From a96a214c03b3438f9ccf96f7c37a2e842ec224e1 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 7 Oct 2023 03:37:19 +0200 Subject: [PATCH] Themes: add guideposts to climbing theme --- assets/layers/guidepost/guidepost.json | 14 ++--- ...post_example.jpg => guidepost_example.jpg} | Bin .../guidepost/guidepost_example.jpg.license | 2 + assets/layers/guidepost/license_info.json | 2 +- .../guidepost/signpost_example.jpg.license | 2 +- assets/themes/climbing/climbing.json | 3 +- src/Logic/State/UserSettingsMetaTagging.ts | 48 ++++-------------- 7 files changed, 23 insertions(+), 48 deletions(-) rename assets/layers/guidepost/{signpost_example.jpg => guidepost_example.jpg} (100%) create mode 100644 assets/layers/guidepost/guidepost_example.jpg.license diff --git a/assets/layers/guidepost/guidepost.json b/assets/layers/guidepost/guidepost.json index 28e2d80b6..6fd27bcc4 100644 --- a/assets/layers/guidepost/guidepost.json +++ b/assets/layers/guidepost/guidepost.json @@ -32,18 +32,18 @@ "enableImproveAccuracy": "true", "enableRelocation": "false" }, - "title": {}, - "pointRendering": [ + "title": { + "render": { + "en": "Guidepost" + } + }, + "mapRendering": [ { "location": [ "centroid", "point" ], - "marker": [ - { - "icon": "./assets/layers/guidepost/guidepost.svg" - } - ], + "icon": "./assets/layers/guidepost/guidepost.svg", "anchor": "bottom" } ], diff --git a/assets/layers/guidepost/signpost_example.jpg b/assets/layers/guidepost/guidepost_example.jpg similarity index 100% rename from assets/layers/guidepost/signpost_example.jpg rename to assets/layers/guidepost/guidepost_example.jpg diff --git a/assets/layers/guidepost/guidepost_example.jpg.license b/assets/layers/guidepost/guidepost_example.jpg.license new file mode 100644 index 000000000..cd1b48769 --- /dev/null +++ b/assets/layers/guidepost/guidepost_example.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mschaeuble +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/guidepost/license_info.json b/assets/layers/guidepost/license_info.json index 851b7188a..e622ffc30 100644 --- a/assets/layers/guidepost/license_info.json +++ b/assets/layers/guidepost/license_info.json @@ -10,7 +10,7 @@ ] }, { - "path": "signpost_example.jpg", + "path": "guidepost_example.jpg", "license": "CC0-1.0", "authors": [ "Mschaeuble" diff --git a/assets/layers/guidepost/signpost_example.jpg.license b/assets/layers/guidepost/signpost_example.jpg.license index c4fea401e..cd1b48769 100644 --- a/assets/layers/guidepost/signpost_example.jpg.license +++ b/assets/layers/guidepost/signpost_example.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mschaeuble -SPDX-License-Identifier: CC0 \ No newline at end of file +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index f5bb2c2dd..90f4dc383 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -464,7 +464,8 @@ { "builtin": [ "toilet", - "drinking_water" + "drinking_water", + "guidepost" ], "override": { "minzoom": 15 diff --git a/src/Logic/State/UserSettingsMetaTagging.ts b/src/Logic/State/UserSettingsMetaTagging.ts index 6e568c5c3..33a5ae85b 100644 --- a/src/Logic/State/UserSettingsMetaTagging.ts +++ b/src/Logic/State/UserSettingsMetaTagging.ts @@ -1,42 +1,14 @@ import { Utils } from "../../Utils" /** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */ export class ThemeMetaTagging { - public static readonly themeName = "usersettings" + public static readonly themeName = "usersettings" - public metaTaggging_for_usersettings(feat: { properties: Record }) { - Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () => - feat.properties._description - .match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/) - ?.at(1) - ) - Utils.AddLazyProperty( - feat.properties, - "_d", - () => feat.properties._description?.replace(/</g, "<")?.replace(/>/g, ">") ?? "" - ) - Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () => - ((feat) => { - const e = document.createElement("div") - e.innerHTML = feat.properties._d - return Array.from(e.getElementsByTagName("a")).filter( - (a) => a.href.match(/mastodon|en.osm.town/) !== null - )[0]?.href - })(feat) - ) - Utils.AddLazyProperty(feat.properties, "_mastodon_link", () => - ((feat) => { - const e = document.createElement("div") - e.innerHTML = feat.properties._d - return Array.from(e.getElementsByTagName("a")).filter( - (a) => a.getAttribute("rel")?.indexOf("me") >= 0 - )[0]?.href - })(feat) - ) - Utils.AddLazyProperty( - feat.properties, - "_mastodon_candidate", - () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a - ) - feat.properties["__current_backgroun"] = "initial_value" - } -} + public metaTaggging_for_usersettings(feat: {properties: Record}) { + Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) ) + Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/</g,'<')?.replace(/>/g,'>') ?? '' ) + Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) ) + Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat) ) + Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a ) + feat.properties['__current_backgroun'] = 'initial_value' + } +} \ No newline at end of file