From 1e277b94c9ff950181d5d933241012aea0e10a7d Mon Sep 17 00:00:00 2001 From: Davey Oldenburg Date: Wed, 2 Oct 2024 10:50:53 +0200 Subject: [PATCH] Cartografische aanpassingen --- gen_historischebodeminformatie.py | 11 ++++--- historischebodeminformatie.map | 54 ++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/gen_historischebodeminformatie.py b/gen_historischebodeminformatie.py index 1604ba0..727182d 100644 --- a/gen_historischebodeminformatie.py +++ b/gen_historischebodeminformatie.py @@ -19,7 +19,7 @@ def slugify(s: str) -> str: ("Bodemgebruik en obstakels", "Overig", "Overig", ('#d00ee5', False)), ("Bodemgebruik en obstakels", "Spoorwegemplacement", "Spoorwegemplacement", ('#ae95b9', False)), ("Bodemgebruik en obstakels", "Stookruimte/olietank", "Stookruimte/olietank", ('#713dbe', False)), - ("Bodemgebruik en obstakels", "Tram- en busremises", "Tram en busremises", ('#3a15e1', False)), + ("Bodemgebruik en obstakels", "Tram- en busremises", "Tram- en busremises", ('#3a15e1', False)), ("Bodemgebruik en obstakels", "Volkstuinen", "Volkstuinen", ('#06d3f7', False)), ("Lijnvormige obstakels", "Gasbuis", "Gasbuis", ('#bfb479', True)), #LIJN zit in 'kabels en leidingen' ("Lijnvormige obstakels", "Grondkering", "Grondkering", ('#d7650e',False)), @@ -90,6 +90,7 @@ def slugify(s: str) -> str: with block("STYLE"): p(f'COLOR "{colors[0]}"') p("OPACITY", 40) + with block("STYLE"): p(f'OUTLINECOLOR "{colors[0]}"') p("WIDTH ", 2) @@ -140,12 +141,11 @@ def slugify(s: str) -> str: with block("STYLE"): p(f'COLOR "{colors[0]}"') - p("OPACITY", 40) p(f'OUTLINECOLOR "{colors[0]}"') p("WIDTH ", 2) if colors[1] == True: with block("PATTERN"): - print ("10 5") + print ("3 3") with block("LABEL"): p("MAXSCALEDENOM 3000") @@ -194,9 +194,12 @@ def slugify(s: str) -> str: with block("STYLE"): p(f'COLOR "{colors[0]}"') p("OPACITY", 40) + + #tweede style block om te voorkomen dat de randen ook transparant worden. + with block("STYLE"): p(f'OUTLINECOLOR "{colors[0]}"') p("WIDTH ", 2) - + #ik verdubbel het label omdat er twee opties zijn, ik krijg het simpeler even niet gefixt.. with block("LABEL"): p("EXPRESSION ([van_minimaal_jaar] = [van_maximaal_jaar])") diff --git a/historischebodeminformatie.map b/historischebodeminformatie.map index f57d651..2125ab9 100644 --- a/historischebodeminformatie.map +++ b/historischebodeminformatie.map @@ -33,6 +33,8 @@ MAP STYLE COLOR "#ebdc56" OPACITY 40 + END + STYLE OUTLINECOLOR "#ebdc56" WIDTH 2 END @@ -75,6 +77,8 @@ MAP STYLE COLOR "#d5587c" OPACITY 40 + END + STYLE OUTLINECOLOR "#d5587c" WIDTH 2 END @@ -117,6 +121,8 @@ MAP STYLE COLOR "#a78409" OPACITY 40 + END + STYLE OUTLINECOLOR "#a78409" WIDTH 2 END @@ -159,6 +165,8 @@ MAP STYLE COLOR "#0e6f99" OPACITY 40 + END + STYLE OUTLINECOLOR "#0e6f99" WIDTH 2 END @@ -201,6 +209,8 @@ MAP STYLE COLOR "#9bca54" OPACITY 40 + END + STYLE OUTLINECOLOR "#9bca54" WIDTH 2 END @@ -243,6 +253,8 @@ MAP STYLE COLOR "#03cea2" OPACITY 40 + END + STYLE OUTLINECOLOR "#03cea2" WIDTH 2 END @@ -285,6 +297,8 @@ MAP STYLE COLOR "#d00ee5" OPACITY 40 + END + STYLE OUTLINECOLOR "#d00ee5" WIDTH 2 END @@ -327,6 +341,8 @@ MAP STYLE COLOR "#ae95b9" OPACITY 40 + END + STYLE OUTLINECOLOR "#ae95b9" WIDTH 2 END @@ -369,6 +385,8 @@ MAP STYLE COLOR "#713dbe" OPACITY 40 + END + STYLE OUTLINECOLOR "#713dbe" WIDTH 2 END @@ -389,7 +407,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 where categorie = 'Tram- en busremises') as subquery USING srid=28992 USING UNIQUE id" GROUP 'bodemgebruik_en_obstakels' TYPE POLYGON TEMPLATE 'fooOnlyForWMSGetFeatureInfo.html' @@ -411,6 +429,8 @@ MAP STYLE COLOR "#3a15e1" OPACITY 40 + END + STYLE OUTLINECOLOR "#3a15e1" WIDTH 2 END @@ -453,6 +473,8 @@ MAP STYLE COLOR "#06d3f7" OPACITY 40 + END + STYLE OUTLINECOLOR "#06d3f7" WIDTH 2 END @@ -494,11 +516,10 @@ MAP TITLE 'Gasbuis' STYLE COLOR "#bfb479" - OPACITY 40 OUTLINECOLOR "#bfb479" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -539,7 +560,6 @@ MAP TITLE 'Grondkering' STYLE COLOR "#d7650e" - OPACITY 40 OUTLINECOLOR "#d7650e" WIDTH 2 END @@ -581,11 +601,10 @@ MAP TITLE 'Kabel' STYLE COLOR "#d67814" - OPACITY 40 OUTLINECOLOR "#d67814" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -626,11 +645,10 @@ MAP TITLE 'Mantelbuis' STYLE COLOR "#79e0d4" - OPACITY 40 OUTLINECOLOR "#79e0d4" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -671,11 +689,10 @@ MAP TITLE 'Persleiding' STYLE COLOR "#20a620" - OPACITY 40 OUTLINECOLOR "#20a620" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -716,11 +733,10 @@ MAP TITLE 'Riool' STYLE COLOR "#0e5129" - OPACITY 40 OUTLINECOLOR "#0e5129" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -761,11 +777,10 @@ MAP TITLE 'Spoorweg' STYLE COLOR "#232323" - OPACITY 40 OUTLINECOLOR "#232323" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -806,11 +821,10 @@ MAP TITLE 'Waterleiding' STYLE COLOR "#3a15e1" - OPACITY 40 OUTLINECOLOR "#3a15e1" WIDTH 2 PATTERN -10 5 +3 3 END END LABEL @@ -851,6 +865,8 @@ MAP STYLE COLOR "#e4d62e" OPACITY 40 + END + STYLE OUTLINECOLOR "#e4d62e" WIDTH 2 END @@ -919,6 +935,8 @@ MAP STYLE COLOR "#ce7263" OPACITY 40 + END + STYLE OUTLINECOLOR "#ce7263" WIDTH 2 END @@ -987,6 +1005,8 @@ MAP STYLE COLOR "#66b2b1" OPACITY 40 + END + STYLE OUTLINECOLOR "#66b2b1" WIDTH 2 END @@ -1055,6 +1075,8 @@ MAP STYLE COLOR "#8c8c8b" OPACITY 40 + END + STYLE OUTLINECOLOR "#8c8c8b" WIDTH 2 END