@versatiles/style 5.0.0 → 5.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 VersaTiles
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/shortbread/layers.js

@@ -110,29 +110,40 @@ export function getShortbreadLayers(option) {
         ...['tunnel', 'street', 'bridge'].flatMap((c) => {
             let filter;
             let prefix;
+            let suffixes = [];
             const results = [];
             switch (c) {
                 case 'tunnel':
                     filter = [['==', 'tunnel', true]];
                     prefix = 'tunnel-';
+                    suffixes = [':outline', ''];
                     break;
                 case 'street':
                     filter = [['!=', 'bridge', true], ['!=', 'tunnel', true]];
                     prefix = '';
+                    suffixes = [':outline', ''];
                     break;
                 case 'bridge':
                     filter = [['==', 'bridge', true]];
                     prefix = 'bridge-';
+                    suffixes = [':bridge', ':outline', ''];
                     break;
             }
-            // bridges, above street, below bridge
-            if (c === 'bridge')
+            // in osm data streets on bridges are often not tagged as such
+            // to be able to have multiple levels of bridges cross over each
+            // other in the right order without using a secondary property.
+            // this results in bridge-polygons being rendered above streets.
+            // therefore bridge polygons are *under* surface streets here.
+            // this workaround is also wrong, but everyone is using it since
+            // it's simpler than removing all these tagging hacks from osm.
+            // bridges, above tunnel, below street
+            if (c === 'street')
                 results.push({
                     id: 'bridge',
                     type: 'fill',
                     'source-layer': 'bridges',
                 });
-            [':outline', ''].forEach(suffix => {
+            suffixes.forEach(suffix => {
                 // pedestrian zone — no outline
                 if (suffix === ':outline')
                     results.push({

package/dist/styles/colorful.js

@@ -317,6 +317,47 @@ export default class Colorful extends StyleBuilder {
             'bridge-{street,way}-*:outline': {
                 lineCap: 'butt',
             },
+            // faux bridges
+            'bridge-{street,way}-*:bridge': {
+                lineCap: 'butt',
+                lineJoin: 'round',
+                color: colors.land.darken(0.02),
+                fillAntialias: true,
+                opacity: 0.5,
+            },
+            'bridge-street-motorway:bridge': {
+                size: { '5': 0, '6': 3, '10': 7, '14': 7, '16': 20, '18': 53, '19': 118, '20': 235 }
+            },
+            'bridge-street-trunk:bridge': {
+                size: { '7': 0, '8': 3, '10': 6, '14': 8, '16': 17, '18': 50, '19': 104, '20': 202 }
+            },
+            'bridge-street-primary:bridge': {
+                size: { '8': 0, '9': 1, '10': 6, '14': 8, '16': 17, '18': 50, '19': 104, '20': 202 }
+            },
+            'bridge-street-secondary:bridge': {
+                size: { '11': 3, '14': 7, '16': 11, '18': 42, '19': 95, '20': 193 },
+                opacity: { '11': 0, '12': 1 }
+            },
+            'bridge-street-motorway-link:bridge': {
+                minzoom: 12,
+                size: { '12': 3, '14': 4, '16': 10, '18': 20, '20': 56 }
+            },
+            'bridge-street-{trunk,primary,secondary}-link:bridge': {
+                minzoom: 13,
+                size: { '12': 3, '14': 4, '16': 10, '18': 20, '20': 56 }
+            },
+            'bridge-street-{tertiary,tertiary-link,unclassified,residential,livingstreet,pedestrian}*:bridge': {
+                size: { '12': 3, '14': 4, '16': 8, '18': 36, '19': 90, '20': 179 },
+                opacity: { '12': 0, '13': 1 }
+            },
+            'bridge-street-{service,track}:bridge': {
+                size: { '14': 3, '16': 6, '18': 25, '19': 67, '20': 134 },
+                opacity: { '14': 0, '15': 1 }
+            },
+            'bridge-way-*:bridge': {
+                size: { '15': 0, '16': 7, '18': 10, '19': 17, '20': 31 },
+                minzoom: 15
+            },
             // special color: motorway
             '{bridge-,}street-motorway{-link,}:outline': {
                 color: colors.motorwaybg,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versatiles/style",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Generate StyleJSON for MapLibre",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,36 +38,36 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "@maplibre/maplibre-gl-style-spec": "^21.2.0",
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@maplibre/maplibre-gl-style-spec": "^23.0.0",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.1",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/bin-pack": "^1.0.3",
     "@types/brace-expansion": "^1.1.2",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.10.6",
     "@types/tar-stream": "^3.1.3",
-    "@typescript-eslint/eslint-plugin": "^8.14.0",
-    "@typescript-eslint/parser": "^8.14.0",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "@versatiles/container": "^1.2.3",
     "@versatiles/release-tool": "^1.2.6",
     "bin-pack": "^1.0.2",
-    "eslint": "^9.14.0",
-    "inquirer": "^12.1.0",
+    "eslint": "^9.18.0",
+    "inquirer": "^12.3.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-ts-webcompat-resolver": "^1.0.0",
-    "npm-check-updates": "^17.1.11",
-    "rollup": "^4.26.0",
+    "npm-check-updates": "^17.1.13",
+    "rollup": "^4.30.1",
     "rollup-plugin-dts": "^6.1.1",
     "sharp": "^0.33.5",
     "tar-stream": "^3.1.7",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.2",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.14.0"
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0"
   }
 }