diff --git a/aardgasvrij.map b/aardgasvrij.map index d2092151..c822a298 100644 --- a/aardgasvrij.map +++ b/aardgasvrij.map @@ -31,7 +31,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.aardgasvrijezones_buurt USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.aardgasvrijezones_buurt_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -390,7 +390,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.aardgasvrijezones_buurt USING srid=28992 USING UNIQUE id WHERE aandeel_kookgas IS NOT NULL" + DATA "geometry FROM public.aardgasvrijezones_buurt_v1 USING srid=28992 USING UNIQUE id WHERE aandeel_kookgas IS NOT NULL" TYPE POLYGON MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -438,7 +438,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.aardgasvrijezones_buurtinitiatief USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.aardgasvrijezones_buurtinitiatief_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/adresseerbare_objecten/ligplaatsen.inc b/adresseerbare_objecten/ligplaatsen.inc index ca0f6af9..6a84ca0f 100644 --- a/adresseerbare_objecten/ligplaatsen.inc +++ b/adresseerbare_objecten/ligplaatsen.inc @@ -19,8 +19,8 @@ DATA "geometrie FROM ( bv.geometrie AS geometrie, bv.status_omschrijving AS status, bvg.omschrijving AS gebruiksdoel - FROM bag_ligplaatsen AS bv - INNER JOIN bag_ligplaatsen_gebruiksdoel AS bvg + FROM bag_ligplaatsen_v1 AS bv + INNER JOIN bag_ligplaatsen_gebruiksdoel_v1 AS bvg ON bv.id = bvg.parent_id WHERE (lower(bvg.omschrijving) = lower($1) OR $1 = 'all') diff --git a/adresseerbare_objecten/standplaatsen.inc b/adresseerbare_objecten/standplaatsen.inc index e5461c38..5ebabb5f 100644 --- a/adresseerbare_objecten/standplaatsen.inc +++ b/adresseerbare_objecten/standplaatsen.inc @@ -18,8 +18,8 @@ DATA "geometrie FROM ( bv.id AS id, bv.geometrie AS geometrie, bvg.omschrijving AS gebruiksdoel - FROM bag_standplaatsen AS bv - INNER JOIN bag_standplaatsen_gebruiksdoel AS bvg + FROM bag_standplaatsen_v1 AS bv + INNER JOIN bag_standplaatsen_gebruiksdoel_v1 AS bvg ON bv.id = bvg.parent_id WHERE (lower(bvg.omschrijving) = lower($1) OR $1 = 'all') diff --git a/adresseerbare_objecten/verblijfsobjecten.inc b/adresseerbare_objecten/verblijfsobjecten.inc index 076b0d28..c5f5cc0e 100644 --- a/adresseerbare_objecten/verblijfsobjecten.inc +++ b/adresseerbare_objecten/verblijfsobjecten.inc @@ -21,8 +21,8 @@ DATA "geometrie FROM ( bv.geometrie AS geometrie, bv.status_omschrijving AS status, bvg.omschrijving AS gebruiksdoel - FROM bag_verblijfsobjecten AS bv - INNER JOIN bag_verblijfsobjecten_gebruiksdoel AS bvg + FROM bag_verblijfsobjecten_v1 AS bv + INNER JOIN bag_verblijfsobjecten_gebruiksdoel_v1 AS bvg ON bv.id = bvg.parent_id WHERE (lower(bv.status_omschrijving) = lower($1) OR $1 = 'all') diff --git a/bb_quotum.map b/bb_quotum.map index 08220a17..94c5f62f 100644 --- a/bb_quotum.map +++ b/bb_quotum.map @@ -1,5 +1,3 @@ -# TEAM: Beeldschoon/BOR - MAP NAME "bb_quotum" INCLUDE "header.inc" @@ -22,7 +20,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.vergunningen_bedandbreakfast USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.vergunningen_bedandbreakfast_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/beheerkaart.map b/beheerkaart.map index fa5c17b0..3e6d23ba 100644 --- a/beheerkaart.map +++ b/beheerkaart.map @@ -41,7 +41,7 @@ MAP GROUP bgt INCLUDE "connection/dataservices.inc" # Let op: Hier wordt geselecteerd op bgt_fysiekvoorkomen!=erf. (Zie opmerking bovenaan) - DATA "geometrie FROM (SELECT * FROM public.beheerkaart_basis_kaart WHERE agg_indicatie_belast_recht = true AND objecteindtijd is NULL AND bgt_fysiekvoorkomen != 'erf') as SUBQUERY USING srid=28992 USING UNIQUE identificatie_lokaalid" + DATA "geometrie FROM (SELECT * FROM public.beheerkaart_basis_kaart_v1 WHERE agg_indicatie_belast_recht = true AND objecteindtijd is NULL AND bgt_fysiekvoorkomen != 'erf') as SUBQUERY USING srid=28992 USING UNIQUE identificatie_lokaalid" TYPE POLYGON CLASSITEM "agg_belast_door_zrt_code" MAXSCALEDENOM 50000 @@ -131,7 +131,7 @@ MAP NAME onbelast GROUP bgt INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.beheerkaart_basis_kaart WHERE agg_indicatie_belast_recht = false AND objecteindtijd is NULL) as SUBQUERY USING srid=28992 USING UNIQUE identificatie_lokaalid" + DATA "geometrie FROM (SELECT * FROM public.beheerkaart_basis_kaart_v1 WHERE agg_indicatie_belast_recht = false AND objecteindtijd is NULL) as SUBQUERY USING srid=28992 USING UNIQUE identificatie_lokaalid" TYPE POLYGON CLASSITEM "agg_aard_zakelijk_recht_code" MAXSCALEDENOM 50000 diff --git a/beschermdestadsdorpsgezichten.map b/beschermdestadsdorpsgezichten.map index cc15e61b..d96b6425 100644 --- a/beschermdestadsdorpsgezichten.map +++ b/beschermdestadsdorpsgezichten.map @@ -20,7 +20,7 @@ MAP 'init=epsg:28992' END INCLUDE 'connection/dataservices.inc' - DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten USING UNIQUE id USING srid=28992' + DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten_v2 USING UNIQUE id USING srid=28992' TYPE POLYGON METADATA 'wfs_enable_request' '!*' @@ -49,7 +49,7 @@ MAP 'init=epsg:28992' END INCLUDE 'connection/dataservices.inc' - DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten USING UNIQUE id USING srid=28992' + DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten_v2 USING UNIQUE id USING srid=28992' TYPE POLYGON METADATA 'wfs_enable_request' '!*' @@ -78,7 +78,7 @@ MAP 'init=epsg:28992' END INCLUDE 'connection/dataservices.inc' - DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten USING UNIQUE id USING srid=28992' + DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten_v2 USING UNIQUE id USING srid=28992' TYPE POLYGON METADATA 'wfs_enable_request' '!*' @@ -107,7 +107,7 @@ MAP 'init=epsg:28992' END INCLUDE 'connection/dataservices.inc' - DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten USING UNIQUE id USING srid=28992' + DATA 'geometry FROM public.beschermdestadsdorpsgezichten_beschermdestadsdorpsgezichten_v2 USING UNIQUE id USING srid=28992' TYPE POLYGON METADATA 'wfs_enable_request' '!*' diff --git a/bodem.map b/bodem.map index 887156fa..73f94aad 100644 --- a/bodem.map +++ b/bodem.map @@ -27,7 +27,7 @@ MAP LAYER NAME "grondmonsters" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.bodem_grond USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.bodem_grond_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MAXSCALEDENOM 10000 TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" @@ -91,7 +91,7 @@ MAP LAYER NAME "grondwatermonsters" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.bodem_grondwater USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.bodem_grondwater_v1 USING srid=28992 USING UNIQUE id" TYPE POINT TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -154,7 +154,7 @@ MAP LAYER NAME "asbest" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.bodem_asbest USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.bodem_asbest_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MAXSCALEDENOM 10000 TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" diff --git a/bommenkaart.map b/bommenkaart.map index 58b10321..53f8890f 100644 --- a/bommenkaart.map +++ b/bommenkaart.map @@ -32,7 +32,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.explosieven_bominslag USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.explosieven_bominslag_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MAXSCALEDENOM 400000 MINSCALEDENOM 10 @@ -161,7 +161,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.explosieven_verdachtgebied USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.explosieven_verdachtgebied_1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MAXSCALEDENOM 400000 MINSCALEDENOM 10 @@ -256,7 +256,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.explosieven_gevrijwaardgebied USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.explosieven_gevrijwaardgebied_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MAXSCALEDENOM 400000 MINSCALEDENOM 10 diff --git a/brk2.map b/brk2.map index 3ed51889..fd49ff13 100644 --- a/brk2.map +++ b/brk2.map @@ -21,7 +21,7 @@ MAP GROUP "kadaster" INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT identificatie, geometrie FROM public.brk_2_kadastraleobjecten + SELECT identificatie, geometrie FROM public.brk_2_kadastraleobjecten_v2 WHERE coalesce(eind_geldigheid, now()) >= now() ) AS sub USING srid=28992 USING UNIQUE identificatie" @@ -56,7 +56,7 @@ MAP NAME "kadastrale_sectie" GROUP "kadaster" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.brk_2_kadastralesecties + DATA "geometrie FROM public.brk_2_kadastralesecties_v1 USING srid=28992 USING UNIQUE identificatie" TYPE LINE MINSCALEDENOM 2501 @@ -89,7 +89,7 @@ MAP NAME "kadastrale_gemeente" GROUP "kadaster" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.brk_2_kadastralegemeentes + DATA "geometrie FROM public.brk_2_kadastralegemeentes_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POLYGON MINSCALEDENOM 12501 @@ -123,7 +123,7 @@ MAP GROUP "kadaster" INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT * FROM public.brk_2_gemeentes + SELECT * FROM public.brk_2_gemeentes_v1 WHERE coalesce(eind_geldigheid, now()) >= now() ) AS sub USING srid=28992 USING UNIQUE identificatie" @@ -162,7 +162,7 @@ MAP #specifieke kolommen verwijderd voor rechten. DATA "geometrie FROM ( select id, identificatie, volgnummer, neuron_id, kadastrale_aanduiding, aangeduid_door_brk_gemeente_id, aangeduid_door_brk_gemeente_identificatie, aangeduid_door_brk_gemeente_volgnummer, aangeduid_door_brk_kadastralegemeente_id, aangeduid_door_brk_kadastralegemeentecode_id, aangeduid_door_brk_kadastralesectie_id, perceelnummer, indexletter, indexnummer, soort_grootte_code, soort_grootte_omschrijving, grootte, referentie, oudst_digitaal_bekend, mutatie_id, meettarief_verschuldigd, toelichting_bewaarder, tijdstip_ontstaan_object, hoofdsplitsing_identificatie, afwijking_lijst_rechthebbenden, geometrie, plaatscoordinaten, perceelnummer_rotatie, perceelnummer_verschuiving_x, perceelnummer_verschuiving_y, bijpijling_geometrie, indicatie_meer_objecten, toestandsdatum, begin_geldigheid, eind_geldigheid, in_onderzoek, datum_actueel_tot, indicatie_voorlopige_kadastrale_grens, geometrie_punt, geometrie_vlak - FROM public.brk_2_kadastraleobjecten bk + FROM public.brk_2_kadastraleobjecten_v2 bk WHERE bk.indexletter = 'A' and eind_geldigheid IS NULL ) AS sub USING srid=28992 USING UNIQUE id" @@ -205,7 +205,7 @@ MAP GROUP "kadaster" INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT identificatie, geometrie, perceelnummer FROM public.brk_2_kadastraleobjecten + SELECT identificatie, geometrie, perceelnummer FROM public.brk_2_kadastraleobjecten_v2 WHERE coalesce(eind_geldigheid, now()) >= now() ) AS sub USING srid=28992 USING UNIQUE identificatie" @@ -250,7 +250,7 @@ MAP NAME "kadastrale_sectie_label" GROUP "kadaster" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.brk_2_kadastralesecties + DATA "geometrie FROM public.brk_2_kadastralesecties_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POLYGON MINSCALEDENOM 2501 @@ -293,7 +293,7 @@ MAP NAME "kadastrale_gemeente_label" GROUP "kadaster" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.brk_2_kadastralegemeentes + DATA "geometrie FROM public.brk_2_kadastralegemeentes_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POLYGON MINSCALEDENOM 12501 @@ -337,7 +337,7 @@ MAP GROUP "kadaster" INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT * FROM public.brk_2_gemeentes + SELECT * FROM public.brk_2_gemeentes_v1 WHERE coalesce(eind_geldigheid, now()) >= now() ) AS sub USING srid=28992 USING UNIQUE identificatie" @@ -383,7 +383,7 @@ MAP GROUP "kadaster" INCLUDE "connection/dataservices.inc" DATA "geometrie FROM (select id, identificatie, volgnummer, neuron_id, kadastrale_aanduiding, aangeduid_door_brk_gemeente_id, aangeduid_door_brk_gemeente_identificatie, aangeduid_door_brk_gemeente_volgnummer, aangeduid_door_brk_kadastralegemeente_id, aangeduid_door_brk_kadastralegemeentecode_id, aangeduid_door_brk_kadastralesectie_id, perceelnummer, indexletter, indexnummer, soort_grootte_code, soort_grootte_omschrijving, grootte, referentie, oudst_digitaal_bekend, mutatie_id, meettarief_verschuldigd, toelichting_bewaarder, tijdstip_ontstaan_object, hoofdsplitsing_identificatie, afwijking_lijst_rechthebbenden, geometrie, plaatscoordinaten, perceelnummer_rotatie, perceelnummer_verschuiving_x, perceelnummer_verschuiving_y, bijpijling_geometrie, indicatie_meer_objecten, toestandsdatum, begin_geldigheid, eind_geldigheid, in_onderzoek, datum_actueel_tot, indicatie_voorlopige_kadastrale_grens, geometrie_punt, geometrie_vlak - FROM public.brk_2_kadastraleobjecten bk + FROM public.brk_2_kadastraleobjecten_v2 bk WHERE bk.indexletter = 'A' and eind_geldigheid IS NULL) AS sub USING srid=28992 USING UNIQUE id" TYPE POINT diff --git a/externeveiligheid.map b/externeveiligheid.map index 90c55c0b..986c5d5e 100644 --- a/externeveiligheid.map +++ b/externeveiligheid.map @@ -25,7 +25,7 @@ MAP NAME "lpgstationcontouren" GROUP "milieu_veiligheid_lpg_station" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.risicozones_lpgtankstations USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.risicozones_lpgtankstations_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON # MINSCALEDENOM 100 # MAXSCALEDENOM 15000 @@ -63,7 +63,7 @@ MAP NAME "lpgstationslocaties" GROUP "milieu_veiligheid_lpg_station" INCLUDE "connection/dataservices.inc" - DATA "geometrie_punt FROM public.risicozones_lpgtankstations USING srid=28992 USING UNIQUE id" + DATA "geometrie_punt FROM public.risicozones_lpgtankstations_v1 USING srid=28992 USING UNIQUE id" TYPE POINT # MINSCALEDENOM 100 # MAXSCALEDENOM 15000 @@ -100,7 +100,7 @@ MAP NAME "lpgvulpuntinvloedsgebied" GROUP "milieu_veiligheid_lpg_vulpunt" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgvulpunten WHERE type_contour = 'Invloedsgebied groepsrisico') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgvulpunten_v1 WHERE type_contour = 'Invloedsgebied groepsrisico') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -139,7 +139,7 @@ MAP NAME "lpgvulpuntplaatsgebondenrisico106" GROUP "milieu_veiligheid_lpg_vulpunt" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgvulpunten WHERE type_contour = 'Plaatsgebonden risico 10-6') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgvulpunten_v1 WHERE type_contour = 'Plaatsgebonden risico 10-6') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -178,7 +178,7 @@ MAP NAME "lpgvulpuntplaatsgebondenrisico105" GROUP "milieu_veiligheid_lpg_vulpunt" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgvulpunten WHERE type_contour = 'Plaatsgebonden risico 10-5') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgvulpunten_v1 WHERE type_contour = 'Plaatsgebonden risico 10-5') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -224,7 +224,7 @@ MAP NAME "lpgvulpuntlocaties" GROUP "milieu_veiligheid_lpg_vulpunt" INCLUDE "connection/dataservices.inc" - DATA "geometrie_punt FROM public.risicozones_lpgvulpunten USING srid=28992 USING UNIQUE id" + DATA "geometrie_punt FROM public.risicozones_lpgvulpunten_v1 USING srid=28992 USING UNIQUE id" TYPE POINT TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -258,7 +258,7 @@ MAP NAME "lpgafleverzuilplaatsgebondenrisico" GROUP "milieu_veiligheid_lpg_afleverzuil" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.risicozones_lpgafleverzuilen USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.risicozones_lpgafleverzuilen_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -297,7 +297,7 @@ MAP NAME "lpgafleverzuillocaties" GROUP "milieu_veiligheid_lpg_afleverzuil" INCLUDE "connection/dataservices.inc" - DATA "geometrie_punt FROM public.risicozones_lpgafleverzuilen USING srid=28992 USING UNIQUE id" + DATA "geometrie_punt FROM public.risicozones_lpgafleverzuilen_v1 USING srid=28992 USING UNIQUE id" TYPE POINT TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -332,7 +332,7 @@ MAP NAME "lpgtankinvloedsgebied" GROUP "milieu_veiligheid_lpg_tank" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgtanks WHERE kleurcode = 11796735) AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgtanks_v1 WHERE kleurcode = 11796735) AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -367,7 +367,7 @@ MAP NAME "lpgtankplaatsgebondenrisico" GROUP "milieu_veiligheid_lpg_tank" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgtanks WHERE kleurcode IN (65535, 16711680)) AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgtanks_v1 WHERE kleurcode IN (65535, 16711680)) AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -406,7 +406,7 @@ MAP NAME "lpgtankligging" GROUP "milieu_veiligheid_lpg_tank" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgtanks WHERE kleurcode = 0) AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_lpgtanks_v1 WHERE kleurcode = 0) AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -440,7 +440,7 @@ MAP NAME "overigerisicobedrijfscontouren" GROUP "milieu_veiligheid_bedrijf" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.risicozones_bedrijven USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.risicozones_bedrijven_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -477,7 +477,7 @@ MAP NAME "overigerisicobedrijfslocaties" GROUP "milieu_veiligheid_bedrijf" INCLUDE "connection/dataservices.inc" - DATA "geometrie_punt FROM public.risicozones_bedrijven USING srid=28992 USING UNIQUE id" + DATA "geometrie_punt FROM public.risicozones_bedrijven_v1 USING srid=28992 USING UNIQUE id" TYPE POINT TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -512,7 +512,7 @@ MAP NAME "overigerisicobedrijfsbronnen" GROUP "overigerisicobedrijven" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.risicozones_bronnen USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.risicozones_bronnen_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -549,7 +549,7 @@ MAP NAME "overigerisicobedrijfplaatsgebondenrisico106" GROUP "overigerisicobedrijven" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_contouren WHERE type_contour = 'Plaatsgebonden risico 10-6') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_contouren_v1 WHERE type_contour = 'Plaatsgebonden risico 10-6') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -588,7 +588,7 @@ MAP NAME "risicozonesbelemmeringenstrook" GROUP "milieu_veiligheid_aardgasbuisleidingen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden WHERE type = 'belemmeringenstrook') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden_v1 WHERE type = 'belemmeringenstrook') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -625,7 +625,7 @@ MAP NAME "risicozonesaardgas1let" GROUP "milieu_veiligheid_aardgasbuisleidingen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden WHERE type = 'letaliteitsafstand_1%') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden_v1 WHERE type = 'letaliteitsafstand_1%') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -664,7 +664,7 @@ MAP NAME "risicozonesaardgas100let" GROUP "milieu_veiligheid_aardgasbuisleidingen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden WHERE type = 'letaliteitsafstand_100%') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden_v1 WHERE type = 'letaliteitsafstand_100%') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -703,7 +703,7 @@ MAP NAME "risicozonesaardgaspr106" GROUP "milieu_veiligheid_aardgasbuisleidingen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden WHERE type = 'plaatsgebondenrisico') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_aardgasgebieden_v1 WHERE type = 'plaatsgebondenrisico') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -742,7 +742,7 @@ MAP NAME "milieu_veiligheid_aardgasbuisleidingen" GROUP "milieu_veiligheid_aardgasbuisleidingen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.risicozones_aardgasleidingen USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.risicozones_aardgasleidingen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -775,7 +775,7 @@ MAP LAYER NAME "milieu_veiligheid_aardgasbuisleidingen_legenda" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.risicozones_aardgasleidingen USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.risicozones_aardgasleidingen_v1 USING srid=28992 USING UNIQUE id" TYPE LINE TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -807,7 +807,7 @@ MAP NAME "risicozonesspoorweg" GROUP "risicozones" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_infrastructuur WHERE type = 'spoorweg') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_infrastructuur_v1 WHERE type = 'spoorweg') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -849,7 +849,7 @@ MAP NAME "risicozonesvaarweg" GROUP "risicozones" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_infrastructuur WHERE type = 'vaarweg') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_infrastructuur_v1 WHERE type = 'vaarweg') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -891,7 +891,7 @@ MAP NAME "risicozonesweg" GROUP "risicozones" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT * FROM public.risicozones_infrastructuur WHERE type = 'autoweg') AS foo USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM (SELECT * FROM public.risicozones_infrastructuur_v1 WHERE type = 'autoweg') AS foo USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION diff --git a/gemeentelijk_vastgoed.map b/gemeentelijk_vastgoed.map index 3b123849..927c5210 100644 --- a/gemeentelijk_vastgoed.map +++ b/gemeentelijk_vastgoed.map @@ -32,7 +32,7 @@ MAP INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT * from gemeentelijk_vastgoed_gebouwobjecten + SELECT * from gemeentelijk_vastgoed_gebouwobjecten_v1 WHERE eigendom = 'Volle eigendom' ) AS sub USING srid=28992 USING UNIQUE object_id" @@ -87,7 +87,7 @@ MAP INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT * from gemeentelijk_vastgoed_gebouwobjecten + SELECT * from gemeentelijk_vastgoed_gebouwobjecten_v1 WHERE eigendom = 'Appartementsrecht' ) AS sub USING srid=28992 USING UNIQUE object_id" diff --git a/gen_beschermdestadsdorpsgezichten.py b/gen_beschermdestadsdorpsgezichten.py index 6685b804..ab45dde5 100644 --- a/gen_beschermdestadsdorpsgezichten.py +++ b/gen_beschermdestadsdorpsgezichten.py @@ -41,7 +41,7 @@ p("INCLUDE", "connection/dataservices.inc") p( "DATA", - f"geometry FROM public.{BSD_SHORT}_{BSD_SHORT} USING UNIQUE id USING srid=28992", + f"geometry FROM public.{BSD_SHORT}_{BSD_SHORT}_v2 USING UNIQUE id USING srid=28992", ) p("TYPE POLYGON") diff --git a/gen_historischebodeminformatie.py b/gen_historischebodeminformatie.py index 3a9bfa38..bf5a9dc9 100644 --- a/gen_historischebodeminformatie.py +++ b/gen_historischebodeminformatie.py @@ -58,7 +58,7 @@ def slugify(s: str) -> str: if group == "Bodemgebruik en obstakels": with block("LAYER"): - sql = f"geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id" + sql = f"geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id" layer_name_slug = slugify(layer_name) @@ -110,7 +110,7 @@ def slugify(s: str) -> str: if group == "Lijnvormige obstakels": with block("LAYER"): - sql = f"geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id" + sql = f"geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = '{filter_value}') as subquery USING srid=28992 USING UNIQUE id" layer_name_slug = slugify(layer_name) @@ -163,7 +163,7 @@ def slugify(s: str) -> str: if group == "Dempingen en ophogingen": with block("LAYER"): - sql = f"geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen where categorie = '{filter_value}') as subquery USING srid=7415 USING UNIQUE id" + sql = f"geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen_v1 where categorie = '{filter_value}') as subquery USING srid=7415 USING UNIQUE id" layer_name_slug = slugify(layer_name) diff --git a/grex.map b/grex.map index fabe0607..491960fa 100644 --- a/grex.map +++ b/grex.map @@ -31,7 +31,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.grex_projecten USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.grex_projecten_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/historischebodeminformatie.map b/historischebodeminformatie.map index cf58f48e..81f86708 100644 --- a/historischebodeminformatie.map +++ b/historischebodeminformatie.map @@ -12,7 +12,7 @@ MAP LAYER NAME 'boerderij' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Boerderij') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Boerderij') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -56,7 +56,7 @@ MAP LAYER NAME 'defensieterrein' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Defensieterrein') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Defensieterrein') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -100,7 +100,7 @@ MAP LAYER NAME 'fabriek_bedrijventerrein' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Fabriek/bedrijventerrein') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Fabriek/bedrijventerrein') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -144,7 +144,7 @@ MAP LAYER NAME 'gebouw' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Gebouw') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Gebouw') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -188,7 +188,7 @@ MAP LAYER NAME 'glastuinbouw' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Glastuinbouw') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Glastuinbouw') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -232,7 +232,7 @@ MAP LAYER NAME 'object' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Object') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Object') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -276,7 +276,7 @@ MAP LAYER NAME 'overig' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Overig') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Overig') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -320,7 +320,7 @@ MAP LAYER NAME 'spoorwegemplacement' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Spoorwegemplacement') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Spoorwegemplacement') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -364,7 +364,7 @@ MAP LAYER NAME 'stookruimte_olietank' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Stookruimte/olietank') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Stookruimte/olietank') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -408,7 +408,7 @@ MAP LAYER NAME 'tram_en_busremises' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Tram- en busremises') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Tram- en busremises') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -452,7 +452,7 @@ MAP LAYER NAME 'volkstuinen' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels where categorie = 'Volkstuinen') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_bodemgebruik_en_obstakels_v1 where categorie = 'Volkstuinen') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -496,7 +496,7 @@ MAP LAYER NAME 'gasbuis' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Gasbuis') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Gasbuis') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -540,7 +540,7 @@ MAP LAYER NAME 'grondkering' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Grondkering') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Grondkering') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -581,7 +581,7 @@ MAP LAYER NAME 'kabel' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Kabel') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Kabel') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -625,7 +625,7 @@ MAP LAYER NAME 'mantelbuis' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Mantelbuis') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Mantelbuis') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -669,7 +669,7 @@ MAP LAYER NAME 'persleiding' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Persleiding') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Persleiding') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -713,7 +713,7 @@ MAP LAYER NAME 'riool' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Riool') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Riool') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -757,7 +757,7 @@ MAP LAYER NAME 'spoorweg' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Spoorweg') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Spoorweg') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -801,7 +801,7 @@ MAP LAYER NAME 'waterleiding' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels where categorie = 'Waterleiding') as subquery USING srid=28992 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_lijnvormige_obstakels_v1 where categorie = 'Waterleiding') as subquery USING srid=28992 USING UNIQUE id" GROUP 'lijnvormige_obstakels' TYPE LINE TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -845,7 +845,7 @@ MAP LAYER NAME 'demping' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen where categorie = 'Demping') as subquery USING srid=7415 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen_v1 where categorie = 'Demping') as subquery USING srid=7415 USING UNIQUE id" GROUP 'dempingen_en_ophogingen' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -915,7 +915,7 @@ MAP LAYER NAME 'depot_stort' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen where categorie = 'Depot/stort') as subquery USING srid=7415 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen_v1 where categorie = 'Depot/stort') as subquery USING srid=7415 USING UNIQUE id" GROUP 'dempingen_en_ophogingen' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -985,7 +985,7 @@ MAP LAYER NAME 'dijk' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen where categorie = 'Dijk') as subquery USING srid=7415 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen_v1 where categorie = 'Dijk') as subquery USING srid=7415 USING UNIQUE id" GROUP 'dempingen_en_ophogingen' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -1055,7 +1055,7 @@ MAP LAYER NAME 'ophoging' INCLUDE 'connection/dataservices.inc' - DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen where categorie = 'Ophoging') as subquery USING srid=7415 USING UNIQUE id" + DATA "geometrie from (SELECT * FROM public.historische_bodeminformatie_dempingen_en_ophogingen_v1 where categorie = 'Ophoging') as subquery USING srid=7415 USING UNIQUE id" GROUP 'dempingen_en_ophogingen' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' diff --git a/lood.map b/lood.map index b7853a4f..f1e5b351 100644 --- a/lood.map +++ b/lood.map @@ -36,7 +36,7 @@ MAP ligging_omschrijving , type_woonobject, ('https://api.data.amsterdam.nl/bag/v1.1/pand/' || identificatie::text || '/'::text) AS uri - FROM public.bag_panden + FROM public.bag_panden_v1 WHERE eind_geldigheid is null ) AS subquery USING srid=28992 USING UNIQUE id" TYPE POLYGON diff --git a/meetbouten.map b/meetbouten.map index 50b1c5f8..36703a22 100644 --- a/meetbouten.map +++ b/meetbouten.map @@ -18,7 +18,7 @@ MAP NAME "meetbouten_status" GROUP "meetbouten" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.meetbouten_meetbouten USING srid=28992 USING UNIQUE identificatie" + DATA "geometrie FROM public.meetbouten_meetbouten_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 5001 @@ -71,7 +71,7 @@ MAP NAME "meetbouten_labels" GROUP "meetbouten" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.meetbouten_meetbouten USING srid=28992 USING UNIQUE identificatie" + DATA "geometrie FROM public.meetbouten_meetbouten_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 1001 @@ -136,13 +136,13 @@ MAP INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( SELECT mbt.*, mtn.zakkingssnelheid FROM - public.meetbouten_meetbouten mbt, public.meetbouten_metingen mtn + public.meetbouten_meetbouten_v1 mbt, public.meetbouten_metingen_v1 mtn WHERE mtn.hoort_bij_meetbout_id = mbt.identificatie AND (mtn.datum, mtn.hoort_bij_meetbout_id) IN ( SELECT max(datum), hoort_bij_meetbout_id FROM - public.meetbouten_metingen + public.meetbouten_metingen_v1 GROUP BY hoort_bij_meetbout_id ) ) @@ -295,7 +295,7 @@ MAP NAME "referentiepunt" GROUP "referentiepunten" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.meetbouten_referentiepunten USING srid=28992 USING UNIQUE identificatie" + DATA "geometrie FROM public.meetbouten_referentiepunten_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 5001 @@ -333,7 +333,7 @@ MAP NAME "referentiepunt_label" GROUP "referentiepunten" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.meetbouten_referentiepunten USING srid=28992 USING UNIQUE identificatie" + DATA "geometrie FROM public.meetbouten_referentiepunten_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 15001 diff --git a/monumenten.map b/monumenten.map index 53713e0a..4e74c08b 100644 --- a/monumenten.map +++ b/monumenten.map @@ -39,7 +39,7 @@ MAP SELECT coalesce(ST_CollectionExtract(contour, 3), ST_Buffer(punt_coordinaten, 1.5)) AS unified_geometrie, identificatie, monumentnummer, adressering, naam, type, status, datum_aanwijzing, datum_afvoeren, in_onderzoek, architect_ontwerp, opdrachtgever_bouw, jaar_begin_van, jaar_begin_tot, oorspronkelijke_functie, redengevende_omschrijving_publiek, beschrijving_publiek, ligt_in_monumenten_complex_id, datum_actueel_tot - FROM public.monumenten_monumenten) AS query + FROM public.monumenten_monumenten_v2) AS query USING srid=28992 USING UNIQUE identificatie" TYPE POLYGON MINSCALEDENOM 10 @@ -104,7 +104,7 @@ MAP SELECT coalesce(ST_CollectionExtract(contour, 3), ST_Buffer(punt_coordinaten , 1.5)) AS unified_geometrie, identificatie, monumentnummer, adressering, naam, type, status, datum_aanwijzing, datum_afvoeren, in_onderzoek, architect_ontwerp, opdrachtgever_bouw, jaar_begin_van, jaar_begin_tot, oorspronkelijke_functie, redengevende_omschrijving_publiek, beschrijving_publiek, ligt_in_monumenten_complex_id, datum_actueel_tot - FROM public.monumenten_monumenten) AS subquery + FROM public.monumenten_monumenten_v2) AS subquery USING srid=28992 USING UNIQUE identificatie" TYPE POLYGON PROJECTION diff --git a/nap.map b/nap.map index 52a89bd1..323aaa4c 100644 --- a/nap.map +++ b/nap.map @@ -38,7 +38,7 @@ MAP NAME "peilmerk" GROUP "NAP" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.nap_peilmerken USING srid=28992 USING UNIQUE identificatie" + DATA "geometrie FROM public.nap_peilmerken_v1 USING srid=28992 USING UNIQUE identificatie" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 15001 @@ -123,7 +123,7 @@ MAP GROUP "NAP_hoogte" INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT geometrie, identificatie, hoogte_tov_nap from public.nap_peilmerken) AS query USING srid=28992 USING UNIQUE identificatie" + SELECT geometrie, identificatie, hoogte_tov_nap from public.nap_peilmerken_v1) AS query USING srid=28992 USING UNIQUE identificatie" TYPE POINT MINSCALEDENOM 100 MAXSCALEDENOM 15001 diff --git a/nieuwbouwplannen.map b/nieuwbouwplannen.map index 919d205d..e84450d1 100644 --- a/nieuwbouwplannen.map +++ b/nieuwbouwplannen.map @@ -16,7 +16,7 @@ MAP NAME "fase_1" GROUP "woningbouwplannen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar_v2 USING srid=28992 USING UNIQUE id" FILTER ([plaberum_publicatie] = 'Fase 1: Verkenning') TYPE POLYGON TEMPLATE "empty" @@ -57,7 +57,7 @@ MAP NAME "fase_2_3" GROUP "woningbouwplannen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar_v2 USING srid=28992 USING UNIQUE id" FILTER ([plaberum_publicatie] = 'Fase 2&3: Haalbaarheid en ontwerp') TYPE POLYGON TEMPLATE "empty" @@ -98,7 +98,7 @@ MAP NAME "fase_4" GROUP "woningbouwplannen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar_v2 USING srid=28992 USING UNIQUE id" FILTER ([plaberum_publicatie] = 'Fase 4: Voorbereiding en uitvoering') TYPE POLYGON TEMPLATE "empty" @@ -139,7 +139,7 @@ MAP NAME "fase_5" GROUP "woningbouwplannen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar_v2 USING srid=28992 USING UNIQUE id" FILTER ([plaberum_publicatie] = 'Fase 5: Gestart') TYPE POLYGON TEMPLATE "empty" @@ -180,7 +180,7 @@ MAP NAME "onbekend" GROUP "woningbouwplannen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.nieuwbouwplannen_woningbouwplannen_openbaar_v2 USING srid=28992 USING UNIQUE id" FILTER ([plaberum_publicatie] = 'Onbekend') TYPE POLYGON TEMPLATE "empty" diff --git a/omzettingen_quotum.map b/omzettingen_quotum.map index 7842456e..7a48d8ec 100644 --- a/omzettingen_quotum.map +++ b/omzettingen_quotum.map @@ -22,7 +22,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.vergunningen_omzetting USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.vergunningen_omzetting_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/ondergrond.map b/ondergrond.map index c2bc3cab..8194c8cb 100644 --- a/ondergrond.map +++ b/ondergrond.map @@ -69,7 +69,7 @@ MAP LAYER NAME "rioolknopen" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM leidingeninfrastructuur_waternet_rioolknopen USING srid=7415 USING UNIQUE objectnummer" + DATA "geometrie FROM leidingeninfrastructuur_waternet_rioolknopen_v2 USING srid=7415 USING UNIQUE objectnummer" PROCESSING "CLOSE_CONNECTION=DEFER" # Use the same connection for all queried layers because they reside in the same db TYPE POINT MINSCALEDENOM 10 diff --git a/ondergrond/eisvoorzorgsmaatregelen_layer.inc b/ondergrond/eisvoorzorgsmaatregelen_layer.inc index 4a7d8a6b..3a375649 100644 --- a/ondergrond/eisvoorzorgsmaatregelen_layer.inc +++ b/ondergrond/eisvoorzorgsmaatregelen_layer.inc @@ -3,7 +3,7 @@ INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( SELECT * - FROM leidingeninfrastructuur_klic_eisvoorzorgsmaatregelen a + FROM leidingeninfrastructuur_klic_eisvoorzorgsmaatregelen_v1 a WHERE a.thema = '%thema%' ) AS query diff --git a/ondergrond/kabels_en_leidingen_layer.inc b/ondergrond/kabels_en_leidingen_layer.inc index f6d8f714..302fd936 100644 --- a/ondergrond/kabels_en_leidingen_layer.inc +++ b/ondergrond/kabels_en_leidingen_layer.inc @@ -3,7 +3,7 @@ INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( SELECT * - FROM leidingeninfrastructuur_klic_kabels_en_leidingen a + FROM leidingeninfrastructuur_klic_kabels_en_leidingen_v1 a WHERE a.thema = '%thema%' ) AS query diff --git a/ondergrond/objecten_layer.inc b/ondergrond/objecten_layer.inc index 874e3cc3..7668befb 100644 --- a/ondergrond/objecten_layer.inc +++ b/ondergrond/objecten_layer.inc @@ -3,7 +3,7 @@ INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( SELECT * - FROM leidingeninfrastructuur_klic_puntobjecten a + FROM leidingeninfrastructuur_klic_puntobjecten_v1 a WHERE a.thema = '%thema%' ) AS query diff --git a/ondergrond/rioolleidingen_layer.inc b/ondergrond/rioolleidingen_layer.inc index 07c503fa..83147282 100644 --- a/ondergrond/rioolleidingen_layer.inc +++ b/ondergrond/rioolleidingen_layer.inc @@ -4,7 +4,7 @@ TYPE LINE DATA "geometrie FROM ( SELECT objectnummer, geometrie, status, jaar_gelegd, soort, type_leiding, vorm, diameter, breedte, hoogte, materiaal, funderingstype, COALESCE(stelsel_type, 'Onbekend') AS stelsel_type - FROM leidingeninfrastructuur_waternet_rioolleidingen a + FROM leidingeninfrastructuur_waternet_rioolleidingen_v2 a WHERE ('%stelsel_type%' = 'Onbekend' AND a.stelsel_type ISNULL) OR a.stelsel_type = '%stelsel_type%' diff --git a/planologischezonesschiphol.map b/planologischezonesschiphol.map index bfcd2f03..4f789713 100644 --- a/planologischezonesschiphol.map +++ b/planologischezonesschiphol.map @@ -26,7 +26,7 @@ MAP LAYER NAME "maatgevendetoetshoogteschiphol" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.schiphol_maatgevendetoetshoogtes USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.schiphol_maatgevendetoetshoogtes_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -170,7 +170,7 @@ MAP LAYER NAME "toetshoogteradarschiphol" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.schiphol_hoogtebeperkingradar USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.schiphol_hoogtebeperkingradar_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -315,7 +315,7 @@ MAP LAYER NAME "geluidszoneschiphol" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.schiphol_geluidzones USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.schiphol_geluidzones_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION @@ -367,7 +367,7 @@ MAP LAYER NAME "vogelvrijwaringsgebiedschiphol" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM public.schiphol_vogelvrijwaringsgebieden USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM public.schiphol_vogelvrijwaringsgebieden_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON TEMPLATE "fooOnlyForWMSGetFeatureInfo.html" PROJECTION diff --git a/referentiekaarten/kaartteksten.map b/referentiekaarten/kaartteksten.map index 6254e3b8..0800fc58 100644 --- a/referentiekaarten/kaartteksten.map +++ b/referentiekaarten/kaartteksten.map @@ -59,7 +59,7 @@ MAP NAME "kbk50_lbl_plaats" GROUP "kbk50_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_50_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_50_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "plaats") TYPE POLYGON MINSCALEDENOM 40000 @@ -91,7 +91,7 @@ MAP NAME "kbk50_lbl_stadsdeel" GROUP "kbk50_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_50_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_50_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "stadsdeel") TYPE POLYGON MINSCALEDENOM 20000 @@ -123,7 +123,7 @@ MAP NAME "kbk50_lbl_water" GROUP "kbk50_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_50_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_50_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "water") TYPE POLYGON MINSCALEDENOM 20000 @@ -157,7 +157,7 @@ MAP NAME "kbk25_lbl_gebied" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "gebied") TYPE POLYGON MINSCALEDENOM 10000 @@ -189,7 +189,7 @@ MAP NAME "kbk25_lbl_gemeente" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "gemeente") TYPE POLYGON MINSCALEDENOM 10000 @@ -221,7 +221,7 @@ MAP NAME "kbk25_lbl_kunstwerk" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "kunstwerk") TYPE POLYGON MINSCALEDENOM 5000 @@ -253,7 +253,7 @@ MAP NAME "kbk25_lbl_park" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "park") TYPE POLYGON MINSCALEDENOM 5000 @@ -285,7 +285,7 @@ MAP NAME "kbk25_lbl_plaats" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "plaats") TYPE POLYGON MINSCALEDENOM 10000 @@ -315,7 +315,7 @@ MAP NAME "kbk25_lbl_polder" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "polder") TYPE POLYGON MINSCALEDENOM 20000 @@ -347,7 +347,7 @@ MAP NAME "kbk25_lbl_provincie" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "provincie") TYPE POLYGON MINSCALEDENOM 5000 @@ -379,7 +379,7 @@ MAP NAME "kbk25_lbl_stadsdeel" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "stadsdeel") TYPE POLYGON MINSCALEDENOM 10000 @@ -411,7 +411,7 @@ MAP NAME "kbk25_lbl_water" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "water") TYPE POLYGON MINSCALEDENOM 5000 @@ -443,7 +443,7 @@ MAP NAME "kbk25_lbl_weg" GROUP "kbk25_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_25_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "weg") TYPE POLYGON MINSCALEDENOM 5000 @@ -479,7 +479,7 @@ MAP NAME "kbk10_lbl_gemeente" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "gemeente") TYPE POLYGON MINSCALEDENOM 5000 @@ -511,7 +511,7 @@ MAP NAME "kbk10_lbl_kunstwerk" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "kunstwerk") TYPE POLYGON MINSCALEDENOM 2500 @@ -543,7 +543,7 @@ MAP NAME "kbk10_lbl_plaats" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "plaats") TYPE POLYGON MINSCALEDENOM 5000 @@ -575,7 +575,7 @@ MAP NAME "kbk10_lbl_park" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "park") TYPE POLYGON MINSCALEDENOM 2500 @@ -607,7 +607,7 @@ MAP NAME "kbk10_lbl_polder" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "polder") TYPE POLYGON MINSCALEDENOM 5000 @@ -639,7 +639,7 @@ MAP NAME "kbk10_lbl_provincie" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "provincie") TYPE POLYGON MINSCALEDENOM 2500 @@ -671,7 +671,7 @@ MAP NAME "kbk10_lbl_stadsdeel" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "stadsdeel") TYPE POLYGON MINSCALEDENOM 2500 @@ -701,7 +701,7 @@ MAP NAME "kbk10_lbl_water" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "water") TYPE POLYGON MINSCALEDENOM 2500 @@ -733,7 +733,7 @@ MAP NAME "kbk10_lbl_weg" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "weg") TYPE POLYGON MINSCALEDENOM 2500 @@ -765,7 +765,7 @@ MAP NAME "kbk10_lbl_wijk" GROUP "kbk10_label" INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels) AS sub USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT identificatie, type, geometrie_vlak AS geometrie FROM brt_10_pluslabels_v1) AS sub USING srid=28992 using unique identificatie" FILTER ("[type]" eq "wijk") TYPE POLYGON MINSCALEDENOM 5000 @@ -802,7 +802,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 2500 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabel_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" FILTER ("[bgt_type]" eq "Weg") TYPE POINT PROJECTION @@ -866,7 +866,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 2500 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabel_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" FILTER ("[bgt_type]" eq "Water") TYPE POINT PROJECTION @@ -930,7 +930,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 2500 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, naam AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, naam AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabel_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" FILTER ("[bgt_type]" eq "Terrein") TYPE POINT PROJECTION @@ -994,7 +994,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 2500 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, naam AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, naam AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabel_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" FILTER ("[bgt_type]" eq "Kunstwerk") TYPE POINT PROJECTION @@ -1058,7 +1058,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 2500 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabel_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" FILTER ("[bgt_type]" eq "Administratief gebied") TYPE POINT PROJECTION @@ -1133,7 +1133,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 2500 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT bgt_type, geometrie_punt AS geometrie, upper(naam) AS tekst, (360 - label_hoek::numeric) as hoek, identificatie FROM bgt_openbareruimtelabel_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" FILTER ("[bgt_type]" eq "Landschappelijk gebied") TYPE POINT PROJECTION @@ -1208,7 +1208,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 1250 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT geometrie_punt AS geometrie, upper(nummeraanduidingreeks_afgekort) AS tekst, (360 - labelhoek::numeric) as hoek, identificatie FROM bgt_nummeraanduidingreekslabels WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" + DATA "geometrie FROM (SELECT geometrie_punt AS geometrie, upper(nummeraanduidingreeks_afgekort) AS tekst, (360 - labelhoek::numeric) as hoek, identificatie FROM bgt_nummeraanduidingreekslabels_v1 WHERE object_eindtijd IS NULL) AS data USING srid=28992 using unique identificatie" TYPE POINT PROJECTION "init=epsg:28992" @@ -1292,7 +1292,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 1250 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT geometrie_punt AS geometrie, nummeraanduidingreeks AS tekst, (360 - label_hoek::numeric) as hoek, hoort_bij_bag_ligplaats FROM bgt_ligplaatsnummeraanduidingreekslabels) AS data USING srid=28992 USING UNIQUE hoort_bij_bag_ligplaats" + DATA "geometrie FROM (SELECT geometrie_punt AS geometrie, nummeraanduidingreeks AS tekst, (360 - label_hoek::numeric) as hoek, hoort_bij_bag_ligplaats FROM bgt_ligplaatsnummeraanduidingreekslabels_v1) AS data USING srid=28992 USING UNIQUE hoort_bij_bag_ligplaats" TYPE POINT PROJECTION "init=epsg:28992" @@ -1376,7 +1376,7 @@ MAP GROUP bgt_label MAXSCALEDENOM 1250 INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM (SELECT geometrie_punt AS geometrie, nummeraanduidingreeks AS tekst, (360 - label_hoek::numeric) as hoek, hoort_bij_bag_standplaats FROM bgt_standplaatsnummeraanduidingreekslabels) AS data USING srid=28992 USING UNIQUE hoort_bij_bag_standplaats" + DATA "geometrie FROM (SELECT geometrie_punt AS geometrie, nummeraanduidingreeks AS tekst, (360 - label_hoek::numeric) as hoek, hoort_bij_bag_standplaats FROM bgt_standplaatsnummeraanduidingreekslabels_v1) AS data USING srid=28992 USING UNIQUE hoort_bij_bag_standplaats" TYPE POINT PROJECTION "init=epsg:28992" diff --git a/sport.map b/sport.map index b5d8dfec..f0e3bf2c 100644 --- a/sport.map +++ b/sport.map @@ -38,7 +38,7 @@ MAP LAYER NAME "zwembaden" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_zwembad USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_zwembad_v2 USING srid=28992 USING UNIQUE id" TYPE POINT METADATA @@ -63,7 +63,7 @@ MAP LAYER NAME "hardlooproutes" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_hardlooproute USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_hardlooproute_v2 USING srid=28992 USING UNIQUE id" TYPE LINE METADATA @@ -93,7 +93,7 @@ MAP LAYER NAME "openbaresportplekken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_openbaresportplek USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_openbaresportplek_v2 USING srid=28992 USING UNIQUE id" TYPE POINT METADATA @@ -118,7 +118,7 @@ MAP LAYER NAME "sportaanbieders" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_aanbieder USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_aanbieder_v2 USING srid=28992 USING UNIQUE id" TYPE POINT METADATA @@ -143,7 +143,7 @@ MAP LAYER NAME "sportparken" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_park USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_park_v2 USING srid=28992 USING UNIQUE id" TYPE POLYGON METADATA @@ -173,7 +173,7 @@ MAP LAYER NAME "sportvelden" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_veld USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_veld_v2 USING srid=28992 USING UNIQUE id" TYPE POLYGON METADATA @@ -204,7 +204,7 @@ MAP LAYER NAME "sporthallen" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.sport_hal USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.sport_hal_v2 USING srid=28992 USING UNIQUE id" TYPE POINT METADATA diff --git a/stroomstoringen.map b/stroomstoringen.map index 7d63a42a..ef5fe6ae 100644 --- a/stroomstoringen.map +++ b/stroomstoringen.map @@ -22,7 +22,7 @@ MAP LAYER NAME "stroomstoring onopgelost" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.stroomstoringen_stroomstoringen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.stroomstoringen_stroomstoringen_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON METADATA @@ -54,7 +54,7 @@ MAP LAYER NAME "stroomstoring opgelost" INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.stroomstoringen_stroomstoringen USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.stroomstoringen_stroomstoringen_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON METADATA diff --git a/varen.map b/varen.map index 0cc9760b..d6bb6338 100644 --- a/varen.map +++ b/varen.map @@ -28,7 +28,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM varen_ligplaats USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM varen_ligplaats_1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 @@ -125,7 +125,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometrie FROM varen_opafstapplaats USING srid=28992 USING UNIQUE id" + DATA "geometrie FROM varen_opafstapplaats_v1 USING srid=28992 USING UNIQUE id" TYPE POINT MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/vastgoed.map b/vastgoed.map index f2c7800a..1cf3e6e0 100644 --- a/vastgoed.map +++ b/vastgoed.map @@ -33,7 +33,7 @@ MAP INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT * from vastgoed_gemeentelijk + SELECT * from vastgoed_gemeentelijk_v2 WHERE object_eigendomsstatus = 'volle eigendom' ) AS sub USING srid=28992 USING UNIQUE id" @@ -88,7 +88,7 @@ MAP INCLUDE "connection/dataservices.inc" DATA "geometrie FROM ( - SELECT * from vastgoed_gemeentelijk + SELECT * from vastgoed_gemeentelijk_v2 WHERE object_eigendomsstatus = 'appartementsrecht' ) AS sub USING srid=28992 USING UNIQUE id" diff --git a/winkgeb.map b/winkgeb.map index 60a51fbd..95eb0e3c 100644 --- a/winkgeb.map +++ b/winkgeb.map @@ -32,7 +32,7 @@ MAP END INCLUDE "connection/dataservices.inc" - DATA "geometry FROM public.winkelgebieden_winkelgebieden USING srid=28992 USING UNIQUE id" + DATA "geometry FROM public.winkelgebieden_winkelgebieden_v1 USING srid=28992 USING UNIQUE id" TYPE POLYGON MINSCALEDENOM 10 MAXSCALEDENOM 400000 diff --git a/woningbouw.map b/woningbouw.map index 22334838..8fee1f65 100644 --- a/woningbouw.map +++ b/woningbouw.map @@ -24,7 +24,7 @@ MAP DATA " geometrie FROM ( SELECT identificatie, geometrie FROM - public.bag_panden + public.bag_panden_v1 WHERE begin_geldigheid < now() AND (eind_geldigheid IS NULL OR eind_geldigheid > now()) diff --git a/ziektenplagenexotengroen.map b/ziektenplagenexotengroen.map index 948ca0f6..faa670ee 100644 --- a/ziektenplagenexotengroen.map +++ b/ziektenplagenexotengroen.map @@ -1050,8 +1050,8 @@ EXPRESSION ("[categorie]" = "Woningbouwcorporaties") END CLASS NAME 'meerdere_categorieen' - TITLE 'Meerdere Categorieën' -EXPRESSION ("[categorie]" = "meerdere categorieën") + TITLE 'Meerdere Categorieën' +EXPRESSION ("[categorie]" = "meerdere categorieën") STYLE COLOR '#008080' OPACITY 20