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

iD.behavior.Hash handles selected id parameter

Browse Source 
(this is better than having `iD.modes.Select` mess with `location.hash`)
This commit is contained in:
Bryan Housel
2014-06-30 00:33:19 -04:00
parent a9d58fdf74
commit 52903c509d
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/behavior/hash.js
+31 -11
View File
@@ -14,15 +14,29 @@ iD.behavior.Hash = function(context) {
};
var formatter = function(map) {
var center = map.center(),
var mode = context.mode(),
center = map.center(),
zoom = map.zoom(),
precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
var q = iD.util.stringQs(location.hash.substring(1));
return '#' + iD.util.qsString(_.assign(q, {
map: zoom.toFixed(2) +
'/' + center[0].toFixed(precision) +
'/' + center[1].toFixed(precision)
}), true);
precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)),
q = iD.util.stringQs(location.hash.substring(1)),
newParams = {};
if (mode && mode.id === 'browse') {
delete q.id;
} else {
var selected = context.selectedIDs().filter(function(id) {
return !context.entity(id).isNew();
});
if (selected.length) {
newParams.id = selected.join(',');
}
}
newParams.map = zoom.toFixed(2) +
'/' + center[0].toFixed(precision) +
'/' + center[1].toFixed(precision);
return '#' + iD.util.qsString(_.assign(q, newParams), true);
};
function update() {
@@ -30,7 +44,7 @@ iD.behavior.Hash = function(context) {
if (s0 !== s1) location.replace(s0 = s1); // don't recenter the map!
}
var move = _.throttle(update, 500);
var throttledUpdate = _.throttle(update, 500);
function hashchange() {
if (location.hash === s0) return; // ignore spurious hashchange events
@@ -41,14 +55,17 @@ iD.behavior.Hash = function(context) {
function hash() {
context.map()
.on('move.hash', move);
.on('move.hash', throttledUpdate);
context
.on('enter.hash', throttledUpdate);
d3.select(window)
.on('hashchange.hash', hashchange);
if (location.hash) {
var q = iD.util.stringQs(location.hash.substring(1));
if (q.id) context.loadEntity(q.id, !q.map);
if (q.id) context.loadEntity(q.id.split(',')[0], !q.map);
hashchange();
if (q.map) hash.hadHash = true;
}
@@ -58,6 +75,9 @@ iD.behavior.Hash = function(context) {
context.map()
.on('move.hash', null);
context
.on('enter.hash', null);
d3.select(window)
.on('hashchange.hash', null);
js/id/modes/select.js
-23
View File
@@ -93,17 +93,6 @@ iD.modes.Select = function(context, selectedIDs) {
});
});
var notNew = selectedIDs.filter(function(id) {
return !context.entity(id).isNew();
});
if (notNew.length) {
var q = iD.util.stringQs(location.hash.substring(1));
location.replace('#' + iD.util.qsString(_.assign(q, {
id: notNew.join(',')
}), true));
}
context.ui().sidebar
.select(singular() ? singular().id : null, newFeature);
@@ -187,18 +176,6 @@ iD.modes.Select = function(context, selectedIDs) {
context.uninstall(behavior);
});
var q = _.omit(iD.util.stringQs(location.hash.substring(1)), 'id'),
center = context.map().center(),
zoom = context.map().zoom(),
precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)),
newhash = '#' + iD.util.qsString(_.assign(q, {
map: zoom.toFixed(2) +
'/' + center[0].toFixed(precision) +
'/' + center[1].toFixed(precision)
}), true);
location.replace(newhash);
keybinding.off();
context.history()