From c041108f09e818370f5437de1d002f68ffda8a26 Mon Sep 17 00:00:00 2001
From: solderq35 <solderq35@gmail.com>
Date: Sat, 30 Dec 2023 14:07:25 -0800
Subject: [PATCH 1/2] fix map search and geojson

---
 src/components/map/map.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/map/map.vue b/src/components/map/map.vue
index 4ec835c2..42b97886 100644
--- a/src/components/map/map.vue
+++ b/src/components/map/map.vue
@@ -94,6 +94,7 @@
           <l-tile-layer :url="url" :attribution="attribution"></l-tile-layer>
           <l-geo-json
             v-for="building of this.$store.getters['map/buildings']"
+            v-if="building.geoJSON"
             :key="building.id * rKey"
             :geojson="building.geoJSON"
             :options="buildingOptions"
@@ -101,7 +102,12 @@
           ></l-geo-json>
         </l-map>
       </div>
-      <prompt v-if="askingForComparison" @cancel="stopCompare" @compare="showComparison" />
+      <prompt
+        :compareStories="compareStories"
+        v-if="askingForComparison"
+        @cancel="stopCompare"
+        @compare="showComparison"
+      />
       <prompt_error v-if="building_compare_error" @cancel="stopCompareError" @compare="showComparison" />
       <transition name="side">
         <compareSide v-if="showCompareSide" @hide="showCompareSide = false" :compareStories="compareStories" />
@@ -211,7 +217,7 @@ export default {
               color: e.target.options.color
             }
             e.target.setStyle({ fillColor: '#000', color: '#000' })
-            e.target.bindTooltip(this.$store.getters['map/building'](e.target.feature.properties.id).name).openTooltip()
+            e.target.bindTooltip(e.target.feature.properties.name).openTooltip()
           })
           layer.on('mouseout', e => {
             if (!e.target.setStyle) return
@@ -342,6 +348,13 @@ export default {
         layer.unbindTooltip()
       }
     },
+    initBuildingRename () {
+      for (let layer of Object.values(this.map._layers)) {
+        if (layer.feature && layer.feature.geometry && layer.feature.geometry.type === 'Polygon') {
+          layer.feature.properties.name = this.$store.getters['map/building'](layer.feature.properties.id).name
+        }
+      }
+    },
     removeAllMarkers: function () {
       for (let marker of this.compareMarkers) {
         this.map.removeLayer(marker)
@@ -492,6 +505,7 @@ export default {
       this.message = inputWord
     })
     this.map.zoomControl.setPosition('topleft')
+    this.initBuildingRename()
   },
   mounted () {
     this.$nextTick(() => {
@@ -633,8 +647,6 @@ export default {
       var searchGroup = []
       for (let layer of Object.values(this.map._layers)) {
         if (layer.feature && layer.feature.geometry && layer.feature.geometry.type === 'Polygon') {
-          layer.feature.properties.name = this.$store.getters['map/building'](layer.feature.properties.id).name
-
           if (layer.feature.properties.name !== undefined) {
             if (layer.feature.properties.name.toLowerCase().includes(v.toLowerCase())) {
               searchGroup.push(layer)

From c7818d2029e6e0ad386d868bc3f49026b7c99755 Mon Sep 17 00:00:00 2001
From: s-egge <102624422+s-egge@users.noreply.github.com>
Date: Mon, 1 Jan 2024 17:45:02 -0800
Subject: [PATCH 2/2] Fixed Meter change issue (#290)

---
 src/components/view/modals/edit_card.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/view/modals/edit_card.vue b/src/components/view/modals/edit_card.vue
index 3b4350f6..18b3ea67 100644
--- a/src/components/view/modals/edit_card.vue
+++ b/src/components/view/modals/edit_card.vue
@@ -117,7 +117,7 @@
           ref="submeters"
           v-model="form.sets[currentIndex].meter"
           style="width: 100%"
-          @change="form[currentIndex].point = null"
+          @change="form.sets[currentIndex].point = meterPoints[0].value"
         >
           <el-option v-for="item in meters" :key="item.path" :label="item.name" :value="item.path"></el-option>
         </el-select>
@@ -214,7 +214,7 @@
               ref="submeters"
               v-model="form.sets[currentIndex].meter"
               style="width: 100%"
-              @change="form[currentIndex].point = null"
+              @change="form.sets[currentIndex].point = meterPoints[0].value"
             >
               <el-option v-for="item in meters" :key="item.path" :label="item.name" :value="item.path"></el-option>
             </el-select>