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

Fix loading inflight requests and clearing history when you switch

Browse Source 
sources
This commit is contained in:
Tom MacWright
2013-01-24 10:28:05 -05:00
parent 79c169b214
commit 29577f7645
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/id/connection.js
View File

@@ -292,6 +292,8 @@ iD.Connection = function() {
connection.flush = function() {
loadedTiles = {};
_.forEach(inflight, abortRequest);
inflight = {};
return connection;
};

1
js/id/renderer/map.js
View File

@@ -300,6 +300,7 @@ iD.Map = function() {
map.flush = function () {
connection.flush();
history.reset();
return map;
};

16
js/id/svg/labels.js
View File

@@ -196,9 +196,9 @@ iD.svg.Labels = function(projection) {
for (var i = 0; i < entities.length; i++) {
var entity = entities[i];
if (!entity.tags.name) continue;
if (hidePoints && entity.geometry() === 'point') continue;
if (hidePoints && entity.geometry(graph) === 'point') continue;
for (var k = 0; k < label_stack.length; k ++) {
if (entity.geometry() === label_stack[k][0] &&
if (entity.geometry(graph) === label_stack[k][0] &&
entity.tags[label_stack[k][1]] && !entity.tags[label_stack[k][2]]) {
labelable[k].push(entity);
break;
@@ -226,17 +226,17 @@ iD.svg.Labels = function(projection) {
var entity = labelable[k][i],
width = textWidth(entity.tags.name, font_size),
p;
if (entity.geometry() === 'point') {
if (entity.geometry(graph) === 'point') {
p = getPointLabel(entity, width, font_size);
} else if (entity.geometry() === 'line') {
} else if (entity.geometry(graph) === 'line') {
p = getLineLabel(entity, width, font_size);
} else if (entity.geometry() === 'area') {
} else if (entity.geometry(graph) === 'area') {
p = getAreaLabel(entity, width, font_size);
}
if (p) {
p.classes = entity.geometry() + ' tag-' + label_stack[k].slice(1).join('-');
positions[entity.geometry()].push(p);
labelled[entity.geometry()].push(entity);
p.classes = entity.geometry(graph) + ' tag-' + label_stack[k].slice(1).join('-');
positions[entity.geometry(graph)].push(p);
labelled[entity.geometry(graph)].push(entity);
}
}
}