FGFS-4.1/flightgear-airports-old
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove center storing

Browse Source
This commit is contained in:
portree_kid 2020-05-24 14:57:50 +02:00
parent 7142373c2a
commit 3ee9ec60e3
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer/components/FlightgearMap.vue
View File

@ -104,10 +104,11 @@
}, },
visible (feature) { visible (feature) {
let bounds = this.$store.state.Settings.bounds let bounds = this.$store.state.Settings.bounds
if (!bounds.hasOwnProperty('getNorthEast')) { bounds = L.latLngBounds(L.latLng(bounds._southWest), L.latLng(bounds._northEast))
if (!bounds.hasOwnProperty('_northEast') && this.$refs.map) {
bounds = this.$refs.map.mapObject.getBounds() bounds = this.$refs.map.mapObject.getBounds()
} }
let width = bounds.getNorthWest().distanceTo(bounds.getSouthEast()) let width = L.latLng(bounds._northEast).distanceTo(L.latLng(bounds._southWest))
// Load all airports in a minimum 5 km box // Load all airports in a minimum 5 km box
if (width < 5000) { if (width < 5000) {
let rest = 5000 - width let rest = 5000 - width
@ -116,10 +117,10 @@
} }
let coordinates = feature.geometry.coordinates let coordinates = feature.geometry.coordinates
let ret = bounds.getNorthEast().lat > Number(coordinates[1]) && let ret = bounds._northEast.lat > Number(coordinates[1]) &&
bounds.getNorthEast().lng > Number(coordinates[0]) bounds._northEast.lng > Number(coordinates[0])
let ret2 = bounds.getSouthWest().lat < Number(coordinates[1]) && let ret2 = bounds._southWest.lat < Number(coordinates[1]) &&
bounds.getSouthWest().lng < Number(coordinates[0]) bounds._southWest.lng < Number(coordinates[0])
return ret && ret2 return ret && ret2
}, },
normalStyle (target) { normalStyle (target) {
@ -166,11 +167,13 @@
} }
}, },
async centerUpdated (center) { async centerUpdated (center) {
/*
if (center !== this.$store.state.Settings.center) { if (center !== this.$store.state.Settings.center) {
this.$store.dispatch('setCenter', center) this.$store.dispatch('setCenter', center)
this.$refs.airportLayer.setVisible(this.zoom < 12) this.$refs.airportLayer.setVisible(this.zoom < 12)
this.$refs.pavementLayer.setVisible(this.zoom < 12) this.$refs.pavementLayer.setVisible(this.zoom < 12)
} }
*/
}, },
async boundsUpdated (bounds) { async boundsUpdated (bounds) {
if (bounds !== this.$store.state.Settings.bounds) { if (bounds !== this.$store.state.Settings.bounds) {
@ -185,7 +188,10 @@
return this.$store.state.Settings.zoom return this.$store.state.Settings.zoom
}, },
center: function () { center: function () {
return this.$store.state.Settings.center let bounds = this.$store.state.Settings.bounds
bounds = L.latLngBounds(L.latLng(bounds._southWest), L.latLng(bounds._northEast))
return bounds.getCenter()
} }
} }
} }