Merge branch 'develop'

colouring-cities · Oct 1, 2019 · fb0358e · fb0358e
2 parents ea15025 + f47e456
commit fb0358e
Show file tree

Hide file tree

Showing 124 changed files with 8,036 additions and 7,064 deletions.
diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
@@ -35,6 +35,12 @@
     </Style>
     <Style name="highlight">
         <Rule>
+            <Filter>[base_layer] = 'location' or [base_layer] = 'conservation_area'</Filter>
+            <LineSymbolizer stroke="#ff0000aa" stroke-width="4.5" />
+            <LineSymbolizer stroke="#ff0000ff" stroke-width="2.5" />
+        </Rule>
+        <Rule>
+            <ElseFilter />
             <LineSymbolizer stroke="#00ffffaa" stroke-width="4.5" />
             <LineSymbolizer stroke="#00ffffff" stroke-width="2.5" />
         </Rule>