fix(maps.js): fix app loading using /reach url

GIScience · Sep 16, 2021 · ae39c88 · ae39c88
1 parent 4540e1d
commit ae39c88
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/src/pages/maps/maps.js b/src/pages/maps/maps.js
@@ -402,6 +402,7 @@ export default {
      */
     storeZoomValue (zoom = null) {
       const appRouteData = this.$store.getters.appRouteData
+      appRouteData.options = appRouteData.options || {}
       zoom = zoom || appRouteData.options.zoom || this.defaultZoom
       appRouteData.options.zoom = zoom
       this.$store.commit('appRouteData', appRouteData)

diff --git a/src/support/dependency-service.js b/src/support/dependency-service.js
@@ -366,26 +366,28 @@ const applyValuesRestrictions = (scopedFilters, key) => {
 const setFilteredValues = (scopedFilters, key, dependsOnFilter, rule) => {
   if (rule.valuesWhen && scopedFilters[key]) {    
     Object.keys(rule.valuesWhen).forEach(function (ruleKey) {
-      if ((dependsOnFilter.value === ruleKey) || (ruleKey.endsWith('*') && dependsOnFilter.value.startsWith(ruleKey.replace('*', '')))) {
-        if (rule.valuesWhen[ruleKey].value !== undefined) {
-          scopedFilters[key].value = getRuleValue(rule, ruleKey, 'value')
-        }
-        if (rule.valuesWhen[ruleKey].min !== undefined) {
-          scopedFilters[key].min = getRuleValue(rule, ruleKey, 'min')
-        }
-        if (rule.valuesWhen[ruleKey].max !== undefined) {
-          scopedFilters[key].max = getRuleValue(rule, ruleKey, 'max')
-          if (scopedFilters[key].min > scopedFilters[key].max) {
-            scopedFilters[key].min = scopedFilters[key].max
+      if (dependsOnFilter.value) {
+        if ((dependsOnFilter.value === ruleKey) || (ruleKey.endsWith('*') && dependsOnFilter.value.startsWith(ruleKey.replace('*', '')))) {
+          if (rule.valuesWhen[ruleKey].value !== undefined) {
+            scopedFilters[key].value = getRuleValue(rule, ruleKey, 'value')
           }
+          if (rule.valuesWhen[ruleKey].min !== undefined) {
+            scopedFilters[key].min = getRuleValue(rule, ruleKey, 'min')
+          }
+          if (rule.valuesWhen[ruleKey].max !== undefined) {
+            scopedFilters[key].max = getRuleValue(rule, ruleKey, 'max')
+            if (scopedFilters[key].min > scopedFilters[key].max) {
+              scopedFilters[key].min = scopedFilters[key].max
+            }
+          }
+          if (rule.valuesWhen[ruleKey].multiplyValueBy !== undefined) {
+            scopedFilters[key].multiplyValueBy = getRuleValue(rule, ruleKey, 'multiplyValueBy')
+          }
+          if (rule.valuesWhen[ruleKey].step !== undefined) {
+            scopedFilters[key].step = getRuleValue(rule, ruleKey, 'step')
+          }
+          return false
         }
-        if (rule.valuesWhen[ruleKey].multiplyValueBy !== undefined) {
-          scopedFilters[key].multiplyValueBy = getRuleValue(rule, ruleKey, 'multiplyValueBy')
-        }
-        if (rule.valuesWhen[ruleKey].step !== undefined) {
-          scopedFilters[key].step = getRuleValue(rule, ruleKey, 'step')
-        }
-        return false
       }
     })
   }