Skip to content

Ergu/team aanpassing #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ekesgin merged 12 commits into from
Mar 24, 2026
Merged

Ergu/team aanpassing #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bbbb295
nieuw layer en python script aangepast
ekesgin Mar 10, 2026
549b244
overlastgebied terug naar oorspronkelijke stand.
ekesgin Mar 10, 2026
fda8267
gen_overlastgenbieden.py aangepastpython
ekesgin Mar 10, 2026
8923bc0
Update gen_overlastgebieden.py
ekesgin Mar 10, 2026
3bd16b5
python script en mapfile aangepast
ekesgin Mar 10, 2026
0606ca5
Merge branch 'ergu/bedelverbod' of github.com:Amsterdam/mapserver int…
ekesgin Mar 10, 2026
c606291
pythonscript aangepast
ekesgin Mar 12, 2026
2f0ad2d
Merge github.com:Amsterdam/mapserver into ergu/bedelverbod
ekesgin Mar 16, 2026
3a85f2b
team namen gecorrigeerd
ekesgin Mar 16, 2026
a2f9ff4
tabellen naar de juiste tabellen met versie aanduiding verwezen
ekesgin Mar 17, 2026
693a8ce
gen_huishoudelijkafvalservicegebieden.py aangepast
ekesgin Mar 17, 2026
c0aebae
branch naam gewijzigd
ekesgin Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion adresseerbare_objecten.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAP
INCLUDE "header.inc"
WEB
METADATA
"team" "SOEB"
"team" "BENK"
"ows_title" "adresseerbare_objecten"
"ows_abstract" "adresseerbare_objecten"
END
Expand Down
2 changes: 1 addition & 1 deletion eigendommen_v2.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAP
INCLUDE "header.inc"
WEB
METADATA
"team" "BOR"
"team" "BENK"
"ows_title" "Eigendommen"
"ows_abstract" "Eigendommen"
"ows_onlineresource" "MAP_URL_REPLACE/maps/eigendommen_v2"
Expand Down
26 changes: 13 additions & 13 deletions energie.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Markt'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -75,7 +75,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Markt'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -119,7 +119,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Markt'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -163,7 +163,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Markt'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -206,7 +206,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Evenement'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -250,7 +250,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Evenement'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -294,7 +294,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Evenement'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -338,7 +338,7 @@ MAP
TYPE POINT
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
SELECT * FROM public.bouwstroompunten_bouwstroompunten
SELECT * FROM public.bouwstroompunten_bouwstroompunten_v1
WHERE primaire_functie = 'Evenement'
) AS sub
USING srid=28992 USING UNIQUE id"
Expand Down Expand Up @@ -384,7 +384,7 @@ MAP
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
select *
from public.bouwstroompunten_bouwstroompunten
from public.bouwstroompunten_bouwstroompunten_v1
where primaire_functie = 'Bouw'
) as subquery USING srid=28992 USING UNIQUE id"
FILTER ([capaciteit] = '{3 x 80 A}' or [capaciteit] = '{3 x 160 A}' or [capaciteit] = '{3 x 250 A}')
Expand Down Expand Up @@ -428,7 +428,7 @@ MAP
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
select *
from public.bouwstroompunten_bouwstroompunten
from public.bouwstroompunten_bouwstroompunten_v1
where primaire_functie = 'Bouw'
) as subquery USING srid=28992 USING UNIQUE id"
FILTER ([capaciteit] = '{3 x 50 A}' or [capaciteit] = '{3 x 63 A}')
Expand Down Expand Up @@ -472,7 +472,7 @@ MAP
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
select *
from public.bouwstroompunten_bouwstroompunten
from public.bouwstroompunten_bouwstroompunten_v1
where primaire_functie = 'Bouw'
) as subquery USING srid=28992 USING UNIQUE id"
FILTER ([capaciteit] = '{3 x 35 A}' or [capaciteit] = '{3 x 40 A}')
Expand Down Expand Up @@ -516,7 +516,7 @@ MAP
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
select *
from public.bouwstroompunten_bouwstroompunten
from public.bouwstroompunten_bouwstroompunten_v1
where primaire_functie = 'Bouw'
) as subquery USING srid=28992 USING UNIQUE id"
FILTER ([capaciteit] = '{1 x 10 A}' or [capaciteit] = '{3 x 25 A}')
Expand Down Expand Up @@ -561,7 +561,7 @@ MAP
INCLUDE "connection/dataservices.inc"
DATA "geometry FROM (
select *
from public.bouwstroompunten_bouwstroompunten
from public.bouwstroompunten_bouwstroompunten_v1
where capaciteit[1] is null
) as subquery USING srid=28992 USING UNIQUE id"
TEMPLATE "fooOnlyForWMSGetFeatureInfo.html"
Expand Down
2 changes: 1 addition & 1 deletion gemeentelijk_vastgoed.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MAP

WEB
METADATA
"team" "BENK"
"team" "SOEB"
"ows_title" "Gemeentelijk Vastgoed"
"ows_abstract" "Vastgoed van de Gemeente Amsterdam"
"wms_extent" "100000 450000 150000 500000"
Expand Down
4 changes: 2 additions & 2 deletions gen_huishoudelijkafvalservicegebieden.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def slugify(s: str) -> str:
if group == 'Servicegebieden':

