From 506975acd9e6760c971fefaf88ddc442c8bbd25d Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Wed, 9 Jul 2025 21:59:13 -0400 Subject: [PATCH] swap maps and tiles sections (#169) --- LICENSE.md | 2 +- workshop/content/docs/publishing/index.md | 4 +- .../content/docs/publishing/ogcapi-maps.md | 6 +- .../content/docs/publishing/ogcapi-tiles.md | 6 +- workshop/content/mkdocs.yml | 6 +- workshop/exercises/pygeoapi.config.yml | 72 +++++++++---------- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index e480ed7d..f2476b43 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # The MIT License (MIT) -Copyright © 2018-2023 The pygeoapi community +Copyright © 2018-2025 The pygeoapi community * * * diff --git a/workshop/content/docs/publishing/index.md b/workshop/content/docs/publishing/index.md index dbab0ea8..bc37da1c 100644 --- a/workshop/content/docs/publishing/index.md +++ b/workshop/content/docs/publishing/index.md @@ -14,8 +14,8 @@ through the following exercises: - [Exercise 1 - Your first dataset](first.md) - [Exercise 2 - Vector data via OGC API - Features](ogcapi-features.md) - [Exercise 3 - Raster data via OGC API - Coverages](ogcapi-coverages.md) -- [Exercise 4 - Tiles of geospatial data via OGC API - Tiles](ogcapi-tiles.md) -- [Exercise 5 - Maps of geospatial data via OGC API - Maps](ogcapi-maps.md) +- [Exercise 4 - Maps of geospatial data via OGC API - Maps](ogcapi-maps.md) +- [Exercise 5 - Tiles of geospatial data via OGC API - Tiles](ogcapi-tiles.md) - [Exercise 6 - Metadata via OGC API - Records](ogcapi-records.md) - [Exercise 7 - Environmental data via OGC API - Environmental Data Retrieval](ogcapi-edr.md) - [Exercise 8 - Functions via OGC API - Processes](ogcapi-processes.md) diff --git a/workshop/content/docs/publishing/ogcapi-maps.md b/workshop/content/docs/publishing/ogcapi-maps.md index e1c3fe27..c83d7b5e 100644 --- a/workshop/content/docs/publishing/ogcapi-maps.md +++ b/workshop/content/docs/publishing/ogcapi-maps.md @@ -1,8 +1,8 @@ --- -title: Exercise 5 - Maps of geospatial data via OGC API - Maps +title: Exercise 4 - Maps of geospatial data via OGC API - Maps --- -# Exercise 5 - Maps of geospatial data via OGC API - Maps +# Exercise 4 - Maps of geospatial data via OGC API - Maps [OGC API - Maps](https://ogcapi.ogc.org/maps) provides a Web API to access any geospatial data as a georeferenced map image. @@ -23,7 +23,7 @@ In this section we'll be exposing a Geopackage file available at `workshop/exerc !!! question "Interact with OGC API - Maps via MapScript" - Open the pygeoapi configuration file in a text editor. Find the line `# START - EXERCISE 5 - Maps`. + Open the pygeoapi configuration file in a text editor. Find the line `# START - EXERCISE 4 - Maps`. Uncomment section related to #airports. diff --git a/workshop/content/docs/publishing/ogcapi-tiles.md b/workshop/content/docs/publishing/ogcapi-tiles.md index e7825a89..10f3c083 100644 --- a/workshop/content/docs/publishing/ogcapi-tiles.md +++ b/workshop/content/docs/publishing/ogcapi-tiles.md @@ -1,8 +1,8 @@ --- -title: Exercise 4 - Tiles of geospatial data via OGC API - Tiles +title: Exercise 5 - Tiles of geospatial data via OGC API - Tiles --- -# Exercise 4 - Tiles of geospatial data via OGC API - Tiles +# Exercise 5 - Tiles of geospatial data via OGC API - Tiles [OGC API - Tiles](https://ogcapi.ogc.org/tiles) provides a Web API to deliver tiles of geospatial information. Different forms of geospatial information are supported, such as tiles of vector features ("vector tiles"), coverages, maps (or imagery) and potentially eventually additional types of tiles of geospatial information. The standard is available on this document: @@ -261,7 +261,7 @@ Finally start the docker composition, which will download and ingest the dataset ### QGIS -QGIS supports OGC API Vector Tiles via the [Vector Tiles Layer](https://docs.qgis.org/3.34/en/docs/user_manual/working_with_vector_tiles/vector_tiles_properties.html). Although OGC API - Tiles are not natively supported, you can customize the `generic connection` in order to access them in QGIS. +QGIS supports OGC API Vector Tiles via the [Vector Tiles Layer](https://docs.qgis.org/3.40/en/docs/user_manual/working_with_vector_tiles/vector_tiles_properties.html). Although OGC API - Tiles are not natively supported, you can customize the `generic connection` in order to access them in QGIS. !!! question "Access OGC API Vector Tiles from QGIS" diff --git a/workshop/content/mkdocs.yml b/workshop/content/mkdocs.yml index c2e07dfe..59bfe5cf 100644 --- a/workshop/content/mkdocs.yml +++ b/workshop/content/mkdocs.yml @@ -1,7 +1,7 @@ site_name: Diving into pygeoapi site_description: "pygeoapi is an OGC Reference Implementation supporting numerous OGC API specifications. This workshop will cover publishing geospatial data to the Web using pygeoapi in support of the suite of OGC API standards." site_author: The pygeoapi community -copyright: "© 2023 pygeoapi community" +copyright: "© 2025 pygeoapi community" site_url: https://geopython.github.io/diving-into-pygeoapi repo_url: https://github.com/geopython/diving-into-pygeoapi nav: @@ -14,8 +14,8 @@ nav: - Exercise 1 - Your first dataset: publishing/first.md - Exercise 2 - Vector data via OGC API - Features: publishing/ogcapi-features.md - Exercise 3 - Raster data via OGC API - Coverages: publishing/ogcapi-coverages.md - - Exercise 4 - Tiles of geospatial data via OGC API - Tiles: publishing/ogcapi-tiles.md - - Exercise 5 - Maps of geospatial data via OGC API - Maps: publishing/ogcapi-maps.md + - Exercise 4 - Maps of geospatial data via OGC API - Maps: publishing/ogcapi-maps.md + - Exercise 5 - Tiles of geospatial data via OGC API - Tiles: publishing/ogcapi-tiles.md - Exercise 6 - Metadata via OGC API - Records: publishing/ogcapi-records.md - Exercise 7 - Environmental data via OGC API - Environmental Data Retrieval: publishing/ogcapi-edr.md - Exercise 8 - Functions via OGC API - Processes: publishing/ogcapi-processes.md diff --git a/workshop/exercises/pygeoapi.config.yml b/workshop/exercises/pygeoapi.config.yml index d9df6393..becc5846 100644 --- a/workshop/exercises/pygeoapi.config.yml +++ b/workshop/exercises/pygeoapi.config.yml @@ -282,7 +282,41 @@ resources: # mimetype: application/tiff ## END - EXERCISE 3 - Coverages -## START - EXERCISE 4 - Tiles +## START - EXERCISE 4 - Maps +# airports: +# type: collection +# title: airports of the world +# description: Point data representing airports around the world with various metadata such as name, Code, etc. +# keywords: +# - airports +# - natural earth +# links: +# - type: text/html +# rel: canonical +# title: information +# href: https://www.naturalearthdata.com/downloads/10m-cultural-vectors/airports/ +# hreflang: en-US +# extents: +# spatial: +# bbox: [-180,-90,180,90] +# crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84 +# temporal: +# begin: +# end: null # or empty +# providers: +# - type: map +# name: MapScript +# data: /data/airport.gpkg +# options: +# type: MS_LAYER_POINT +# layer: airport +# style: /data/airport.sld +# format: +# name: png +# mimetype: image/png +## END - EXERCISE 4 - Maps + +## START - EXERCISE 5 - Tiles # hyderabad: # type: collection # title: Greater Hyderabad Municipal Corporation ward boundaries @@ -319,41 +353,7 @@ resources: # format: # name: pbf # mimetype: application/vnd.mapbox-vector-tile -# # END - EXERCISE 4 - Tiles - -## START - EXERCISE 5 - Maps -# airports: -# type: collection -# title: airports of the world -# description: Point data representing airports around the world with various metadata such as name, Code, etc. -# keywords: -# - airports -# - natural earth -# links: -# - type: text/html -# rel: canonical -# title: information -# href: https://www.naturalearthdata.com/downloads/10m-cultural-vectors/airports/ -# hreflang: en-US -# extents: -# spatial: -# bbox: [-180,-90,180,90] -# crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84 -# temporal: -# begin: -# end: null # or empty -# providers: -# - type: map -# name: MapScript -# data: /data/airport.gpkg -# options: -# type: MS_LAYER_POINT -# layer: airport -# style: /data/airport.sld -# format: -# name: png -# mimetype: image/png -## END - EXERCISE 5 - Maps +# # END - EXERCISE 5 - Tiles ## START - EXERCISE 6 - Metadata # example_catalogue: