pygeoapi: use official latest Docker Image and make /pygeoapi INSPIRE compliant

justb4 · justb4 · commit 18a7b7090681 · 2023-04-13T10:43:27.000+02:00
diff --git a/services/pygeoapi/env.sh b/services/pygeoapi/env.sh
@@ -12,8 +12,8 @@ export SERVICE_PATH_ADR="/${SERVICE_NAME_ADR}"
 
 # Can be usually left as is, unless you want to run specific build and/or version.
 export DOCKER_IMAGE_NAME="geopython/pygeoapi"
-# export DOCKER_IMAGE_VERSION="latest"
-export DOCKER_IMAGE_VERSION="dev"
+export DOCKER_IMAGE_VERSION="latest"
+# export DOCKER_IMAGE_VERSION="dev"
 export DOCKER_IMAGE="${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_VERSION}"
 
 export PYGEOAPI_REPO="https://github.com/geopython/pygeoapi"
diff --git a/services/pygeoapi/local.config.yml b/services/pygeoapi/local.config.yml
@@ -70,19 +70,29 @@ resources:
             hreflang: nl
           - type: application/xml
             rel: describedby
-            title: Metadata as iso19139 xml
+            title: Metadata as ISO 19139 XML
             href: https://www.nationaalgeoregister.nl/geonetwork/srv/api/records/a5f961e9-ebdd-41e2-b8e8-ab33ed340a83/formatters/xml
             hreflang: nl
+          - type: text/html
+            rel: about
+            title: Description of the encoding
+            href: https://github.com/INSPIRE-MIF/2017.2/tree/master/GeoJSON/ads
+            hreflang: en
           - type: text/html
             rel: tag
-            title: Reference to the concept Addresses (inspire registry)
-            href: https://inspire.ec.europa.eu/theme/ad
-            hreflang: nl
+            title: INSPIRE feature concept dictionary for addresses
+            href: https://inspire.ec.europa.eu/featureconcept/Address
+            hreflang: en
           - type: application/gml+xml
             rel: enclosure
             title: Download complete dataset as GML
             href: https://service.pdok.nl/kadaster/ad/atom/downloads/addresses.gml.gz
             hreflang: nl
+          - type: text/html
+            rel: license
+            title: CC0 1.0 Public Domain license
+            href: https://creativecommons.org/publicdomain/zero/1.0/deed.en
+            hreflang: en
       extents:
           spatial:
               bbox: [6.85, 53.311, 6.87, 53.322]
@@ -133,19 +143,29 @@ resources:
             hreflang: nl
           - type: application/xml
             rel: describedby
-            title: Metadata as iso19139 xml
+            title: Metadata as ISO 19139 XML
             href: https://www.nationaalgeoregister.nl/geonetwork/srv/api/records/a5f961e9-ebdd-41e2-b8e8-ab33ed340a83/formatters/xml
             hreflang: nl
+          - type: text/html
+            rel: about
+            title: Description of the encoding
+            href: https://github.com/INSPIRE-MIF/2017.2/tree/master/GeoJSON/ads
+            hreflang: en
           - type: text/html
             rel: tag
-            title: Reference to the concept Addresses (inspire registry)
-            href: https://inspire.ec.europa.eu/theme/ad
-            hreflang: nl
+            title: INSPIRE feature concept dictionary for addresses
+            href: https://inspire.ec.europa.eu/featureconcept/Address
+            hreflang: en
           - type: application/gml+xml
             rel: enclosure
             title: Download complete dataset as GML
             href: https://service.pdok.nl/kadaster/ad/atom/downloads/addresses.gml.gz
             hreflang: nl
+          - type: text/html
+            rel: license
+            title: CC0 1.0 Public Domain license
+            href: https://creativecommons.org/publicdomain/zero/1.0/deed.en
+            hreflang: en
       extents:
           spatial:
               bbox: [6.85, 53.311, 6.87, 53.322]
@@ -196,19 +216,24 @@ resources:
               hreflang: nl
             - type: application/xml
               rel: describedby
-              title: Metadata as iso19139 xml
+              title: Metadata as ISO 19139 XML
               href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/45eaae76-874a-4fe1-88f4-820517e3de73/formatters/xml
               hreflang: nl
             - type: text/html
               rel: tag
-              title: Referentie naar het concept beschermde gebieden (inspire registry)
+              title: Reference to the concept Protected Site (INSPIRE registry)
               href: https://inspire.ec.europa.eu/featureconcept/ProtectedSite
               hreflang: nl
             - type: application/gml+xml
               rel: enclosure
-              title: Download volledige dataset Werelderfgoed als GML
+              title: Download complete dataset as GML
               href: https://service.pdok.nl/rce/ps-ch/wfs/v1_0?request=GetFeature&service=WFS&version=1.1.0&typeName=ps-ch:rce_inspire_polygons&outputFormat=text%2Fxml%3B%20subtype%3Dgml%2F3.1.1
               hreflang: nl
+            - type: text/html
+              rel: license
+              title: CC BY 3.0 NL license
+              href: https://creativecommons.org/licenses/by/3.0/nl/deed.en
+              hreflang: en
         extents:
             spatial:
                 bbox: [4.40, 51.76, 5.80, 52.85]
@@ -302,10 +327,31 @@ resources:
             - RD
         links:
             - type: text/html
