Commit Graph

6668 Commits

Author SHA1 Message Date
Ajith Ranka
04fe8a5b6c Use drinking-water 2017-01-13 16:47:14 +05:30
Ajith Ranka
4ed4cf67d2 Use horse-riding 2017-01-13 16:38:39 +05:30
Ajith Ranka
9292bfdc28 Use defibrillator 2017-01-13 16:36:06 +05:30
Ajith Ranka
0d0f6237e7 Rename entrance to entrance-alt1 2017-01-13 16:33:57 +05:30
Ajith Ranka
16be07a7cc Use fence 2017-01-13 16:11:18 +05:30
Ajith Ranka
c9718df214 Use barrier instead of prison 2017-01-13 16:08:55 +05:30
Ajith Ranka
33a4ffd213 Rename toilets to toilet 2017-01-13 16:02:05 +05:30
Ajith Ranka
71a14a9798 Rename land-use to landuse 2017-01-13 15:53:31 +05:30
Ajith Ranka
8e6ca56e2f Rename park2 to park-alt; set sawmill as logging 2017-01-13 15:50:40 +05:30
Ajith Ranka
d5c1900006 Rename industrial to industry 2017-01-13 15:39:56 +05:30
Ajith Ranka
6ece90b80a Rename mobilephone to mobile-phone & emergency-telephone to emergency-phone 2017-01-13 15:35:22 +05:30
Ajith Ranka
7b87e450b4 Rename camera to attraction 2017-01-13 15:13:46 +05:30
Ajith Ranka
3379d5d9ba Fix isMaki, reset sizes, remove unnecessary checks 2017-01-13 15:04:58 +05:30
Ajith Ranka
953ca7cfc6 Get the list of maki icons 2017-01-13 15:04:27 +05:30
Ajith Ranka
44034d051b Pull in @mapbox/maki instead 2017-01-13 14:42:24 +05:30
Ajith Ranka
7f9702f4bc Update path in dist:svg:maki script 2017-01-13 11:12:37 +05:30
Ajith Ranka
0b63eaa245 Update maki package to version 2 2017-01-13 11:09:24 +05:30
Bryan Housel
0efd8cb9e6 Merge pull request #3747 from openstreetmap/add-aerialway-presets
Adds additional aerialway presets, fixes #3733
2017-01-12 14:52:06 +05:30
Ajith Ranka
adbde8c68f Add additional aerialway presets, fixes #3733 2017-01-12 14:37:21 +05:30
Bryan Housel
cc3b2ea079 Merge pull request #3735 from M1dgard/fields-email-fax
Add universal email field, make fax universal
2017-01-11 00:22:40 +05:30
Bryan Housel
f96a595698 Merge pull request #3730 from mertemin/feature-y
Add outdoor_seating options
2017-01-10 12:29:04 -05:00
Bryan Housel
1207b08a20 Use a more example-y Turkish phone number, and run build 2017-01-10 22:57:25 +05:30
Bryan Housel
bf951fc451 Merge branch 'feature-x' of https://github.com/mertemin/iD 2017-01-10 22:53:57 +05:30
Bryan Housel
f5ff246ecf Merge pull request #3740 from boothym/step_count
Add step_count field
2017-01-10 12:21:51 -05:00
boothym
ef54e4eb8e Add step_count field 2017-01-10 15:46:50 +00:00
Mert Emin Kalender
c654033663 Add Turkish phone format 2017-01-08 23:37:18 -08:00
Mert Emin Kalender
d18f54cb2f Making outdoor_seating checkbox 2017-01-08 23:05:14 -08:00
M1dgard
8226745f12 Add universal email field, make fax universal
Fixes #3710
2017-01-08 23:14:29 +01:00
Bryan Housel
9abae74e83 Merge pull request #3729 from mertemin/feature-x
Add Turkish address scheme
2017-01-08 15:14:52 -05:00
Bryan Housel
9ab39dd030 Merge pull request #3727 from M1dgard/amenity-coworkingspace
Add amenity=coworking_space as non-searchable preset
2017-01-08 15:13:04 -05:00
Mert Emin Kalender
b2bd8ada9d Add outdoor_seating options 2017-01-07 20:50:42 -08:00
Mert Emin Kalender
0d2eb85007 Add Turkish address scheme 2017-01-07 19:54:35 -08:00
M1dgard
d268f7983e amenity=coworking_space as non-searchable preset
So that it doesn't show up as a blank Amenity in the Inspector.
2017-01-07 23:11:45 +01:00
Bryan Housel
a4eda3cf08 Add presets for leisure=horse_riding
(closes #3619)
2017-01-07 00:29:51 -05:00
Bryan Housel
104262e0b0 Add preset for place=square
(closes #3658)
2017-01-07 00:15:53 -05:00
Bryan Housel
6fd7743f00 Add toll field to motorway, trunk 2017-01-06 23:31:21 -05:00
Bryan Housel
8a7e9f8669 Add preset for barrier=border_control
(closes #3719)
2017-01-06 23:22:04 -05:00
Bryan Housel
5db9cd156b Allow toll_booth on area geometry 2017-01-06 23:18:48 -05:00
Bryan Housel
739c1e9acc Move tracktype to top of field list
(closes #3718)
2017-01-06 23:08:07 -05:00
greenkeeperio-bot
6f18f3865d chore(package): update rollup to version 0.41.1
https://greenkeeper.io/
2017-01-06 22:42:47 -05:00
greenkeeperio-bot
aed977d736 chore(package): update d3 to version 4.4.1
https://greenkeeper.io/
2017-01-06 21:45:33 -05:00
greenkeeperio-bot
ae28a18152 chore(package): update eslint to version 3.13.0
https://greenkeeper.io/
2017-01-06 21:45:13 -05:00
Bryan Housel
4cfc51bf4a Merge branch 'cedarstudios-master' 2017-01-05 11:09:14 -05:00
Bryan Housel
ddd1b7e43a Don't change history state while in transition 2017-01-04 17:37:29 -05:00
Bryan Housel
8ce6b9e185 Merge branch 'transitioned-actions' 2017-01-04 17:26:22 -05:00
Bryan Housel
9ba610a977 Add test for transitioned history.perform 2017-01-04 16:06:09 -05:00
Bryan Housel
12047b1b5b Merge branch 'master' of https://github.com/cedarstudios/iD into cedarstudios-master 2017-01-04 13:33:31 -05:00
Milad Karbasizadeh
4729bbbc4e fix a bug with space 2017-01-04 11:13:45 +03:30
Bryan Housel
d63c766e69 Split into utilDisplayName / utilDisplayNameForPath
This is because utilDisplayName gets called a bunch of places and we
only want to add the Arabic reversal code for textpath labels
2017-01-03 20:58:56 -05:00
Bryan Housel
c70b6278fc Avoid es6 let/const (because phantomjs) 2017-01-03 17:29:33 -05:00