Merge branch 'master' into multiple-time-periods

OSU-Sustainability-Office · Jan 2, 2024 · fef47f9 · fef47f9
2 parents 8a0b664 + c7818d2
commit fef47f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git 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"
@@ -216,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
@@ -347,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)
@@ -497,6 +505,7 @@ export default {
  this.message = inputWord
  })
  this.map.zoomControl.setPosition('topleft')
+ this.initBuildingRename()
  },
  mounted () {
  this.$nextTick(() => {
@@ -638,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)

diff --git 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>