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

Fix map-in-map to use new d3 v4 zoom behavior

Browse Source
This commit is contained in:
Bryan Housel
2016-09-12 21:40:58 -04:00
parent 4522d8f89a
commit f1b918cf43
2 changed files with 103 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/map.js
+6 -13
View File
@@ -60,10 +60,7 @@ export function Map(context) {
selection
.on('dblclick.map', dblClick)
.call(zoom, d3.zoomIdentity
.translate(projection.translate())
.scale(projection.scale())
);
.call(zoom, projection.transform());
supersurface = selection.append('div')
.attr('id', 'supersurface')
@@ -260,10 +257,10 @@ export function Map(context) {
difference = extent = undefined;
}
var zoom = String(~~map.zoom());
if (surface.attr('data-zoom') !== zoom) {
surface.attr('data-zoom', zoom)
.classed('low-zoom', zoom <= 16);
var z = String(~~map.zoom());
if (surface.attr('data-zoom') !== z) {
surface.attr('data-zoom', z)
.classed('low-zoom', z <= 16);
}
if (!difference) {
@@ -281,11 +278,7 @@ export function Map(context) {
wrapper
.call(drawLayers);
transformStart = {
k: projection.scale(),
x: projection.translate()[0],
y: projection.translate()[1]
};
transformStart = projection.transform();
return map;
}