986498e038
Add missing parameter to isComplete
2015-01-24 01:18:35 -05:00
9233be9cd6
Avoid zorroing connected ways when moving a way
...
(closes #729 )
2015-01-24 01:07:27 -05:00
2360d5a768
Fix "Group Home" preset ( fixes #2510 )
2015-01-18 12:51:24 -08: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
0b93f9cdb5
Add leisure=nature_reserve preset ( closes #2496 )
2015-01-13 22:07:55 -05:00
d668498414
Add amenity=bicycle_repair_station preset ( closes #2497 )
2015-01-13 21:47:52 -05:00
ef657fad08
Add amenity=grit_bin preset ( closes #2500 )
2015-01-13 21:31:15 -05:00
05cb8a4c44
Merge pull request #2507 from guillaumep/master
...
Add amenity=public_bookcase preset
2015-01-13 21:19:05 -05:00
8d714abb74
Add amenity=public_bookcase preset
2015-01-13 20:19:58 -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
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
Bryan Housel