with block("LAYER"):
sql = f"geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden where fractie_omschrijving = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id"
sql = f"geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_v1 where fractie_omschrijving = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id"


layer_name_slug = slugify(layer_name)
Expand Down Expand Up @@ -90,7 +90,7 @@ def slugify(s: str) -> str:
if group == 'Servicegebiedenlocatie':

with block("LAYER"):
sql = f"geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie where cluster_fractie_omschrijving = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id"
sql = f"geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie_v1 where cluster_fractie_omschrijving = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id"


layer_name_slug = slugify(layer_name)
Expand Down
2 changes: 1 addition & 1 deletion gen_huishoudelijkafvalv2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def slugify(s: str) -> str:
q("init=epsg:28992")

p("INCLUDE", "connection/dataservices.inc")
p("DATA", "geometrie FROM (SELECT bol.id, bol.geometrie, bol.fractie_omschrijving, lac.loopafstand_categorie_omschrijving FROM public.huishoudelijkafval_bag_object_loopafstand_v2 bol INNER JOIN public.huishoudelijkafval_loopafstand_categorie_v2 lac ON bol.loopafstand_categorie_id = lac.id WHERE 1=1) rest USING srid=28992 USING UNIQUE id")
p("DATA", "geometrie FROM (SELECT bol.id, bol.geometrie, bol.fractie_omschrijving, lac.loopafstand_categorie_omschrijving FROM public.huishoudelijkafval_bag_object_loopafstand_v2_v2 bol INNER JOIN public.huishoudelijkafval_loopafstand_categorie_v2_v2 lac ON bol.loopafstand_categorie_id = lac.id WHERE 1=1) rest USING srid=28992 USING UNIQUE id")
print(f"FILTER ({layer['filter']} AND {range['expression']})")
p("TYPE POLYGON")
p("MINSCALEDENOM", 10)
Expand Down
2 changes: 1 addition & 1 deletion gen_ziektenplagenexotengroen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def slugify(s: str) -> str:
"geometrie FROM"
# This subquery appears to do nothing, but it actually restricts
# the fields that mapserver sees.
" (SELECT id, geometrie, urgentie_status_kaartlaag FROM public.ziekte_plagen_exoten_groen_eikenprocessierups WHERE ranking=1) AS sub"
" (SELECT id, geometrie, urgentie_status_kaartlaag FROM public.ziekte_plagen_exoten_groen_eikenprocessierups_v1 WHERE ranking=1) AS sub"
" USING srid=28992 USING UNIQUE id"
)
p("TYPE POINT")
Expand Down
20 changes: 10 additions & 10 deletions huishoudelijkafvalservicegebieden.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MAP
LAYER
NAME 'servicegebieden_rest'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden where fractie_omschrijving = 'Rest') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_v1 where fractie_omschrijving = 'Rest') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebieden'
TYPE POLYGON
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -135,7 +135,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebieden_glas'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden where fractie_omschrijving = 'Glas') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_v1 where fractie_omschrijving = 'Glas') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebieden'
TYPE POLYGON
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -258,7 +258,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebieden_papier'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden where fractie_omschrijving = 'Papier') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_v1 where fractie_omschrijving = 'Papier') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebieden'
TYPE POLYGON
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -381,7 +381,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebieden_textiel'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden where fractie_omschrijving = 'Textiel') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_v1 where fractie_omschrijving = 'Textiel') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebieden'
TYPE POLYGON
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -504,7 +504,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebieden_gft'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden where fractie_omschrijving = 'GFT') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(servicegebieden_locatie_id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_v1 where fractie_omschrijving = 'GFT') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebieden'
TYPE POLYGON
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -627,7 +627,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebiedenlocatie_rest'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie where cluster_fractie_omschrijving = 'Rest') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie_v1 where cluster_fractie_omschrijving = 'Rest') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebiedenlocatie'
TYPE POINT
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -891,7 +891,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebiedenlocatie_glas'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie where cluster_fractie_omschrijving = 'Glas') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie_v1 where cluster_fractie_omschrijving = 'Glas') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebiedenlocatie'
TYPE POINT
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -1155,7 +1155,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebiedenlocatie_papier'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie where cluster_fractie_omschrijving = 'Papier') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie_v1 where cluster_fractie_omschrijving = 'Papier') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebiedenlocatie'
TYPE POINT
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -1419,7 +1419,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebiedenlocatie_textiel'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie where cluster_fractie_omschrijving = 'Textiel') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie_v1 where cluster_fractie_omschrijving = 'Textiel') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebiedenlocatie'
TYPE POINT
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down Expand Up @@ -1683,7 +1683,7 @@ EXPRESSION ("[last_numeric_digit]" eq "9")
LAYER
NAME 'servicegebiedenlocatie_gft'
INCLUDE 'connection/dataservices.inc'
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie where cluster_fractie_omschrijving = 'GFT') as subquery USING srid=28992 USING UNIQUE id"
DATA "geometrie from (SELECT *, (regexp_matches(id, '[0-9](?!.*[0-9])'))[1] AS last_numeric_digit FROM huishoudelijkafval_servicegebieden_locatie_v1 where cluster_fractie_omschrijving = 'GFT') as subquery USING srid=28992 USING UNIQUE id"
GROUP 'servicegebiedenlocatie'
TYPE POINT
TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html'
Expand Down
Loading
Loading