Remove elastic vestiges

This commit is contained in:
John Firebaugh
2012-12-06 18:48:13 -05:00
parent 9743ee282b
commit caf382c1dc
3 changed files with 5 additions and 13 deletions
-4
View File
@@ -44,10 +44,6 @@ path.casing {
stroke-width: 3;
}
.elastic-true {
pointer-events:none;
}
path.casing.hover {
stroke:#FF0F0F !important;
opacity:0.8;
+2 -4
View File
@@ -31,8 +31,7 @@ iD.modes.DrawArea = function(wayId) {
if (datum.id === tailId) {
history.replace(
iD.actions.DeleteNode(node.id),
iD.actions.AddWayNode(way.id, tailId),
iD.actions.ChangeEntityTags(way.id, _.omit(way.tags, 'elastic')));
iD.actions.AddWayNode(way.id, tailId));
controller.enter(iD.modes.Select(way));
@@ -51,8 +50,7 @@ iD.modes.DrawArea = function(wayId) {
map.keybinding().on('⎋.drawarea', function() {
history.replace(
iD.actions.DeleteNode(node.id),
iD.actions.ChangeEntityTags(wayId, _.omit(way.tags, 'elastic')));
iD.actions.DeleteNode(node.id));
controller.enter(iD.modes.Browse());
});
+3 -5
View File
@@ -8,7 +8,7 @@ iD.modes.DrawRoad = function(wayId, direction) {
history = mode.history,
controller = mode.controller,
way = history.graph().entity(wayId),
node = iD.Node({loc: map.mouseCoordinates(), tags: {elastic: true}}),
node = iD.Node({loc: map.mouseCoordinates()}),
index = (direction === 'forward') ? undefined : -1,
headId = (direction === 'forward') ? _.last(way.nodes) : _.first(way.nodes),
tailId = (direction === 'forward') ? _.first(way.nodes) : _.last(way.nodes);
@@ -35,8 +35,7 @@ iD.modes.DrawRoad = function(wayId, direction) {
// connect the way in a loop
history.replace(
iD.actions.DeleteNode(node.id),
iD.actions.AddWayNode(wayId, tailId, index),
iD.actions.ChangeEntityTags(wayId, _.omit(way.tags, 'elastic')));
iD.actions.AddWayNode(wayId, tailId, index));
controller.enter(iD.modes.Select(way));
@@ -64,8 +63,7 @@ iD.modes.DrawRoad = function(wayId, direction) {
map.keybinding().on('⎋.drawroad', function() {
history.replace(
iD.actions.DeleteNode(node.id),
iD.actions.ChangeEntityTags(wayId, _.omit(way.tags, 'elastic')));
iD.actions.DeleteNode(node.id));
controller.enter(iD.modes.Browse());
});