Merge pull request #31 from openearth/Fix-mapboxlayers-array

Fix mapboxlayers array
openearth · Aug 12, 2019 · 9b6921f · 9b6921f
2 parents 7b98d32 + 1d452e8
commit 9b6921f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 202 deletions.
diff --git a/api-mock/datasets-old.json b/api-mock/datasets-old.json
diff --git a/api-mock/datasets.json b/api-mock/datasets.json
@@ -15,7 +15,7 @@
             "timeSpan": "Live",
             "units": "N/A",
             "vectorLayer": {
-                "mapboxLayer": [{
+                "mapboxLayers": [{
                     "filterIds": [
                         "Alert.level"
                     ],
@@ -61,7 +61,7 @@
             "timeSpan": "Live",
             "units": "m",
             "vectorLayer": {
-                "mapboxLayer": [{
+                "mapboxLayers": [{
                     "filterIds": [
                         "H.simulated"
                     ],
@@ -91,7 +91,7 @@
             "timeSpan": "Live",
             "units": "m",
             "vectorLayer": {
-                "mapboxLayer": [{
+                "mapboxLayers": [{
                     "filterIds": [
                         "H.surge.simulated"
                     ],
@@ -121,7 +121,7 @@
             "timeSpan": "Live",
             "units": "m",
             "vectorLayer": {
-                "mapboxLayer": [{
+                "mapboxLayers": [{
                     "filterIds": [
                         "H.astronomical.simulated"
                     ],
@@ -150,7 +150,7 @@
             "timeSpan": "Live",
             "units": "m/s",
             "vectorLayer": {
-                "mapboxLayer": [{
+                "mapboxLayers": [{
                     "filterIds": [
                         "Wind.speed",
                         "Wind.direction"
@@ -181,7 +181,7 @@
             "timeSpan": "Live",
             "units": "m",
             "vectorLayer": {
-                "mapboxLayer": [{
+                "mapboxLayers": [{
                     "filterIds": [
                         "H.simulated"
                     ],
@@ -205,7 +205,7 @@
             "timeSpan": "Historic",
             "units": "m",
             "vectorLayer": {
-                "mapboxLayer": [
+                "mapboxLayers": [
                     {
                         "id": "shoreline-aggregatedpointsz0",
                         "type": "circle",

diff --git a/components/v-mapbox-components/v-mapbox-vector-layer.vue b/components/v-mapbox-components/v-mapbox-vector-layer.vue
@@ -26,13 +26,7 @@ export default {
   watch: {
     layers: {
       handler(newValue) {
-        newValue.forEach((newLayer, index) => {
-          if (this.map.getLayer(this.layers[index].id)) {
-            this.map.setFilter(this.layers[index].id, newLayer.filter)
-          } else {
-            this.addToMap()
-          }
-        })
+        this.updateMap()
       },
       deep: true,
     },
@@ -43,7 +37,7 @@ export default {
   created() {
     this.map = this.getMap()
     if (this.map.loaded()) {
-      this.addToMap()
+      this.updateMap()
     }
   },
   beforeDestroy() {
@@ -56,7 +50,16 @@ export default {
   },
   methods: {
     deferredMountedTo(map) {
-      this.addToMap()
+      this.updateMap()
+    },
+    updateMap() {
+      this.layers.forEach((newLayer, index) => {
+        if (this.map.getLayer(this.layers[index].id)) {
+          this.map.setFilter(this.layers[index].id, newLayer.filter)
+        } else {
+          this.addToMap()
+        }
+      })
     },
     addToMap() {
       this.layers.forEach(layer => {

diff --git a/store/map/datasets.js b/store/map/datasets.js
@@ -30,7 +30,7 @@ export const mutations = {
 
     // TODO: make generic by looping over vectorLayer
     const mergedVector = _.merge(
-      { mapboxLayer: _.get(data, 'vectorLayer.mapboxLayer') },
+      { mapboxLayer: _.get(data, 'vectorLayer.mapboxLayers') },
       vectorData,
     )
     Vue.set(state[id], 'vector', mergedVector)

diff --git a/test/unit/store/map/datasets/mutations.spec.js b/test/unit/store/map/datasets/mutations.spec.js
@@ -3,7 +3,7 @@ import { mutations } from '../../../../../store/map/datasets'
 describe('addDatasetVector', () => {
   test('updates state with payload', () => {
     const state = { wl: { metadata: 'foo' } }
-    const data = { id: 'wl', vectorLayer: { mapboxLayer: 'bar' } }
+    const data = { id: 'wl', vectorLayer: { mapboxLayers: 'bar' } }
 
     mutations.addDatasetVector(state, data)
     expect(state).toMatchObject({
@@ -71,7 +71,7 @@ describe('addDatasetVector', () => {
       },
     }
 
-    const data = { id: 'wd', vectorLayer: { mapboxLayer: { bar: 'foo' } } }
+    const data = { id: 'wd', vectorLayer: { mapboxLayers: { bar: 'foo' } } }
 
     mutations.addDatasetVector(state, data)
     expect(state).toMatchObject({