vector tile: add no-thru traffic restrictions layer #6146

flaktack · 2024-10-11T11:28:57Z

Summary

The new vector tile layers did not include no-thru traffic details. This adds layers reusing the existing colors from the permission layer.

The edge layers are grouped by street mode. This allows coloring all edges usable by the selected modes.

Issue

Fixes #6145

codecov · 2024-10-11T12:12:20Z

Codecov Report

Attention: Patch coverage is 82.35294% with 15 lines in your changes missing coverage. Please review.

Project coverage is 69.76%. Comparing base (2ead4da) to head (0b6fcac).
Report is 71 commits behind head on dev-2.x.

Files with missing lines	Patch %	Lines
...nner/inspector/vector/edge/EdgePropertyMapper.java	8.33%	11 Missing ⚠️
...ipplanner/apis/vectortiles/model/StyleBuilder.java	77.77%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             dev-2.x    #6146   +/-   ##
==========================================
  Coverage      69.75%   69.76%           
- Complexity     17657    17663    +6     
==========================================
  Files           2007     2007           
  Lines          75573    75641   +68     
  Branches        7734     7738    +4     
==========================================
+ Hits           52716    52768   +52     
- Misses         20144    20158   +14     
- Partials        2713     2715    +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

+ group no-thru traffic and permission layers by mode

habrahamsson-skanetrafiken

It's nice to get rid of the checkboxes for all permission combinations.

I haven't looked at the vectortiles before but I think this looks good in general. I tested it out and added my thoughts.

habrahamsson-skanetrafiken · 2024-10-21T08:28:38Z

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

