Merge pull request #2 from tomkralidis/tk-updates

change OAFeat terminology and MapServer port

Author: geographika

workshop/content/docs/advanced/clusters.md

@@ -31,8 +31,8 @@ CLASS
 
 !!! example
 
-    - MapServer request: <http://localhost:5000/?map=/etc/mapserver/clusters.map&mode=map&layer=trees>
-    - OpenLayers example: <http://localhost:5001/clusters.html>
+    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/clusters.map&mode=map&layer=trees>
+    - OpenLayers example: <http://localhost:7001/clusters.html>
 
 ??? JavaScript "clusters.js"
 
@@ -55,4 +55,4 @@ CLASS
         MAXDISTANCE 50
         REGION "ellipse"
     END
-    ```
+    ```

workshop/content/docs/advanced/sld.md

@@ -24,10 +24,10 @@ This exercise will focus on the first use case.
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:5000/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
-    - Local OpenLayers example: <http://localhost:5001/sld.html>
-    - GetCapabilities request: <http://localhost:5000/?map=/etc/mapserver/sld.map&REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.3.0>
-    - Request to generate SLD from a Mapfile: <http://localhost:5000/?map=/etc/mapserver/sld.map&REQUEST=GetStyles&SERVICE=WMS&LAYERS=countries&VERSION=1.3.0&sld=http://node:5001/data/sld.xml>
+    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
+    - Local OpenLayers example: <http://localhost:7001/sld.html>
+    - GetCapabilities request: <http://localhost:7000/?map=/etc/mapserver/sld.map&REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.3.0>
+    - Request to generate SLD from a Mapfile: <http://localhost:7000/?map=/etc/mapserver/sld.map&REQUEST=GetStyles&SERVICE=WMS&LAYERS=countries&VERSION=1.3.0&sld=http://node:7001/data/sld.xml>
 
 ???+ SLD
 

workshop/content/docs/advanced/symbols.md

@@ -81,8 +81,8 @@ END
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:5000/?map=/etc/mapserver/railways.map&mode=map&layer=roads>
-    - Local OpenLayers example: <http://localhost:5001/railways.html>
+    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/railways.map&mode=map&layer=roads>
+    - Local OpenLayers example: <http://localhost:7001/railways.html>
 
 ??? JavaScript "railways.js"
 
