Skip to content

Snelle fix voor versienummers tabellen. Moet later voor alles gebeuren. #686

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
Doldenburgamsterdam merged 1 commit into from
Oct 2, 2025
Merged

Snelle fix voor versienummers tabellen. Moet later voor alles gebeuren. #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions afval.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ MAP
NAME "container_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -108,7 +108,7 @@ MAP
NAME "gfe_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'GFT' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -171,7 +171,7 @@ MAP
NAME "kca_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'KCA' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -237,7 +237,7 @@ MAP
NAME "textiel_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=4326 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=4326 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Textiel' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -301,7 +301,7 @@ MAP
NAME "papier_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Papier' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -364,7 +364,7 @@ MAP
NAME "glas_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Glas' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -428,7 +428,7 @@ MAP
NAME "plastic_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Plastic' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -492,7 +492,7 @@ MAP
NAME "rest_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Rest' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -555,7 +555,7 @@ MAP
NAME "brood_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Brood' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -618,7 +618,7 @@ MAP
NAME "PMD_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'PMD' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -681,7 +681,7 @@ MAP
NAME "grof_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'Grof' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -744,7 +744,7 @@ MAP
NAME "onbekend_coordinaten"
GROUP "afvalcontainers"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id"
FILTER ([fractie_omschrijving] = 'onbekend' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down
4 changes: 2 additions & 2 deletions gen_huishoudelijkafvalv2.py.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ with block("MAP"):

p("INCLUDE", "connection/dataservices.inc")
if layer["name"] == 'onbekend_coordinaten':
p("DATA", f"geometrie FROM (select * FROM public.huishoudelijkafval_container where fractie_omschrijving is null and status = 1) as subquery USING srid=28992 USING UNIQUE id")
p("DATA", f"geometrie FROM (select * FROM public.huishoudelijkafval_container_v2 where fractie_omschrijving is null and status = 1) as subquery USING srid=28992 USING UNIQUE id")
else:
p("DATA", f"geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id")
p("DATA", f"geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id")
print(f"FILTER ({layer['filter']})")
p("TYPE POINT")
p("MINSCALEDENOM", 10)
Expand Down
14 changes: 7 additions & 7 deletions huishoudelijkafvalv2.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MAP
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id'
FILTER ([fractie_omschrijving] = 'GFT' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -67,7 +67,7 @@ FILTER ([fractie_omschrijving] = 'GFT' AND [status] = 1)
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id'
FILTER ([fractie_omschrijving] = 'Textiel' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -107,7 +107,7 @@ FILTER ([fractie_omschrijving] = 'Textiel' AND [status] = 1)
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id'
FILTER ([fractie_omschrijving] = 'Papier' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -147,7 +147,7 @@ FILTER ([fractie_omschrijving] = 'Papier' AND [status] = 1)
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id'
FILTER ([fractie_omschrijving] = 'Glas' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -187,7 +187,7 @@ FILTER ([fractie_omschrijving] = 'Glas' AND [status] = 1)
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id'
FILTER ([fractie_omschrijving] = 'Rest' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -227,7 +227,7 @@ FILTER ([fractie_omschrijving] = 'Rest' AND [status] = 1)
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM public.huishoudelijkafval_container USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM public.huishoudelijkafval_container_v2 USING srid=28992 USING UNIQUE id'
FILTER ([fractie_omschrijving] = 'Brood' AND [status] = 1)
TYPE POINT
MINSCALEDENOM 10
Expand Down Expand Up @@ -267,7 +267,7 @@ FILTER ([fractie_omschrijving] = 'Brood' AND [status] = 1)
'init=epsg:28992'
END
INCLUDE 'connection/dataservices.inc'
DATA 'geometrie FROM (select * FROM public.huishoudelijkafval_container where fractie_omschrijving is null and status = 1) as subquery USING srid=28992 USING UNIQUE id'
DATA 'geometrie FROM (select * FROM public.huishoudelijkafval_container_v2 where fractie_omschrijving is null and status = 1) as subquery USING srid=28992 USING UNIQUE id'
TYPE POINT
MINSCALEDENOM 10
MAXSCALEDENOM 400000
Expand Down
2 changes: 1 addition & 1 deletion ondergrond.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MAP
LAYER
NAME "historische_onderzoeken"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM ondergrond_historischeonderzoeken USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.historische_bodeminformatie_onderzoeken_v1 USING srid=28992 USING UNIQUE id"
PROCESSING "CLOSE_CONNECTION=DEFER" # Use the same connection for all queried layers because they reside in the same db
TYPE POLYGON
MINSCALEDENOM 10
Expand Down
2 changes: 1 addition & 1 deletion private/ondergrond.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MAP
LAYER
NAME "historische_onderzoeken"
INCLUDE "connection/dataservices.inc"
DATA "geometrie FROM ondergrond_historischeonderzoeken USING srid=28992 USING UNIQUE id"
DATA "geometrie FROM public.historische_bodeminformatie_onderzoeken_v1 USING srid=28992 USING UNIQUE id"
PROCESSING "CLOSE_CONNECTION=DEFER" # Use the same connection for all queried layers because they reside in the same db
TYPE POLYGON
MINSCALEDENOM 10
Expand Down