diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts index e7e34e89c..4303c6309 100644 --- a/Customizations/AllKnownLayouts.ts +++ b/Customizations/AllKnownLayouts.ts @@ -9,6 +9,7 @@ import DependencyCalculator from "../Models/ThemeConfig/DependencyCalculator"; import Constants from "../Models/Constants"; import {Utils} from "../Utils"; import Link from "../UI/Base/Link"; +import {LayoutConfigJson} from "../Models/ThemeConfig/Json/LayoutConfigJson"; export class AllKnownLayouts { // Must be below the list... @@ -173,22 +174,20 @@ export class AllKnownLayouts { private static AllLayouts(): Map { const dict: Map = new Map(); for (const layoutConfigJson of known_themes.themes) { - // @ts-ignore - const layout = new LayoutConfig(layoutConfigJson, true) - dict.set(layout.id, layout) - - for (let i = 0; i < layout.layers.length; i++) { - let layer = layout.layers[i]; - if (typeof (layer) === "string") { - layer = AllKnownLayouts.sharedLayers.get(layer); - layout.layers[i] = layer - if (layer === undefined) { - console.log("Defined layers are ", AllKnownLayouts.sharedLayers.keys()) - throw `Layer ${layer} was not found or defined - probably a type was made` - } - } - - } + const layout = new LayoutConfig( layoutConfigJson, true) + dict.set(layout.id, layout) + for (let i = 0; i < layout.layers.length; i++) { + let layer = layout.layers[i]; + if (typeof (layer) === "string") { + layer = AllKnownLayouts.sharedLayers.get(layer); + layout.layers[i] = layer + if (layer === undefined) { + console.log("Defined layers are ", AllKnownLayouts.sharedLayers.keys()) + throw `Layer ${layer} was not found or defined - probably a type was made` + } + } + + } } return dict; } diff --git a/Docs/Misc/geolocation_button.gv.svg b/Docs/Misc/geolocation_button.gv.svg index fed1344bf..52384ae20 100644 --- a/Docs/Misc/geolocation_button.gv.svg +++ b/Docs/Misc/geolocation_button.gv.svg @@ -1,5 +1,5 @@ - + diff --git a/Logic/Osm/Actions/CreateNewNodeAction.ts b/Logic/Osm/Actions/CreateNewNodeAction.ts index 569ffa761..d3f7e1f19 100644 --- a/Logic/Osm/Actions/CreateNewNodeAction.ts +++ b/Logic/Osm/Actions/CreateNewNodeAction.ts @@ -1,5 +1,5 @@ import {Tag} from "../../Tags/Tag"; -import OsmChangeAction, {OsmCreateAction} from "./OsmChangeAction"; +import {OsmCreateAction} from "./OsmChangeAction"; import {Changes} from "../Changes"; import {ChangeDescription} from "./ChangeDescription"; import {And} from "../../Tags/And"; diff --git a/Logic/State/UserRelatedState.ts b/Logic/State/UserRelatedState.ts index e7d5a011b..d77026845 100644 --- a/Logic/State/UserRelatedState.ts +++ b/Logic/State/UserRelatedState.ts @@ -8,7 +8,6 @@ import {Utils} from "../../Utils"; import Locale from "../../UI/i18n/Locale"; import ElementsState from "./ElementsState"; import SelectedElementTagsUpdater from "../Actors/SelectedElementTagsUpdater"; -import {log} from "util"; /** * The part of the state which keeps track of user-related stuff, e.g. the OSM-connection, diff --git a/Logic/Web/IdbLocalStorage.ts b/Logic/Web/IdbLocalStorage.ts index 7a39a0b64..6850c3b6f 100644 --- a/Logic/Web/IdbLocalStorage.ts +++ b/Logic/Web/IdbLocalStorage.ts @@ -1,7 +1,7 @@ import {UIEventSource} from "../UIEventSource"; import * as idb from "idb-keyval" -import ScriptUtils from "../../scripts/ScriptUtils"; import {Utils} from "../../Utils"; + /** * UIEventsource-wrapper around indexedDB key-value */ diff --git a/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts b/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts index a7c50bf64..b8f78fe5b 100644 --- a/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts +++ b/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts @@ -3,7 +3,6 @@ import LayerConfig from "../LayerConfig"; import {LayerConfigJson} from "../Json/LayerConfigJson"; import Translations from "../../../UI/i18n/Translations"; import {TagsFilter} from "../../../Logic/Tags/TagsFilter"; -import {Tag} from "../../../Logic/Tags/Tag"; import {And} from "../../../Logic/Tags/And"; export default class CreateNoteImportLayer extends Conversion { diff --git a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts index 42b9cddb1..df9408a8e 100644 --- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts +++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts @@ -898,18 +898,20 @@ class AddDependencyLayersToTheme extends DesugaringStep { } } -class SetDefault extends DesugaringStep { - private readonly value: object; +class SetDefault extends DesugaringStep { + private readonly value: any; private readonly key: string; + private readonly _overrideEmptyString: boolean; - constructor(key: string, value: object) { + constructor(key: string, value: any, overrideEmptyString = false) { super("Sets " + key + " to a default value if undefined"); this.key = key; this.value = value; + this._overrideEmptyString = overrideEmptyString; } - convert(state: DesugaringContext, json: LayerConfigJson, context: string): { result: LayerConfigJson; errors: string[]; warnings: string[] } { - if (json[this.key] === undefined) { + convert(state: DesugaringContext, json: T, context: string): { result: T; errors: string[]; warnings: string[] } { + if (json[this.key] === undefined || (json[this.key] === "" && this._overrideEmptyString)) { json = {...json} json[this.key] = this.value } @@ -1044,6 +1046,7 @@ export class PrepareTheme extends Fuse { super( "Fully prepares and expands a theme", new OnEveryConcat("layers", new SubstituteLayer()), + new SetDefault("socialImage", "assets/SocialImage.png", true), new AddDefaultLayers(), new AddDependencyLayersToTheme(), new OnEvery("layers", new PrepareLayer()), diff --git a/Models/ThemeConfig/LayoutConfig.ts b/Models/ThemeConfig/LayoutConfig.ts index 7e7fe1e0e..763782532 100644 --- a/Models/ThemeConfig/LayoutConfig.ts +++ b/Models/ThemeConfig/LayoutConfig.ts @@ -102,6 +102,11 @@ export default class LayoutConfig { this.descriptionTail = json.descriptionTail === undefined ? undefined : new Translation(json.descriptionTail, context + ".descriptionTail"); this.icon = json.icon; this.socialImage = json.socialImage; + if(this.socialImage === null || this.socialImage === "" || this.socialImage === undefined){ + if(official){ + throw "Theme "+json.id+" has no social image defined" + } + } this.startZoom = json.startZoom; this.startLat = json.startLat; this.startLon = json.startLon; diff --git a/Models/TileRange.ts b/Models/TileRange.ts index f5be84e0b..7f282be6b 100644 --- a/Models/TileRange.ts +++ b/Models/TileRange.ts @@ -1,6 +1,3 @@ -import {control} from "leaflet"; - - export interface TileRange { xstart: number, ystart: number, diff --git a/UI/AllThemesGui.ts b/UI/AllThemesGui.ts index e39db20eb..ebdc64583 100644 --- a/UI/AllThemesGui.ts +++ b/UI/AllThemesGui.ts @@ -10,7 +10,6 @@ import IndexText from "./BigComponents/IndexText"; import FeaturedMessage from "./BigComponents/FeaturedMessage"; import Toggle from "./Input/Toggle"; import {SubtleButton} from "./Base/SubtleButton"; -import Title from "./Base/Title"; export default class AllThemesGui { constructor() { diff --git a/UI/Base/Combine.ts b/UI/Base/Combine.ts index 2e84ee81b..cead86ecb 100644 --- a/UI/Base/Combine.ts +++ b/UI/Base/Combine.ts @@ -18,7 +18,7 @@ export default class Combine extends BaseUIElement { AsMarkdown(): string { let sep = " "; - if(this.HasClass("flex-col")){ + if (this.HasClass("flex-col")) { sep = "\n\n" } return this.uiElements.map(el => el.AsMarkdown()).join(sep); @@ -56,11 +56,10 @@ export default class Combine extends BaseUIElement { return el; } - - public getElements(): BaseUIElement[]{ + + public getElements(): BaseUIElement[] { return this.uiElements } - } \ No newline at end of file diff --git a/UI/Base/FixedUiElement.ts b/UI/Base/FixedUiElement.ts index 14b1860dc..4600d26ff 100644 --- a/UI/Base/FixedUiElement.ts +++ b/UI/Base/FixedUiElement.ts @@ -21,6 +21,6 @@ export class FixedUiElement extends BaseUIElement { e.innerHTML = this.content return e; } - + } \ No newline at end of file diff --git a/UI/Base/Img.ts b/UI/Base/Img.ts index ecaee76db..c2d85768a 100644 --- a/UI/Base/Img.ts +++ b/UI/Base/Img.ts @@ -53,17 +53,17 @@ export default class Img extends BaseUIElement { } return el; } - + AsMarkdown(): string { - if(this._rawSvg === true){ + if (this._rawSvg === true) { console.warn("Converting raw svgs to markdown is not supported"); return undefined } let src = this._src - if(this._src.startsWith("./")){ - src = "https://mapcomplete.osm.be/"+src + if (this._src.startsWith("./")) { + src = "https://mapcomplete.osm.be/" + src } - return "![]("+src+")"; + return "![](" + src + ")"; } } diff --git a/UI/Base/Link.ts b/UI/Base/Link.ts index a4cdae117..bfcb268e9 100644 --- a/UI/Base/Link.ts +++ b/UI/Base/Link.ts @@ -13,7 +13,7 @@ export default class Link extends BaseUIElement { this._embeddedShow = Translations.W(embeddedShow); this._href = href; this._newTab = newTab; - if(this._embeddedShow === undefined){ + if (this._embeddedShow === undefined) { throw "Error: got a link where embeddedShow is undefined" } @@ -43,16 +43,16 @@ export default class Link extends BaseUIElement { el.appendChild(embeddedShow) return el; } - - public static OsmWiki(key: string, value?: string, hideKey = false){ - if(value !== undefined){ + + public static OsmWiki(key: string, value?: string, hideKey = false) { + if (value !== undefined) { let k = ""; - if(!hideKey){ - k = key+"=" + if (!hideKey) { + k = key + "=" } - return new Link(k+value,`https://wiki.openstreetmap.org/wiki/Tag:${key}%3D${value}`) + return new Link(k + value, `https://wiki.openstreetmap.org/wiki/Tag:${key}%3D${value}`) } - return new Link(key, "https://wiki.openstreetmap.org/wiki/Key:" + key) + return new Link(key, "https://wiki.openstreetmap.org/wiki/Key:" + key) } } \ No newline at end of file diff --git a/UI/Base/Minimap.ts b/UI/Base/Minimap.ts index c55dd3549..1b9d07641 100644 --- a/UI/Base/Minimap.ts +++ b/UI/Base/Minimap.ts @@ -37,8 +37,8 @@ export default class Minimap { public static createMiniMap: (options: MinimapOptions) => (BaseUIElement & MinimapObj) = (_) => { throw "CreateMinimap hasn't been initialized yet. Please call MinimapImplementation.initialize()" } - - private constructor() { + + private constructor() { } diff --git a/UI/Base/MinimapImplementation.ts b/UI/Base/MinimapImplementation.ts index e729e6150..2f70f8551 100644 --- a/UI/Base/MinimapImplementation.ts +++ b/UI/Base/MinimapImplementation.ts @@ -25,7 +25,7 @@ export default class MinimapImplementation extends BaseUIElement implements Mini private readonly _attribution: BaseUIElement | boolean; private readonly _bounds: UIEventSource | undefined; private readonly _addLayerControl: boolean; - private readonly _options : MinimapOptions; + private readonly _options: MinimapOptions; private constructor(options: MinimapOptions) { super() @@ -48,7 +48,7 @@ export default class MinimapImplementation extends BaseUIElement implements Mini public static initialize() { Minimap.createMiniMap = options => new MinimapImplementation(options) } - + public installBounds(factor: number | BBox, showRange?: boolean) { this.leafletMap.addCallbackD(leaflet => { let bounds; @@ -105,7 +105,7 @@ export default class MinimapImplementation extends BaseUIElement implements Mini } }) } - + Destroy() { super.Destroy(); console.warn("Decomissioning minimap", this._id) @@ -134,10 +134,10 @@ export default class MinimapImplementation extends BaseUIElement implements Mini const self = this; // @ts-ignore const resizeObserver = new ResizeObserver(_ => { - if(wrapper.clientHeight === 0 || wrapper.clientWidth === 0){ + if (wrapper.clientHeight === 0 || wrapper.clientWidth === 0) { return; } - if(wrapper.offsetParent === null || window.getComputedStyle(wrapper).display === 'none'){ + if (wrapper.offsetParent === null || window.getComputedStyle(wrapper).display === 'none') { // Not visible return; } diff --git a/UI/Base/ScrollableFullScreen.ts b/UI/Base/ScrollableFullScreen.ts index c3dd39caa..96fdb2eb0 100644 --- a/UI/Base/ScrollableFullScreen.ts +++ b/UI/Base/ScrollableFullScreen.ts @@ -76,6 +76,7 @@ export default class ScrollableFullScreen extends UIElement { ScrollableFullScreen._currentlyOpen = this; fs.classList.remove("hidden") } + private BuildComponent(title: BaseUIElement, content: BaseUIElement, isShown: UIEventSource) { const returnToTheMap = new Combine([ diff --git a/UI/Base/SubtleButton.ts b/UI/Base/SubtleButton.ts index 13c3c82a7..5174d70d3 100644 --- a/UI/Base/SubtleButton.ts +++ b/UI/Base/SubtleButton.ts @@ -21,7 +21,7 @@ export class SubtleButton extends UIElement { } protected InnerRender(): string | BaseUIElement { - const classes= "block flex p-3 my-2 bg-blue-100 rounded-lg hover:shadow-xl hover:bg-blue-200 link-no-underline"; + const classes = "block flex p-3 my-2 bg-blue-100 rounded-lg hover:shadow-xl hover:bg-blue-200 link-no-underline"; const message = Translations.W(this.message); let img; if ((this.imageUrl ?? "") === "") { diff --git a/UI/Base/TableOfContents.ts b/UI/Base/TableOfContents.ts index f49a0076d..aa57f87dc 100644 --- a/UI/Base/TableOfContents.ts +++ b/UI/Base/TableOfContents.ts @@ -10,8 +10,8 @@ import {Utils} from "../../Utils"; export default class TableOfContents extends Combine { -private readonly titles: Title[] - + private readonly titles: Title[] + constructor(elements: Combine | Title[], options?: { noTopLevel: false | boolean, maxDepth?: number @@ -28,9 +28,9 @@ private readonly titles: Title[] let content: BaseUIElement if (title.title instanceof Translation) { content = title.title.Clone() - }else if(title.title instanceof FixedUiElement){ + } else if (title.title instanceof FixedUiElement) { content = title.title - }else if(Utils.runningFromConsole){ + } else if (Utils.runningFromConsole) { content = new FixedUiElement(title.AsMarkdown()) } else { content = new FixedUiElement(title.title.ConstructElement().innerText) @@ -48,12 +48,12 @@ private readonly titles: Title[] els.push({level: title.level, content: vis}) } - const minLevel = Math.min(...els.map(e => e.level)) + const minLevel = Math.min(...els.map(e => e.level)) if (options?.noTopLevel) { - els = els.filter(e => e.level !== minLevel ) + els = els.filter(e => e.level !== minLevel) } - - if(options?.maxDepth){ + + if (options?.maxDepth) { els = els.filter(e => e.level <= (options.maxDepth + minLevel)) } @@ -63,18 +63,18 @@ private readonly titles: Title[] this.titles = titles; } - private static getTitles(elements: BaseUIElement[]): Title[]{ + private static getTitles(elements: BaseUIElement[]): Title[] { const titles = [] - for (const uiElement of elements){ - if(uiElement instanceof Combine){ + for (const uiElement of elements) { + if (uiElement instanceof Combine) { titles.push(...TableOfContents.getTitles(uiElement.getElements())) - }else if(uiElement instanceof Title){ + } else if (uiElement instanceof Title) { titles.push(uiElement) } } return titles } - + private static mergeLevel(elements: { level: number, content: BaseUIElement }[]): BaseUIElement[] { const maxLevel = Math.max(...elements.map(e => e.level)) const minLevel = Math.min(...elements.map(e => e.level)) @@ -108,16 +108,16 @@ private readonly titles: Title[] } AsMarkdown(): string { - const depthIcons = ["1."," -"," +"," *"] + const depthIcons = ["1.", " -", " +", " *"] const lines = ["## Table of contents\n"]; const minLevel = Math.min(...this.titles.map(t => t.level)) for (const title of this.titles) { const prefix = depthIcons[title.level - minLevel] ?? " ~" - const text = title.title.AsMarkdown().replace("\n","") + const text = title.title.AsMarkdown().replace("\n", "") const link = title.id - lines.push(prefix + " ["+text+"](#"+link+")") + lines.push(prefix + " [" + text + "](#" + link + ")") } - - return lines.join("\n")+"\n\n" + + return lines.join("\n") + "\n\n" } } \ No newline at end of file diff --git a/UI/Base/Title.ts b/UI/Base/Title.ts index 49c4b5ded..f187818bc 100644 --- a/UI/Base/Title.ts +++ b/UI/Base/Title.ts @@ -5,13 +5,13 @@ import {Utils} from "../../Utils"; export default class Title extends BaseUIElement { public readonly title: BaseUIElement; public readonly level: number; - public readonly id : string - - private static readonly defaultClassesPerLevel = ["", "text-3xl font-bold","text-2xl font-bold","text-xl font-bold", "text-lg font-bold"] + public readonly id: string + + private static readonly defaultClassesPerLevel = ["", "text-3xl font-bold", "text-2xl font-bold", "text-xl font-bold", "text-lg font-bold"] constructor(embedded: string | BaseUIElement, level: number = 3) { super() - if(embedded === undefined){ + if (embedded === undefined) { throw "A title should have some content. Undefined is not allowed" } if (typeof embedded === "string") { @@ -20,20 +20,20 @@ export default class Title extends BaseUIElement { this.title = embedded } this.level = level; - - let innerText : string = undefined; - if(typeof embedded === "string" ) { + + let innerText: string = undefined; + if (typeof embedded === "string") { innerText = embedded - }else if(embedded instanceof FixedUiElement){ + } else if (embedded instanceof FixedUiElement) { innerText = embedded.content - }else{ - if(Utils.runningFromConsole){ - console.log("Not constructing an anchor for title with embedded content of "+embedded) - }else{ + } else { + if (Utils.runningFromConsole) { + console.log("Not constructing an anchor for title with embedded content of " + embedded) + } else { innerText = embedded.ConstructElement()?.innerText } } - + this.id = innerText?.replace(/ /g, '-') ?.replace(/[?#.;:/]/, "") ?.toLowerCase() ?? "" diff --git a/UI/Base/Toggleable.ts b/UI/Base/Toggleable.ts index 277ff41f9..31c68239b 100644 --- a/UI/Base/Toggleable.ts +++ b/UI/Base/Toggleable.ts @@ -15,7 +15,7 @@ export class Accordeon extends Combine { } })) } - + super(toggles); } @@ -33,24 +33,24 @@ export default class Toggleable extends Combine { this.onClick(() => self.isVisible.setData(!self.isVisible.data)) const contentElement = content.ConstructElement() - if(title instanceof Title){ + if (title instanceof Title) { Hash.hash.addCallbackAndRun(h => { - if(h === title.id){ + if (h === title.id) { self.isVisible.setData(true) content.RemoveClass("border-gray-300") content.SetClass("border-red-300") - }else{ + } else { content.SetClass("border-gray-300") content.RemoveClass("border-red-300") } }) this.isVisible.addCallbackAndRun(isVis => { - if(isVis){ + if (isVis) { Hash.hash.setData(title.id) } }) } - + this.isVisible.addCallbackAndRun(isVisible => { if (isVisible) { contentElement.style.maxHeight = "100vh" diff --git a/UI/Base/VariableUIElement.ts b/UI/Base/VariableUIElement.ts index e5d76d5db..8427170de 100644 --- a/UI/Base/VariableUIElement.ts +++ b/UI/Base/VariableUIElement.ts @@ -9,7 +9,7 @@ export class VariableUiElement extends BaseUIElement { super(); this._contents = contents; } - + Destroy() { super.Destroy(); this.isDestroyed = true; @@ -19,7 +19,7 @@ export class VariableUiElement extends BaseUIElement { const el = document.createElement("span"); const self = this; this._contents.addCallbackAndRun((contents) => { - if(self.isDestroyed){ + if (self.isDestroyed) { return true; } while (el.firstChild) { @@ -47,13 +47,13 @@ export class VariableUiElement extends BaseUIElement { }); return el; } - + AsMarkdown(): string { const d = this._contents.data; - if(typeof d === "string"){ + if (typeof d === "string") { return d; } - if(d instanceof BaseUIElement){ + if (d instanceof BaseUIElement) { return d.AsMarkdown() } return new Combine(d).AsMarkdown() diff --git a/UI/BigComponents/RightControls.ts b/UI/BigComponents/RightControls.ts index 470774786..6e3e333fa 100644 --- a/UI/BigComponents/RightControls.ts +++ b/UI/BigComponents/RightControls.ts @@ -4,8 +4,6 @@ import MapControlButton from "../MapControlButton"; import GeoLocationHandler from "../../Logic/Actors/GeoLocationHandler"; import Svg from "../../Svg"; import MapState from "../../Logic/State/MapState"; -import ShowDataLayer from "../ShowDataLayer/ShowDataLayer"; -import AllKnownLayers from "../../Customizations/AllKnownLayers"; export default class RightControls extends Combine { diff --git a/UI/Input/LocationInput.ts b/UI/Input/LocationInput.ts index 107b39639..133244d89 100644 --- a/UI/Input/LocationInput.ts +++ b/UI/Input/LocationInput.ts @@ -16,6 +16,7 @@ import ShowDataLayer from "../ShowDataLayer/ShowDataLayer"; import BaseUIElement from "../BaseUIElement"; import Toggle from "./Toggle"; import * as matchpoint from "../../assets/layers/matchpoint/matchpoint.json" + export default class LocationInput extends InputElement implements MinimapObj { private static readonly matchLayer = new LayerConfig(matchpoint, "LocationInput.matchpoint", true) diff --git a/UI/Popup/NoteCommentElement.ts b/UI/Popup/NoteCommentElement.ts index 93957a1bd..4251204c4 100644 --- a/UI/Popup/NoteCommentElement.ts +++ b/UI/Popup/NoteCommentElement.ts @@ -6,7 +6,6 @@ import {FixedUiElement} from "../Base/FixedUiElement"; import Translations from "../i18n/Translations"; import {Utils} from "../../Utils"; import Img from "../Base/Img"; -import {ImageCarousel} from "../Image/ImageCarousel"; import {SlideShow} from "../Image/SlideShow"; import {UIEventSource} from "../../Logic/UIEventSource"; import {OsmConnection} from "../../Logic/Osm/OsmConnection"; diff --git a/UI/Popup/SplitRoadWizard.ts b/UI/Popup/SplitRoadWizard.ts index 71c4c1fec..daeb7bbb1 100644 --- a/UI/Popup/SplitRoadWizard.ts +++ b/UI/Popup/SplitRoadWizard.ts @@ -17,6 +17,7 @@ import ShowDataMultiLayer from "../ShowDataLayer/ShowDataMultiLayer"; import LayerConfig from "../../Models/ThemeConfig/LayerConfig"; import {BBox} from "../../Logic/BBox"; import * as split_point from "../../assets/layers/split_point/split_point.json" + export default class SplitRoadWizard extends Toggle { // @ts-ignore private static splitLayerStyling = new LayerConfig(split_point, "(BUILTIN) SplitRoadWizard.ts", true) diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json index cdd4621d6..46c4fd5fd 100644 --- a/assets/layers/address/address.json +++ b/assets/layers/address/address.json @@ -5,7 +5,8 @@ "de": "Bekannte Adressen in OSM", "zh_Hant": "OSM 上已知的地址", "hu": "Ismert címek az OSM-en", - "nl": "Bekende adressen in OSM" + "nl": "Bekende adressen in OSM", + "fr": "Adresses connues d’OpenStreetMap" }, "minzoom": 18, "source": { @@ -27,7 +28,8 @@ "en": "Known address", "de": "Bekannte Adresse", "hu": "Ismert cím", - "nl": "Bekend adres" + "nl": "Bekend adres", + "fr": "Adresse connue" } }, "description": { @@ -36,7 +38,8 @@ "de": "Adressen", "ru": "Адреса", "zh_Hant": "地址", - "hu": "Címek" + "hu": "Címek", + "fr": "Adresses" }, "tagRenderings": [ { @@ -45,13 +48,15 @@ "en": "The housenumber is {addr:housenumber}", "nl": "Het huisnummer is {addr:housenumber}", "de": "Die Hausnummer ist {addr:housenumber}", - "hu": "A házszám: {addr:housenumber}" + "hu": "A házszám: {addr:housenumber}", + "fr": "Son numéro est le {addr:housenumber}" }, "question": { "en": "What is the number of this house?", "de": "Wie lautet die Nummer dieses Hauses?", "hu": "Mi ennek az épületnek a házszáma?", - "nl": "Wat is het huisnummer van dit huis?" + "nl": "Wat is het huisnummer van dit huis?", + "fr": "Quel est le numéro de ce bâtiment ?" }, "freeform": { "key": "addr:housenumber", @@ -70,7 +75,8 @@ "en": "This building has no house number", "nl": "Dit gebouw heeft geen huisnummer", "de": "Dieses Gebäude hat keine Hausnummer", - "hu": "Ennek az épületnek nincs házszáma" + "hu": "Ennek az épületnek nincs házszáma", + "fr": "Ce bâtiment n’a pas de numéro" } } ] @@ -81,13 +87,15 @@ "en": "This address is in street {addr:street}", "de": "Diese Adresse befindet sich in der Straße {addr:street}", "hu": "Ez a cím a következő utcában van: {addr:street}", - "nl": "Dit adres bevindt zich in de straat {addr:street}" + "nl": "Dit adres bevindt zich in de straat {addr:street}", + "fr": "Le nom de la voie est {addr:street}" }, "question": { "en": "What street is this address located in?", "de": "In welcher Straße befindet sich diese Adresse?", "hu": "Melyik utcában található ez a cím?", - "nl": "In welke straat bevindt dit adres zich?" + "nl": "In welke straat bevindt dit adres zich?", + "fr": "Dans quelle rue est située l’adresse ?" }, "freeform": { "key": "addr:street" @@ -122,7 +130,8 @@ "en": "What should be fixed here? Please explain", "zh_Hant": "這裡需要修什麼？請直接解釋", "de": "Was sollte hier korrigiert werden? Bitte erläutern", - "hu": "Mit kellene itt kijavítani? Légy szíves, magyarázd el" + "hu": "Mit kellene itt kijavítani? Légy szíves, magyarázd el", + "fr": "Précisez ce qui devrait être corrigé ici" }, "freeform": { "key": "fixme" diff --git a/assets/layers/address/housenumber_blank.svg b/assets/layers/address/housenumber_blank.svg index 403b819d6..9fe6b0f6a 100644 --- a/assets/layers/address/housenumber_blank.svg +++ b/assets/layers/address/housenumber_blank.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json index 6d13e76cd..6fa4a0cc8 100644 --- a/assets/layers/barrier/barrier.json +++ b/assets/layers/barrier/barrier.json @@ -5,13 +5,15 @@ "nl": "Barrières", "de": "Hindernisse", "ru": "Препятствия", - "hu": "Akadályok" + "hu": "Akadályok", + "fr": "Barrières" }, "description": { "en": "Obstacles while cycling, such as bollards and cycle barriers", "nl": "Hindernissen tijdens het fietsen, zoals paaltjes en fietshekjes", "de": "Hindernisse beim Fahrradfahren, wie zum Beispiel Poller und Fahrrad Barrieren", - "hu": "Kerékpározás közbeni akadályok, például terelőoszlopok és kerékpárakadályok" + "hu": "Kerékpározás közbeni akadályok, például terelőoszlopok és kerékpárakadályok", + "fr": "Obstacles à vélo, tels que des potelets ou des barrières" }, "source": { "osmTags": { @@ -27,7 +29,8 @@ "en": "Barrier", "nl": "Barrière", "de": "Hindernis", - "ru": "Препятствие" + "ru": "Препятствие", + "fr": "Barrière" }, "mappings": [ { @@ -45,7 +48,8 @@ "then": { "en": "Cycling Barrier", "nl": "Fietshekjes", - "de": "Barriere für Radfahrer" + "de": "Barriere für Radfahrer", + "fr": "Barrière cyclable" } } ] @@ -67,7 +71,8 @@ "en": "A bollard in the road", "nl": "Een paaltje in de weg", "de": "Ein Poller auf der Straße", - "hu": "Terelőoszlop az úton" + "hu": "Terelőoszlop az úton", + "fr": "Un potelet sur le chemin" }, "preciseInput": { "preferredBackground": [ @@ -82,7 +87,8 @@ "en": "Cycle barrier", "nl": "Fietshekjes", "de": "Fahrradhindernis", - "hu": "Kerékpárakadály" + "hu": "Kerékpárakadály", + "fr": "Barrière cyclable" }, "tags": [ "barrier=cycle_barrier" @@ -91,7 +97,8 @@ "en": "Cycle barrier, slowing down cyclists", "nl": "Fietshekjes, voor het afremmen van fietsers", "de": "Fahrradhindernis, das Radfahrer abbremst", - "hu": "A kerékpáros sebességét csökkentő kerékpárakadály" + "hu": "A kerékpáros sebességét csökkentő kerékpárakadály", + "fr": "Barrières cyclables, ralentissant les cyclistes" }, "preciseInput": { "preferredBackground": [ @@ -223,7 +230,8 @@ "en": "What kind of cycling barrier is this?", "nl": "Wat voor fietshekjes zijn dit?", "de": "Um welche Art Fahrradhindernis handelt es sich?", - "hu": "Milyen fajta kerékpárakadály ez?" + "hu": "Milyen fajta kerékpárakadály ez?", + "fr": "Quel est ce type de barrière cyclable ?" }, "condition": "barrier=cycle_barrier", "mappings": [ @@ -233,7 +241,8 @@ "en": "Single, just two barriers with a space inbetween ", "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen ", "de": "Einfach, nur zwei Barrieren mit einem Zwischenraum ", - "hu": "Egyszeres: csak két korlát, közöttük térköz " + "hu": "Egyszeres: csak két korlát, közöttük térköz ", + "fr": "Simple, deux barrières côte à côte " } }, { @@ -242,7 +251,8 @@ "en": "Double, two barriers behind each other ", "nl": "Dubbel, twee hekjes achter elkaar ", "de": "Doppelt, zwei Barrieren hintereinander ", - "hu": "Kétszeres: két, egymáshoz képest eltolt korlát egymás után " + "hu": "Kétszeres: két, egymáshoz képest eltolt korlát egymás után ", + "fr": "Double, deux barrières successives" } }, { @@ -251,7 +261,8 @@ "en": "Triple, three barriers behind each other ", "nl": "Drievoudig, drie hekjes achter elkaar ", "de": "Dreifach, drei Barrieren hintereinander ", - "hu": "Háromszoros: három, egymáshoz képest eltolt korlát egymás után " + "hu": "Háromszoros: három, egymáshoz képest eltolt korlát egymás után ", + "fr": "Triple, trois barrières successives " } }, { @@ -260,7 +271,8 @@ "en": "Squeeze gate, gap is smaller at top, than at the bottom ", "nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem ", "de": "Eine Durchfahrtsbeschränkung, Durchfahrtsbreite ist oben kleiner als unten ", - "hu": "Szűkítőkapu: a rés felül keskenyebb, mint alul " + "hu": "Szűkítőkapu: a rés felül keskenyebb, mint alul ", + "fr": "Poire, l’espace en hauteur est plus faible qu’au sol " } } ], @@ -278,7 +290,8 @@ "en": "How wide is the gap left over besides the barrier?", "nl": "Hoe breed is de ruimte naast de barrière?", "de": "Welche Durchfahrtsbreite hat das Hindernis?", - "hu": "Milyen széles az akadályon az a rés, amelyen át lehet haladni?" + "hu": "Milyen széles az akadályon az a rés, amelyen át lehet haladni?", + "fr": "Quelle est la largeur du passage ?" }, "condition": { "and": [ @@ -301,13 +314,15 @@ "en": "Space between barriers (along the length of the road): {width:separation} m", "nl": "Ruimte tussen barrières (langs de lengte van de weg): {width:separation} m", "de": "Abstand zwischen den Barrieren (entlang der Straße): {width:separation} m", - "hu": "A korlátok közötti távolság (az út irányában): {width:separation} m" + "hu": "A korlátok közötti távolság (az út irányában): {width:separation} m", + "fr": "Espace entre deux barrières successives : {width:separation} m" }, "question": { "en": "How much space is there between the barriers (along the length of the road)?", "nl": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg)?", "de": "Wie groß ist der Abstand zwischen den Barrieren (entlang der Straße)?", - "hu": "Mekkora távolság van a korlátok között (az út irányában)?" + "hu": "Mekkora távolság van a korlátok között (az út irányában)?", + "fr": "Combien d’espace sépare deux barrières successives ?" }, "condition": { "or": [ @@ -359,13 +374,15 @@ "render": { "en": "Overlap: {overlap} m", "de": "Überschneidung: {overlap} m", - "hu": "Átfedés: {overlap} m" + "hu": "Átfedés: {overlap} m", + "fr": "Chevauchement : {overlap} m" }, "question": { "en": "How much overlap do the barriers have?", "nl": "Hoeveel overlappen de barrières?", "de": "Wie stark überschneiden sich die Barrieren?", - "hu": "Mekkora a korlátok átfedése?" + "hu": "Mekkora a korlátok átfedése?", + "fr": "Quel est le chevauchement des barrières ?" }, "condition": { "or": [ diff --git a/assets/layers/barrier/barrier.svg b/assets/layers/barrier/barrier.svg index 479316583..2ca9d9f0c 100644 --- a/assets/layers/barrier/barrier.svg +++ b/assets/layers/barrier/barrier.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bench/bench.svg b/assets/layers/bench/bench.svg index a26380a4b..8c02d1259 100644 --- a/assets/layers/bench/bench.svg +++ b/assets/layers/bench/bench.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bicycle_library/bicycle_library.svg b/assets/layers/bicycle_library/bicycle_library.svg index 3cf31e291..d4330c701 100644 --- a/assets/layers/bicycle_library/bicycle_library.svg +++ b/assets/layers/bicycle_library/bicycle_library.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg index 0521b9260..6ebaa9e1a 100644 --- a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg +++ b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bicycle_tube_vending_machine/tube.svg b/assets/layers/bicycle_tube_vending_machine/tube.svg index eac8be74e..c39c1a856 100644 --- a/assets/layers/bicycle_tube_vending_machine/tube.svg +++ b/assets/layers/bicycle_tube_vending_machine/tube.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_cleaning/bike_cleaning.svg b/assets/layers/bike_cleaning/bike_cleaning.svg index f140ee853..81e2afeee 100644 --- a/assets/layers/bike_cleaning/bike_cleaning.svg +++ b/assets/layers/bike_cleaning/bike_cleaning.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_cleaning/bike_cleaning_icon.svg b/assets/layers/bike_cleaning/bike_cleaning_icon.svg index 20e2b8805..7283c4358 100644 --- a/assets/layers/bike_cleaning/bike_cleaning_icon.svg +++ b/assets/layers/bike_cleaning/bike_cleaning_icon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/bollard.svg b/assets/layers/bike_parking/bollard.svg index 9c9f44e7e..fea2ba923 100644 --- a/assets/layers/bike_parking/bollard.svg +++ b/assets/layers/bike_parking/bollard.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/handlebar_holder.svg b/assets/layers/bike_parking/handlebar_holder.svg index b2d376e2f..2f2e080a4 100644 --- a/assets/layers/bike_parking/handlebar_holder.svg +++ b/assets/layers/bike_parking/handlebar_holder.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/rack.svg b/assets/layers/bike_parking/rack.svg index a4a8b4f7a..ee84be5f1 100644 --- a/assets/layers/bike_parking/rack.svg +++ b/assets/layers/bike_parking/rack.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/shed.svg b/assets/layers/bike_parking/shed.svg index 381d8bcd1..5c3ec483e 100644 --- a/assets/layers/bike_parking/shed.svg +++ b/assets/layers/bike_parking/shed.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/staple.svg b/assets/layers/bike_parking/staple.svg index 31e6a9f3c..deec75798 100644 --- a/assets/layers/bike_parking/staple.svg +++ b/assets/layers/bike_parking/staple.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/two_tier.svg b/assets/layers/bike_parking/two_tier.svg index 338edaed2..8a9923be4 100644 --- a/assets/layers/bike_parking/two_tier.svg +++ b/assets/layers/bike_parking/two_tier.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_parking/wall_loops.svg b/assets/layers/bike_parking/wall_loops.svg index 9af628553..fb7a6497e 100644 --- a/assets/layers/bike_parking/wall_loops.svg +++ b/assets/layers/bike_parking/wall_loops.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_repair_station/bike_pump.svg b/assets/layers/bike_repair_station/bike_pump.svg index 128033396..13ed4a20a 100644 --- a/assets/layers/bike_repair_station/bike_pump.svg +++ b/assets/layers/bike_repair_station/bike_pump.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_repair_station/broken_pump_2.svg b/assets/layers/bike_repair_station/broken_pump_2.svg index 873c5919e..ce3f9b1c1 100644 --- a/assets/layers/bike_repair_station/broken_pump_2.svg +++ b/assets/layers/bike_repair_station/broken_pump_2.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/bike_themed_object/other_services.svg b/assets/layers/bike_themed_object/other_services.svg index 6c6242b0e..4e0720bea 100644 --- a/assets/layers/bike_themed_object/other_services.svg +++ b/assets/layers/bike_themed_object/other_services.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/binocular/telescope.svg b/assets/layers/binocular/telescope.svg index 72872cd08..3cf4a66bc 100644 --- a/assets/layers/binocular/telescope.svg +++ b/assets/layers/binocular/telescope.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/birdhide/birdhide.svg b/assets/layers/birdhide/birdhide.svg index a1b82a3c9..6c653e19e 100644 --- a/assets/layers/birdhide/birdhide.svg +++ b/assets/layers/birdhide/birdhide.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/birdhide/birdshelter.svg b/assets/layers/birdhide/birdshelter.svg index ce2e1b285..442b9b00a 100644 --- a/assets/layers/birdhide/birdshelter.svg +++ b/assets/layers/birdhide/birdshelter.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/cafe_pub/cafe.svg b/assets/layers/cafe_pub/cafe.svg index 8c5c3e4e1..c71f9f073 100644 --- a/assets/layers/cafe_pub/cafe.svg +++ b/assets/layers/cafe_pub/cafe.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/cafe_pub/pub.svg b/assets/layers/cafe_pub/pub.svg index d0716db50..15b89b3fc 100644 --- a/assets/layers/cafe_pub/pub.svg +++ b/assets/layers/cafe_pub/pub.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/CEE7_4F.svg b/assets/layers/charging_station/CEE7_4F.svg index 270a00108..942df3a3c 100644 --- a/assets/layers/charging_station/CEE7_4F.svg +++ b/assets/layers/charging_station/CEE7_4F.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Chademo_type4.svg b/assets/layers/charging_station/Chademo_type4.svg index ebf917992..980ad164e 100644 --- a/assets/layers/charging_station/Chademo_type4.svg +++ b/assets/layers/charging_station/Chademo_type4.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Tesla-hpwc-model-s.svg b/assets/layers/charging_station/Tesla-hpwc-model-s.svg index 1b3489487..2959fca83 100644 --- a/assets/layers/charging_station/Tesla-hpwc-model-s.svg +++ b/assets/layers/charging_station/Tesla-hpwc-model-s.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Type1_J1772.svg b/assets/layers/charging_station/Type1_J1772.svg index 66a9fdbcd..b82ff6fad 100644 --- a/assets/layers/charging_station/Type1_J1772.svg +++ b/assets/layers/charging_station/Type1_J1772.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Type2_CCS.svg b/assets/layers/charging_station/Type2_CCS.svg index afd780e89..6fac6d0b1 100644 --- a/assets/layers/charging_station/Type2_CCS.svg +++ b/assets/layers/charging_station/Type2_CCS.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Type2_socket.svg b/assets/layers/charging_station/Type2_socket.svg index d6702eaf4..bf583a767 100644 --- a/assets/layers/charging_station/Type2_socket.svg +++ b/assets/layers/charging_station/Type2_socket.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Type2_tethered.svg b/assets/layers/charging_station/Type2_tethered.svg index 29d80fc52..bec4ba77b 100644 --- a/assets/layers/charging_station/Type2_tethered.svg +++ b/assets/layers/charging_station/Type2_tethered.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/Type3c.svg b/assets/layers/charging_station/Type3c.svg index 7d8059a2d..f881a6b07 100644 --- a/assets/layers/charging_station/Type3c.svg +++ b/assets/layers/charging_station/Type3c.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/TypeE.svg b/assets/layers/charging_station/TypeE.svg index 344494687..b5548d49d 100644 --- a/assets/layers/charging_station/TypeE.svg +++ b/assets/layers/charging_station/TypeE.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/bosch-3pin.svg b/assets/layers/charging_station/bosch-3pin.svg index a12e8a18c..c5ae175e5 100644 --- a/assets/layers/charging_station/bosch-3pin.svg +++ b/assets/layers/charging_station/bosch-3pin.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/bosch-5pin.svg b/assets/layers/charging_station/bosch-5pin.svg index 0a562e250..7cb71f319 100644 --- a/assets/layers/charging_station/bosch-5pin.svg +++ b/assets/layers/charging_station/bosch-5pin.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/under_construction.svg b/assets/layers/charging_station/under_construction.svg index bddd23d59..c9128cbec 100644 --- a/assets/layers/charging_station/under_construction.svg +++ b/assets/layers/charging_station/under_construction.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/charging_station/usb_port.svg b/assets/layers/charging_station/usb_port.svg index b28e922ab..2b600c175 100644 --- a/assets/layers/charging_station/usb_port.svg +++ b/assets/layers/charging_station/usb_port.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/crab_address/housenumber_blank.svg b/assets/layers/crab_address/housenumber_blank.svg index 71f278958..206227d52 100644 --- a/assets/layers/crab_address/housenumber_blank.svg +++ b/assets/layers/crab_address/housenumber_blank.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/crossings/Belgian_road_sign_B22.svg b/assets/layers/crossings/Belgian_road_sign_B22.svg index 1bdeb9f3a..e2d4fa1fb 100644 --- a/assets/layers/crossings/Belgian_road_sign_B22.svg +++ b/assets/layers/crossings/Belgian_road_sign_B22.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/crossings/Belgian_road_sign_B23.svg b/assets/layers/crossings/Belgian_road_sign_B23.svg index cacfe41c5..dd9977991 100644 --- a/assets/layers/crossings/Belgian_road_sign_B23.svg +++ b/assets/layers/crossings/Belgian_road_sign_B23.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index 2a1fff0c2..2c1fb4b6a 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -3,12 +3,14 @@ "name": { "en": "Crossings", "nl": "Oversteekplaatsen", - "de": "Kreuzungen" + "de": "Kreuzungen", + "fr": "Traversée" }, "description": { "en": "Crossings for pedestrians and cyclists", "nl": "Oversteekplaatsen voor voetgangers en fietsers", - "de": "Übergänge für Fußgänger und Radfahrer" + "de": "Übergänge für Fußgänger und Radfahrer", + "fr": "Traversée pour piétons et cyclistes" }, "source": { "osmTags": { @@ -23,7 +25,8 @@ "render": { "en": "Crossing", "nl": "Oversteekplaats", - "de": "Kreuzung" + "de": "Kreuzung", + "fr": "Traversée" }, "mappings": [ { @@ -32,7 +35,8 @@ "en": "Traffic signal", "nl": "Verkeerslicht", "ru": "Светофор", - "de": "Ampel" + "de": "Ampel", + "fr": "Feu de signalisation" } }, { @@ -40,7 +44,8 @@ "then": { "en": "Crossing with traffic signals", "nl": "Oversteektplaats met verkeerslichten", - "de": "Kreuzung mit Ampeln" + "de": "Kreuzung mit Ampeln", + "fr": "Traversée avec feu de signalisation" } } ] @@ -50,7 +55,8 @@ "title": { "en": "Crossing", "nl": "Oversteekplaats", - "de": "Kreuzung" + "de": "Kreuzung", + "fr": "Traversée" }, "tags": [ "highway=crossing" @@ -58,7 +64,8 @@ "description": { "en": "Crossing for pedestrians and/or cyclists", "nl": "Oversteekplaats voor voetgangers en/of fietsers", - "de": "Kreuzung für Fußgänger und/oder Radfahrer" + "de": "Kreuzung für Fußgänger und/oder Radfahrer", + "fr": "Traversée pour piétons et/ou cyclistes" }, "preciseInput": { "preferredBackground": [ @@ -73,7 +80,8 @@ "en": "Traffic signal", "nl": "Verkeerslicht", "ru": "Светофор", - "de": "Ampel" + "de": "Ampel", + "fr": "Feu de signalisation" }, "tags": [ "highway=traffic_signals" @@ -81,7 +89,8 @@ "description": { "en": "Traffic signal on a road", "nl": "Verkeerslicht op een weg", - "de": "Ampel an einer Straße" + "de": "Ampel an einer Straße", + "fr": "Feu de signalisation sur la voie" }, "preciseInput": { "preferredBackground": [ diff --git a/assets/layers/crossings/pedestrian_crossing.svg b/assets/layers/crossings/pedestrian_crossing.svg index 8951d12a7..bfd553208 100644 --- a/assets/layers/crossings/pedestrian_crossing.svg +++ b/assets/layers/crossings/pedestrian_crossing.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/crossings/traffic_lights.svg b/assets/layers/crossings/traffic_lights.svg index d86a65cda..be2c64cc8 100644 --- a/assets/layers/crossings/traffic_lights.svg +++ b/assets/layers/crossings/traffic_lights.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index ccc5f9dfe..e0812d68f 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -3,7 +3,8 @@ "name": { "en": "Cycleways and roads", "nl": "Fietspaden, straten en wegen", - "de": "Radwege und Straßen" + "de": "Radwege und Straßen", + "fr": "Pistes cyclables et routes" }, "minzoom": 16, "source": { @@ -33,7 +34,8 @@ "en": "Cycleways", "nl": "Fietspaden", "de": "Radwege", - "ru": "Велосипедные дорожки" + "ru": "Велосипедные дорожки", + "fr": "Pistes cyclables" }, "mappings": [ { @@ -47,7 +49,8 @@ "nl": "Fietsweg", "en": "Cycleway", "de": "Radweg", - "ru": "Велосипедная дорожка" + "ru": "Велосипедная дорожка", + "fr": "Piste cyclable" } }, { @@ -55,7 +58,8 @@ "then": { "nl": "Fietssuggestiestrook", "en": "Shared lane", - "de": "Gemeinsame Fahrspur" + "de": "Gemeinsame Fahrspur", + "fr": "Voie partagée" } }, { @@ -63,7 +67,8 @@ "then": { "nl": "Fietsstrook", "en": "Bike lane", - "de": "Fahrradspur" + "de": "Fahrradspur", + "fr": "Bande cyclable" } }, { @@ -71,7 +76,8 @@ "then": { "en": "Cycleway next to the road", "nl": "Fietsweg naast de weg", - "de": "Radweg neben der Straße" + "de": "Radweg neben der Straße", + "fr": "Piste cyclable séparée de la route" } }, { @@ -79,7 +85,8 @@ "then": { "nl": "Fietsstraat", "en": "Cyclestreet", - "de": "Fahrradstraße" + "de": "Fahrradstraße", + "fr": "Vélorue" } } ] diff --git a/assets/layers/defibrillator/aed_checked.svg b/assets/layers/defibrillator/aed_checked.svg index 3456cae2b..246aab1e2 100644 --- a/assets/layers/defibrillator/aed_checked.svg +++ b/assets/layers/defibrillator/aed_checked.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/entrance/door.svg b/assets/layers/entrance/door.svg index 432761899..4720d93d9 100644 --- a/assets/layers/entrance/door.svg +++ b/assets/layers/entrance/door.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/entrance/emergency_door.svg b/assets/layers/entrance/emergency_door.svg index 1dc5b486c..56e05be0f 100644 --- a/assets/layers/entrance/emergency_door.svg +++ b/assets/layers/entrance/emergency_door.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/etymology/logo.svg b/assets/layers/etymology/logo.svg index 64ceefb73..43c997166 100644 --- a/assets/layers/etymology/logo.svg +++ b/assets/layers/etymology/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/food/Vegetarian-mark.svg b/assets/layers/food/Vegetarian-mark.svg index 22f11fd4b..9ec14b57a 100644 --- a/assets/layers/food/Vegetarian-mark.svg +++ b/assets/layers/food/Vegetarian-mark.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/food/fastfood.svg b/assets/layers/food/fastfood.svg index ea5eb4ed9..6e3fd193e 100644 --- a/assets/layers/food/fastfood.svg +++ b/assets/layers/food/fastfood.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/food/fries.svg b/assets/layers/food/fries.svg index 3803dc8f3..763c73b69 100644 --- a/assets/layers/food/fries.svg +++ b/assets/layers/food/fries.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/food/restaurant.svg b/assets/layers/food/restaurant.svg index f2a1d0d46..ef2032870 100644 --- a/assets/layers/food/restaurant.svg +++ b/assets/layers/food/restaurant.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/ghost_bike/ghost_bike.svg b/assets/layers/ghost_bike/ghost_bike.svg index ee6f9e6c3..f5ece0454 100644 --- a/assets/layers/ghost_bike/ghost_bike.svg +++ b/assets/layers/ghost_bike/ghost_bike.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/information_board/board.svg b/assets/layers/information_board/board.svg index 7c8d52d2c..435cb4c0f 100644 --- a/assets/layers/information_board/board.svg +++ b/assets/layers/information_board/board.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/nature_reserve/groen_logo.svg b/assets/layers/nature_reserve/groen_logo.svg index 79e8791fd..6d3301076 100644 --- a/assets/layers/nature_reserve/groen_logo.svg +++ b/assets/layers/nature_reserve/groen_logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/nature_reserve/nature_reserve.svg b/assets/layers/nature_reserve/nature_reserve.svg index af9e812c2..97d700ba9 100644 --- a/assets/layers/nature_reserve/nature_reserve.svg +++ b/assets/layers/nature_reserve/nature_reserve.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/observation_tower/Tower_observation.svg b/assets/layers/observation_tower/Tower_observation.svg index d159eb015..e60d4ff56 100644 --- a/assets/layers/observation_tower/Tower_observation.svg +++ b/assets/layers/observation_tower/Tower_observation.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/parking/parking.svg b/assets/layers/parking/parking.svg index 9983d9fcc..1369443d9 100644 --- a/assets/layers/parking/parking.svg +++ b/assets/layers/parking/parking.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/picnic_table/picnic_table.svg b/assets/layers/picnic_table/picnic_table.svg index d85294955..c6211ab54 100644 --- a/assets/layers/picnic_table/picnic_table.svg +++ b/assets/layers/picnic_table/picnic_table.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/play_forest/icon.svg b/assets/layers/play_forest/icon.svg index 868df8d67..83c51bef8 100644 --- a/assets/layers/play_forest/icon.svg +++ b/assets/layers/play_forest/icon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/slow_roads/slow_road.svg b/assets/layers/slow_roads/slow_road.svg index d620e9552..a63359077 100644 --- a/assets/layers/slow_roads/slow_road.svg +++ b/assets/layers/slow_roads/slow_road.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/slow_roads/woonerf.svg b/assets/layers/slow_roads/woonerf.svg index fa465c2f8..c026fa216 100644 --- a/assets/layers/slow_roads/woonerf.svg +++ b/assets/layers/slow_roads/woonerf.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/baseball.svg b/assets/layers/sport_pitch/baseball.svg index ca35a82c8..b4ee67970 100644 --- a/assets/layers/sport_pitch/baseball.svg +++ b/assets/layers/sport_pitch/baseball.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/basketball.svg b/assets/layers/sport_pitch/basketball.svg index 6f5528e1b..e67ae7f64 100644 --- a/assets/layers/sport_pitch/basketball.svg +++ b/assets/layers/sport_pitch/basketball.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/beachvolleyball.svg b/assets/layers/sport_pitch/beachvolleyball.svg index f495e36a0..e61a0003d 100644 --- a/assets/layers/sport_pitch/beachvolleyball.svg +++ b/assets/layers/sport_pitch/beachvolleyball.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/boules.svg b/assets/layers/sport_pitch/boules.svg index f4c7fcd89..d5790a7e2 100644 --- a/assets/layers/sport_pitch/boules.svg +++ b/assets/layers/sport_pitch/boules.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/lock.svg b/assets/layers/sport_pitch/lock.svg index 3af727b6b..2d4e2c032 100644 --- a/assets/layers/sport_pitch/lock.svg +++ b/assets/layers/sport_pitch/lock.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/skateboard.svg b/assets/layers/sport_pitch/skateboard.svg index ea2e06678..895237f48 100644 --- a/assets/layers/sport_pitch/skateboard.svg +++ b/assets/layers/sport_pitch/skateboard.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/soccer.svg b/assets/layers/sport_pitch/soccer.svg index eca4910e1..454cc841a 100644 --- a/assets/layers/sport_pitch/soccer.svg +++ b/assets/layers/sport_pitch/soccer.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/sport_pitch.svg b/assets/layers/sport_pitch/sport_pitch.svg index 1b8645b2d..8252ab908 100644 --- a/assets/layers/sport_pitch/sport_pitch.svg +++ b/assets/layers/sport_pitch/sport_pitch.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/table_tennis.svg b/assets/layers/sport_pitch/table_tennis.svg index 9439391be..3c233754b 100644 --- a/assets/layers/sport_pitch/table_tennis.svg +++ b/assets/layers/sport_pitch/table_tennis.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/tennis.svg b/assets/layers/sport_pitch/tennis.svg index 6e249f41c..83a32373e 100644 --- a/assets/layers/sport_pitch/tennis.svg +++ b/assets/layers/sport_pitch/tennis.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/sport_pitch/volleyball.svg b/assets/layers/sport_pitch/volleyball.svg index f495e36a0..e61a0003d 100644 --- a/assets/layers/sport_pitch/volleyball.svg +++ b/assets/layers/sport_pitch/volleyball.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/street_lamps/bent_pole_1.svg b/assets/layers/street_lamps/bent_pole_1.svg index be0fcf8ae..80db7bd06 100644 --- a/assets/layers/street_lamps/bent_pole_1.svg +++ b/assets/layers/street_lamps/bent_pole_1.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/street_lamps/bent_pole_2.svg b/assets/layers/street_lamps/bent_pole_2.svg index 89b03f22d..636863709 100644 --- a/assets/layers/street_lamps/bent_pole_2.svg +++ b/assets/layers/street_lamps/bent_pole_2.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/street_lamps/straight_pole.svg b/assets/layers/street_lamps/straight_pole.svg index de064d04e..e0e849d46 100644 --- a/assets/layers/street_lamps/straight_pole.svg +++ b/assets/layers/street_lamps/straight_pole.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/toilet/toilets.svg b/assets/layers/toilet/toilets.svg index 0d9aa98ae..02ade60d5 100644 --- a/assets/layers/toilet/toilets.svg +++ b/assets/layers/toilet/toilets.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/toilet/urinal.svg b/assets/layers/toilet/urinal.svg index bddb75ed0..0b6579e1f 100644 --- a/assets/layers/toilet/urinal.svg +++ b/assets/layers/toilet/urinal.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/toilet/wheelchair.svg b/assets/layers/toilet/wheelchair.svg index c9c373ebe..e6ccd1d1a 100644 --- a/assets/layers/toilet/wheelchair.svg +++ b/assets/layers/toilet/wheelchair.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/trail/pushchair.svg b/assets/layers/trail/pushchair.svg index db1e7973b..4f3ca7261 100644 --- a/assets/layers/trail/pushchair.svg +++ b/assets/layers/trail/pushchair.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json index 4ff87d105..72e945213 100644 --- a/assets/layers/trail/trail.json +++ b/assets/layers/trail/trail.json @@ -4,7 +4,8 @@ "en": "Trails", "nl": "Wandeltochten", "ru": "Тропы", - "de": "Wanderwege" + "de": "Wanderwege", + "fr": "Sentiers" }, "minzoom": 12, "source": { @@ -25,7 +26,8 @@ "en": "Trail", "nl": "Wandeltocht", "ru": "Тропа", - "de": "Wanderweg" + "de": "Wanderweg", + "fr": "Sentier" }, "mappings": [ { diff --git a/assets/layers/trail/trail.svg b/assets/layers/trail/trail.svg index a5cdf8954..678c600c5 100644 --- a/assets/layers/trail/trail.svg +++ b/assets/layers/trail/trail.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/trail/wheelchair.svg b/assets/layers/trail/wheelchair.svg index c9f991a3f..719c5fd26 100644 --- a/assets/layers/trail/wheelchair.svg +++ b/assets/layers/trail/wheelchair.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg b/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg index 54f9b2700..a9d033bab 100644 --- a/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg +++ b/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/viewpoint/viewpoint.svg b/assets/layers/viewpoint/viewpoint.svg index 1b21bae66..720cb95a6 100644 --- a/assets/layers/viewpoint/viewpoint.svg +++ b/assets/layers/viewpoint/viewpoint.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json index 8275a78c6..499c6e1a7 100644 --- a/assets/layers/visitor_information_centre/visitor_information_centre.json +++ b/assets/layers/visitor_information_centre/visitor_information_centre.json @@ -24,7 +24,8 @@ "en": "{name}", "de": "{name}", "ru": "{name}", - "eo": "{name}" + "eo": "{name}", + "fr": "{name}" }, "mappings": [ { @@ -48,7 +49,8 @@ "en": "{name}", "de": "{name}", "ru": "{name}", - "eo": "{name}" + "eo": "{name}", + "fr": "{name}" } } ] diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json index 2654f8232..1e885ee8e 100644 --- a/assets/layers/watermill/watermill.json +++ b/assets/layers/watermill/watermill.json @@ -5,7 +5,8 @@ "en": "Watermill", "de": "Wassermühle", "ru": "Водяная мельница", - "id": "Kincir Air" + "id": "Kincir Air", + "fr": "Moulin à eau" }, "minzoom": 12, "source": { diff --git a/assets/layers/watermill/watermill.svg b/assets/layers/watermill/watermill.svg index 2bd09dbb7..86c14d61d 100644 --- a/assets/layers/watermill/watermill.svg +++ b/assets/layers/watermill/watermill.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/add.svg b/assets/svg/add.svg index 8e115b291..e0ec8b41a 100644 --- a/assets/svg/add.svg +++ b/assets/svg/add.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/addSmall.svg b/assets/svg/addSmall.svg index 6a20dfd65..91d6a9156 100644 --- a/assets/svg/addSmall.svg +++ b/assets/svg/addSmall.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/add_pin.svg b/assets/svg/add_pin.svg index ccb00d8cb..9963cbdf3 100644 --- a/assets/svg/add_pin.svg +++ b/assets/svg/add_pin.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/ampersand.svg b/assets/svg/ampersand.svg index 56b8a09af..1b5cbf7d4 100644 --- a/assets/svg/ampersand.svg +++ b/assets/svg/ampersand.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/back.svg b/assets/svg/back.svg index 5b4df40aa..2536cfc29 100644 --- a/assets/svg/back.svg +++ b/assets/svg/back.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/blocked.svg b/assets/svg/blocked.svg index 2e34057d1..4d2914f4c 100644 --- a/assets/svg/blocked.svg +++ b/assets/svg/blocked.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/bug.svg b/assets/svg/bug.svg index 7c1c5da28..ac79e84e3 100644 --- a/assets/svg/bug.svg +++ b/assets/svg/bug.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/camera-plus.svg b/assets/svg/camera-plus.svg index 73663f6bd..38168e90d 100644 --- a/assets/svg/camera-plus.svg +++ b/assets/svg/camera-plus.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/checkbox-empty.svg b/assets/svg/checkbox-empty.svg index 51681cb8c..2cf245bf1 100644 --- a/assets/svg/checkbox-empty.svg +++ b/assets/svg/checkbox-empty.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/checkbox-filled.svg b/assets/svg/checkbox-filled.svg index 67d9380a4..1684232e4 100644 --- a/assets/svg/checkbox-filled.svg +++ b/assets/svg/checkbox-filled.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/checkmark.svg b/assets/svg/checkmark.svg index 6ee35b94b..34ae82a76 100644 --- a/assets/svg/checkmark.svg +++ b/assets/svg/checkmark.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/circle.svg b/assets/svg/circle.svg index 455f629ee..2cfde629f 100644 --- a/assets/svg/circle.svg +++ b/assets/svg/circle.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/clock.svg b/assets/svg/clock.svg index 64b540764..afca6d9ad 100644 --- a/assets/svg/clock.svg +++ b/assets/svg/clock.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/close.svg b/assets/svg/close.svg index 54740512f..d09268384 100644 --- a/assets/svg/close.svg +++ b/assets/svg/close.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/copyright.svg b/assets/svg/copyright.svg index 52b4bcd89..786af75a2 100644 --- a/assets/svg/copyright.svg +++ b/assets/svg/copyright.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/cross_bottom_right.svg b/assets/svg/cross_bottom_right.svg index ac930d487..0b4c0e2f8 100644 --- a/assets/svg/cross_bottom_right.svg +++ b/assets/svg/cross_bottom_right.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/crosshair-blue-center.svg b/assets/svg/crosshair-blue-center.svg index 0a7aae18f..15f86df08 100644 --- a/assets/svg/crosshair-blue-center.svg +++ b/assets/svg/crosshair-blue-center.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/crosshair-blue.svg b/assets/svg/crosshair-blue.svg index c8da096c9..c2ba4364b 100644 --- a/assets/svg/crosshair-blue.svg +++ b/assets/svg/crosshair-blue.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/crosshair-empty.svg b/assets/svg/crosshair-empty.svg index 233b03f6a..54528d8b0 100644 --- a/assets/svg/crosshair-empty.svg +++ b/assets/svg/crosshair-empty.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/crosshair-locked.svg b/assets/svg/crosshair-locked.svg index 61a7caaec..6c528f58f 100644 --- a/assets/svg/crosshair-locked.svg +++ b/assets/svg/crosshair-locked.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/crosshair.svg b/assets/svg/crosshair.svg index 1d899b072..a1d12eb22 100644 --- a/assets/svg/crosshair.svg +++ b/assets/svg/crosshair.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/delete_icon.svg b/assets/svg/delete_icon.svg index fc996a42c..c9f1bc15f 100644 --- a/assets/svg/delete_icon.svg +++ b/assets/svg/delete_icon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/delete_not_allowed.svg b/assets/svg/delete_not_allowed.svg index 625128546..2f7913bc5 100644 --- a/assets/svg/delete_not_allowed.svg +++ b/assets/svg/delete_not_allowed.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/direction_stroke.svg b/assets/svg/direction_stroke.svg index 33033c6eb..521b40b0d 100644 --- a/assets/svg/direction_stroke.svg +++ b/assets/svg/direction_stroke.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/download.svg b/assets/svg/download.svg index ca8a20f49..95998b929 100644 --- a/assets/svg/download.svg +++ b/assets/svg/download.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/envelope.svg b/assets/svg/envelope.svg index c7d92dc21..1e324366a 100644 --- a/assets/svg/envelope.svg +++ b/assets/svg/envelope.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/eye.svg b/assets/svg/eye.svg index 5aedf73fd..0321ac0e7 100644 --- a/assets/svg/eye.svg +++ b/assets/svg/eye.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/filter.svg b/assets/svg/filter.svg index 0b79791f0..a4448913e 100644 --- a/assets/svg/filter.svg +++ b/assets/svg/filter.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gear.svg b/assets/svg/gear.svg index 72c7429c2..6d9fba717 100644 --- a/assets/svg/gear.svg +++ b/assets/svg/gear.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gender_bi.svg b/assets/svg/gender_bi.svg index 8c24c52e6..5e09e2fe8 100644 --- a/assets/svg/gender_bi.svg +++ b/assets/svg/gender_bi.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gender_female.svg b/assets/svg/gender_female.svg index 2dddced66..5d5e12ae8 100644 --- a/assets/svg/gender_female.svg +++ b/assets/svg/gender_female.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gender_inter.svg b/assets/svg/gender_inter.svg index 1180065fc..7aa50c45e 100644 --- a/assets/svg/gender_inter.svg +++ b/assets/svg/gender_inter.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gender_male.svg b/assets/svg/gender_male.svg index 9433a37dd..692e49c1f 100644 --- a/assets/svg/gender_male.svg +++ b/assets/svg/gender_male.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gender_queer.svg b/assets/svg/gender_queer.svg index 8c5d8e761..3e742c2ad 100644 --- a/assets/svg/gender_queer.svg +++ b/assets/svg/gender_queer.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/gender_trans.svg b/assets/svg/gender_trans.svg index 64d9358e5..a41e21ce5 100644 --- a/assets/svg/gender_trans.svg +++ b/assets/svg/gender_trans.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/generic_map.svg b/assets/svg/generic_map.svg index e6901b246..5dfe67b7e 100644 --- a/assets/svg/generic_map.svg +++ b/assets/svg/generic_map.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/hand.svg b/assets/svg/hand.svg index 8257efbba..7a4525224 100644 --- a/assets/svg/hand.svg +++ b/assets/svg/hand.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/help.svg b/assets/svg/help.svg index 92cfefc66..7515e0738 100644 --- a/assets/svg/help.svg +++ b/assets/svg/help.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/home.svg b/assets/svg/home.svg index f214e84e7..c151ae16e 100644 --- a/assets/svg/home.svg +++ b/assets/svg/home.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/layers.svg b/assets/svg/layers.svg index 5b4e7c4a1..0fc110faa 100644 --- a/assets/svg/layers.svg +++ b/assets/svg/layers.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/length-crosshair.svg b/assets/svg/length-crosshair.svg index b3f8c37dc..fe2cd3362 100644 --- a/assets/svg/length-crosshair.svg +++ b/assets/svg/length-crosshair.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/liberapay.svg b/assets/svg/liberapay.svg index 0aadfc671..ce5b50b28 100644 --- a/assets/svg/liberapay.svg +++ b/assets/svg/liberapay.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/loading.svg b/assets/svg/loading.svg index 6f5cf9c80..7bb6275a1 100644 --- a/assets/svg/loading.svg +++ b/assets/svg/loading.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/location-empty.svg b/assets/svg/location-empty.svg index 35c2e97d9..e15d6f45f 100644 --- a/assets/svg/location-empty.svg +++ b/assets/svg/location-empty.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/location-refused.svg b/assets/svg/location-refused.svg index 8d20fe6c9..20d0f2f1e 100644 --- a/assets/svg/location-refused.svg +++ b/assets/svg/location-refused.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/location.svg b/assets/svg/location.svg index 1f8f3cf65..d289b6960 100644 --- a/assets/svg/location.svg +++ b/assets/svg/location.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/location_locked.svg b/assets/svg/location_locked.svg index b02b73406..9d74a0a6d 100644 --- a/assets/svg/location_locked.svg +++ b/assets/svg/location_locked.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/location_unlocked.svg b/assets/svg/location_unlocked.svg index 1267c8f72..2aa077403 100644 --- a/assets/svg/location_unlocked.svg +++ b/assets/svg/location_unlocked.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/logo.svg b/assets/svg/logo.svg index 1227eed20..b51870735 100644 --- a/assets/svg/logo.svg +++ b/assets/svg/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/logout.svg b/assets/svg/logout.svg index 204625da0..35af5e550 100644 --- a/assets/svg/logout.svg +++ b/assets/svg/logout.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/mapillary.svg b/assets/svg/mapillary.svg index 7c640e472..31d6f8b02 100644 --- a/assets/svg/mapillary.svg +++ b/assets/svg/mapillary.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/mapillary_black.svg b/assets/svg/mapillary_black.svg index be6612f9b..93f0d1dac 100644 --- a/assets/svg/mapillary_black.svg +++ b/assets/svg/mapillary_black.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/min.svg b/assets/svg/min.svg index f312bbbd5..e15337770 100644 --- a/assets/svg/min.svg +++ b/assets/svg/min.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/move-arrows.svg b/assets/svg/move-arrows.svg index f843f670c..ff0adf970 100644 --- a/assets/svg/move-arrows.svg +++ b/assets/svg/move-arrows.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/move.svg b/assets/svg/move.svg index 25e62ca7b..56eb488d2 100644 --- a/assets/svg/move.svg +++ b/assets/svg/move.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/move_confirm.svg b/assets/svg/move_confirm.svg index fd550699e..88b386a6e 100644 --- a/assets/svg/move_confirm.svg +++ b/assets/svg/move_confirm.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/move_not_allowed.svg b/assets/svg/move_not_allowed.svg index 93ce4b552..a44e09071 100644 --- a/assets/svg/move_not_allowed.svg +++ b/assets/svg/move_not_allowed.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/no_checkmark.svg b/assets/svg/no_checkmark.svg index 45fb94f7b..7c6392c8d 100644 --- a/assets/svg/no_checkmark.svg +++ b/assets/svg/no_checkmark.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/assets/svg/none.svg b/assets/svg/none.svg index 5da0dbc85..5adcc79f0 100644 --- a/assets/svg/none.svg +++ b/assets/svg/none.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/assets/svg/note.svg b/assets/svg/note.svg index 369082576..d4b0cb5f4 100644 --- a/assets/svg/note.svg +++ b/assets/svg/note.svg @@ -1,16 +1,16 @@ + width="275px" + height="374px" + viewBox="0 0 275 374" + version="1.1" + id="svg7" + sodipodi:docname="teardrop.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> - + diff --git a/assets/svg/pencil.svg b/assets/svg/pencil.svg index 07609a41d..24e22f4e5 100644 --- a/assets/svg/pencil.svg +++ b/assets/svg/pencil.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/phone.svg b/assets/svg/phone.svg index d441f3720..6e139aa9d 100644 --- a/assets/svg/phone.svg +++ b/assets/svg/phone.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/pin.svg b/assets/svg/pin.svg index 7fdfc62d5..0675ec07a 100644 --- a/assets/svg/pin.svg +++ b/assets/svg/pin.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/plus.svg b/assets/svg/plus.svg index 5e754ea36..a97b5494e 100644 --- a/assets/svg/plus.svg +++ b/assets/svg/plus.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/pop-out.svg b/assets/svg/pop-out.svg index 3740e529a..f32e3cf64 100644 --- a/assets/svg/pop-out.svg +++ b/assets/svg/pop-out.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/reload.svg b/assets/svg/reload.svg index ed8cb9a23..66573348f 100644 --- a/assets/svg/reload.svg +++ b/assets/svg/reload.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/relocation.svg b/assets/svg/relocation.svg index 6c387ee5d..d95f3f509 100644 --- a/assets/svg/relocation.svg +++ b/assets/svg/relocation.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/resolved.svg b/assets/svg/resolved.svg index 98fcc59db..cf8530a90 100644 --- a/assets/svg/resolved.svg +++ b/assets/svg/resolved.svg @@ -1,16 +1,16 @@ + width="275px" + height="374px" + viewBox="0 0 275 374" + version="1.1" + id="svg7" + sodipodi:docname="resolved.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> - + diff --git a/assets/svg/robot.svg b/assets/svg/robot.svg index d7ac11d7e..eb4c176c0 100644 --- a/assets/svg/robot.svg +++ b/assets/svg/robot.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/satellite.svg b/assets/svg/satellite.svg index 7af205b81..506a593bf 100644 --- a/assets/svg/satellite.svg +++ b/assets/svg/satellite.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/scissors.svg b/assets/svg/scissors.svg index 97d5eac02..597cd419c 100644 --- a/assets/svg/scissors.svg +++ b/assets/svg/scissors.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/search.svg b/assets/svg/search.svg index fe76b700a..3bfbb3010 100644 --- a/assets/svg/search.svg +++ b/assets/svg/search.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/send_email.svg b/assets/svg/send_email.svg index c32e61fa1..9a720b802 100644 --- a/assets/svg/send_email.svg +++ b/assets/svg/send_email.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/share.svg b/assets/svg/share.svg index 1e100e017..948376481 100644 --- a/assets/svg/share.svg +++ b/assets/svg/share.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/square.svg b/assets/svg/square.svg index 03e201f55..0bad670ff 100644 --- a/assets/svg/square.svg +++ b/assets/svg/square.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/star.svg b/assets/svg/star.svg index cb0a78730..d7148bcef 100644 --- a/assets/svg/star.svg +++ b/assets/svg/star.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/star_half.svg b/assets/svg/star_half.svg index 0c7101c1e..7765c2872 100644 --- a/assets/svg/star_half.svg +++ b/assets/svg/star_half.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/star_outline.svg b/assets/svg/star_outline.svg index f53adff90..859b7539c 100644 --- a/assets/svg/star_outline.svg +++ b/assets/svg/star_outline.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/star_outline_half.svg b/assets/svg/star_outline_half.svg index 82e581dbc..8c08c6cda 100644 --- a/assets/svg/star_outline_half.svg +++ b/assets/svg/star_outline_half.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/statistics.svg b/assets/svg/statistics.svg index 51b1441ef..4895984cd 100644 --- a/assets/svg/statistics.svg +++ b/assets/svg/statistics.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/teardrop.svg b/assets/svg/teardrop.svg index 9294e9f2c..efed7c4eb 100644 --- a/assets/svg/teardrop.svg +++ b/assets/svg/teardrop.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/teardrop_with_hole_green.svg b/assets/svg/teardrop_with_hole_green.svg index bce9cdadd..a173f54bc 100644 --- a/assets/svg/teardrop_with_hole_green.svg +++ b/assets/svg/teardrop_with_hole_green.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/translate.svg b/assets/svg/translate.svg index 977859d85..cfcc7316d 100644 --- a/assets/svg/translate.svg +++ b/assets/svg/translate.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/up.svg b/assets/svg/up.svg index 499f83cb7..ed57d9b96 100644 --- a/assets/svg/up.svg +++ b/assets/svg/up.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/upload.svg b/assets/svg/upload.svg index d80a69509..6342032c9 100644 --- a/assets/svg/upload.svg +++ b/assets/svg/upload.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/wikidata.svg b/assets/svg/wikidata.svg index 170ece2f3..0c609ce56 100644 --- a/assets/svg/wikidata.svg +++ b/assets/svg/wikidata.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/svg/wikimedia-commons-white.svg b/assets/svg/wikimedia-commons-white.svg index ad1688e1c..a0c8bc772 100644 --- a/assets/svg/wikimedia-commons-white.svg +++ b/assets/svg/wikimedia-commons-white.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 96b197be7..425bb3f7c 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -109,7 +109,8 @@ "nb_NO": "Hva er respektivt element på Wikipedia?", "ca": "Quin és l'ítem a Viquipèdia?", "sv": "Vad är det motsvarande objektet på Wikipedia?", - "zh_Hant": "維基百科上對應的項目是什麼？" + "zh_Hant": "維基百科上對應的項目是什麼？", + "fr": "Quel est l’élément Wikipédia correspondant ?" }, "mappings": [ { @@ -462,7 +463,8 @@ "de": "Gibt es an dieser Einrichtung Steckdosen, an denen Kunden ihre Geräte laden können?", "sv": "Har den här bekvämligheten eluttag tillgängliga för kunder när de är inne?", "zh_Hant": "這個便利設施有電器設備，能給客戶使用嗎？", - "hu": "Van-e ebben a létesítményben olyan konnektor, amely a bent tartózkodó ügyfelek rendelkezésére áll?" + "hu": "Van-e ebben a létesítményben olyan konnektor, amely a bent tartózkodó ügyfelek rendelkezésére áll?", + "fr": "Des prises sont elles à disposition des client·e·s en intérieur ?" }, "mappings": [ { @@ -474,7 +476,8 @@ "de": "Für Kunden stehen im Innenraum viele Steckdosen zur Verfügung, an denen sie ihre Geräte laden können", "sv": "Det finns gott om hushållsuttag tillgängliga för kunder som sitter inomhus, där de kan ladda sin elektronik", "zh_Hant": "這邊的客戶座位有不少個室內插座，而且可以為電器充電", - "hu": "Számos konnektor áll a belső térben ügyfelek rendelkezésére, ahol elektromos készülékeiket tölthetik" + "hu": "Számos konnektor áll a belső térben ügyfelek rendelkezésére, ahol elektromos készülékeiket tölthetik", + "fr": "Il y a suffisamment de prises disponibles pour les client·e·s en intérieur souhaitant recharger leurs appareils" }, "if": "service:electricity=yes" }, @@ -487,7 +490,8 @@ "de": "Für Kunden stehen im Innenraum wenig Steckdosen zur Verfügung, an denen sie ihre Geräte laden können", "sv": "Det finns ett fåtal hushållsuttag tillgängliga för kunder som sitter inomhus, där de kan ladda sin elektronik", "zh_Hant": "這邊客戶座位有一些室內插座，可以為電器充電", - "hu": "Csupán néhány konnektor áll a belső térben ügyfelek rendelkezésére, ahol elektromos készülékeiket tölthetik" + "hu": "Csupán néhány konnektor áll a belső térben ügyfelek rendelkezésére, ahol elektromos készülékeiket tölthetik", + "fr": "Il y a peu de prises disponibles pour les client·e·s en intérieur souhaitant recharger leurs appareils" }, "if": "service:electricity=limited" }, diff --git a/assets/themes/aed/aed.svg b/assets/themes/aed/aed.svg index c3bbfd677..3ab3f8840 100644 --- a/assets/themes/aed/aed.svg +++ b/assets/themes/aed/aed.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/artwork/artwork.svg b/assets/themes/artwork/artwork.svg index 685275a24..8dd4f697c 100644 --- a/assets/themes/artwork/artwork.svg +++ b/assets/themes/artwork/artwork.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/benches/bench_poi.svg b/assets/themes/benches/bench_poi.svg index a26380a4b..8c02d1259 100644 --- a/assets/themes/benches/bench_poi.svg +++ b/assets/themes/benches/bench_poi.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/benches/bench_public_transport.svg b/assets/themes/benches/bench_public_transport.svg index 2053c4221..d8a615020 100644 --- a/assets/themes/benches/bench_public_transport.svg +++ b/assets/themes/benches/bench_public_transport.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/bicyclelib/bicyclelib.json b/assets/themes/bicyclelib/bicyclelib.json index 8e5d817a1..e36d4ef51 100644 --- a/assets/themes/bicyclelib/bicyclelib.json +++ b/assets/themes/bicyclelib/bicyclelib.json @@ -37,7 +37,6 @@ "de": "Fahrradbibliotheken sind Orte, um Fahrräder auszuleihen, oft gegen eine geringe Gebühr. Ein wichtiger Anwendungsfall sind Fahrradbibliotheken für Kinder, die es ihnen ermöglichen, auf ein größeres Fahrrad umzusteigen, wenn sie aus ihrem aktuellen Fahrrad herausgewachsen sind" }, "icon": "./assets/themes/bicyclelib/logo.svg", - "socialImage": null, "startLat": 0, "startLon": 0, "startZoom": 1, diff --git a/assets/themes/bicyclelib/logo.svg b/assets/themes/bicyclelib/logo.svg index 48fa85301..92a6c880e 100644 --- a/assets/themes/bicyclelib/logo.svg +++ b/assets/themes/bicyclelib/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/bookcases/bookcase.svg b/assets/themes/bookcases/bookcase.svg index ad216c21c..a49c40b27 100644 --- a/assets/themes/bookcases/bookcase.svg +++ b/assets/themes/bookcases/bookcase.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/bookcases/bookcases.json b/assets/themes/bookcases/bookcases.json index 03747813e..7dfab9543 100644 --- a/assets/themes/bookcases/bookcases.json +++ b/assets/themes/bookcases/bookcases.json @@ -37,7 +37,6 @@ "it": "Una minibiblioteca è una piccola cabina a lato della strada, una scatola, una vecchia cabina telefonica o qualche altro contenitore che ospita libri. Tutti può lasciare o prendere un libro. Questa mappa punta a rappresentarle tutte. Puoi facilmente scoprire nuove minibiblioteche nelle tue vicinanze e, con un account gratuito su OpenStreetMap, puoi aggiungerne altre." }, "icon": "./assets/themes/bookcases/bookcase.svg", - "socialImage": null, "startLat": 0, "startLon": 0, "startZoom": 1, diff --git a/assets/themes/buurtnatuur/forest.svg b/assets/themes/buurtnatuur/forest.svg index 8f9e7ec47..c00375846 100644 --- a/assets/themes/buurtnatuur/forest.svg +++ b/assets/themes/buurtnatuur/forest.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/buurtnatuur/groen_logo.svg b/assets/themes/buurtnatuur/groen_logo.svg index 79e8791fd..6d3301076 100644 --- a/assets/themes/buurtnatuur/groen_logo.svg +++ b/assets/themes/buurtnatuur/groen_logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/buurtnatuur/nature_reserve.svg b/assets/themes/buurtnatuur/nature_reserve.svg index af9e812c2..97d700ba9 100644 --- a/assets/themes/buurtnatuur/nature_reserve.svg +++ b/assets/themes/buurtnatuur/nature_reserve.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/buurtnatuur/park.svg b/assets/themes/buurtnatuur/park.svg index 749f61d8f..fb42bcc61 100644 --- a/assets/themes/buurtnatuur/park.svg +++ b/assets/themes/buurtnatuur/park.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/campersite/caravan.svg b/assets/themes/campersite/caravan.svg index dff85ca55..45d06e4dc 100644 --- a/assets/themes/campersite/caravan.svg +++ b/assets/themes/campersite/caravan.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/campersite/caravan_green.svg b/assets/themes/campersite/caravan_green.svg index 323753589..af80ec857 100644 --- a/assets/themes/campersite/caravan_green.svg +++ b/assets/themes/campersite/caravan_green.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/campersite/sanitary_dump_station.svg b/assets/themes/campersite/sanitary_dump_station.svg index ec58eaad8..b3c2c45f4 100644 --- a/assets/themes/campersite/sanitary_dump_station.svg +++ b/assets/themes/campersite/sanitary_dump_station.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/charging_stations/bicycle.svg b/assets/themes/charging_stations/bicycle.svg index 7b78c8c2e..e2bdb47f0 100644 --- a/assets/themes/charging_stations/bicycle.svg +++ b/assets/themes/charging_stations/bicycle.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/charging_stations/car.svg b/assets/themes/charging_stations/car.svg index d6128f17d..97b04cd4f 100644 --- a/assets/themes/charging_stations/car.svg +++ b/assets/themes/charging_stations/car.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/charging_stations/logo.svg b/assets/themes/charging_stations/logo.svg index 6d90202cb..fc4c5f9eb 100644 --- a/assets/themes/charging_stations/logo.svg +++ b/assets/themes/charging_stations/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/charging_stations/plug.svg b/assets/themes/charging_stations/plug.svg index 7ca76d044..6d0cd0c35 100644 --- a/assets/themes/charging_stations/plug.svg +++ b/assets/themes/charging_stations/plug.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/carabiner.svg b/assets/themes/climbing/carabiner.svg index 1f811f698..06682ab12 100644 --- a/assets/themes/climbing/carabiner.svg +++ b/assets/themes/climbing/carabiner.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/climbing_gym.svg b/assets/themes/climbing/climbing_gym.svg index 5b5c68d90..c437e8da6 100644 --- a/assets/themes/climbing/climbing_gym.svg +++ b/assets/themes/climbing/climbing_gym.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/climbing_icon.svg b/assets/themes/climbing/climbing_icon.svg index 9e098579c..d68108e51 100644 --- a/assets/themes/climbing/climbing_icon.svg +++ b/assets/themes/climbing/climbing_icon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/climbing_no_rope.svg b/assets/themes/climbing/climbing_no_rope.svg index adee00dbe..22afca58d 100644 --- a/assets/themes/climbing/climbing_no_rope.svg +++ b/assets/themes/climbing/climbing_no_rope.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/climbing_rope.svg b/assets/themes/climbing/climbing_rope.svg index 7ec867009..29ad63d1d 100644 --- a/assets/themes/climbing/climbing_rope.svg +++ b/assets/themes/climbing/climbing_rope.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/climbing_route.svg b/assets/themes/climbing/climbing_route.svg index 1803dcd00..9a5dafe74 100644 --- a/assets/themes/climbing/climbing_route.svg +++ b/assets/themes/climbing/climbing_route.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/club.svg b/assets/themes/climbing/club.svg index 1912b69ab..dbe630c9a 100644 --- a/assets/themes/climbing/club.svg +++ b/assets/themes/climbing/club.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/climbing/height.svg b/assets/themes/climbing/height.svg index 86a349f25..ce9f59fb4 100644 --- a/assets/themes/climbing/height.svg +++ b/assets/themes/climbing/height.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_highways/fietssnelwegen-logo.svg b/assets/themes/cycle_highways/fietssnelwegen-logo.svg index bf9e612a8..52810e3aa 100644 --- a/assets/themes/cycle_highways/fietssnelwegen-logo.svg +++ b/assets/themes/cycle_highways/fietssnelwegen-logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D07.svg b/assets/themes/cycle_infra/Belgian_road_sign_D07.svg index ef8345fce..d5a7af7a4 100644 --- a/assets/themes/cycle_infra/Belgian_road_sign_D07.svg +++ b/assets/themes/cycle_infra/Belgian_road_sign_D07.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D09.svg b/assets/themes/cycle_infra/Belgian_road_sign_D09.svg index 2aa99b566..54f014cdc 100644 --- a/assets/themes/cycle_infra/Belgian_road_sign_D09.svg +++ b/assets/themes/cycle_infra/Belgian_road_sign_D09.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D10.svg b/assets/themes/cycle_infra/Belgian_road_sign_D10.svg index 74e042fde..4eef09fd4 100644 --- a/assets/themes/cycle_infra/Belgian_road_sign_D10.svg +++ b/assets/themes/cycle_infra/Belgian_road_sign_D10.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg b/assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg index 2bce1c717..c7d097e20 100644 --- a/assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg +++ b/assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg b/assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg index ba8285fbc..1c9716eca 100644 --- a/assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg +++ b/assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg b/assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg index 046ff7882..e8ef24e56 100644 --- a/assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg +++ b/assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg b/assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg index 9db585d0e..fe0dbd38c 100644 --- a/assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg +++ b/assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg b/assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg index e06dba7d8..e60d661cc 100644 --- a/assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg +++ b/assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg b/assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg index fa3c4a285..c533ae6ce 100644 --- a/assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg +++ b/assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Cycle_barrier_double.svg b/assets/themes/cycle_infra/Cycle_barrier_double.svg index 9c665aff8..4fbc0d832 100644 --- a/assets/themes/cycle_infra/Cycle_barrier_double.svg +++ b/assets/themes/cycle_infra/Cycle_barrier_double.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_length.svg b/assets/themes/cycle_infra/Cycle_barrier_double_length.svg index 4f3b8d5e8..289a645ed 100644 --- a/assets/themes/cycle_infra/Cycle_barrier_double_length.svg +++ b/assets/themes/cycle_infra/Cycle_barrier_double_length.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg b/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg index db33697db..f82e706d3 100644 --- a/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg +++ b/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_template.svg b/assets/themes/cycle_infra/Cycle_barrier_double_template.svg index 5276a646f..fc196865b 100644 --- a/assets/themes/cycle_infra/Cycle_barrier_double_template.svg +++ b/assets/themes/cycle_infra/Cycle_barrier_double_template.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_width.svg b/assets/themes/cycle_infra/Cycle_barrier_double_width.svg index a9bfa60a9..ee732b511 100644 --- a/assets/themes/cycle_infra/Cycle_barrier_double_width.svg +++ b/assets/themes/cycle_infra/Cycle_barrier_double_width.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/bicycleway.svg b/assets/themes/cycle_infra/bicycleway.svg index 289f399a6..fcc31cb70 100644 --- a/assets/themes/cycle_infra/bicycleway.svg +++ b/assets/themes/cycle_infra/bicycleway.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/cycle-infra.svg b/assets/themes/cycle_infra/cycle-infra.svg index 04d1dddf9..abd6dea01 100644 --- a/assets/themes/cycle_infra/cycle-infra.svg +++ b/assets/themes/cycle_infra/cycle-infra.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cycle_infra/street.svg b/assets/themes/cycle_infra/street.svg index b0d793960..693b85817 100644 --- a/assets/themes/cycle_infra/street.svg +++ b/assets/themes/cycle_infra/street.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cyclestreets/F111.svg b/assets/themes/cyclestreets/F111.svg index 637ffbc61..5187f3692 100644 --- a/assets/themes/cyclestreets/F111.svg +++ b/assets/themes/cyclestreets/F111.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cyclofix/fietsambassade_gent_logo.svg b/assets/themes/cyclofix/fietsambassade_gent_logo.svg index aae60ee38..42714a138 100644 --- a/assets/themes/cyclofix/fietsambassade_gent_logo.svg +++ b/assets/themes/cyclofix/fietsambassade_gent_logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg index 5308c42e7..258b3daf6 100644 --- a/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg +++ b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/cyclofix/logo.svg b/assets/themes/cyclofix/logo.svg index f338707f7..0e9e260d3 100644 --- a/assets/themes/cyclofix/logo.svg +++ b/assets/themes/cyclofix/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/bloei.svg b/assets/themes/facadegardens/bloei.svg index 5cbdab3e0..94bf0494a 100644 --- a/assets/themes/facadegardens/bloei.svg +++ b/assets/themes/facadegardens/bloei.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/bodembedekker.svg b/assets/themes/facadegardens/bodembedekker.svg index 88abd37b8..aa2d4a0b1 100644 --- a/assets/themes/facadegardens/bodembedekker.svg +++ b/assets/themes/facadegardens/bodembedekker.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/eetbaar.svg b/assets/themes/facadegardens/eetbaar.svg index ca608b7ec..855a250ef 100644 --- a/assets/themes/facadegardens/eetbaar.svg +++ b/assets/themes/facadegardens/eetbaar.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/gevelton.svg b/assets/themes/facadegardens/gevelton.svg index 885796c1d..ee58806d0 100644 --- a/assets/themes/facadegardens/gevelton.svg +++ b/assets/themes/facadegardens/gevelton.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/geveltuin.svg b/assets/themes/facadegardens/geveltuin.svg index 10624d15f..42c61fa02 100644 --- a/assets/themes/facadegardens/geveltuin.svg +++ b/assets/themes/facadegardens/geveltuin.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/halfzon.svg b/assets/themes/facadegardens/halfzon.svg index 543312dad..6d3b15861 100644 --- a/assets/themes/facadegardens/halfzon.svg +++ b/assets/themes/facadegardens/halfzon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/klimplant.svg b/assets/themes/facadegardens/klimplant.svg index fa2d9b7c1..f6e185cb8 100644 --- a/assets/themes/facadegardens/klimplant.svg +++ b/assets/themes/facadegardens/klimplant.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/schaduw.svg b/assets/themes/facadegardens/schaduw.svg index c43b836af..961b83e05 100644 --- a/assets/themes/facadegardens/schaduw.svg +++ b/assets/themes/facadegardens/schaduw.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/struik.svg b/assets/themes/facadegardens/struik.svg index 4d164460d..501f5093f 100644 --- a/assets/themes/facadegardens/struik.svg +++ b/assets/themes/facadegardens/struik.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/facadegardens/zon.svg b/assets/themes/facadegardens/zon.svg index 038a17064..48c7d40b8 100644 --- a/assets/themes/facadegardens/zon.svg +++ b/assets/themes/facadegardens/zon.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/fritures/Vegetarian-mark.svg b/assets/themes/fritures/Vegetarian-mark.svg index 22f11fd4b..9ec14b57a 100644 --- a/assets/themes/fritures/Vegetarian-mark.svg +++ b/assets/themes/fritures/Vegetarian-mark.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/fritures/fries.svg b/assets/themes/fritures/fries.svg index 3803dc8f3..763c73b69 100644 --- a/assets/themes/fritures/fries.svg +++ b/assets/themes/fritures/fries.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/fritures/logo.svg b/assets/themes/fritures/logo.svg index eed466277..6847b4618 100644 --- a/assets/themes/fritures/logo.svg +++ b/assets/themes/fritures/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/fruit_trees/fruit_tree.svg b/assets/themes/fruit_trees/fruit_tree.svg index 69b12e638..e5cce675e 100644 --- a/assets/themes/fruit_trees/fruit_tree.svg +++ b/assets/themes/fruit_trees/fruit_tree.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/ghostbikes/logo.svg b/assets/themes/ghostbikes/logo.svg index 5b5451cd7..196503895 100644 --- a/assets/themes/ghostbikes/logo.svg +++ b/assets/themes/ghostbikes/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/grb_import/housenumber_blank.svg b/assets/themes/grb_import/housenumber_blank.svg index 31813a679..c8f1a7f01 100644 --- a/assets/themes/grb_import/housenumber_blank.svg +++ b/assets/themes/grb_import/housenumber_blank.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hackerspaces/glider.svg b/assets/themes/hackerspaces/glider.svg index 77a5fc692..3f7548762 100644 --- a/assets/themes/hackerspaces/glider.svg +++ b/assets/themes/hackerspaces/glider.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/Twemoji12_1f692.svg b/assets/themes/hailhydrant/Twemoji12_1f692.svg index 4000107d0..97ee5e448 100644 --- a/assets/themes/hailhydrant/Twemoji12_1f692.svg +++ b/assets/themes/hailhydrant/Twemoji12_1f692.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/Twemoji12_1f9ef.svg b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg index 0010dfbbf..775a7ba49 100644 --- a/assets/themes/hailhydrant/Twemoji12_1f9ef.svg +++ b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/Twemoji12_26d1.svg b/assets/themes/hailhydrant/Twemoji12_26d1.svg index 69c219e76..880a5537a 100644 --- a/assets/themes/hailhydrant/Twemoji12_26d1.svg +++ b/assets/themes/hailhydrant/Twemoji12_26d1.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/Twemoji_1f691.svg b/assets/themes/hailhydrant/Twemoji_1f691.svg index e98d41bce..1adc8a092 100644 --- a/assets/themes/hailhydrant/Twemoji_1f691.svg +++ b/assets/themes/hailhydrant/Twemoji_1f691.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/hydrant_pillar.svg b/assets/themes/hailhydrant/hydrant_pillar.svg index a852a7cf4..d6a301fc1 100644 --- a/assets/themes/hailhydrant/hydrant_pillar.svg +++ b/assets/themes/hailhydrant/hydrant_pillar.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/hydrant_underground.svg b/assets/themes/hailhydrant/hydrant_underground.svg index 68a7c94fe..a71848681 100644 --- a/assets/themes/hailhydrant/hydrant_underground.svg +++ b/assets/themes/hailhydrant/hydrant_underground.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/hydrant_unknown.svg b/assets/themes/hailhydrant/hydrant_unknown.svg index d2e1cc25c..90eec0cc3 100644 --- a/assets/themes/hailhydrant/hydrant_unknown.svg +++ b/assets/themes/hailhydrant/hydrant_unknown.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/hailhydrant/logo.svg b/assets/themes/hailhydrant/logo.svg index 0c3c36c42..087d13d4b 100644 --- a/assets/themes/hailhydrant/logo.svg +++ b/assets/themes/hailhydrant/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/maps/logo.svg b/assets/themes/maps/logo.svg index c0fea0253..75f7d3272 100644 --- a/assets/themes/maps/logo.svg +++ b/assets/themes/maps/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/nature/logo.svg b/assets/themes/nature/logo.svg index a1b82a3c9..6c653e19e 100644 --- a/assets/themes/nature/logo.svg +++ b/assets/themes/nature/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/natuurpunt/bench.svg b/assets/themes/natuurpunt/bench.svg index 62492b05c..716f73685 100644 --- a/assets/themes/natuurpunt/bench.svg +++ b/assets/themes/natuurpunt/bench.svg @@ -1,16 +1,16 @@ + width="254.98047" + height="119.35156" + viewBox="0 0 254.98047 119.35156" + version="1.1" + id="svg5" + sodipodi:docname="bench.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="211.75177" + height="142.0576" + viewBox="0 0 211.75177 142.0576" + version="1.1" + id="svg5" + sodipodi:docname="birdhide.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="151.85362" + height="165.0014" + viewBox="0 0 151.85362 165.0014" + version="1.1" + id="svg5" + sodipodi:docname="drips.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-17.5 7 6.3699999 15.000459" + version="1.1" + id="svg10" + sodipodi:docname="information.svg" + width="6.3699999" + height="15.000459" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="199.53906" + height="149.26953" + viewBox="0 0 199.53906 149.26953" + version="1.1" + id="svg7" + sodipodi:docname="information_board.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="143.75452" + height="178.10156" + viewBox="0 0 143.75452 178.10156" + version="1.1" + id="svg5" + sodipodi:docname="nature_reserve.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-12.5 7 12.050868 16.002609" + version="1.1" + id="svg10" + sodipodi:docname="parking.svg" + width="12.050868" + height="16.002609" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-11 8 16.730312 19.004028" + version="1.1" + id="svg24" + sodipodi:docname="parkingbike.svg" + width="16.730312" + height="19.004028" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-23 6 17.859455 17.979752" + version="1.1" + id="svg11" + sodipodi:docname="parkingmotor.svg" + width="17.859455" + height="17.979752" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-24 7 13.266731 20.714458" + version="1.1" + id="svg12" + sodipodi:docname="parkingwheels.svg" + width="13.266731" + height="20.714458" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-7 5 22.07 12.9" + version="1.1" + id="svg16" + sodipodi:docname="picnic_table.svg" + width="22.07" + height="12.9" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="222.35574" + height="190.93405" + viewBox="0 0 222.35574 190.93405" + version="1.1" + id="svg838" + sodipodi:docname="pushchair.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="247" + height="113.56189" + viewBox="0 0 247 113.56189" + version="1.1" + id="svg7" + sodipodi:docname="toilets.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-10 8 11.976725 17.589441" + version="1.1" + id="svg14" + sodipodi:docname="trail.svg" + width="11.976725" + height="17.589441" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + width="157.30078" + height="203.94189" + viewBox="0 0 157.30078 203.94189" + version="1.1" + id="svg904" + sodipodi:docname="urinal.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-8 8 25.386618 17.599442" + version="1.1" + id="svg985" + sodipodi:docname="walk_wheelchair.svg" + width="25.386618" + height="17.599442" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + viewBox="-10 8 15.18 19.74" + version="1.1" + id="svg1054" + sodipodi:docname="watermill.svg" + width="15.18" + height="19.74" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> - + diff --git a/assets/themes/parkings/parkings.svg b/assets/themes/parkings/parkings.svg index 9983d9fcc..1369443d9 100644 --- a/assets/themes/parkings/parkings.svg +++ b/assets/themes/parkings/parkings.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/playgrounds/playground.svg b/assets/themes/playgrounds/playground.svg index b8054f607..97e6a132a 100644 --- a/assets/themes/playgrounds/playground.svg +++ b/assets/themes/playgrounds/playground.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/postal_codes/townhall.svg b/assets/themes/postal_codes/townhall.svg index 439ae1638..291c535e1 100644 --- a/assets/themes/postal_codes/townhall.svg +++ b/assets/themes/postal_codes/townhall.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/postboxes/post_office.svg b/assets/themes/postboxes/post_office.svg index 9fec26dca..f9d52a930 100644 --- a/assets/themes/postboxes/post_office.svg +++ b/assets/themes/postboxes/post_office.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/shops/shop.svg b/assets/themes/shops/shop.svg index 4d81c6f1c..fd8e78c60 100644 --- a/assets/themes/shops/shop.svg +++ b/assets/themes/shops/shop.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/speelplekken/logo.svg b/assets/themes/speelplekken/logo.svg index 295238bb3..dfc602362 100644 --- a/assets/themes/speelplekken/logo.svg +++ b/assets/themes/speelplekken/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/speelplekken/speelbos.svg b/assets/themes/speelplekken/speelbos.svg index 99915c8e1..ac2e13ad1 100644 --- a/assets/themes/speelplekken/speelbos.svg +++ b/assets/themes/speelplekken/speelbos.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/speelplekken/speeltuin.svg b/assets/themes/speelplekken/speeltuin.svg index 3c418339e..da82683c8 100644 --- a/assets/themes/speelplekken/speeltuin.svg +++ b/assets/themes/speelplekken/speeltuin.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/speelplekken/speelweide.svg b/assets/themes/speelplekken/speelweide.svg index c52d2ceea..6aca3d4fd 100644 --- a/assets/themes/speelplekken/speelweide.svg +++ b/assets/themes/speelplekken/speelweide.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/speelplekken/youtube.svg b/assets/themes/speelplekken/youtube.svg index f219bd970..2b5ab752c 100644 --- a/assets/themes/speelplekken/youtube.svg +++ b/assets/themes/speelplekken/youtube.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/surveillance/cam_left.svg b/assets/themes/surveillance/cam_left.svg index 584c82811..fa8441501 100644 --- a/assets/themes/surveillance/cam_left.svg +++ b/assets/themes/surveillance/cam_left.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/surveillance/cam_right.svg b/assets/themes/surveillance/cam_right.svg index 1566dd10c..1a2abb09f 100644 --- a/assets/themes/surveillance/cam_right.svg +++ b/assets/themes/surveillance/cam_right.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/surveillance/dome.svg b/assets/themes/surveillance/dome.svg index b9f2a498d..ee2f0aef5 100644 --- a/assets/themes/surveillance/dome.svg +++ b/assets/themes/surveillance/dome.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/surveillance/logo.svg b/assets/themes/surveillance/logo.svg index 6d9af345b..918f90471 100644 --- a/assets/themes/surveillance/logo.svg +++ b/assets/themes/surveillance/logo.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/toilets/toilets.svg b/assets/themes/toilets/toilets.svg index 0d9aa98ae..02ade60d5 100644 --- a/assets/themes/toilets/toilets.svg +++ b/assets/themes/toilets/toilets.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/uk_addresses/housenumber_add.svg b/assets/themes/uk_addresses/housenumber_add.svg index d2cd7f0d2..c12c0c29e 100644 --- a/assets/themes/uk_addresses/housenumber_add.svg +++ b/assets/themes/uk_addresses/housenumber_add.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/uk_addresses/housenumber_ok.svg b/assets/themes/uk_addresses/housenumber_ok.svg index 869670824..aac6f685f 100644 --- a/assets/themes/uk_addresses/housenumber_ok.svg +++ b/assets/themes/uk_addresses/housenumber_ok.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/uk_addresses/housenumber_text.svg b/assets/themes/uk_addresses/housenumber_text.svg index 029cd8a93..6559a0be4 100644 --- a/assets/themes/uk_addresses/housenumber_text.svg +++ b/assets/themes/uk_addresses/housenumber_text.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/uk_addresses/housenumber_unknown.svg b/assets/themes/uk_addresses/housenumber_unknown.svg index 6bf8e3f94..62ca19079 100644 --- a/assets/themes/uk_addresses/housenumber_unknown.svg +++ b/assets/themes/uk_addresses/housenumber_unknown.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/uk_addresses/housenumber_unknown_small.svg b/assets/themes/uk_addresses/housenumber_unknown_small.svg index 0798634e5..08f44c3cb 100644 --- a/assets/themes/uk_addresses/housenumber_unknown_small.svg +++ b/assets/themes/uk_addresses/housenumber_unknown_small.svg @@ -1,5 +1,5 @@ - + diff --git a/assets/themes/waste_basket/waste_basket.svg b/assets/themes/waste_basket/waste_basket.svg index 44a697d0a..948754640 100644 --- a/assets/themes/waste_basket/waste_basket.svg +++ b/assets/themes/waste_basket/waste_basket.svg @@ -1,5 +1,5 @@ - + diff --git a/index.manifest b/index.manifest index 8b8573088..e9ccebb12 100644 --- a/index.manifest +++ b/index.manifest @@ -58,7 +58,7 @@ "type": "image/png" }, { - "src": "./assets/svg/mapcomplete_logo.svg", + "src": "assets/svg/mapcomplete_logo.svg", "sizes": "513x513", "type": "image/svg" } diff --git a/langs/layers/fr.json b/langs/layers/fr.json index cf500c06a..f5fed3035 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -1,4 +1,29 @@ { + "address": { + "description": "Adresses", + "name": "Adresses connues d’OpenStreetMap", + "tagRenderings": { + "fixme": { + "question": "Précisez ce qui devrait être corrigé ici" + }, + "housenumber": { + "mappings": { + "0": { + "then": "Ce bâtiment n’a pas de numéro" + } + }, + "question": "Quel est le numéro de ce bâtiment ?", + "render": "Son numéro est le {addr:housenumber}" + }, + "street": { + "question": "Dans quelle rue est située l’adresse ?", + "render": "Le nom de la voie est {addr:street}" + } + }, + "title": { + "render": "Adresse connue" + } + }, "ambulancestation": { "description": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical.", "name": "Couche des ambulances", @@ -122,10 +147,12 @@ } }, "barrier": { + "description": "Obstacles à vélo, tels que des potelets ou des barrières", + "name": "Barrières", "presets": { "0": { - "title": "Bollard", - "description": "Un potelet sur le chemin" + "description": "Un potelet sur le chemin", + "title": "Bollard" }, "1": { "description": "Barrières cyclables, ralentissant les cyclistes", @@ -153,9 +180,34 @@ }, "question": "Quel est le type de bollard (borne) ?" }, + "Cycle barrier type": { + "mappings": { + "0": { + "then": "Simple, deux barrières côte à côte " + }, + "1": { + "then": "Double, deux barrières successives" + }, + "2": { + "then": "Triple, trois barrières successives " + }, + "3": { + "then": "Poire, l’espace en hauteur est plus faible qu’au sol " + } + }, + "question": "Quel est ce type de barrière cyclable ?" + }, "MaxWidth": { - "render": "Largeur maximale: {maxwidth:physical} m", - "question": "Quelle est la largeur du passage ?" + "question": "Quelle est la largeur du passage ?", + "render": "Largeur maximale: {maxwidth:physical} m" + }, + "Overlap (cyclebarrier)": { + "question": "Quel est le chevauchement des barrières ?", + "render": "Chevauchement : {overlap} m" + }, + "Space between barrier (cyclebarrier)": { + "question": "Combien d’espace sépare deux barrières successives ?", + "render": "Espace entre deux barrières successives : {width:separation} m" }, "Width of opening (cyclebarrier)": { "render": "Largeur de l'ouverture : {width:opening} m" @@ -169,31 +221,6 @@ "then": "Un cycliste ne peut pas franchir ceci." } } - }, - "Cycle barrier type": { - "mappings": { - "0": { - "then": "Simple, deux barrières côte à côte " - }, - "2": { - "then": "Triple, trois barrières successives " - }, - "3": { - "then": "Poire, l’espace en hauteur est plus faible qu’au sol " - }, - "1": { - "then": "Double, deux barrières successives" - } - }, - "question": "Quel est ce type de barrière cyclable ?" - }, - "Overlap (cyclebarrier)": { - "question": "Quel est le chevauchement des barrières ?", - "render": "Chevauchement : {overlap} m" - }, - "Space between barrier (cyclebarrier)": { - "question": "Combien d’espace sépare deux barrières successives ?", - "render": "Espace entre deux barrières successives : {width:separation} m" } }, "title": { @@ -206,9 +233,7 @@ } }, "render": "Barrière" - }, - "description": "Obstacles à vélo, tels que des potelets ou des barrières", - "name": "Barrières" + } }, "bench": { "name": "Bancs", @@ -979,6 +1004,54 @@ } } }, + "crossings": { + "description": "Traversée pour piétons et cyclistes", + "name": "Traversée", + "presets": { + "0": { + "description": "Traversée pour piétons et/ou cyclistes", + "title": "Traversée" + }, + "1": { + "description": "Feu de signalisation sur la voie", + "title": "Feu de signalisation" + } + }, + "title": { + "mappings": { + "0": { + "then": "Feu de signalisation" + }, + "1": { + "then": "Traversée avec feu de signalisation" + } + }, + "render": "Traversée" + } + }, + "cycleways_and_roads": { + "name": "Pistes cyclables et routes", + "title": { + "mappings": { + "0": { + "then": "Piste cyclable" + }, + "1": { + "then": "Voie partagée" + }, + "2": { + "then": "Bande cyclable" + }, + "3": { + "then": "Piste cyclable séparée de la route" + }, + "4": { + "then": "Vélorue" + } + }, + "render": "Pistes cyclables" + } + }, "defibrillator": { "name": "Défibrillateurs", "presets": { @@ -2168,6 +2241,12 @@ "render": "Toilettes" } }, + "trail": { + "name": "Sentiers", + "title": { + "render": "Sentier" + } + }, "tree_node": { "name": "Arbre", "presets": { @@ -2311,57 +2390,6 @@ "render": "Point de vue" } }, - "cycleways_and_roads": { - "name": "Pistes cyclables et routes", - "title": { - "mappings": { - "3": { - "then": "Piste cyclable séparée de la route" - }, - "2": { - "then": "Bande cyclable" - }, - "4": { - "then": "Vélorue" - }, - "0": { - "then": "Piste cyclable" - }, - "1": { - "then": "Voie partagée" - } - }, - "render": "Pistes cyclables" - } - }, - "watermill": { - "name": "Moulin à eau" - }, - "crossings": { - "presets": { - "0": { - "description": "Traversée pour piétons et/ou cyclistes", - "title": "Traversée" - }, - "1": { - "description": "Feu de signalisation sur la voie", - "title": "Feu de signalisation" - } - }, - "description": "Traversée pour piétons et cyclistes", - "title": { - "mappings": { - "0": { - "then": "Feu de signalisation" - }, - "1": { - "then": "Traversée avec feu de signalisation" - } - }, - "render": "Traversée" - }, - "name": "Traversée" - }, "visitor_information_centre": { "title": { "mappings": { @@ -2372,35 +2400,7 @@ "render": "{name}" } }, - "address": { - "description": "Adresses", - "name": "Adresses connues d’OpenStreetMap", - "tagRenderings": { - "fixme": { - "question": "Précisez ce qui devrait être corrigé ici" - }, - "housenumber": { - "mappings": { - "0": { - "then": "Ce bâtiment n’a pas de numéro" - } - }, - "question": "Quel est le numéro de ce bâtiment ?", - "render": "Son numéro est le {addr:housenumber}" - }, - "street": { - "question": "Dans quelle rue est située l’adresse ?", - "render": "Le nom de la voie est {addr:street}" - } - }, - "title": { - "render": "Adresse connue" - } - }, - "trail": { - "name": "Sentiers", - "title": { - "render": "Sentier" - } + "watermill": { + "name": "Moulin à eau" } -} +} \ No newline at end of file diff --git a/langs/shared-questions/fr.json b/langs/shared-questions/fr.json index a75cde800..aeb372cb3 100644 --- a/langs/shared-questions/fr.json +++ b/langs/shared-questions/fr.json @@ -61,17 +61,17 @@ }, "service:electricity": { "mappings": { + "0": { + "then": "Il y a suffisamment de prises disponibles pour les client·e·s en intérieur souhaitant recharger leurs appareils" + }, + "1": { + "then": "Il y a peu de prises disponibles pour les client·e·s en intérieur souhaitant recharger leurs appareils" + }, "2": { "then": "Il n'y a pas de prises disponibles à l'intérieur pour les clients, mais la recharge est peut-être possible sur demande auprès des employés" }, "3": { "then": "Il n'y a pas de prises secteur disponibles pour les clients assis à l'intérieur" - }, - "1": { - "then": "Il y a peu de prises disponibles pour les client·e·s en intérieur souhaitant recharger leurs appareils" - }, - "0": { - "then": "Il y a suffisamment de prises disponibles pour les client·e·s en intérieur souhaitant recharger leurs appareils" } }, "question": "Des prises sont elles à disposition des client·e·s en intérieur ?" @@ -113,4 +113,4 @@ "question": "Quel est l’élément Wikipédia correspondant ?" } } -} +} \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index 6f38dcca4..809b996c0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -55,6 +55,7 @@ cd dist echo -e "Fixing social images..." for file in $(ls *.html) do - sed -i 's!!!' $file - sed -i 's!!!' $file + echo "Hi!" + # sed -i 's!!!' $file + # sed -i 's!!!' $file done \ No newline at end of file diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts index cde836557..3922e2442 100644 --- a/scripts/generateLayouts.ts +++ b/scripts/generateLayouts.ts @@ -114,8 +114,8 @@ async function createLandingPage(layout: LayoutConfig, manifest) { Locale.language.setData(layout.language[0]); - const ogTitle = Translations.WT(layout.title).txt; - const ogDescr = Translations.WT(layout.shortDescription ?? "Easily add and edit geodata with OpenStreetMap").txt; + const ogTitle = Translations.WT(layout.title).txt.replace(/"/g, '\\"'); + const ogDescr = Translations.WT(layout.shortDescription ?? "Easily add and edit geodata with OpenStreetMap").txt.replace(/"/g, '\\"'); const ogImage = layout.socialImage; let customCss = ""; @@ -130,9 +130,15 @@ async function createLandingPage(layout: LayoutConfig, manifest) { } const og = ` - + - ` + + + + + + + ` let icon = layout.icon; if (icon.startsWith("`, og, customCss, - ``, ``, ...apple_icons ].join("\n") @@ -217,11 +222,12 @@ for (const i in all) { } createManifest(new LayoutConfig({ - icon: "./assets/svg/mapcomplete_logo.svg", + icon: "assets/svg/mapcomplete_logo.svg", id: "index", language: "en", layers: [], maintainer: "Pieter Vander Vennet", + socialImage: "assets/SocialImage.png", startLat: 0, startLon: 0, startZoom: 0, diff --git a/scripts/postal_code_tools/prepPostalCodesHulls.ts b/scripts/postal_code_tools/prepPostalCodesHulls.ts index c1c81006a..749123ad5 100644 --- a/scripts/postal_code_tools/prepPostalCodesHulls.ts +++ b/scripts/postal_code_tools/prepPostalCodesHulls.ts @@ -1,6 +1,6 @@ import * as fs from "fs"; -import ScriptUtils from "../ScriptUtils"; import {writeFileSync} from "fs"; +import ScriptUtils from "../ScriptUtils"; function handleFile(file: string, postalCode: number) { diff --git a/test/CreateNoteImportLayer.spec.ts b/test/CreateNoteImportLayer.spec.ts index 0d98811e6..4a35df7f2 100644 --- a/test/CreateNoteImportLayer.spec.ts +++ b/test/CreateNoteImportLayer.spec.ts @@ -5,7 +5,6 @@ import {DesugaringContext, PrepareLayer} from "../Models/ThemeConfig/Conversion/ import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson"; import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson"; import LayerConfig from "../Models/ThemeConfig/LayerConfig"; -import * as fs from "fs"; export default class CreateNoteImportLayerSpec extends T { diff --git a/test/LegacyThemeLoader.spec.ts b/test/LegacyThemeLoader.spec.ts index 31b746939..f29e9c6e1 100644 --- a/test/LegacyThemeLoader.spec.ts +++ b/test/LegacyThemeLoader.spec.ts @@ -19,6 +19,7 @@ export default class LegacyThemeLoaderSpec extends T { "language": [ "en" ], + socialImage: "img.jpg", "version": "2021-10-02", "startLat": 51.1599, "startLon": 3.34750, diff --git a/test/ReplaceGeometry.spec.ts b/test/ReplaceGeometry.spec.ts index a6e552437..b33442cc7 100644 --- a/test/ReplaceGeometry.spec.ts +++ b/test/ReplaceGeometry.spec.ts @@ -19,6 +19,7 @@ export default class ReplaceGeometrySpec extends T { "nl", "en" ], + socialImage: "img.jpg", "version": "0", "startLat": 51.0249, "startLon": 4.026489,