From 158e854d8d3e2ecdbf10c8bc889b47cbf0987d37 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Wed, 8 Feb 2023 13:15:36 -0500 Subject: [PATCH 1/6] Make ferry routes thinner and non-dashed at low and middle zooms --- src/layer/ferry.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/layer/ferry.js b/src/layer/ferry.js index 6aa8a6ca1..a00d6ce89 100644 --- a/src/layer/ferry.js +++ b/src/layer/ferry.js @@ -5,13 +5,30 @@ import * as Color from "../constants/color.js"; // Filter properties in this layer should be updated to reflect consensus once // https://github.com/openmaptiles/openmaptiles/issues/1373 is closed +//Exponent base for inter-zoom interpolation +const ferryExp = 1.2; // same as for roads + export const ferry = { id: "ferry", type: "line", paint: { "line-color": Color.waterLineBold, - "line-dasharray": [7, 5], - "line-width": 1.5, + "line-dasharray": [ + "step", + ["zoom"], + ["literal", [1, 0]], + 15, + ["literal", [7, 5]], + ], + "line-width": [ + "interpolate", + ["exponential", ferryExp], + ["zoom"], + 4, + 0.55, // make slightlier thicker than roads at this scale since ferry colors are lower contrast + 12, + 1, + ], }, filter: [ "any", @@ -27,7 +44,7 @@ export const ferry = { export const legendEntries = [ { - description: "Ferry line", + description: "Ferry route", layers: [ferry.id], }, ]; From 98f10d4940da972ced86fd73266636a191e855cf Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Sun, 12 Feb 2023 22:31:03 -0500 Subject: [PATCH 2/6] Switch ferry to dashed line at lower zoom level --- src/layer/ferry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer/ferry.js b/src/layer/ferry.js index a00d6ce89..3c9cb39b7 100644 --- a/src/layer/ferry.js +++ b/src/layer/ferry.js @@ -17,7 +17,7 @@ export const ferry = { "step", ["zoom"], ["literal", [1, 0]], - 15, + 13, ["literal", [7, 5]], ], "line-width": [ From 3af309400002642964c9a4da9f895f083eb23a31 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Tue, 14 Feb 2023 22:46:23 -0500 Subject: [PATCH 3/6] Transport-colored (violet) ferries --- src/constants/color.js | 2 ++ src/layer/ferry.js | 2 +- src/layer/transportation_label.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/constants/color.js b/src/constants/color.js index 7b69fc519..19c2518c4 100644 --- a/src/constants/color.js +++ b/src/constants/color.js @@ -25,6 +25,8 @@ export const airportOutline = "hsl(250, 41%, 79%)"; export const airportRunway = "hsl(250, 41%, 79%)"; export const airportLabel = "hsl(250, 71%, 29%)"; +export const ferry = `hsl(250, 36%, 50%)`; + //TODO - rename this variable to "palette" export const palette = { black: "black", diff --git a/src/layer/ferry.js b/src/layer/ferry.js index 3c9cb39b7..ae057a6bd 100644 --- a/src/layer/ferry.js +++ b/src/layer/ferry.js @@ -12,7 +12,7 @@ export const ferry = { id: "ferry", type: "line", paint: { - "line-color": Color.waterLineBold, + "line-color": Color.ferry, "line-dasharray": [ "step", ["zoom"], diff --git a/src/layer/transportation_label.js b/src/layer/transportation_label.js index e3f45f4a1..66bb265f2 100644 --- a/src/layer/transportation_label.js +++ b/src/layer/transportation_label.js @@ -31,7 +31,7 @@ export const label = { minorConstruction, "slategray", "ferry", - Color.waterLineBold, + Color.ferry, "#333", ], "text-halo-color": [ From 9b44a571e846cff508d823fd5413129a5671b575 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Tue, 14 Feb 2023 23:03:08 -0500 Subject: [PATCH 4/6] Lighten ferry color somewhat --- src/constants/color.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants/color.js b/src/constants/color.js index 19c2518c4..4dfe781b9 100644 --- a/src/constants/color.js +++ b/src/constants/color.js @@ -25,7 +25,7 @@ export const airportOutline = "hsl(250, 41%, 79%)"; export const airportRunway = "hsl(250, 41%, 79%)"; export const airportLabel = "hsl(250, 71%, 29%)"; -export const ferry = `hsl(250, 36%, 50%)`; +export const ferry = `hsl(250, 41%, 54%)`; //TODO - rename this variable to "palette" export const palette = { From 7d5be9f55a23a95ebff9477403a6b49bda72f366 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:07:15 -0500 Subject: [PATCH 5/6] Blue ferries, consistently dashed --- src/constants/color.js | 2 -- src/layer/ferry.js | 10 ++-------- src/layer/transportation_label.js | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/constants/color.js b/src/constants/color.js index 4dfe781b9..7b69fc519 100644 --- a/src/constants/color.js +++ b/src/constants/color.js @@ -25,8 +25,6 @@ export const airportOutline = "hsl(250, 41%, 79%)"; export const airportRunway = "hsl(250, 41%, 79%)"; export const airportLabel = "hsl(250, 71%, 29%)"; -export const ferry = `hsl(250, 41%, 54%)`; - //TODO - rename this variable to "palette" export const palette = { black: "black", diff --git a/src/layer/ferry.js b/src/layer/ferry.js index ae057a6bd..0b8cd9601 100644 --- a/src/layer/ferry.js +++ b/src/layer/ferry.js @@ -12,14 +12,8 @@ export const ferry = { id: "ferry", type: "line", paint: { - "line-color": Color.ferry, - "line-dasharray": [ - "step", - ["zoom"], - ["literal", [1, 0]], - 13, - ["literal", [7, 5]], - ], + "line-color": Color.waterLineBold, + "line-dasharray": ["literal", [7, 5]], "line-width": [ "interpolate", ["exponential", ferryExp], diff --git a/src/layer/transportation_label.js b/src/layer/transportation_label.js index 66bb265f2..e3f45f4a1 100644 --- a/src/layer/transportation_label.js +++ b/src/layer/transportation_label.js @@ -31,7 +31,7 @@ export const label = { minorConstruction, "slategray", "ferry", - Color.ferry, + Color.waterLineBold, "#333", ], "text-halo-color": [ From 91ddb815ef41852ae5fb06ab3751a4d0e36970b5 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:09:56 -0500 Subject: [PATCH 6/6] Literally no need for `literal` --- src/layer/ferry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer/ferry.js b/src/layer/ferry.js index 0b8cd9601..7d1512f0b 100644 --- a/src/layer/ferry.js +++ b/src/layer/ferry.js @@ -13,7 +13,7 @@ export const ferry = { type: "line", paint: { "line-color": Color.waterLineBold, - "line-dasharray": ["literal", [7, 5]], + "line-dasharray": [7, 5], "line-width": [ "interpolate", ["exponential", ferryExp],