Commit Graph

1211 Commits

Author SHA1 Message Date
Bryan Housel
200098dff9 Render restriction paths with red/green/blue shadow 2018-02-19 21:30:47 -05:00
Bryan Housel
d940200ef0 osmInferRestriction can just take a turn, instead of from/to
This is better because it makes explicit that osmInferRestriction
needs an actual turn now (from/to with vertex, etc)
2018-02-16 13:27:23 -05:00
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
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
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
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
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
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
47eb5256cc WIP: add detail slider to restriction editor 2018-02-09 16:22:49 -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
Bryan Housel
c1378a141f Add support for complex intersection and via way restrictions 2018-02-02 19:58:09 -05:00
Bryan Housel
db0858f7d2 v2.6.1 2018-02-01 11:38:41 -05:00
Bryan Housel
9d55cfb70f Treat both EsriWorldImagery layers the same (support vintage, etc) 2018-02-01 11:36:20 -05:00
Bryan Housel
80a998e9c5 Support multiple semicolon delimited direction values
(closes #4755)
2018-01-29 17:49:08 -05:00
Bryan Housel
4476d2f265 Merge pull request #4751 from bencostamagna/delete_warning
Warning on multiple deletions: added some details.
2018-01-29 08:58:51 -05:00
Benoit Costamagna
8e85fe847f correcting build issues 2018-01-29 13:20:50 +01:00
Benoit Costamagna
45b74d8730 Added difference between ways and areas 2018-01-29 13:10:39 +01:00
Benoit Costamagna
70a70ae906 very small optimization 2018-01-29 12:55:16 +01:00
Benoit Costamagna
8831ac18c9 Added more details to the warning when many elements are deleted 2018-01-29 12:50:50 +01:00
Bryan Housel
0b6183e2c5 Remove any duplicate vertex created during replaceMovedVertex 2018-01-29 01:03:03 -05:00
Bryan Housel
9b200cf514 Code cleanups, changes to replaceMovedVertex in moveAction
Trying to eliminate the minimum 10m distance for replacing the original
junction vertex - this is a small threshold.  When _not_ replacing this
vertex, the unzorro code will wreck havok on a traffic circle.
(If there is no suitable vertex to use, it will snap to a point between
the nearest vertices, see #4146)
2018-01-28 23:56:03 -05:00
Bryan Housel
f54d201eb2 Stop sequence from playing when the Mapillary viewer is hidden
(closes #4707)
2018-01-26 16:59:32 -05:00
Bryan Housel
db2d165a17 Support fallback mode for Mapillary when WebGL disabled
(closes #3804)
2018-01-26 16:27:48 -05:00
Bryan Housel
9ebf3b11a4 Don't initialize Mapillary viewer with a key
(closes #4536)

This avoids binding the viewer to an image key that might not be
fully processed, which gets the viewer into a bad state.

Instead, we initialize the viewer with a `null` image key and
issue `moveToKey` immediately.

This commit also adds exception handling for moveToKey.
2018-01-26 15:45:53 -05:00
Bryan Housel
db96246ddf Create fake entities for nominatim serach results, so they can be localized
(closes #4725)
2018-01-26 00:41:04 -05:00
Bryan Housel
d5bf2d9762 Add geoHasLineIntersections, better for testing multipolygon rings
(closes #4741)
2018-01-24 23:16:51 -05:00
Bryan Housel
fb196bee8c Persist area-fill-toggle so we can toggle out of wireframe
(closes #4740)
2018-01-24 14:53:30 -05:00
Bryan Housel
300616819d Don't use the same keybind id for modeSave (esc dialog) and uiSave (Ctrl+S)
(closes #4728)
2018-01-24 13:46:01 -05:00
Bryan Housel
0bb812c916 Merge pull request #4672 from openstreetmap/1ec5-num-format-3597
Localize numbers, units in scale, info panels
2018-01-23 18:05:37 -05:00
Bryan Housel
9cf3630439 Merge pull request #4694 from openstreetmap/1ec5-membership-title-4565
Describe relation in tooltip in add membership list
2018-01-23 17:32:46 -05:00
Gautier Pelloux-Prayer
58a4699508 Restore area fill from local storage including wireframe 2018-01-23 20:20:16 +01:00
Bryan Housel
ffc68d1cd6 Merge pull request #4720 from bagage/master
Restore last imageries used and disable features from local storage
2018-01-23 11:03:52 -05:00
Bryan Housel
6570365413 Use dark halo around text, switch to svgPath to get viewport clipping 2018-01-23 00:29:07 -05:00