Commit Graph

8763 Commits

Author SHA1 Message Date
Bryan Housel aff9258dee Indirect restrictions now include only the partial path
This lets us properly infer the actual turn taken through the indirect
restriction using osmInferRestriction (an improvement over 5e9db0d)
2018-02-16 11:42:44 -05:00
Bryan Housel 14e904b38f Merge pull request #4808 from bencostamagna/boatbuilder_priority
reduced search priority for boat builder
2018-02-16 09:15:15 -05:00
Bryan Housel 725099e6bd Merge pull request #4809 from fritruc/4804_Mapillary_photo_overlay_can_t_get_disabled
do not stop mapillary autoplaying if _mlyViewer is not initialized (closes #4804)
2018-02-16 09:07:10 -05:00
Jordane Pelloux-Prayer ca493ec47c fixes #4804: do not stop mapillary autoplaying if _mlyViewer is not initialized 2018-02-16 13:01:32 +01:00
Benoit Costamagna 28cb6aa1e1 reduced search priority for boat builder 2018-02-16 11:52:05 +01:00
Bryan Housel 5e9db0d409 Move help display code, fix display of indirect only restrictions
"indirect only" means an only restriction elsewhere in the intersection
that affects the selected from way.

    |     |
 ---+--F--+---
    A     |
 ---v--T--+---
    B     |

In the above example

 - 'only_straight_on' restriction "FROM way A VIA node V TO way B"
 - way F is selected

This would indirectly prevent a u-turn "FROM way F VIA way A TO way T"
We want to display the straight on restriction in the UI as
  "only_straight_on FROM way A VIA node V TO way B"
not
  "only_left_turn FROM way F VIA way A TO way B"
2018-02-16 00:03:04 -05:00
Bryan Housel a2b6a3b09b Flag restriction as indirect if from doesn't match 2018-02-15 22:18:01 -05:00
Bryan Housel f7e6eae065 Support Only Via paths, render indirect turn restriction with opacity 2018-02-15 17:27:45 -05:00
Bryan Housel 9cb3e7d03a Adjust calculation for turn indicator placement
This helps move the indicator a bit further away in cases where
turn.to.node is right up very close to the turning vertex
2018-02-15 13:40:32 -05:00
Bryan Housel d030251fbb Ignore pointer events on restriction help
This prevents flickering when hovering over a turn restriction
that is up underneath where the help is drawn
2018-02-15 13:39:39 -05:00
Bryan Housel 4a7fa80225 eslint 2018-02-15 08:31:31 -05:00
Bryan Housel 050907e252 Move event bindings to update selection, so callbacks use correct vars
When they are on the enter selection, they can stay "sticky" which has
the effect where you might move a slider and it puts the intersection
back to how it previously was (or returns to a previous intersection)
2018-02-15 08:27:39 -05:00
vershwal a80f5b0957 fixes 4795 : Added check for properties 2018-02-15 17:55:04 +05:30
Bryan Housel dbdbad29c2 Make sure container has dimensions the first time 2018-02-14 21:53:56 -05:00
Bryan Housel 0381bad22d Adjust constants, trying to avoid crunched turn indicator on leaf way 2018-02-13 17:45:45 -05:00
Bryan Housel 1612326ffa Move dist/via sliders to bottom, add imperial/metric conversion 2018-02-13 17:25:49 -05:00
Bryan Housel 1174424f50 Adjust padding and sizing constants, return to col4 sidebar
I really want the sidebar back to col4, so the user sees more main map.
This makes it very tricky to fit all of the intersection in the turn
restriction editor.
2018-02-12 15:35:45 -05:00
James Kingdom 73f78c3622 Revert max nodes to 50k 2018-02-12 19:54:19 +00:00
Bryan Housel c9dac22218 Render turn indicators slightly closer to turning vertex 2018-02-12 14:43:14 -05:00
Bryan Housel 777585317a Better inference of u-turns via way 2018-02-12 14:42:39 -05:00
James Kingdom aa3b4882de Change max nodes per request
(closes #4793)
2018-02-12 19:28:17 +00:00
Bryan Housel 013253ecde Improve combobox option visibility
(closes #4761)

This improves the usability of the combobox when it appears over
other rows of fields (e.g. raw tag editor)
1. shrink size on left/right to provide more separation from content beneath
2. adjust box shadow for slightly more visibility
3. shrink size of first option by one pixel, so that the combobox
   options will never perfectly line up with rows that they cover
2018-02-11 22:24:06 -05:00
Bryan Housel aa34a055f6 Capitalize "Wholesale" 2018-02-10 10:42:00 -05:00
Bryan Housel 746c34ecd2 npm run build 2018-02-10 10:19:14 -05:00
Bryan Housel 5cb009eac9 Merge pull request #4785 from hikemaniac/wayside_shrine
Add religion and denomination fields to wayside shrine
2018-02-10 10:18:19 -05:00
hikemaniac 21ab63d9ca Added religion and denomination fields. 2018-02-10 11:52:25 +01:00
hikemaniac a10954b2ad Added religion and denomination fields. 2018-02-10 11:49:58 +01:00
Bryan Housel ca9aac501b Adjust text hint colors, change "Continue" to "Straight on" 2018-02-09 23:12:02 -05:00
Bryan Housel 957896656a Detail slider affects turns, but not geometry
(I decided that the larger context of the intersection is important and
shouldn't be hidden from the user)

Also
- show detail slider only if the intersection is complex
- hide the restriction editor completely if there is no real intersection
  (e.g. junction of `highway=path`)
2018-02-09 22:11:22 -05:00
Bryan Housel 4e1bafc221 Trying help text with color hint 2018-02-09 17:58:06 -05:00
Bryan Housel 3bd8d8d43d Style tweaks, persist max detail to localstorage 2018-02-09 17:39:36 -05:00
Bryan Housel 0348f9f481 Merge pull request #4784 from MKuranowski/pl-address-fix
Polish Address Format fix
2018-02-09 16:31:16 -05:00
Bryan Housel 47eb5256cc WIP: add detail slider to restriction editor 2018-02-09 16:22:49 -05:00
Mikołaj 'Natsuysaumi' Kuranowski 78fddaf39e PL Address Format fix 2018-02-09 21:56:56 +01:00
Bryan Housel 9453feddbb Use "gaming" icon for Amusement Arcade preset 2018-02-08 15:13:24 -05:00
Bryan Housel 1738586fab Merge pull request #4777 from fritruc/4774_Add_leisure_amusement_arcade_preset
add amusement arcade preset (closes #4774)
2018-02-08 15:10:22 -05:00
Bryan Housel 44ef1a83d8 Change caption on shop=agrarian preset to "Farm Supply Shop"
(closes #4775)
2018-02-08 15:08:47 -05:00
Bryan Housel 4b2b568ab6 Upgrade to xmlbuilder 9.0.6
(closes #4781)
2018-02-08 15:06:34 -05:00
greenkeeper[bot] e38f6cfbfd chore(package): update @std/esm to version 0.21.0 2018-02-08 14:56:50 -05:00
Bryan Housel 0cbff57dc9 Cycle through only_ turn restriction states
(re: #2622)
2018-02-07 19:04:28 -05:00
Bryan Housel 3c340a0362 Trying out more intuitive restriction help message
- includes in the message the names of the streets
- also highlights related segments and nodes along the path

The messages are currently a bit rough:
  U-Turns FROM Black Horse Pike IS allowed...
  VIA Main Street TO Black Horse Pike
2018-02-07 17:00:53 -05:00
Bryan Housel cf1226ca33 Better calc of turn arrow placmenet along short segments 2018-02-07 17:00:22 -05:00
Bryan Housel ea4ac80fee Extend max distance to 30m, but as measured from starting vertex 2018-02-07 09:27:54 -05:00
Bryan Housel 5ca56b6873 Handle situation where nodes have no loc (like in tests) 2018-02-07 01:16:14 -05:00
Bryan Housel 1007cfe252 Better calculation for fitting the whole intersection into view 2018-02-07 01:10:26 -05:00
Bryan Housel aa7925a918 Extend leaf ways, so they don't stop within the viewport 2018-02-07 00:07:38 -05:00
Bryan Housel 520cfd3276 Fix bug causing improper calc of from/via/to metadata after trimming
This is the part of the algorithm where trivial sections get trimmed
from the vgraph.  Removing a vertex from `vertexIds` means "stop checking
this one".  But there were some situations where it could get removed
twice, so we now just verify that `vertexId` is actually in the array
before calling `splice`.
2018-02-06 14:34:26 -05:00
Jordane Pelloux-Prayer 14157a3623 add amusement arcade preset (#4774) 2018-02-06 16:41:23 +01:00
Bryan Housel 176d7d2b4f Adjust preset names, use warehouse icon for shop=wholesale 2018-02-05 15:11:25 -05:00
Bryan Housel e802492313 Merge branch '4754_Create_new_presets_for_shop_wholesale_and_shop_health_food' of https://github.com/fritruc/iD into fritruc-4754_Create_new_presets_for_shop_wholesale_and_shop_health_food 2018-02-05 15:06:18 -05:00