Commit Graph

337 Commits

Author SHA1 Message Date
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
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
1ca44a2677 Add brand field to amenity=bicycle_repair_station
(re: #2497)
2015-01-24 22:16:43 -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
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
fb0d17e713 WIP: Add choices ui for resolving conflicts 2015-01-11 23:13:31 -05:00
Bryan Housel
95c92e9a59 WIP: conflict save dialog
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel
3bbf31902a Add accessor to get conflict details from iD.actions.MergeRemoteChanges 2014-12-29 22:47:44 -05:00
John Firebaugh
d9294e3e04 Add substation type field
Fixes #2486
2014-12-21 15:37:13 -08:00
John Firebaugh
3348ef8c72 Add junction=yes preset
Fixes #2484
2014-12-21 15:29:22 -08:00
John Firebaugh
29c2a85488 Add takeaway and delivery fields
Fixes #2483
2014-12-21 15:27:18 -08:00
John Firebaugh
9f0ec5dad4 Add amenity=register_office preset
Fixes #2431
2014-12-21 15:15:22 -08:00
John Firebaugh
363a67bdf9 Add landuse=garages preset
Fixes #2430
2014-12-21 15:12:35 -08:00
John Firebaugh
da43e8347b Add natural=cave_entrance preset
Fixes #2412
2014-12-21 14:59:25 -08:00
Aleksandr Zykov
f1f4835848 added bench field
added bench and covered fields to bus_stop preset
2014-11-23 12:52:14 +05:00
John Firebaugh
c66091c00c Merge pull request #2357 from bhousel/feature-filtering
Feature filtering
2014-11-11 12:16:42 -08:00
jgpacker
977949292d Fix a typo: Confectionary → Confectionery 2014-11-07 22:23:30 -02:00
samanpwbb
140b56a68a style adjustments + clean out unused code 2014-10-31 17:09:49 -04:00
Bryan Housel
224db06ca4 design enhancements..
* replace full width bottom bar with subtle list item
* move hidden feature details to list item tooltip
* simplify some of the text labels on the Map Data panel
* progressively hide some footer elements with media queries
2014-10-31 10:55:00 -04:00
Aaron Lidman
ced0158327 Fix .more-fields string 2014-10-30 16:07:38 -04:00
Bryan Housel
7d9b267858 Show auto-hidden features as disabled checkboxes with tooltip
also rearrange map data panel to put features last
2014-10-28 21:37:03 -04:00
Bryan Housel
8c423651b2 Update help text because GPS tracks are purple now 2014-10-28 21:37:03 -04:00
samanpwbb
794a4bcb30 new icon 2014-10-28 21:37:02 -04:00
samanpwbb
70e7987943 add data icon, fix button style 2014-10-28 21:37:02 -04:00
Bryan Housel
dcc9812986 prevent most operations on things connected to hidden features.. 2014-10-28 21:37:02 -04:00
Bryan Housel
8a98339bc2 Add area fill selector (wireframe/partial/full) to map data panel
also:
* style dark tooltips with shortcut keys
* use uppercase for shortcut keys
2014-10-28 21:37:01 -04:00
Bryan Housel
35e7474829 Rename Features to Map Data..
* move GPX and Mapillary layers to Map Data
* put feature filters and layer data into show/hide containers
* cleanup css
2014-10-28 21:37:01 -04:00
Bryan Housel
8fd177935d Feature filtering (in progress)
(rebased to master post-Mapillary merge)
2014-10-28 21:37:00 -04:00
Sajjad Anwar
dab742a501 Make taginfo configurable and default to disabling taginfo related features 2014-10-24 16:26:37 -07:00
John Firebaugh
dd0e08b244 Write presets and imagery to standalone files 2014-10-23 15:52:29 -07:00
John Firebaugh
2240d629c5 Update translations 2014-10-23 15:24:22 -07:00
John Firebaugh
eb9876c2de Use interpolation rather than concatenation 2014-10-22 11:16:37 -07:00
Bryan Housel
712f533212 Translate text in changes section on save panel. (fixes #2417) 2014-10-22 10:27:59 -04:00
jgpacker
32b67e8c2c Adding some traffic_calming=* presets
* I'm assuming a traffic_calming=table always has a pedestrian crossing on it;
* It would be good to have a icon "bump" in the future.
2014-10-20 17:36:49 -07:00
endro
50f892a75b Prefer power=substation to sub_station 2014-10-20 17:25:41 -07:00
Jakub Wieczorek
dfa442903d Improve the error message on saving when offline (fixes #2373) 2014-10-20 17:14:28 -07:00
John Firebaugh
71cf00416d Update maki 2014-10-20 12:48:17 -07:00
Bryan Housel
5d285cfd51 add amenity=community_centre preset (closes #2243) 2014-10-12 01:39:41 -04:00
John Firebaugh
d904736581 Update translations 2014-10-06 14:51:43 -07:00
John Firebaugh
0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
samanpwbb
e721e93a31 cleanup mapillary UI 2014-09-16 13:49:13 -04:00