almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-29 11:52:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2111 from umap-project/fix-bounds-isonscreen

Browse source 
fix: feature.isOnScreen is now passing the "bounds" argument
This commit is contained in:
Yohan Boniface 2024-09-06 16:30:01 +02:00 committed by GitHub
commit 1ab9d2bda6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
umap/static/umap/js/modules/data/features.js
View file

@ -98,8 +98,8 @@ class Feature {
this.pushGeometry() this.pushGeometry()
} }
isOnScreen() { isOnScreen(bounds) {
return this.ui?.isOnScreen() return this.ui?.isOnScreen(bounds)
} }
pushGeometry() { pushGeometry() {
@ -261,7 +261,7 @@ class Feature {
builder.helpers['properties.name'].input.focus() builder.helpers['properties.name'].input.focus()
}) })
this.map.editedFeature = this this.map.editedFeature = this
if (!this.ui.isOnScreen()) this.zoomTo(event) if (!this.ui.isOnScreen(this.map.getBounds())) this.zoomTo(event)
} }
getAdvancedEditActions(container) { getAdvancedEditActions(container) {

4
umap/static/umap/js/modules/rendering/ui.js
View file

@ -105,7 +105,7 @@ const FeatureMixin = {
text: translate('Copy as GeoJSON'), text: translate('Copy as GeoJSON'),
callback: () => { callback: () => {
L.Util.copyToClipboard(JSON.stringify(this.feature.toGeoJSON())) L.Util.copyToClipboard(JSON.stringify(this.feature.toGeoJSON()))
this._map.tooltip.open({content: L._('Copied!')}) this._map.tooltip.open({ content: L._('Copied!') })
}, },
}) })
if (this._map.editEnabled && !this.feature.isReadOnly()) { if (this._map.editEnabled && !this.feature.isReadOnly()) {
@ -156,7 +156,6 @@ const FeatureMixin = {
const PointMixin = { const PointMixin = {
isOnScreen: function (bounds) { isOnScreen: function (bounds) {
bounds = bounds || this._map.getBounds()
return bounds.contains(this.getCenter()) return bounds.contains(this.getCenter())
}, },
} }
@ -428,7 +427,6 @@ const PathMixin = {
], ],
isOnScreen: function (bounds) { isOnScreen: function (bounds) {
bounds = bounds || this._map.getBounds()
return bounds.overlaps(this.getBounds()) return bounds.overlaps(this.getBounds())
}, },
} }