Commit Graph

8657 Commits

Author SHA1 Message Date
Martin Raifer
d2d464d9ee only drop restrictions from FROM towards VIA when adding new only
partially adresses bugs in #4968:

* doesn't crash anymore in complex situations (short FROM ways where both ends connect to a TO way)
* adding a only-restriction at one end of a short FROM doesn't delete restrictions on the other end of the same FROM anymore
2018-04-10 13:19:20 +02:00
Bryan Housel
d60c423ac0 npm run build to update translation file 2018-04-03 21:26:30 -04:00
Bryan Housel
6bca22bf0d Merge pull request #4962 from Xavier-J-Ortiz/add_faces_to_clock
adding faces to clock
2018-04-03 21:25:22 -04:00
xortiz
606192ac66 created field for face, added face in clocks 2018-04-03 21:01:07 -04:00
xortiz
c786c5ba34 not sure, but am getting an error when running 'npm run build'
building data
2018-04-03 19:49:19 -04:00
Bryan Housel
e517c48344 Remove "vertex" geometry from Beach Resort preset 2018-04-03 17:43:25 -04:00
Bryan Housel
29685b704e Merge pull request #4956 from Xavier-J-Ortiz/add_lesiure_beach_resort
added beach_resort.json in leisure
2018-04-03 17:40:40 -04:00
Bryan Housel
30409d76d6 Remove babel-eslint parser (not needed since we removed flow) 2018-04-02 15:44:12 -04:00
Bryan Housel
5a97f54317 Fix zoom scaleExtent to allow zoom out to z2 (full map)
(closes #4959)

Also includes some code formatting and cleanup
2018-04-02 15:26:52 -04:00
xortiz
d12ed45a49 added beach_resort.json in leisure 2018-03-31 14:47:06 -04:00
Bryan Housel
d6196ac0f9 Rebuild taginfo.json 2018-03-30 09:03:19 -04:00
Bryan Housel
b950c63f17 Merge branch 'patch/taginfo' of https://github.com/mmd-osm/iD into mmd-osm-patch/taginfo 2018-03-30 08:52:19 -04:00
Bryan Housel
2d042288aa Add some padding at bottom of panes
(re https://github.com/openstreetmap/iD/issues/4599#issuecomment-377207313)
2018-03-30 00:07:58 -04:00
Bryan Housel
63b73c59b4 Add tests for complex intersections, no/only restrictions, via node/way
(tests cover #4951, #4928, #4849)
2018-03-29 23:13:22 -04:00
Bryan Housel
7e61ef0dc1 Clearer conditional 2018-03-29 16:31:52 -04:00
Bryan Housel
4041ab48fe Only restriction along viaway can enter either at either end
(closes #4951)

Previously it would only count if the connecting node was the first one.
I guess I was only thinking about oneways only the day I wrote that code.
2018-03-29 16:19:18 -04:00
Bryan Housel
0d262e5bb5 Stricter test for whether a via way restriction matches the path
(closes #4928)
2018-03-28 23:49:08 -04:00
Bryan Housel
05526c1ba6 Prevent clicking in restriction editor from selecting nearby text 2018-03-28 20:54:08 -04:00
mmd-osm
1da6d9029b bugfix: don't store icon and geom in t, as no translation is needed here 2018-03-28 23:12:06 +02:00
mmd-osm
19de638f58 Bug fix 2018-03-28 22:24:17 +02:00
Bryan Housel
3b882c8145 Rename "No Turns" to "Only Straight On", add "Only U-turn" preset
(closes #4952)
2018-03-28 16:04:10 -04:00
greenkeeper[bot]
07c406ad1c fix(package): update lodash-es to version 4.17.8 2018-03-28 13:49:48 -04:00
Bryan Housel
02682f0376 Add more kinds of vending machines, change vending to multiple select field
(closes #4888)
2018-03-28 00:55:30 -04:00
Bryan Housel
bf8c24fd2b Add usage voltage frequency fields to several rail presets
(closes #4919)
2018-03-28 00:26:36 -04:00
Bryan Housel
a160c00c35 Hide Turn Restriction field on trivial junctions
(closes #4934)
2018-03-27 23:54:26 -04:00
Bryan Housel
4840fea0bc Don't autocomplete numeric values in the combobox
(closes #4935)
2018-03-27 22:15:19 -04:00
Bryan Housel
734957f283 Handle variants of 'stop' and 'platform' when identifying PTv2 members
(closes #4946)
2018-03-27 21:52:52 -04:00
Bryan Housel
f504909394 Merge branch 'vershwal-fix4599' 2018-03-27 21:00:01 -04:00
Bryan Housel
08ac17f49c Split pane content into header and content, move close button 2018-03-27 18:38:39 -04:00
mmd-osm
096585f9a5 Minor style fixes 2018-03-27 20:42:06 +02:00
mmd-osm
126d33308f Lint fixes 2018-03-27 20:10:38 +02:00
mmd-osm
c92eb99272 Fix GitHub URLs 2018-03-27 20:08:14 +02:00
Bryan Housel
d09c7c9a71 Merge pull request #4949 from hikemaniac/industrial
Add field for industrial=*
2018-03-27 14:03:54 -04:00
hikemaniac
79c37cf07b Fixed a typo. 2018-03-27 19:58:54 +02:00
mmd-osm
764acea67f Taginfo Maki icon lookup
+ Changed description duplicate handling
+ Removed geometry and icon from translation
2018-03-27 19:41:48 +02:00
hikemaniac
192beec275 Added type of industry field. 2018-03-27 19:32:45 +02:00
mmd-osm
e3536fd05c lint fix 2018-03-26 21:32:49 +02:00
mmd-osm
35317d3a95 Taginfo: Added descriptions, coalesce entries 2018-03-26 21:21:03 +02:00
Bryan Housel
3bf618add8 Merge branch 'fix4599' of https://github.com/vershwal/iD into vershwal-fix4599 2018-03-26 11:19:10 -04:00
Bryan Housel
523fb7f370 Merge pull request #4942 from Xavier-J-Ortiz/add_shop_pet_grooming
added pet_grooming to shop
2018-03-26 10:42:55 -04:00
greenkeeper[bot]
35f067142c fix(package): update marked to version 0.3.19 2018-03-26 10:39:25 -04:00
xortiz
483b907c91 corrected a typo mistake 2018-03-25 19:25:00 -04:00
xortiz
5e8038e32b added pet_grooming to shop 2018-03-25 19:00:38 -04:00
mmd-osm
872fdba3b1 fix lint error 2018-03-25 19:38:15 +02:00
mmd-osm
44f3ef8ee1 Add fields to Taginfo file
(Fixes #4937)
2018-03-25 19:25:49 +02:00
Bryan Housel
b328948d0d Add communication types field and terms to antenna preset 2018-03-25 09:50:44 -04:00
Alex
17bbf0a5e7 Create antenna.json
see https://wiki.openstreetmap.org/wiki/Proposed_features/Telecommunications_tower
2018-03-25 13:10:13 +02:00
Bryan Housel
d9b6fcef71 Switch "monastery_grounds" -> "monastery" 2018-03-24 17:55:48 -04:00
Bryan Housel
9e02cde651 Merge pull request #4936 from Xavier-J-Ortiz/add_amenity_monestary
added monastary
2018-03-24 14:55:33 -04:00
xortiz
1b01b2e0ad removed service_times from monastary 2018-03-24 12:58:05 -04:00