From 85c2b4c364532f738e9f8884fad109a68c5c60ef Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 16 Apr 2025 13:06:22 +0200 Subject: [PATCH] --amend --- package-lock.json | 13 +- public/assets/sunny-unlabeled.json | 283 ++++++++++++++++-- .../Conversion/PrepareTheme.spec.ts | 6 +- 3 files changed, 260 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index 447f2bd94..fc88e67e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "mapcomplete", "version": "0.51.0", + "hasInstallScript": true, "license": "GPL-3.0-or-later", "dependencies": { "@capacitor/android": "^6.1.2", @@ -12758,9 +12759,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001705", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz", - "integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==", + "version": "1.0.30001713", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz", + "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==", "dev": true, "funding": [ { @@ -39214,9 +39215,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001705", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz", - "integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==", + "version": "1.0.30001713", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz", + "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==", "dev": true }, "canonicalize": { diff --git a/public/assets/sunny-unlabeled.json b/public/assets/sunny-unlabeled.json index 751fbe525..741de827c 100644 --- a/public/assets/sunny-unlabeled.json +++ b/public/assets/sunny-unlabeled.json @@ -600,9 +600,8 @@ "river" ], [ - "<", - "level", - 0 + "has", + "is_tunnel" ] ], "layout": { @@ -674,9 +673,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "in", @@ -703,6 +701,98 @@ ] } }, + { + "id": "roads_tunnels_footway_casing_outer", + "type": "line", + "source": "protomaps", + "source-layer": "roads", + "filter": [ + "all", + [ + "has", + "is_tunnel" + ], + [ + "!has", + "is_bridge" + ], + [ + "in", + "kind", + "other", + "path" + ], + [ + "in", + "kind_detail", + "footway", + "cycleway" + ] + ], + "paint": { + "line-color": "#888888", + "line-width": [ + "interpolate", + [ + "exponential", + 1.6 + ], + [ + "zoom" + ], + 14, + 0, + 20, + 9 + ] + } + }, + { + "id": "roads_tunnels_footway_casing_inner", + "type": "line", + "source": "protomaps", + "source-layer": "roads", + "filter": [ + "all", + [ + "has", + "is_tunnel" + ], + [ + "!has", + "is_bridge" + ], + [ + "in", + "kind", + "other", + "path" + ], + [ + "in", + "kind_detail", + "footway", + "cycleway" + ] + ], + "paint": { + "line-color": "#ffffff", + "line-width": [ + "interpolate", + [ + "exponential", + 1.6 + ], + [ + "zoom" + ], + 14, + 0, + 20, + 8 + ] + } + }, { "id": "roads_tunnels_minor_casing", "type": "line", @@ -711,9 +801,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -769,9 +858,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -825,9 +913,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -881,9 +968,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -944,15 +1030,24 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "in", "kind", "other", "path" + ], + [ + "!=", + "kind_detail", + "footway" + ], + [ + "!=", + "kind_detail", + "cycleway" ] ], "paint": { @@ -977,6 +1072,96 @@ ] } }, + { + "id": "roads_tunnels_footway", + "type": "line", + "source": "protomaps", + "source-layer": "roads", + "filter": [ + "all", + [ + "has", + "is_tunnel" + ], + [ + "in", + "kind", + "other", + "path" + ], + [ + "==", + "kind_detail", + "footway" + ] + ], + "paint": { + "line-color": "#d46710", + "line-dasharray": [ + 4, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.6 + ], + [ + "zoom" + ], + 14, + 0, + 20, + 5 + ] + } + }, + { + "id": "roads_tunnels_cycleway", + "type": "line", + "source": "protomaps", + "source-layer": "roads", + "filter": [ + "all", + [ + "has", + "is_tunnel" + ], + [ + "in", + "kind", + "other", + "path" + ], + [ + "==", + "kind_detail", + "cycleway" + ] + ], + "paint": { + "line-color": "#6099c9", + "line-dasharray": [ + 4, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.6 + ], + [ + "zoom" + ], + 14, + 0, + 20, + 5 + ] + } + }, { "id": "roads_tunnels_minor", "type": "line", @@ -985,9 +1170,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -1025,9 +1209,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -1063,9 +1246,8 @@ "filter": [ "all", [ - "<", - "level", - 0 + "has", + "is_tunnel" ], [ "==", @@ -1245,7 +1427,20 @@ "source-layer": "buildings", "paint": { "fill-color": "#cccccc", - "fill-opacity": 0.5 + "fill-opacity": 0.7, + "fill-outline-color": [ + "interpolate", + [ + "linear" + ], + [ + "zoom" + ], + 15, + "#cccccc", + 18, + "#aaaaaa" + ] } }, { @@ -1364,7 +1559,21 @@ ] ], "paint": { - "line-color": "#e0e0e0", + "line-color": [ + "interpolate", + [ + "linear" + ], + [ + "zoom" + ], + 12, + "#dddddd", + 14, + "#aaaaaa", + 18, + "#888888" + ], "line-gap-width": [ "interpolate", [ @@ -2957,6 +3166,16 @@ "kind", "other", "path" + ], + [ + "!=", + "kind_detail", + "cycleway" + ], + [ + "!=", + "kind_detail", + "footway" ] ], "paint": { diff --git a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts index 508965a99..fcb80f891 100644 --- a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts +++ b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts @@ -10,9 +10,7 @@ import { Tag } from "../../../../src/Logic/Tags/Tag" import { DesugaringContext } from "../../../../src/Models/ThemeConfig/Conversion/Conversion" import { And } from "../../../../src/Logic/Tags/And" import { describe, expect, it } from "vitest" -import { - QuestionableTagRenderingConfigJson -} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" +import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" import Constants from "../../../../src/Models/Constants" import { ConversionContext } from "../../../../src/Models/ThemeConfig/Conversion/ConversionContext" import { MinimalTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/TagRenderingConfigJson" @@ -55,7 +53,7 @@ function constructSharedLayers(): Map { tagRenderings: null, lineRendering: null, title: null, - source: "special" + source: "special", }) for (const defaultLayer of Constants.added_by_default) { sharedLayers.set(defaultLayer, {