changeset 4378:09406e3b052c

layers: only load fairwaydimensions with staging_done on map
author Thomas Junk <thomas.junk@intevation.de>
date Wed, 11 Sep 2019 16:30:25 +0200
parents 4707fa47284a
children f0be2aec953a
files client/src/components/importoverview/FairwayDimensionDetail.vue client/src/components/map/layers.js
diffstat 2 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importoverview/FairwayDimensionDetail.vue	Wed Sep 11 16:17:50 2019 +0200
+++ b/client/src/components/importoverview/FairwayDimensionDetail.vue	Wed Sep 11 16:30:25 2019 +0200
@@ -102,12 +102,6 @@
       this.LOS = level_of_service;
       this.organization = source_organization;
     });
-    // this.$store.dispatch("map/moveToBoundingBox", {
-    //   boundingBox: ,
-    //   zoom: 17,
-    //   preventZoomOut: true,
-    //   duration: 0
-    // });
   },
   computed: {
     ...mapGetters("map", ["openLayersMap"]),
--- a/client/src/components/map/layers.js	Wed Sep 11 16:17:50 2019 +0200
+++ b/client/src/components/map/layers.js	Wed Sep 11 16:30:25 2019 +0200
@@ -11,7 +11,7 @@
 import { bbox as bboxStrategy } from "ol/loadingstrategy";
 import { WFS, GeoJSON } from "ol/format";
 import OSM from "ol/source/OSM";
-import { equalTo } from "ol/format/filter";
+import { equalTo, and as andFilter } from "ol/format/filter";
 import { HTTP } from "@/lib/http";
 import { styleFactory } from "./styles";
 import store from "@/store/index";
@@ -331,7 +331,10 @@
               {
                 geometryName: "area",
                 featureTypes: ["fairway_dimensions"],
-                filter: equalTo("level_of_service", 1)
+                filter: andFilter(
+                  equalTo("level_of_service", 1),
+                  equalTo("staging_done", true)
+                )
               },
               source,
               false
@@ -354,7 +357,10 @@
               {
                 geometryName: "area",
                 featureTypes: ["fairway_dimensions"],
-                filter: equalTo("level_of_service", 2)
+                filter: andFilter(
+                  equalTo("level_of_service", 2),
+                  equalTo("staging_done", true)
+                )
               },
               source,
               false
@@ -377,7 +383,10 @@
               {
                 geometryName: "area",
                 featureTypes: ["fairway_dimensions"],
-                filter: equalTo("level_of_service", 3)
+                filter: andFilter(
+                  equalTo("level_of_service", 3),
+                  equalTo("staging_done", true)
+                )
               },
               source,
               false