Merge branch 'main' into do/versie_update_fix

Author: Doldenburgamsterdam

.github/workflows/dependabot.yml

@@ -0,0 +1,21 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/src" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    groups:
+      pip-minor-and-patch:
+        applies-to: version-updates
+        update-types:
+        - "minor"
+        - "patch"
+  - package-ecosystem: "docker" # See documentation for possible values
+    directory: "/src" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/pre-commit.yml

@@ -0,0 +1,22 @@
+name: pre-commit
+
+on:
+  push:
+    branches:
+    - features/**
+  pull_request:
+    branches:
+    - main
+    - master
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'  # matches what .pre-commit-config.yaml has
+    - uses: pre-commit/action@v3.0.1
+      with:
+          extra_args: --files ${{ steps.file_changes.outputs.files}}

.github/workflows/trigger-ado-deploy.yml

@@ -21,4 +21,4 @@ jobs:
             organisation: ${{ secrets.AZURE_DEVOPS_ORG }}
             project: ${{ secrets.AZURE_DEVOPS_PROJECT }}
             pat-token: ${{ secrets.AZURE_DEVOPS_TOKEN }}
-            template-params: '{"environments": "- dev\n- prd", "branch": "main", "includeApp": "private", "akscluster": "blue"}'
+            template-params: '{"environments": "- dev\n- acc\n- prd", "branch": "main", "includeApp": "private", "akscluster": "blue"}'

.gitignore

@@ -6,6 +6,7 @@ docker-compose.override.y*ml
 sld/config.json
 __pycache__
 .env
+venv
 .vscode
 index.json
 tmpdata/

.pre-commit-config.yaml

@@ -0,0 +1,50 @@
+# File format: https://pre-commit.com/#plugins
+# Supported hooks: https://pre-commit.com/hooks.html
+# Running "make format" fixes most issues for you
+default_language_version:
+  python: python3.13
+repos:
+  - repo: local
+    hooks:
+      - id: validate-maps
+        name: validate maps
+        entry: mappyfile validate
+        language: python
+        types: [ map ]
+        pass_filenames: true
+        args:
+          - --no-expand
+          - --version=7.6
+  - repo: local
+    hooks:
+      - id: check_ows_onlineresource_url
+        name: check ows_onlineresource url
+        entry: python3 tools/check_ows_onlineresource_url.py
+        language: python
+        additional_dependencies: [mappyfile]
+        types: [ map ]
+        pass_filenames: true
+  - repo: local
+    hooks:
+      - id: format-maps
+        name: check mapfile formatting
+        entry: python3 tools/check_map_formatting.py
+        language: python
+        additional_dependencies: [mappyfile]
+        types: [ map ]
+        pass_filenames: true
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-merge-conflict
+      - id: check-illegal-windows-names
+      - id: check-json
+      - id: check-toml
+      - id: check-yaml
+        args:
+          - --unsafe
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+        args:
+          - --markdown-linebreak-ext=md

Dockerfile

@@ -13,6 +13,8 @@ RUN apt-get update -y \
         wget \
     && apt-get clean
 
+
+RUN python3 -m pip install --upgrade pip setuptools
 # Enable these Apache modules
 RUN a2enmod actions cgid headers rewrite
 

Dockerfile.database

@@ -1,5 +1,5 @@
 # Dockerfile for PostgreSQL in dev environment only.
 
-FROM postgis/postgis:14-3.2
+FROM postgis/postgis:14-3.5
 
 ADD docker/initdb.d/* /docker-entrypoint-initdb.d/

bomen.map

@@ -21,7 +21,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Iep (Ulmus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Iep (Ulmus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -58,7 +58,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Linde (Tilia)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Linde (Tilia)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -95,7 +95,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Esdoorn (Acer)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Esdoorn (Acer)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -132,7 +132,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Es (Fraxinus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Es (Fraxinus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -169,7 +169,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Plataan (Platanus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Plataan (Platanus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -206,7 +206,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Eik (Quercus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Eik (Quercus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -243,7 +243,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Populier (Populus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Populier (Populus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -280,7 +280,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Els (Alnus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Els (Alnus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -317,7 +317,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Wilg (Salix)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Wilg (Salix)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -354,7 +354,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Berk (Betula)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Berk (Betula)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -391,7 +391,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Kers (Prunus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Kers (Prunus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -428,7 +428,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Haagbeuk (Carpinus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Haagbeuk (Carpinus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -465,7 +465,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Meidoorn (Crataegus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Meidoorn (Crataegus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -502,7 +502,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Acacia (Robinia)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Acacia (Robinia)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -539,7 +539,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Paardenkastanje (Aesculus)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Paardenkastanje (Aesculus)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -576,7 +576,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Vleugelnoot (Pterocarya)')) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Vleugelnoot (Pterocarya)')) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -613,7 +613,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Onbekend' OR soortnaam_top IS NULL)) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top = 'Onbekend' OR soortnaam_top IS NULL)) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'
@@ -650,7 +650,7 @@ MAP
       'init=epsg:28992'
     END
     INCLUDE 'connection/dataservices.inc'
-    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top != 'Iep (Ulmus)' AND soortnaam_top != 'Linde (Tilia)' AND soortnaam_top != 'Esdoorn (Acer)' AND soortnaam_top != 'Es (Fraxinus)' AND soortnaam_top != 'Plataan (Platanus)' AND soortnaam_top != 'Eik (Quercus)' AND soortnaam_top != 'Populier (Populus)' AND soortnaam_top != 'Els (Alnus)' AND soortnaam_top != 'Wilg (Salix)' AND soortnaam_top != 'Berk (Betula)' AND soortnaam_top != 'Kers (Prunus)' AND soortnaam_top != 'Haagbeuk (Carpinus)' AND soortnaam_top != 'Meidoorn (Crataegus)' AND soortnaam_top != 'Acacia (Robinia)' AND soortnaam_top != 'Paardenkastanje (Aesculus)' AND soortnaam_top != 'Vleugelnoot (Pterocarya)' AND soortnaam_top IS NOT NULL)) AS sub USING srid=28992 USING UNIQUE id"
+    DATA "geometrie FROM (   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1   WHERE type_soortnaam = 'Bomen'  AND (soortnaam_top != 'Iep (Ulmus)' AND soortnaam_top != 'Linde (Tilia)' AND soortnaam_top != 'Esdoorn (Acer)' AND soortnaam_top != 'Es (Fraxinus)' AND soortnaam_top != 'Plataan (Platanus)' AND soortnaam_top != 'Eik (Quercus)' AND soortnaam_top != 'Populier (Populus)' AND soortnaam_top != 'Els (Alnus)' AND soortnaam_top != 'Wilg (Salix)' AND soortnaam_top != 'Berk (Betula)' AND soortnaam_top != 'Kers (Prunus)' AND soortnaam_top != 'Haagbeuk (Carpinus)' AND soortnaam_top != 'Meidoorn (Crataegus)' AND soortnaam_top != 'Acacia (Robinia)' AND soortnaam_top != 'Paardenkastanje (Aesculus)' AND soortnaam_top != 'Vleugelnoot (Pterocarya)' AND soortnaam_top IS NOT NULL)) AS sub USING srid=28992 USING UNIQUE id"
     TYPE POINT
     METADATA
       'wfs_enable_request' '!*'

gemeentelijk_vastgoed.map

@@ -58,7 +58,7 @@ MAP
     END
 
     CLASS
-      NAME          "Gebouwobjecten Volle eigendom"
+      NAME          "Volle eigendom"
 
       STYLE
           ANTIALIAS    true
@@ -113,7 +113,7 @@ MAP
     END
 
     CLASS
-      NAME          "Gebouwobjecten Appartementsrechten"
+      NAME          "Appartementsrechten"
 
       STYLE
           ANTIALIAS    true
@@ -127,4 +127,4 @@ MAP
       END
     END
   END
-END
+END

gen_bomen.py

@@ -63,7 +63,7 @@
             p(
                 "DATA",
                 "geometrie FROM ("
-                "   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens"
+                "   SELECT id, geometrie, soortnaam_top FROM public.bomen_stamgegevens_v1"
                 "   WHERE type_soortnaam = 'Bomen'"
                 f"  AND ({select_soort})"
                 ") AS sub"