Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PR] fix map search and geojson #289

Merged
merged 1 commit into from
Dec 31, 2023
Merged

[PR] fix map search and geojson #289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/components/map/map.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,20 @@
<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"
ref="geoLayer"
></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" />
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -492,6 +505,7 @@ export default {
this.message = inputWord
})
this.map.zoomControl.setPosition('topleft')
this.initBuildingRename()
},
mounted () {
this.$nextTick(() => {
Expand Down Expand Up @@ -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)
Expand Down
Loading