Skip to content

Commit 2509c8f

Browse files
committed
Fixes following run through
1 parent 9601fa8 commit 2509c8f

File tree

11 files changed

+46
-25
lines changed

11 files changed

+46
-25
lines changed

workshop/content/docs/inputs/vector.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ CONNECTIONTYPE OGR
2626
CONNECTION "/vsicurl/https://raw.githubusercontent.com/ofrohn/d3-celestial/master/data/constellations.lines.json"
2727
```
2828

29+
+ GeoParquet, GeoArrow - use range requests to access only the data needed.
30+
**Cloud-Optimised** - similar to raster data formats such as "Cloud-Optimized GeoTIFFs" - COGs.
31+
2932
<!--
3033
## Extents
3134
-->

workshop/content/docs/outputs/ogcfeatures.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ new VectorLayer({
121121

122122
1. Modify the `workshop\exercises\mapfiles\railways.map` to enable the OGC Features API. You will need to add a new entry to the `MAPS` section in `workshop\exercises\mapfiles\mapserver.conf` and restart the Docker container to be able to browse the OGC Features API interface.
123123

124+
!!! tip
125+
126+
You need to add `TEMPLATE "void"` to each of the layers you want to make available through the OGC Features API.
127+
[TEMPLATE](https://mapserver.org/mapfile/layer.html#mapfile-layer-template) is a left-over from when HTML templates were used to return features, and allows the layer to be queried.
128+
124129
## Possible Errors
125130

126131
-

workshop/content/docs/outputs/vector-tiles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ new VectorTileLayer({
3838
stroke: new Stroke({
3939
color: 'rgb(66, 133, 244)', // Light blue border color
4040
width: 2, // Border width
41-
}),
41+
})
4242
});
4343
},
4444
}),
@@ -65,7 +65,7 @@ new VectorTileLayer({
6565
## Exercises
6666

6767
1. Update the layer to use the `data/naturalearth/ne_110m_lakes` dataset.
68-
2. Update the OpenLayers style to use a blue fill for the lakes.
68+
2. Update the OpenLayers style to use a blue fill for the lakes. In the `Style` function you will need to add a
6969

7070

7171

workshop/content/docs/outputs/wms.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44

55
We've been using WMS for the example so far. In this exercise we'll look in more detail at how to configure WMS services in MapServer.
66

7+
8+
## METADATA Blocks
9+
10+
Web services are configured using `METADATA` blocks. These are key-value pairs, for example:
11+
12+
13+
!!! tip
14+
15+
It is good practice to put the key names in quotes. This is not required, but it makes the Mapfile
16+
clearer that they are strings and not keywords. Keys can also contain strings such as field names, which
17+
could contain spaces. Without quotes these will cause syntax errors in the Mapfile.
18+
719
## Output Image Formats
820

921
+ webp

workshop/exercises/app/js/vector-tiles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const map = new Map({
2424
stroke: new Stroke({
2525
color: 'rgb(66, 133, 244)', // Light blue border color
2626
width: 2, // Border width
27-
}),
27+
})
2828
});
2929
},
3030
}),

workshop/exercises/mapfiles/contours.map

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MAP
1212

1313
WEB
1414
METADATA
15-
ows_enable_request "*"
16-
ows_srs "EPSG:4326 EPSG:3857"
15+
"ows_enable_request" "*"
16+
"ows_srs" "EPSG:4326 EPSG:3857"
1717
END
1818
END
1919

workshop/exercises/mapfiles/lines.map

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ MAP
99

1010
WEB
1111
METADATA
12-
ows_enable_request "*"
13-
ows_srs "EPSG:4326 EPSG:3857"
12+
"ows_enable_request" "*"
13+
"ows_srs" "EPSG:4326 EPSG:3857"
1414
END
1515
END
1616

workshop/exercises/mapfiles/ogcfeatures.map

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ MAP
1010

1111
WEB
1212
METADATA
13-
ows_title "OSM Features"
14-
ows_enable_request "*" # this enables all OGC requests
15-
ows_srs "EPSG:4326 EPSG:3857"
16-
oga_onlineresource "/ogcfeatures/ogcapi"
17-
# oga_html_template_directory
18-
# oga_enable_request "*"
13+
"ows_title" "OSM Features"
14+
"ows_enable_request" "*" # this enables all OGC requests
15+
"ows_srs" "EPSG:4326 EPSG:3857"
16+
"oga_onlineresource" "/ogcfeatures/ogcapi"
17+
# "oga_html_template_directory"
18+
# "oga_enable_request" "*"
1919
END
2020
END
2121

@@ -26,9 +26,9 @@ MAP
2626
TEMPLATE "void"
2727

2828
METADATA
29-
ows_title "Point POIs"
30-
gml_include_items "all"
31-
gml_featureid "osm_id"
29+
"ows_title" "Point POIs"
30+
"gml_include_items" "all"
31+
"gml_featureid" "osm_id"
3232
END
3333
CONNECTIONTYPE OGR
3434
CONNECTION "data/osm/pois.fgb"
@@ -41,9 +41,9 @@ MAP
4141
TEMPLATE "void"
4242

4343
METADATA
44-
ows_title "Polygon POIs"
45-
gml_include_items "all"
46-
gml_featureid "osm_id"
44+
"ows_title" "Polygon POIs"
45+
"gml_include_items" "all"
46+
"gml_featureid" "osm_id"
4747
END
4848
CONNECTIONTYPE OGR
4949
CONNECTION "data/osm/pois_a.fgb"

workshop/exercises/mapfiles/postgis.map

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ MAP
1010

1111
WEB
1212
METADATA
13-
ows_title "OSM Water"
14-
ows_enable_request "*"
15-
ows_srs "EPSG:4326 EPSG:3857"
13+
"ows_title" "OSM Water"
14+
"ows_enable_request" "*"
15+
"ows_srs" "EPSG:4326 EPSG:3857"
1616
END
1717
END
1818

workshop/exercises/mapfiles/raster.map

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MAP
1212

1313
WEB
1414
METADATA
15-
ows_enable_request "*"
16-
ows_srs "EPSG:4326 EPSG:3857"
15+
"ows_enable_request" "*"
16+
"ows_srs" "EPSG:4326 EPSG:3857"
1717
END
1818
END
1919

0 commit comments

Comments
 (0)