From c4237c0ba4b504c84da3134ab3750fc899b016a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BC?= Date: Fri, 20 Mar 2026 14:03:20 +0100 Subject: [PATCH 1/3] de tabellen naar de juiste versies verwezen --- hoofdroutes.map | 6 ++--- milieuzonesenuitstootvrijezonesverkeer.map | 12 +++++----- parkeervakken.map | 26 +++++++++++----------- private/blackspots.map | 2 +- touringcars.map | 12 +++++----- water.map | 4 ++-- wegenbestand.map | 10 ++++----- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/hoofdroutes.map b/hoofdroutes.map index ce46d196..bfc8491a 100644 --- a/hoofdroutes.map +++ b/hoofdroutes.map @@ -28,7 +28,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.hoofdroutes_routes_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.hoofdroutes_routes_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -71,7 +71,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.hoofdroutes_tunnels_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.hoofdroutes_tunnels_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -127,7 +127,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.hoofdroutes_u_routes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.hoofdroutes_u_routes_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/milieuzonesenuitstootvrijezonesverkeer.map b/milieuzonesenuitstootvrijezonesverkeer.map index 908db56b..c73f5dd2 100644 --- a/milieuzonesenuitstootvrijezonesverkeer.map +++ b/milieuzonesenuitstootvrijezonesverkeer.map @@ -16,7 +16,7 @@ MAP NAME "milieuzone_personenauto" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_personenauto USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_personenauto_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -56,7 +56,7 @@ MAP NAME "milieuzone_touringcar" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_touringcar USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_touringcar_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -96,7 +96,7 @@ MAP NAME "milieuzone_taxi" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_taxi USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_taxi_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -136,7 +136,7 @@ MAP NAME "milieuzone_vrachtenbestelauto" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_vracht_en_bestelauto USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_vracht_en_bestelauto_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -176,7 +176,7 @@ MAP NAME "uitstootvrijezone_bromensnorfietsen" GROUP "uitstootvrijezones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.uitstootvrije_zones_brom_en_snorfiets USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.uitstootvrije_zones_brom_en_snorfiets_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -216,7 +216,7 @@ MAP NAME "uitstootvrijezone_vrachtenbestelauto" GROUP "uitstootvrijezones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.uitstootvrije_zones_vracht_en_bestelauto USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.uitstootvrije_zones_vracht_en_bestelauto_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION diff --git a/parkeervakken.map b/parkeervakken.map index 47410216..35b6d48f 100644 --- a/parkeervakken.map +++ b/parkeervakken.map @@ -42,7 +42,7 @@ MAP NAME "parkeervakken_tijdvakken_taxistandplaats" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -175,7 +175,7 @@ MAP NAME "parkeervakken_tijdvakken_laden_lossen" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -306,7 +306,7 @@ MAP NAME "parkeervakken_tijdvakken_kiss_ride" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -438,7 +438,7 @@ MAP NAME "parkeervakken_tijdvakken_vrachtwagens" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -571,7 +571,7 @@ MAP NAME "alle_parkeervakken" GROUP "parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 100 MAXSCALEDENOM 425001 @@ -615,7 +615,7 @@ MAP NAME "parkeervakken_label" GROUP "parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 100 MAXSCALEDENOM 401 @@ -653,8 +653,8 @@ MAP NAME "parkeervakken_bord" GROUP "parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken - join (select parent_id, string_agg(bord, ',') as bord from parkeervakken_parkeervakken_regimes + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 + join (select parent_id, string_agg(bord, ',') as bord from parkeervakken_parkeervakken_regimes_v1 where e_type <> 'E6b' and bord is not null and bord <> '' group by parent_id) pvr on ID = pvr.parent_id USING srid=28992 USING UNIQUE id" TYPE POLYGON @@ -711,11 +711,11 @@ MAP 'categorie' '^[0-9a-z_,]{1,256}$' END - DATA "geometry FROM public.parkeervakken_parkeervakken pv + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 pv join (select parent_id , string_agg(nullif(opmerking, ''), ',') as opmerkingen , string_agg(nullif(bord, ''), ',') as bord - from parkeervakken_parkeervakken_regimes pvr + from parkeervakken_parkeervakken_regimes_v1 pvr where (pvr.begin_datum is not null and current_date between pvr.begin_datum and pvr.eind_datum) or (pvr.begin_datum is null and nullif(pvr.e_type,'') is not null) group by parent_id) pvr1 @@ -937,7 +937,7 @@ MAP NAME "fiscaal_parkeervakken" GROUP "fiscaalparkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -984,7 +984,7 @@ MAP NAME "nietfiscaal_parkeervakken" GROUP "nietfiscaalparkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -1032,7 +1032,7 @@ MAP NAME "embed_parkeervakken_label" GROUP "embed_parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION diff --git a/private/blackspots.map b/private/blackspots.map index a3fadbde..0e8461f1 100644 --- a/private/blackspots.map +++ b/private/blackspots.map @@ -19,7 +19,7 @@ MAP LAYER NAME "blackspots" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.blackspots_blackspots USING srid=4326 USING UNIQUE id" + DATA "geometry FROM public.blackspots_blackspots_v1 USING srid=4326 USING UNIQUE id" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 400001 diff --git a/touringcars.map b/touringcars.map index 8f151e54..c2ac093b 100644 --- a/touringcars.map +++ b/touringcars.map @@ -32,7 +32,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_doorrijhoogtes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_doorrijhoogtes_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -90,7 +90,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_wegwerkzaamheden USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_wegwerkzaamheden_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -152,7 +152,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_parkeerplaatsen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_parkeerplaatsen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -213,7 +213,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_haltes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_haltes_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -274,7 +274,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_aanbevolenroutes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_aanbevolenroutes_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -342,7 +342,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_verplichteroutes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_verplichteroutes_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/water.map b/water.map index 39bcd280..861f2b61 100644 --- a/water.map +++ b/water.map @@ -17,7 +17,7 @@ MAP NAME "binnenwater" GROUP "water" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.water_binnenwater USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.water_binnenwater_v3 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -55,7 +55,7 @@ MAP NAME "uitstootvrije_zone_pleziervaart" GROUP "water" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.water_uitstootvrije_zone_pleziervaart USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.water_uitstootvrije_zone_pleziervaar_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION diff --git a/wegenbestand.map b/wegenbestand.map index 4ae5e457..3b1530fd 100644 --- a/wegenbestand.map +++ b/wegenbestand.map @@ -28,7 +28,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_binnen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_binnen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -75,7 +75,7 @@ MAP INCLUDE "connection/dataservices.inc" # mapserver treats in the `EXPRESSION` clause on the `CLASS` NULL values as integer zero. In this case we do not want that # and translate NULL values to an integer of 4 (or more). Hence the `COALESCE` in the `DATA` query below. - DATA "geometry FROM (SELECT *, COALESCE(weg_functie, 4) weg_functie_null_trans FROM public.wegenbestand_zone_zwaar_verkeer_buiten) as SUBQUERY USING srid=28992 USING UNIQUE id" + DATA "geometry FROM (SELECT *, COALESCE(weg_functie, 4) weg_functie_null_trans FROM public.wegenbestand_zone_zwaar_verkeer_buiten_v1) as SUBQUERY USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -134,7 +134,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_breed_opgezette_wegen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_breed_opgezette_wegen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -180,7 +180,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_routes_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_routes_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -225,7 +225,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_tunnels_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_tunnels_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 From 8c3d8ee8f7f999b9f461a3dff7460cfde7a1a18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BC?= Date: Fri, 20 Mar 2026 14:03:20 +0100 Subject: [PATCH 2/3] de tabellen naar de juiste versies verwezen --- hoofdroutes.map | 6 ++--- milieuzonesenuitstootvrijezonesverkeer.map | 12 +++++----- parkeervakken.map | 26 +++++++++++----------- private/blackspots.map | 2 +- touringcars.map | 12 +++++----- water.map | 4 ++-- wegenbestand.map | 10 ++++----- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/hoofdroutes.map b/hoofdroutes.map index ce46d196..bfc8491a 100644 --- a/hoofdroutes.map +++ b/hoofdroutes.map @@ -28,7 +28,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.hoofdroutes_routes_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.hoofdroutes_routes_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -71,7 +71,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.hoofdroutes_tunnels_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.hoofdroutes_tunnels_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -127,7 +127,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.hoofdroutes_u_routes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.hoofdroutes_u_routes_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/milieuzonesenuitstootvrijezonesverkeer.map b/milieuzonesenuitstootvrijezonesverkeer.map index 908db56b..c73f5dd2 100644 --- a/milieuzonesenuitstootvrijezonesverkeer.map +++ b/milieuzonesenuitstootvrijezonesverkeer.map @@ -16,7 +16,7 @@ MAP NAME "milieuzone_personenauto" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_personenauto USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_personenauto_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -56,7 +56,7 @@ MAP NAME "milieuzone_touringcar" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_touringcar USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_touringcar_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -96,7 +96,7 @@ MAP NAME "milieuzone_taxi" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_taxi USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_taxi_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -136,7 +136,7 @@ MAP NAME "milieuzone_vrachtenbestelauto" GROUP "milieuzones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.milieuzones_2025_vracht_en_bestelauto USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.milieuzones_2025_vracht_en_bestelauto_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -176,7 +176,7 @@ MAP NAME "uitstootvrijezone_bromensnorfietsen" GROUP "uitstootvrijezones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.uitstootvrije_zones_brom_en_snorfiets USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.uitstootvrije_zones_brom_en_snorfiets_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -216,7 +216,7 @@ MAP NAME "uitstootvrijezone_vrachtenbestelauto" GROUP "uitstootvrijezones" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.uitstootvrije_zones_vracht_en_bestelauto USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.uitstootvrije_zones_vracht_en_bestelauto_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION diff --git a/parkeervakken.map b/parkeervakken.map index 47410216..35b6d48f 100644 --- a/parkeervakken.map +++ b/parkeervakken.map @@ -42,7 +42,7 @@ MAP NAME "parkeervakken_tijdvakken_taxistandplaats" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -175,7 +175,7 @@ MAP NAME "parkeervakken_tijdvakken_laden_lossen" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -306,7 +306,7 @@ MAP NAME "parkeervakken_tijdvakken_kiss_ride" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -438,7 +438,7 @@ MAP NAME "parkeervakken_tijdvakken_vrachtwagens" GROUP "regimes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes) pvr on ID = pvr.parent_id + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 inner join (select begin_tijd, eind_tijd, parent_id, bord from parkeervakken_parkeervakken_regimes_v1) pvr on ID = pvr.parent_id inner join ( select '00:00:00_06:59:00' as tijdvak union @@ -571,7 +571,7 @@ MAP NAME "alle_parkeervakken" GROUP "parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 100 MAXSCALEDENOM 425001 @@ -615,7 +615,7 @@ MAP NAME "parkeervakken_label" GROUP "parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 100 MAXSCALEDENOM 401 @@ -653,8 +653,8 @@ MAP NAME "parkeervakken_bord" GROUP "parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken - join (select parent_id, string_agg(bord, ',') as bord from parkeervakken_parkeervakken_regimes + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 + join (select parent_id, string_agg(bord, ',') as bord from parkeervakken_parkeervakken_regimes_v1 where e_type <> 'E6b' and bord is not null and bord <> '' group by parent_id) pvr on ID = pvr.parent_id USING srid=28992 USING UNIQUE id" TYPE POLYGON @@ -711,11 +711,11 @@ MAP 'categorie' '^[0-9a-z_,]{1,256}$' END - DATA "geometry FROM public.parkeervakken_parkeervakken pv + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 pv join (select parent_id , string_agg(nullif(opmerking, ''), ',') as opmerkingen , string_agg(nullif(bord, ''), ',') as bord - from parkeervakken_parkeervakken_regimes pvr + from parkeervakken_parkeervakken_regimes_v1 pvr where (pvr.begin_datum is not null and current_date between pvr.begin_datum and pvr.eind_datum) or (pvr.begin_datum is null and nullif(pvr.e_type,'') is not null) group by parent_id) pvr1 @@ -937,7 +937,7 @@ MAP NAME "fiscaal_parkeervakken" GROUP "fiscaalparkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -984,7 +984,7 @@ MAP NAME "nietfiscaal_parkeervakken" GROUP "nietfiscaalparkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -1032,7 +1032,7 @@ MAP NAME "embed_parkeervakken_label" GROUP "embed_parkeervakken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.parkeervakken_parkeervakken USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.parkeervakken_parkeervakken_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION diff --git a/private/blackspots.map b/private/blackspots.map index a3fadbde..0e8461f1 100644 --- a/private/blackspots.map +++ b/private/blackspots.map @@ -19,7 +19,7 @@ MAP LAYER NAME "blackspots" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.blackspots_blackspots USING srid=4326 USING UNIQUE id" + DATA "geometry FROM public.blackspots_blackspots_v1 USING srid=4326 USING UNIQUE id" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 400001 diff --git a/touringcars.map b/touringcars.map index 8f151e54..c2ac093b 100644 --- a/touringcars.map +++ b/touringcars.map @@ -32,7 +32,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_doorrijhoogtes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_doorrijhoogtes_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -90,7 +90,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_wegwerkzaamheden USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_wegwerkzaamheden_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -152,7 +152,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_parkeerplaatsen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_parkeerplaatsen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -213,7 +213,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_haltes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_haltes_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -274,7 +274,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_aanbevolenroutes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_aanbevolenroutes_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -342,7 +342,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.touringcars_verplichteroutes USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.touringcars_verplichteroutes_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/water.map b/water.map index 39bcd280..861f2b61 100644 --- a/water.map +++ b/water.map @@ -17,7 +17,7 @@ MAP NAME "binnenwater" GROUP "water" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.water_binnenwater USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.water_binnenwater_v3 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION @@ -55,7 +55,7 @@ MAP NAME "uitstootvrije_zone_pleziervaart" GROUP "water" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.water_uitstootvrije_zone_pleziervaart USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.water_uitstootvrije_zone_pleziervaar_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "empty" PROJECTION diff --git a/wegenbestand.map b/wegenbestand.map index 4ae5e457..3b1530fd 100644 --- a/wegenbestand.map +++ b/wegenbestand.map @@ -28,7 +28,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_binnen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_binnen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -75,7 +75,7 @@ MAP INCLUDE "connection/dataservices.inc" # mapserver treats in the `EXPRESSION` clause on the `CLASS` NULL values as integer zero. In this case we do not want that # and translate NULL values to an integer of 4 (or more). Hence the `COALESCE` in the `DATA` query below. - DATA "geometry FROM (SELECT *, COALESCE(weg_functie, 4) weg_functie_null_trans FROM public.wegenbestand_zone_zwaar_verkeer_buiten) as SUBQUERY USING srid=28992 USING UNIQUE id" + DATA "geometry FROM (SELECT *, COALESCE(weg_functie, 4) weg_functie_null_trans FROM public.wegenbestand_zone_zwaar_verkeer_buiten_v1) as SUBQUERY USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -134,7 +134,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_breed_opgezette_wegen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_zone_zwaar_verkeer_breed_opgezette_wegen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -180,7 +180,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_routes_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_routes_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -225,7 +225,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.wegenbestand_tunnels_gevaarlijke_stoffen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.wegenbestand_tunnels_gevaarlijke_stoffen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 From 931330d5711a262ab1e0d6bf982f1019b39941a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BC?= Date: Fri, 17 Apr 2026 10:43:35 +0200 Subject: [PATCH 3/3] walue capaciteit changed and ows - wms title added --- energie.map | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/energie.map b/energie.map index 53a11a26..f59a10a1 100644 --- a/energie.map +++ b/energie.map @@ -36,7 +36,7 @@ MAP WHERE primaire_functie = 'Markt' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{3 x 80 A}' or [capaciteit] = "{3 x 160 A}" or [capaciteit] = "{3 x 250 A}") + FILTER ([capaciteit] = '{"3 x 80 A"}' or [capaciteit] = '{"3 x 160 A"}' or [capaciteit] = '{"3 x 250 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -54,6 +54,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Markt: groter of gelijk aan 3 x 80 A" + "ows_title" "Markt: groter of gelijk aan 3 x 80 A" END CLASS @@ -79,7 +81,7 @@ MAP WHERE primaire_functie = 'Markt' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{3 x 50 A}' or [capaciteit] = "{3 x 160 A}") + FILTER ([capaciteit] = '{"3 x 50 A"}' or [capaciteit] = '{"3 x 160 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -97,6 +99,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Markt: tot 3 x 63 A" + "ows_title" "Markt: tot 3 x 63 A" END CLASS @@ -123,7 +127,7 @@ MAP WHERE primaire_functie = 'Markt' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{3 x 35 A}' or [capaciteit] = "{3 x 40 A}") + FILTER ([capaciteit] = '{"3 x 35 A"}' or [capaciteit] = '{"3 x 40 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -141,6 +145,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Markt: tot 3 x 40 A" + "ows_title" "Markt: tot 3 x 40 A" END CLASS @@ -167,7 +173,7 @@ MAP WHERE primaire_functie = 'Markt' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{1 x 10 A}' or [capaciteit] = "{3 x 25 A}") + FILTER ([capaciteit] = '{"1 x 10 A"}' or [capaciteit] = '{"3 x 25 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -185,6 +191,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Markt: tot 3 x 25 A" + "ows_title" "Markt: tot 3 x 25 A" END CLASS @@ -210,7 +218,7 @@ MAP WHERE primaire_functie = 'Evenement' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{3 x 80 A}' or [capaciteit] = "{3 x 160 A}" or [capaciteit] = "{3 x 250 A}") + FILTER ([capaciteit] = '{"3 x 80 A"}' or [capaciteit] = '{"3 x 160 A"}' or [capaciteit] = '{"3 x 250 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -228,6 +236,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Evenement: groter of gelijk aan 3 x 80 A" + "ows_title" "Evenement: groter of gelijk aan 3 x 80 A" END CLASS @@ -254,7 +264,7 @@ MAP WHERE primaire_functie = 'Evenement' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{3 x 50 A}' or [capaciteit] = '{3 x 63 A}') + FILTER ([capaciteit] = '{"3 x 50 A"}' or [capaciteit] = '{"3 x 63 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -272,6 +282,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Evenement: tot 3 x 63 A" + "ows_title" "Evenement: tot 3 x 63 A" END CLASS @@ -298,7 +310,7 @@ MAP WHERE primaire_functie = 'Evenement' ) AS sub USING srid=28992 USING UNIQUE id" - FILTER ([capaciteit] = '{3 x 35 A}' or [capaciteit] = '{3 x 40 A}') + FILTER ([capaciteit] = '{"3 x 35 A"}' or [capaciteit] = '{"3 x 40 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -316,6 +328,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Evenement: tot 3 x 40 A" + "ows_title" "Evenement: tot 3 x 40 A" END CLASS @@ -343,7 +357,7 @@ MAP ) AS sub USING srid=28992 USING UNIQUE id" # Note: the middle value actually has to have 'X' instead of 'x'. - FILTER ([capaciteit] = '{1 x 10 A}' or [capaciteit] = '{3 X 16 A}' or [capaciteit] = '{3 x 25 A}') + FILTER ([capaciteit] = '{"1 x 10 A"}' or [capaciteit] = '{"3 X 16 A"}' or [capaciteit] = '{"3 x 25 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -361,6 +375,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Evenement: tot 3 x 25 A" + "ows_title" "Evenement: tot 3 x 25 A" END CLASS @@ -387,7 +403,7 @@ MAP 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}') + FILTER ([capaciteit] = '{"3 x 80 A"}' or [capaciteit] = '{"3 x 160 A"}' or [capaciteit] = '{"3 x 250 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -405,6 +421,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Bouwstroompunt: groter of gelijk aan 3 x 80 A" + "ows_title" "Bouwstroompunt: groter of gelijk aan 3 x 80 A" END CLASS @@ -431,7 +449,7 @@ MAP 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}') + FILTER ([capaciteit] = '{"3 x 50 A"}' or [capaciteit] = '{"3 x 63 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -449,6 +467,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Bouwstroompunt: tot 3 x 63 A" + "ows_title" "Bouwstroompunt: tot 3 x 63 A" END CLASS @@ -475,7 +495,7 @@ MAP 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}') + FILTER ([capaciteit] = '{"3 x 35 A"}' or [capaciteit] = '{"3 x 40 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -493,6 +513,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Bouwstroompunt: tot 3 x 40 A" + "ows_title" "Bouwstroompunt: tot 3 x 40 A" END CLASS @@ -519,7 +541,7 @@ MAP 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}') + FILTER ([capaciteit] = '{"1 x 10 A"}' or [capaciteit] = '{"3 x 25 A"}') TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" END @@ -537,6 +559,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "Bouwstroompunt: tot 3 x 25 A" + "ows_title" "Bouwstroompunt: tot 3 x 25 A" END CLASS @@ -562,7 +586,7 @@ MAP DATA "geometry FROM ( select * from public.bouwstroompunten_bouwstroompunten_v1 - where capaciteit[1] is null + where capaciteit is null ) as subquery USING srid=28992 USING UNIQUE id" TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION "init=epsg:28992" @@ -581,6 +605,8 @@ MAP "wms_format" "image/png" "wms_server_version" "1.1.1" "wms_extent" "100000 450000 150000 500000" + "wms_title" "onbekend" + "ows_title" "energie" END CLASS