Merge pull request #755 from ZeLonewolf/clay-aerialway

add aerialways

scripts/taginfo_template.json

@@ -154,6 +154,62 @@
       "doc_url": "https://openmaptiles.org/schema/#class",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_military_plane.svg"
     },
+    {
+      "key": "aerialway",
+      "value": "cable_car",
+      "object_types": ["way"],
+      "description": "Cable cars are represented by a solid magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "chair_lift",
+      "object_types": ["way"],
+      "description": "Chairlifts are represented by a solid magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "gondola",
+      "object_types": ["way"],
+      "description": "Aerial gondolas are represented by a solid magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "mixed_lift",
+      "object_types": ["way"],
+      "description": "Mixed aerial lifts are represented by a solid magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "drag_lift",
+      "object_types": ["way"],
+      "description": "Drag lifts are represented by a dashed magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "platter",
+      "object_types": ["way"],
+      "description": "Platter lifts are represented by a dashed magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "j-bar",
+      "object_types": ["way"],
+      "description": "J-bar lifts are represented by a dashed magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
+    {
+      "key": "aerialway",
+      "value": "t-bar",
+      "object_types": ["way"],
+      "description": "T-bar lifts are represented by a dashed magenta line that splits in two at high zoom.",
+      "doc_url": "https://openmaptiles.org/schema/#aerialway"
+    },
     {
       "key": "aeroway",
       "value": "runway",

src/constants/color.js

@@ -20,6 +20,9 @@ export const parkOutline = "hsla(136, 41%, 70%, 50%)";
 export const parkLabel = "hsl(136, 71%, 29%)";
 export const parkLabelHalo = "hsl(90, 27%, 94%)";
 
+export const aerialwayLine = "hsl(310, 41%, 59%)";
+export const aerialwayLabel = "hsl(310, 71%, 29%)";
+
 export const airportFill = "hsl(250, 41%, 95%)";
 export const airportOutline = "hsl(250, 41%, 79%)";
 export const airportRunway = "hsl(250, 41%, 79%)";

src/js/legend_config.js

@@ -13,6 +13,7 @@ import * as ParkLayers from "../layer/park.js";
 import * as BuildingLayers from "../layer/building.js";
 import * as WaterLayers from "../layer/water.js";
 import * as FerryLayers from "../layer/ferry.js";
+import * as AerialwayLayers from "../layer/aerialway.js";
 
 export const sections = [
   {
@@ -40,6 +41,10 @@ export const sections = [
     name: "Railroads",
     entries: RailLayers.legendEntries,
   },
+  {
+    name: "Aerial lifts",
+    entries: AerialwayLayers.legendEntries,
+  },
   {
     name: "Aviation",
     entries: AerowayLayers.legendEntries,

src/layer/aerialway.js

@@ -0,0 +1,144 @@
+"use strict";
+
+import * as Color from "../constants/color.js";
+
+// Exponent base for inter-zoom interpolation
+let aerialwayExp = 1.2;
+
+let lineWidth = [
+  "interpolate",
+  ["exponential", aerialwayExp],
+  ["zoom"],
+  12,
+  1.2,
+  14.9999,
+  2.4,
+  15,
+  1.2,
+  16,
+  1.2,
+  20,
+  2.4,
+];
+let lineGapWidth = [
+  "interpolate",
+  ["exponential", aerialwayExp],
+  ["zoom"],
+  12,
+  0,
+  15,
+  0,
+  16,
+  1,
+  20,
+  16,
+];
+
+let casingLineWidth = [
+  "interpolate",
+  ["exponential", aerialwayExp],
+  ["zoom"],
+  12,
+  2,
+  15.9999,
+  4,
+  16,
+  2,
+  20,
+  4,
+];
+let casingLineGapWidth = [
+  "interpolate",
+  ["exponential", aerialwayExp],
+  ["zoom"],
+  12,
+  0,
+  16,
+  0,
+  20,
+  14.4,
+];
+
+export const lift = {
+  id: "lift",
+  type: "line",
+  paint: {
+    "line-color": Color.aerialwayLine,
+    "line-width": lineWidth,
+    "line-gap-width": lineGapWidth,
+  },
+  filter: [
+    "all",
+    ["==", ["get", "class"], "aerialway"],
+    [
+      "in",
+      ["get", "subclass"],
+      ["literal", ["chair_lift", "cable_car", "gondola", "mixed_lift"]],
+    ],
+  ],
+  layout: {
+    visibility: "visible",
+  },
+  source: "openmaptiles",
+  "source-layer": "transportation",
+};
+
+export const liftCasing = {
+  id: "lift_casing",
+  type: "line",
+  paint: {
+    "line-color": Color.backgroundFill,
+    "line-width": casingLineWidth,
+    "line-gap-width": casingLineGapWidth,
+  },
+  filter: [
+    "all",
+    ["==", ["get", "class"], "aerialway"],
+    [
+      "in",
+      ["get", "subclass"],
+      ["literal", ["chair_lift", "cable_car", "gondola", "mixed_lift"]],
+    ],
+  ],
+  layout: {
+    visibility: "visible",
+  },
+  source: "openmaptiles",
+  "source-layer": "transportation",
+};
+
+export const dragLift = {
+  id: "drag_lift",
+  type: "line",
+  paint: {
+    "line-color": Color.aerialwayLine,
+    "line-width": lineWidth,
+    "line-gap-width": lineGapWidth,
+    "line-dasharray": [5, 1],
+  },
+  filter: [
+    "all",
+    ["==", ["get", "class"], "aerialway"],
+    [
+      "in",
+      ["get", "subclass"],
+      ["literal", ["drag_lift", "platter", "j-bar", "t-bar"]],
+    ],
+  ],
+  layout: {
+    visibility: "visible",
+  },
+  source: "openmaptiles",
+  "source-layer": "transportation",
+};
+
+export const legendEntries = [
+  {
+    description: "Aerial tramway or chairlift",
+    layers: [lift.id],
+  },
+  {
+    description: "Drag lift",
+    layers: [dragLift.id],
+  },
+];

src/layer/index.js

@@ -2,6 +2,7 @@
 
 import * as Label from "../constants/label.js";
 
+import * as lyrAerialway from "./aerialway.js";
 import * as lyrAeroway from "./aeroway.js";
 import * as lyrBackground from "./background.js";
 import * as lyrBoundary from "./boundary.js";
@@ -135,7 +136,9 @@ export function build(locales) {
     lyrRail.railway.fill(),
 
     lyrOneway.road,
-    lyrOneway.link
+    lyrOneway.link,
+
+    lyrAerialway.dragLift
   );
 
   layers.push(lyrBuilding.building);
@@ -199,6 +202,9 @@ export function build(locales) {
 
   layers.push(
     //The labels at the end of the list draw on top of the layers at the beginning.
+    lyrAerialway.liftCasing,
+    lyrAerialway.lift,
+
     lyrBoundary.countryLabelLeft,
     lyrBoundary.countryLabelRight,
     lyrWater.waterwayLabel,