From 859b07c2389b5e738505b24028a685def3b83b26 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Mon, 10 Apr 2023 11:02:20 -0400
Subject: [PATCH 1/3] Add aerialway station icon

---
 icons/poi_aerialway_circle.svg | 6 ++++++
 src/layer/poi.js               | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 icons/poi_aerialway_circle.svg

diff --git a/icons/poi_aerialway_circle.svg b/icons/poi_aerialway_circle.svg
new file mode 100644
index 000000000..7c5caf6a2
--- /dev/null
+++ b/icons/poi_aerialway_circle.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" fill="#fff" stroke="#000" r="9.5"/>
+ <path style="fill:none;stroke:#000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M10.5 2.5c-.471404 0-1 .5285955-1 1v2c0 .4714045.528596 1 1 1M1.2 6.5 15.2 2"/>
+ <path style="color:#000;fill:#000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none" d="M 5,7 A 0.50005,0.50005 0 0 0 4.5351562,7.3144531 c -1.0512252,2.6280631 -1.0512252,5.7430309 0,8.3710939 A 0.50005,0.50005 0 0 0 5,16 h 10 a 0.50005,0.50005 0 0 0 0.464844,-0.314453 c 1.051225,-2.628063 1.051225,-5.7430308 0,-8.3710939 A 0.50005,0.50005 0 0 0 15,7 h -5 z"/>
+ <path style="color:#000;fill:#fff;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none" d="M 5.40625 8 C 4.9512475 9.2608747 4.7569735 10.63881 4.8203125 12 L 15.179688 12 C 15.243026 10.63881 15.048752 9.2608747 14.59375 8 L 10 8 L 5.40625 8 z"/>
+</svg>
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 30d166bca..b75f09c5b 100644
--- 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"],

From 14edb1109e51ac7416c4e3dc859da43e750e58a8 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Wed, 12 Apr 2023 19:25:30 -0400
Subject: [PATCH 2/3] hide bus and tram stop labels until very high zoom

---
 src/layer/poi.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/layer/poi.js b/src/layer/poi.js
index e75a0b888..47437f3e2 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -213,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,

From d8fd2382ee1102f8031cace074f4817dc206728c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Thu, 13 Apr 2023 11:46:00 -0700
Subject: [PATCH 3/3] Through railways include branch lines (#808)

* Through railways include branch lines

* Update rail.js

---------

Co-authored-by: Brian Sperlongano <zelonewolf@gmail.com>
---
 src/layer/rail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layer/rail.js b/src/layer/rail.js
index fab7a9227..da96593a5 100644
--- 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],
   },