Merge branch 'main' into clay-shields-sa-national

osm-americana · Apr 17, 2023 · 8184ac7 · 8184ac7
2 parents f1f10a6 + d8fd238
commit 8184ac7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/icons/poi_aerialway_circle.svg b/icons/poi_aerialway_circle.svg
diff --git a/src/layer/poi.js b/src/layer/poi.js
@@ -2,6 +2,14 @@ import * as label from "../constants/label.js";
 import * as Color from "../constants/color.js";
 
 var iconDefs = {
+  aerialway_station: {
+    classes: {
+      aerialway: ["station"],
+    },
+    sprite: "poi_aerialway_circle",
+    color: Color.poi.transport,
+    description: "Aerial lift station",
+  },
   bar: {
     classes: {
       bar: ["bar"],
@@ -205,7 +213,21 @@ export const poi = {
     },
     "icon-image": imageExpression,
     "icon-size": 1.0,
-    "text-field": label.localizedName,
+    "text-field": [
+      "step",
+      ["zoom"],
+      [
+        "match",
+        ["get", "subclass"],
+        ["bus_stop", "tram_stop"],
+        "",
+        label.localizedName,
+      ],
+      16,
+      ["match", ["get", "subclass"], ["bus_stop"], "", label.localizedName],
+      17,
+      label.localizedName,
+    ],
     "text-variable-anchor": ["left", "right", "bottom"],
     "text-justify": "auto",
     "text-radial-offset": 1.2,

diff --git a/src/layer/rail.js b/src/layer/rail.js
@@ -493,7 +493,7 @@ const isTram = ["==", ["get", "subclass"], "tram"];
 
 export const legendEntries = [
   {
-    description: "Mainline track",
+    description: "Main or branch line track",
     layers: [rail.dashes().id, railway.fill().id],
     filter: ["all", isGenericRail, isNotService, isNotCrossover],
   },