Merge pull request #170 from HSLdevcom/development

Add pikaratikka to the style
HSLdevcom · Sep 8, 2023 · 988864d · 988864d
2 parents 6f7e9b9 + b5840ed
commit 988864d
Show file tree

Hide file tree

Showing 11 changed files with 259 additions and 4 deletions.
diff --git a/cli/static/driver-info.json b/cli/static/driver-info.json
@@ -63,6 +63,15 @@
         "circle-radius": 8
       }
     },
+    {
+      "id": "stops_lrail",
+      "source": "stops-by-routes",
+      "minzoom": 0,
+      "filter": ["==", ["get", "timingStopType"], 0],
+      "paint": {
+        "circle-radius": 8
+      }
+    },
     {
       "id": "stops_subway",
       "source": "stops-by-routes",

diff --git a/cli/static/routes-with-departures-only.json b/cli/static/routes-with-departures-only.json
@@ -24,6 +24,18 @@
       "id": "route_tram_inner",
       "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
     },
+    {
+      "id": "route_lrail_case",
+      "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
+    },
+    {
+      "id": "route_lrail",
+      "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
+    },
+    {
+      "id": "route_lrail_inner",
+      "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
+    },
     {
       "id": "route_trunk_case",
       "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]

diff --git a/cli/static/stops-with-route-info.json b/cli/static/stops-with-route-info.json
@@ -28,6 +28,10 @@
       "id": "stops_tram",
       "source": "stops-by-routes"
     },
+    {
+      "id": "stops_lrail",
+      "source": "stops-by-routes"
+    },
     {
       "id": "stops_subway",
       "source": "stops-by-routes"

diff --git a/index.html b/index.html
@@ -3,8 +3,8 @@
         <meta charset="utf-8" />
         <title>HSL Map Style</title>
         <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
-        <script src="https://api.mapbox.com/mapbox-gl-js/v0.45.0/mapbox-gl.js"></script>
-        <link href="https://api.mapbox.com/mapbox-gl-js/v0.45.0/mapbox-gl.css" rel="stylesheet" />
+        <script src="https://unpkg.com/maplibre-gl/dist/maplibre-gl.js"></script>
+        <link href="https://unpkg.com/maplibre-gl/dist/maplibre-gl.css" rel="stylesheet" />
         <style>
             body {
                 margin: 0;
@@ -31,7 +31,7 @@
         <div id="map"></div>
         <div id="info"></div>
         <script>
-            var map = new mapboxgl.Map({
+            var map = new maplibregl.Map({
                 container: "map", // container id
                 style: "style.json", //stylesheet location
                 center: [24.9, 60.5], // starting position

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hsl-map-style",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "bin": {

diff --git a/style.json b/style.json
@@ -2312,6 +2312,63 @@
         }
       }
     },
+    {
+      "id": "route_lrail_case",
+      "type": "line",
+      "source": "routes",
+      "source-layer": "routes",
+      "filter": ["==", ["get", "mode"], "L_RAIL"],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round"
+      },
+      "paint": {
+        "line-color": "#fff",
+        "line-width": {
+          "stops": [
+            [10, 4],
+            [22, 8]
+          ]
+        }
+      }
+    },
+    {
+      "id": "route_lrail",
+      "type": "line",
+      "source": "routes",
+      "source-layer": "routes",
+      "filter": ["==", ["get", "mode"], "L_RAIL"],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "line-round-limit": 1
+      },
+      "paint": {
+        "line-color": "#00b3aa",
+        "line-width": {
+          "stops": [
+            [10, 2],
+            [22, 6]
+          ]
+        }
+      }
+    },
+    {
+      "id": "route_lrail_inner",
+      "type": "line",
+      "source": "routes",
+      "source-layer": "routes",
+      "filter": ["==", ["get", "mode"], "L_RAIL"],
+      "paint": {
+        "line-color": "#30bfb6",
+        "line-width": {
+          "stops": [
+            [10, 0.5],
+            [22, 2]
+          ]
+        }
+      }
+    },
     {
       "id": "route_ferry",
       "type": "line",
@@ -3466,6 +3523,26 @@
         ]
       }
     },
