Skip to content

Make area edges switchable in Debug UI #7254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leonardehrenfried wants to merge 1 commit into
base: dev-2.x
Choose a base branch
from
+71 −7
Open

Make area edges switchable in Debug UI #7254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public class DebugStyleSpec {
POSITRON_BACKGROUND
);
private static final String MAGENTA = "#f21d52";
private static final String LIGHT_MAGENTA = "#f783a0";
private static final String BRIGHT_GREEN = "#22DD9E";
private static final String DARK_GREEN = "#136b04";
private static final String TEAL = "#277eb5";
Expand Down Expand Up @@ -103,12 +104,14 @@ public class DebugStyleSpec {
private static final ZoomDependentNumber LINE_HALF_WIDTH = new ZoomDependentNumber(
List.of(new ZoomStop(LINE_DETAIL_ZOOM, 0.1f), new ZoomStop(MAX_ZOOM, 6))
);
private static final ZoomDependentNumber LINE_QUARTER_WIDTH = new ZoomDependentNumber(
List.of(new ZoomStop(LINE_DETAIL_ZOOM, 0.01f), new ZoomStop(MAX_ZOOM, 3))
);
private static final ZoomDependentNumber CIRCLE_STROKE = new ZoomDependentNumber(
List.of(new ZoomStop(15, 0.2f), new ZoomStop(MAX_ZOOM, 3))
);
private static final Class<Edge>[] EDGES_TO_DISPLAY = new Class[] {
StreetEdge.class,
AreaEdge.class,
EscalatorEdge.class,
PathwayEdge.class,
ElevatorHopEdge.class,
Expand Down Expand Up @@ -443,6 +446,18 @@ private static List<StyleBuilder> rental(

private static List<StyleBuilder> edges(VectorSourceLayer edges) {
return List.of(
StyleBuilder.ofId("area-edge")
.group(EDGES_GROUP)
.typeLine()
.vectorSourceLayer(edges)
.edgeFilter(AreaEdge.class)
.lineColor(LIGHT_MAGENTA)
.lineWidth(LINE_QUARTER_WIDTH)
.lineOffset(LINE_OFFSET)
.lineOpacity(0.5f)
.minZoom(15)
.maxZoom(MAX_ZOOM)
.intiallyHidden(),
StyleBuilder.ofId("edge")
.group(EDGES_GROUP)
.typeLine()
Expand Down
5 changes: 5 additions & 0 deletions application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ public StyleBuilder lineColor(String color) {
return this;
}

public StyleBuilder lineOpacity(float v) {
paint.put("line-opacity", v);
return this;
}

/**
* Generates the line color based off a numeric property in the feature.
* <p>
Expand Down
56 changes: 50 additions & 6 deletions application/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,6 @@
"in",
"class",
"StreetEdge",
"AreaEdge",
"EscalatorEdge",
"PathwayEdge",
"ElevatorHopEdge",
Expand Down Expand Up @@ -785,7 +784,6 @@
"in",
"class",
"StreetEdge",
"AreaEdge",
"EscalatorEdge",
"PathwayEdge",
"ElevatorHopEdge",
Expand Down Expand Up @@ -931,7 +929,6 @@
"in",
"class",
"StreetEdge",
"AreaEdge",
"EscalatorEdge",
"PathwayEdge",
"ElevatorHopEdge",
Expand Down Expand Up @@ -1267,7 +1264,6 @@
"in",
"class",
"StreetEdge",
"AreaEdge",
"EscalatorEdge",
"PathwayEdge",
"ElevatorHopEdge",
Expand Down Expand Up @@ -1310,6 +1306,56 @@
"group" : "Permissions"
}
},
{
"id" : "area-edge",
"type" : "line",
"source" : "vectorSource",
"source-layer" : "edges",
"minzoom" : 15,
"maxzoom" : 23,
"paint" : {
"line-color" : "#f783a0",
"line-width" : [
"interpolate",
[
"linear"
],
[
"zoom"
],
13,
0.01,
23,
3.0
],
"line-offset" : [
"interpolate",
[
"linear"
],
[
"zoom"
],
13,
0.4,
23,
7.0
],
"line-opacity" : 0.5
},
"filter" : [
"in",
"class",
"AreaEdge"
],
"layout" : {
"line-cap" : "round",
"visibility" : "none"
},
"metadata" : {
"group" : "Edges"
}
},
{
"id" : "edge",
"type" : "line",
Expand Down Expand Up @@ -1350,7 +1396,6 @@
"in",
"class",
"StreetEdge",
"AreaEdge",
"EscalatorEdge",
"PathwayEdge",
"ElevatorHopEdge",
Expand Down Expand Up @@ -1384,7 +1429,6 @@
"in",
"class",
"StreetEdge",
"AreaEdge",
"EscalatorEdge",
"PathwayEdge",
"ElevatorHopEdge",
Expand Down
Loading