CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8473 from mbrzakovic/8472-crossEditableZoom

Browse Source 
CrossEditableZoom event firing fix - Use fresh zoom level value to determine if event should be fired
This commit is contained in:
Milos Brzakovic
2021-06-21 16:54:22 +02:00
committed by GitHub
parent a38aa34204 92a9ef2061
commit 83509f98de
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/renderer/map.js
View File

@@ -589,15 +589,6 @@ export function rendererMap(context) {
return; // no change
}
var withinEditableZoom = map.withinEditableZoom();
if (_lastWithinEditableZoom !== withinEditableZoom) {
if (_lastWithinEditableZoom !== undefined) {
// notify that the map zoomed in or out over the editable zoom threshold
dispatch.call('crossEditableZoom', this, withinEditableZoom);
}
_lastWithinEditableZoom = withinEditableZoom;
}
if (geoScaleToZoom(k, TILESIZE) < _minzoom) {
surface.interrupt();
dispatch.call('hitMinZoom', this, map);
@@ -608,6 +599,15 @@ export function rendererMap(context) {
}
projection.transform(eventTransform);
var withinEditableZoom = map.withinEditableZoom();
if (_lastWithinEditableZoom !== withinEditableZoom) {
if (_lastWithinEditableZoom !== undefined) {
// notify that the map zoomed in or out over the editable zoom threshold
dispatch.call('crossEditableZoom', this, withinEditableZoom);
}
_lastWithinEditableZoom = withinEditableZoom;
}
var scale = k / _transformStart.k;
var tX = (x / scale - _transformStart.x) * scale;