organize test data, add sources for Tartu metadata (#158)

Author: tomkralidis

workshop/content/docs/publishing/first.md

@@ -6,10 +6,10 @@ title: Exercise 1 - Your first dataset
 
 In this section you are going to publish a vector dataset.
 
-For this exercise, we will use a CSV dataset of [Bathing waters in Estonia](https://github.com/geopython/diving-into-pygeoapi/tree/main/workshop/exercises/data/bathingwater-estonia.csv),
+For this exercise, we will use a CSV dataset of [Bathing waters in Estonia](https://github.com/geopython/diving-into-pygeoapi/tree/main/workshop/exercises/data/tartu/bathingwater-estonia.csv),
 kindly provided by [Estonian Health Board](https://terviseamet.ee).
 
-You can find this dataset in `workshop/exercises/data/bathingwater-estonia.csv`.
+You can find this dataset in `workshop/exercises/data/tartu/bathingwater-estonia.csv`.
 
 This exercise consists of two steps:
 
@@ -90,7 +90,7 @@ The config section reads:
         providers:
             - type: feature
               name: CSV
-              data: /data/bathingwater-estonia.csv
+              data: /data/tartu/bathingwater-estonia.csv
               id_field: id
               title_field: Name
               geometry:

workshop/content/docs/publishing/ogcapi-features.md

@@ -42,7 +42,7 @@ Let's add the file `workshop/exercises/data/cp-tartu2.gpkg.zip`:
 
 !!! question "Update the pygeoapi configuration"
 
-    First, let's unzip the file [cptartu2.gpkg.zip](https://github.com/geopython/diving-into-pygeoapi/tree/main/workshop/exercises/data/cptartu2.gpkg.zip) to `cptartu2.gpkg`.
+    First, let's unzip the file [cptartu2.gpkg.zip](https://github.com/geopython/diving-into-pygeoapi/tree/main/workshop/exercises/data/tartu/cptartu2.gpkg.zip) to `cptartu2.gpkg`.
 
     Then, open the pygeoapi configuration file in a text editor.
     Find the line `# START - EXERCISE 2 - cadastral parcels Tartu`.
@@ -70,7 +70,7 @@ Let's add the file `workshop/exercises/data/cp-tartu2.gpkg.zip`:
         providers:
             - type: feature
               name: SQLiteGPKG
-              data: /data/cptartu2.gpkg # place correct path here
+              data: /data/tartu/cptartu2.gpkg # place correct path here
               id_field: nationalca
               title_field: label
               table: cptartu2 # table name within gpkg
@@ -118,7 +118,7 @@ First we will load `bathingwater-estonia.geojson` into the Elasticsearch server.
 Edit the `add-data.sh` script within the `ES` folder, adding these two lines before the end:
 
 ``` {.bash linenums="1"}
-    curl -o /tmp/bathingwater-estonia.geojson https://raw.githubusercontent.com/geopython/diving-into-pygeoapi/main/workshop/exercises/data/bathingwater-estonia.geojson
+    curl -o /tmp/bathingwater-estonia.geojson https://raw.githubusercontent.com/geopython/diving-into-pygeoapi/main/workshop/exercises/data/tartu/bathingwater-estonia.geojson
     python3 /load_es_data.py /tmp/bathingwater-estonia.geojson id
 ```
 Through these changes the file `bathingwater-estonia.geojson` is downloaded inside the Elasticsearch Docker container and then loaded into Elasticsearch. 

workshop/content/docs/publishing/ogcapi-records.md

@@ -24,7 +24,7 @@ pygeoapi supports the OGC API - Records draft specification, using Elasticsearch
 ## Publish metadata records in pygeoapi
 
 With pygeoapi we can setup OGC API - Records using any supported data provider. In this exercise we will use the [TinyDB](https://tinydb.readthedocs.io/en/latest/index.html)
-Catalogue backend. We will use the sample catalogue in `workshop/exercises/data/records/tartu/catalogue.tinydb`.
+Catalogue backend. We will use the sample catalogue in `workshop/exercises/data/tartu/metadata/catalogue.tinydb`.
 
 !!! question "Update the pygeoapi configuration"
 
@@ -52,7 +52,7 @@ Catalogue backend. We will use the sample catalogue in `workshop/exercises/data/
         providers:
             - type: record
               name: TinyDBCatalogue
-              data: /data/records/tartu/catalogue.tinydb
+              data: /data/tartu/metadata/catalogue.tinydb
               id_field: externalId
               time_field: recordCreated
               title_field: title
@@ -81,7 +81,7 @@ It is possible to load more example ISO19139 metadata in a TinyDB database with
 
 <div class="termy">
 ```bash
-cd workshop/exercises/data/records/tartu
+cd workshop/exercises/data/tartu/metadata
 curl -O https://raw.githubusercontent.com/geopython/pygeoapi/master/tests/load_tinydb_records.py
 python3 load_tinydb_records.py xml catalogue.tinydb
 ```
@@ -100,7 +100,7 @@ If you do not have Python installed, you can the loader by using the OWSLib Dock
     pip3 install owslib
     apt-get update -y && apt-get install curl -y
     curl -O https://raw.githubusercontent.com/geopython/pygeoapi/master/tests/load_tinydb_records.py
-    python3 load_tinydb_records.py /data/records/tartu/xml /data/records/tartu/catalogue.tinydb
+    python3 load_tinydb_records.py /data/tartu/metadata/xml /data/tartu/metadata/catalogue.tinydb
     ```
     </div>
 

workshop/content/docs/publishing/ogcapi-tiles.md

@@ -44,7 +44,7 @@ include, but are not limited to:
 
 For this exercise, you will publish a vector dataset of the [bathing water sources in Estonia](https://avaandmed.eesti.ee/datasets/joogiveeallikad), from the location below:
 
-* data: `workshop/exercises/data/bathingwater-estonia.geojson`
+* data: `workshop/exercises/data/tartu/bathingwater-estonia.geojson`
 
 Let's generate the tiles as the first step using tippecanoe:
 
@@ -57,7 +57,7 @@ Let's generate the tiles as the first step using tippecanoe:
         cd workshop/exercises
         docker run -it --rm -v $(pwd)/data:/data emotionalcities/tippecanoe \
         tippecanoe -r1 -pk -pf --output-to-directory=/data/tiles/ --force --maximum-zoom=20 \
-        --extend-zooms-if-still-dropping --no-tile-compression /data/bathingwater-estonia.geojson
+        --extend-zooms-if-still-dropping --no-tile-compression /data/tartu/bathingwater-estonia.geojson
         ```
         </div>
      
@@ -68,7 +68,7 @@ Let's generate the tiles as the first step using tippecanoe:
         cd workshop/exercises
         docker run -it --rm -v ${pwd}/data:/data emotionalcities/tippecanoe \
         tippecanoe -r1 -pk -pf --output-to-directory=/data/tiles/ --force --maximum-zoom=20 \
-        --extend-zooms-if-still-dropping --no-tile-compression /data/bathingwater-estonia.geojson
+        --extend-zooms-if-still-dropping --no-tile-compression /data/tartu/bathingwater-estonia.geojson
         ```
         </div>
 
@@ -106,7 +106,7 @@ Let's generate the tiles as the first step using tippecanoe:
         providers:
             - type: feature
               name: GeoJSON
-              data: /data/bathingwater-estonia.geojson
+              data: /data/tartu/bathingwater-estonia.geojson
               id_field: id
             - type: tile
               name: MVT-tippecanoe
@@ -153,7 +153,7 @@ Edit the `add-data.sh` script on the `ES` folder, adding these two lines before
 
 ``` {.yaml linenums="1"}
 
-    curl -o /tmp/bathingwater-estonia.geojson https://raw.githubusercontent.com/doublebyte1/diving-into-pygeoapi/tiles-update/workshop/exercises/data/bathingwater-estonia.geojson
+    curl -o /tmp/bathingwater-estonia.geojson https://raw.githubusercontent.com/geopython/diving-into-pygeoapi/tiles-update/workshop/exercises/data/tartu/bathingwater-estonia.geojson
     python3 /load_es_data.py /tmp/bathingwater-estonia.geojson id
 
 ```

workshop/exercises/data/README.md

@@ -9,7 +9,7 @@ This directory provides sample data to demonstrate functionality.
 - url: https://avaandmed.eesti.ee/datasets/supluskohad
 - description: Locations where the Estonian Health Board monitors the bathing water quality
 - copyright: [Terviseamet](https://terviseamet.ee)
-- license: CC-BY-SA 3.0
+- license: CC BY-SA 3.0
 - projection: epsg:3300
 
 ### Cadastral Parcels Estonia
@@ -24,7 +24,7 @@ This directory provides sample data to demonstrate functionality.
 - url: http://opendata.comune.firenze.it/?q=metarepo/datasetinfo&id=52d8d3ab-eae5-400e-8561-d974f8612de0
 - description: The dataset contains: acCic_s: Cycle Circulation Area with PolygonZ geometry (class acCic, has two spatial components, acCic_c with PolylineZ ring geometry and acCic_s with PolygonZ geometry). It consists of the longitudinal part of the road reserved for the circulation of cycles. It can be carried out: on its own when it is physically separated from the area reserved for motor vehicles and from that reserved for pedestrians, through suitable traffic dividers placed in the longitudinal direction and impassable; on a reserved lane, obtained from the roadway, separated from the lane reserved for motor vehicles simply by a longitudinal strip or by lane delimiters; on a reserved lane created on the pavement space.
 - copyright: Comune di Firenze
-- license: CC-BY 4.0
+- license: CC BY 4.0
 
 ### ICOADS
 - title: [coads_sst.nc](coads_sst.nc)
@@ -36,22 +36,43 @@ This directory provides sample data to demonstrate functionality.
 ## Metadata/Records
 
 ### Free Wifi Hotspots in Florence
-- title: [free-wifi-florence.xml](./records/xml/free-wifi-florence.xml)
+- title: [./firenze/metadata/xml/free-wifi-florence.xml](./firenze/metadata/xml/free-wifi-florence.xml)
 - url: https://opendata.comune.fi.it/?q=metarepo/datasetinfo&id=fb5b7bac-bcb0-4326-9388-7e3f3d671d71
 - description: The dataset shows the location of the places in the Municipality of Florence where a free wireless internet connection service (Wifi) is available.
 - copyright: Comune di Firenze
-- license: CC-BY 4.0
+- license: CC BY 4.0
 
 ### Carsharing spots in Florence
-- title: [carsharing-florence.xml](./records/xml/carsharing-florence.xml)
+- title: [./firenze/metadata/xml/carsharing-florence.xml](./firenze/metadata/xml/carsharing-florence.xml)
 - url: http://dati.cittametropolitana.fi.it/geonetwork/srv/ita/catalog.search#/metadata/cmfi:9c92966b-ae6b-42d4-9729-592b016e4b82
 - description: Punctual positioning of the car-sharing activities of the Metropolitan City of Florence.
 - copyright: Comune di Firenze
-- license: CC-BY 4.0
+- license: CC BY 4.0
 
 ### German Soil Types
-- title: [bodenart.en.csv](bodenart.en.csv)
+- title: [./bodenart.en.csv](./bodenart.en.csv)
 - url: https://registry.gdi-de.org/codelist/de.bund.thuenen/bodenart/bodenart.en.csv
 - description: Bodenarten auf Basis der Bodenkundlichen Kartieranleitung 5. Auflage (KA5)
 - copyright: Johann Heinrich von Thünen-Institut
-- license: CC-BY 4.0
+- license: CC BY 4.0
+
+### Estonia Dams
+- title: [./tartu/metadata/xml/estonia-dams.xml](./tartu/metadata/xml/estonia-dams.xml)
+- url: https://metadata.geoportaal.ee/geonetwork/srv/eng/catalog.search#/metadata/937c4456-fd9f-40cf-89ba-30be47146858
+- description: Eesti paisude ruumiandmekogum koondab andmeid paisude asukohtade, tehniliste parameetrite ja seisundi kohta. Andmeid hallatakse Eesti Looduse Infosüsteemis (EELIS).
+- copyright:  Keskkonnaagentuur 
+- license: CC BY-SA 3.0
+
+### Estonia Landcover
+- title: [./tartu/metadata/xml/estonia-landcover.xml](./tartu/metadata/xml/estonia-landcover.xml)
+- url: https://metadata.geoportaal.ee/geonetwork/srv/eng/catalog.search#/metadata/2cde09a2-ea86-4a73-9768-6c7ba78bc0e6
+- description: Eesti maakatte andmebaas. Koostatud ühtse üle-euroopalise Corine Land Cover metoodika alusel. Minimaalne kaardistusühik 25 ha, hierarhiline nomenklatuur IV taset.
+- copyright:  Keskkonnaagentuur 
+- license: CC BY-SA 3.0
+
+### Estonia Transport
+- title: [./tartu/metadata/xml/estonia-transport.xml](./tartu/metadata/xml/estonia-transport.xml)
+- url: https://metadata.geoportaal.ee/geonetwork/srv/eng/catalog.search#/metadata/bf38a8fc-96f1-4d34-9130-18160e489514
+- description: Ruumiandmekogum "Eesti topograafia andmekogu - transport" hõlmab Eesti topograafia andmekogu (ETAK) reaalsusmudeli transpordi gruppi koondatud reaalse maailma nähtuseid, mis on klassifitseeritud nähtusklassideks
+- copyright:  Keskkonnaagentuur 
+- license: CC BY-SA 3.0