Skip to content

Commit 251058e

Browse files
committed
Markdown docs following full run through
1 parent cc49723 commit 251058e

File tree

9 files changed

+23
-15
lines changed

9 files changed

+23
-15
lines changed

workshop/content/docs/advanced/symbols.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ END
8484
- Direct MapServer request: <http://localhost:5000/?map=/etc/mapserver/railways.map&mode=map&layer=roads>
8585
- Local OpenLayers example: <http://localhost:5001/railways.html>
8686

87-
??? JavaScript
87+
??? JavaScript "railways.js"
8888

8989
``` js
9090
--8<-- "railways.js"
9191
```
9292

93-
??? Mapfile
93+
??? Mapfile "railways.map"
9494

9595
``` scala
9696
--8<-- "railways.map"

workshop/content/docs/inputs/databases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
MapServer can connect to most geospatial databases. There are native MapServer drivers for [PostgreSQL/PostGIS](https://mapserver.org/input/vector/postgis.html),
66
[Oracle](https://mapserver.org/input/vector/oracle.html), and [Microsoft SQL Server](https://mapserver.org/input/vector/mssql.html). Other databases
7-
can be accessed through OGR e.g. [MySQL](https://mapserver.org/input/vector/mysql.html).
7+
can be accessed through OGR, for example [MySQL](https://mapserver.org/input/vector/mysql.html).
88

99
In this exercise we'll be connecting to a PostGIS database to display water polygon features using a MapServer WMS. [PostGIS](https://postgis.net/) spatially enables the [PostgreSQL](https://www.postgresql.org/)
1010
databases.

workshop/content/docs/inputs/raster.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,5 @@ A [COMPOSITE](https://mapserver.org/mapfile/composite.html) block is used on the
104104
## Exercises
105105

106106
1. Try different settings for layer `OPACITY` to see its effect on the output in `raster.map`.
107-
2. Change the `COLOR` of the first `CLASS` in `terrain.include` to highlight which pixels have values in this range.
107+
2. Change the `COLOR` of the first `CLASS` in `terrain.include` to highlight which pixels have values in this range.
108+
Cyan (`COLOR 0 255 255`) is a good colour for highlighting.

workshop/content/docs/inputs/vector.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +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.
29+
MapServer (through GDAL) takes advantage of the newer **Cloud-Optimised** formats such as COGs - "Cloud-Optimized GeoTIFFs".
30+
These formats use range requests to access only the data needed, so MapServer only needs to download the data for rendering rather
31+
than a huge GeoTIFF file.
3132

3233
<!--
3334
## Extents

workshop/content/docs/mapfile/labels.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ GEOMTRANSFORM (centerline(densify([shape], 0.1)))
5959
## Exercises
6060

6161
1. Use a different font for the label by adding the following to the `LABEL` block: `FONT MonsieurLaDoulaise` and increasing the `SIZE` to `28`.
62+
The list of fonts available can be found in `workshop/exercises/mapfiles/data/fonts/fontset.txt`.
6263
2. Comment out the `GEOMTRANSFORM (centerline([shape]))` and `ANGLE FOLLOW` lines (using `#`) to see its effect on the map.
63-
64+
3. If you have time, download a font you like from https://fonts.google.com/ and unzip the .TTF file to `workshop/exercises/mapfiles/data/fonts/`
65+
add a new entry to `fontset.txt` and use this font to draw your Map labels.
6466
<!--
6567
``` xml
6668
<ServiceExceptionReport xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3.0" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wms/1.3.0/exceptions_1_3_0.xsd">

workshop/content/docs/mapfile/polygons.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,5 @@ CLASS
104104

105105
3. Switch the `CONNECTIONTYPE` to use the native `FLATGEOBUF` driver.
106106

107-
4. Experiment with styling the polygons. `WIDTH` can be used to change the width of the polygon outline.
107+
4. Experiment with styling the polygons. `WIDTH` can be used to change the width of the polygon outline. There are more examples
108+
at [Cartographical Symbol Construction with MapServer](https://mapserver.org/mapfile/symbology/construction.html).

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ 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. In the `Style` function you will need to add a
68+
2. Update the OpenLayers style to use a blue fill for the lakes. In the `Style` function you will need to uncomment the `fill` JavaScript.
69+
Experiment with different colour values for the `fill` and `stroke`.
6970

7071

7172

workshop/content/docs/outputs/wms.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
We've been using WMS for interacting with MapServer for Mapfile examples. In this exercise we'll look in more detail at how to configure WMS services in MapServer.
66

7-
Full MapServer WMS documentation is available [here](https://www.mapserver.org/ogc/wms_server.html).
7+
The MapServer WMS documentation is available [here](https://www.mapserver.org/ogc/wms_server.html).
88

99
## METADATA Blocks
1010

@@ -64,5 +64,7 @@ A sample request for the legend for the `polygons.map` is as follows:
6464
## Exercises
6565

6666
1. If you've read this far you deserve to discover one of MapServer's Easter eggs. Try changing the output format to `&format=image/txt`. We'll use the `polygons.map` for the request: <http://localhost:5000/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetMap&layers=buildings&format=image/txt>
67-
2. Change the legend title for the `polygon map`.
68-
3. Run a [GetCapabilities](http://localhost:5000/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetCapabilities) request for the `polygon.map`. Add various `METADATA` pairs to get rid of the warnings in the `GetCapabilities` response.
67+
2. Create a `GetLegendGraphic` request, but for the `points.map` for the `layer=poi`.
68+
3. Run a [GetCapabilities](http://localhost:5000/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetCapabilities) request for the `polygon.map`.
69+
Add various `METADATA` pairs listed in the [Web Object Metadata](https://mapserver.org/ogc/wms_server.html#web-object-metadata) and check its output
70+
in the `GetCapabilities` response.

workshop/content/mkdocs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ nav:
2929
- Vector Tiles: outputs/vector-tiles.md
3030
- OGC Features API: outputs/ogcfeatures.md
3131
- Advanced:
32-
- SLD: advanced/sld.md
3332
- Vector Symbols: advanced/symbols.md
3433
- Clusters: advanced/clusters.md
35-
- Apache: advanced/apache.md
36-
- MapScript: advanced/mapscript.md
34+
- SLD: advanced/sld.md
35+
# - Apache: advanced/apache.md
36+
# - MapScript: advanced/mapscript.md
3737
- Summary: summary.md
3838
- Credits and Thanks: credits.md
3939

0 commit comments

Comments
 (0)