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
98665fef91
Don't allow zoomTo on an entity with degenrate extent
...
(because sending the map to NaN/NaN/NaN is not cool)
2015-02-28 23:00:00 -05:00
2aae57d361
Save originals of parent entities to localstorage
...
This prevents strange things from happening when a way is moved,
(affecting only the childnodes but not the way).
2015-02-28 22:52:21 -05:00
2b3dfef5e7
Fix versions of childnodes when merging force_local
2015-02-27 16:56:00 -05:00
1cfc6ad69a
Check childNode versions too
2015-02-27 16:35:58 -05:00
80f5f65f63
More bugfixes and style updates:
...
* working Previous/Next buttons
* remove behaviors from save mode
(users should not be moving nodes around or selecting at this point)
* clear hover before hovering next object
* enable save button and finished message after reviewing last conflict
* store users choice in __data__.chosen..
* default choices to `keep remote version`
* better message for delete conflicts
* fix undelete action to check localGraph (which will have the entity)
instead of context.graph() (which may not)
2015-02-27 15:45:43 -05:00
0ed12da6fa
WIP: style, replace expand/contract list with prev/next buttons
2015-02-26 22:39:22 -05:00
a3617b02cc
WIP: fix style, fix choice selection
2015-02-26 00:43:14 -05:00
15bc08795d
Don't save history to localstorage in save mode
...
(to avoid saving remote merges / conflict resolutions)
2015-02-25 23:35:06 -05:00
57e5113b1e
Use radio buttons for mine/theirs choice
2015-02-24 23:32:02 -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
861bd14903
map#trimmedExtentZoom
...
Like map#extentZoom, but uses trimmed viewport instead of full viewport
to avoid putting the extent under UI buttons and border elements.
This is because in conflict resolution the user will be extentZooming to see
their changes and it was annoying to have the change appear under the UI.
Also using this in zoomToGPXLayer.
2015-02-20 14:59:40 -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
cdd0ca1acf
WIP: Use history.perform/replace/pop instead of context.perform
...
This means
* no more weird saves to localStoage of partially merged graphs
* pop cleanly cancels back to history state before merges happen
(removed the annotated undo states)
2015-02-17 00:47:12 -05:00
6638f6806e
WIP: changes to "download changeset"
...
* use original changeset before conflict resolutions
* don't cancel the conflict resolution ui
2015-02-16 15:12:42 -05:00
663ed92508
WIP: code cleanup, use difference.summary()
...
filling the toCheck list from summary() means that moved vertices are
treated as a change to the parent way, instead of changes to each node
TODO: need to conflict check each node, but at least now they are
fetched with a single API call to fetch the way, and can be reported
as a single conflict in the ui..
2015-02-16 14:53:51 -05:00
d755145ae6
WIP: usernames in messages, show # of total
2015-02-14 11:20:19 -05:00
34642526ff
jshint
2015-02-10 14:41:06 -05:00
a4a5812816
style cleanup
2015-02-10 13:24:10 -05:00
744346398a
style cleanup
2015-02-10 11:08:01 -05:00
e94d089526
fix modals
2015-02-09 18:11:38 -05:00
094c46dcfb
fix order issues
2015-02-09 17:49:58 -05:00
7f9d1437d2
zoom to conflict on active
2015-02-09 17:28:22 -05:00
cef46853ea
rework list interactions
2015-02-09 15:20:29 -05:00
e49ebe2784
rework save UI
2015-02-09 14:28:55 -05:00
c1d393302a
fix close button
2015-02-06 19:35:53 -05:00
d141827c3e
Merge branch 'master' into conflict-resolution-ui
2015-02-06 19:08:50 -05:00
78e4271071
finish basic layout/style pass
2015-02-06 19:07:57 -05:00
986498e038
Add missing parameter to isComplete
2015-01-24 01:18:35 -05:00
cac0258baf
Merge pull request #2498 from bhousel/copy-paste
...
Copy paste map features with Cmd-C, Cmd-V
2015-01-15 21:24:58 -05:00
62f7681370
Remove row when clicking trash icon in raw tag editor
...
(closes #2418 )
Dispatching `event.change(tag)` does update the tag editor in most
cases, but it is not sufficient to remove a blank row with no tags..
2015-01-14 09:57:23 -05:00
ef2d6e75cf
Add minzoom check to map.zoom() ( closes #2499 )
2015-01-13 23:09:19 -05:00
3fc99e1df5
Allow undeletions
2015-01-13 16:28:06 -05:00
a3459714b8
Styling for conflict resolution buttons
2015-01-12 22:29:59 -05:00
fb0d17e713
WIP: Add choices ui for resolving conflicts
2015-01-11 23:13:31 -05:00
c420650ac8
"Try Again" and "Download Changeset" buttons
2015-01-10 22:16:07 -05:00
95c92e9a59
WIP: conflict save dialog
...
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
d6b0e0a8bb
WIP: Differentiate between errors and conflicts.
...
This will allow the conflicts dialog to have different
explanation text, buttons, etc..
2015-01-08 22:59:08 -05:00
e5d6c34efb
No default OK button on iD.ui.confirm
...
This allows the calling code to either keep the OK button or to override
with other buttons as needed.
2015-01-08 22:56:39 -05:00
ed4929273d
Return entities from iD.Connection via callbacks
...
(instead of dispatching `load` event to merge them into `history`)
This is cleaner becuase now `context` doesn't need to keep an
`altGraph` state used only for Conflict Resolution.
The conflict resolution code calls the `iD.Connection` methods directly,
and other places in the code call `loadEntity` and `loadTiles` wrappers
that merge the entities into the main history.
2015-01-08 14:44:58 -05:00
0e35a6b35b
Don't ignore tiger: tags in mergeTags
2015-01-07 11:56:46 -05:00
d9f204cf45
Remove Graph#freeze
2015-01-07 11:52:17 -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
Bryan Housel