samanpwbb
744346398a
style cleanup
2015-02-10 11:08:01 -05:00
samanpwbb
e94d089526
fix modals
2015-02-09 18:11:38 -05:00
samanpwbb
094c46dcfb
fix order issues
2015-02-09 17:49:58 -05:00
samanpwbb
7f9d1437d2
zoom to conflict on active
2015-02-09 17:28:22 -05:00
samanpwbb
cef46853ea
rework list interactions
2015-02-09 15:20:29 -05:00
samanpwbb
e49ebe2784
rework save UI
2015-02-09 14:28:55 -05:00
samanpwbb
c1d393302a
fix close button
2015-02-06 19:35:53 -05:00
samanpwbb
d141827c3e
Merge branch 'master' into conflict-resolution-ui
2015-02-06 19:08:50 -05:00
samanpwbb
78e4271071
finish basic layout/style pass
2015-02-06 19:07:57 -05:00
Bryan Housel
986498e038
Add missing parameter to isComplete
2015-01-24 01:18:35 -05:00
Bryan Housel
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
Bryan Housel
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
Bryan Housel
ef2d6e75cf
Add minzoom check to map.zoom() ( closes #2499 )
2015-01-13 23:09:19 -05:00
Bryan Housel
3fc99e1df5
Allow undeletions
2015-01-13 16:28:06 -05:00
Bryan Housel
a3459714b8
Styling for conflict resolution buttons
2015-01-12 22:29:59 -05:00
Bryan Housel
fb0d17e713
WIP: Add choices ui for resolving conflicts
2015-01-11 23:13:31 -05:00
Bryan Housel
c420650ac8
"Try Again" and "Download Changeset" buttons
2015-01-10 22:16:07 -05:00
Bryan Housel
95c92e9a59
WIP: conflict save dialog
...
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel
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
Bryan Housel
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
Bryan Housel
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
Bryan Housel
0e35a6b35b
Don't ignore tiger: tags in mergeTags
2015-01-07 11:56:46 -05:00
Bryan Housel
d9f204cf45
Remove Graph#freeze
2015-01-07 11:52:17 -05:00
Bryan Housel
b2ad17f1cb
code style
2015-01-07 11:13:54 -05:00
Bryan Housel
1603b638f6
Add Copy/Paste behaviors, context copybuffer
2015-01-07 10:41:05 -05:00
Bryan Housel
90147b23db
Make copy handle circular and other degenerate Relations
2015-01-04 23:15:47 -05:00
Bryan Housel
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
Bryan Housel
d527c46108
Display conflict details on error confirmation box
2014-12-29 22:49:49 -05:00
Bryan Housel
3bbf31902a
Add accessor to get conflict details from iD.actions.MergeRemoteChanges
2014-12-29 22:47:44 -05:00
Bryan Housel
4b6abf7a42
Added iD.actions.CopyEntity
2014-12-28 22:01:10 -05:00
Bryan Housel
dae0d2d55e
Add entity copy methods
2014-12-28 22:00:55 -05:00
Bryan Housel
b9ac4b95d1
Connection.loadFromURL was swallowing all the errors instead of passing them along
2014-12-17 21:39:48 -05:00
Bryan Housel
93b505259f
Mode change code in editOff no longer needed..
...
(because iD.modes.Select listens for drawn event and knows to exit itself)
2014-12-15 16:16:46 -05:00
Bryan Housel
de6d24f41a
Don't exit mode when selected elements are gone until after a draw pass
...
(fixes #2476 )
2014-12-15 16:08:01 -05:00
Bryan Housel
a3fc0d62e5
free radialMenu in exit ( fixes #2477 )
2014-12-15 10:10:52 -05:00
Bryan Housel
0c881ef9f2
merge ways with non-overlapping changes to nodelists
2014-12-13 22:50:29 -05:00
Bryan Housel
381142356b
add Diff3 library
2014-12-13 22:49:44 -05:00
Bryan Housel
977e29cfdb
Most iD.actions.MergeRemoteChanges features complete
...
(todo: merging ways where nodelist has not been reordered)
2014-12-11 23:52:53 -05:00
Bryan Housel
c74629ede8
handle relation selections, cleanup code,
...
closes #2469 , #2470
2014-12-10 23:30:09 -05:00
Bryan Housel
037bd19ebf
Fix help pane button toggling ( closes #2471 )
...
(and cleanup code to make background, map_data, help panes more consistent)
2014-12-10 13:30:11 -05:00
Bryan Housel
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
Bryan Housel
5aa95d4dd4
iD.actions.MergeRemoteChanges merges remote tags
2014-12-09 00:58:36 -05:00
Bryan Housel
3e97bd7d89
stub out iD.actions.MergeRemoteChanges
2014-12-06 22:11:54 -05:00
Bryan Housel
4088f2e70a
properly load changed entities into altgraph and produce diffs.
2014-12-05 11:15:45 -05:00
Bryan Housel
1c3d198b96
add force option for rebase to overwrite existing entities
...
related: openstreetmap/iD#2467
2014-12-04 19:50:32 -05:00
Bryan Housel
edb94fd4d6
Merge branch 'localstorage-restore' into conflict-resolution
2014-12-04 11:52:51 -05:00
Bryan Housel
7c458513f3
Don't pass extra arguments from map to Entity initializer
...
fixes #2465
2014-12-02 22:14:31 -05:00
Christian Schwarz
1d580d3ca2
Fixed address input while nominatim is not available
2014-11-30 22:16:03 +01:00
Bryan Housel
ba919b8168
Conflict Resolution WIP: check server versions of modified nodes before sending changeset
2014-11-30 00:56:40 -05:00
Bryan Housel
5ca46fbbfb
support loading entities into alternate graph..
2014-11-30 00:55:55 -05:00
