jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1250 from umap-project/has-geom

Browse source 
Do not try to compute geom based property before we have a geom
This commit is contained in:
Yohan Boniface 2023-08-15 07:28:02 +02:00 committed by GitHub
commit 567a3fb308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
umap/static/umap/js/umap.features.js
View file

@ -445,6 +445,7 @@ L.U.FeatureMixin = {
},
resetTooltip: function () {
if (!this.hasGeom()) return
const displayName = this.getDisplayName(null)
let showLabel = this.getOption('showLabel')
const oldLabelHover = this.getOption('labelHover')
@ -495,15 +496,17 @@ L.U.FeatureMixin = {
extendedProperties: function () {
// Include context properties
properties = this.map.getGeoContext()
center = this.getCenter()
properties.lat = center.lat
properties.lon = center.lng
properties.lng = center.lng
properties.rank = this.getRank() + 1
if (L.locale) properties.locale = L.locale
if (L.lang) properties.lang = L.lang
if (typeof this.getMeasure !== 'undefined') {
properties.measure = this.getMeasure()
properties.rank = this.getRank() + 1
if (this.hasGeom()) {
center = this.getCenter()
properties.lat = center.lat
properties.lon = center.lng
properties.lng = center.lng
if (typeof this.getMeasure !== 'undefined') {
properties.measure = this.getMeasure()
}
}
return L.extend(properties, this.properties)
},
@ -536,6 +539,10 @@ L.U.Marker = L.Marker.extend({
this._popupHandlersAdded = true // prevent Leaflet from binding event on bindPopup
},
hasGeom: function () {
return !!this._latlng
},
_onMouseOut: function () {
if (
this.dragging &&
@ -680,6 +687,10 @@ L.U.Marker = L.Marker.extend({
})
L.U.PathMixin = {
hasGeom: function () {
return !this.isEmpty()
},
connectToDataLayer: function (datalayer) {
L.U.FeatureMixin.connectToDataLayer.call(this, datalayer)
// We keep markers on their own layer on top of the paths.