Commit Graph

7583 Commits

Author SHA1 Message Date
Tom MacWright 28e41032e9 Unify, improve development environment 2016-08-30 16:16:36 -04:00
Bryan Housel 7e30fa0fe3 Add string suggestions for display and visibility combos 2016-08-28 16:10:16 -04:00
Bryan Housel f98b5563a2 Merge branch 'patch-1' of https://github.com/HolgerJeromin/iD into HolgerJeromin-patch-1 2016-08-28 15:59:35 -04:00
Bryan Housel 9d0b019699 Merge pull request #3370 from Psigio/3336
Add access_simple field to basketball, tennis & garden presets (#3336)
2016-08-28 15:49:09 -04:00
Bryan Housel 0695a38827 Run make for new preset strings 2016-08-28 15:39:31 -04:00
Bryan Housel b9ad608252 Merge pull request #3381 from willemarcel/master
Add preset for amenity=coworking_space
2016-08-28 15:37:29 -04:00
Bryan Housel a6f6bb9c17 Merge pull request #3380 from bagage/patch-1
Add fire-station icon for fire-hydrant
2016-08-28 15:35:37 -04:00
Wille Marcel 84de65e316 add preset to amenity=coworking_space 2016-08-28 11:24:42 -03:00
Wille Marcel 12b06f0583 Merge branch 'master' of https://github.com/openstreetmap/iD 2016-08-28 10:38:49 -03:00
Gautier Pelloux-Prayer 9a5598e8cd Add fire-station icon for fire-hydrant
Fire hydrants are for firemen anyway, and it help distinguish them from other no-icon point on the map. 

By the way, is there any plan to upgrade maki from version 0.5.0 to latest version 2.0.x? Is that OK if I migrate iD by updating icons' name or there is a particular reason to use maki 0.5.0?
2016-08-27 21:24:07 +02:00
Bryan Housel 82495e8f16 Merge pull request #3379 from openstreetmap/greenkeeper-eslint-3.4.0
Update eslint to version 3.4.0 🚀
2016-08-26 22:02:10 -04:00
greenkeeperio-bot 4a776cc7c7 chore(package): update eslint to version 3.4.0
https://greenkeeper.io/
2016-08-26 14:30:34 -04:00
Bryan Housel a86f34b4ef Pacify eslint, get build and tests running again 2016-08-26 01:15:07 -04:00
Bryan Housel 1021f6266f Merge branch 'master' into d3-v4 2016-08-25 16:22:50 -04:00
Jon D 1dfa5aa77d Fix comment 2016-08-25 07:07:10 +01:00
Jon D 1b09b0dd60 Add implementation for left/right exchange on direction tags. 2016-08-25 07:03:35 +01:00
Jon D 95ac00ffbf Add tests for left/right reversal. 2016-08-25 06:54:54 +01:00
Jon D 08ca3e6fa3 Add implementation for directional tag reversal for nodes on a way. 2016-08-25 00:10:30 +01:00
Jon D 3c57f7147f Add tests for reverse way-node behaviour. No implementation yet. 2016-08-24 23:59:15 +01:00
Bryan Housel 5a045933c6 Rename confirm -> uiconfirm and import to save.js
(closes #3373)
2016-08-24 16:03:23 -04:00
Tom MacWright a59b0d9fdf Fix transitions and multis 2016-08-24 10:42:34 -04:00
Tom MacWright 6f762a92a8 Fix dynamic panning and zooming 2016-08-24 10:30:19 -04:00
Tom MacWright 580b907b30 Fix timers 2016-08-24 10:11:21 -04:00
Tom MacWright e7b6b66ddc Fix mode buttons 2016-08-24 09:52:43 -04:00
Tom MacWright e0f3d562c7 Fix tooltip positioning 2016-08-24 09:42:14 -04:00
Tom MacWright 29f2c20e35 Fix selection usage 2016-08-24 09:34:30 -04:00
Kushan Joshi cb670ccdc4 add test cases for bicycleway 2016-08-22 18:17:12 +05:30
Jon D d0fcb96892 Check in generated presets.json file from make for #3336 2016-08-22 09:01:37 +01:00
Tom MacWright b14948a268 Remove d3 build 2016-08-21 15:21:54 -04:00
Tom MacWright cdb533fa84 Begin d3 v4 update 2016-08-21 15:19:27 -04:00
Jon D 278816473e Add access_simple field to garden also #3336 2016-08-21 16:03:25 +01:00
Jon D 60dd3fdb80 Add access_simple field to basketball and tennis presets as per issue #3336 2016-08-21 15:57:53 +01:00
Bryan Housel 36a90b4f86 Adjust fields (building->building_area), run make for yoga preset 2016-08-21 09:50:45 -04:00
Jon D d13c3b0979 Add Yoga Studio preset #3352 2016-08-21 14:29:49 +01:00
Kushan Joshi c95df1c830 restructure lanesArray 2016-08-21 04:04:42 +05:30
Kushan Joshi ce948f7563 modify test cases to adjust lanes != total lane count 2016-08-21 03:35:52 +05:30
Kushan Joshi 9f76267152 add psv, hov, hgv , bicycle lanes 2016-08-21 02:34:47 +05:30
Bryan Housel 18186ba926 Merge pull request #3367 from 1ec5/patch-2
Simplify macOS setup instructions
2016-08-20 14:30:24 -04:00
Minh Nguyễn 2f6c2e15ee Simplified macOS setup instructions
Presumably either the Command Line Tools package or Xcode would install the tools needed for the build system.
2016-08-20 11:15:32 -07:00
Kushan Joshi 856f6618d9 format test cases 2016-08-20 18:34:50 +05:30
Kushan Joshi 80d2000291 add test cases for maxspeed & maxpseed:lanes 2016-08-20 18:32:35 +05:30
Kushan Joshi 51c0670a57 add maxspeed 2016-08-19 03:22:34 +05:30
Bryan Housel 2501a763e2 Run make for preset updates 2016-08-18 15:14:36 -04:00
Bryan Housel dd57c9f413 Merge pull request #3363 from boothym/bowling-green
Add Bowling Green preset
2016-08-18 15:13:33 -04:00
Bryan Housel a96eeac3a7 Merge pull request #3362 from boothym/shop-terms
Add additional shop/amenity terms
2016-08-18 15:09:29 -04:00
Bryan Housel 07c75eaf6d Merge pull request #3361 from boothym/locality
Remove population from locality
2016-08-18 15:08:31 -04:00
Guillaume Carbonneau 3abfb0f973 Change instructions to use node's http-server instead of going into python land (#3364)
* Change instructions to use node's http-server instead of going into python land

* Node scripts have the local node_modules/.bin/ automatically in their path
2016-08-18 10:48:22 -04:00
boothym da68f82f54 Bowling Green preset 2016-08-18 14:06:16 +01:00
boothym 88783d2b9f Add additional shop/amenity terms 2016-08-18 13:48:47 +01:00
boothym 03eec2924a Remove population from locality 2016-08-18 12:54:48 +01:00