Mercurial > gemma

changeset 2446:ba15d3534b2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: partially revert e0f423606929 Sorry, accidentally committed files that don't belong in this commit.
author Markus Kottlaender <markus@intevation.de>
date Fri, 01 Mar 2019 12:55:48 +0100
parents e0f423606929
children 522024fa06eb
files client/src/components/Maplayer.vue client/src/store/map.js
diffstat 2 files changed, 9 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Maplayer.vue	Fri Mar 01 12:42:52 2019 +0100
+++ b/client/src/components/Maplayer.vue	Fri Mar 01 12:55:48 2019 +0100
@@ -352,20 +352,6 @@
     );
     layer.data.setVisible(layer.isVisible);
 
-    layer = this.getLayerByName(LAYERS.BOTTLENECKSTATUS);
-    layer.data.getSource().setLoader(
-      this.buildVectorLoader(
-        {
-          featureNS: "gemma",
-          featurePrefix: "gemma",
-          featureTypes: ["bottlenecks_geoserver"],
-          geometryName: "area"
-        },
-        "/internal/wfs",
-        layer.data.getSource()
-      )
-    );
-
     layer = this.getLayerByName(LAYERS.BOTTLENECKS);
     layer.data.getSource().setLoader(
       this.buildVectorLoader(
--- a/client/src/store/map.js	Fri Mar 01 12:42:52 2019 +0100
+++ b/client/src/store/map.js	Fri Mar 01 12:55:48 2019 +0100
@@ -44,7 +44,6 @@
   WATERWAYAXIS: "Waterway Axis",
   WATERWAYPROFILES: "Waterway Profiles",
   BOTTLENECKS: "Bottlenecks",
-  BOTTLENECKSTATUS: "Bottleneck Status",
   BOTTLENECKISOLINE: "Bottleneck isolines",
   DISTANCEMARKS: "Distance marks",
   DISTANCEMARKSAXIS: "Distance marks, Axis",
@@ -280,48 +279,15 @@
           source: new VectorSource({
             strategy: bboxStrategy
           }),
-          style: function(feature, resolution) {
-            if (resolution <= 50) {
-              return new Style({
-                stroke: new Stroke({
-                  color: "rgba(230, 230, 10, .8)",
-                  width: 4
-                }),
-                fill: new Fill({
-                  color: "rgba(230, 230, 10, .3)"
-                })
-              });
-            }
-            return [];
-          }
-        }),
-        isVisible: true,
-        showInLegend: true
-      },
-      {
-        name: LAYERS.BOTTLENECKSTATUS,
-        data: new VectorLayer({
-          source: new VectorSource({
-            strategy: bboxStrategy
-          }),
-          style: function(feature, resolution) {
-            if (resolution > 50) {
-              let bnCenter = getCenter(feature.getGeometry().getExtent());
-              let fillColor = feature.get("fa_critical")
-                ? "rgba(255, 0, 0, 0.5)"
-                : "rgba(0, 255, 0, 0.5)";
-              let strokeColor = feature.get("fa_critical") ? "red" : "green";
-              return new Style({
-                geometry: new Point(bnCenter),
-                image: new Circle({
-                  radius: 10,
-                  fill: new Fill({ color: fillColor }),
-                  stroke: new Stroke({ color: strokeColor, width: 2 })
-                })
-              });
-            }
-            return [];
-          }
+          style: new Style({
+            stroke: new Stroke({
+              color: "rgba(230, 230, 10, .8)",
+              width: 4
+            }),
+            fill: new Fill({
+              color: "rgba(230, 230, 10, .3)"
+            })
+          })
         }),
         isVisible: true,
         showInLegend: true