-              rel: canonical
-              title: information
-              href: https://www.nationaalgeoregister.nl/geonetwork/srv/dut/catalog.search#/metadata/291afe4b-4f4b-497c-8026-fb437c4e9c7e
-              hreflang: nl-NL
+              rel: describedby
+              title: Metadata as HTML
+              href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/291afe4b-4f4b-497c-8026-fb437c4e9c7e
+              hreflang: nl
+            - type: application/xml
+              rel: describedby
+              title: Metadata as ISO 19139 XML
+              href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/291afe4b-4f4b-497c-8026-fb437c4e9c7e/formatters/xml
+              hreflang: nl
+            - type: text/html
+              rel: tag
+              title: Reference to the concept Protected Site (INSPIRE registry)
+              href: https://inspire.ec.europa.eu/featureconcept/ProtectedSite
+              hreflang: nl
+            - type: application/gml+xml
+              rel: enclosure
+              title: Download complete dataset as GML
+              href: https://services.rce.geovoorziening.nl/landschapsatlas/wfs?request=GetFeature&typeName=landschapsatlas:Molens
+              hreflang: nl
+              length: 3012614
+            - type: text/html
+              rel: license
+              title: Public Domain Mark 1.0 license
+              href: https://creativecommons.org/publicdomain/mark/1.0/deed.en
+              hreflang: en
         extents:
             spatial:
                 bbox: [3.37,50.75,7.21,53.47]
@@ -352,28 +398,35 @@ resources:
         description: In deze dataset zijn de begrenzingen opgenomen van Nederlandse Gemeenten uit 2018. De gegevens in de dataset zijn conform INSPIRE geharmoniseerd.
         keywords:
             - statistiek
+            - statistics
             - Gemeenten
         links:
             - type: text/html
               rel: describedby
               title: Metadata as HTML
-              href: https://www.nationaalgeoregister.nl/geonetwork/srv/dut/catalog.search#/metadata/10d1153e-778f-4995-9b6c-7c69b196cccb
+              href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/10d1153e-778f-4995-9b6c-7c69b196cccb
               hreflang: nl
             - type: application/xml
               rel: describedby
-              title: Metadata as iso19139 xml
+              title: Metadata as ISO 19139 XML
               href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/10d1153e-778f-4995-9b6c-7c69b196cccb/formatters/xml
               hreflang: nl
             - type: text/html
               rel: tag
-              title: Referentie naar het concept statistische eenheden (inspire registry)
+              title: Reference to the concept Statistical Unit (INSPIRE registry)
               href: https://inspire.ec.europa.eu/featureconcept/VectorStatisticalUnit
               hreflang: nl
             - type: application/gml+xml
               rel: enclosure
-              title: Download volledige dataset als GML
-              href: https://geodata.nationaalgeoregister.nl/su-vector/wfs?request=GetFeature&version=2.0.0&typeNames=su-vector:SU.VectorStatisticalUnit&filter=%3CFilter+xmlns=%22https://www.opengis.net/ogc%22%3E%3CPropertyIsEqualTo%3E%3CPropertyName%3Etessellation_localid%3C/PropertyName%3E%3CLiteral%3Egemeente.2018%3C/Literal%3E%3C/PropertyIsEqualTo%3E%3C/Filter%3E
+              title: Download complete dataset as GML
+              href: https://geodata.nationaalgeoregister.nl/su-vector/wfs?request=GetFeature&version=2.0.0&typeNames=su-vector:SU.VectorStatisticalUnit&filter=%3CFilter+xmlns=%22http://www.opengis.net/ogc%22%3E%3CPropertyIsEqualTo%3E%3CPropertyName%3Etessellation_localid%3C/PropertyName%3E%3CLiteral%3Egemeente.2018%3C/Literal%3E%3C/PropertyIsEqualTo%3E%3C/Filter%3E
               hreflang: nl
+              length: 1314056
+            - type: text/html
+              rel: license
+              title: CC BY 4.0 International license
+              href: https://creativecommons.org/licenses/by/4.0/deed.en
+              hreflang: en
         extents:
             spatial:
                 bbox: [3.10, 50.50, 7.60, 53.80]
@@ -421,23 +474,29 @@ resources:
             - type: text/html
               rel: describedby
               title: Metadata as HTML
-              href: https://www.nationaalgeoregister.nl/geonetwork/srv/dut/catalog.search#/metadata/10d1153e-778f-4995-9b6c-7c69b196cccb
+              href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/10d1153e-778f-4995-9b6c-7c69b196cccb
               hreflang: nl
             - type: application/xml
               rel: describedby
-              title: Metadata as iso19139 xml
+              title: Metadata as ISO 19139 XML
               href: https://www.nationaalgeoregister.nl/geonetwork/srv/metadata/10d1153e-778f-4995-9b6c-7c69b196cccb/formatters/xml
               hreflang: nl
             - type: text/html
               rel: tag
-              title: Referentie naar het concept statistische eenheden (inspire registry)
+              title: Reference to the concept Statistical Unit (INSPIRE registry)
               href: https://inspire.ec.europa.eu/featureconcept/VectorStatisticalUnit
               hreflang: nl
             - type: application/gml+xml
               rel: enclosure
-              title: Download volledige dataset als GML
+              title: Download complete dataset as GML
               href: https://geodata.nationaalgeoregister.nl/su-vector/wfs?request=GetFeature&version=2.0.0&typeNames=su-vector:SU.VectorStatisticalUnit&CQL_FILTER=tessellation_localid=%27gemeente.2017%27
               hreflang: nl
+              length: 1338695
+            - type: text/html
+              rel: license
+              title: CC BY 4.0 International license
+              href: https://creativecommons.org/licenses/by/4.0/deed.en
+              hreflang: en
         extents:
             spatial:
                 bbox: [3.10, 50.50, 7.60, 53.80]
