# HG changeset patch
# User Raimund Renkert <raimund@renkert.org>
# Date 1570620583 -7200
# Node ID db4e7fecad0d00f149c7ab7e627c473987f677e1
# Parent  acd802a76b9322f6ccd6c6ae28be5699e83264a0
Updated SLD templates for sounding results and differences.

diff -r acd802a76b93 -r db4e7fecad0d client/src/components/layers/Layerselect.vue
--- a/client/src/components/layers/Layerselect.vue	Wed Oct 09 10:22:47 2019 +0200
+++ b/client/src/components/layers/Layerselect.vue	Wed Oct 09 13:29:43 2019 +0200
@@ -137,7 +137,7 @@
     },
     loadLegendImage(layer, storeTarget) {
       HTTP.get(
-        `/internal/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=${layer}&legend_options=columns:4;fontAntiAliasing:true`,
+        `/internal/wms?REQUEST=GetLegendGraphic&VERSION=1.3.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=${layer}&legend_options=columns:4;fontAntiAliasing:true&SCALE=5000`,
         {
           headers: {
             Accept: "image/png",
diff -r acd802a76b93 -r db4e7fecad0d style-templates/sounding_differences.sld-template
--- a/style-templates/sounding_differences.sld-template	Wed Oct 09 10:22:47 2019 +0200
+++ b/style-templates/sounding_differences.sld-template	Wed Oct 09 13:29:43 2019 +0200
@@ -50,74 +50,69 @@
             </ogc:And>
           </ogc:Filter>
         {{- end }}
-           <se:LineSymbolizer>
+        <se:MaxScaleDenominator>34e3</se:MaxScaleDenominator>
+          <se:PolygonSymbolizer>
+            <se:Fill>
+              <se:SvgParameter name="fill">{{ .Color }}</se:SvgParameter>
+            </se:Fill>
             <se:Stroke>
-              <se:SvgParameter name="stroke">{{ .Color }}</se:SvgParameter>
+              <se:SvgParameter name="stroke">#404040</se:SvgParameter>
               <se:SvgParameter name="stroke-width">0.5</se:SvgParameter>
             </se:Stroke>
-          </se:LineSymbolizer>
+          </se:PolygonSymbolizer>
+        </se:Rule>
+        <se:Rule>
+        {{- if not .HasLow }}
+          <se:Name>&#8804; {{ printf "%g" .High }}</se:Name>
+          <ogc:Filter>
+            <ogc:PropertyIsLessThanOrEqualTo>
+              <ogc:PropertyName>height</ogc:PropertyName>
+              <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
+            </ogc:PropertyIsLessThanOrEqualTo>
+          </ogc:Filter>
+        {{- else if not .HasHigh }}
+          <se:Name>&gt; {{ printf "%g" .Low }}</se:Name>
+          <ogc:Filter>
+            <ogc:PropertyIsGreaterThanOrEqualTo>
+              <ogc:PropertyName>height</ogc:PropertyName>
+              <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal>
+            </ogc:PropertyIsGreaterThanOrEqualTo>
+          </ogc:Filter>
+        {{- else }}
+          <se:Name>&#8804; {{ printf "%g" .High }}</se:Name>
+          <ogc:Filter>
+            <ogc:And>
+              <ogc:PropertyIsGreaterThan>
+                <ogc:PropertyName>height</ogc:PropertyName>
+                <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal>
+              </ogc:PropertyIsGreaterThan>
+              <ogc:PropertyIsLessThanOrEqualTo>
+                <ogc:PropertyName>height</ogc:PropertyName>
+                <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
+              </ogc:PropertyIsLessThanOrEqualTo>
+            </ogc:And>
+          </ogc:Filter>
+        {{- end }}
+        <se:MinScaleDenominator>34e3</se:MinScaleDenominator>
+          <se:PolygonSymbolizer>
+            <se:Fill>
+              <se:SvgParameter name="fill">{{ .Color }}</se:SvgParameter>
+            </se:Fill>
+          </se:PolygonSymbolizer>
         </se:Rule>
         {{ end }}
       </se:FeatureTypeStyle>
       <se:FeatureTypeStyle>
-        <se:Name>contour_lines_emph</se:Name>
-        <se:Description>
-          <se:Abstract>
-            FeatureTypeStyle for emphasized contour lines
-          </se:Abstract>
-          </se:Description>
-          <se:Rule>
-            <se:LegendGraphic>
-              <se:Graphic>
-            </se:Graphic>
-          </se:LegendGraphic>
-          <ogc:Filter>
-             <ogc:Or>
-              {{ range . -}}
-              {{ if .HasHigh -}}
-                <ogc:PropertyIsEqualTo>
-                <ogc:Function name="numberFormat">
-                  <ogc:Literal>0.000000</ogc:Literal>
-                  <ogc:PropertyName>height</ogc:PropertyName>
-                </ogc:Function>
-                <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
-                </ogc:PropertyIsEqualTo>
-              {{ end -}}
-              {{ end }}
-            </ogc:Or>
-          </ogc:Filter>
-          <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator>
-          <se:LineSymbolizer>
-            <se:Stroke>
-              <se:SvgParameter name="stroke-width">1.5</se:SvgParameter>
-              <se:SvgParameter name="stroke">
-                <ogc:Function name="Recode">
-                  <ogc:Function name="numberFormat">
-                    <ogc:Literal>0.000000</ogc:Literal>
-                    <ogc:PropertyName>height</ogc:PropertyName>
-                  </ogc:Function>
-                  {{ range . -}}
-                  {{ if .HasHigh -}}
-                  <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
-                  <ogc:Literal>{{ .Color }}</ogc:Literal>
-                  {{ end -}}
-                  {{ end }}
-                </ogc:Function>
-              </se:SvgParameter>
-            </se:Stroke>
-          </se:LineSymbolizer>
-        </se:Rule>
-      </se:FeatureTypeStyle>
-      <se:FeatureTypeStyle>
         <se:Name>contour_lines_label</se:Name>
         <se:Description>
           <se:Abstract>
-            FeatureTypeStyle for labels at contour lines
+            FeatureTypeStyle for labels at color areas
           </se:Abstract>
         </se:Description>
         <se:Rule>
           <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator>
           <se:TextSymbolizer>
+            <se:VendorOption name="spaceAround">50</se:VendorOption>
             <se:Label>
               <ogc:Function name="Recode">
                 <ogc:Function name="numberFormat">
diff -r acd802a76b93 -r db4e7fecad0d style-templates/sounding_results_areas_geoserver.sld-template
--- a/style-templates/sounding_results_areas_geoserver.sld-template	Wed Oct 09 10:22:47 2019 +0200
+++ b/style-templates/sounding_results_areas_geoserver.sld-template	Wed Oct 09 13:29:43 2019 +0200
@@ -50,7 +50,8 @@
             </ogc:And>
           </ogc:Filter>
         {{- end }}
-           <se:PolygonSymbolizer>
+          <se:MaxScaleDenominator>34e3</se:MaxScaleDenominator>
+          <se:PolygonSymbolizer>
             <se:Fill>
               <se:SvgParameter name="fill">{{ .Color }}</se:SvgParameter>
             </se:Fill>
@@ -60,6 +61,46 @@
             </se:Stroke>
           </se:PolygonSymbolizer>
         </se:Rule>
+        <se:Rule>
+        {{- if not .HasLow }}
+          <se:Name>&#8804; {{ printf "%g" .High }}</se:Name>
+          <ogc:Filter>
+            <ogc:PropertyIsLessThanOrEqualTo>
+              <ogc:PropertyName>height</ogc:PropertyName>
+              <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
+            </ogc:PropertyIsLessThanOrEqualTo>
+          </ogc:Filter>
+        {{- else if not .HasHigh }}
+          <se:Name>&gt; {{ printf "%g" .Low }}</se:Name>
+          <ogc:Filter>
+            <ogc:PropertyIsGreaterThanOrEqualTo>
+              <ogc:PropertyName>height</ogc:PropertyName>
+              <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal>
+            </ogc:PropertyIsGreaterThanOrEqualTo>
+          </ogc:Filter>
+        {{- else }}
+          <se:Name>&#8804; {{ printf "%g" .High }}</se:Name>
+          <ogc:Filter>
+            <ogc:And>
+              <ogc:PropertyIsGreaterThan>
+                <ogc:PropertyName>height</ogc:PropertyName>
+                <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal>
+              </ogc:PropertyIsGreaterThan>
+              <ogc:PropertyIsLessThanOrEqualTo>
+                <ogc:PropertyName>height</ogc:PropertyName>
+                <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
+              </ogc:PropertyIsLessThanOrEqualTo>
+            </ogc:And>
+          </ogc:Filter>
+        {{- end }}
+          <se:MinScaleDenominator>34e3</se:MinScaleDenominator>
+          <se:PolygonSymbolizer>
+            <se:Fill>
+              <se:SvgParameter name="fill">{{ .Color }}</se:SvgParameter>
+            </se:Fill>
+          </se:PolygonSymbolizer>
+        </se:Rule>
+        <se:VendorOption name="sortBy">height</se:VendorOption>
         {{ end }}
       </se:FeatureTypeStyle>
       <se:FeatureTypeStyle>
@@ -70,12 +111,25 @@
           </se:Abstract>
         </se:Description>
         <se:Rule>
-            <!--
           <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator>
-          -->
           <se:TextSymbolizer>
+            <se:VendorOption name="spaceAround">10</se:VendorOption>
             <se:Label>
-              <ogc:PropertyName>height</ogc:PropertyName>
+              <ogc:Function name="Recode">
+                <ogc:Function name="numberFormat">
+                  <ogc:Literal>0.000000</ogc:Literal>
+                  <ogc:PropertyName>height</ogc:PropertyName>
+                </ogc:Function>
+                {{ range . -}}
+                {{ if .HasHigh -}}
+                    <ogc:Literal>
+                    {{- printf "%f" .High -}}
+                    </ogc:Literal><ogc:Literal>
+                    {{- printf "%g" .High -}}
+                    </ogc:Literal>
+                {{ end -}}
+                {{ end }}
+              </ogc:Function>
             </se:Label>
             <se:Font>
               <se:SvgParameter name="font-family">Avenir</se:SvgParameter>
diff -r acd802a76b93 -r db4e7fecad0d style-templates/sounding_results_contour_lines_geoserver.sld-template
--- a/style-templates/sounding_results_contour_lines_geoserver.sld-template	Wed Oct 09 10:22:47 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StyledLayerDescriptor
-    xmlns="http://www.opengis.net/sld"
-    xmlns:se="http://www.opengis.net/se"
-    xmlns:ogc="http://www.opengis.net/ogc"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd"
-    version="1.1.0">
-  <NamedLayer>
-    <se:Name>sounding_results_contour_lines</se:Name>
-    <UserStyle>
-      <se:Name>sounding_results_contour_lines</se:Name>
-      <se:FeatureTypeStyle>
-          <se:Name>contour_line_colours</se:Name>
-        <se:Description>
-          <se:Abstract>
-            FeatureTypeStyle defining colour classes for height attribute
-          </se:Abstract>
-        </se:Description>
-        {{ range . -}}
-        <se:Rule>
-        {{- if not .HasLow }}
-          <se:Name>&#8804; {{ printf "%g" .High }}</se:Name>
-          <ogc:Filter>
-            <ogc:PropertyIsLessThanOrEqualTo>
-              <ogc:PropertyName>height</ogc:PropertyName>
-              <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
-            </ogc:PropertyIsLessThanOrEqualTo>
-          </ogc:Filter>
-        {{- else if not .HasHigh }}
-          <se:Name>&gt; {{ printf "%g" .Low }}</se:Name>
-          <ogc:Filter>
-            <ogc:PropertyIsGreaterThanOrEqualTo>
-              <ogc:PropertyName>height</ogc:PropertyName>
-              <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal>
-            </ogc:PropertyIsGreaterThanOrEqualTo>
-          </ogc:Filter>
-        {{- else }}
-          <se:Name>&#8804; {{ printf "%g" .High }}</se:Name>
-          <ogc:Filter>
-            <ogc:And>
-              <ogc:PropertyIsGreaterThan>
-                <ogc:PropertyName>height</ogc:PropertyName>
-                <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal>
-              </ogc:PropertyIsGreaterThan>
-              <ogc:PropertyIsLessThanOrEqualTo>
-                <ogc:PropertyName>height</ogc:PropertyName>
-                <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
-              </ogc:PropertyIsLessThanOrEqualTo>
-            </ogc:And>
-          </ogc:Filter>
-        {{- end }}
-           <se:LineSymbolizer>
-            <se:Stroke>
-              <se:SvgParameter name="stroke">{{ .Color }}</se:SvgParameter>
-              <se:SvgParameter name="stroke-width">0.5</se:SvgParameter>
-            </se:Stroke>
-          </se:LineSymbolizer>
-        </se:Rule>
-        {{ end }}
-      </se:FeatureTypeStyle>
-      <se:FeatureTypeStyle>
-        <se:Name>contour_lines_emph</se:Name>
-        <se:Description>
-          <se:Abstract>
-            FeatureTypeStyle for emphasized contour lines
-          </se:Abstract>
-          </se:Description>
-          <se:Rule>
-            <se:LegendGraphic>
-              <se:Graphic>
-            </se:Graphic>
-          </se:LegendGraphic>
-          <ogc:Filter>
-             <ogc:Or>
-              {{ range . -}}
-              {{ if .HasHigh -}}
-                <ogc:PropertyIsEqualTo>
-                <ogc:Function name="numberFormat">
-                  <ogc:Literal>0.000000</ogc:Literal>
-                  <ogc:PropertyName>height</ogc:PropertyName>
-                </ogc:Function>
-                <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
-                </ogc:PropertyIsEqualTo>
-              {{ end -}}
-              {{ end }}
-            </ogc:Or>
-          </ogc:Filter>
-          <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator>
-          <se:LineSymbolizer>
-            <se:Stroke>
-              <se:SvgParameter name="stroke-width">1.5</se:SvgParameter>
-              <se:SvgParameter name="stroke">
-                <ogc:Function name="Recode">
-                  <ogc:Function name="numberFormat">
-                    <ogc:Literal>0.000000</ogc:Literal>
-                    <ogc:PropertyName>height</ogc:PropertyName>
-                  </ogc:Function>
-                  {{ range . -}}
-                  {{ if .HasHigh -}}
-                  <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal>
-                  <ogc:Literal>{{ .Color }}</ogc:Literal>
-                  {{ end -}}
-                  {{ end }}
-                </ogc:Function>
-              </se:SvgParameter>
-            </se:Stroke>
-          </se:LineSymbolizer>
-        </se:Rule>
-      </se:FeatureTypeStyle>
-      <se:FeatureTypeStyle>
-        <se:Name>contour_lines_label</se:Name>
-        <se:Description>
-          <se:Abstract>
-            FeatureTypeStyle for labels at contour lines
-          </se:Abstract>
-        </se:Description>
-        <se:Rule>
-          <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator>
-          <se:TextSymbolizer>
-            <se:Label>
-              <ogc:Function name="Recode">
-                <ogc:Function name="numberFormat">
-                  <ogc:Literal>0.000000</ogc:Literal>
-                  <ogc:PropertyName>height</ogc:PropertyName>
-                </ogc:Function>
-                {{ range . -}}
-                {{ if .HasHigh -}}
-                    <ogc:Literal>
-                    {{- printf "%f" .High -}}
-                    </ogc:Literal><ogc:Literal>
-                    {{- printf "%g" .High -}}
-                    </ogc:Literal>
-                {{ end -}}
-                {{ end }}
-              </ogc:Function>
-            </se:Label>
-            <se:Font>
-              <se:SvgParameter name="font-family">Avenir</se:SvgParameter>
-              <se:SvgParameter name="font-family">Helvetica</se:SvgParameter>
-              <se:SvgParameter name="font-family">Arial</se:SvgParameter>
-              <se:SvgParameter name="font-family">sans-serif</se:SvgParameter>
-            </se:Font>
-            <se:LabelPlacement>
-              <se:LinePlacement>
-                <se:PerpendicularOffset>5</se:PerpendicularOffset>
-              </se:LinePlacement>
-            </se:LabelPlacement>
-            <se:Fill>
-              <se:SvgParameter name="fill">#070707</se:SvgParameter>
-            </se:Fill>
-          </se:TextSymbolizer>
-        </se:Rule>
-      </se:FeatureTypeStyle>
-    </UserStyle>
-  </NamedLayer>
-</StyledLayerDescriptor>