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
90147b23db
Make copy handle circular and other degenerate Relations
2015-01-04 23:15:47 -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
d527c46108
Display conflict details on error confirmation box
2014-12-29 22:49:49 -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
dae0d2d55e
Add entity copy methods
2014-12-28 22:00:55 -05:00
d9294e3e04
Add substation type field
...
Fixes #2486
2014-12-21 15:37:13 -08:00
3348ef8c72
Add junction=yes preset
...
Fixes #2484
2014-12-21 15:29:22 -08:00
29c2a85488
Add takeaway and delivery fields
...
Fixes #2483
2014-12-21 15:27:18 -08:00
b8f83ccc8b
Add levels field to building=commercial
...
Fixes #2454
2014-12-21 15:21:24 -08:00
9f0ec5dad4
Add amenity=register_office preset
...
Fixes #2431
2014-12-21 15:15:22 -08:00
363a67bdf9
Add landuse=garages preset
...
Fixes #2430
2014-12-21 15:12:35 -08:00
da43e8347b
Add natural=cave_entrance preset
...
Fixes #2412
2014-12-21 14:59:25 -08:00
60b1d4ef91
Add amenity/fast_food to default suggestions
...
Fixes #2446
2014-12-21 14:55:03 -08:00
b9ac4b95d1
Connection.loadFromURL was swallowing all the errors instead of passing them along
2014-12-17 21:39:48 -05:00
3da6935be0
Switch to landuse=farmland as the preferred preset ( fixes #2478 )
2014-12-17 09:36:54 -08:00
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
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
a3fc0d62e5
free radialMenu in exit ( fixes #2477 )
2014-12-15 10:10:52 -05:00
0c881ef9f2
merge ways with non-overlapping changes to nodelists
2014-12-13 22:50:29 -05:00
381142356b
add Diff3 library
2014-12-13 22:49:44 -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
c74629ede8
handle relation selections, cleanup code,
...
closes #2469 , #2470
2014-12-10 23:30:09 -05:00
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
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
d85da08cfe
fix "inherits entities from base prototypally" test
2014-12-10 00:11:09 -05:00
eff18cb257
add tests for iD.actions.MergeRemoteChanges
2014-12-09 00:59:25 -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
4088f2e70a
properly load changed entities into altgraph and produce diffs.
2014-12-05 11:15:45 -05:00
1c3d198b96
add force option for rebase to overwrite existing entities
...
related: openstreetmap/iD#2467
2014-12-04 19:50:32 -05:00
ba4f712711
Merge pull request #2467 from bhousel/localstorage-restore
...
Don't pass extra arguments from map to Entity initializer
2014-12-04 11:54:20 -05:00
edb94fd4d6
Merge branch 'localstorage-restore' into conflict-resolution
2014-12-04 11:52:51 -05:00
7c458513f3
Don't pass extra arguments from map to Entity initializer
...
fixes #2465
2014-12-02 22:14:31 -05:00
0d1c289354
Merge pull request #2463 from cschwarz/fix-country-code-error-handling
...
Fixed address input while nominatim is not available, fixes #2438
2014-11-30 23:02:51 +01:00
1d580d3ca2
Fixed address input while nominatim is not available
2014-11-30 22:16:03 +01:00
ba919b8168
Conflict Resolution WIP: check server versions of modified nodes before sending changeset
2014-11-30 00:56:40 -05:00
5ca46fbbfb
support loading entities into alternate graph..
2014-11-30 00:55:55 -05:00
e17a72ba4a
Merge pull request #2451 from alexandrz/bench-covered-bus-stop
...
Updated bus_stop preset
2014-11-23 08:36:05 -08:00
f1f4835848
added bench field
...
added bench and covered fields to bus_stop preset
2014-11-23 12:52:14 +05:00
3e391e87df
don't try to call Entity#geometry for midpoints
2014-11-21 10:58:32 -05:00
ebaaa4ba5a
Initialize radialMenu earlier
...
This prevents it from being undefined when exiting back to browse mode:
in selectElements() (re 2024e233
2014-11-19 00:18:39 -05:00
3974bcf41b
Move editable() to be with the other map things
2014-11-19 00:17:50 -05:00
81ea0276f8
Don't show "0 Hidden Features" warning after editOff
...
(regressed in 916a901
2014-11-18 22:05:20 -05:00
dfe8fd1e90
features performance enhancements
...
1. reusue entity.geometry where possible
2. cache entity parents
2014-11-18 22:05:08 -05:00
Bryan Housel