From 367d457861041a211c766015ab469652422a4fc3 Mon Sep 17 00:00:00 2001
From: Edward Mac Gillavry <edward@webmapper.net>
Date: Tue, 7 Jan 2025 15:07:34 +0100
Subject: [PATCH] Changes to enable multiple styles for reference map (#630)

* Also mount 'sld' directory into the container for map styling.

* Merge 'binnentuin' layers and remove obsolete filter for 'autosnelweg' (in SQL already).
---
 compose.yml         |  2 ++
 sld/kbk10_light.xml | 49 ++++++---------------------------------------
 sld/kbk10_zw.xml    | 47 +++++--------------------------------------
 3 files changed, 13 insertions(+), 85 deletions(-)

diff --git a/compose.yml b/compose.yml
index e8914ebf..4ea2024c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -90,6 +90,7 @@ services:
       - ./tools/:/srv/mapserver/tools/
       - ./symbols/:/srv/mapserver/symbols/
       - ./fonts/:/srv/mapserver/fonts/
+      - ./sld/:/srv/mapserver/sld/
       - ./connection/:/srv/mapserver/connection/
       - ./private:/srv/mapserver/
 
@@ -122,5 +123,6 @@ services:
       - ./tools/:/srv/mapserver/tools/
       - ./symbols/:/srv/mapserver/symbols/
       - ./fonts/:/srv/mapserver/fonts/
+      - ./sld/:/srv/mapserver/sld/
       - ./connection/:/srv/mapserver/connection/
       - ./referentiekaarten/:/srv/mapserver/
diff --git a/sld/kbk10_light.xml b/sld/kbk10_light.xml
index 26028113..91914d96 100644
--- a/sld/kbk10_light.xml
+++ b/sld/kbk10_light.xml
@@ -417,24 +417,7 @@
     </UserStyle>
   </NamedLayer>
   <NamedLayer>
-    <Name>TRN_binnentuin-case</Name>
-    <UserStyle>
-      <FeatureTypeStyle>
-        <Rule>
-          <MinScaleDenominator>3500</MinScaleDenominator>
-          <MaxScaleDenominator>8000</MaxScaleDenominator>
-          <PolygonSymbolizer>
-            <Stroke>
-              <CssParameter name="stroke">#C9C7C2</CssParameter>
-              <CssParameter name="stroke-width">1.5</CssParameter>
-            </Stroke>
-          </PolygonSymbolizer>
-        </Rule>
-      </FeatureTypeStyle>
-    </UserStyle>
-  </NamedLayer>
-  <NamedLayer>
-    <Name>TRN_binnentuin-fill</Name>
+    <Name>TRN_binnentuin</Name>
     <UserStyle>
       <FeatureTypeStyle>
         <Rule>
@@ -444,6 +427,10 @@
             <Fill>
               <CssParameter name="fill">#E5EBD8</CssParameter>
             </Fill>
+            <Stroke>
+              <CssParameter name="stroke">#C9C7C2</CssParameter>
+              <CssParameter name="stroke-width">1.5</CssParameter>
+            </Stroke>
           </PolygonSymbolizer>
         </Rule>
       </FeatureTypeStyle>
@@ -871,12 +858,6 @@
     <UserStyle>
       <FeatureTypeStyle>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>8000</MinScaleDenominator>
           <MaxScaleDenominator>20000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -887,12 +868,6 @@
           </LineSymbolizer>
         </Rule>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>3500</MinScaleDenominator>
           <MaxScaleDenominator>8000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -910,12 +885,6 @@
     <UserStyle>
       <FeatureTypeStyle>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>8000</MinScaleDenominator>
           <MaxScaleDenominator>20000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -926,12 +895,6 @@
           </LineSymbolizer>
         </Rule>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>3500</MinScaleDenominator>
           <MaxScaleDenominator>8000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -944,4 +907,4 @@
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>
-</StyledLayerDescriptor>
+</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/sld/kbk10_zw.xml b/sld/kbk10_zw.xml
index 27bd50f8..fa85e490 100644
--- a/sld/kbk10_zw.xml
+++ b/sld/kbk10_zw.xml
@@ -417,13 +417,16 @@
     </UserStyle>
   </NamedLayer>
   <NamedLayer>
-    <Name>TRN_binnentuin-case</Name>
+    <Name>TRN_binnentuin</Name>
     <UserStyle>
       <FeatureTypeStyle>
         <Rule>
           <MinScaleDenominator>3500</MinScaleDenominator>
           <MaxScaleDenominator>8000</MaxScaleDenominator>
           <PolygonSymbolizer>
+            <Fill>
+              <CssParameter name="fill">#F0F0F0</CssParameter>
+            </Fill>
             <Stroke>
               <CssParameter name="stroke">#C9C7C2</CssParameter>
               <CssParameter name="stroke-width">1.5</CssParameter>
@@ -433,22 +436,6 @@
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>
-  <NamedLayer>
-    <Name>TRN_binnentuin-fill</Name>
-    <UserStyle>
-      <FeatureTypeStyle>
-        <Rule>
-          <MinScaleDenominator>3500</MinScaleDenominator>
-          <MaxScaleDenominator>10000</MaxScaleDenominator>
-          <PolygonSymbolizer>
-            <Fill>
-              <CssParameter name="fill">#F0F0F0</CssParameter>
-            </Fill>
-          </PolygonSymbolizer>
-        </Rule>
-      </FeatureTypeStyle>
-    </UserStyle>
-  </NamedLayer>
   <NamedLayer>
     <Name>WDL_waterbassin</Name>
     <UserStyle>
@@ -871,12 +858,6 @@
     <UserStyle>
       <FeatureTypeStyle>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>8000</MinScaleDenominator>
           <MaxScaleDenominator>20000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -887,12 +868,6 @@
           </LineSymbolizer>
         </Rule>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>3500</MinScaleDenominator>
           <MaxScaleDenominator>8000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -910,12 +885,6 @@
     <UserStyle>
       <FeatureTypeStyle>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>8000</MinScaleDenominator>
           <MaxScaleDenominator>20000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -926,12 +895,6 @@
           </LineSymbolizer>
         </Rule>
         <Rule>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:PropertyName>TYPEWEG</ogc:PropertyName>
-              <ogc:Literal>autosnelweg</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
           <MinScaleDenominator>3500</MinScaleDenominator>
           <MaxScaleDenominator>8000</MaxScaleDenominator>
           <LineSymbolizer>
@@ -944,4 +907,4 @@
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>
-</StyledLayerDescriptor>
+</StyledLayerDescriptor>
\ No newline at end of file