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

Merge pull request #7444 from CarycaKatarzyna/fix-history

Browse Source 
Reopen: change page title
This commit is contained in:
Quincy Morgan
2020-03-23 14:28:31 -07:00
committed by GitHub
parent 628b53eff6 f0cb8ffb25
commit 9c46de05ff
2 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules/behavior/hash.js
View File

@@ -2,6 +2,7 @@ import _throttle from 'lodash-es/throttle';
import { select as d3_select } from 'd3-selection';
import { utilDisplayLabel } from '../util';
import { geoSphericalDistance } from '../geo';
import { modeBrowse } from '../modes/browse';
import { utilObjectOmit, utilQsString, utilStringQs } from '../util';
@@ -29,7 +30,6 @@ export function behaviorHash(context) {
if (mode && mode.id.match(/^draw/) !== null && dist > maxdist) {
context.enter(modeBrowse(context));
}
map.centerZoom([args[2], Math.min(lat, Math.max(-lat, args[1]))], args[0]);
}
};
@@ -51,20 +51,54 @@ export function behaviorHash(context) {
if (selected.length) {
newParams.id = selected.join(',');
}
newParams.map = zoom.toFixed(2) +
'/' + center[1].toFixed(precision) +
'/' + center[0].toFixed(precision);
updateTitle(selected, center[1].toFixed(precision), center[0].toFixed(precision));
return '#' + utilQsString(Object.assign(q, newParams), true);
};
function updateTitle(selected, center1, center0){
//selection
var oldTitle = document.title;
var endIndex = oldTitle.indexOf('-');
var oldIDStr = oldTitle.substring(endIndex+2);
if (selected.length === 1) {
if (endIndex === -1) {
oldTitle += ' - ' + utilDisplayLabel(context.entity(selected[0]), context);
}
else {
var newIDStr = utilDisplayLabel(context.entity(selected[0]), context);
oldTitle = oldTitle.replace(oldIDStr, newIDStr);
}
}
else if (selected.length > 1 ) {
newIDStr = utilDisplayLabel(context.entity(selected[0]), context) + ' and ' + (selected.length-1).toString() + ' more';
oldTitle = oldTitle.replace(oldIDStr, newIDStr);
}
else {
if (endIndex !== -1){
oldIDStr = oldTitle.substring(endIndex);
oldTitle = oldTitle.replace(oldIDStr, '');
}
//map location
oldTitle += ' - (' + center1 + ',' + center0 + ')';
}
document.title = oldTitle;
}
function update() {
if (context.inIntro()) return;
var s1 = formatter(context.map());
if (s0 !== s1) {
window.location.replace(s0 = s1); // don't recenter the map!
s0 = s1;
window.location.replace(s0); // don't recenter the map!
}
}
@@ -94,8 +128,11 @@ export function behaviorHash(context) {
var q = utilStringQs(window.location.hash);
if (q.id) {
context.zoomToEntity(q.id.split(',')[0], !q.map);
}
if (!context.history().hasRestorableChanges()) {
// targeting specific features: download, select, and zoom to them
context.zoomToEntities(q.id.split(','));
}
}
// Store these here instead of updating local storage since local
// storage could be flushed if the user discards pending changes

3
modules/ui/tools/save.js
View File

@@ -51,10 +51,11 @@ export function uiToolSave(context) {
}
}
function updateCount() {
var val = history.difference().summary().length;
if (val === _numChanges) return;
_numChanges = val;
if (tooltipBehavior) {