@@ -181,9 +197,8 @@ private static List<StyleBuilder> edges(VectorSourceLayer edges) {
        .group(EDGES_GROUP)
        .typeLine()
        .vectorSourceLayer(edges)
-        .lineColor(MAGENTA)
-        .edgeFilter(EDGES_TO_DISPLAY)


Can you explain why we remove this filter?

The style changes have been reverted.

Since only the edge layer was interactive, my thought was to have an indicative background layer on which any edge could be selected.

That has been replaced with an update to MapControl/LayerControl so that the list of dynamic layers is updated based on the selected layers.

habrahamsson-skanetrafiken · 2024-10-21T08:44:50Z

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

+      .toList();
+  }
+
+  private static String permissionColors(StreetTraversalPermission p) {


Suggested change

private static String permissionColors(StreetTraversalPermission p) {

private static String permissionColor(StreetTraversalPermission p) {

Thanks, updated ✔️

habrahamsson-skanetrafiken · 2024-10-21T09:45:05Z

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

-        .lineColor(MAGENTA)
-        .edgeFilter(EDGES_TO_DISPLAY)
-        .lineWidth(LINE_WIDTH)
+        .lineColor(GRAY)


This is hard to see.

The original styling has been restored.

habrahamsson-skanetrafiken · 2024-10-21T09:45:16Z

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

+        .lineColor(GRAY)
+        .lineOpacity(0.2f)


This is very hard to see

The original styling has been restored.

habrahamsson-skanetrafiken · 2024-10-21T09:57:27Z

application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java

+  public static String streetPermissionAsString(StreetTraversalPermission permission) {
+    return (
+      permission == StreetTraversalPermission.ALL
+        ? "PEDESTRIAN_AND_BICYCLE_AND_CAR"


This does add a bit of noise to the map since the labels that used to say ALL now says PEDESTRIAN BICYCLE CAR. Maybe that's ok since it's more explicit?

The layer style has been updated to handle ALL instead.

…oups

leonardehrenfried · 2024-11-08T06:06:02Z

client/src/components/MapView/MapView.tsx

@@ -78,7 +79,7 @@ export function MapView({
        }}
        // it's unfortunate that you have to list these layers here.
        // maybe there is a way around it: https://github.com/visgl/react-map-gl/discussions/2343
-        interactiveLayerIds={['regular-stop', 'area-stop', 'group-stop', 'parking-vertex', 'vertex', 'edge', 'link']}
+        interactiveLayerIds={interactiveLayerIds}


Fantastic! I was waiting for someone to come up with a solution for this.

You could remove the coment above it.

It has been removed 🙇

... since the list of interactive layer ids is updated when a layer's visibility is changed

flaktack added the Skip Changelog label Oct 11, 2024

flaktack force-pushed the feature/layer-groups branch from 24c6206 to 06f97dc Compare October 11, 2024 12:06

t2gran added this to the 2.7 (next release) milestone Oct 16, 2024

flaktack force-pushed the feature/layer-groups branch 2 times, most recently from 1bb4fc1 to b10b81d Compare October 17, 2024 13:22

vector tiles: add no-thru traffic layers

336fb13

+ group no-thru traffic and permission layers by mode

flaktack force-pushed the feature/layer-groups branch from b10b81d to 336fb13 Compare October 17, 2024 13:31

flaktack marked this pull request as ready for review October 17, 2024 13:32

flaktack requested a review from a team as a code owner October 17, 2024 13:32

flaktack added the OTP Debug UI The OTP bundled client label Oct 17, 2024

habrahamsson-skanetrafiken self-requested a review October 17, 2024 14:05

habrahamsson-skanetrafiken reviewed Oct 21, 2024

View reviewed changes

flaktack added 2 commits November 7, 2024 21:20

Merge remote-tracking branch 'upstream/dev-2.x' into feature/layer-gr…

f6c04e0

…oups

vector tile: use ALL for permissions

14cef7c

flaktack force-pushed the feature/layer-groups branch from 26f78f5 to 171092c Compare November 7, 2024 21:28

flaktack added 2 commits November 7, 2024 22:55

vector tile: update/restore edge styles

3415473

debug client: dynamically update interactive layers

8e786c0

flaktack force-pushed the feature/layer-groups branch from 171092c to 8e786c0 Compare November 7, 2024 21:55

leonardehrenfried reviewed Nov 8, 2024

View reviewed changes

leonardehrenfried previously approved these changes Nov 8, 2024

View reviewed changes

debug client: remove obsolete comment

0b6fcac

... since the list of interactive layer ids is updated when a layer's visibility is changed

flaktack dismissed leonardehrenfried’s stale review via 0b6fcac November 8, 2024 07:36

leonardehrenfried approved these changes Nov 8, 2024

View reviewed changes

leonardehrenfried requested a review from habrahamsson-skanetrafiken November 11, 2024 22:02

habrahamsson-skanetrafiken approved these changes Nov 12, 2024

View reviewed changes

flaktack merged commit 3d5d504 into opentripplanner:dev-2.x Nov 12, 2024
6 checks passed

leonardehrenfried mentioned this pull request Nov 19, 2024

Make stop layers clickable again in debug client #6261

Merged

flaktack deleted the feature/layer-groups branch November 22, 2024 09:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

vector tile: add no-thru traffic restrictions layer #6146

vector tile: add no-thru traffic restrictions layer #6146

flaktack commented Oct 11, 2024 •

edited

Loading

codecov bot commented Oct 11, 2024 •

edited

Loading

habrahamsson-skanetrafiken left a comment

habrahamsson-skanetrafiken Oct 21, 2024

flaktack Nov 7, 2024

habrahamsson-skanetrafiken Oct 21, 2024

flaktack Nov 7, 2024

habrahamsson-skanetrafiken Oct 21, 2024

flaktack Nov 7, 2024

habrahamsson-skanetrafiken Oct 21, 2024

flaktack Nov 7, 2024

habrahamsson-skanetrafiken Oct 21, 2024

flaktack Nov 7, 2024

leonardehrenfried Nov 8, 2024

leonardehrenfried Nov 8, 2024

flaktack Nov 8, 2024

	private static String permissionColors(StreetTraversalPermission p) {
	private static String permissionColor(StreetTraversalPermission p) {

vector tile: add no-thru traffic restrictions layer #6146

vector tile: add no-thru traffic restrictions layer #6146

Conversation

flaktack commented Oct 11, 2024 • edited Loading

Summary

Issue

codecov bot commented Oct 11, 2024 • edited Loading

Codecov Report

habrahamsson-skanetrafiken left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flaktack commented Oct 11, 2024 •

edited

Loading

codecov bot commented Oct 11, 2024 •

edited

Loading