-
{#each $ids as featId}
{#if layer.layerDef.source.geojsonSource === undefined}
{featId}
@@ -172,8 +165,3 @@
{:else}
Not supposed to show this... AutoApplyButton has invalid buttonstate: {$buttonState}
{/if}
-
-
-
-
-
diff --git a/src/UI/Popup/AutoApplyButtonVis.ts b/src/UI/Popup/AutoApplyButtonVis.ts
index b7203b10f..c2dba91cc 100644
--- a/src/UI/Popup/AutoApplyButtonVis.ts
+++ b/src/UI/Popup/AutoApplyButtonVis.ts
@@ -1,7 +1,11 @@
import { Store, Stores, UIEventSource } from "../../Logic/UIEventSource"
import ThemeConfig from "../../Models/ThemeConfig/ThemeConfig"
import { Changes } from "../../Logic/Osm/Changes"
-import { SpecialVisualization, SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization"
+import {
+ SpecialVisualization,
+ SpecialVisualizationState,
+ SpecialVisualizationSvelte,
+} from "../SpecialVisualization"
import { IndexedFeatureSource } from "../../Logic/FeatureSource/FeatureSource"
import SvelteUIElement from "../Base/SvelteUIElement"
import { Feature } from "geojson"
@@ -94,26 +98,28 @@ export default class AutoApplyButtonVis implements SpecialVisualizationSvelte {
target_layer_id,
targetTagRendering,
text,
- icon
+ icon,
}
const to_parse: UIEventSource
= new UIEventSource(undefined)
- Stores.Chronic(500, () => to_parse.data === undefined).map(() => {
- const applicable = tagSource.data[argument[1]]
- if (typeof applicable === "string") {
- return JSON.parse(applicable)
- } else {
- return applicable
- }
- }).addCallbackAndRunD(data => {
- to_parse.set(data)
- })
+ Stores.Chronic(500, () => to_parse.data === undefined)
+ .map(() => {
+ const applicable = tagSource.data[argument[1]]
+ if (typeof applicable === "string") {
+ return JSON.parse(applicable)
+ } else {
+ return applicable
+ }
+ })
+ .addCallbackAndRunD((data) => {
+ to_parse.set(data)
+ })
const stableIds: Store = Stores.ListStabilized(to_parse).map((ids) => {
if (typeof ids === "string") {
ids = JSON.parse(ids)
}
- return ids.map(id => id)
+ return ids.map((id) => id)
})
return new SvelteUIElement(AutoApplyButton, { state, ids: stableIds, options })
}
diff --git a/src/UI/Popup/QrCode.svelte b/src/UI/Popup/QrCode.svelte
index 2072cf0f0..8b2ff0098 100644
--- a/src/UI/Popup/QrCode.svelte
+++ b/src/UI/Popup/QrCode.svelte
@@ -39,16 +39,20 @@
console.log(key, "-->", extraUrlParams[key])
params.push(key + "=" + encodeURIComponent(extraUrlParams[key]))
}
- let url = id.map((id) => {
- if (id) {
- return "#" + id
- } else {
- return ""
- }
- }).map(
- (id) =>
- `${window.location.protocol}//${window.location.host}${window.location.pathname}?${params.join("&")}${id}`
- )
+ let url = id
+ .map((id) => {
+ if (id) {
+ return "#" + id
+ } else {
+ return ""
+ }
+ })
+ .map(
+ (id) =>
+ `${window.location.protocol}//${window.location.host}${
+ window.location.pathname
+ }?${params.join("&")}${id}`
+ )
function toggleSize() {
if (size.data !== bigSize) {
@@ -58,26 +62,27 @@
}
}
- let sideTextSub = (tags ?? new ImmutableStore({})).map(tgs => Utils.SubstituteKeys(sideText, tgs))
+ let sideTextSub = (tags ?? new ImmutableStore({})).map((tgs) =>
+ Utils.SubstituteKeys(sideText, tgs)
+ )
{#if $id?.startsWith("node/-")}
{:else}
-
-
-
-
![]()
toggleSize()}
- src={new Qr($url).toImageElement($size)}
- style={`width: ${$size}px; height: ${$size}px`}
- />
- {#if sideText}
-
{ $sideTextSub}
- {/if}
+
+
+
![]()
toggleSize()}
+ src={new Qr($url).toImageElement($size)}
+ style={`width: ${$size}px; height: ${$size}px`}
+ />
+ {#if sideText}
+
{$sideTextSub}
+ {/if}
-
{$url}
+
{$url}
{/if}
diff --git a/src/UI/Reviews/AllReviews.svelte b/src/UI/Reviews/AllReviews.svelte
index 8480c8fa8..920523e55 100644
--- a/src/UI/Reviews/AllReviews.svelte
+++ b/src/UI/Reviews/AllReviews.svelte
@@ -15,9 +15,11 @@
export let reviews: FeatureReviews
export let state: ThemeViewState
let average = reviews.average
- let allReviews: Store<(Review & {
- madeByLoggedInUser: Store
- })[]> = reviews.reviews.map((r) => Utils.NoNull(r))
+ let allReviews: Store<
+ (Review & {
+ madeByLoggedInUser: Store
+ })[]
+ > = reviews.reviews.map((r) => Utils.NoNull(r))
let test = state.featureSwitches.featureSwitchIsTesting
let debug = state.featureSwitches.featureSwitchIsDebugging
let subject: Store = reviews.subjectUri
@@ -39,9 +41,11 @@
{/if}
diff --git a/src/UI/SpecialVisualisations/SettingsVisualisations.ts b/src/UI/SpecialVisualisations/SettingsVisualisations.ts
index 26f3fea79..17f8256c9 100644
--- a/src/UI/SpecialVisualisations/SettingsVisualisations.ts
+++ b/src/UI/SpecialVisualisations/SettingsVisualisations.ts
@@ -151,26 +151,36 @@ export class SettingsVisualisations {
},
{
funcName: "qr_login",
- args: [{
- name: "text",
- doc: "Extra text on the side of the QR-code"
- }, {
- name: "textClass",
- doc: "CSS class of the the side text"
- }],
+ args: [
+ {
+ name: "text",
+ doc: "Extra text on the side of the QR-code",
+ },
+ {
+ name: "textClass",
+ doc: "CSS class of the the side text",
+ },
+ ],
docs: "A QR-code which shares the current URL and adds the login token. Anyone with this login token will have the same permissions as you currently have. Logging out from this session will also log them out",
group: "settings",
- constr(state: SpecialVisualizationState, tags: UIEventSource>, argument: string[], feature: Feature, layer: LayerConfig): SvelteUIElement {
+ constr(
+ state: SpecialVisualizationState,
+ tags: UIEventSource>,
+ argument: string[],
+ feature: Feature,
+ layer: LayerConfig
+ ): SvelteUIElement {
const shared_oauth_cookie = state.osmConnection.getToken()
const sideText = argument[0]
const sideTextClass = argument[1] ?? ""
return new SvelteUIElement(QrCode, {
state,
tags,
- sideText, sideTextClass,
- extraUrlParams: { shared_oauth_cookie }
+ sideText,
+ sideTextClass,
+ extraUrlParams: { shared_oauth_cookie },
})
- }
+ },
},
{
diff --git a/src/UI/SpecialVisualisations/UISpecialVisualisations.ts b/src/UI/SpecialVisualisations/UISpecialVisualisations.ts
index 4dc248b09..c488dc36c 100644
--- a/src/UI/SpecialVisualisations/UISpecialVisualisations.ts
+++ b/src/UI/SpecialVisualisations/UISpecialVisualisations.ts
@@ -174,13 +174,16 @@ export class UISpecialVisualisations {
},
{
funcName: "qr_code",
- args: [{
- name: "text",
- doc: "Extra text on the side of the QR-code"
- }, {
- name: "textClass",
- doc: "CSS class of the the side text"
- }],
+ args: [
+ {
+ name: "text",
+ doc: "Extra text on the side of the QR-code",
+ },
+ {
+ name: "textClass",
+ doc: "CSS class of the the side text",
+ },
+ ],
group: "default",
docs: "Generates a QR-code to share the selected object",
constr(
@@ -191,7 +194,13 @@ export class UISpecialVisualisations {
): SvelteUIElement {
const sideText = argument[0]
const sideTextClass = argument[1] ?? ""
- return new SvelteUIElement(QrCode, { state, tags, feature, sideText, sideTextClass })
+ return new SvelteUIElement(QrCode, {
+ state,
+ tags,
+ feature,
+ sideText,
+ sideTextClass,
+ })
},
},
{
diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts
index 4aac5e84d..8be9c0368 100644
--- a/src/UI/SpecialVisualizations.ts
+++ b/src/UI/SpecialVisualizations.ts
@@ -1,7 +1,11 @@
import { FixedUiElement } from "./Base/FixedUiElement"
import BaseUIElement from "./BaseUIElement"
import { default as FeatureTitle } from "./Popup/Title.svelte"
-import { RenderingSpecification, SpecialVisualization, SpecialVisualizationState } from "./SpecialVisualization"
+import {
+ RenderingSpecification,
+ SpecialVisualization,
+ SpecialVisualizationState,
+} from "./SpecialVisualization"
import { HistogramViz } from "./Popup/HistogramViz"
import { UploadToOsmViz } from "./Popup/UploadToOsmViz"
import { MultiApplyViz } from "./Popup/MultiApplyViz"
@@ -35,11 +39,8 @@ import { UISpecialVisualisations } from "./SpecialVisualisations/UISpecialVisual
import { SettingsVisualisations } from "./SpecialVisualisations/SettingsVisualisations"
import { ReviewSpecialVisualisations } from "./SpecialVisualisations/ReviewSpecialVisualisations"
import { DataImportSpecialVisualisations } from "./SpecialVisualisations/DataImportSpecialVisualisations"
-import TagrenderingManipulationSpecialVisualisations
- from "./SpecialVisualisations/TagrenderingManipulationSpecialVisualisations"
-import {
- WebAndCommunicationSpecialVisualisations
-} from "./SpecialVisualisations/WebAndCommunicationSpecialVisualisations"
+import TagrenderingManipulationSpecialVisualisations from "./SpecialVisualisations/TagrenderingManipulationSpecialVisualisations"
+import { WebAndCommunicationSpecialVisualisations } from "./SpecialVisualisations/WebAndCommunicationSpecialVisualisations"
import ClearGPSHistory from "./BigComponents/ClearGPSHistory.svelte"
import AllFeaturesStatistics from "./Statistics/AllFeaturesStatistics.svelte"
import OpeningHoursWithError from "./OpeningHours/Visualisation/OpeningHoursWithError.svelte"
@@ -146,7 +147,9 @@ export default class SpecialVisualizations {
throw (
"\n\n >>>> ERROR <<<< Unknown visualisation group type: " +
viz.group +
- " (used by " + viz.funcName + ")\n\n\n"
+ " (used by " +
+ viz.funcName +
+ ")\n\n\n"
)
}
helpTexts.push(groupExplanations[viz.group])
@@ -278,11 +281,12 @@ export default class SpecialVisualizations {
"A normal opening hours table can be invoked with `{opening_hours_table()}`. A table for e.g. conditional access with opening hours can be `{opening_hours_table(access:conditional, no @ &LPARENS, &RPARENS)}`",
constr: (state, tagSource: UIEventSource, args) => {
const [key, prefix, postfix] = args
- const openingHoursStore: Store = OH.CreateOhObjectStore(tagSource, key, prefix, postfix)
+ const openingHoursStore: Store =
+ OH.CreateOhObjectStore(tagSource, key, prefix, postfix)
return new SvelteUIElement(OpeningHoursWithError, {
tags: tagSource,
key,
- opening_hours_obj: openingHoursStore
+ opening_hours_obj: openingHoursStore,
})
},
},
diff --git a/src/UI/Studio/EditLayerState.ts b/src/UI/Studio/EditLayerState.ts
index 7c086960a..1b2a131c1 100644
--- a/src/UI/Studio/EditLayerState.ts
+++ b/src/UI/Studio/EditLayerState.ts
@@ -1,7 +1,12 @@
import { ConfigMeta } from "./configMeta"
import { Store, UIEventSource } from "../../Logic/UIEventSource"
import { LayerConfigJson } from "../../Models/ThemeConfig/Json/LayerConfigJson"
-import { Conversion, ConversionMessage, DesugaringContext, Pipe } from "../../Models/ThemeConfig/Conversion/Conversion"
+import {
+ Conversion,
+ ConversionMessage,
+ DesugaringContext,
+ Pipe,
+} from "../../Models/ThemeConfig/Conversion/Conversion"
import { PrepareLayer } from "../../Models/ThemeConfig/Conversion/PrepareLayer"
import { PrevalidateTheme, ValidateLayer } from "../../Models/ThemeConfig/Conversion/Validation"
import { AllSharedLayers } from "../../Customizations/AllSharedLayers"
@@ -276,7 +281,11 @@ class ContextRewritingStep extends Conversion {
step: Conversion,
getTagRenderings: (t: T) => TagRenderingConfigJson[]
) {
- super("ContextRewritingStep", "When validating a layer, the tagRenderings are first expanded. Some builtin tagRendering-calls (e.g. `contact`) will introduce _multiple_ tagRenderings, causing the count to be off. This class rewrites the error messages to fix this", [])
+ super(
+ "ContextRewritingStep",
+ "When validating a layer, the tagRenderings are first expanded. Some builtin tagRendering-calls (e.g. `contact`) will introduce _multiple_ tagRenderings, causing the count to be off. This class rewrites the error messages to fix this",
+ []
+ )
this._state = state
this._step = step
this._getTagRenderings = getTagRenderings
diff --git a/src/UI/Test.svelte b/src/UI/Test.svelte
index 36ea1fc43..f0116c38c 100644
--- a/src/UI/Test.svelte
+++ b/src/UI/Test.svelte
@@ -1,6 +1,4 @@
- accept(fileList.detail)} accept="image/jpg">Select file
+ accept(fileList.detail)} accept="image/jpg">
+ Select file
+
{$txt}
diff --git a/src/Utils.ts b/src/Utils.ts
index 775fa14a7..d65a7e6fd 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -178,7 +178,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
public static NoNull(array: undefined): undefined
public static NoNull(array: ReadonlyArray): T[]
public static NoNull(array: ReadonlyArray): NonNullable[] {
- return []>array?.filter((o) => o !== undefined && o !== null)
+ return []>(array?.filter((o) => o !== undefined && o !== null))
}
public static Hist(array: ReadonlyArray): Map {
@@ -332,7 +332,10 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
* @param toKey
* @constructor
*/
- public static DedupOnId(arr: T[], toKey?: (t: T) => string | string[]): T[] {
+ public static DedupOnId(
+ arr: T[],
+ toKey?: (t: T) => string | string[]
+ ): T[] {
const uniq: T[] = []
const seen = new Set()
if (toKey === undefined) {
@@ -350,7 +353,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
}
} else {
const ksNoNull = Utils.NoNull(ks)
- const hasBeenSeen = ksNoNull.some(k => seen.has(k))
+ const hasBeenSeen = ksNoNull.some((k) => seen.has(k))
if (!hasBeenSeen) {
uniq.push(img)
}
diff --git a/src/assets/contributors.json b/src/assets/contributors.json
index e30f6f34f..b7633bd14 100644
--- a/src/assets/contributors.json
+++ b/src/assets/contributors.json
@@ -1,7 +1,7 @@
{
"contributors": [
{
- "commits": 9721,
+ "commits": 9825,
"contributor": "Pieter Vander Vennet"
},
{
diff --git a/src/assets/language_in_country.json b/src/assets/language_in_country.json
index 0cf78b0b1..40a158fe2 100644
--- a/src/assets/language_in_country.json
+++ b/src/assets/language_in_country.json
@@ -505,10 +505,6 @@
"ar",
"ar"
],
- "PT": [
- "pt",
- "pt"
- ],
"PW": [
"en",
"ja"
diff --git a/src/assets/language_translations.json b/src/assets/language_translations.json
index 932a148c8..837629c60 100644
--- a/src/assets/language_translations.json
+++ b/src/assets/language_translations.json
@@ -9862,7 +9862,6 @@
"GQ",
"GW",
"MZ",
- "PT",
"ST",
"TL"
],
diff --git a/src/assets/schemas/layerconfigmeta.json b/src/assets/schemas/layerconfigmeta.json
index 5986dc768..78b1764cb 100644
--- a/src/assets/schemas/layerconfigmeta.json
+++ b/src/assets/schemas/layerconfigmeta.json
@@ -10989,6 +10989,10 @@
"if": "value=gps_track",
"then": "gps_track - Meta layer showing the previous locations of the user as single line with controls, e.g. to erase, upload or download this track. Add this to your theme and override the maprendering to change the appearance of the travelled track."
},
+ {
+ "if": "value=grab_rail",
+ "then": "grab_rail - A grab rail is a support to help persons with reduced mobility or a motor disability. It helps them to transfer from their wheelchair onto the toilet, to stand in a shower, close a door, ... "
+ },
{
"if": "value=grave",
"then": "grave - Tombstones (and graves) indicate where a person was buried. On this map, those can be recorded and a link to Wikipedia can be made"
@@ -11087,11 +11091,11 @@
},
{
"if": "value=nsi_brand",
- "then": "nsi_brand - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_brand - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=nsi_operator",
- "then": "nsi_operator - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_operator - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=observation_tower",
@@ -11341,6 +11345,10 @@
"if": "value=wayside_shrine",
"then": "wayside_shrine - Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by. Wayside crosses can be seen as a sub-type of a wayside shrine, typically in the form of a Christian cross at the side of the road, typically without votive offerings."
},
+ {
+ "if": "value=windpump",
+ "then": "windpump - undefined"
+ },
{
"if": "value=windturbine",
"then": "windturbine - Modern windmills generating electricity"
@@ -11457,6 +11465,14 @@
"if": "value=artwork",
"then": "artwork - An open map of statues, busts, graffitis and other artwork all over the world"
},
+ {
+ "if": "value=historic_rolling_stock",
+ "then": "historic_rolling_stock - Historic rolling stock (such as locomotives, railway cars and wagons) which are permanently placed at a location"
+ },
+ {
+ "if": "value=historic_aircraft",
+ "then": "historic_aircraft - undefined"
+ },
{
"if": "value=drinking_water",
"then": "drinking_water - A layer showing drinking water fountains"
diff --git a/src/assets/schemas/layoutconfigmeta.json b/src/assets/schemas/layoutconfigmeta.json
index 93ce40a09..6d5ca7c46 100644
--- a/src/assets/schemas/layoutconfigmeta.json
+++ b/src/assets/schemas/layoutconfigmeta.json
@@ -868,6 +868,10 @@
"if": "value=gps_track",
"then": "gps_track (builtin) - Meta layer showing the previous locations of the user as single line with controls, e.g. to erase, upload or download this track. Add this to your theme and override the maprendering to change the appearance of the travelled track."
},
+ {
+ "if": "value=grab_rail",
+ "then": "grab_rail (builtin) - A grab rail is a support to help persons with reduced mobility or a motor disability. It helps them to transfer from their wheelchair onto the toilet, to stand in a shower, close a door, ... "
+ },
{
"if": "value=grave",
"then": "grave (builtin) - Tombstones (and graves) indicate where a person was buried. On this map, those can be recorded and a link to Wikipedia can be made"
@@ -966,11 +970,11 @@
},
{
"if": "value=nsi_brand",
- "then": "nsi_brand (builtin) - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_brand (builtin) - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=nsi_operator",
- "then": "nsi_operator (builtin) - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_operator (builtin) - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=observation_tower",
@@ -1220,6 +1224,10 @@
"if": "value=wayside_shrine",
"then": "wayside_shrine (builtin) - Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by. Wayside crosses can be seen as a sub-type of a wayside shrine, typically in the form of a Christian cross at the side of the road, typically without votive offerings."
},
+ {
+ "if": "value=windpump",
+ "then": "windpump (builtin) - undefined"
+ },
{
"if": "value=windturbine",
"then": "windturbine (builtin) - Modern windmills generating electricity"
@@ -1336,6 +1344,14 @@
"if": "value=artwork",
"then": "artwork (builtin) - An open map of statues, busts, graffitis and other artwork all over the world"
},
+ {
+ "if": "value=historic_rolling_stock",
+ "then": "historic_rolling_stock (builtin) - Historic rolling stock (such as locomotives, railway cars and wagons) which are permanently placed at a location"
+ },
+ {
+ "if": "value=historic_aircraft",
+ "then": "historic_aircraft (builtin) - undefined"
+ },
{
"if": "value=drinking_water",
"then": "drinking_water (builtin) - A layer showing drinking water fountains"
@@ -13641,6 +13657,10 @@
"if": "value=gps_track",
"then": "gps_track - Meta layer showing the previous locations of the user as single line with controls, e.g. to erase, upload or download this track. Add this to your theme and override the maprendering to change the appearance of the travelled track."
},
+ {
+ "if": "value=grab_rail",
+ "then": "grab_rail - A grab rail is a support to help persons with reduced mobility or a motor disability. It helps them to transfer from their wheelchair onto the toilet, to stand in a shower, close a door, ... "
+ },
{
"if": "value=grave",
"then": "grave - Tombstones (and graves) indicate where a person was buried. On this map, those can be recorded and a link to Wikipedia can be made"
@@ -13739,11 +13759,11 @@
},
{
"if": "value=nsi_brand",
- "then": "nsi_brand - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_brand - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=nsi_operator",
- "then": "nsi_operator - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_operator - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=observation_tower",
@@ -13993,6 +14013,10 @@
"if": "value=wayside_shrine",
"then": "wayside_shrine - Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by. Wayside crosses can be seen as a sub-type of a wayside shrine, typically in the form of a Christian cross at the side of the road, typically without votive offerings."
},
+ {
+ "if": "value=windpump",
+ "then": "windpump - undefined"
+ },
{
"if": "value=windturbine",
"then": "windturbine - Modern windmills generating electricity"
@@ -14109,6 +14133,14 @@
"if": "value=artwork",
"then": "artwork - An open map of statues, busts, graffitis and other artwork all over the world"
},
+ {
+ "if": "value=historic_rolling_stock",
+ "then": "historic_rolling_stock - Historic rolling stock (such as locomotives, railway cars and wagons) which are permanently placed at a location"
+ },
+ {
+ "if": "value=historic_aircraft",
+ "then": "historic_aircraft - undefined"
+ },
{
"if": "value=drinking_water",
"then": "drinking_water - A layer showing drinking water fountains"
@@ -35450,6 +35482,10 @@
"if": "value=gps_track",
"then": "gps_track - Meta layer showing the previous locations of the user as single line with controls, e.g. to erase, upload or download this track. Add this to your theme and override the maprendering to change the appearance of the travelled track."
},
+ {
+ "if": "value=grab_rail",
+ "then": "grab_rail - A grab rail is a support to help persons with reduced mobility or a motor disability. It helps them to transfer from their wheelchair onto the toilet, to stand in a shower, close a door, ... "
+ },
{
"if": "value=grave",
"then": "grave - Tombstones (and graves) indicate where a person was buried. On this map, those can be recorded and a link to Wikipedia can be made"
@@ -35548,11 +35584,11 @@
},
{
"if": "value=nsi_brand",
- "then": "nsi_brand - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_brand - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=nsi_operator",
- "then": "nsi_operator - Exposes part of the NSI to reuse in other themes, e.g. for rendering"
+ "then": "nsi_operator - Exposes part of the NSI to reuse in other themes, e.g. for rendering. Automatically generated and never directly loaded in a theme. Generated with scripts/nsiLogos.ts"
},
{
"if": "value=observation_tower",
@@ -35802,6 +35838,10 @@
"if": "value=wayside_shrine",
"then": "wayside_shrine - Shrines are religious places that are dedicated to specific deities, saints and other figures of religious importance. Typically, the contain religious depictions and people frequently leave offerings at those places. Wayside shrines are small shrines that can be found next to a road or pathway and are frequented by travellers passing by. Wayside crosses can be seen as a sub-type of a wayside shrine, typically in the form of a Christian cross at the side of the road, typically without votive offerings."
},
+ {
+ "if": "value=windpump",
+ "then": "windpump - undefined"
+ },
{
"if": "value=windturbine",
"then": "windturbine - Modern windmills generating electricity"
@@ -35918,6 +35958,14 @@
"if": "value=artwork",
"then": "artwork - An open map of statues, busts, graffitis and other artwork all over the world"
},
+ {
+ "if": "value=historic_rolling_stock",
+ "then": "historic_rolling_stock - Historic rolling stock (such as locomotives, railway cars and wagons) which are permanently placed at a location"
+ },
+ {
+ "if": "value=historic_aircraft",
+ "then": "historic_aircraft - undefined"
+ },
{
"if": "value=drinking_water",
"then": "drinking_water - A layer showing drinking water fountains"
diff --git a/src/assets/translators.json b/src/assets/translators.json
index 50d368008..95efc0cb0 100644
--- a/src/assets/translators.json
+++ b/src/assets/translators.json
@@ -144,6 +144,10 @@
"commits": 13,
"contributor": "Joost"
},
+ {
+ "commits": 12,
+ "contributor": "Weblate Admin"
+ },
{
"commits": 12,
"contributor": "hugoalh"
@@ -152,10 +156,6 @@
"commits": 12,
"contributor": "Piotr Strebski"
},
- {
- "commits": 11,
- "contributor": "Weblate Admin"
- },
{
"commits": 11,
"contributor": "Manuel Tassi"
diff --git a/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts
index d3e564b55..7ea1d8151 100644
--- a/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts
+++ b/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts
@@ -1,9 +1,10 @@
import { LayerConfigJson } from "../../../../src/Models/ThemeConfig/Json/LayerConfigJson"
import LineRenderingConfigJson from "../../../../src/Models/ThemeConfig/Json/LineRenderingConfigJson"
-import { PrepareLayer, RewriteSpecial } from "../../../../src/Models/ThemeConfig/Conversion/PrepareLayer"
import {
- QuestionableTagRenderingConfigJson
-} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
+ PrepareLayer,
+ RewriteSpecial,
+} from "../../../../src/Models/ThemeConfig/Conversion/PrepareLayer"
+import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
import RewritableConfigJson from "../../../../src/Models/ThemeConfig/Json/RewritableConfigJson"
import { describe, expect, it } from "vitest"
@@ -103,7 +104,7 @@ describe("PrepareLayer", () => {
},
],
titleIcons: [{ render: "icons.defaults", id: "iconsdefaults" }],
- units: []
+ units: [],
}
expect(result).toEqual(expected)
diff --git a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
index 212b6b813..1fdc42fde 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"
@@ -155,7 +153,7 @@ describe("PrepareTheme", () => {
},
],
lineRendering: [{ width: 1 }],
- units: []
+ units: [],
}
const sharedLayers = constructSharedLayers()
sharedLayers.set("layer-example", testLayer)
@@ -213,7 +211,7 @@ describe("PrepareTheme", () => {
],
lineRendering: [{ width: 1 }],
titleIcons: [],
- units: []
+ units: [],
})
})
})
",
+ "layers": {
+ "6": {
+ "name": "Wandelroutes van provincie Antwerpen",
+ "tagRenderings": {
+ "walk-description": {
+ "render": "