# HG changeset patch # User Thomas Junk # Date 1568212225 -7200 # Node ID 09406e3b052ca2f7cc8c9430afa477bd0ed6a2fd # Parent 4707fa47284af5bfdc5e3cf7d799260f87e3ebcc layers: only load fairwaydimensions with staging_done on map diff -r 4707fa47284a -r 09406e3b052c client/src/components/importoverview/FairwayDimensionDetail.vue --- 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"]), diff -r 4707fa47284a -r 09406e3b052c client/src/components/map/layers.js --- 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