samanpwbb
a46805c3cb
remove distracting transitions
2015-02-10 11:45:23 -05:00
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
be8b3daae4
remove dev code
2015-02-06 19:10:48 -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
Saman Bemel-Benrud
158dbab0b1
Merge pull request #2521 from openstreetmap/round-tooltips
...
add rounded tooltips
2015-02-05 18:09:28 -05:00
samanpwbb
f273650963
add rounded tooltips
2015-02-05 18:05:24 -05:00
Bryan Housel
3b88fe999b
Change description for amenity=farm to "Farmland"
2015-02-03 12:42:36 -05:00
Bryan Housel
62c9afcd2d
Add gender field to amenity=toilets ( closes #2422 )
2015-02-03 12:36:25 -05:00
Bryan Housel
487130329d
Updates to landuse presets ( closes #2518 )
...
* Do not support `landuse=*` on nodes anymore
* Add "Area" to description for `residential`, `commercial`, `industrial`, `retail`
2015-02-03 11:12:44 -05:00
Bryan Housel
b07f205db9
should be shop=houseware, not shop=household ( closes #2509 )
2015-02-03 10:48:40 -05:00
Bryan Housel
3bc98bec58
Update tree and forest presets
...
(closes #2512 )
for `natural=tree`, `natural=wood`, `landuse=forest`
deprecate keys `type` and `wood`
now use keys `leaf_type`, `leaf_cycle`
2015-01-24 23:16:11 -05:00
Bryan Housel
32007fc814
Add shop=household preset
...
(closes #2509 )
2015-01-24 22:48:42 -05:00
Bryan Housel
1200919fb3
quote "yes" and "no" in YAML
...
(re: #2286 )
2015-01-24 22:38:37 -05:00
Bryan Housel
1ca44a2677
Add brand field to amenity=bicycle_repair_station
...
(re: #2497 )
2015-01-24 22:16:43 -05:00
Bryan Housel
986498e038
Add missing parameter to isComplete
2015-01-24 01:18:35 -05:00
John Firebaugh
2360d5a768
Fix "Group Home" preset ( fixes #2510 )
2015-01-18 12:51:24 -08: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
0b93f9cdb5
Add leisure=nature_reserve preset ( closes #2496 )
2015-01-13 22:07:55 -05:00
Bryan Housel
d668498414
Add amenity=bicycle_repair_station preset ( closes #2497 )
2015-01-13 21:47:52 -05:00
Bryan Housel
ef657fad08
Add amenity=grit_bin preset ( closes #2500 )
2015-01-13 21:31:15 -05:00
Bryan Housel
05cb8a4c44
Merge pull request #2507 from guillaumep/master
...
Add amenity=public_bookcase preset
2015-01-13 21:19:05 -05:00
Guillaume Pratte
8d714abb74
Add amenity=public_bookcase preset
2015-01-13 20:19:58 -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
John Firebaugh
d9294e3e04
Add substation type field
...
Fixes #2486
2014-12-21 15:37:13 -08:00