@@ -114,4 +114,4 @@ END
 ## Further Reading
 
 - [Cartographical Symbol Construction with MapServer](https://mapserver.org/mapfile/symbology/construction.html)
-- [MapServer Symbology Exchange](https://github.com/MapServer/MapServer/wiki/SymbologyExchangeVector)
+- [MapServer Symbology Exchange](https://github.com/MapServer/MapServer/wiki/SymbologyExchangeVector)

workshop/content/docs/inputs/databases.md

@@ -78,8 +78,8 @@ Online example not available as no PostGIS installation on the server
 
 !!! example "Exercise Links"
 
-    - MapServer request: <http://localhost:5000/?map=/etc/mapserver/postgis.map&mode=map&layer=water>
-    - OpenLayers example: <http://localhost:5001/postgis.html>
+    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/postgis.map&mode=map&layer=water>
+    - OpenLayers example: <http://localhost:7001/postgis.html>
 
 ??? JavaScript "postgis.js"
 
@@ -97,7 +97,7 @@ Online example not available as no PostGIS installation on the server
 
 1. Try and load another dataset into the database using the `ogr2ogr` approach above.
 2. Now add a new layer to the Mapfile to display the layer. You can make a direct request to MapServer in the form:
-  <http://localhost:5000/?map=/etc/mapserver/postgis.map&mode=map&layers=water%20NEWLAYERNAME>.
+  <http://localhost:7000/?map=/etc/mapserver/postgis.map&mode=map&layers=water%20NEWLAYERNAME>.
 3. Now update the JS file so the layer is visible as part of the interactive map, through WMS:
 
     ```js
@@ -106,4 +106,4 @@ Online example not available as no PostGIS installation on the server
           params: { 'LAYERS': 'water,NEWLAYERNAME', 'STYLES': '' },
           ratio: 1
       }),
-    ```
+    ```

workshop/content/docs/inputs/raster.md

@@ -86,8 +86,8 @@ A [COMPOSITE](https://mapserver.org/mapfile/composite.html) block is used on the
 
 !!! example
 
-    - MapServer request: <http://localhost:5000/?map=/etc/mapserver/raster.map&mode=map&layer=dtm>
-    - OpenLayers example: <http://localhost:5001/raster.html>
+    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/raster.map&mode=map&layer=dtm>
+    - OpenLayers example: <http://localhost:7001/raster.html>
 
 ??? JavaScript "raster.js"
 
@@ -105,4 +105,4 @@ A [COMPOSITE](https://mapserver.org/mapfile/composite.html) block is used on the
 
 1. Try different settings for layer `OPACITY` to see its effect on the output in `raster.map`.
 2. Change the `COLOR` of the first `CLASS` in `terrain.include` to highlight which pixels have values in this range. 
-   Cyan (`COLOR 0 255 255`) is a good colour for highlighting.
+   Cyan (`COLOR 0 255 255`) is a good colour for highlighting.

workshop/content/docs/inputs/vector.md

@@ -38,8 +38,8 @@ than a huge GeoTIFF file.
 
 !!! example
 
-    - MapServer request: <http://localhost:5000/?map=/etc/mapserver/stars.map&mode=map&layer=constellations>
-    - OpenLayers example: <http://localhost:5001/stars.html>
+    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/stars.map&mode=map&layer=constellations>
+    - OpenLayers example: <http://localhost:7001/stars.html>
 
 ??? JavaScript "stars.js"
 

workshop/content/docs/introduction/commandline.md

@@ -21,7 +21,7 @@ INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE INPUT=FLATGEOBUF
 When run through a web server, data is passed to the `mapserv` application, which generates output that is then sent back through the web server.
 All web requests can be recreated and tested on the command line, this makes it a handy debugging tool. 
 
-To test a URL such as <http://localhost:5000/?map=/etc/mapserver/countries.map&mode=map> run the following command:
+To test a URL such as <http://localhost:7000/?map=/etc/mapserver/countries.map&mode=map> run the following command:
 
 ```bash
 mapserv "QUERY_STRING=map=/etc/mapserver/countries.map&mode=map"

workshop/content/docs/introduction/docker.md

@@ -10,15 +10,15 @@ MapServer runs on the Apache web server - see the [Apache page](../advanced/apac
 
 It uses the Apache [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), module that provides FastCGI support.
 
-MapServer runs on port 80 on the Docker container, which is mapped to port 5000 on the local machine, as can be seen in the Docker compose file
+MapServer runs on port 80 on the Docker container, which is mapped to port 5002 on the local machine, as can be seen in the Docker compose file
 located at `workshop\exercises\docker-compose.yml`:
 
 ```yaml
   mapserver:
     image: camptocamp/mapserver:8.4-gdal3.10
     container_name: mapserver
     ports:
-      - 5000:80
+      - 5002:80
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:
@@ -37,7 +37,7 @@ A second container that serves the JavaScript example pages is also run using Do
     image: node:lts-slim
     container_name: node
     ports:
-      - 5001:5001
+      - 5001:7001
     working_dir: /home/node/app
     volumes:
       - ./app:/home/node/app
@@ -55,8 +55,8 @@ A second container that serves the JavaScript example pages is also run using Do
   # start docker in detached mode
   docker compose up -d
   # the following URLs should now be available
-  # http://localhost:5000
-  # http://localhost:5001
+  # http://localhost:7000
+  # http://localhost:7001
 
   # stop docker
   docker compose down
@@ -73,4 +73,4 @@ A second container that serves the JavaScript example pages is also run using Do
 ```bash
 # to remove a container named db
 docker rm db
-```
+```

workshop/content/docs/introduction/introduction.md

@@ -56,13 +56,13 @@ setup provided to you is actually working. The configuration file for Docker Com
     docker compose up
     ```
 
-    2. Open <http://localhost:5000> in your browser, you should see an error message!
+    2. Open <http://localhost:7000> in your browser, you should see an error message!
     3. Close by pressing `CTRL-C`
 
 # Displaying your First Map
 
-- Ensure that you have MapServer setup and running at <http://localhost:5000>.
-- Now try opening the following MapServer URL in your browser - <http://localhost:5000/?map=/etc/mapserver/countries.map&mode=map>
+- Ensure that you have MapServer setup and running at <http://localhost:7000>.
+- Now try opening the following MapServer URL in your browser - <http://localhost:7000/?map=/etc/mapserver/countries.map&mode=map>
 
 
 !!! note
@@ -72,7 +72,7 @@ setup provided to you is actually working. The configuration file for Docker Com
     ```bash
     docker compose up -d
     docker container ls  # verify that the mapserver container is running
-    # visit http://localhost:5000 in your browser
+    # visit http://localhost:7000 in your browser
     docker logs --follow mapserver  # view logs
     docker compose stop
     ```

workshop/content/docs/introduction/openlayers.md

@@ -15,7 +15,7 @@ A useful introduction to OpenLayers can be found [here](https://openlayers.org/w
 ## HTML example pages
 
 The HTML pages are served using a Docker container, and when the containers are
-running an index page for all workshop exercises is available at <http://localhost:5001/>. 
+running an index page for all workshop exercises is available at <http://localhost:7001/>. 
 
 The HTML files used in the workshop are located in `exercises/app`.
 The JavaScript files can be found in `exercises/app/js`. These files can be edited, and changes viewed in the browser.