Fix deletion, make active class clearer, refocus on DC, fix friendlyName

This commit is contained in:
Tom MacWright
2012-11-29 09:35:48 -05:00
parent 7dafbefbd9
commit f7fcf37197
5 changed files with 9 additions and 7 deletions
+2 -2
View File
@@ -50,8 +50,8 @@ path.casing:hover {
}
path.casing.active {
stroke:#FFF9C9 !important;
stroke-opacity:1 !important;
stroke:#E96666 !important;
opacity:1 !important;
stroke-width:10 !important;
}
+2 -2
View File
@@ -58,12 +58,12 @@ iD.format.XML = {
return x;
}).map(iD.format.XML.rep)),
modify: changes.modify.map(function(c) {
var x = Object.create(c);
var x = iD.Entity(c);
x.changeset = changeset_id;
return x;
}).map(iD.format.XML.rep),
'delete': changes['delete'].map(function(c) {
var x = Object.create(c);
var x = iD.Entity(c);
x.changeset = changeset_id;
return x;
}).map(iD.format.XML.rep)
+3 -1
View File
@@ -70,7 +70,9 @@ iD.History.prototype = {
return _.difference(
_.pluck(this.stack[0].entities, 'id'),
_.pluck(this.stack[this.index].entities, 'id')
);
).map(function(id) {
return this.stack[0].fetch(id);
}.bind(this));
},
changes: function() {
+1 -1
View File
@@ -145,7 +145,7 @@ var iD = function(container) {
});
var hash = iD.Hash().map(map);
if (!hash.hadHash) map.setZoom(19).setCenter([-1.49475, 51.87502]);
if (!hash.hadHash) map.setZoom(19).setCenter([-77.0198, 38.8796]);
d3.select('.user').call(iD.userpanel(connection)
.on('logout', connection.logout)
.on('login', connection.authenticate));
+1 -1
View File
@@ -16,7 +16,7 @@ iD.Util.trueObj = function(arr) {
iD.Util.friendlyName = function(entity) {
// Generate a string such as 'river' or 'Fred's House' for an entity.
if (!Object.keys(entity.tags).length) { return ''; }
if (!entity.tags || !Object.keys(entity.tags).length) { return ''; }
var mainkeys = ['highway','amenity','railway','waterway'],
n = [];