c69fbf3e3d
In copy/paste, use the graph that entities originally came from
...
(fixes #2557 )
2015-03-18 10:08:36 -04:00
1f0087d133
Merge pull request #2525 from openstreetmap/conflict-resolution
...
Merge Conflict Resolution
2015-03-05 19:49:15 -05:00
c503b9f96c
fill remoteGraph with loadMultiple, finally do proper undeletion
2015-03-03 23:43:37 -05:00
edda24360a
Fix undeletion version, don't undelete twice
2015-03-03 20:51:33 -05:00
38f833d19c
Exclude current way when checking if childnode is used
2015-03-02 22:47:13 -05:00
e3139e250e
improvements to iD.actions.MergeRemoteChanges
...
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
2015-03-02 13:07:24 -05:00
78ca4b11f4
Better support for delete/restore
2015-02-28 23:03:44 -05:00
2b3dfef5e7
Fix versions of childnodes when merging force_local
2015-02-27 16:56:00 -05:00
72e5c3dce1
remove/restore of child vertices when switching mine/theirs
2015-02-21 00:02:46 -05:00
0730e0432b
keep localGraph - UI can now flip between mine/theirs
2015-02-20 17:01:19 -05:00
ad8c381301
WIP: handle conflicting local tag deletion
...
re: https://github.com/openstreetmap/iD/pull/2489#discussion-diff-22490581
2015-02-20 12:43:47 -05:00
0a1dd4b338
WIP: simplify
2015-02-20 11:21:47 -05:00
38b50a347e
WIP: Fix tests, simplify mergeChildNodes
2015-02-17 22:10:47 -05:00
ebe5484e22
WIP: MergeRemoteChanges merges way childnodes
2015-02-17 00:51:49 -05:00
d755145ae6
WIP: usernames in messages, show # of total
2015-02-14 11:20:19 -05:00
9aab74c187
Test; simplify
2015-02-12 10:24:40 -08:00
c9162ea65e
Extend protection to multipolygon outer ways
2015-02-12 10:21:24 -08:00
0953475f04
Don't delete ways from route/boundary relations
2015-02-12 10:21:23 -08:00
d141827c3e
Merge branch 'master' into conflict-resolution-ui
2015-02-06 19:08:50 -05:00
0e35a6b35b
Don't ignore tiger: tags in mergeTags
2015-01-07 11:56:46 -05:00
b2ad17f1cb
code style
2015-01-07 11:13:54 -05:00
1603b638f6
Add Copy/Paste behaviors, context copybuffer
2015-01-07 10:41:05 -05:00
f6d144c151
Improvements, and simplify code
...
* don't worry about deep copying, because immutability
* don't need `attrs` parameter which is usually empty
* don't worry about resetting `v` entity version
2015-01-01 22:49:44 -05:00
3bbf31902a
Add accessor to get conflict details from iD.actions.MergeRemoteChanges
2014-12-29 22:47:44 -05:00
4b6abf7a42
Added iD.actions.CopyEntity
2014-12-28 22:01:10 -05:00
0c881ef9f2
merge ways with non-overlapping changes to nodelists
2014-12-13 22:50:29 -05:00
977e29cfdb
Most iD.actions.MergeRemoteChanges features complete
...
(todo: merging ways where nodelist has not been reordered)
2014-12-11 23:52:53 -05:00
dc1221b8ba
pass graphs instead of entities to iD.actions.MergeRemoteChanges
...
(realized that I will need to compare more stuff from the
local and remote graphs in order to merge ways/relations)
2014-12-10 00:12:32 -05:00
5aa95d4dd4
iD.actions.MergeRemoteChanges merges remote tags
2014-12-09 00:58:36 -05:00
3e97bd7d89
stub out iD.actions.MergeRemoteChanges
2014-12-06 22:11:54 -05:00
43777d5259
Better inferRestriction for no_u_turn
...
* where from.node === to.node
* where from.way and to.way are oneways joined at a narrow angle
2014-09-02 16:43:31 -04:00
cf715a5156
Only use no_u_turn restriction for angles < 5
2014-08-31 21:59:23 -04:00
eb55e36c3c
Delete relations that become empty ( #2270 )
2014-06-26 10:21:03 -07:00
f811c19cdc
Fix straight on restricting with splits
2014-05-18 16:02:53 -07:00
6089a6aaea
Better solution for maintaining selection
2014-05-18 16:02:48 -07:00
243e86b277
Update selected segment after splits
2014-05-18 16:02:48 -07:00
eaaff52d62
Help text
2014-05-18 16:02:48 -07:00
d4d80b2d6e
Use turn restriction icons
2014-05-18 16:02:48 -07:00
3d210ac3c1
Implement basic restriction toggling
2014-05-18 16:02:47 -07:00
33782a3958
Require 2 uniq points for circularize. Handle 2 point case, where D3 centroid() fails.
2014-04-21 23:29:25 -04:00
210e7889a1
Factor makeConvex into new method, fix missing comma and style issues..
2014-04-14 23:54:03 -04:00
52f631f4a0
Coax concave ways to convex before circularizing..
2014-04-10 15:26:31 -04:00
4c0c078045
When circularizing a way, try to add inBetweenNodes to shared ways too..
2014-04-07 22:42:34 -04:00
a3a125187d
preserve disconnect for lines, improve disconnect for shared nodes in areas..
2014-04-01 17:22:48 -04:00
48dedb15ed
Prevent a closed way from disconnecting itself..
2014-03-30 22:49:19 -04:00
327af5176b
Fix jshint
2014-02-09 18:48:52 -08:00
173108ae46
Style adjustments
2014-02-09 18:45:31 -08:00
90fd8b6e51
disable merge operation if at least one relation is incomplete
...
Incomplete multipolygons were harmed in the merge operation (which
relies on completely loaded relations to determine inner/outer
status for example).
This disables the operation and adds an appropriate tooltip.
2014-02-09 18:41:31 +01:00
422f76be77
merge-polygons: do not merge tags from all possible members
...
previously when merging polygons, all tags from all involved
members were merged into the resulting multipolygon. This includes
existing inner members with different tags or outer members that
are not directly involved in the merge operations.
Example: A forest (landuse=forest) containing some clearings
(landuse=meadow), whose outline is in part a river (waterway=river)
is merged with a new untagged area. The resulting multipolygon
would have falsely been tagged: landuse=forest;meadow + waterway=river
2014-02-09 17:53:55 +01:00
4078d353b2
Bump threshold for Orthogonalize to 12 degrees
2014-01-16 12:06:54 -08:00
Bryan Housel