bugfix: mobility map crashes after covid-sim upgrade

matsim-vsp · Nov 6, 2024 · b8d76ff · b8d76ff
1 parent e3cf3e2
commit b8d76ff
Show file tree

Hide file tree

Showing 3 changed files with 8,413 additions and 12 deletions.
diff --git a/src/components/MobilityMap.vue b/src/components/MobilityMap.vue
@@ -90,7 +90,6 @@ export default defineComponent({
 
   mounted() {
     this.loadData(this.svnUrl + this.landkreiseUrl)
-    //this.loadBundesland(this.svnUrl + this.bundeslandUrl)
     this.updateMap()
   },
 
@@ -158,7 +157,6 @@ export default defineComponent({
         var locations = []
         var data = []
         var names = []
-        var localActivity = this.activity
         for (const [key, value] of Object.entries(this.landkreisData)) {
           var id
           id = this.mapping[key]
@@ -199,6 +197,9 @@ export default defineComponent({
             this.data[0].z = data
             this.data[0].featureidkey = 'properties.id_2'
             this.data[0].text = names
+            // force update the data array...
+            // otherwise the map won't update
+            this.data = [...this.data]
           }
         }
       } else {

diff --git a/src/views/MobilityPageLandkreise.vue b/src/views/MobilityPageLandkreise.vue
@@ -197,17 +197,14 @@ const i18n = {
   },
 }
 
-import { Route } from 'vue-router'
 import MarkdownIt from 'markdown-it'
 import Papaparse from '@simwrapper/papaparse'
-import VueSlider from 'vue-slider-component'
 import YAML from 'yaml'
 
 import Colophon from '@/components/Colophon.vue'
 import MobilityPlot from '@/components/MobilityPlot.vue'
 import MobilityPlotLandkreise from '@/components/MobilityPlotLandkreise.vue'
 import MobilityMap from '@/components/MobilityMap.vue'
-import 'vue-slider-component/theme/default.css'
 
 type MobilityYaml = {
   description?: string
@@ -216,7 +213,6 @@ type MobilityYaml = {
 }
 
 import { defineComponent } from 'vue'
-import type { PropType } from 'vue'
 
 const public_svn =
   'https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/episim/'
@@ -230,11 +226,8 @@ const markdownParser = new MarkdownIt({
 export default defineComponent({
   name: 'MobilityPageLandkreise',
   i18n,
-  components: { VueSlider, Colophon, MobilityPlot, MobilityMap, MobilityPlotLandkreise },
-  props: {
-    // state: { type: Object, required: true },
-    // measure: { type: String, required: true },
-  },
+  components: { Colophon, MobilityPlot, MobilityMap, MobilityPlotLandkreise },
+  props: {},
   data() {
     return {
       badPage: false,
@@ -583,7 +576,8 @@ export default defineComponent({
         }
       }
 
-      for (var i = 0; i < this.mobilityWeekly.length; i++) {
+      const minLength = Math.min(this.mobilityWeekly.length, this.rangeWeekly.length)
+      for (var i = 0; i < minLength; i++) {
         var landkreis = this.mobilityWeekly[i].Landkreis
         var date = this.rangeWeekly[i].date
         var dailyRange = this.rangeWeekly[i].dailyRangePerPerson