+    {
+      "id": "stops_lrail",
+      "type": "circle",
+      "source": "stops",
+      "source-layer": "stops",
+      "minzoom": 13,
+      "filter": ["==", ["get", "mode"], "L_RAIL"],
+      "paint": {
+        "circle-color": "#00b2a9",
+        "circle-radius": [
+          "interpolate",
+          ["exponential", 1.15],
+          ["zoom"],
+          12,
+          1,
+          22,
+          24
+        ]
+      }
+    },
     {
       "id": "stops_subway",
       "type": "circle",

diff --git a/style/hsl-map-style-routes.json b/style/hsl-map-style-routes.json
@@ -354,6 +354,102 @@
         }
       }
     },
+    {
+      "id": "route_lrail_case",
+      "type": "line",
+      "source": "routes",
+      "source-layer": "routes",
+      "filter": [
+        "==",
+        [
+          "get",
+          "mode"
+        ],
+        "L_RAIL"
+      ],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round"
+      },
+      "paint": {
+        "line-color": "#fff",
+        "line-width": {
+          "stops": [
+            [
+              10,
+              4
+            ],
+            [
+              22,
+              8
+            ]
+          ]
+        }
+      }
+    },
+    {
+      "id": "route_lrail",
+      "type": "line",
+      "source": "routes",
+      "source-layer": "routes",
+      "filter": [
+        "==",
+        [
+          "get",
+          "mode"
+        ],
+        "L_RAIL"
+      ],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "line-round-limit": 1
+      },
+      "paint": {
+        "line-color": "#00b3aa",
+        "line-width": {
+          "stops": [
+            [
+              10,
+              2
+            ],
+            [
+              22,
+              6
+            ]
+          ]
+        }
+      }
+    },
+    {
+      "id": "route_lrail_inner",
+      "type": "line",
+      "source": "routes",
+      "source-layer": "routes",
+      "filter": [
+        "==",
+        [
+          "get",
+          "mode"
+        ],
+        "L_RAIL"
+      ],
+      "paint": {
+        "line-color": "#30bfb6",
+        "line-width": {
+          "stops": [
+            [
+              10,
+              0.5
+            ],
+            [
+              22,
+              2
+            ]
+          ]
+        }
+      }
+    },
     {
       "id": "route_ferry",
       "type": "line",

diff --git a/style/hsl-map-style-stops.json b/style/hsl-map-style-stops.json
@@ -241,6 +241,38 @@
         ]
       }
     },
+    {
+      "id": "stops_lrail",
+      "type": "circle",
+      "source": "stops",
+      "source-layer": "stops",
+      "minzoom": 13,
+      "filter": [
+        "==",
+        [
+          "get",
+          "mode"
+        ],
+        "L_RAIL"
+      ],
+      "paint": {
+        "circle-color": "#00b2a9",
+        "circle-radius": [
+          "interpolate",
+          [
+            "exponential",
+            1.15
+          ],
+          [
+            "zoom"
+          ],
+          12,
+          1,
+          22,
+          24
+        ]
+      }
+    },
     {
       "id": "stops_subway",
       "type": "circle",

diff --git a/style/hsl-map-theme-driver-info.json b/style/hsl-map-theme-driver-info.json
@@ -63,6 +63,15 @@
         "circle-radius": 8
       }
     },
+    {
+      "id": "stops_lrail",
+      "source": "stops-by-routes",
+      "minzoom": 0,
+      "filter": ["==", ["get", "timingStopType"], 0],
+      "paint": {
+        "circle-radius": 8
+      }
+    },
     {
       "id": "stops_subway",
       "source": "stops-by-routes",

diff --git a/style/hsl-map-theme-routes-with-departures-only.json b/style/hsl-map-theme-routes-with-departures-only.json
@@ -24,6 +24,18 @@
       "id": "route_tram_inner",
       "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
     },
+    {
+      "id": "route_lrail_case",
+      "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
+    },
+    {
+      "id": "route_lrail",
+      "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
+    },
+    {
+      "id": "route_lrail_inner",
+      "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]
+    },
     {
       "id": "route_trunk_case",
       "filter": ["!=", ["boolean", ["get", "hasRegularDayDepartures"]], false]

diff --git a/style/hsl-map-theme-stops-with-route-info.json b/style/hsl-map-theme-stops-with-route-info.json
@@ -28,6 +28,10 @@
       "id": "stops_tram",
       "source": "stops-by-routes"
     },
+    {
+      "id": "stops_lrail",
+      "source": "stops-by-routes"
+    },
     {
       "id": "stops_subway",
       "source": "stops-by-routes"