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

Use #map clientrect instread of #surface (which can be transformed)

Browse Source
This commit is contained in:
Bryan Housel
2017-04-12 14:09:14 -04:00
parent b566cc9c90
commit bdcd4fd431
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/ui/intro/navigation.js
View File

@@ -34,6 +34,17 @@ export function uiIntroNavigation(context, reveal) {
}
function trimmedMap() {
var rect = d3.select('#map').node().getBoundingClientRect();
return {
left: rect.left + (textDirection === 'rtl' ? 60 : 10),
top: rect.top + 70,
width: rect.width - 60,
height: rect.height - 170
};
}
function dragMap() {
context.history().reset('initial');
@@ -42,17 +53,13 @@ export function uiIntroNavigation(context, reveal) {
context.map().zoom(19).centerEase(townHall, msec);
timeout(function() {
var dragged = false,
rect = context.surfaceRect(),
box = {
left: rect.left + (textDirection === 'rtl' ? 60 : 10),
top: rect.top + 70,
width: rect.width - 70,
height: rect.height - 170
};
var dragged = false;
context.map().centerZoom([-85.63591, 41.94285], 19);
reveal(box, t('intro.navigation.drag'));
reveal(trimmedMap(), t('intro.navigation.drag'));
context.map().on('drawn.intro', function() {
reveal(trimmedMap(), t('intro.navigation.drag'), { duration: 0 });
});
context.map().on('move.intro', function() {
dragged = true;
@@ -62,10 +69,10 @@ export function uiIntroNavigation(context, reveal) {
if (dragged) continueTo(clickTownHall);
}, true);
}, msec + 100);
}, msec + 100 );
function continueTo(nextStep) {
context.map().on('move.intro', null);
context.map().on('move.intro drawn.intro', null);
d3.select(window).on('mouseup.intro', null, true);
nextStep();
}