Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution ...

Merge Conflict Resolution

2015-03-05 19:49:15 -05:00

..

add_entity.js

…

add_member.js

…

add_midpoint.js

…

change_member.js

…

change_preset.js

…

change_tags.js

…

circularize.js

…

connect.js

…

copy_entity.js

Pend some failing tests

2015-03-03 21:06:28 -05:00

delete_member.js

Delete relations that become empty (#2270)

2014-06-26 10:21:03 -07:00

delete_multiple.js

…

delete_node.js

…

delete_relation.js

…

delete_way.js

Test; simplify

2015-02-12 10:24:40 -08:00

discard_tags.js

…

disconnect.js

…

join.js

…

merge_polygon.js

…

merge_remote_changes.js

fill remoteGraph with loadMultiple, finally do proper undeletion

2015-03-03 23:43:37 -05:00

merge.js

…

move_node.js

…

move.js

…

noop.js

…

orthogonalize.js

…

restrict_turn.js

Better inferRestriction for no_u_turn

2014-09-02 16:43:31 -04:00

reverse.js

…

split.js

Moved area-keys to data, and process it during runtime

2014-10-23 15:52:29 -07:00

straighten.js

…

unrestrict_turn.js

Implement basic restriction toggling

2014-05-18 16:02:47 -07:00