diff --git a/Docs/Misc/gen.sh b/Docs/Misc/gen.sh new file mode 100755 index 0000000000..8304eee245 --- /dev/null +++ b/Docs/Misc/gen.sh @@ -0,0 +1,2 @@ + +dot -Tps geolocation_button.gv -Tsvg -O diff --git a/Docs/Misc/geolocation_button.gv b/Docs/Misc/geolocation_button.gv new file mode 100644 index 0000000000..3881519e42 --- /dev/null +++ b/Docs/Misc/geolocation_button.gv @@ -0,0 +1,22 @@ +digraph G { + init [shape=box] + denied + init -> denied [label="geolocation permanently denied"] + init -> getting_location [label="previously granted flag set"] + init -> idle [label="previously granted flag unset"] + idle + idle -> request_permission [label="on click"] + request_permission + request_permission -> getting_location [label="granted (sets flag)"] + request_permission -> idle [label="not granted"] + request_permission -> denied [label="permanently denied"] + getting_location + location_found + getting_location -> location_found [label="location found"] + location_found -> open_lock [label="on click (zooms to location)"] + open_lock + open_lock -> location_found [label="after 3 sec"] + closed_lock + open_lock -> closed_lock [label="on click (locks zoom to location)"] + closed_lock -> location_found [label="on click"] +} diff --git a/Docs/Misc/geolocation_button.gv.svg b/Docs/Misc/geolocation_button.gv.svg new file mode 100644 index 0000000000..6dbf788489 --- /dev/null +++ b/Docs/Misc/geolocation_button.gv.svg @@ -0,0 +1,145 @@ + + + + + + +G + + + +init + +init + + + +denied + +denied + + + +init->denied + + +geolocation permanently denied + + + +getting_location + +getting_location + + + +init->getting_location + + +previously granted flag set + + + +idle + +idle + + + +init->idle + + +previously granted flag unset + + + +location_found + +location_found + + + +getting_location->location_found + + +location found + + + +request_permission + +request_permission + + + +idle->request_permission + + +on click + + + +request_permission->denied + + +permanently denied + + + +request_permission->getting_location + + +granted (sets flag) + + + +request_permission->idle + + +not granted + + + +open_lock + +open_lock + + + +location_found->open_lock + + +on click (zooms to location) + + + +open_lock->location_found + + +after 3 sec + + + +closed_lock + +closed_lock + + + +open_lock->closed_lock + + +on click (locks zoom to location) + + + +closed_lock->location_found + + +on click + + + diff --git a/Logic/Actors/AvailableBaseLayers.ts b/Logic/Actors/AvailableBaseLayers.ts index ce77e46d7d..89a5435e6a 100644 --- a/Logic/Actors/AvailableBaseLayers.ts +++ b/Logic/Actors/AvailableBaseLayers.ts @@ -23,11 +23,11 @@ export default class AvailableBaseLayers { private static implementation: AvailableBaseLayersObj static AvailableLayersAt(location: UIEventSource): UIEventSource { - return AvailableBaseLayers.implementation.AvailableLayersAt(location); + return AvailableBaseLayers.implementation?.AvailableLayersAt(location) ?? new UIEventSource([]); } static SelectBestLayerAccordingTo(location: UIEventSource, preferedCategory: UIEventSource): UIEventSource { - return AvailableBaseLayers.implementation.SelectBestLayerAccordingTo(location, preferedCategory); + return AvailableBaseLayers.implementation?.SelectBestLayerAccordingTo(location, preferedCategory) ?? new UIEventSource(undefined); } diff --git a/Logic/Actors/AvailableBaseLayersImplementation.ts b/Logic/Actors/AvailableBaseLayersImplementation.ts index 5d7116381a..09f5cfe42a 100644 --- a/Logic/Actors/AvailableBaseLayersImplementation.ts +++ b/Logic/Actors/AvailableBaseLayersImplementation.ts @@ -175,7 +175,7 @@ export default class AvailableBaseLayersImplementation implements AvailableBaseL // Note: if layer.geometry is null, there is global coverage for this layer layers.push({ id: props.id, - max_zoom: props.max_zoom ?? 25, + max_zoom: props.max_zoom ?? 19, min_zoom: props.min_zoom ?? 1, name: props.name, layer: leafletLayer, diff --git a/Logic/Actors/BackgroundLayerResetter.ts b/Logic/Actors/BackgroundLayerResetter.ts index d193d81329..60666c53d6 100644 --- a/Logic/Actors/BackgroundLayerResetter.ts +++ b/Logic/Actors/BackgroundLayerResetter.ts @@ -2,6 +2,7 @@ import {UIEventSource} from "../UIEventSource"; import BaseLayer from "../../Models/BaseLayer"; import AvailableBaseLayers from "./AvailableBaseLayers"; import Loc from "../../Models/Loc"; +import {Utils} from "../../Utils"; /** * Sets the current background layer to a layer that is actually available @@ -12,6 +13,11 @@ export default class BackgroundLayerResetter { location: UIEventSource, availableLayers: UIEventSource, defaultLayerId: string = undefined) { + + if(Utils.runningFromConsole){ + return + } + defaultLayerId = defaultLayerId ?? AvailableBaseLayers.osmCarto.id; // Change the baselayer back to OSM if we go out of the current range of the layer diff --git a/Logic/Actors/OverpassFeatureSource.ts b/Logic/Actors/OverpassFeatureSource.ts index 5062133b68..49c605137f 100644 --- a/Logic/Actors/OverpassFeatureSource.ts +++ b/Logic/Actors/OverpassFeatureSource.ts @@ -29,7 +29,7 @@ export default class OverpassFeatureSource implements FeatureSource { private readonly retries: UIEventSource = new UIEventSource(0); - + private readonly state: { readonly locationControl: UIEventSource, readonly layoutToUse: LayoutConfig, @@ -39,6 +39,7 @@ export default class OverpassFeatureSource implements FeatureSource { } private readonly _isActive: UIEventSource; private readonly onBboxLoaded: (bbox: BBox, date: Date, layers: LayerConfig[], zoomlevel: number) => void; + constructor( state: { readonly locationControl: UIEventSource, @@ -90,7 +91,7 @@ export default class OverpassFeatureSource implements FeatureSource { } const self = this; this.updateAsync(paddedZoomLevel).then(bboxDate => { - if(bboxDate === undefined || self.onBboxLoaded === undefined){ + if (bboxDate === undefined || self.onBboxLoaded === undefined) { return; } const [bbox, date, layers] = bboxDate @@ -109,41 +110,43 @@ export default class OverpassFeatureSource implements FeatureSource { return undefined; } - const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(padToZoomLevel); - - if (bounds === undefined) { - return undefined; - } - const self = this; - - - const layersToDownload = [] - for (const layer of this.state.layoutToUse.layers) { - - if (typeof (layer) === "string") { - throw "A layer was not expanded!" - } - if(this.state.locationControl.data.zoom < layer.minzoom){ - continue; - } - if (layer.doNotDownload) { - continue; - } - if (layer.source.geojsonSource !== undefined) { - // Not our responsibility to download this layer! - continue; - } - layersToDownload.push(layer) - } - let data: any = undefined let date: Date = undefined - const overpassUrls = self.state.overpassUrl.data let lastUsed = 0; + + + const layersToDownload = [] + for (const layer of this.state.layoutToUse.layers) { + + if (typeof (layer) === "string") { + throw "A layer was not expanded!" + } + if (this.state.locationControl.data.zoom < layer.minzoom) { + continue; + } + if (layer.doNotDownload) { + continue; + } + if (layer.source.geojsonSource !== undefined) { + // Not our responsibility to download this layer! + continue; + } + layersToDownload.push(layer) + } + + const self = this; + const overpassUrls = self.state.overpassUrl.data + let bounds : BBox do { try { - + + bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(padToZoomLevel); + + if (bounds === undefined) { + return undefined; + } + const overpass = this.GetFilter(overpassUrls[lastUsed], layersToDownload); if (overpass === undefined) { @@ -175,16 +178,21 @@ export default class OverpassFeatureSource implements FeatureSource { } } } - } while (data === undefined); + } while (data === undefined && this._isActive.data); - self.retries.setData(0); + try { + if(data === undefined){ + return undefined + } data.features.forEach(feature => SimpleMetaTagger.objectMetaInfo.applyMetaTagsOnFeature(feature, date, undefined)); self.features.setData(data.features.map(f => ({feature: f, freshness: date}))); return [bounds, date, layersToDownload]; } catch (e) { console.error("Got the overpass response, but could not process it: ", e, e.stack) + return undefined } finally { + self.retries.setData(0); self.runningQuery.setData(false); } diff --git a/Logic/Actors/PendingChangesUploader.ts b/Logic/Actors/PendingChangesUploader.ts index bd1e93fd68..675491467f 100644 --- a/Logic/Actors/PendingChangesUploader.ts +++ b/Logic/Actors/PendingChangesUploader.ts @@ -1,6 +1,7 @@ import {Changes} from "../Osm/Changes"; import Constants from "../../Models/Constants"; import {UIEventSource} from "../UIEventSource"; +import {Utils} from "../../Utils"; export default class PendingChangesUploader { @@ -30,6 +31,10 @@ export default class PendingChangesUploader { } }); + if(Utils.runningFromConsole){ + return; + } + document.addEventListener('mouseout', e => { // @ts-ignore if (!e.toElement && !e.relatedTarget) { diff --git a/Logic/Actors/SelectedElementTagsUpdater.ts b/Logic/Actors/SelectedElementTagsUpdater.ts index 35d725c313..765c9ee19d 100644 --- a/Logic/Actors/SelectedElementTagsUpdater.ts +++ b/Logic/Actors/SelectedElementTagsUpdater.ts @@ -9,6 +9,13 @@ import {OsmConnection} from "../Osm/OsmConnection"; export default class SelectedElementTagsUpdater { + private static readonly metatags = new Set(["timestamp", + "version", + "changeset", + "user", + "uid", + "id"] ) + constructor(state: { selectedElement: UIEventSource, allElements: ElementStorage, @@ -18,15 +25,15 @@ export default class SelectedElementTagsUpdater { state.osmConnection.isLoggedIn.addCallbackAndRun(isLoggedIn => { - if(isLoggedIn){ + if (isLoggedIn) { SelectedElementTagsUpdater.installCallback(state) return true; } }) } - - private static installCallback(state: { + + public static installCallback(state: { selectedElement: UIEventSource, allElements: ElementStorage, changes: Changes, @@ -36,80 +43,99 @@ export default class SelectedElementTagsUpdater { state.selectedElement.addCallbackAndRunD(s => { let id = s.properties?.id - + const backendUrl = state.osmConnection._oauth_config.url - if(id.startsWith(backendUrl)){ + if (id.startsWith(backendUrl)) { id = id.substring(backendUrl.length) } - - if(!(id.startsWith("way") || id.startsWith("node") || id.startsWith("relation"))){ + + if (!(id.startsWith("way") || id.startsWith("node") || id.startsWith("relation"))) { // This object is _not_ from OSM, so we skip it! return; } - - if(id.indexOf("-") >= 0){ + + if (id.indexOf("-") >= 0) { // This is a new object return; } - - OsmObject.DownloadPropertiesOf(id).then(tags => { - SelectedElementTagsUpdater.applyUpdate(state, tags, id) - }).catch(e => { - console.error("Could not update tags of ", id, "due to", e) + OsmObject.DownloadPropertiesOf(id).then(latestTags => { + SelectedElementTagsUpdater.applyUpdate(state, latestTags, id) }) + }); } - private static applyUpdate(state: { - selectedElement: UIEventSource, - allElements: ElementStorage, - changes: Changes, - osmConnection: OsmConnection - }, latestTags: any, id: string + public static applyUpdate(state: { + selectedElement: UIEventSource, + allElements: ElementStorage, + changes: Changes, + osmConnection: OsmConnection + }, latestTags: any, id: string ) { - const pendingChanges = state.changes.pendingChanges.data - .filter(change => change.type +"/"+ change.id === id) - .filter(change => change.tags !== undefined); - - for (const pendingChange of pendingChanges) { - const tagChanges = pendingChange.tags; - for (const tagChange of tagChanges) { - const key = tagChange.k - const v = tagChange.v - if (v === undefined || v === "") { - delete latestTags[key] - } else { - latestTags[key] = v + try { + + const pendingChanges = state.changes.pendingChanges.data + .filter(change => change.type + "/" + change.id === id) + .filter(change => change.tags !== undefined); + + for (const pendingChange of pendingChanges) { + const tagChanges = pendingChange.tags; + for (const tagChange of tagChanges) { + const key = tagChange.k + const v = tagChange.v + if (v === undefined || v === "") { + delete latestTags[key] + } else { + latestTags[key] = v + } } } - } - // With the changes applied, we merge them onto the upstream object - let somethingChanged = false; - const currentTagsSource = state.allElements.getEventSourceById(id); - const currentTags = currentTagsSource.data - for (const key in latestTags) { - let osmValue = latestTags[key] - - if(typeof osmValue === "number"){ - osmValue = ""+osmValue - } - - const localValue = currentTags[key] - if (localValue !== osmValue) { - console.log("Local value for ", key ,":", localValue, "upstream", osmValue) - somethingChanged = true; - currentTags[key] = osmValue - } - } - if (somethingChanged) { - console.log("Detected upstream changes to the object when opening it, updating...") - currentTagsSource.ping() - }else{ - console.debug("Fetched latest tags for ", id, "but detected no changes") - } + // With the changes applied, we merge them onto the upstream object + let somethingChanged = false; + const currentTagsSource = state.allElements.getEventSourceById(id); + const currentTags = currentTagsSource.data + for (const key in latestTags) { + let osmValue = latestTags[key] + if (typeof osmValue === "number") { + osmValue = "" + osmValue + } + + const localValue = currentTags[key] + if (localValue !== osmValue) { + console.log("Local value for ", key, ":", localValue, "upstream", osmValue) + somethingChanged = true; + currentTags[key] = osmValue + } + } + + for (const currentKey in currentTags) { + if (currentKey.startsWith("_")) { + continue + } + if(this.metatags.has(currentKey)){ + continue + } + if (currentKey in latestTags) { + continue + } + console.log("Removing key as deleted upstream", currentKey) + delete currentTags[currentKey] + somethingChanged = true + } + + + if (somethingChanged) { + console.log("Detected upstream changes to the object when opening it, updating...") + currentTagsSource.ping() + } else { + console.debug("Fetched latest tags for ", id, "but detected no changes") + } + } catch (e) { + console.error("Updating the tags of selected element ", id, "failed due to", e) + } } diff --git a/Logic/Actors/SelectedFeatureHandler.ts b/Logic/Actors/SelectedFeatureHandler.ts index 73e69d72cd..7d431c7af5 100644 --- a/Logic/Actors/SelectedFeatureHandler.ts +++ b/Logic/Actors/SelectedFeatureHandler.ts @@ -3,15 +3,20 @@ import {OsmObject} from "../Osm/OsmObject"; import Loc from "../../Models/Loc"; import {ElementStorage} from "../ElementStorage"; import FeaturePipeline from "../FeatureSource/FeaturePipeline"; +import {GeoOperations} from "../GeoOperations"; +import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; /** * Makes sure the hash shows the selected element and vice-versa. */ export default class SelectedFeatureHandler { - private static readonly _no_trigger_on = new Set(["welcome", "copyright", "layers", "new", "", undefined]) - hash: UIEventSource; + private static readonly _no_trigger_on = new Set(["welcome", "copyright", "layers", "new", "filter","", undefined]) + private readonly hash: UIEventSource; private readonly state: { - selectedElement: UIEventSource + selectedElement: UIEventSource, + allElements: ElementStorage, + locationControl: UIEventSource, + layoutToUse: LayoutConfig } constructor( @@ -19,7 +24,9 @@ export default class SelectedFeatureHandler { state: { selectedElement: UIEventSource, allElements: ElementStorage, - featurePipeline: FeaturePipeline + featurePipeline: FeaturePipeline, + locationControl: UIEventSource, + layoutToUse: LayoutConfig } ) { this.hash = hash; @@ -27,30 +34,9 @@ export default class SelectedFeatureHandler { // If the hash changes, set the selected element correctly - function setSelectedElementFromHash(h){ - if (h === undefined || h === "") { - // Hash has been cleared - we clear the selected element - state.selectedElement.setData(undefined); - }else{ - // we search the element to select - const feature = state.allElements.ContainingFeatures.get(h) - if(feature === undefined){ - return; - } - const currentlySeleced = state.selectedElement.data - if(currentlySeleced === undefined){ - state.selectedElement.setData(feature) - return; - } - if(currentlySeleced.properties?.id === feature.properties.id){ - // We already have the right feature - return; - } - state.selectedElement.setData(feature) - } - } - hash.addCallback(setSelectedElementFromHash) + const self = this; + hash.addCallback(() => self.setSelectedElementFromHash()) // IF the selected element changes, set the hash correctly @@ -66,41 +52,107 @@ export default class SelectedFeatureHandler { hash.setData(h) } }) - - state.featurePipeline.newDataLoadedSignal.addCallbackAndRunD(_ => { + + state.featurePipeline?.newDataLoadedSignal?.addCallbackAndRunD(_ => { // New data was loaded. In initial startup, the hash might be set (via the URL) but might not be selected yet - if(hash.data === undefined || SelectedFeatureHandler._no_trigger_on.has(hash.data)){ + if (hash.data === undefined || SelectedFeatureHandler._no_trigger_on.has(hash.data)) { // This is an invalid hash anyway return; } - if(state.selectedElement.data !== undefined){ + if (state.selectedElement.data !== undefined) { // We already have something selected return; } - setSelectedElementFromHash(hash.data) + self.setSelectedElementFromHash() + }) + + + this.initialLoad() + + } + + + /** + * On startup: check if the hash is loaded and eventually zoom to it + * @private + */ + private initialLoad() { + const hash = this.hash.data + if (hash === undefined || hash === "" || hash.indexOf("-") >= 0) { + return; + } + if (SelectedFeatureHandler._no_trigger_on.has(hash)) { + return; + } + + if (!(hash.startsWith("node") || hash.startsWith("way") || hash.startsWith("relation"))) { + return; + } + + + OsmObject.DownloadObjectAsync(hash).then(obj => { + + try { + + console.log("Downloaded selected object from OSM-API for initial load: ", hash) + const geojson = obj.asGeoJson() + this.state.allElements.addOrGetElement(geojson) + this.state.selectedElement.setData(geojson) + this.zoomToSelectedFeature() + } catch (e) { + console.error(e) + } + }) } - // If a feature is selected via the hash, zoom there - public zoomToSelectedFeature(location: UIEventSource) { - const hash = this.hash.data; - if (hash === undefined || SelectedFeatureHandler._no_trigger_on.has(hash)) { - return; // No valid feature selected - } - // We should have a valid osm-ID and zoom to it... But we wrap it in try-catch to be sure - try { - - OsmObject.DownloadObject(hash).addCallbackAndRunD(element => { - const centerpoint = element.centerpoint(); - console.log("Zooming to location for select point: ", centerpoint) - location.data.lat = centerpoint[0] - location.data.lon = centerpoint[1] - location.ping(); - }) - } catch (e) { - console.error("Could not download OSM-object with id", hash, " - probably a weird hash") + private setSelectedElementFromHash() { + const state = this.state + const h = this.hash.data + if (h === undefined || h === "") { + // Hash has been cleared - we clear the selected element + state.selectedElement.setData(undefined); + } else { + // we search the element to select + const feature = state.allElements.ContainingFeatures.get(h) + if (feature === undefined) { + return; + } + const currentlySeleced = state.selectedElement.data + if (currentlySeleced === undefined) { + state.selectedElement.setData(feature) + return; + } + if (currentlySeleced.properties?.id === feature.properties.id) { + // We already have the right feature + return; + } + state.selectedElement.setData(feature) } } + // If a feature is selected via the hash, zoom there + private zoomToSelectedFeature() { + + const selected = this.state.selectedElement.data + if (selected === undefined) { + return + } + + const centerpoint = GeoOperations.centerpointCoordinates(selected) + const location = this.state.locationControl; + location.data.lon = centerpoint[0] + location.data.lat = centerpoint[1] + + const minZoom = Math.max(14, ...(this.state.layoutToUse?.layers?.map(l => l.minzoomVisible) ?? [])) + if (location.data.zoom < minZoom) { + location.data.zoom = minZoom + } + + location.ping(); + + + } + } \ No newline at end of file diff --git a/Logic/Actors/TitleHandler.ts b/Logic/Actors/TitleHandler.ts index 91ec89b0c8..d3d2f78fb2 100644 --- a/Logic/Actors/TitleHandler.ts +++ b/Logic/Actors/TitleHandler.ts @@ -5,6 +5,7 @@ import TagRenderingAnswer from "../../UI/Popup/TagRenderingAnswer"; import Combine from "../../UI/Base/Combine"; import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import {ElementStorage} from "../ElementStorage"; +import {Utils} from "../../Utils"; export default class TitleHandler { constructor(state : { @@ -38,6 +39,9 @@ export default class TitleHandler { currentTitle.addCallbackAndRunD(title => { + if(Utils.runningFromConsole){ + return + } document.title = title }) } diff --git a/Logic/ExtraFunction.ts b/Logic/ExtraFunction.ts index a022eb11a9..8f0265bb14 100644 --- a/Logic/ExtraFunction.ts +++ b/Logic/ExtraFunction.ts @@ -5,8 +5,6 @@ import State from "../State"; import BaseUIElement from "../UI/BaseUIElement"; import List from "../UI/Base/List"; import Title from "../UI/Base/Title"; -import {UIEventSourceTools} from "./UIEventSource"; -import AspectedRouting from "./Osm/aspectedRouting"; import {BBox} from "./BBox"; export interface ExtraFuncParams { diff --git a/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts b/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts index 092c1a4023..83a269b89e 100644 --- a/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts +++ b/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts @@ -4,13 +4,14 @@ * Technically, more an Actor then a featuresource, but it fits more neatly this ay */ import {FeatureSourceForLayer} from "../FeatureSource"; +import {Tiles} from "../../../Models/TileRange"; export default class SaveTileToLocalStorageActor { public static readonly storageKey: string = "cached-features"; public static readonly formatVersion: string = "2" constructor(source: FeatureSourceForLayer, tileIndex: number) { - + source.features.addCallbackAndRunD(features => { const key = `${SaveTileToLocalStorageActor.storageKey}-${source.layer.layerDef.id}-${tileIndex}` const now = new Date() @@ -28,13 +29,30 @@ export default class SaveTileToLocalStorageActor { } - public static MarkVisited(layerId: string, tileId: number, freshness: Date){ + public static MarkVisited(layerId: string, tileId: number, freshness: Date) { const key = `${SaveTileToLocalStorageActor.storageKey}-${layerId}-${tileId}` - try{ + try { localStorage.setItem(key + "-time", JSON.stringify(freshness.getTime())) localStorage.setItem(key + "-format", SaveTileToLocalStorageActor.formatVersion) - }catch(e){ + } catch (e) { console.error("Could not mark tile ", key, "as visited") } } + + public static poison(layers: string[], lon: number, lat: number) { + for (let z = 0; z < 25; z++) { + + const {x, y} = Tiles.embedded_tile(lat, lon, z) + const tileId = Tiles.tile_index(z, x, y) + + for (const layerId of layers) { + + const key = `${SaveTileToLocalStorageActor.storageKey}-${layerId}-${tileId}` + localStorage.removeItem(key + "-time"); + localStorage.removeItem(key + "-format") + localStorage.removeItem(key) + } + } + + } } \ No newline at end of file diff --git a/Logic/FeatureSource/FeaturePipeline.ts b/Logic/FeatureSource/FeaturePipeline.ts index e8b77bb77c..b5ea30bd3a 100644 --- a/Logic/FeatureSource/FeaturePipeline.ts +++ b/Logic/FeatureSource/FeaturePipeline.ts @@ -30,14 +30,14 @@ import TileFreshnessCalculator from "./TileFreshnessCalculator"; /** * The features pipeline ties together a myriad of various datasources: - * + * * - The Overpass-API * - The OSM-API * - Third-party geojson files, either sliced or directly. - * + * * In order to truly understand this class, please have a look at the following diagram: https://cdn-images-1.medium.com/fit/c/800/618/1*qTK1iCtyJUr4zOyw4IFD7A.jpeg - * - * + * + * */ export default class FeaturePipeline { @@ -68,7 +68,7 @@ export default class FeaturePipeline { private readonly freshnesses = new Map(); - private readonly oldestAllowedDate: Date = new Date(new Date().getTime() - 60 * 60 * 24 * 30 * 1000); + private readonly oldestAllowedDate: Date; private readonly osmSourceZoomLevel constructor( @@ -90,10 +90,23 @@ export default class FeaturePipeline { this.state = state; const self = this + const expiryInSeconds = Math.min(...state.layoutToUse.layers.map(l => l.maxAgeOfCache)) + for (const layer of state.layoutToUse.layers) { + TiledFromLocalStorageSource.cleanCacheForLayer(layer) + } + this.oldestAllowedDate = new Date(new Date().getTime() - expiryInSeconds); this.osmSourceZoomLevel = state.osmApiTileSize.data; - // milliseconds const useOsmApi = state.locationControl.map(l => l.zoom > (state.overpassMaxZoom.data ?? 12)) this.relationTracker = new RelationsTracker() + + state.changes.allChanges.addCallbackAndRun(allChanges => { + allChanges.filter(ch => ch.id < 0 && ch.changes !== undefined) + .map(ch => ch.changes) + .filter(coor => coor["lat"] !== undefined && coor["lon"] !== undefined) + .forEach(coor => { + SaveTileToLocalStorageActor.poison(state.layoutToUse.layers.map(l => l.id), coor["lon"], coor["lat"]) + }) + }) this.sufficientlyZoomed = state.locationControl.map(location => { @@ -220,7 +233,7 @@ export default class FeaturePipeline { maxZoomLevel: state.layoutToUse.clustering.maxZoom, registerTile: (tile) => { // We save the tile data for the given layer to local storage - if(source.layer.layerDef.source.geojsonSource === undefined || source.layer.layerDef.source.isOsmCacheLayer == true){ + if (source.layer.layerDef.source.geojsonSource === undefined || source.layer.layerDef.source.isOsmCacheLayer == true) { new SaveTileToLocalStorageActor(tile, tile.tileIndex) } perLayerHierarchy.get(source.layer.layerDef.id).registerTile(new RememberingSource(tile)) @@ -257,7 +270,7 @@ export default class FeaturePipeline { this.runningQuery = updater.runningQuery.map( overpass => { console.log("FeaturePipeline: runningQuery state changed. Overpass", overpass ? "is querying," : "is idle,", - "osmFeatureSource is", osmFeatureSource.isRunning ? "is running and needs "+neededTilesFromOsm.data?.length+" tiles (already got "+ osmFeatureSource.downloadedTiles.size +" tiles )" : "is idle") + "osmFeatureSource is", osmFeatureSource.isRunning ? "is running and needs " + neededTilesFromOsm.data?.length + " tiles (already got " + osmFeatureSource.downloadedTiles.size + " tiles )" : "is idle") return overpass || osmFeatureSource.isRunning.data; }, [osmFeatureSource.isRunning] ) @@ -353,7 +366,7 @@ export default class FeaturePipeline { isActive: useOsmApi.map(b => !b && overpassIsActive.data, [overpassIsActive]), onBboxLoaded: (bbox, date, downloadedLayers, paddedToZoomLevel) => { Tiles.MapRange(bbox.containingTileRange(paddedToZoomLevel), (x, y) => { - const tileIndex = Tiles.tile_index(paddedToZoomLevel, x, y) + const tileIndex = Tiles.tile_index(paddedToZoomLevel, x, y) downloadedLayers.forEach(layer => { self.freshnesses.get(layer.id).addTileLoad(tileIndex, date) SaveTileToLocalStorageActor.MarkVisited(layer.id, tileIndex, date) @@ -412,7 +425,7 @@ export default class FeaturePipeline { } public GetFeaturesWithin(layerId: string, bbox: BBox): any[][] { - if(layerId === "*"){ + if (layerId === "*") { return this.GetAllFeaturesWithin(bbox) } const requestedHierarchy = this.perLayerHierarchy.get(layerId) diff --git a/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts b/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts index a2cd50be08..900393c1e4 100644 --- a/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts +++ b/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts @@ -5,6 +5,7 @@ import TileHierarchy from "./TileHierarchy"; import SaveTileToLocalStorageActor from "../Actors/SaveTileToLocalStorageActor"; import {Tiles} from "../../../Models/TileRange"; import {BBox} from "../../BBox"; +import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"; export default class TiledFromLocalStorageSource implements TileHierarchy { public readonly loadedTiles: Map = new Map(); @@ -16,7 +17,7 @@ export default class TiledFromLocalStorageSource implements TileHierarchy() for (const key of Object.keys(localStorage)) { - if(!(key.startsWith(prefix) && key.endsWith("-time"))){ + if (!(key.startsWith(prefix) && key.endsWith("-time"))) { continue } const index = Number(key.substring(prefix.length, key.length - "-time".length)) @@ -28,6 +29,28 @@ export default class TiledFromLocalStorageSource implements TileHierarchy= layer.maxAgeOfCache){ + const k = prefix+index; + localStorage.removeItem(k) + localStorage.removeItem(k+"-format") + localStorage.removeItem(k+"-time") + } + } + } + constructor(layer: FilteredLayer, handleFeatureSource: (src: FeatureSourceForLayer & Tiled, index: number) => void, state: { @@ -36,7 +59,7 @@ export default class TiledFromLocalStorageSource implements TileHierarchy() const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-" const knownTiles: number[] = Object.keys(localStorage) @@ -56,9 +79,9 @@ export default class TiledFromLocalStorageSource implements TileHierarchy { - if(bounds === undefined){ + if (bounds === undefined) { return; } for (const knownTile of knownTiles) { - - if(this.loadedTiles.has(knownTile)){ + + if (this.loadedTiles.has(knownTile)) { continue; } - if(this.undefinedTiles.has(knownTile)){ + if (this.undefinedTiles.has(knownTile)) { continue; } - - if(!bounds.overlapsWith(BBox.fromTileIndex(knownTile))){ + + if (!bounds.overlapsWith(BBox.fromTileIndex(knownTile))) { continue; } self.loadTile(knownTile) @@ -86,8 +109,8 @@ export default class TiledFromLocalStorageSource implements TileHierarchy provider.defaultKeyPrefixes)) private static _cache: Map> = new Map>() - public static LoadImagesFor(tags: UIEventSource, tagKey?: string): UIEventSource { + public static LoadImagesFor(tags: UIEventSource, tagKey?: string[]): UIEventSource { if (tags.data.id === undefined) { return undefined; } @@ -44,7 +46,7 @@ export default class AllImageProviders { let prefixes = imageProvider.defaultKeyPrefixes if(tagKey !== undefined){ - prefixes = [...prefixes, tagKey] + prefixes = tagKey } const singleSource = imageProvider.GetRelevantUrls(tags, { diff --git a/Logic/ImageProviders/ImgurUploader.ts b/Logic/ImageProviders/ImgurUploader.ts index b8addab5a5..10bf436098 100644 --- a/Logic/ImageProviders/ImgurUploader.ts +++ b/Logic/ImageProviders/ImgurUploader.ts @@ -27,7 +27,8 @@ export default class ImgurUploader { files, function (url) { console.log("File saved at", url); - self.success.setData([...self.success.data, url]); + self.success.data.push(url) + self.success.ping(); self._handleSuccessUrl(url); }, function () { diff --git a/Logic/ImageProviders/Mapillary.ts b/Logic/ImageProviders/Mapillary.ts index 68491a5297..07e0473d4a 100644 --- a/Logic/ImageProviders/Mapillary.ts +++ b/Logic/ImageProviders/Mapillary.ts @@ -1,11 +1,9 @@ import ImageProvider, {ProvidedImage} from "./ImageProvider"; import BaseUIElement from "../../UI/BaseUIElement"; -import {UIEventSource} from "../UIEventSource"; import Svg from "../../Svg"; import {Utils} from "../../Utils"; import {LicenseInfo} from "./LicenseInfo"; import Constants from "../../Models/Constants"; -import {fail} from "assert"; export class Mapillary extends ImageProvider { @@ -13,7 +11,7 @@ export class Mapillary extends ImageProvider { public static readonly singleton = new Mapillary(); private static readonly valuePrefix = "https://a.mapillary.com" - public static readonly valuePrefixes = [Mapillary.valuePrefix, "http://mapillary.com","https://mapillary.com"] + public static readonly valuePrefixes = [Mapillary.valuePrefix, "http://mapillary.com","https://mapillary.com","http://www.mapillary.com","https://www.mapillary.com"] private static ExtractKeyFromURL(value: string, failIfNoMath = false): { key: string, diff --git a/Logic/Osm/Actions/RelationSplitHandler.ts b/Logic/Osm/Actions/RelationSplitHandler.ts index 00c5a67069..4636743474 100644 --- a/Logic/Osm/Actions/RelationSplitHandler.ts +++ b/Logic/Osm/Actions/RelationSplitHandler.ts @@ -10,13 +10,9 @@ export interface RelationSplitInput { originalNodes: number[], allWaysNodesInOrder: number[][] } - -/** - * When a way is split and this way is part of a relation, the relation should be updated too to have the new segment if relevant. - */ -export default class RelationSplitHandler extends OsmChangeAction { - private readonly _input: RelationSplitInput; - private readonly _theme: string; +abstract class AbstractRelationSplitHandler extends OsmChangeAction { + protected readonly _input: RelationSplitInput; + protected readonly _theme: string; constructor(input: RelationSplitInput, theme: string) { super() @@ -24,35 +20,10 @@ export default class RelationSplitHandler extends OsmChangeAction { this._theme = theme; } - async CreateChangeDescriptions(changes: Changes): Promise { - return new InPlaceReplacedmentRTSH(this._input, this._theme).CreateChangeDescriptions(changes) - } - - -} - - -/** - * A simple strategy to split relations: - * -> Download the way members just before and just after the original way - * -> Make sure they are still aligned - * - * Note that the feature might appear multiple times. - */ -export class InPlaceReplacedmentRTSH extends OsmChangeAction { - private readonly _input: RelationSplitInput; - private readonly _theme: string; - - constructor(input: RelationSplitInput, theme: string) { - super(); - this._input = input; - this._theme = theme; - } - /** * Returns which node should border the member at the given index */ - private async targetNodeAt(i: number, first: boolean) { + protected async targetNodeAt(i: number, first: boolean) { const member = this._input.relation.members[i] if (member === undefined) { return undefined @@ -74,6 +45,124 @@ export class InPlaceReplacedmentRTSH extends OsmChangeAction { } return undefined; } +} + +/** + * When a way is split and this way is part of a relation, the relation should be updated too to have the new segment if relevant. + */ +export default class RelationSplitHandler extends AbstractRelationSplitHandler { + + constructor(input: RelationSplitInput, theme: string) { + super(input, theme) + } + + async CreateChangeDescriptions(changes: Changes): Promise { + if(this._input.relation.tags["type"] === "restriction"){ + // This is a turn restriction + return new TurnRestrictionRSH(this._input, this._theme).CreateChangeDescriptions(changes) + } + return new InPlaceReplacedmentRTSH(this._input, this._theme).CreateChangeDescriptions(changes) + } + + +} + +export class TurnRestrictionRSH extends AbstractRelationSplitHandler { + + constructor(input: RelationSplitInput, theme: string) { + super(input, theme); + } + + public async CreateChangeDescriptions(changes: Changes): Promise { + + const relation = this._input.relation + const members = relation.members + + const selfMembers = members.filter(m => m.type === "way" && m.ref === this._input.originalWayId) + + if(selfMembers.length > 1){ + console.warn("Detected a turn restriction where this way has multiple occurances. This is an error") + } + const selfMember = selfMembers[0] + + if(selfMember.role === "via"){ + // A via way can be replaced in place + return new InPlaceReplacedmentRTSH(this._input, this._theme).CreateChangeDescriptions(changes); + } + + + // We have to keep only the way with a common point with the rest of the relation + // Let's figure out which member is neighbouring our way + + let commonStartPoint : number = await this.targetNodeAt(members.indexOf(selfMember), true) + let commonEndPoint : number = await this.targetNodeAt(members.indexOf(selfMember), false) + + // In normal circumstances, only one of those should be defined + let commonPoint = commonStartPoint ?? commonEndPoint + + // Let's select the way to keep + const idToKeep : {id: number} = this._input.allWaysNodesInOrder.map((nodes, i) => ({nodes: nodes, id: this._input.allWayIdsInOrder[i]})) + .filter(nodesId => { + const nds = nodesId.nodes + return nds[0] == commonPoint || nds[nds.length - 1] == commonPoint + })[0] + + if(idToKeep === undefined){ + console.error("No common point found, this was a broken turn restriction!", relation.id) + return [] + } + + const originalWayId = this._input.originalWayId + if(idToKeep.id === originalWayId){ + console.log("Turn_restriction fixer: the original ID can be kept, nothing to do") + return [] + } + + const newMembers : { + ref:number, + type:"way" | "node" | "relation", + role:string + } [] = relation.members.map(m => { + if(m.type === "way" && m.ref === originalWayId){ + return { + ref: idToKeep.id, + type:"way", + role: m.role + } + } + return m + }) + + + return [ + { + type: "relation", + id: relation.id, + changes: { + members: newMembers + }, + meta: { + theme: this._theme, + changeType: "relation-fix:turn_restriction" + } + } + ]; + } + +} + +/** + * A simple strategy to split relations: + * -> Download the way members just before and just after the original way + * -> Make sure they are still aligned + * + * Note that the feature might appear multiple times. + */ +export class InPlaceReplacedmentRTSH extends AbstractRelationSplitHandler { + + constructor(input: RelationSplitInput, theme: string) { + super(input, theme); + } async CreateChangeDescriptions(changes: Changes): Promise { diff --git a/Logic/Osm/Changes.ts b/Logic/Osm/Changes.ts index 6c90cccbb3..7faa234947 100644 --- a/Logic/Osm/Changes.ts +++ b/Logic/Osm/Changes.ts @@ -97,6 +97,7 @@ export class Changes { console.log("Is already uploading... Abort") return; } + console.log("Uploading changes due to: ", flushreason) this.isUploading.setData(true) this.flushChangesAsync() @@ -287,7 +288,7 @@ export class Changes { v = undefined; } - const oldV = obj.type[k] + const oldV = obj.tags[k] if (oldV === v) { continue; } diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts index c0795aad0c..7fd1078386 100644 --- a/Logic/Osm/OsmConnection.ts +++ b/Logic/Osm/OsmConnection.ts @@ -8,7 +8,6 @@ import Svg from "../../Svg"; import Img from "../../UI/Base/Img"; import {Utils} from "../../Utils"; import {OsmObject} from "./OsmObject"; -import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import {Changes} from "./Changes"; export default class UserDetails { @@ -97,7 +96,6 @@ export class OsmConnection { self.AttemptLogin() } }); - this.isLoggedIn.addCallbackAndRunD(li => console.log("User is logged in!", li)) this._dryRun = options.dryRun; this.updateAuthObject(); diff --git a/Logic/Osm/OsmObject.ts b/Logic/Osm/OsmObject.ts index 91b4b6e89e..faf1ee79db 100644 --- a/Logic/Osm/OsmObject.ts +++ b/Logic/Osm/OsmObject.ts @@ -263,7 +263,7 @@ export abstract class OsmObject { continue; } const v = this.tags[key]; - if (v !== "") { + if (v !== "" && v !== undefined) { tags += ' \n' } } diff --git a/Logic/State/FeatureSwitchState.ts b/Logic/State/FeatureSwitchState.ts index 215c819f85..0f5df51f78 100644 --- a/Logic/State/FeatureSwitchState.ts +++ b/Logic/State/FeatureSwitchState.ts @@ -5,6 +5,7 @@ import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import {UIEventSource} from "../UIEventSource"; import {QueryParameters} from "../Web/QueryParameters"; import Constants from "../../Models/Constants"; +import {Utils} from "../../Utils"; export default class FeatureSwitchState { @@ -137,37 +138,26 @@ export default class FeatureSwitchState { let testingDefaultValue = false; - if (this.featureSwitchApiURL.data !== "osm-test" && + if (this.featureSwitchApiURL.data !== "osm-test" && !Utils.runningFromConsole && (location.hostname === "localhost" || location.hostname === "127.0.0.1")) { testingDefaultValue = true } - this.featureSwitchIsTesting = QueryParameters.GetQueryParameter( + this.featureSwitchIsTesting = QueryParameters.GetBooleanQueryParameter( "test", ""+testingDefaultValue, "If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org" - ).map( - (str) => str === "true", - [], - (b) => "" + b - ); + ) - this.featureSwitchIsDebugging = QueryParameters.GetQueryParameter( + this.featureSwitchIsDebugging = QueryParameters.GetBooleanQueryParameter( "debug", "false", "If true, shows some extra debugging help such as all the available tags on every object" - ).map( - (str) => str === "true", - [], - (b) => "" + b - ); + ) - this.featureSwitchFakeUser = QueryParameters.GetQueryParameter("fake-user", "false", + this.featureSwitchFakeUser = QueryParameters.GetBooleanQueryParameter("fake-user", "false", "If true, 'dryrun' mode is activated and a fake user account is loaded") - .map(str => str === "true", [], b => "" + b); - - this.overpassUrl = QueryParameters.GetQueryParameter("overpassUrl", diff --git a/Logic/State/MapState.ts b/Logic/State/MapState.ts index afcbb1bf21..00a05dd61c 100644 --- a/Logic/State/MapState.ts +++ b/Logic/State/MapState.ts @@ -119,7 +119,7 @@ export default class MapState extends UserRelatedState { this.overlayToggles = this.layoutToUse.tileLayerSources.filter(c => c.name !== undefined).map(c => ({ config: c, - isDisplayed: QueryParameters.GetQueryParameter("overlay-" + c.id, "" + c.defaultState, "Wether or not the overlay " + c.id + " is shown").map(str => str === "true", [], b => "" + b) + isDisplayed: QueryParameters.GetBooleanQueryParameter("overlay-" + c.id, "" + c.defaultState, "Wether or not the overlay " + c.id + " is shown") })) this.filteredLayers = this.InitializeFilteredLayers() @@ -170,17 +170,12 @@ export default class MapState extends UserRelatedState { .map(value => value === "yes", [], enabled => { return enabled ? "yes" : ""; }) - isDisplayed.addCallbackAndRun(d => console.log("IsDisplayed for layer", layer.id, "is currently", d)) } else { - isDisplayed = QueryParameters.GetQueryParameter( + isDisplayed = QueryParameters.GetBooleanQueryParameter( "layer-" + layer.id, "true", "Wether or not layer " + layer.id + " is shown" - ).map( - (str) => str !== "false", - [], - (b) => b.toString() - ); + ) } const flayer = { isDisplayed: isDisplayed, diff --git a/Logic/UIEventSource.ts b/Logic/UIEventSource.ts index 77431441f9..571c74f8e3 100644 --- a/Logic/UIEventSource.ts +++ b/Logic/UIEventSource.ts @@ -286,6 +286,9 @@ export class UIEventSource { } public stabilized(millisToStabilize): UIEventSource { + if(Utils.runningFromConsole){ + return this; + } const newSource = new UIEventSource(this.data); @@ -334,21 +337,4 @@ export class UIEventSource { } ) } -} - -export class UIEventSourceTools { - - private static readonly _download_cache = new Map>() - - public static downloadJsonCached(url: string): UIEventSource { - const cached = UIEventSourceTools._download_cache.get(url) - if (cached !== undefined) { - return cached; - } - const src = new UIEventSource(undefined) - UIEventSourceTools._download_cache.set(url, src) - Utils.downloadJson(url).then(r => src.setData(r)) - return src; - } - } \ No newline at end of file diff --git a/Logic/Web/QueryParameters.ts b/Logic/Web/QueryParameters.ts index 36ecc76803..8af95a69bd 100644 --- a/Logic/Web/QueryParameters.ts +++ b/Logic/Web/QueryParameters.ts @@ -55,6 +55,10 @@ export class QueryParameters { return source; } + public static GetBooleanQueryParameter(key: string, deflt: string, documentation?: string): UIEventSource{ + return QueryParameters.GetQueryParameter(key, deflt, documentation).map(str => str === "true", [], b => ""+b) + } + public static GenerateQueryParameterDocs(): string { const docs = [QueryParameters.QueryParamDocsIntro]; for (const key in QueryParameters.documentation) { diff --git a/Models/Constants.ts b/Models/Constants.ts index b8e2df07d6..6405a34b6a 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import {Utils} from "../Utils"; export default class Constants { - public static vNumber = "0.11.0-rc-1"; + public static vNumber = "0.11.2"; public static ImgurApiKey = '7070e7167f0a25a' public static readonly mapillary_client_token_v3 = 'TXhLaWthQ1d4RUg0czVxaTVoRjFJZzowNDczNjUzNmIyNTQyYzI2' public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" diff --git a/Models/ThemeConfig/Json/LayerConfigJson.ts b/Models/ThemeConfig/Json/LayerConfigJson.ts index 69d1b972ed..e13734c8a0 100644 --- a/Models/ThemeConfig/Json/LayerConfigJson.ts +++ b/Models/ThemeConfig/Json/LayerConfigJson.ts @@ -60,8 +60,13 @@ export interface LayerConfigJson { * NOTE: the previous format was 'overpassTags: AndOrTagConfigJson | string', which is interpreted as a shorthand for source: {osmTags: "key=value"} * While still supported, this is considered deprecated */ - source: { osmTags: AndOrTagConfigJson | string, overpassScript?: string } | - { osmTags: AndOrTagConfigJson | string, geoJson: string, geoJsonZoomLevel?: number, isOsmCache?: boolean } + source: ({ osmTags: AndOrTagConfigJson | string, overpassScript?: string } | + { osmTags: AndOrTagConfigJson | string, geoJson: string, geoJsonZoomLevel?: number, isOsmCache?: boolean }) & ({ + /** + * The maximum amount of seconds that a tile is allowed to linger in the cache + */ + maxCacheAge?: number + }) /** * diff --git a/Models/ThemeConfig/Json/LayoutConfigJson.ts b/Models/ThemeConfig/Json/LayoutConfigJson.ts index be7c3ccf53..2b355d5453 100644 --- a/Models/ThemeConfig/Json/LayoutConfigJson.ts +++ b/Models/ThemeConfig/Json/LayoutConfigJson.ts @@ -174,26 +174,6 @@ export interface LayoutConfigJson { */ tileLayerSources?: TilesourceConfigJson[] - /** - * The number of seconds that a feature is allowed to stay in the cache. - * The caching flow is as following: - * - * 1. The application is opened the first time - * 2. An overpass query is run - * 3. The result is saved to local storage - * - * On the next opening: - * - * 1. The application is opened - * 2. Data is loaded from cache and displayed - * 3. An overpass query is run - * 4. All data (both from overpass ánd local storage) are saved again to local storage (except when to old) - * - * Default value: 60 days - */ - cacheTimout?: number; - - /** * The layers to display. * diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts index bf365ee6ab..ba6ca94b8d 100644 --- a/Models/ThemeConfig/LayerConfig.ts +++ b/Models/ThemeConfig/LayerConfig.ts @@ -52,6 +52,10 @@ export default class LayerConfig { public readonly deletion: DeleteConfig | null; public readonly allowMove: MoveConfig | null public readonly allowSplit: boolean + /** + * In seconds + */ + public readonly maxAgeOfCache: number presets: PresetConfig[]; @@ -87,7 +91,9 @@ export default class LayerConfig { // @ts-ignore legacy = TagUtils.Tag(json["overpassTags"], context + ".overpasstags"); } + if (json.source !== undefined) { + this.maxAgeOfCache = json.source.maxCacheAge ?? 24 * 60 * 60 * 30 if (legacy !== undefined) { throw ( context + @@ -126,7 +132,7 @@ export default class LayerConfig { osmTags: legacy, }); } - + this.calculatedTags = undefined; if (json.calculatedTags !== undefined) { if (!official) { diff --git a/Models/ThemeConfig/LayoutConfig.ts b/Models/ThemeConfig/LayoutConfig.ts index 98e0515358..1d89a104d7 100644 --- a/Models/ThemeConfig/LayoutConfig.ts +++ b/Models/ThemeConfig/LayoutConfig.ts @@ -49,10 +49,7 @@ export default class LayoutConfig { public readonly enableIframePopout: boolean; public readonly customCss?: string; - /* - How long is the cache valid, in seconds? - */ - public readonly cacheTimeout?: number; + public readonly overpassUrl: string[]; public readonly overpassTimeout: number; public readonly overpassMaxZoom: number @@ -170,7 +167,6 @@ export default class LayoutConfig { this.enablePdfDownload = json.enablePdfDownload ?? false; this.enableIframePopout = json.enableIframePopout ?? true this.customCss = json.customCss; - this.cacheTimeout = json.cacheTimout ?? (60 * 24 * 60 * 60) this.overpassUrl = Constants.defaultOverpassUrls if(json.overpassUrl !== undefined){ if(typeof json.overpassUrl === "string"){ diff --git a/Models/ThemeConfig/TagRenderingConfig.ts b/Models/ThemeConfig/TagRenderingConfig.ts index 4edd0da1d2..40b7bdfe14 100644 --- a/Models/ThemeConfig/TagRenderingConfig.ts +++ b/Models/ThemeConfig/TagRenderingConfig.ts @@ -62,6 +62,9 @@ export default class TagRenderingConfig { this.render = Translations.T(json.render, context + ".render"); this.question = Translations.T(json.question, context + ".question"); this.roaming = json.roaming ?? false; + if(this.roaming){ + console.warn("Deprecation notice: roaming renderings will be scrapped.", this.id, context) + } const condition = TagUtils.Tag(json.condition ?? {"and": []}, `${context}.condition`); if (this.roaming && conditionIfRoaming !== undefined) { this.condition = new And([condition, conditionIfRoaming]); diff --git a/UI/Base/Ornament.ts b/UI/Base/Ornament.ts deleted file mode 100644 index 7c2798892f..0000000000 --- a/UI/Base/Ornament.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {FixedUiElement} from "./FixedUiElement"; - -export default class Ornament extends FixedUiElement { - - constructor() { - super(""); - this.SetClass("pt-3 pb-3 flex justify-center box-border") - } - - -} \ No newline at end of file diff --git a/UI/Base/ScrollableFullScreen.ts b/UI/Base/ScrollableFullScreen.ts index da8114f8ca..b9f134565b 100644 --- a/UI/Base/ScrollableFullScreen.ts +++ b/UI/Base/ScrollableFullScreen.ts @@ -1,11 +1,11 @@ import {UIElement} from "../UIElement"; import Svg from "../../Svg"; import Combine from "./Combine"; -import Ornament from "./Ornament"; import {FixedUiElement} from "./FixedUiElement"; import {UIEventSource} from "../../Logic/UIEventSource"; import Hash from "../../Logic/Web/Hash"; import BaseUIElement from "../BaseUIElement"; +import Img from "./Img"; /** * @@ -18,34 +18,43 @@ import BaseUIElement from "../BaseUIElement"; */ export default class ScrollableFullScreen extends UIElement { private static readonly empty = new FixedUiElement(""); - private static readonly _actor = ScrollableFullScreen.InitActor(); private static _currentlyOpen: ScrollableFullScreen; public isShown: UIEventSource; private _component: BaseUIElement; private _fullscreencomponent: BaseUIElement; - private _hashToSet: string; constructor(title: ((mode: string) => BaseUIElement), content: ((mode: string) => BaseUIElement), - hashToSet: string, + hashToShow: string, isShown: UIEventSource = new UIEventSource(false) ) { super(); this.isShown = isShown; - this._hashToSet = hashToSet; + + if (hashToShow === undefined) { + throw "HashToShow should be defined as it is vital for the 'back' key functionality" + } this._component = this.BuildComponent(title("desktop"), content("desktop"), isShown) .SetClass("hidden md:block"); - this._fullscreencomponent = this.BuildComponent(title("mobile"), content("mobile"), isShown); + this._fullscreencomponent = this.BuildComponent(title("mobile"), content("mobile").SetClass("pb-20"), isShown); + - const self = this; isShown.addCallback(isShown => { if (isShown) { self.Activate(); + Hash.hash.setData(hashToShow) } else { ScrollableFullScreen.clear(); } }) + + Hash.hash.addCallback(hash => { + if (hash === hashToShow) { + return + } + isShown.setData(false) + }) } private static clear() { @@ -56,15 +65,6 @@ export default class ScrollableFullScreen extends UIElement { Hash.hash.setData(undefined); } - private static InitActor() { - Hash.hash.addCallback(hash => { - if (hash === undefined || hash === "") { - ScrollableFullScreen.clear() - } - }); - return true; - } - InnerRender(): BaseUIElement { return this._component; } @@ -72,9 +72,6 @@ export default class ScrollableFullScreen extends UIElement { Activate(): void { this.isShown.setData(true) this._fullscreencomponent.AttachTo("fullscreen"); - if (this._hashToSet != undefined) { - Hash.hash.setData(this._hashToSet) - } const fs = document.getElementById("fullscreen"); ScrollableFullScreen._currentlyOpen = this; fs.classList.remove("hidden") @@ -83,25 +80,26 @@ export default class ScrollableFullScreen extends UIElement { private BuildComponent(title: BaseUIElement, content: BaseUIElement, isShown: UIEventSource) { const returnToTheMap = new Combine([ - Svg.back_svg().SetClass("block md:hidden"), - Svg.close_svg().SetClass("hidden md:block") - ]) - .onClick(() => { - isShown.setData(false) - }).SetClass("mb-2 bg-blue-50 rounded-full w-12 h-12 p-1.5 flex-shrink-0") + new Img(Svg.back.replace(/#000000/g, "#cccccc"), true) + .SetClass("block md:hidden w-12 h-12 p-2"), + new Img(Svg.close.replace(/#000000/g, "#cccccc"), true) + .SetClass("hidden md:block w-12 h-12 p-3") + ]).SetClass("rounded-full p-0 flex-shrink-0 self-center") - title.SetClass("block text-l sm:text-xl md:text-2xl w-full font-bold p-2 pl-4 max-h-20vh overflow-y-auto") - const ornament = new Combine([new Ornament().SetStyle("height:5em;")]) - .SetClass("md:hidden h-5") + returnToTheMap.onClick(() => { + isShown.setData(false) + }) + + title.SetClass("block text-l sm:text-xl md:text-2xl w-full font-bold p-0 max-h-20vh overflow-y-auto") return new Combine([ new Combine([ new Combine([returnToTheMap, title]) - .SetClass("border-b-2 border-black shadow md:shadow-none bg-white p-2 pb-0 md:p-0 flex flex-shrink-0"), - new Combine([content, ornament]) + .SetClass("border-b-1 border-black shadow bg-white flex flex-shrink-0 pt-1 pb-1 md:pt-0 md:pb-0"), + new Combine([content]) .SetClass("block p-2 md:pt-4 w-full h-full overflow-y-auto md:max-h-65vh"), // We add an ornament which takes around 5em. This is in order to make sure the Web UI doesn't hide ]).SetClass("flex flex-col h-full relative bg-white") - ]).SetClass("fixed top-0 left-0 right-0 h-screen w-screen md:max-h-65vh md:w-auto md:relative z-above-controls"); + ]).SetClass("fixed top-0 left-0 right-0 h-screen w-screen md:max-h-65vh md:w-auto md:relative z-above-controls md:rounded-xl overflow-hidden"); } diff --git a/UI/BigComponents/AllDownloads.ts b/UI/BigComponents/AllDownloads.ts index 3df26f53de..2586fef3f1 100644 --- a/UI/BigComponents/AllDownloads.ts +++ b/UI/BigComponents/AllDownloads.ts @@ -9,12 +9,11 @@ import {DownloadPanel} from "./DownloadPanel"; import {SubtleButton} from "../Base/SubtleButton"; import Svg from "../../Svg"; import ExportPDF from "../ExportPDF"; -import {FixedUiElement} from "../Base/FixedUiElement"; export default class AllDownloads extends ScrollableFullScreen { constructor(isShown: UIEventSource) { - super(AllDownloads.GenTitle, AllDownloads.GeneratePanel, "layers", isShown); + super(AllDownloads.GenTitle, AllDownloads.GeneratePanel, "downloads", isShown); } private static GenTitle(): BaseUIElement { diff --git a/UI/BigComponents/FilterView.ts b/UI/BigComponents/FilterView.ts index d8a46d517a..71506c398e 100644 --- a/UI/BigComponents/FilterView.ts +++ b/UI/BigComponents/FilterView.ts @@ -40,20 +40,16 @@ export default class FilterView extends VariableUiElement { const iconUnselected = new Combine([Svg.checkbox_empty]).SetStyle( iconStyle ); - const name: Translation = config.config.name.Clone(); + const name: Translation = config.config.name; - const styledNameChecked = name - .Clone() - .SetStyle("font-size:large;padding-left:1.25rem"); + const styledNameChecked = name.Clone().SetStyle("font-size:large;padding-left:1.25rem"); - const styledNameUnChecked = name - .Clone() - .SetStyle("font-size:large;padding-left:1.25rem"); + const styledNameUnChecked = name.Clone().SetStyle("font-size:large;padding-left:1.25rem"); const zoomStatus = new Toggle( undefined, - Translations.t.general.layerSelection.zoomInToSeeThisLayer.Clone() + Translations.t.general.layerSelection.zoomInToSeeThisLayer .SetClass("alert") .SetStyle("display: block ruby;width:min-content;"), State.state.locationControl.map(location => location.zoom >= config.config.minzoom) @@ -97,20 +93,16 @@ export default class FilterView extends VariableUiElement { const name: Translation = Translations.WT( filteredLayer.layerDef.name - )?.Clone(); + ); - const styledNameChecked = name - .Clone() - .SetStyle("font-size:large;padding-left:1.25rem"); + const styledNameChecked = name.Clone().SetStyle("font-size:large;padding-left:1.25rem"); - const styledNameUnChecked = name - .Clone() - .SetStyle("font-size:large;padding-left:1.25rem"); + const styledNameUnChecked = name.Clone().SetStyle("font-size:large;padding-left:1.25rem"); const zoomStatus = new Toggle( undefined, - Translations.t.general.layerSelection.zoomInToSeeThisLayer.Clone() + Translations.t.general.layerSelection.zoomInToSeeThisLayer .SetClass("alert") .SetStyle("display: block ruby;width:min-content;"), State.state.locationControl.map(location => location.zoom >= filteredLayer.layerDef.minzoom) diff --git a/UI/BigComponents/FullWelcomePaneWithTabs.ts b/UI/BigComponents/FullWelcomePaneWithTabs.ts index 8dc7cf668f..7e2b4d8fbf 100644 --- a/UI/BigComponents/FullWelcomePaneWithTabs.ts +++ b/UI/BigComponents/FullWelcomePaneWithTabs.ts @@ -30,7 +30,8 @@ export default class FullWelcomePaneWithTabs extends ScrollableFullScreen { super( () => layoutToUse.title.Clone(), () => FullWelcomePaneWithTabs.GenerateContents(state, currentTab, isShown), - undefined, isShown + "welcome", + isShown ) } @@ -49,7 +50,7 @@ export default class FullWelcomePaneWithTabs extends ScrollableFullScreen { {header: ``, content: welcome}, { header: Svg.osm_logo_img, - content: Translations.t.general.openStreetMapIntro.Clone().SetClass("link-underline") + content: Translations.t.general.openStreetMapIntro.SetClass("link-underline") }, ] @@ -63,7 +64,7 @@ export default class FullWelcomePaneWithTabs extends ScrollableFullScreen { header: Svg.add_img, content: new Combine([ - Translations.t.general.morescreen.intro.Clone(), + Translations.t.general.morescreen.intro, new MoreScreen(state) ]).SetClass("flex flex-col") }); @@ -85,7 +86,7 @@ export default class FullWelcomePaneWithTabs extends ScrollableFullScreen { tabsWithAboutMc.push({ header: Svg.help, - content: new Combine([Translations.t.general.aboutMapcomplete.Clone() + content: new Combine([Translations.t.general.aboutMapcomplete .Subs({"osmcha_link": Utils.OsmChaLinkFor(7)}), "
Version " + Constants.vNumber]) .SetClass("link-underline") } diff --git a/UI/BigComponents/LeftControls.ts b/UI/BigComponents/LeftControls.ts index b92adb54ab..cc8b9e4c05 100644 --- a/UI/BigComponents/LeftControls.ts +++ b/UI/BigComponents/LeftControls.ts @@ -26,12 +26,12 @@ export default class LeftControls extends Combine { featureSwitchEnableExport: UIEventSource, featureSwitchExportAsPdf: UIEventSource, filteredLayers: UIEventSource, - featureSwitchFilter: UIEventSource, - selectedElement: UIEventSource + featureSwitchFilter: UIEventSource }, guiState: { downloadControlIsOpened: UIEventSource, filterViewIsOpened: UIEventSource, + copyrightViewIsOpened: UIEventSource }) { const toggledCopyright = new ScrollableFullScreen( @@ -41,7 +41,8 @@ export default class LeftControls extends Combine { state.layoutToUse, new ContributorCount(state).Contributors ), - undefined + "copyright", + guiState.copyrightViewIsOpened ); const copyrightButton = new Toggle( @@ -49,8 +50,7 @@ export default class LeftControls extends Combine { new MapControlButton(Svg.copyright_svg()) .onClick(() => toggledCopyright.isShown.setData(true)), toggledCopyright.isShown - ) - .SetClass("p-0.5"); + ).SetClass("p-0.5"); const toggledDownload = new Toggle( new AllDownloads( @@ -73,11 +73,11 @@ export default class LeftControls extends Combine { () => Translations.t.general.layerSelection.title.Clone(), () => new FilterView(state.filteredLayers, state.overlayToggles).SetClass( - "block p-1 rounded-full" + "block p-1" ), - undefined, + "filters", guiState.filterViewIsOpened - ), + ).SetClass("rounded-lg"), new MapControlButton(Svg.filter_svg()) .onClick(() => guiState.filterViewIsOpened.setData(true)), guiState.filterViewIsOpened @@ -90,18 +90,6 @@ export default class LeftControls extends Combine { ); - state.locationControl.addCallback(() => { - // Close the layer selection when the map is moved - toggledDownload.isEnabled.setData(false); - copyrightButton.isEnabled.setData(false); - toggledFilter.isEnabled.setData(false); - }); - - state.selectedElement.addCallbackAndRunD((_) => { - toggledDownload.isEnabled.setData(false); - copyrightButton.isEnabled.setData(false); - toggledFilter.isEnabled.setData(false); - }); super([filterButton, downloadButtonn, copyrightButton]) diff --git a/UI/BigComponents/MoreScreen.ts b/UI/BigComponents/MoreScreen.ts index c59766f288..84475d3bef 100644 --- a/UI/BigComponents/MoreScreen.ts +++ b/UI/BigComponents/MoreScreen.ts @@ -6,8 +6,6 @@ import {SubtleButton} from "../Base/SubtleButton"; import Translations from "../i18n/Translations"; import * as personal from "../../assets/themes/personal/personal.json" import Constants from "../../Models/Constants"; -import LanguagePicker from "../LanguagePicker"; -import IndexText from "./IndexText"; import BaseUIElement from "../BaseUIElement"; import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import {UIEventSource} from "../../Logic/UIEventSource"; @@ -201,14 +199,13 @@ export default class MoreScreen extends Combine { }) ?? new UIEventSource(`${linkPrefix}${linkSuffix}`) - let description = Translations.WT(layout.shortDescription).Clone(); return new SubtleButton(layout.icon, new Combine([ `
`, - Translations.WT(layout.title).Clone(), + Translations.WT(layout.title), `
`, `
`, - description.Clone().SetClass("subtle") ?? "", + Translations.WT(layout.shortDescription)?.SetClass("subtle") ?? "", `
`, ]), {url: linkText, newTab: false}); } diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts index 204e7f955f..84e14b6827 100644 --- a/UI/BigComponents/SimpleAddUI.ts +++ b/UI/BigComponents/SimpleAddUI.ts @@ -113,9 +113,9 @@ export default class SimpleAddUI extends Toggle { new Toggle( new Toggle( new Toggle( - addUi, Translations.t.general.add.stillLoading.Clone().SetClass("alert"), - state.featurePipeline.somethingLoaded + addUi, + state.featurePipeline.runningQuery ), Translations.t.general.add.zoomInFurther.Clone().SetClass("alert"), state.locationControl.map(loc => loc.zoom >= Constants.userJourney.minZoomLevelToAddNewPoints) diff --git a/UI/BigComponents/UploadFlowStateUI.ts b/UI/BigComponents/UploadFlowStateUI.ts deleted file mode 100644 index c98c1a941a..0000000000 --- a/UI/BigComponents/UploadFlowStateUI.ts +++ /dev/null @@ -1,45 +0,0 @@ -import {UIEventSource} from "../../Logic/UIEventSource"; -import BaseUIElement from "../BaseUIElement"; -import {VariableUiElement} from "../Base/VariableUIElement"; -import Translations from "../i18n/Translations"; - -/** - * Shows that 'images are uploading', 'all images are uploaded' as relevant... - */ -export default class UploadFlowStateUI extends VariableUiElement { - - - constructor(queue: UIEventSource, failed: UIEventSource, success: UIEventSource) { - const t = Translations.t.image; - - super( - queue.map(queue => { - const failedReasons = failed.data - const successCount = success.data.length - const pendingCount = queue.length - successCount - failedReasons.length; - - let stateMessages: BaseUIElement[] = [] - - if (pendingCount == 1) { - stateMessages.push(t.uploadingPicture.Clone().SetClass("alert")) - } - if (pendingCount > 1) { - stateMessages.push(t.uploadingMultiple.Subs({count: "" + pendingCount}).SetClass("alert")) - } - if (failedReasons.length > 0) { - stateMessages.push(t.uploadFailed.Clone().SetClass("alert")) - } - if (successCount > 0 && pendingCount == 0) { - stateMessages.push(t.uploadDone.SetClass("thanks")) - } - - stateMessages.forEach(msg => msg.SetStyle("display: block ruby")) - - return stateMessages - }, [failed, success]) - ); - - - } - -} \ No newline at end of file diff --git a/UI/DefaultGUI.ts b/UI/DefaultGUI.ts index 5c7f1b9a6b..e259b4f2e3 100644 --- a/UI/DefaultGUI.ts +++ b/UI/DefaultGUI.ts @@ -23,46 +23,74 @@ import ScrollableFullScreen from "./Base/ScrollableFullScreen"; import Translations from "./i18n/Translations"; import SimpleAddUI from "./BigComponents/SimpleAddUI"; import StrayClickHandler from "../Logic/Actors/StrayClickHandler"; +import Lazy from "./Base/Lazy"; export class DefaultGuiState { - public readonly welcomeMessageIsOpened; + public readonly welcomeMessageIsOpened : UIEventSource; public readonly downloadControlIsOpened: UIEventSource; public readonly filterViewIsOpened: UIEventSource; - public readonly welcomeMessageOpenedTab + public readonly copyrightViewIsOpened: UIEventSource; + public readonly welcomeMessageOpenedTab: UIEventSource + public readonly allFullScreenStates: UIEventSource[] = [] constructor() { - this.filterViewIsOpened = QueryParameters.GetQueryParameter( - "filter-toggle", - "false", - "Whether or not the filter view is shown" - ).map( - (str) => str !== "false", - [], - (b) => "" + b - ); - this.welcomeMessageIsOpened = new UIEventSource(Hash.hash.data === undefined || - Hash.hash.data === "" || - Hash.hash.data == "welcome"); - this.welcomeMessageOpenedTab = QueryParameters.GetQueryParameter( + + + this.welcomeMessageOpenedTab = UIEventSource.asFloat(QueryParameters.GetQueryParameter( "tab", "0", `The tab that is shown in the welcome-message. 0 = the explanation of the theme,1 = OSM-credits, 2 = sharescreen, 3 = more themes, 4 = about mapcomplete (user must be logged in and have >${Constants.userJourney.mapCompleteHelpUnlock} changesets)` - ).map( - (str) => (isNaN(Number(str)) ? 0 : Number(str)), - [], - (n) => "" + n - ); - this.downloadControlIsOpened = - QueryParameters.GetQueryParameter( + )); + this.welcomeMessageIsOpened = QueryParameters.GetBooleanQueryParameter( + "welcome-control-toggle", + "false", + "Whether or not the welcome panel is shown" + ) + this.downloadControlIsOpened = QueryParameters.GetBooleanQueryParameter( "download-control-toggle", "false", "Whether or not the download panel is shown" - ).map( - (str) => str !== "false", - [], - (b) => "" + b - ); + ) + this.filterViewIsOpened = QueryParameters.GetBooleanQueryParameter( + "filter-toggle", + "false", + "Whether or not the filter view is shown" + ) + this.copyrightViewIsOpened = QueryParameters.GetBooleanQueryParameter( + "copyright-toggle", + "false", + "Whether or not the copyright view is shown" + ) + if(Hash.hash.data === "download"){ + this.downloadControlIsOpened.setData(true) + } + if(Hash.hash.data === "filter"){ + this.filterViewIsOpened.setData(true) + } + if(Hash.hash.data === "copyright"){ + this.copyrightViewIsOpened.setData(true) + } + if(Hash.hash.data === "" || Hash.hash.data === undefined || Hash.hash.data === "welcome"){ + this.welcomeMessageIsOpened.setData(true) + } + + this.allFullScreenStates.push(this.downloadControlIsOpened, this.filterViewIsOpened, this.copyrightViewIsOpened, this.welcomeMessageIsOpened) + + for (let i = 0; i < this.allFullScreenStates.length; i++){ + const fullScreenState = this.allFullScreenStates[i]; + for (let j = 0; j < this.allFullScreenStates.length; j++){ + if(i == j){ + continue + } + const otherState = this.allFullScreenStates[j]; + fullScreenState.addCallbackAndRunD(isOpened => { + if(isOpened){ + otherState.setData(false) + } + }) + } + } } } @@ -81,12 +109,22 @@ export default class DefaultGUI { constructor(state: FeaturePipelineState, guiState: DefaultGuiState) { this.state = state; this._guiState = guiState; - const self = this; if (state.layoutToUse.customCss !== undefined) { Utils.LoadCustomCss(state.layoutToUse.customCss); } + + this.SetupUIElements(); + this.SetupMap() + + } + + + private SetupMap(){ + const state = this.state; + const guiState = this._guiState; + // Attach the map state.mainMapObject.SetClass("w-full h-full") .AttachTo("leafletDiv") @@ -96,8 +134,28 @@ export default class DefaultGUI { state ) - this.InitWelcomeMessage(); + new ShowDataLayer({ + leafletMap: state.leafletMap, + layerToShow: AllKnownLayers.sharedLayers.get("home_location"), + features: state.homeLocation, + enablePopups: false, + }) + + state.leafletMap.addCallbackAndRunD(_ => { + // Lets assume that all showDataLayers are initialized at this point + state.selectedElement.ping() + State.state.locationControl.ping(); + return true; + }) + + } + + private SetupUIElements(){ + const state = this.state; + const guiState = this._guiState; + + const self =this Toggle.If(state.featureSwitchUserbadge, () => new UserBadge(state) ).AttachTo("userbadge") @@ -119,36 +177,37 @@ export default class DefaultGUI { } - new Toggle(self.InitWelcomeMessage(), - Toggle.If(state.featureSwitchIframePopoutEnabled, iframePopout), + new Toggle(new Lazy(() => self.InitWelcomeMessage()), + Toggle.If(state.featureSwitchIframePopoutEnabled, iframePopout), state.featureSwitchWelcomeMessage ).AttachTo("messagesbox"); + new LeftControls(state, guiState).AttachTo("bottom-left"); new RightControls(state).AttachTo("bottom-right"); - State.state.locationControl.ping(); + new CenterMessageBox(state).AttachTo("centermessage"); document .getElementById("centermessage") .classList.add("pointer-events-none"); - - - new ShowDataLayer({ - leafletMap: state.leafletMap, - layerToShow: AllKnownLayers.sharedLayers.get("home_location"), - features: state.homeLocation, - enablePopups: false, - }) - - state.leafletMap.addCallbackAndRunD(_ => { - // Lets assume that all showDataLayers are initialized at this point - state.selectedElement.ping() - return true; - }) + // We have to ping the welcomeMessageIsOpened and other isOpened-stuff to activate the FullScreenMessage if needed + for (const state of guiState.allFullScreenStates) { + if(state.data){ + state.ping() + } + } + + /** + * At last, if the map moves or an element is selected, we close all the panels just as well + */ + + state.selectedElement.addCallbackAndRunD((_) => { + guiState.allFullScreenStates.forEach(s => s.setData(false)) + }); } - private InitWelcomeMessage() { + private InitWelcomeMessage() : BaseUIElement{ const isOpened = this._guiState.welcomeMessageIsOpened const fullOptions = new FullWelcomePaneWithTabs(isOpened, this._guiState.welcomeMessageOpenedTab, this.state); @@ -180,7 +239,7 @@ export default class DefaultGUI { public setupClickDialogOnMap(filterViewIsOpened: UIEventSource, state: FeaturePipelineState) { - function setup(){ + function setup() { let presetCount = 0; for (const layer of state.layoutToUse.layers) { for (const preset of layer.presets) { diff --git a/UI/Image/ImageCarousel.ts b/UI/Image/ImageCarousel.ts index 9932da6164..43ce326821 100644 --- a/UI/Image/ImageCarousel.ts +++ b/UI/Image/ImageCarousel.ts @@ -9,7 +9,9 @@ import ImageProvider from "../../Logic/ImageProviders/ImageProvider"; export class ImageCarousel extends Toggle { - constructor(images: UIEventSource<{ key: string, url: string, provider: ImageProvider }[]>, tags: UIEventSource) { + constructor(images: UIEventSource<{ key: string, url: string, provider: ImageProvider }[]>, + tags: UIEventSource, + keys: string[]) { const uiElements = images.map((imageURLS: { key: string, url: string, provider: ImageProvider }[]) => { const uiElements: BaseUIElement[] = []; for (const url of imageURLS) { diff --git a/UI/Image/ImageUploadFlow.ts b/UI/Image/ImageUploadFlow.ts index 80ebe427c6..c0407c2089 100644 --- a/UI/Image/ImageUploadFlow.ts +++ b/UI/Image/ImageUploadFlow.ts @@ -9,14 +9,23 @@ import LicensePicker from "../BigComponents/LicensePicker"; import Toggle from "../Input/Toggle"; import FileSelectorButton from "../Input/FileSelectorButton"; import ImgurUploader from "../../Logic/ImageProviders/ImgurUploader"; -import UploadFlowStateUI from "../BigComponents/UploadFlowStateUI"; import ChangeTagAction from "../../Logic/Osm/Actions/ChangeTagAction"; import LayerConfig from "../../Models/ThemeConfig/LayerConfig"; import {FixedUiElement} from "../Base/FixedUiElement"; +import {VariableUiElement} from "../Base/VariableUIElement"; export class ImageUploadFlow extends Toggle { + + private static readonly uploadCountsPerId = new Map>() + constructor(tagsSource: UIEventSource, imagePrefix: string = "image", text: string = undefined) { + const perId = ImageUploadFlow.uploadCountsPerId + const id = tagsSource.data.id + if(!perId.has(id)){ + perId.set(id, new UIEventSource(0)) + } + const uploadedCount = perId.get(id) const uploader = new ImgurUploader(url => { // A file was uploaded - we add it to the tags of the object @@ -30,7 +39,9 @@ export class ImageUploadFlow extends Toggle { key = imagePrefix + ":" + freeIndex; } console.log("Adding image:" + key, url); - Promise.resolve(State.state.changes + uploadedCount.data ++ + uploadedCount.ping() + Promise.resolve(State.state.changes .applyAction(new ChangeTagAction( tags.id, new Tag(key, url), tagsSource.data, { @@ -40,10 +51,6 @@ export class ImageUploadFlow extends Toggle { ))) }) - uploader.queue.addCallbackD(q => console.log("Image upload queue is ", q)) - uploader.failed.addCallbackD(q => console.log("Image upload fail list is ", q)) - uploader.success.addCallbackD(q => console.log("Image upload success list is ", q)) - const licensePicker = new LicensePicker() const t = Translations.t.image; @@ -105,10 +112,33 @@ export class ImageUploadFlow extends Toggle { }) - const uploadStateUi = new UploadFlowStateUI(uploader.queue, uploader.failed, uploader.success) - const uploadFlow: BaseUIElement = new Combine([ - uploadStateUi, + new VariableUiElement(uploader.queue.map(q => q.length).map(l => { + if(l == 0){ + return undefined; + } + if(l == 1){ + return t.uploadingPicture.Clone().SetClass("alert") + }else{ + return t.uploadingMultiple.Subs({count: "" + l}).SetClass("alert") + } + })), + new VariableUiElement(uploader.failed.map(q => q.length).map(l => { + if(l==0){ + return undefined + } + return t.uploadFailed.Clone().SetClass("alert"); + })), + new VariableUiElement(uploadedCount.map(l => { + if(l == 0){ + return undefined; + } + if(l == 1){ + return t.uploadDone.Clone().SetClass("thanks"); + } + return t.uploadMultipleDone.Subs({count: l}).SetClass("thanks") + })), + fileSelector, Translations.t.image.respectPrivacy.Clone().SetStyle("font-size:small;"), licensePicker diff --git a/UI/Popup/FeatureInfoBox.ts b/UI/Popup/FeatureInfoBox.ts index 155df8bdc0..d46ebf711b 100644 --- a/UI/Popup/FeatureInfoBox.ts +++ b/UI/Popup/FeatureInfoBox.ts @@ -27,7 +27,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen { ) { super(() => FeatureInfoBox.GenerateTitleBar(tags, layerConfig), () => FeatureInfoBox.GenerateContent(tags, layerConfig), - undefined); + tags.data.id); if (layerConfig === undefined) { throw "Undefined layerconfig"; @@ -73,7 +73,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen { editElements.push(questionBox); } - if(layerConfig.allowMove) { + if (layerConfig.allowMove) { editElements.push( new VariableUiElement(tags.map(tags => tags.id).map(id => { const feature = State.state.allElements.ContainingFeatures.get(id) @@ -149,8 +149,8 @@ export default class FeatureInfoBox extends ScrollableFullScreen { )) renderings.push(editors) - return new Combine(renderings).SetClass("block") + return new Combine(renderings).SetClass("block") } /** diff --git a/UI/Popup/MoveWizard.ts b/UI/Popup/MoveWizard.ts index 3606581e2b..254c7a0ca7 100644 --- a/UI/Popup/MoveWizard.ts +++ b/UI/Popup/MoveWizard.ts @@ -17,7 +17,6 @@ import ChangeLocationAction from "../../Logic/Osm/Actions/ChangeLocationAction"; import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import MoveConfig from "../../Models/ThemeConfig/MoveConfig"; import {ElementStorage} from "../../Logic/ElementStorage"; -import ValidatedTextField from "../Input/ValidatedTextField"; import AvailableBaseLayers from "../../Logic/Actors/AvailableBaseLayers"; interface MoveReason { @@ -47,7 +46,7 @@ export default class MoveWizard extends Toggle { const t = Translations.t.move const loginButton = new Toggle( - t.loginToMove.Clone().SetClass("btn").onClick(() => state.osmConnection.AttemptLogin()), + t.loginToMove.SetClass("btn").onClick(() => state.osmConnection.AttemptLogin()), undefined, state.featureSwitchUserbadge ) @@ -55,8 +54,8 @@ export default class MoveWizard extends Toggle { const reasons: MoveReason[] = [] if (options.enableRelocation) { reasons.push({ - text: t.reasons.reasonRelocation.Clone(), - invitingText: t.inviteToMove.reasonRelocation.Clone(), + text: t.reasons.reasonRelocation, + invitingText: t.inviteToMove.reasonRelocation, icon: Svg.relocation_svg(), changesetCommentValue: "relocated", lockBounds: false, @@ -67,7 +66,7 @@ export default class MoveWizard extends Toggle { } if(options.enableImproveAccuracy){ reasons.push({ - text: t.reasons.reasonInaccurate.Clone(), + text: t.reasons.reasonInaccurate, invitingText: t.inviteToMove.reasonInaccurate, icon: Svg.crosshair_svg(), changesetCommentValue: "improve_accuracy", @@ -86,14 +85,14 @@ export default class MoveWizard extends Toggle { moveReason.setData(reason) moveButton = new SubtleButton( reason.icon.SetStyle("height: 1.5rem; width: auto;"), - Translations.WT(reason.invitingText).Clone() + Translations.WT(reason.invitingText) ).onClick(() => { currentStep.setData("pick_location") }) }else{ moveButton = new SubtleButton( Svg.move_ui().SetStyle("height: 1.5rem; width: auto"), - t.inviteToMove.generic.Clone() + t.inviteToMove.generic ).onClick(() => { currentStep.setData("reason") }) @@ -102,7 +101,7 @@ export default class MoveWizard extends Toggle { const moveAgainButton = new SubtleButton( Svg.move_ui(), - t.inviteToMoveAgain.Clone() + t.inviteToMoveAgain ).onClick(() => { currentStep.setData("reason") }) @@ -152,7 +151,7 @@ export default class MoveWizard extends Toggle { confirmMove.onClick(() => { const loc = locationInput.GetValue().data state.changes.applyAction(new ChangeLocationAction(featureToMove.properties.id, [loc.lon, loc.lat], { - reason: Translations.WT(reason.text).textFor("en"), + reason: reason.changesetCommentValue, theme: state.layoutToUse.id })) featureToMove.properties._lat = loc.lat @@ -160,7 +159,7 @@ export default class MoveWizard extends Toggle { state.allElements.getEventSourceById(id).ping() currentStep.setData("moved") }) - const zoomInFurhter = t.zoomInFurther.Clone().SetClass("alert block m-6") + const zoomInFurhter = t.zoomInFurther.SetClass("alert block m-6") return new Combine([ locationInput, new Toggle(confirmMove, zoomInFurhter, locationInput.GetValue().map(l => l.zoom >= 19)) @@ -175,11 +174,11 @@ export default class MoveWizard extends Toggle { case "start": return moveButton; case "reason": - return new Combine([t.whyMove.Clone().SetClass("text-lg font-bold"), selectReason, cancelButton]).SetClass(dialogClasses); + return new Combine([t.whyMove.SetClass("text-lg font-bold"), selectReason, cancelButton]).SetClass(dialogClasses); case "pick_location": - return new Combine([t.moveTitle.Clone().SetClass("text-lg font-bold"), new VariableUiElement(locationInput), cancelButton]).SetClass(dialogClasses) + return new Combine([t.moveTitle.SetClass("text-lg font-bold"), new VariableUiElement(locationInput), cancelButton]).SetClass(dialogClasses) case "moved": - return new Combine([t.pointIsMoved.Clone().SetClass("thanks"), moveAgainButton]).SetClass("flex flex-col"); + return new Combine([t.pointIsMoved.SetClass("thanks"), moveAgainButton]).SetClass("flex flex-col"); } @@ -196,20 +195,20 @@ export default class MoveWizard extends Toggle { const moveDisallowedReason = new UIEventSource(undefined) if (id.startsWith("way")) { - moveDisallowedReason.setData(t.isWay.Clone()) + moveDisallowedReason.setData(t.isWay) } else if (id.startsWith("relation")) { - moveDisallowedReason.setData(t.isRelation.Clone()) - } else { + moveDisallowedReason.setData(t.isRelation) + } else if(id.indexOf("-") < 0) { OsmObject.DownloadReferencingWays(id).then(referencing => { if (referencing.length > 0) { console.log("Got a referencing way, move not allowed") - moveDisallowedReason.setData(t.partOfAWay.Clone()) + moveDisallowedReason.setData(t.partOfAWay) } }) OsmObject.DownloadReferencingRelations(id).then(partOf => { - if(partOf.length > 0){ - moveDisallowedReason.setData(t.partOfRelation.Clone()) + if(partOf.length > 0){ + moveDisallowedReason.setData(t.partOfRelation) } }) } @@ -217,7 +216,7 @@ export default class MoveWizard extends Toggle { moveFlow, new Combine([ Svg.move_not_allowed_svg().SetStyle("height: 2rem").SetClass("m-2"), - new Combine([t.cannotBeMoved.Clone(), + new Combine([t.cannotBeMoved, new VariableUiElement(moveDisallowedReason).SetClass("subtle") ]).SetClass("flex flex-col") ]).SetClass("flex m-2 p-2 rounded-lg bg-gray-200"), diff --git a/UI/Popup/TagRenderingQuestion.ts b/UI/Popup/TagRenderingQuestion.ts index 556635c571..a45172a98c 100644 --- a/UI/Popup/TagRenderingQuestion.ts +++ b/UI/Popup/TagRenderingQuestion.ts @@ -27,6 +27,7 @@ import ChangeTagAction from "../../Logic/Osm/Actions/ChangeTagAction"; import TagRenderingConfig from "../../Models/ThemeConfig/TagRenderingConfig"; import {Unit} from "../../Models/Unit"; import VariableInputElement from "../Input/VariableInputElement"; +import Toggle from "../Input/Toggle"; /** * Shows the question element. @@ -76,7 +77,7 @@ export default class TagRenderingQuestion extends Combine { const inputElement: InputElement = - new VariableInputElement(applicableMappingsSrc.map(applicableMappings => + new VariableInputElement(applicableMappingsSrc.map(applicableMappings => TagRenderingQuestion.GenerateInputElement(configuration, applicableMappings, applicableUnit, tags) )) @@ -105,8 +106,11 @@ export default class TagRenderingQuestion extends Combine { .onClick(save) } - const saveButton = options.saveButtonConstr(inputElement.GetValue()) - + const saveButton = new Combine([ + options.saveButtonConstr(inputElement.GetValue()), + new Toggle(Translations.t.general.testing, undefined, State.state.featureSwitchIsTesting).SetClass("alert") + ]) + let bottomTags: BaseUIElement; if (options.bottomText !== undefined) { bottomTags = options.bottomText(inputElement.GetValue()) @@ -119,7 +123,7 @@ export default class TagRenderingQuestion extends Combine { return ""; } if (tagsFilter === undefined) { - return Translations.t.general.noTagsSelected.Clone().SetClass("subtle"); + return Translations.t.general.noTagsSelected.SetClass("subtle"); } if (csCount < Constants.userJourney.tagsVisibleAndWikiLinked) { const tagsStr = tagsFilter.asHumanString(false, true, tags.data); @@ -136,6 +140,8 @@ export default class TagRenderingQuestion extends Combine { options.cancelButton, saveButton, bottomTags]) + + this.SetClass("question disable-links") } @@ -190,7 +196,7 @@ export default class TagRenderingQuestion extends Combine { applicableMappings.map((mapping, i) => { return { value: new And([mapping.if, ...allIfNotsExcept(i)]), - shown: Translations.WT(mapping.then).Clone() + shown: Translations.WT(mapping.then) } }) ) @@ -204,7 +210,7 @@ export default class TagRenderingQuestion extends Combine { if (inputEls.length == 0) { - if(ff === undefined){ + if (ff === undefined) { throw "Error: could not generate a question: freeform and all mappings are undefined" } return ff; diff --git a/UI/SpecialVisualizations.ts b/UI/SpecialVisualizations.ts index 7e9ef1e65a..1882152965 100644 --- a/UI/SpecialVisualizations.ts +++ b/UI/SpecialVisualizations.ts @@ -83,15 +83,15 @@ export default class SpecialVisualizations { docs: "Creates an image carousel for the given sources. An attempt will be made to guess what source is used. Supported: Wikidata identifiers, Wikipedia pages, Wikimedia categories, IMGUR (with attribution, direct links)", args: [{ name: "image key/prefix (multiple values allowed if comma-seperated)", - defaultValue: "image", + defaultValue: AllImageProviders.defaultKeys.join(","), doc: "The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... " }], constr: (state: State, tags, args) => { - let imagePrefixes = undefined; + let imagePrefixes: string[] = undefined; if(args.length > 0){ - imagePrefixes = args; + imagePrefixes = [].concat(...args.map(a => a.split(","))); } - return new ImageCarousel(AllImageProviders.LoadImagesFor(tags, imagePrefixes), tags); + return new ImageCarousel(AllImageProviders.LoadImagesFor(tags, imagePrefixes), tags, imagePrefixes); } }, { diff --git a/UI/Wikipedia/WikidataPreviewBox.ts b/UI/Wikipedia/WikidataPreviewBox.ts index 9358f3a830..1d7595e6d0 100644 --- a/UI/Wikipedia/WikidataPreviewBox.ts +++ b/UI/Wikipedia/WikidataPreviewBox.ts @@ -122,13 +122,13 @@ export default class WikidataPreviewBox extends VariableUiElement { const els : BaseUIElement[] = [] for (const extraProperty of WikidataPreviewBox.extraProperties) { - let hasAllRequirements =true + let hasAllRequirements = true for (const requirement of extraProperty.requires) { - if(!wikidata.claims.has("P"+requirement.p)){ + if(!wikidata.claims?.has("P"+requirement.p)){ hasAllRequirements = false; break } - if(!wikidata.claims.get("P"+requirement.p).has("Q"+requirement.q)){ + if(!wikidata.claims?.get("P"+requirement.p).has("Q"+requirement.q)){ hasAllRequirements = false; break } diff --git a/UI/i18n/Translations.ts b/UI/i18n/Translations.ts index b1513d74c6..d9e9d6e2db 100644 --- a/UI/i18n/Translations.ts +++ b/UI/i18n/Translations.ts @@ -6,7 +6,6 @@ import BaseUIElement from "../BaseUIElement"; export default class Translations { static t = AllTranslationAssets.t; - private static wtcache = {} constructor() { throw "Translations is static. If you want to intitialize a new translation, use the singular form" @@ -45,15 +44,10 @@ export default class Translations { return undefined; } if (typeof (s) === "string") { - if (Translations.wtcache[s]) { - return Translations.wtcache[s]; - } - const tr = new Translation({en: s}); - Translations.wtcache[s] = tr; - return tr; + return new Translation({en: s}); } if (s instanceof Translation) { - return s; + return s.Clone() /* MUST CLONE HERE! */; } console.error("Trying to Translation.WT, but got ", s) throw "??? Not a valid translation" diff --git a/Utils.ts b/Utils.ts index 2aae7c8699..a732f1ab88 100644 --- a/Utils.ts +++ b/Utils.ts @@ -330,7 +330,7 @@ export class Utils { return cached.promise } } - const promise = Utils.downloadJson(url, headers) + const promise = /*NO AWAIT as we work with the promise directly */Utils.downloadJson(url, headers) Utils._download_cache.set(url, {promise, timestamp: new Date().getTime()}) return await promise } diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json index 9d56e19a5c..9e39755c77 100644 --- a/assets/layers/bike_cleaning/bike_cleaning.json +++ b/assets/layers/bike_cleaning/bike_cleaning.json @@ -79,16 +79,13 @@ ] }, "then": { - "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg", - "roaming": true - }, - "badge": true + "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg" + } } ], "titleIcons": [ { - "render": "", - "roaming": true + "render": "" } ], "tagRenderings": [ @@ -118,7 +115,6 @@ "then": "The cleaning service has a fee" } ], - "roaming": true, "id": "bike_cleaning-service:bicycle:cleaning:charge" }, { @@ -146,7 +142,6 @@ "then": "The cleaning service has a fee" } ], - "roaming": false, "id": "bike_cleaning-charge" } ], diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index 8b78c689d7..6215ad1eb7 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -129,8 +129,7 @@ "titleIcons": [ { "render": "", - "condition": "operator=De Fietsambassade Gent", - "roaming": true + "condition": "operator=De Fietsambassade Gent" }, "defaults" ], @@ -616,16 +615,7 @@ "level" ], "icon": { - "render": { - "en": "./assets/layers/bike_repair_station/repair_station.svg", - "ru": "./assets/layers/bike_repair_station/repair_station.svg", - "it": "./assets/layers/bike_repair_station/repair_station.svg", - "fi": "./assets/layers/bike_repair_station/repair_station.svg", - "fr": "./assets/layers/bike_repair_station/repair_station.svg", - "pt_BR": "./assets/layers/bike_repair_station/repair_station.svg", - "de": "./assets/layers/bike_repair_station/repair_station.svg", - "pt": "./assets/layers/bike_repair_station/repair_station.svg" - }, + "render": "./assets/layers/bike_repair_station/repair_station.svg", "mappings": [ { "if": { diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 0615750377..6cd8890c31 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -174,6 +174,10 @@ "condition": "service:bicycle:diy=yes", "render": "" }, + { + "condition": "service:bicycle:cleaning=yes", + "render": "" + }, "defaults" ], "description": { @@ -659,6 +663,32 @@ } } ] + }, + { + "question": "How much does it cost to use the cleaning service?", + "render": "Using the cleaning service costs {charge}", + "freeform": { + "key": "service:bicycle:cleaning:charge", + "addExtraTags": [ + "service:bicycle:cleaning:fee=yes" + ] + }, + "mappings": [ + { + "if": "service:bicycle:cleaning:fee=no&service:bicycle:cleaning:charge=", + "then": "The cleaning service is free to use" + }, + { + "if": "service:bicycle:cleaning:fee=no&", + "then": "Free to use", + "hideInAnswer": true + }, + { + "if": "service:bicycle:cleaning:fee=yes", + "then": "The cleaning service has a fee" + } + ], + "id": "bike_cleaning-service:bicycle:cleaning:charge" } ], "presets": [ @@ -700,6 +730,17 @@ "if": "service:bicycle:pump=yes", "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg", "badge": true + }, + { + "if": { + "and": [ + "service:bicycle:cleaning~*" + ] + }, + "then": { + "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg" + }, + "badge": true } ], "width": { diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 3e421b24d2..3ec94777e3 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -2,12 +2,13 @@ "id": "charging_station", "name": { "en": "Charging stations", + "nl": "Oplaadpunten", + "de": "Ladestationen", "it": "Stazioni di ricarica", "ja": "充電ステーション", "nb_NO": "Ladestasjoner", "ru": "Зарядные станции", - "zh_Hant": "充電站", - "de": "Ladestationen" + "zh_Hant": "充電站" }, "minzoom": 10, "source": { @@ -23,6 +24,8 @@ "title": { "render": { "en": "Charging station", + "nl": "Oplaadpunten", + "de": "Ladestation", "it": "Stazione di ricarica", "ja": "充電ステーション", "nb_NO": "Ladestasjon", @@ -32,19 +35,22 @@ }, "description": { "en": "A charging station", + "nl": "Oplaadpunten", + "de": "Eine Ladestation", "it": "Una stazione di ricarica", "ja": "充電ステーション", "nb_NO": "En ladestasjon", "ru": "Зарядная станция", - "zh_Hant": "充電站", - "de": "Eine Ladestation" + "zh_Hant": "充電站" }, "tagRenderings": [ "images", { "id": "Type", + "#": "Allowed vehicle types", "question": { "en": "Which vehicles are allowed to charge here?", + "nl": "Welke voertuigen kunnen hier opgeladen worden?", "de": "Welche Fahrzeuge dürfen hier geladen werden?" }, "multiAnswer": true, @@ -54,6 +60,7 @@ "ifnot": "bicycle=no", "then": { "en": "bicycles can be charged here", + "nl": "Fietsen kunnen hier opgeladen worden", "de": "Fahrräder können hier geladen werden" } }, @@ -62,6 +69,7 @@ "ifnot": "motorcar=no", "then": { "en": "Cars can be charged here", + "nl": "Elektrische auto's kunnen hier opgeladen worden", "de": "Autos können hier geladen werden" } }, @@ -70,6 +78,7 @@ "ifnot": "scooter=no", "then": { "en": "Scooters can be charged here", + "nl": "Electrische scooters (snorfiets of bromfiets) kunnen hier opgeladen worden", "de": " Roller können hier geladen werden" } }, @@ -78,6 +87,7 @@ "ifnot": "hgv=no", "then": { "en": "Heavy good vehicles (such as trucks) can be charged here", + "nl": "Vrachtwagens kunnen hier opgeladen worden", "de": "Lastkraftwagen (LKW) können hier geladen werden" } }, @@ -86,6 +96,7 @@ "ifnot": "bus=no", "then": { "en": "Buses can be charged here", + "nl": "Bussen kunnen hier opgeladen worden", "de": "Busse können hier geladen werden" } } @@ -95,10 +106,12 @@ "id": "access", "question": { "en": "Who is allowed to use this charging station?", + "nl": "Wie mag er dit oplaadpunt gebruiken?", "de": "Wer darf diese Ladestation benutzen?" }, "render": { "en": "Access is {access}", + "nl": "Toegang voor {access}", "de": "Zugang ist {access}" }, "freeform": { @@ -110,7 +123,10 @@ "mappings": [ { "if": "access=yes", - "then": "Anyone can use this charging station (payment might be needed)" + "then": { + "en": "Anyone can use this charging station (payment might be needed)", + "nl": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)" + } }, { "if": { @@ -119,16 +135,25 @@ "access=public" ] }, - "then": "Anyone can use this charging station (payment might be needed)", + "then": { + "en": "Anyone can use this charging station (payment might be needed)", + "nl": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)" + }, "hideInAnswer": true }, { "if": "access=customers", - "then": "Only customers of the place this station belongs to can use this charging station
E.g. a charging station operated by hotel which is only usable by their guests " + "then": { + "en": "Only customers of the place this station belongs to can use this charging station
E.g. a charging station operated by hotel which is only usable by their guests", + "nl": "Enkel klanten van de bijhorende plaats mogen dit oplaadpunt gebruiken
Bijvoorbeeld een oplaadpunt op de parking van een restaurant dat enkel door klanten van het restaurant gebruikt mag worden" + } }, { "if": "access=private", - "then": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)" + "then": { + "en": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)", + "nl": "Niet toegankelijk voor het publiek Enkel toegankelijk voor de eigenaar, medewerkers ,... " + } } ] }, @@ -153,6 +178,7 @@ "id": "Available_charging_stations (generated)", "question": { "en": "Which charging stations are available here?", + "nl": "Welke aansluitingen zijn hier beschikbaar?", "de": "Welche Ladestationen gibt es hier?" }, "multiAnswer": true, @@ -889,96 +915,6 @@ ] } }, - { - "id": "voltage-0", - "question": { - "en": "What voltage do the plugs with
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", - "nl": "Welke spanning levert de stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
" - }, - "render": { - "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs {socket:schuko:voltage} volt", - "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
heeft een spanning van {socket:schuko:voltage} volt" - }, - "freeform": { - "key": "socket:schuko:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:schuko:voltage=230 V", - "then": { - "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs 230 volt", - "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
heeft een spanning van 230 volt" - } - } - ], - "condition": { - "and": [ - "socket:schuko~*", - "socket:schuko!=0" - ] - } - }, - { - "id": "current-0", - "question": { - "en": "What current do the plugs with
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", - "nl": "Welke stroom levert de stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
?" - }, - "render": { - "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most {socket:schuko:current}A", - "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een stroom van maximaal {socket:schuko:current}A" - }, - "freeform": { - "key": "socket:schuko:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:schuko:current=16 A", - "then": { - "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most 16 A", - "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een stroom van maximaal 16 A" - } - } - ], - "condition": { - "and": [ - "socket:schuko~*", - "socket:schuko!=0" - ] - } - }, - { - "id": "power-output-0", - "question": { - "en": "What power output does a single plug of type
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
?" - }, - "render": { - "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most {socket:schuko:output}", - "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een vermogen van maximaal {socket:schuko:output}" - }, - "freeform": { - "key": "socket:schuko:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:schuko:output=3.6 kw", - "then": { - "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most 3.6 kw", - "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een vermogen van maximaal 3.6 kw" - } - } - ], - "condition": { - "and": [ - "socket:schuko~*", - "socket:schuko!=0" - ] - } - }, { "id": "plugs-1", "question": { @@ -1000,103 +936,6 @@ ] } }, - { - "id": "voltage-1", - "question": { - "en": "What voltage do the plugs with
European wall plug with ground pin (CEE7/4 type E)
offer?", - "nl": "Welke spanning levert de stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
" - }, - "render": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs {socket:typee:voltage} volt", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
heeft een spanning van {socket:typee:voltage} volt" - }, - "freeform": { - "key": "socket:typee:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:typee:voltage=230 V", - "then": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs 230 volt", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
heeft een spanning van 230 volt" - } - } - ], - "condition": { - "and": [ - "socket:typee~*", - "socket:typee!=0" - ] - } - }, - { - "id": "current-1", - "question": { - "en": "What current do the plugs with
European wall plug with ground pin (CEE7/4 type E)
offer?", - "nl": "Welke stroom levert de stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
?" - }, - "render": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most {socket:typee:current}A", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een stroom van maximaal {socket:typee:current}A" - }, - "freeform": { - "key": "socket:typee:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:typee:current=16 A", - "then": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most 16 A", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een stroom van maximaal 16 A" - } - } - ], - "condition": { - "and": [ - "socket:typee~*", - "socket:typee!=0" - ] - } - }, - { - "id": "power-output-1", - "question": { - "en": "What power output does a single plug of type
European wall plug with ground pin (CEE7/4 type E)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
?" - }, - "render": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most {socket:typee:output}", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een vermogen van maximaal {socket:typee:output}" - }, - "freeform": { - "key": "socket:typee:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:typee:output=3 kw", - "then": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most 3 kw", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een vermogen van maximaal 3 kw" - } - }, - { - "if": "socket:socket:typee:output=22 kw", - "then": { - "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most 22 kw", - "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een vermogen van maximaal 22 kw" - } - } - ], - "condition": { - "and": [ - "socket:typee~*", - "socket:typee!=0" - ] - } - }, { "id": "plugs-2", "question": { @@ -1118,96 +957,6 @@ ] } }, - { - "id": "voltage-2", - "question": { - "en": "What voltage do the plugs with
Chademo
offer?", - "nl": "Welke spanning levert de stekker van type
Chademo
" - }, - "render": { - "en": "
Chademo
outputs {socket:chademo:voltage} volt", - "nl": "
Chademo
heeft een spanning van {socket:chademo:voltage} volt" - }, - "freeform": { - "key": "socket:chademo:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:chademo:voltage=500 V", - "then": { - "en": "
Chademo
outputs 500 volt", - "nl": "
Chademo
heeft een spanning van 500 volt" - } - } - ], - "condition": { - "and": [ - "socket:chademo~*", - "socket:chademo!=0" - ] - } - }, - { - "id": "current-2", - "question": { - "en": "What current do the plugs with
Chademo
offer?", - "nl": "Welke stroom levert de stekker van type
Chademo
?" - }, - "render": { - "en": "
Chademo
outputs at most {socket:chademo:current}A", - "nl": "
Chademo
levert een stroom van maximaal {socket:chademo:current}A" - }, - "freeform": { - "key": "socket:chademo:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:chademo:current=120 A", - "then": { - "en": "
Chademo
outputs at most 120 A", - "nl": "
Chademo
levert een stroom van maximaal 120 A" - } - } - ], - "condition": { - "and": [ - "socket:chademo~*", - "socket:chademo!=0" - ] - } - }, - { - "id": "power-output-2", - "question": { - "en": "What power output does a single plug of type
Chademo
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Chademo
?" - }, - "render": { - "en": "
Chademo
outputs at most {socket:chademo:output}", - "nl": "
Chademo
levert een vermogen van maximaal {socket:chademo:output}" - }, - "freeform": { - "key": "socket:chademo:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:chademo:output=50 kw", - "then": { - "en": "
Chademo
outputs at most 50 kw", - "nl": "
Chademo
levert een vermogen van maximaal 50 kw" - } - } - ], - "condition": { - "and": [ - "socket:chademo~*", - "socket:chademo!=0" - ] - } - }, { "id": "plugs-3", "question": { @@ -1229,110 +978,6 @@ ] } }, - { - "id": "voltage-3", - "question": { - "en": "What voltage do the plugs with
Type 1 with cable (J1772)
offer?", - "nl": "Welke spanning levert de stekker van type
Type 1 met kabel (J1772)
" - }, - "render": { - "en": "
Type 1 with cable (J1772)
outputs {socket:type1_cable:voltage} volt", - "nl": "
Type 1 met kabel (J1772)
heeft een spanning van {socket:type1_cable:voltage} volt" - }, - "freeform": { - "key": "socket:type1_cable:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1_cable:voltage=200 V", - "then": { - "en": "
Type 1 with cable (J1772)
outputs 200 volt", - "nl": "
Type 1 met kabel (J1772)
heeft een spanning van 200 volt" - } - }, - { - "if": "socket:socket:type1_cable:voltage=240 V", - "then": { - "en": "
Type 1 with cable (J1772)
outputs 240 volt", - "nl": "
Type 1 met kabel (J1772)
heeft een spanning van 240 volt" - } - } - ], - "condition": { - "and": [ - "socket:type1_cable~*", - "socket:type1_cable!=0" - ] - } - }, - { - "id": "current-3", - "question": { - "en": "What current do the plugs with
Type 1 with cable (J1772)
offer?", - "nl": "Welke stroom levert de stekker van type
Type 1 met kabel (J1772)
?" - }, - "render": { - "en": "
Type 1 with cable (J1772)
outputs at most {socket:type1_cable:current}A", - "nl": "
Type 1 met kabel (J1772)
levert een stroom van maximaal {socket:type1_cable:current}A" - }, - "freeform": { - "key": "socket:type1_cable:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1_cable:current=32 A", - "then": { - "en": "
Type 1 with cable (J1772)
outputs at most 32 A", - "nl": "
Type 1 met kabel (J1772)
levert een stroom van maximaal 32 A" - } - } - ], - "condition": { - "and": [ - "socket:type1_cable~*", - "socket:type1_cable!=0" - ] - } - }, - { - "id": "power-output-3", - "question": { - "en": "What power output does a single plug of type
Type 1 with cable (J1772)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Type 1 met kabel (J1772)
?" - }, - "render": { - "en": "
Type 1 with cable (J1772)
outputs at most {socket:type1_cable:output}", - "nl": "
Type 1 met kabel (J1772)
levert een vermogen van maximaal {socket:type1_cable:output}" - }, - "freeform": { - "key": "socket:type1_cable:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1_cable:output=3.7 kw", - "then": { - "en": "
Type 1 with cable (J1772)
outputs at most 3.7 kw", - "nl": "
Type 1 met kabel (J1772)
levert een vermogen van maximaal 3.7 kw" - } - }, - { - "if": "socket:socket:type1_cable:output=7 kw", - "then": { - "en": "
Type 1 with cable (J1772)
outputs at most 7 kw", - "nl": "
Type 1 met kabel (J1772)
levert een vermogen van maximaal 7 kw" - } - } - ], - "condition": { - "and": [ - "socket:type1_cable~*", - "socket:type1_cable!=0" - ] - } - }, { "id": "plugs-4", "question": { @@ -1354,124 +999,6 @@ ] } }, - { - "id": "voltage-4", - "question": { - "en": "What voltage do the plugs with
Type 1 without cable (J1772)
offer?", - "nl": "Welke spanning levert de stekker van type
Type 1 zonder kabel (J1772)
" - }, - "render": { - "en": "
Type 1 without cable (J1772)
outputs {socket:type1:voltage} volt", - "nl": "
Type 1 zonder kabel (J1772)
heeft een spanning van {socket:type1:voltage} volt" - }, - "freeform": { - "key": "socket:type1:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1:voltage=200 V", - "then": { - "en": "
Type 1 without cable (J1772)
outputs 200 volt", - "nl": "
Type 1 zonder kabel (J1772)
heeft een spanning van 200 volt" - } - }, - { - "if": "socket:socket:type1:voltage=240 V", - "then": { - "en": "
Type 1 without cable (J1772)
outputs 240 volt", - "nl": "
Type 1 zonder kabel (J1772)
heeft een spanning van 240 volt" - } - } - ], - "condition": { - "and": [ - "socket:type1~*", - "socket:type1!=0" - ] - } - }, - { - "id": "current-4", - "question": { - "en": "What current do the plugs with
Type 1 without cable (J1772)
offer?", - "nl": "Welke stroom levert de stekker van type
Type 1 zonder kabel (J1772)
?" - }, - "render": { - "en": "
Type 1 without cable (J1772)
outputs at most {socket:type1:current}A", - "nl": "
Type 1 zonder kabel (J1772)
levert een stroom van maximaal {socket:type1:current}A" - }, - "freeform": { - "key": "socket:type1:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1:current=32 A", - "then": { - "en": "
Type 1 without cable (J1772)
outputs at most 32 A", - "nl": "
Type 1 zonder kabel (J1772)
levert een stroom van maximaal 32 A" - } - } - ], - "condition": { - "and": [ - "socket:type1~*", - "socket:type1!=0" - ] - } - }, - { - "id": "power-output-4", - "question": { - "en": "What power output does a single plug of type
Type 1 without cable (J1772)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Type 1 zonder kabel (J1772)
?" - }, - "render": { - "en": "
Type 1 without cable (J1772)
outputs at most {socket:type1:output}", - "nl": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal {socket:type1:output}" - }, - "freeform": { - "key": "socket:type1:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1:output=3.7 kw", - "then": { - "en": "
Type 1 without cable (J1772)
outputs at most 3.7 kw", - "nl": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 3.7 kw" - } - }, - { - "if": "socket:socket:type1:output=6.6 kw", - "then": { - "en": "
Type 1 without cable (J1772)
outputs at most 6.6 kw", - "nl": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 6.6 kw" - } - }, - { - "if": "socket:socket:type1:output=7 kw", - "then": { - "en": "
Type 1 without cable (J1772)
outputs at most 7 kw", - "nl": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 7 kw" - } - }, - { - "if": "socket:socket:type1:output=7.2 kw", - "then": { - "en": "
Type 1 without cable (J1772)
outputs at most 7.2 kw", - "nl": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 7.2 kw" - } - } - ], - "condition": { - "and": [ - "socket:type1~*", - "socket:type1!=0" - ] - } - }, { "id": "plugs-5", "question": { @@ -1493,131 +1020,6 @@ ] } }, - { - "id": "voltage-5", - "question": { - "en": "What voltage do the plugs with
Type 1 CCS (aka Type 1 Combo)
offer?", - "nl": "Welke spanning levert de stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
" - }, - "render": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs {socket:type1_combo:voltage} volt", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
heeft een spanning van {socket:type1_combo:voltage} volt" - }, - "freeform": { - "key": "socket:type1_combo:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1_combo:voltage=400 V", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs 400 volt", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
heeft een spanning van 400 volt" - } - }, - { - "if": "socket:socket:type1_combo:voltage=1000 V", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs 1000 volt", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
heeft een spanning van 1000 volt" - } - } - ], - "condition": { - "and": [ - "socket:type1_combo~*", - "socket:type1_combo!=0" - ] - } - }, - { - "id": "current-5", - "question": { - "en": "What current do the plugs with
Type 1 CCS (aka Type 1 Combo)
offer?", - "nl": "Welke stroom levert de stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
?" - }, - "render": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most {socket:type1_combo:current}A", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal {socket:type1_combo:current}A" - }, - "freeform": { - "key": "socket:type1_combo:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1_combo:current=50 A", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 50 A", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal 50 A" - } - }, - { - "if": "socket:socket:type1_combo:current=125 A", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 125 A", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal 125 A" - } - } - ], - "condition": { - "and": [ - "socket:type1_combo~*", - "socket:type1_combo!=0" - ] - } - }, - { - "id": "power-output-5", - "question": { - "en": "What power output does a single plug of type
Type 1 CCS (aka Type 1 Combo)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
?" - }, - "render": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most {socket:type1_combo:output}", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal {socket:type1_combo:output}" - }, - "freeform": { - "key": "socket:type1_combo:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type1_combo:output=50 kw", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 50 kw", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 50 kw" - } - }, - { - "if": "socket:socket:type1_combo:output=62.5 kw", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 62.5 kw", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 62.5 kw" - } - }, - { - "if": "socket:socket:type1_combo:output=150 kw", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 150 kw", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 150 kw" - } - }, - { - "if": "socket:socket:type1_combo:output=350 kw", - "then": { - "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 350 kw", - "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 350 kw" - } - } - ], - "condition": { - "and": [ - "socket:type1_combo~*", - "socket:type1_combo!=0" - ] - } - }, { "id": "plugs-6", "question": { @@ -1639,117 +1041,6 @@ ] } }, - { - "id": "voltage-6", - "question": { - "en": "What voltage do the plugs with
Tesla Supercharger
offer?", - "nl": "Welke spanning levert de stekker van type
Tesla Supercharger
" - }, - "render": { - "en": "
Tesla Supercharger
outputs {socket:tesla_supercharger:voltage} volt", - "nl": "
Tesla Supercharger
heeft een spanning van {socket:tesla_supercharger:voltage} volt" - }, - "freeform": { - "key": "socket:tesla_supercharger:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_supercharger:voltage=480 V", - "then": { - "en": "
Tesla Supercharger
outputs 480 volt", - "nl": "
Tesla Supercharger
heeft een spanning van 480 volt" - } - } - ], - "condition": { - "and": [ - "socket:tesla_supercharger~*", - "socket:tesla_supercharger!=0" - ] - } - }, - { - "id": "current-6", - "question": { - "en": "What current do the plugs with
Tesla Supercharger
offer?", - "nl": "Welke stroom levert de stekker van type
Tesla Supercharger
?" - }, - "render": { - "en": "
Tesla Supercharger
outputs at most {socket:tesla_supercharger:current}A", - "nl": "
Tesla Supercharger
levert een stroom van maximaal {socket:tesla_supercharger:current}A" - }, - "freeform": { - "key": "socket:tesla_supercharger:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_supercharger:current=125 A", - "then": { - "en": "
Tesla Supercharger
outputs at most 125 A", - "nl": "
Tesla Supercharger
levert een stroom van maximaal 125 A" - } - }, - { - "if": "socket:socket:tesla_supercharger:current=350 A", - "then": { - "en": "
Tesla Supercharger
outputs at most 350 A", - "nl": "
Tesla Supercharger
levert een stroom van maximaal 350 A" - } - } - ], - "condition": { - "and": [ - "socket:tesla_supercharger~*", - "socket:tesla_supercharger!=0" - ] - } - }, - { - "id": "power-output-6", - "question": { - "en": "What power output does a single plug of type
Tesla Supercharger
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Tesla Supercharger
?" - }, - "render": { - "en": "
Tesla Supercharger
outputs at most {socket:tesla_supercharger:output}", - "nl": "
Tesla Supercharger
levert een vermogen van maximaal {socket:tesla_supercharger:output}" - }, - "freeform": { - "key": "socket:tesla_supercharger:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_supercharger:output=120 kw", - "then": { - "en": "
Tesla Supercharger
outputs at most 120 kw", - "nl": "
Tesla Supercharger
levert een vermogen van maximaal 120 kw" - } - }, - { - "if": "socket:socket:tesla_supercharger:output=150 kw", - "then": { - "en": "
Tesla Supercharger
outputs at most 150 kw", - "nl": "
Tesla Supercharger
levert een vermogen van maximaal 150 kw" - } - }, - { - "if": "socket:socket:tesla_supercharger:output=250 kw", - "then": { - "en": "
Tesla Supercharger
outputs at most 250 kw", - "nl": "
Tesla Supercharger
levert een vermogen van maximaal 250 kw" - } - } - ], - "condition": { - "and": [ - "socket:tesla_supercharger~*", - "socket:tesla_supercharger!=0" - ] - } - }, { "id": "plugs-7", "question": { @@ -1771,117 +1062,6 @@ ] } }, - { - "id": "voltage-7", - "question": { - "en": "What voltage do the plugs with
Type 2 (mennekes)
offer?", - "nl": "Welke spanning levert de stekker van type
Type 2 (mennekes)
" - }, - "render": { - "en": "
Type 2 (mennekes)
outputs {socket:type2:voltage} volt", - "nl": "
Type 2 (mennekes)
heeft een spanning van {socket:type2:voltage} volt" - }, - "freeform": { - "key": "socket:type2:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2:voltage=230 V", - "then": { - "en": "
Type 2 (mennekes)
outputs 230 volt", - "nl": "
Type 2 (mennekes)
heeft een spanning van 230 volt" - } - }, - { - "if": "socket:socket:type2:voltage=400 V", - "then": { - "en": "
Type 2 (mennekes)
outputs 400 volt", - "nl": "
Type 2 (mennekes)
heeft een spanning van 400 volt" - } - } - ], - "condition": { - "and": [ - "socket:type2~*", - "socket:type2!=0" - ] - } - }, - { - "id": "current-7", - "question": { - "en": "What current do the plugs with
Type 2 (mennekes)
offer?", - "nl": "Welke stroom levert de stekker van type
Type 2 (mennekes)
?" - }, - "render": { - "en": "
Type 2 (mennekes)
outputs at most {socket:type2:current}A", - "nl": "
Type 2 (mennekes)
levert een stroom van maximaal {socket:type2:current}A" - }, - "freeform": { - "key": "socket:type2:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2:current=16 A", - "then": { - "en": "
Type 2 (mennekes)
outputs at most 16 A", - "nl": "
Type 2 (mennekes)
levert een stroom van maximaal 16 A" - } - }, - { - "if": "socket:socket:type2:current=32 A", - "then": { - "en": "
Type 2 (mennekes)
outputs at most 32 A", - "nl": "
Type 2 (mennekes)
levert een stroom van maximaal 32 A" - } - } - ], - "condition": { - "and": [ - "socket:type2~*", - "socket:type2!=0" - ] - } - }, - { - "id": "power-output-7", - "question": { - "en": "What power output does a single plug of type
Type 2 (mennekes)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Type 2 (mennekes)
?" - }, - "render": { - "en": "
Type 2 (mennekes)
outputs at most {socket:type2:output}", - "nl": "
Type 2 (mennekes)
levert een vermogen van maximaal {socket:type2:output}" - }, - "freeform": { - "key": "socket:type2:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2:output=11 kw", - "then": { - "en": "
Type 2 (mennekes)
outputs at most 11 kw", - "nl": "
Type 2 (mennekes)
levert een vermogen van maximaal 11 kw" - } - }, - { - "if": "socket:socket:type2:output=22 kw", - "then": { - "en": "
Type 2 (mennekes)
outputs at most 22 kw", - "nl": "
Type 2 (mennekes)
levert een vermogen van maximaal 22 kw" - } - } - ], - "condition": { - "and": [ - "socket:type2~*", - "socket:type2!=0" - ] - } - }, { "id": "plugs-8", "question": { @@ -1903,110 +1083,6 @@ ] } }, - { - "id": "voltage-8", - "question": { - "en": "What voltage do the plugs with
Type 2 CCS (mennekes)
offer?", - "nl": "Welke spanning levert de stekker van type
Type 2 CCS (mennekes)
" - }, - "render": { - "en": "
Type 2 CCS (mennekes)
outputs {socket:type2_combo:voltage} volt", - "nl": "
Type 2 CCS (mennekes)
heeft een spanning van {socket:type2_combo:voltage} volt" - }, - "freeform": { - "key": "socket:type2_combo:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2_combo:voltage=500 V", - "then": { - "en": "
Type 2 CCS (mennekes)
outputs 500 volt", - "nl": "
Type 2 CCS (mennekes)
heeft een spanning van 500 volt" - } - }, - { - "if": "socket:socket:type2_combo:voltage=920 V", - "then": { - "en": "
Type 2 CCS (mennekes)
outputs 920 volt", - "nl": "
Type 2 CCS (mennekes)
heeft een spanning van 920 volt" - } - } - ], - "condition": { - "and": [ - "socket:type2_combo~*", - "socket:type2_combo!=0" - ] - } - }, - { - "id": "current-8", - "question": { - "en": "What current do the plugs with
Type 2 CCS (mennekes)
offer?", - "nl": "Welke stroom levert de stekker van type
Type 2 CCS (mennekes)
?" - }, - "render": { - "en": "
Type 2 CCS (mennekes)
outputs at most {socket:type2_combo:current}A", - "nl": "
Type 2 CCS (mennekes)
levert een stroom van maximaal {socket:type2_combo:current}A" - }, - "freeform": { - "key": "socket:type2_combo:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2_combo:current=125 A", - "then": { - "en": "
Type 2 CCS (mennekes)
outputs at most 125 A", - "nl": "
Type 2 CCS (mennekes)
levert een stroom van maximaal 125 A" - } - }, - { - "if": "socket:socket:type2_combo:current=350 A", - "then": { - "en": "
Type 2 CCS (mennekes)
outputs at most 350 A", - "nl": "
Type 2 CCS (mennekes)
levert een stroom van maximaal 350 A" - } - } - ], - "condition": { - "and": [ - "socket:type2_combo~*", - "socket:type2_combo!=0" - ] - } - }, - { - "id": "power-output-8", - "question": { - "en": "What power output does a single plug of type
Type 2 CCS (mennekes)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Type 2 CCS (mennekes)
?" - }, - "render": { - "en": "
Type 2 CCS (mennekes)
outputs at most {socket:type2_combo:output}", - "nl": "
Type 2 CCS (mennekes)
levert een vermogen van maximaal {socket:type2_combo:output}" - }, - "freeform": { - "key": "socket:type2_combo:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2_combo:output=50 kw", - "then": { - "en": "
Type 2 CCS (mennekes)
outputs at most 50 kw", - "nl": "
Type 2 CCS (mennekes)
levert een vermogen van maximaal 50 kw" - } - } - ], - "condition": { - "and": [ - "socket:type2_combo~*", - "socket:type2_combo!=0" - ] - } - }, { "id": "plugs-9", "question": { @@ -2028,117 +1104,6 @@ ] } }, - { - "id": "voltage-9", - "question": { - "en": "What voltage do the plugs with
Type 2 with cable (mennekes)
offer?", - "nl": "Welke spanning levert de stekker van type
Type 2 met kabel (J1772)
" - }, - "render": { - "en": "
Type 2 with cable (mennekes)
outputs {socket:type2_cable:voltage} volt", - "nl": "
Type 2 met kabel (J1772)
heeft een spanning van {socket:type2_cable:voltage} volt" - }, - "freeform": { - "key": "socket:type2_cable:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2_cable:voltage=230 V", - "then": { - "en": "
Type 2 with cable (mennekes)
outputs 230 volt", - "nl": "
Type 2 met kabel (J1772)
heeft een spanning van 230 volt" - } - }, - { - "if": "socket:socket:type2_cable:voltage=400 V", - "then": { - "en": "
Type 2 with cable (mennekes)
outputs 400 volt", - "nl": "
Type 2 met kabel (J1772)
heeft een spanning van 400 volt" - } - } - ], - "condition": { - "and": [ - "socket:type2_cable~*", - "socket:type2_cable!=0" - ] - } - }, - { - "id": "current-9", - "question": { - "en": "What current do the plugs with
Type 2 with cable (mennekes)
offer?", - "nl": "Welke stroom levert de stekker van type
Type 2 met kabel (J1772)
?" - }, - "render": { - "en": "
Type 2 with cable (mennekes)
outputs at most {socket:type2_cable:current}A", - "nl": "
Type 2 met kabel (J1772)
levert een stroom van maximaal {socket:type2_cable:current}A" - }, - "freeform": { - "key": "socket:type2_cable:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2_cable:current=16 A", - "then": { - "en": "
Type 2 with cable (mennekes)
outputs at most 16 A", - "nl": "
Type 2 met kabel (J1772)
levert een stroom van maximaal 16 A" - } - }, - { - "if": "socket:socket:type2_cable:current=32 A", - "then": { - "en": "
Type 2 with cable (mennekes)
outputs at most 32 A", - "nl": "
Type 2 met kabel (J1772)
levert een stroom van maximaal 32 A" - } - } - ], - "condition": { - "and": [ - "socket:type2_cable~*", - "socket:type2_cable!=0" - ] - } - }, - { - "id": "power-output-9", - "question": { - "en": "What power output does a single plug of type
Type 2 with cable (mennekes)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Type 2 met kabel (J1772)
?" - }, - "render": { - "en": "
Type 2 with cable (mennekes)
outputs at most {socket:type2_cable:output}", - "nl": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal {socket:type2_cable:output}" - }, - "freeform": { - "key": "socket:type2_cable:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:type2_cable:output=11 kw", - "then": { - "en": "
Type 2 with cable (mennekes)
outputs at most 11 kw", - "nl": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal 11 kw" - } - }, - { - "if": "socket:socket:type2_cable:output=22 kw", - "then": { - "en": "
Type 2 with cable (mennekes)
outputs at most 22 kw", - "nl": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal 22 kw" - } - } - ], - "condition": { - "and": [ - "socket:type2_cable~*", - "socket:type2_cable!=0" - ] - } - }, { "id": "plugs-10", "question": { @@ -2160,110 +1125,6 @@ ] } }, - { - "id": "voltage-10", - "question": { - "en": "What voltage do the plugs with
Tesla Supercharger CCS (a branded type2_css)
offer?", - "nl": "Welke spanning levert de stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
" - }, - "render": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs {socket:tesla_supercharger_ccs:voltage} volt", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft een spanning van {socket:tesla_supercharger_ccs:voltage} volt" - }, - "freeform": { - "key": "socket:tesla_supercharger_ccs:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_supercharger_ccs:voltage=500 V", - "then": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs 500 volt", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft een spanning van 500 volt" - } - }, - { - "if": "socket:socket:tesla_supercharger_ccs:voltage=920 V", - "then": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs 920 volt", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft een spanning van 920 volt" - } - } - ], - "condition": { - "and": [ - "socket:tesla_supercharger_ccs~*", - "socket:tesla_supercharger_ccs!=0" - ] - } - }, - { - "id": "current-10", - "question": { - "en": "What current do the plugs with
Tesla Supercharger CCS (a branded type2_css)
offer?", - "nl": "Welke stroom levert de stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
?" - }, - "render": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most {socket:tesla_supercharger_ccs:current}A", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal {socket:tesla_supercharger_ccs:current}A" - }, - "freeform": { - "key": "socket:tesla_supercharger_ccs:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_supercharger_ccs:current=125 A", - "then": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most 125 A", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal 125 A" - } - }, - { - "if": "socket:socket:tesla_supercharger_ccs:current=350 A", - "then": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most 350 A", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal 350 A" - } - } - ], - "condition": { - "and": [ - "socket:tesla_supercharger_ccs~*", - "socket:tesla_supercharger_ccs!=0" - ] - } - }, - { - "id": "power-output-10", - "question": { - "en": "What power output does a single plug of type
Tesla Supercharger CCS (a branded type2_css)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
?" - }, - "render": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most {socket:tesla_supercharger_ccs:output}", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een vermogen van maximaal {socket:tesla_supercharger_ccs:output}" - }, - "freeform": { - "key": "socket:tesla_supercharger_ccs:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_supercharger_ccs:output=50 kw", - "then": { - "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most 50 kw", - "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een vermogen van maximaal 50 kw" - } - } - ], - "condition": { - "and": [ - "socket:tesla_supercharger_ccs~*", - "socket:tesla_supercharger_ccs!=0" - ] - } - }, { "id": "plugs-11", "question": { @@ -2285,117 +1146,6 @@ ] } }, - { - "id": "voltage-11", - "question": { - "en": "What voltage do the plugs with
Tesla Supercharger (destination)
offer?", - "nl": "Welke spanning levert de stekker van type
Tesla Supercharger (destination)
" - }, - "render": { - "en": "
Tesla Supercharger (destination)
outputs {socket:tesla_destination:voltage} volt", - "nl": "
Tesla Supercharger (destination)
heeft een spanning van {socket:tesla_destination:voltage} volt" - }, - "freeform": { - "key": "socket:tesla_destination:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_destination:voltage=480 V", - "then": { - "en": "
Tesla Supercharger (destination)
outputs 480 volt", - "nl": "
Tesla Supercharger (destination)
heeft een spanning van 480 volt" - } - } - ], - "condition": { - "and": [ - "socket:tesla_destination~*", - "socket:tesla_destination!=0" - ] - } - }, - { - "id": "current-11", - "question": { - "en": "What current do the plugs with
Tesla Supercharger (destination)
offer?", - "nl": "Welke stroom levert de stekker van type
Tesla Supercharger (destination)
?" - }, - "render": { - "en": "
Tesla Supercharger (destination)
outputs at most {socket:tesla_destination:current}A", - "nl": "
Tesla Supercharger (destination)
levert een stroom van maximaal {socket:tesla_destination:current}A" - }, - "freeform": { - "key": "socket:tesla_destination:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_destination:current=125 A", - "then": { - "en": "
Tesla Supercharger (destination)
outputs at most 125 A", - "nl": "
Tesla Supercharger (destination)
levert een stroom van maximaal 125 A" - } - }, - { - "if": "socket:socket:tesla_destination:current=350 A", - "then": { - "en": "
Tesla Supercharger (destination)
outputs at most 350 A", - "nl": "
Tesla Supercharger (destination)
levert een stroom van maximaal 350 A" - } - } - ], - "condition": { - "and": [ - "socket:tesla_destination~*", - "socket:tesla_destination!=0" - ] - } - }, - { - "id": "power-output-11", - "question": { - "en": "What power output does a single plug of type
Tesla Supercharger (destination)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Tesla Supercharger (destination)
?" - }, - "render": { - "en": "
Tesla Supercharger (destination)
outputs at most {socket:tesla_destination:output}", - "nl": "
Tesla Supercharger (destination)
levert een vermogen van maximaal {socket:tesla_destination:output}" - }, - "freeform": { - "key": "socket:tesla_destination:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_destination:output=120 kw", - "then": { - "en": "
Tesla Supercharger (destination)
outputs at most 120 kw", - "nl": "
Tesla Supercharger (destination)
levert een vermogen van maximaal 120 kw" - } - }, - { - "if": "socket:socket:tesla_destination:output=150 kw", - "then": { - "en": "
Tesla Supercharger (destination)
outputs at most 150 kw", - "nl": "
Tesla Supercharger (destination)
levert een vermogen van maximaal 150 kw" - } - }, - { - "if": "socket:socket:tesla_destination:output=250 kw", - "then": { - "en": "
Tesla Supercharger (destination)
outputs at most 250 kw", - "nl": "
Tesla Supercharger (destination)
levert een vermogen van maximaal 250 kw" - } - } - ], - "condition": { - "and": [ - "socket:tesla_destination~*", - "socket:tesla_destination!=0" - ] - } - }, { "id": "plugs-12", "question": { @@ -2417,117 +1167,6 @@ ] } }, - { - "id": "voltage-12", - "question": { - "en": "What voltage do the plugs with
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
offer?", - "nl": "Welke spanning levert de stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
" - }, - "render": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs {socket:tesla_destination:voltage} volt", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van {socket:tesla_destination:voltage} volt" - }, - "freeform": { - "key": "socket:tesla_destination:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_destination:voltage=230 V", - "then": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs 230 volt", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van 230 volt" - } - }, - { - "if": "socket:socket:tesla_destination:voltage=400 V", - "then": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs 400 volt", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van 400 volt" - } - } - ], - "condition": { - "and": [ - "socket:tesla_destination~*", - "socket:tesla_destination!=0" - ] - } - }, - { - "id": "current-12", - "question": { - "en": "What current do the plugs with
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
offer?", - "nl": "Welke stroom levert de stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
?" - }, - "render": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most {socket:tesla_destination:current}A", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal {socket:tesla_destination:current}A" - }, - "freeform": { - "key": "socket:tesla_destination:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_destination:current=16 A", - "then": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 16 A", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal 16 A" - } - }, - { - "if": "socket:socket:tesla_destination:current=32 A", - "then": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 32 A", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal 32 A" - } - } - ], - "condition": { - "and": [ - "socket:tesla_destination~*", - "socket:tesla_destination!=0" - ] - } - }, - { - "id": "power-output-12", - "question": { - "en": "What power output does a single plug of type
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
?" - }, - "render": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most {socket:tesla_destination:output}", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal {socket:tesla_destination:output}" - }, - "freeform": { - "key": "socket:tesla_destination:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:tesla_destination:output=11 kw", - "then": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 11 kw", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal 11 kw" - } - }, - { - "if": "socket:socket:tesla_destination:output=22 kw", - "then": { - "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 22 kw", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal 22 kw" - } - } - ], - "condition": { - "and": [ - "socket:tesla_destination~*", - "socket:tesla_destination!=0" - ] - } - }, { "id": "plugs-13", "question": { @@ -2549,110 +1188,6 @@ ] } }, - { - "id": "voltage-13", - "question": { - "en": "What voltage do the plugs with
USB to charge phones and small electronics
offer?", - "nl": "Welke spanning levert de stekker van type
USB om GSMs en kleine electronica op te laden
" - }, - "render": { - "en": "
USB to charge phones and small electronics
outputs {socket:USB-A:voltage} volt", - "nl": "
USB om GSMs en kleine electronica op te laden
heeft een spanning van {socket:USB-A:voltage} volt" - }, - "freeform": { - "key": "socket:USB-A:voltage", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:USB-A:voltage=5 V", - "then": { - "en": "
USB to charge phones and small electronics
outputs 5 volt", - "nl": "
USB om GSMs en kleine electronica op te laden
heeft een spanning van 5 volt" - } - } - ], - "condition": { - "and": [ - "socket:USB-A~*", - "socket:USB-A!=0" - ] - } - }, - { - "id": "current-13", - "question": { - "en": "What current do the plugs with
USB to charge phones and small electronics
offer?", - "nl": "Welke stroom levert de stekker van type
USB om GSMs en kleine electronica op te laden
?" - }, - "render": { - "en": "
USB to charge phones and small electronics
outputs at most {socket:USB-A:current}A", - "nl": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal {socket:USB-A:current}A" - }, - "freeform": { - "key": "socket:USB-A:current", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:USB-A:current=1 A", - "then": { - "en": "
USB to charge phones and small electronics
outputs at most 1 A", - "nl": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal 1 A" - } - }, - { - "if": "socket:socket:USB-A:current=2 A", - "then": { - "en": "
USB to charge phones and small electronics
outputs at most 2 A", - "nl": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal 2 A" - } - } - ], - "condition": { - "and": [ - "socket:USB-A~*", - "socket:USB-A!=0" - ] - } - }, - { - "id": "power-output-13", - "question": { - "en": "What power output does a single plug of type
USB to charge phones and small electronics
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
USB om GSMs en kleine electronica op te laden
?" - }, - "render": { - "en": "
USB to charge phones and small electronics
outputs at most {socket:USB-A:output}", - "nl": "
USB om GSMs en kleine electronica op te laden
levert een vermogen van maximaal {socket:USB-A:output}" - }, - "freeform": { - "key": "socket:USB-A:output", - "type": "pfloat" - }, - "mappings": [ - { - "if": "socket:socket:USB-A:output=5w", - "then": { - "en": "
USB to charge phones and small electronics
outputs at most 5w", - "nl": "
USB om GSMs en kleine electronica op te laden
levert een vermogen van maximaal 5w" - } - }, - { - "if": "socket:socket:USB-A:output=10w", - "then": { - "en": "
USB to charge phones and small electronics
outputs at most 10w", - "nl": "
USB om GSMs en kleine electronica op te laden
levert een vermogen van maximaal 10w" - } - } - ], - "condition": { - "and": [ - "socket:USB-A~*", - "socket:USB-A!=0" - ] - } - }, { "id": "plugs-14", "question": { @@ -2674,72 +1209,6 @@ ] } }, - { - "id": "voltage-14", - "question": { - "en": "What voltage do the plugs with
Bosch Active Connect with 3 pins and cable
offer?", - "nl": "Welke spanning levert de stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
" - }, - "render": { - "en": "
Bosch Active Connect with 3 pins and cable
outputs {socket:bosch_3pin:voltage} volt", - "nl": "
Bosch Active Connect met 3 pinnen aan een kabel
heeft een spanning van {socket:bosch_3pin:voltage} volt" - }, - "freeform": { - "key": "socket:bosch_3pin:voltage", - "type": "pfloat" - }, - "mappings": [], - "condition": { - "and": [ - "socket:bosch_3pin~*", - "socket:bosch_3pin!=0" - ] - } - }, - { - "id": "current-14", - "question": { - "en": "What current do the plugs with
Bosch Active Connect with 3 pins and cable
offer?", - "nl": "Welke stroom levert de stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
?" - }, - "render": { - "en": "
Bosch Active Connect with 3 pins and cable
outputs at most {socket:bosch_3pin:current}A", - "nl": "
Bosch Active Connect met 3 pinnen aan een kabel
levert een stroom van maximaal {socket:bosch_3pin:current}A" - }, - "freeform": { - "key": "socket:bosch_3pin:current", - "type": "pfloat" - }, - "mappings": [], - "condition": { - "and": [ - "socket:bosch_3pin~*", - "socket:bosch_3pin!=0" - ] - } - }, - { - "id": "power-output-14", - "question": { - "en": "What power output does a single plug of type
Bosch Active Connect with 3 pins and cable
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
?" - }, - "render": { - "en": "
Bosch Active Connect with 3 pins and cable
outputs at most {socket:bosch_3pin:output}", - "nl": "
Bosch Active Connect met 3 pinnen aan een kabel
levert een vermogen van maximaal {socket:bosch_3pin:output}" - }, - "freeform": { - "key": "socket:bosch_3pin:output", - "type": "pfloat" - }, - "mappings": [], - "condition": { - "and": [ - "socket:bosch_3pin~*", - "socket:bosch_3pin!=0" - ] - } - }, { "id": "plugs-15", "question": { @@ -2761,201 +1230,6 @@ ] } }, - { - "id": "voltage-15", - "question": { - "en": "What voltage do the plugs with
Bosch Active Connect with 5 pins and cable
offer?", - "nl": "Welke spanning levert de stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
" - }, - "render": { - "en": "
Bosch Active Connect with 5 pins and cable
outputs {socket:bosch_5pin:voltage} volt", - "nl": "
Bosch Active Connect met 5 pinnen aan een kabel
heeft een spanning van {socket:bosch_5pin:voltage} volt" - }, - "freeform": { - "key": "socket:bosch_5pin:voltage", - "type": "pfloat" - }, - "mappings": [], - "condition": { - "and": [ - "socket:bosch_5pin~*", - "socket:bosch_5pin!=0" - ] - } - }, - { - "id": "current-15", - "question": { - "en": "What current do the plugs with
Bosch Active Connect with 5 pins and cable
offer?", - "nl": "Welke stroom levert de stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
?" - }, - "render": { - "en": "
Bosch Active Connect with 5 pins and cable
outputs at most {socket:bosch_5pin:current}A", - "nl": "
Bosch Active Connect met 5 pinnen aan een kabel
levert een stroom van maximaal {socket:bosch_5pin:current}A" - }, - "freeform": { - "key": "socket:bosch_5pin:current", - "type": "pfloat" - }, - "mappings": [], - "condition": { - "and": [ - "socket:bosch_5pin~*", - "socket:bosch_5pin!=0" - ] - } - }, - { - "id": "power-output-15", - "question": { - "en": "What power output does a single plug of type
Bosch Active Connect with 5 pins and cable
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
?" - }, - "render": { - "en": "
Bosch Active Connect with 5 pins and cable
outputs at most {socket:bosch_5pin:output}", - "nl": "
Bosch Active Connect met 5 pinnen aan een kabel
levert een vermogen van maximaal {socket:bosch_5pin:output}" - }, - "freeform": { - "key": "socket:bosch_5pin:output", - "type": "pfloat" - }, - "mappings": [], - "condition": { - "and": [ - "socket:bosch_5pin~*", - "socket:bosch_5pin!=0" - ] - } - }, - { - "id": "Authentication", - "question": { - "en": "What kind of authentication is available at the charging station?", - "it": "Quali sono gli orari di apertura di questa stazione di ricarica?", - "ja": "この充電ステーションはいつオープンしますか?", - "nb_NO": "Når åpnet denne ladestasjonen?", - "ru": "В какое время работает эта зарядная станция?", - "zh_Hant": "何時是充電站開放使用的時間？", - "de": "Welche Authentifizierung ist an der Ladestation möglich?" - }, - "multiAnswer": true, - "mappings": [ - { - "if": "authentication:membership_card=yes", - "ifnot": "authentication:membership_card=no", - "then": { - "en": "Authentication by a membership card", - "de": "Authentifizierung durch eine Mitgliedskarte" - } - }, - { - "if": "authentication:app=yes", - "ifnot": "authentication:app=no", - "then": { - "en": "Authentication by an app", - "de": "Authentifizierung durch eine App" - } - }, - { - "if": "authentication:phone_call=yes", - "ifnot": "authentication:phone_call=no", - "then": { - "en": "Authentication via phone call is available", - "de": "Authentifizierung per Anruf ist möglich" - } - }, - { - "if": "authentication:short_message=yes", - "ifnot": "authentication:short_message=no", - "then": { - "en": "Authentication via phone call is available", - "de": "Authentifizierung per Anruf ist möglich" - } - }, - { - "if": "authentication:nfc=yes", - "ifnot": "authentication:nfc=no", - "then": { - "en": "Authentication via NFC is available", - "de": "Authentifizierung über NFC ist möglich" - } - }, - { - "if": "authentication:money_card=yes", - "ifnot": "authentication:money_card=no", - "then": { - "en": "Authentication via Money Card is available", - "de": "Authentifizierung über Geldkarte ist möglich" - } - }, - { - "if": "authentication:debit_card=yes", - "ifnot": "authentication:debit_card=no", - "then": { - "en": "Authentication via debit card is available", - "de": "Authentifizierung per Debitkarte ist möglich" - } - }, - { - "if": "authentication:none=yes", - "ifnot": "authentication:none=no", - "then": { - "en": "Charging here is (also) possible without authentication", - "de": "Keine Authentifizierung erforderlich" - } - } - ] - }, - { - "id": "Auth phone", - "render": { - "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}", - "it": "{network}", - "ja": "{network}", - "nb_NO": "{network}", - "ru": "{network}", - "zh_Hant": "{network}", - "de": "Authentifizierung durch Anruf oder SMS an {authentication:phone_call:number}" - }, - "question": { - "en": "What's the phone number for authentication call or SMS?", - "it": "A quale rete appartiene questa stazione di ricarica?", - "ja": "この充電ステーションの運営チェーンはどこですか?", - "ru": "К какой сети относится эта станция?", - "zh_Hant": "充電站所屬的網路是？", - "de": "Wie lautet die Telefonnummer für den Authentifizierungsanruf oder die SMS?" - }, - "freeform": { - "key": "authentication:phone_call:number", - "type": "phone" - }, - "condition": { - "or": [ - "authentication:phone_call=yes", - "authentication:short_message=yes" - ] - }, - "it": { - "0": { - "then": "Non appartiene a una rete" - } - }, - "ja": { - "0": { - "then": "大規模な運営チェーンの一部ではない" - } - }, - "ru": { - "0": { - "then": "Не является частью более крупной сети" - } - }, - "zh_Hant": { - "0": { - "then": "不屬於大型網路" - } - } - }, { "id": "OH", "render": "{opening_hours_table(opening_hours)}", @@ -2965,49 +1239,113 @@ }, "question": { "en": "When is this charging station opened?", - "de": "Wann ist diese Ladestation geöffnet?" + "nl": "Wanneer is dit oplaadpunt beschikbaar??", + "de": "Wann ist diese Ladestation geöffnet?", + "it": "Quali sono gli orari di apertura di questa stazione di ricarica?", + "ja": "この充電ステーションはいつオープンしますか?", + "nb_NO": "Når åpnet denne ladestasjonen?", + "ru": "В какое время работает эта зарядная станция?", + "zh_Hant": "何時是充電站開放使用的時間？" }, "mappings": [ { "if": "opening_hours=24/7", "then": { "en": "24/7 opened (including holidays)", + "nl": "24/7 open - ook tijdens vakanties", "de": "durchgehend geöffnet (auch an Feiertagen)" } } ] }, { - "id": "fee/charge", + "id": "fee", "question": { - "en": "How much does one have to pay to use this charging station?", - "nl": "Hoeveel kost het gebruik van dit oplaadpunt?" - }, - "freeform": { - "key": "charge", - "addExtraTags": [ - "fee=yes" - ] - }, - "render": { - "en": "Using this charging station costs {charge}", - "nl": "Dit oplaadpunt gebruiken kost {charge}" + "en": "Does one have to pay to use this charging station?", + "nl": "Moet men betalen om dit oplaadpunt te gebruiken?" }, "mappings": [ { "if": { "and": [ - "fee=no", - "charge=" + "fee=no" ] }, "then": { "nl": "Gratis te gebruiken", "en": "Free to use" + }, + "hideInAnswer": true + }, + { + "if": { + "and": [ + "fee=no", + "fee:conditional=", + "charge=", + "authentication:none=yes" + ] + }, + "then": { + "nl": "Gratis te gebruiken (zonder aan te melden)", + "en": "Free to use (without authenticating)" + } + }, + { + "if": { + "and": [ + "fee=no", + "fee:conditional=", + "charge=", + "authentication:none=no" + ] + }, + "then": { + "nl": "Gratis te gebruiken, maar aanmelden met een applicatie is verplicht", + "en": "Free to use, but one has to authenticate" + } + }, + { + "if": { + "and": [ + "fee=yes", + "fee:conditional=no @ customers" + ] + }, + "then": { + "nl": "Betalend te gebruiken, maar gratis voor klanten van het bijhorende hotel/café/ziekenhuis/...", + "en": "Paid use, but free for customers of the hotel/pub/hospital/... who operates the charging station" + } + }, + { + "if": { + "and": [ + "fee=yes", + "fee:conditional=" + ] + }, + "then": { + "nl": "Betalend", + "en": "Paid use" } } ] }, + { + "id": "charge", + "question": { + "en": "How much does one have to pay to use this charging station?", + "nl": "Hoeveel moet men betalen om dit oplaadpunt te gebruiken?" + }, + "render": { + "en": "Using this charging station costs {charge}", + "nl": "Dit oplaadpunt gebruiken kost {charge}" + }, + "freeform": { + "key": "charge" + }, + "condition": "fee=yes" + }, { "id": "payment-options", "builtin": "payment-options", @@ -3024,7 +1362,8 @@ "ifnot": "payment:app=no", "then": { "en": "Payment is done using a dedicated app", - "nl": "Betalen via een app van het netwerk" + "nl": "Betalen via een app van het netwerk", + "de": "Bezahlung mit einer speziellen App" } }, { @@ -3032,44 +1371,180 @@ "ifnot": "payment:membership_card=no", "then": { "en": "Payment is done using a membership card", - "nl": "Betalen via een lidkaart van het netwerk" + "nl": "Betalen via een lidkaart van het netwerk", + "de": "Bezahlung mit einer Mitgliedskarte" } } ] } }, + { + "id": "Authentication", + "#": "In some cases, charging is free but one has to be authenticated. We only ask for authentication if fee is no (or unset). By default one sees the questions for either the payment options or the authentication options, but normally not both", + "question": { + "en": "What kind of authentication is available at the charging station?", + "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?", + "de": "Welche Authentifizierung ist an der Ladestation möglich?" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "authentication:membership_card=yes", + "ifnot": "authentication:membership_card=no", + "then": { + "en": "Authentication by a membership card", + "nl": "Aanmelden met een lidkaart is mogelijk", + "de": "Authentifizierung durch eine Mitgliedskarte" + } + }, + { + "if": "authentication:app=yes", + "ifnot": "authentication:app=no", + "then": { + "en": "Authentication by an app", + "nl": "Aanmelden via een applicatie is mogelijk", + "de": "Authentifizierung durch eine App" + } + }, + { + "if": "authentication:phone_call=yes", + "ifnot": "authentication:phone_call=no", + "then": { + "en": "Authentication via phone call is available", + "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk", + "de": "Authentifizierung per Anruf ist möglich" + } + }, + { + "if": "authentication:short_message=yes", + "ifnot": "authentication:short_message=no", + "then": { + "en": "Authentication via phone call is available", + "nl": "Aanmelden via SMS is mogelijk", + "de": "Authentifizierung per Anruf ist möglich" + } + }, + { + "if": "authentication:nfc=yes", + "ifnot": "authentication:nfc=no", + "then": { + "en": "Authentication via NFC is available", + "nl": "Aanmelden via NFC is mogelijk", + "de": "Authentifizierung über NFC ist möglich" + } + }, + { + "if": "authentication:money_card=yes", + "ifnot": "authentication:money_card=no", + "then": { + "en": "Authentication via Money Card is available", + "nl": "Aanmelden met Money Card is mogelijk", + "de": "Authentifizierung über Geldkarte ist möglich" + } + }, + { + "if": "authentication:debit_card=yes", + "ifnot": "authentication:debit_card=no", + "then": { + "en": "Authentication via debit card is available", + "nl": "Aanmelden met een betaalkaart is mogelijk", + "de": "Authentifizierung per Debitkarte ist möglich" + } + }, + { + "if": "authentication:none=yes", + "ifnot": "authentication:none=no", + "then": { + "en": "Charging here is (also) possible without authentication", + "nl": "Hier opladen is (ook) mogelijk zonder aan te melden", + "de": "Das Aufladen ist hier (auch) ohne Authentifizierung möglich" + } + } + ], + "condition": { + "or": [ + "fee=no", + "fee=" + ] + } + }, + { + "id": "Auth phone", + "render": { + "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}", + "nl": "Aanmelden door te bellen of te SMS'en naar {authentication:phone_call:number}", + "de": "Authentifizierung durch Anruf oder SMS an {authentication:phone_call:number}" + }, + "question": { + "en": "What's the phone number for authentication call or SMS?", + "nl": "Wat is het telefoonnummer dat men moet bellen of SMS'en om zich aan te melden?", + "de": "Wie lautet die Telefonnummer für den Authentifizierungsanruf oder die SMS?" + }, + "freeform": { + "key": "authentication:phone_call:number", + "type": "phone" + }, + "condition": { + "or": [ + "authentication:phone_call=yes", + "authentication:short_message=yes" + ] + } + }, { "id": "maxstay", "question": { "en": "What is the maximum amount of time one is allowed to stay here?", - "nl": "Hoelang mag een voertuig hier blijven staan?" + "nl": "Hoelang mag een voertuig hier blijven staan?", + "de": "Was ist die Höchstdauer des Aufenthalts hier?" }, "freeform": { "key": "maxstay" }, "render": { "en": "One can stay at most {canonical(maxstay)}", - "nl": "De maximale parkeertijd hier is {canonical(maxstay)}" + "nl": "De maximale parkeertijd hier is {canonical(maxstay)}", + "de": "Die maximale Parkzeit beträgt {canonical(maxstay)}" }, "mappings": [ { "if": "maxstay=unlimited", "then": { "en": "No timelimit on leaving your vehicle here", - "nl": "Geen maximum parkeertijd" + "nl": "Geen maximum parkeertijd", + "de": "Keine Höchstparkdauer" } } - ] + ], + "condition": { + "or": [ + "maxstay~*", + "motorcar=yes", + "hgv=yes", + "bus=yes" + ] + } }, { "id": "Network", "render": { "en": "Part of the network {network}", - "de": "Teil des Netzwerks {network}" + "nl": "Maakt deel uit van het {network}-netwerk", + "de": "Teil des Netzwerks {network}", + "it": "{network}", + "ja": "{network}", + "nb_NO": "{network}", + "ru": "{network}", + "zh_Hant": "{network}" }, "question": { "en": "Is this charging station part of a network?", - "de": "Ist diese Ladestation Teil eines Netzwerks?" + "nl": "Is dit oplaadpunt deel van een groter netwerk?", + "de": "Ist diese Ladestation Teil eines Netzwerks?", + "it": "A quale rete appartiene questa stazione di ricarica?", + "ja": "この充電ステーションの運営チェーンはどこですか?", + "ru": "К какой сети относится эта станция?", + "zh_Hant": "充電站所屬的網路是？" }, "freeform": { "key": "network" @@ -3079,6 +1554,7 @@ "if": "no:network=yes", "then": { "en": "Not part of a bigger network", + "nl": "Maakt geen deel uit van een groter netwerk", "de": "Nicht Teil eines größeren Netzwerks" } }, @@ -3086,6 +1562,7 @@ "if": "network=none", "then": { "en": "Not part of a bigger network", + "nl": "Maakt geen deel uit van een groter netwerk", "de": "Nicht Teil eines größeren Netzwerks" }, "hideInAnswer": true @@ -3108,10 +1585,12 @@ "id": "Operator", "question": { "en": "Who is the operator of this charging station?", + "nl": "Wie beheert dit oplaadpunt?", "de": "Wer ist der Betreiber dieser Ladestation?" }, "render": { "en": "This charging station is operated by {operator}", + "nl": "Wordt beheerd door {operator}", "de": "Diese Ladestation wird betrieben von {operator}" }, "freeform": { @@ -3126,6 +1605,7 @@ }, "then": { "en": "Actually, {operator} is the network", + "nl": "Eigenlijk is {operator} het netwerk waarvan het deel uitmaakt", "de": "Eigentlich ist {operator} das Netzwerk" }, "addExtraTags": [ @@ -3138,10 +1618,14 @@ { "id": "phone", "question": { - "en": "What number can one call if there is a problem with this charging station?" + "en": "What number can one call if there is a problem with this charging station?", + "nl": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?", + "de": "Welche Nummer kann man anrufen, wenn es ein Problem mit dieser Ladestation gibt?" }, "render": { - "en": "In case of problems, call {phone}" + "en": "In case of problems, call {phone}", + "nl": "Bij problemen, bel naar {phone}", + "de": "Bei Problemen, anrufen unter {phone}" }, "freeform": { "key": "phone", @@ -3151,10 +1635,14 @@ { "id": "email", "question": { - "en": "What is the email address of the operator?" + "en": "What is the email address of the operator?", + "nl": "Wat is het email-adres van de operator?", + "de": "Wie ist die Email-Adresse des Betreibers?" }, "render": { - "en": "In case of problems, send an email to {email}" + "en": "In case of problems, send an email to {email}", + "nl": "Bij problemen, email naar {email}", + "de": "Bei Problemen senden Sie eine E-Mail an {email}" }, "freeform": { "key": "email", @@ -3164,10 +1652,14 @@ { "id": "website", "question": { - "en": "What is the website of the operator?" + "en": "What is the website of the operator?", + "nl": "Wat is de website waar men meer info kan vinden over dit oplaadpunt?", + "de": "Wie ist die Webseite des Betreibers?" }, "render": { - "en": "More info on {website}" + "en": "More info on {website}", + "nl": "Meer informatie op {website}", + "de": "Weitere Informationen auf {website}" }, "freeform": { "key": "website", @@ -3178,14 +1670,20 @@ { "id": "ref", "question": { - "en": "What is the reference number of this charging station?" + "en": "What is the reference number of this charging station?", + "nl": "Wat is het referentienummer van dit oplaadstation?", + "de": "Wie lautet die Kennung dieser Ladestation?" }, "render": { - "en": "Reference number is {ref}" + "en": "Reference number is {ref}", + "nl": "Het referentienummer van dit oplaadpunt is {ref}", + "de": "Die Kennziffer ist {ref}" }, "freeform": { "key": "ref" - } + }, + "#": "Only asked if part of a bigger network. Small operators typically don't have a reference number", + "condition": "network!=" }, { "id": "Operational status", @@ -3196,7 +1694,31 @@ }, "mappings": [ { - "if": "operational_status=broken", + "if": { + "and": [ + "planned:amenity=", + "construction:amenity=", + "disused:amenity=", + "operational_status=", + "amenity=charging_station" + ] + }, + "then": { + "en": "This charging station works", + "nl": "Dit oplaadpunt werkt", + "de": "Diese Ladestation funktioniert" + } + }, + { + "if": { + "and": [ + "planned:amenity=", + "construction:amenity=", + "disused:amenity=", + "operational_status=broken", + "amenity=charging_station" + ] + }, "then": { "en": "This charging station is broken", "nl": "Dit oplaadpunt is kapot", @@ -3207,6 +1729,9 @@ "if": { "and": [ "planned:amenity=charging_station", + "construction:amenity=", + "disused:amenity=", + "operational_status=", "amenity=" ] }, @@ -3219,7 +1744,10 @@ { "if": { "and": [ + "planned:amenity=", "construction:amenity=charging_station", + "disused:amenity=", + "operational_status=", "amenity=" ] }, @@ -3232,7 +1760,10 @@ { "if": { "and": [ + "planned:amenity=", + "construction:amenity=", "disused:amenity=charging_station", + "operational_status=", "amenity=" ] }, @@ -3241,19 +1772,6 @@ "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig", "de": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar" } - }, - { - "if": { - "and": [ - "amenity=charging_station", - "operational_status=" - ] - }, - "then": { - "en": "This charging station works", - "nl": "Dit oplaadpunt werkt", - "de": "Diese Ladestation funktioniert" - } } ] }, @@ -3261,6 +1779,7 @@ "id": "Parking:fee", "question": { "en": "Does one have to pay a parking fee while charging?", + "nl": "Moet men parkeergeld betalen tijdens het opladen?", "de": "Muss man beim Laden eine Parkgebühr bezahlen?" }, "mappings": [ @@ -3268,6 +1787,7 @@ "if": "parking:fee=no", "then": { "en": "No additional parking cost while charging", + "nl": "Geen extra parkeerkost tijdens het opladen", "de": "Keine zusätzlichen Parkgebühren beim Laden" } }, @@ -3275,10 +1795,20 @@ "if": "parking:fee=yes", "then": { "en": "An additional parking fee should be paid while charging", + "nl": "Tijdens het opladen moet er parkeergeld betaald worden", "de": "Beim Laden ist eine zusätzliche Parkgebühr zu entrichten" } } - ] + ], + "condition": { + "or": [ + "motor_vehicle=yes", + "hgv=yes", + "bus=yes", + "bicycle=no", + "bicycle=" + ] + } } ], "icon": { @@ -3347,16 +1877,60 @@ "presets": [ { "tags": [ - "amenity=charging_station" + "amenity=charging_station", + "motorcar=no", + "bicycle=yes", + "socket:typee=1" ], "title": { "en": "Charging station", + "nl": "gewone stekker (bedoeld om electrische fietsen op te laden)", "de": "Ladestation", "ru": "Зарядная станция" }, "preciseInput": { "preferredBackground": "map" } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=no", + "bicycle=yes" + ], + "title": { + "en": "charging station for e-bikes", + "nl": "oplaadpunt voor elektrische fietsen" + }, + "preciseInput": { + "preferredBackground": "map" + } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=yes", + "bicycle=no" + ], + "title": { + "en": "charging station for cars", + "nl": "oplaadstation voor elektrische auto's" + }, + "preciseInput": { + "preferredBackground": "map" + } + }, + { + "tags": [ + "amenity=charging_station" + ], + "title": { + "en": "charging station", + "nl": "oplaadstation" + }, + "preciseInput": { + "preferredBackground": "map" + } } ], "wayHandling": 1, @@ -3400,6 +1974,7 @@ { "question": { "en": "Only working charging stations", + "nl": "Enkel werkende oplaadpunten", "de": "Nur funktionierende Ladestationen" }, "osmTags": { @@ -3438,7 +2013,8 @@ { "question": { "en": "Has a
Chademo
connector", - "nl": "Heeft een
Chademo
" + "nl": "Heeft een
Chademo
", + "de": "Hat einen
Chademo
Stecker" }, "osmTags": "socket:chademo~*" }, @@ -3466,7 +2042,8 @@ { "question": { "en": "Has a
Tesla Supercharger
connector", - "nl": "Heeft een
Tesla Supercharger
" + "nl": "Heeft een
Tesla Supercharger
", + "de": "Hat einen
Tesla Supercharger
Stecker" }, "osmTags": "socket:tesla_supercharger~*" }, @@ -3585,6 +2162,7 @@ "humanSingular": { "en": " hour", "nl": " uur", + "de": " Stunde", "ru": " час" } }, @@ -3605,6 +2183,7 @@ "humanSingular": { "en": " day", "nl": " dag", + "de": " Tag", "ru": " день" } } @@ -3642,6 +2221,7 @@ "human": { "en": "Volts", "nl": "volt", + "de": "Volt", "ru": "Вольт" } } @@ -3712,6 +2292,7 @@ "human": { "en": "kilowatt", "nl": "kilowatt", + "de": "Kilowatt", "ru": "киловатт" } }, @@ -3723,11 +2304,25 @@ "human": { "en": "megawatt", "nl": "megawatt", + "de": "Megawatt", "ru": "мегаватт" } } ], "eraseInvalidValues": true } - ] + ], + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + } } \ No newline at end of file diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson index 410404d4ef..ac7a86b9bf 100644 --- a/assets/layers/charging_station/charging_station.protojson +++ b/assets/layers/charging_station/charging_station.protojson @@ -2,11 +2,7 @@ "id": "charging_station", "name": { "en": "Charging stations", - "it": "Stazioni di ricarica", - "ja": "充電ステーション", - "nb_NO": "Ladestasjoner", - "ru": "Зарядные станции", - "zh_Hant": "充電站" + "nl": "Oplaadpunten" }, "minzoom": 10, "source": { @@ -22,27 +18,21 @@ "title": { "render": { "en": "Charging station", - "it": "Stazione di ricarica", - "ja": "充電ステーション", - "nb_NO": "Ladestasjon", - "ru": "Зарядная станция", - "zh_Hant": "充電站" + "nl": "Oplaadpunten" } }, "description": { "en": "A charging station", - "it": "Una stazione di ricarica", - "ja": "充電ステーション", - "nb_NO": "En ladestasjon", - "ru": "Зарядная станция", - "zh_Hant": "充電站" + "nl": "Oplaadpunten" }, "tagRenderings": [ "images", { "id": "Type", + "#": "Allowed vehicle types", "question": { - "en": "Which vehicles are allowed to charge here?" + "en": "Which vehicles are allowed to charge here?", + "nl": "Welke voertuigen kunnen hier opgeladen worden?" }, "multiAnswer": true, "mappings": [ @@ -50,35 +40,40 @@ "if": "bicycle=yes", "ifnot": "bicycle=no", "then": { - "en": "bicycles can be charged here" + "en": "Bcycles can be charged here", + "nl": "Fietsen kunnen hier opgeladen worden" } }, { "if": "motorcar=yes", - "ifnot": "motorcar=no", + "ifnot": "motorcar=no", "then": { - "en": "Cars can be charged here" + "en": "Cars can be charged here", + "nl": "Elektrische auto's kunnen hier opgeladen worden" } }, { "if": "scooter=yes", "ifnot": "scooter=no", "then": { - "en": "Scooters can be charged here" + "en": "Scooters can be charged here", + "nl": "Electrische scooters (snorfiets of bromfiets) kunnen hier opgeladen worden" } }, { "if": "hgv=yes", "ifnot": "hgv=no", "then": { - "en": "Heavy good vehicles (such as trucks) can be charged here" + "en": "Heavy good vehicles (such as trucks) can be charged here", + "nl": "Vrachtwagens kunnen hier opgeladen worden" } }, { "if": "bus=yes", "ifnot": "bus=no", "then": { - "en": "Buses can be charged here" + "en": "Buses can be charged here", + "nl": "Bussen kunnen hier opgeladen worden" } } ] @@ -86,10 +81,12 @@ { "id": "access", "question": { - "en": "Who is allowed to use this charging station?" + "en": "Who is allowed to use this charging station?", + "nl": "Wie mag er dit oplaadpunt gebruiken?" }, "render": { - "en": "Access is {access}" + "en": "Access is {access}", + "nl": "Toegang voor {access}" }, "freeform": { "key": "access", @@ -100,7 +97,10 @@ "mappings": [ { "if": "access=yes", - "then": "Anyone can use this charging station (payment might be needed)" + "then": { + "en": "Anyone can use this charging station (payment might be needed)", + "nl": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)" + } }, { "if": { @@ -109,16 +109,25 @@ "access=public" ] }, - "then": "Anyone can use this charging station (payment might be needed)", + "then": { + "en": "Anyone can use this charging station (payment might be needed)", + "nl": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)" + }, "hideInAnswer": true }, { "if": "access=customers", - "then": "Only customers of the place this station belongs to can use this charging station
E.g. a charging station operated by hotel which is only usable by their guests " + "then": { + "en": "Only customers of the place this station belongs to can use this charging station
E.g. a charging station operated by hotel which is only usable by their guests", + "nl": "Enkel klanten van de bijhorende plaats mogen dit oplaadpunt gebruiken
Bv. op de parking van een hotel en enkel toegankelijk voor klanten van dit hotel" + } }, { "if": "access=private", - "then": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)" + "then": { + "en": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)", + "nl": "Niet toegankelijk voor het publiek
Bv. enkel toegankelijk voor de eigenaar, medewerkers ,... " + } } ] }, @@ -137,124 +146,8 @@ "type": "pnat" } }, - {"id": "$$$"}, { - "id": "Authentication", - "question": { - "en": "What kind of authentication is available at the charging station?", - "it": "Quali sono gli orari di apertura di questa stazione di ricarica?", - "ja": "この充電ステーションはいつオープンしますか?", - "nb_NO": "Når åpnet denne ladestasjonen?", - "ru": "В какое время работает эта зарядная станция?", - "zh_Hant": "何時是充電站開放使用的時間？" - }, - "multiAnswer": true, - "mappings": [ - { - "if": "authentication:membership_card=yes", - "ifnot": "authentication:membership_card=no", - "then": { - "en": "Authentication by a membership card" - } - }, - { - "if": "authentication:app=yes", - "ifnot": "authentication:app=no", - "then": { - "en": "Authentication by an app" - } - }, - { - "if": "authentication:phone_call=yes", - "ifnot": "authentication:phone_call=no", - "then": { - "en": "Authentication via phone call is available" - } - }, - { - "if": "authentication:short_message=yes", - "ifnot": "authentication:short_message=no", - "then": { - "en": "Authentication via phone call is available" - } - }, - { - "if": "authentication:nfc=yes", - "ifnot": "authentication:nfc=no", - "then": { - "en": "Authentication via NFC is available" - } - }, - { - "if": "authentication:money_card=yes", - "ifnot": "authentication:money_card=no", - "then": { - "en": "Authentication via Money Card is available" - } - }, - { - "if": "authentication:debit_card=yes", - "ifnot": "authentication:debit_card=no", - "then": { - "en": "Authentication via debit card is available" - } - }, - { - "if": "authentication:none=yes", - "ifnot": "authentication:none=no", - "then": { - "en": "Charging here is (also) possible without authentication" - } - } - ] - }, - { - "id": "Auth phone", - "render": { - "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}", - "it": "{network}", - "ja": "{network}", - "nb_NO": "{network}", - "ru": "{network}", - "zh_Hant": "{network}" - }, - "question": { - "en": "What's the phone number for authentication call or SMS?", - "it": "A quale rete appartiene questa stazione di ricarica?", - "ja": "この充電ステーションの運営チェーンはどこですか?", - "ru": "К какой сети относится эта станция?", - "zh_Hant": "充電站所屬的網路是？" - }, - "freeform": { - "key": "authentication:phone_call:number", - "type": "phone" - }, - "condition": { - "or": [ - "authentication:phone_call=yes", - "authentication:short_message=yes" - ] - }, - "it": { - "0": { - "then": "Non appartiene a una rete" - } - }, - "ja": { - "0": { - "then": "大規模な運営チェーンの一部ではない" - } - }, - "ru": { - "0": { - "then": "Не является частью более крупной сети" - } - }, - "zh_Hant": { - "0": { - "then": "不屬於大型網路" - } - } + "id": "$$$" }, { "id": "OH", @@ -264,48 +157,107 @@ "type": "opening_hours" }, "question": { - "en": "When is this charging station opened?" + "en": "When is this charging station opened?", + "nl": "Wanneer is dit oplaadpunt beschikbaar??" }, "mappings": [ { "if": "opening_hours=24/7", "then": { - "en": "24/7 opened (including holidays)" + "en": "24/7 opened (including holidays)", + "nl": "24/7 open - ook tijdens vakanties" } } ] }, { - "id": "fee/charge", + "id": "fee", "question": { - "en": "How much does one have to pay to use this charging station?", - "nl": "Hoeveel kost het gebruik van dit oplaadpunt?" - }, - "freeform": { - "key": "charge", - "addExtraTags": [ - "fee=yes" - ] - }, - "render": { - "en": "Using this charging station costs {charge}", - "nl": "Dit oplaadpunt gebruiken kost {charge}" + "en": "Does one have to pay to use this charging station?", + "nl": "Moet men betalen om dit oplaadpunt te gebruiken?" }, "mappings": [ { "if": { "and": [ - "fee=no", - "charge=" + "fee=no" ] }, "then": { "nl": "Gratis te gebruiken", "en": "Free to use" + }, + "hideInAnswer": true + }, + { + "if": { + "and": [ + "fee=no", + "fee:conditional=", + "charge=", + "authentication:none=yes" + ] + }, + "then": { + "nl": "Gratis te gebruiken (zonder aan te melden)", + "en": "Free to use (without authenticating)" + } + }, + { + "if": { + "and": [ + "fee=no", + "fee:conditional=", + "charge=", + "authentication:none=no" + ] + }, + "then": { + "nl": "Gratis te gebruiken, maar aanmelden met een applicatie is verplicht", + "en": "Free to use, but one has to authenticate" + } + }, + { + "if": { + "and": [ + "fee=yes", + "fee:conditional=no @ customers" + ] + }, + "then": { + "nl": "Betalend te gebruiken, maar gratis voor klanten van het bijhorende hotel/café/ziekenhuis/...", + "en": "Paid use, but free for customers of the hotel/pub/hospital/... who operates the charging station" + } + }, + { + "if": { + "and": [ + "fee=yes", + "fee:conditional=" + ] + }, + "then": { + "nl": "Betalend", + "en": "Paid use" } } ] }, + { + "id": "charge", + "question": { + "en": "How much does one have to pay to use this charging station?", + "nl": "Hoeveel moet men betalen om dit oplaadpunt te gebruiken?" + }, + "render": { + "en": "Using this charging station costs {charge}", + "nl": "Dit oplaadpunt gebruiken kost {charge}" + }, + "freeform": { + "key": "charge" + }, + "condition": "fee=yes" + }, { "id": "payment-options", "builtin": "payment-options", @@ -336,6 +288,108 @@ ] } }, + { + "id": "Authentication", + "#": "In some cases, charging is free but one has to be authenticated. We only ask for authentication if fee is no (or unset). By default one sees the questions for either the payment options or the authentication options, but normally not both", + "question": { + "en": "What kind of authentication is available at the charging station?", + "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "authentication:membership_card=yes", + "ifnot": "authentication:membership_card=no", + "then": { + "en": "Authentication by a membership card", + "nl": "Aanmelden met een lidkaart is mogelijk" + } + }, + { + "if": "authentication:app=yes", + "ifnot": "authentication:app=no", + "then": { + "en": "Authentication by an app", + "nl": "Aanmelden via een applicatie is mogelijk" + } + }, + { + "if": "authentication:phone_call=yes", + "ifnot": "authentication:phone_call=no", + "then": { + "en": "Authentication via phone call is available", + "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk" + } + }, + { + "if": "authentication:short_message=yes", + "ifnot": "authentication:short_message=no", + "then": { + "en": "Authentication via SMS is available", + "nl": "Aanmelden via SMS is mogelijk" + } + }, + { + "if": "authentication:nfc=yes", + "ifnot": "authentication:nfc=no", + "then": { + "en": "Authentication via NFC is available", + "nl": "Aanmelden via NFC is mogelijk" + } + }, + { + "if": "authentication:money_card=yes", + "ifnot": "authentication:money_card=no", + "then": { + "en": "Authentication via Money Card is available", + "nl": "Aanmelden met Money Card is mogelijk" + } + }, + { + "if": "authentication:debit_card=yes", + "ifnot": "authentication:debit_card=no", + "then": { + "en": "Authentication via debit card is available", + "nl": "Aanmelden met een betaalkaart is mogelijk" + } + }, + { + "if": "authentication:none=yes", + "ifnot": "authentication:none=no", + "then": { + "en": "Charging here is (also) possible without authentication", + "nl": "Hier opladen is (ook) mogelijk zonder aan te melden" + } + } + ], + "condition": { + "or": [ + "fee=no", + "fee=" + ] + } + }, + { + "id": "Auth phone", + "render": { + "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}", + "nl": "Aanmelden door te bellen of te SMS'en naar {authentication:phone_call:number}" + }, + "question": { + "en": "What's the phone number for authentication call or SMS?", + "nl": "Wat is het telefoonnummer dat men moet bellen of SMS'en om zich aan te melden?" + }, + "freeform": { + "key": "authentication:phone_call:number", + "type": "phone" + }, + "condition": { + "or": [ + "authentication:phone_call=yes", + "authentication:short_message=yes" + ] + } + }, { "id": "maxstay", "question": { @@ -356,16 +410,21 @@ "en": "No timelimit on leaving your vehicle here", "nl": "Geen maximum parkeertijd" } - } - ] + } + ], + "condition": { + "or": ["maxstay~*","motorcar=yes","hgv=yes","bus=yes"] + } }, { "id": "Network", "render": { - "en": "Part of the network {network}" + "en": "Part of the network {network}", + "nl": "Maakt deel uit van het {network}-netwerk" }, "question": { - "en": "Is this charging station part of a network?" + "en": "Is this charging station part of a network?", + "nl": "Is dit oplaadpunt deel van een groter netwerk?" }, "freeform": { "key": "network" @@ -374,13 +433,15 @@ { "if": "no:network=yes", "then": { - "en": "Not part of a bigger network" + "en": "Not part of a bigger network", + "nl": "Maakt geen deel uit van een groter netwerk" } }, { "if": "network=none", "then": { - "en": "Not part of a bigger network" + "en": "Not part of a bigger network", + "nl": "Maakt geen deel uit van een groter netwerk" }, "hideInAnswer": true }, @@ -401,10 +462,12 @@ { "id": "Operator", "question": { - "en": "Who is the operator of this charging station?" + "en": "Who is the operator of this charging station?", + "nl": "Wie beheert dit oplaadpunt?" }, "render": { - "en": "This charging station is operated by {operator}" + "en": "This charging station is operated by {operator}", + "nl": "Wordt beheerd door {operator}" }, "freeform": { "key": "operator" @@ -417,7 +480,8 @@ ] }, "then": { - "en": "Actually, {operator} is the network" + "en": "Actually, {operator} is the network", + "nl": "Eigenlijk is {operator} het netwerk waarvan het deel uitmaakt" }, "addExtraTags": [ "operator=" @@ -429,10 +493,11 @@ { "id": "phone", "question": { - "en": "What number can one call if there is a problem with this charging station?" + "en": "What number can one call if there is a problem with this charging station?", + "nl": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?" }, "render": { - "en": "In case of problems, call {phone}" + "en": "In case of problems, call {phone}", "nl": "Bij problemen, bel naar {phone}" }, "freeform": { "key": "phone", @@ -442,10 +507,12 @@ { "id": "email", "question": { - "en": "What is the email address of the operator?" + "en": "What is the email address of the operator?", + "nl": "Wat is het email-adres van de operator?" }, "render": { - "en": "In case of problems, send an email to {email}" + "en": "In case of problems, send an email to {email}", + "nl": "Bij problemen, email naar {email}" }, "freeform": { "key": "email", @@ -455,10 +522,12 @@ { "id": "website", "question": { - "en": "What is the website of the operator?" + "en": "What is the website where one can find more information about this charging station?", + "nl": "Wat is de website waar men meer info kan vinden over dit oplaadpunt?" }, "render": { - "en": "More info on {website}" + "en": "More info on {website}", + "nl": "Meer informatie op {website}" }, "freeform": { "key": "website", @@ -469,14 +538,18 @@ { "id": "ref", "question": { - "en": "What is the reference number of this charging station?" + "en": "What is the reference number of this charging station?", + "nl": "Wat is het referentienummer van dit oplaadstation?" }, "render": { - "en": "Reference number is {ref}" + "en": "Reference number is {ref}", + "nl": "Het referentienummer van dit oplaadpunt is {ref}" }, "freeform": { "key": "ref" - } + }, + "#": "Only asked if part of a bigger network. Small operators typically don't have a reference number", + "condition":"network!=" }, { "id": "Operational status", @@ -486,7 +559,30 @@ }, "mappings": [ { - "if": "operational_status=broken", + "if": { + "and": [ + "planned:amenity=", + "construction:amenity=", + "disused:amenity=", + "operational_status=", + "amenity=charging_station" + ] + }, + "then": { + "en": "This charging station works", + "nl": "Dit oplaadpunt werkt" + } + }, + { + "if": { + "and": [ + "planned:amenity=", + "construction:amenity=", + "disused:amenity=", + "operational_status=broken", + "amenity=charging_station" + ] + }, "then": { "en": "This charging station is broken", "nl": "Dit oplaadpunt is kapot" @@ -496,6 +592,9 @@ "if": { "and": [ "planned:amenity=charging_station", + "construction:amenity=", + "disused:amenity=", + "operational_status=", "amenity=" ] }, @@ -505,9 +604,12 @@ } }, { - "if": { + "if":{ "and": [ + "planned:amenity=", "construction:amenity=charging_station", + "disused:amenity=", + "operational_status=", "amenity=" ] }, @@ -519,7 +621,10 @@ { "if": { "and": [ + "planned:amenity=", + "construction:amenity=", "disused:amenity=charging_station", + "operational_status=", "amenity=" ] }, @@ -527,37 +632,40 @@ "en": "This charging station has beed permanently disabled and is not in use anymore but is still visible", "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig" } - }, - { - "if": { - "and": ["amenity=charging_station","operational_status="] - }, - "then": { - "en": "This charging station works", - "nl": "Dit oplaadpunt werkt" - } } ] }, { "id": "Parking:fee", "question": { - "en": "Does one have to pay a parking fee while charging?" + "en": "Does one have to pay a parking fee while charging?", + "nl": "Moet men parkeergeld betalen tijdens het opladen?" }, "mappings": [ { "if": "parking:fee=no", "then": { - "en": "No additional parking cost while charging" + "en": "No additional parking cost while charging", + "nl": "Geen extra parkeerkost tijdens het opladen" } }, { "if": "parking:fee=yes", "then": { - "en": "An additional parking fee should be paid while charging" + "en": "An additional parking fee should be paid while charging", + "nl": "Tijdens het opladen moet er parkeergeld betaald worden" } } - ] + ], + "condition": { + "or": [ + "motor_vehicle=yes", + "hgv=yes", + "bus=yes", + "bicycle=no", + "bicycle=" + ] + } } ], "icon": { @@ -624,12 +732,56 @@ "render": "#00f" }, "presets": [ + { + "tags": [ + "amenity=charging_station", + "motorcar=no", + "bicycle=yes", + "socket:typee=1" + ], + "title": { + "en": "electrical outlet to charge e-bikes", + "nl": "laadpunt met gewone stekker(s) (bedoeld om electrische fietsen op te laden)" + }, + "preciseInput": { + "preferredBackground": "map" + } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=no", + "bicycle=yes" + ], + "title": { + "en": "charging station for e-bikes", + "nl": "oplaadpunt voor elektrische fietsen" + }, + "preciseInput": { + "preferredBackground": "map" + } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=yes", + "bicycle=no" + ], + "title": { + "en": "charging station for cars", + "nl": "oplaadstation voor elektrische auto's" + }, + "preciseInput": { + "preferredBackground": "map" + } + }, { "tags": [ "amenity=charging_station" ], "title": { - "en": "Charging station" + "en": "charging station", + "nl": "oplaadstation" }, "preciseInput": { "preferredBackground": "map" @@ -673,7 +825,8 @@ "options": [ { "question": { - "en": "Only working charging stations" + "en": "Only working charging stations", + "nl": "Enkel werkende oplaadpunten" }, "osmTags": { "and": [ @@ -742,12 +895,25 @@ "en": " days", "nl": " day" }, - "humanSingular":{ + "humanSingular": { "en": " day", "nl": " dag" } } ] } - ] + ], + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + } } diff --git a/assets/layers/charging_station/csvToJson.ts b/assets/layers/charging_station/csvToJson.ts index c630297c01..4b2490b905 100644 --- a/assets/layers/charging_station/csvToJson.ts +++ b/assets/layers/charging_station/csvToJson.ts @@ -56,6 +56,7 @@ function run(file, protojson) { const overview_question_answers = [] const questions: (TagRenderingConfigJson & { "id": string })[] = [] + const technicalQuestions: (TagRenderingConfigJson & { "id": string })[] = [] const filterOptions: { question: any, osmTags?: string } [] = [ { question: { @@ -149,7 +150,7 @@ function run(file, protojson) { } }) - questions.push({ + technicalQuestions.push({ "id": "voltage-" + i, question: { en: `What voltage do the plugs with ${descrWithImage_en} offer?`, @@ -178,7 +179,7 @@ function run(file, protojson) { }) - questions.push({ + technicalQuestions.push({ "id": "current-" + i, question: { en: `What current do the plugs with ${descrWithImage_en} offer?`, @@ -207,7 +208,7 @@ function run(file, protojson) { }) - questions.push({ + technicalQuestions.push({ "id": "power-output-" + i, question: { en: `What power output does a single plug of type ${descrWithImage_en} offer?`, @@ -247,7 +248,8 @@ function run(file, protojson) { const toggles = { "id": "Available_charging_stations (generated)", "question": { - "en": "Which charging stations are available here?" + "en": "Which charging connections are available here?", + "nl": "Welke aansluitingen zijn hier beschikbaar?" }, "multiAnswer": true, "mappings": overview_question_answers @@ -257,7 +259,7 @@ function run(file, protojson) { const stringified = questions.map(q => JSON.stringify(q, null, " ")) let protoString = readFileSync(protojson, "utf8") - protoString = protoString.replace("{\"id\": \"$$$\"}", stringified.join(",\n")) + protoString = protoString.replace(/{[ \t\n]*"id"[ \t\n]*:[ \t\n]*"\$\$\$"[ \t\n]*}/, stringified.join(",\n")) const proto = JSON.parse(protoString) proto.tagRenderings.forEach(tr => { if (typeof tr === "string") { diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index 3b71f3f1e3..b257f101c6 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -7,7 +7,8 @@ }, "description": { "en": "Crossings for pedestrians and cyclists", - "nl": "Oversteekplaatsen voor voetgangers en fietsers" + "nl": "Oversteekplaatsen voor voetgangers en fietsers", + "de": "Übergänge für Fußgänger und Radfahrer" }, "source": { "osmTags": { @@ -21,7 +22,8 @@ "title": { "render": { "en": "Crossing", - "nl": "Oversteekplaats" + "nl": "Oversteekplaats", + "de": "Kreuzung" }, "mappings": [ { @@ -29,14 +31,16 @@ "then": { "en": "Traffic signal", "nl": "Verkeerslicht", - "ru": "Светофор" + "ru": "Светофор", + "de": "Ampel" } }, { "if": "crossing=traffic_signals", "then": { "en": "Crossing with traffic signals", - "nl": "Oversteektplaats met verkeerslichten" + "nl": "Oversteektplaats met verkeerslichten", + "de": "Kreuzung mit Ampeln" } } ] @@ -60,14 +64,16 @@ { "title": { "en": "Crossing", - "nl": "Oversteekplaats" + "nl": "Oversteekplaats", + "de": "Kreuzung" }, "tags": [ "highway=crossing" ], "description": { "en": "Crossing for pedestrians and/or cyclists", - "nl": "Oversteekplaats voor voetgangers en/of fietsers" + "nl": "Oversteekplaats voor voetgangers en/of fietsers", + "de": "Kreuzung für Fußgänger und/oder Radfahrer" }, "preciseInput": { "preferredBackground": [ @@ -81,14 +87,16 @@ "title": { "en": "Traffic signal", "nl": "Verkeerslicht", - "ru": "Светофор" + "ru": "Светофор", + "de": "Ampel" }, "tags": [ "highway=traffic_signals" ], "description": { "en": "Traffic signal on a road", - "nl": "Verkeerslicht op een weg" + "nl": "Verkeerslicht op een weg", + "de": "Ampel an einer Straße" }, "preciseInput": { "preferredBackground": [ @@ -104,7 +112,8 @@ "id": "crossing-type", "question": { "en": "What kind of crossing is this?", - "nl": "Wat voor oversteekplaats is dit?" + "nl": "Wat voor oversteekplaats is dit?", + "de": "Was ist das für eine Kreuzung?" }, "condition": "highway=crossing", "mappings": [ @@ -112,21 +121,24 @@ "if": "crossing=uncontrolled", "then": { "en": "Crossing, without traffic lights", - "nl": "Oversteekplaats, zonder verkeerslichten" + "nl": "Oversteekplaats, zonder verkeerslichten", + "de": "Kreuzungen ohne Ampeln" } }, { "if": "crossing=traffic_signals", "then": { "en": "Crossing with traffic signals", - "nl": "Oversteekplaats met verkeerslichten" + "nl": "Oversteekplaats met verkeerslichten", + "de": "Kreuzungen mit Ampeln" } }, { "if": "crossing=zebra", "then": { "en": "Zebra crossing", - "nl": "Zebrapad" + "nl": "Zebrapad", + "de": "Zebrastreifen" }, "hideInAnswer": true } @@ -136,7 +148,8 @@ "id": "crossing-is-zebra", "question": { "en": "Is this is a zebra crossing?", - "nl": "Is dit een zebrapad?" + "nl": "Is dit een zebrapad?", + "de": "Ist das ein Zebrastreifen?" }, "condition": "crossing=uncontrolled", "mappings": [ @@ -144,14 +157,16 @@ "if": "crossing_ref=zebra", "then": { "en": "This is a zebra crossing", - "nl": "Dit is een zebrapad" + "nl": "Dit is een zebrapad", + "de": "Dies ist ein Zebrastreifen" } }, { "if": "crossing_ref=", "then": { "en": "This is not a zebra crossing", - "nl": "Dit is geen zebrapad" + "nl": "Dit is geen zebrapad", + "de": "Dies ist kein Zebrastreifen" } } ] @@ -160,7 +175,8 @@ "id": "crossing-bicycle-allowed", "question": { "en": "Is this crossing also for bicycles?", - "nl": "Is deze oversteekplaats ook voor fietsers" + "nl": "Is deze oversteekplaats ook voor fietsers", + "de": "Können Radfahrer diese Kreuzung nutzen?" }, "condition": "highway=crossing", "mappings": [ @@ -168,14 +184,16 @@ "if": "bicycle=yes", "then": { "en": "A cyclist can use this crossing", - "nl": "Een fietser kan deze oversteekplaats gebruiken" + "nl": "Een fietser kan deze oversteekplaats gebruiken", + "de": "Radfahrer können diese Kreuzung nutzen" } }, { "if": "bicycle=no", "then": { "en": "A cyclist can not use this crossing", - "nl": "Een fietser kan deze oversteekplaats niet gebruiken" + "nl": "Een fietser kan deze oversteekplaats niet gebruiken", + "de": "Radfahrer können diese Kreuzung nicht nutzen" } } ] @@ -184,7 +202,8 @@ "id": "crossing-has-island", "question": { "en": "Does this crossing have an island in the middle?", - "nl": "Heeft deze oversteekplaats een verkeerseiland in het midden?" + "nl": "Heeft deze oversteekplaats een verkeerseiland in het midden?", + "de": "Gibt es an diesem Übergang eine Verkehrsinsel?" }, "condition": "highway=crossing", "mappings": [ @@ -192,14 +211,16 @@ "if": "crossing:island=yes", "then": { "en": "This crossing has an island in the middle", - "nl": "Deze oversteekplaats heeft een verkeerseiland in het midden" + "nl": "Deze oversteekplaats heeft een verkeerseiland in het midden", + "de": "Der Übergang hat eine Verkehrsinsel" } }, { "if": "crossing:island=no", "then": { "en": "This crossing does not have an island in the middle", - "nl": "Deze oversteekplaats heeft geen verkeerseiland in het midden" + "nl": "Deze oversteekplaats heeft geen verkeerseiland in het midden", + "de": "Diese Ampel hat eine Taste, um ein grünes Signal anzufordern" } } ] @@ -208,7 +229,8 @@ "id": "crossing-tactile", "question": { "en": "Does this crossing have tactile paving?", - "nl": "Heeft deze oversteekplaats een geleidelijn?" + "nl": "Heeft deze oversteekplaats een geleidelijn?", + "de": "Gibt es an dieser Kreuzung ein Blindenleitsystem?" }, "condition": "highway=crossing", "mappings": [ @@ -216,14 +238,16 @@ "if": "tactile_paving=yes", "then": { "en": "This crossing has tactile paving", - "nl": "Deze oversteekplaats heeft een geleidelijn" + "nl": "Deze oversteekplaats heeft een geleidelijn", + "de": "An dieser Kreuzung gibt es ein Blindenleitsystem" } }, { "if": "tactile_paving=no", "then": { "en": "This crossing does not have tactile paving", - "nl": "Deze oversteekplaats heeft geen geleidelijn" + "nl": "Deze oversteekplaats heeft geen geleidelijn", + "de": "Diese Kreuzung hat kein Blindenleitsystem" } }, { @@ -240,7 +264,8 @@ "id": "crossing-button", "question": { "en": "Does this traffic light have a button to request green light?", - "nl": "Heeft dit verkeerslicht een knop voor groen licht?" + "nl": "Heeft dit verkeerslicht een knop voor groen licht?", + "de": "Hat diese Ampel eine Taste, um ein grünes Signal anzufordern?" }, "condition": { "or": [ @@ -260,7 +285,8 @@ "if": "button_operated=no", "then": { "en": "This traffic light does not have a button to request green light", - "nl": "Dit verkeerlicht heeft geen knop voor groen licht" + "nl": "Dit verkeerlicht heeft geen knop voor groen licht", + "de": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern." } } ] @@ -269,7 +295,8 @@ "id": "crossing-right-turn-through-red", "question": { "en": "Can a cyclist turn right when the light is red?", - "nl": "Mag een fietser rechtsaf slaan als het licht rood is?" + "nl": "Mag een fietser rechtsaf slaan als het licht rood is?", + "de": "Kann ein Radfahrer bei roter Ampel rechts abbiegen?" }, "condition": "highway=traffic_signals", "mappings": [ @@ -277,7 +304,8 @@ "if": "red_turn:right:bicycle=yes", "then": { "en": "A cyclist can turn right if the light is red ", - "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is " + "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is ", + "de": "Ein Radfahrer kann bei roter Ampel rechts abbiegen " }, "hideInAnswer": "_country!=be" }, @@ -285,7 +313,8 @@ "if": "red_turn:right:bicycle=yes", "then": { "en": "A cyclist can turn right if the light is red", - "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is" + "nl": "Een fietser mag wel rechtsaf slaan als het licht rood is", + "de": "Ein Radfahrer kann bei roter Ampel rechts abbiegen" }, "hideInAnswer": "_country=be" }, @@ -293,7 +322,8 @@ "if": "red_turn:right:bicycle=no", "then": { "en": "A cyclist can not turn right if the light is red", - "nl": "Een fietser mag niet rechtsaf slaan als het licht rood is" + "nl": "Een fietser mag niet rechtsaf slaan als het licht rood is", + "de": "Ein Radfahrer kann bei roter Ampel nicht rechts abbiegen" } } ] @@ -302,7 +332,8 @@ "id": "crossing-continue-through-red", "question": { "en": "Can a cyclist go straight on when the light is red?", - "nl": "Mag een fietser rechtdoor gaan als het licht rood is?" + "nl": "Mag een fietser rechtdoor gaan als het licht rood is?", + "de": "Kann ein Radfahrer bei roter Ampel geradeaus fahren?" }, "condition": "highway=traffic_signals", "mappings": [ @@ -310,7 +341,8 @@ "if": "red_turn:straight:bicycle=yes", "then": { "en": "A cyclist can go straight on if the light is red ", - "nl": "Een fietser mag wel rechtdoor gaan als het licht rood is " + "nl": "Een fietser mag wel rechtdoor gaan als het licht rood is ", + "de": "Ein Radfahrer kann bei roter Ampel geradeaus fahren " }, "hideInAnswer": "_country!=be" }, @@ -318,7 +350,8 @@ "if": "red_turn:straight:bicycle=yes", "then": { "en": "A cyclist can go straight on if the light is red", - "nl": "Een fietser mag wel rechtdoor gaan als het licht rood is" + "nl": "Een fietser mag wel rechtdoor gaan als het licht rood is", + "de": "Ein Radfahrer kann bei roter Ampel geradeaus fahren" }, "hideInAnswer": "_country=be" }, @@ -326,7 +359,8 @@ "if": "red_turn:straight:bicycle=no", "then": { "en": "A cyclist can not go straight on if the light is red", - "nl": "Een fietser mag niet rechtdoor gaan als het licht rood is" + "nl": "Een fietser mag niet rechtdoor gaan als het licht rood is", + "de": "Ein Radfahrer kann bei roter Ampel nicht geradeaus fahren" } } ] diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index dfcb6becb3..da3f5ba20f 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -2,7 +2,8 @@ "id": "cycleways_and_roads", "name": { "en": "Cycleways and roads", - "nl": "Fietspaden, straten en wegen" + "nl": "Fietspaden, straten en wegen", + "de": "Radwege und Straßen" }, "minzoom": 16, "source": { @@ -60,14 +61,16 @@ "if": "cycleway=lane", "then": { "nl": "Fietsstrook", - "en": "Bike lane" + "en": "Bike lane", + "de": "Fahrradspur" } }, { "if": "cycleway=track", "then": { "en": "Cycleway next to the road", - "nl": "Fietsweg naast de weg" + "nl": "Fietsweg naast de weg", + "de": "Radweg neben der Straße" } }, { @@ -85,7 +88,8 @@ { "question": { "en": "What kind of cycleway is here?", - "nl": "Wat voor fietspad is hier?" + "nl": "Wat voor fietspad is hier?", + "de": "Was für ein Radweg ist hier?" }, "condition": { "and": [ @@ -98,35 +102,40 @@ "if": "cycleway=shared_lane", "then": { "en": "There is a shared lane", - "nl": "Er is een fietssuggestiestrook" + "nl": "Er is een fietssuggestiestrook", + "de": "Es gibt eine geteilte Fahrspur" } }, { "if": "cycleway=lane", "then": { "en": "There is a lane next to the road (separated with paint)", - "nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)" + "nl": "Er is een fietspad aangrenzend aan de weg (gescheiden met verf)", + "de": "Es gibt eine Spur neben der Straße (getrennt durch eine Straßenmarkierung)" } }, { "if": "cycleway=track", "then": { "en": "There is a track, but no cycleway drawn separately from this road on the map.", - "nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg." + "nl": "Er is een fietspad (los van de weg), maar geen fietspad afzonderlijk getekend naast deze weg.", + "de": "Es gibt einen Weg, aber keinen Radweg, der auf der Karte getrennt von dieser Straße eingezeichnet ist." } }, { "if": "cycleway=separate", "then": { "en": "There is a separately drawn cycleway", - "nl": "Er is een apart getekend fietspad." + "nl": "Er is een apart getekend fietspad.", + "de": "Hier ist ein getrennter Radweg vorhanden" } }, { "if": "cycleway=no", "then": { "en": "There is no cycleway", - "nl": "Er is geen fietspad aanwezig" + "nl": "Er is geen fietspad aanwezig", + "de": "Es gibt keinen Radweg" }, "hideInAnswer": "cycleway=opposite" }, @@ -134,7 +143,8 @@ "if": "cycleway=no", "then": { "en": "There is no cycleway", - "nl": "Er is geen fietspad aanwezig" + "nl": "Er is geen fietspad aanwezig", + "de": "Es gibt keinen Radweg" }, "hideInAnswer": "cycleway!=opposite", "addExtraTags": [ @@ -148,28 +158,32 @@ { "question": { "en": "Is this street lit?", - "nl": "Is deze weg verlicht?" + "nl": "Is deze weg verlicht?", + "de": "Ist diese Straße beleuchtet?" }, "mappings": [ { "if": "lit=yes", "then": { "en": "This street is lit", - "nl": "Deze weg is verlicht" + "nl": "Deze weg is verlicht", + "de": "Diese Straße ist beleuchtet" } }, { "if": "lit=no", "then": { "en": "This road is not lit", - "nl": "Deze weg is niet verlicht" + "nl": "Deze weg is niet verlicht", + "de": "Diese Straße ist nicht beleuchtet" } }, { "if": "lit=sunset-sunrise", "then": { "en": "This road is lit at night", - "nl": "Deze weg is 's nachts verlicht" + "nl": "Deze weg is 's nachts verlicht", + "de": "Diese Straße ist nachts beleuchtet" }, "hideInAnswer": true }, @@ -177,7 +191,8 @@ "if": "lit=24/7", "then": { "en": "This road is lit 24/7", - "nl": "Deze weg is 24/7 verlicht" + "nl": "Deze weg is 24/7 verlicht", + "de": "Diese Straße ist durchgehend beleuchtet" } } ], @@ -186,7 +201,8 @@ { "question": { "en": "Is this a cyclestreet?", - "nl": "Is dit een fietsstraat?" + "nl": "Is dit een fietsstraat?", + "de": "Ist das eine Fahrradstraße" }, "condition": { "and": [ @@ -199,7 +215,8 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet, and a 30km/h zone.", - "nl": "Dit is een fietsstraat, en dus een 30km/h zone" + "nl": "Dit is een fietsstraat, en dus een 30km/h zone", + "de": "Dies ist eine Fahrradstraße in einer 30km/h Zone." }, "addExtraTags": [ "overtaking:motor_vehicle=no", @@ -211,7 +228,8 @@ "if": "cyclestreet=yes", "then": { "en": "This is a cyclestreet", - "nl": "Dit is een fietsstraat" + "nl": "Dit is een fietsstraat", + "de": "Dies ist eine Fahrradstraße" }, "hideInAnswer": "_country=be" }, @@ -219,7 +237,8 @@ "if": "cyclestreet=", "then": { "en": "This is not a cyclestreet.", - "nl": "Dit is geen fietsstraat" + "nl": "Dit is geen fietsstraat", + "de": "Dies ist keine Fahrradstraße." }, "addExtraTags": [ "overtaking:motor_vehicle=" @@ -231,7 +250,8 @@ { "render": { "en": "The maximum speed on this road is {maxspeed} km/h", - "nl": "De maximumsnelheid op deze weg is {maxspeed} km/u" + "nl": "De maximumsnelheid op deze weg is {maxspeed} km/u", + "de": "Die Höchstgeschwindigkeit auf dieser Straße beträgt {maxspeed} km/h" }, "freeform": { "key": "maxspeed", @@ -248,48 +268,55 @@ "if": "maxspeed=20", "then": { "en": "The maximum speed is 20 km/h", - "nl": "De maximumsnelheid is 20 km/u" + "nl": "De maximumsnelheid is 20 km/u", + "de": "Die Höchstgeschwindigkeit ist 20 km/h" } }, { "if": "maxspeed=30", "then": { "en": "The maximum speed is 30 km/h", - "nl": "De maximumsnelheid is 30 km/u" + "nl": "De maximumsnelheid is 30 km/u", + "de": "Die Höchstgeschwindigkeit ist 30 km/h" } }, { "if": "maxspeed=50", "then": { "en": "The maximum speed is 50 km/h", - "nl": "De maximumsnelheid is 50 km/u" + "nl": "De maximumsnelheid is 50 km/u", + "de": "Die Höchstgeschwindigkeit ist 50 km/h" } }, { "if": "maxspeed=70", "then": { "en": "The maximum speed is 70 km/h", - "nl": "De maximumsnelheid is 70 km/u" + "nl": "De maximumsnelheid is 70 km/u", + "de": "Die Höchstgeschwindigkeit ist 70 km/h" } }, { "if": "maxspeed=90", "then": { "en": "The maximum speed is 90 km/h", - "nl": "De maximumsnelheid is 90 km/u" + "nl": "De maximumsnelheid is 90 km/u", + "de": "Die Höchstgeschwindigkeit ist 90 km/h" } } ], "question": { "en": "What is the maximum speed in this street?", - "nl": "Wat is de maximumsnelheid in deze straat?" + "nl": "Wat is de maximumsnelheid in deze straat?", + "de": "Was ist die Höchstgeschwindigkeit auf dieser Straße?" }, "id": "Maxspeed (for road)" }, { "render": { "en": "This cyleway is made of {cycleway:surface}", - "nl": "Dit fietspad is gemaakt van {cycleway:surface}" + "nl": "Dit fietspad is gemaakt van {cycleway:surface}", + "de": "Der Radweg ist aus {cycleway:surface}" }, "freeform": { "key": "cycleway:surface" @@ -306,7 +333,8 @@ "if": "cycleway:surface=unpaved", "then": { "en": "This cycleway is unpaved", - "nl": "Dit fietspad is onverhard" + "nl": "Dit fietspad is onverhard", + "de": "Dieser Radweg hat keinen festen Belag" }, "hideInAnswer": true }, @@ -314,7 +342,8 @@ "if": "cycleway:surface=paved", "then": { "en": "This cycleway is paved", - "nl": "Dit fietspad is geplaveid" + "nl": "Dit fietspad is geplaveid", + "de": "Dieser Radweg hat einen festen Belag" }, "hideInAnswer": true }, @@ -322,28 +351,32 @@ "if": "cycleway:surface=asphalt", "then": { "en": "This cycleway is made of asphalt", - "nl": "Dit fietspad is gemaakt van asfalt" + "nl": "Dit fietspad is gemaakt van asfalt", + "de": "Der Radweg ist aus Asphalt" } }, { "if": "cycleway:surface=paving_stones", "then": { "en": "This cycleway is made of smooth paving stones", - "nl": "Dit fietspad is gemaakt van straatstenen" + "nl": "Dit fietspad is gemaakt van straatstenen", + "de": "Dieser Fahrradweg besteht aus ebenen Pflastersteinen" } }, { "if": "cycleway:surface=concrete", "then": { "en": "This cycleway is made of concrete", - "nl": "Dit fietspad is gemaakt van beton" + "nl": "Dit fietspad is gemaakt van beton", + "de": "Der Radweg ist aus Beton" } }, { "if": "cycleway:surface=cobblestone", "then": { "en": "This cycleway is made of cobblestone (unhewn or sett)", - "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)" + "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)", + "de": "Dieser Radweg besteht aus Kopfsteinpflaster" }, "hideInAnswer": true }, @@ -351,62 +384,71 @@ "if": "cycleway:surface=unhewn_cobblestone", "then": { "en": "This cycleway is made of raw, natural cobblestone", - "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien" + "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien", + "de": "Dieser Fahrradweg besteht aus unregelmäßigem, unbehauenem Kopfsteinpflaster" } }, { "if": "cycleway:surface=sett", "then": { "en": "This cycleway is made of flat, square cobblestone", - "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien" + "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien", + "de": "Dieser Fahrradweg besteht aus regelmäßigem, behauenem Kopfsteinpflaster" } }, { "if": "cycleway:surface=wood", "then": { "en": "This cycleway is made of wood", - "nl": "Dit fietspad is gemaakt van hout" + "nl": "Dit fietspad is gemaakt van hout", + "de": "Der Radweg ist aus Holz" } }, { "if": "cycleway:surface=gravel", "then": { "en": "This cycleway is made of gravel", - "nl": "Dit fietspad is gemaakt van grind" + "nl": "Dit fietspad is gemaakt van grind", + "de": "Der Radweg ist aus Schotter" } }, { "if": "cycleway:surface=fine_gravel", "then": { "en": "This cycleway is made of fine gravel", - "nl": "Dit fietspad is gemaakt van fijn grind" + "nl": "Dit fietspad is gemaakt van fijn grind", + "de": "Dieser Radweg besteht aus feinem Schotter" } }, { "if": "cycleway:surface=pebblestone", "then": { "en": "This cycleway is made of pebblestone", - "nl": "Dit fietspad is gemaakt van kiezelsteentjes" + "nl": "Dit fietspad is gemaakt van kiezelsteentjes", + "de": "Der Radweg ist aus Kies" } }, { "if": "cycleway:surface=ground", "then": { "en": "This cycleway is made from raw ground", - "nl": "Dit fietspad is gemaakt van aarde" + "nl": "Dit fietspad is gemaakt van aarde", + "de": "Dieser Radweg besteht aus Rohboden" } } ], "question": { "en": "What is the surface of the cycleway made from?", - "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?" + "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?", + "de": "Was ist der Belag dieses Radwegs?" }, "id": "Cycleway:surface" }, { "question": { "en": "What is the smoothness of this cycleway?", - "nl": "Wat is de kwaliteit van dit fietspad?" + "nl": "Wat is de kwaliteit van dit fietspad?", + "de": "Wie eben ist dieser Radweg?" }, "condition": { "or": [ @@ -420,56 +462,64 @@ "if": "cycleway:smoothness=excellent", "then": { "en": "Usable for thin rollers: rollerblade, skateboard", - "nl": "Geschikt voor fijne rollers: rollerblade, skateboard" + "nl": "Geschikt voor fijne rollers: rollerblade, skateboard", + "de": "Geeignet für dünne Rollen: Rollerblades, Skateboard" } }, { "if": "cycleway:smoothness=good", "then": { "en": "Usable for thin wheels: racing bike", - "nl": "Geschikt voor fijne wielen: racefiets" + "nl": "Geschikt voor fijne wielen: racefiets", + "de": "Geeignet für dünne Reifen: Rennrad" } }, { "if": "cycleway:smoothness=intermediate", "then": { "en": "Usable for normal wheels: city bike, wheelchair, scooter", - "nl": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter" + "nl": "Geschikt voor normale wielen: stadsfiets, rolstoel, scooter", + "de": "Geeignet für normale Reifen: Fahrrad, Rollstuhl, Scooter" } }, { "if": "cycleway:smoothness=bad", "then": { "en": "Usable for robust wheels: trekking bike, car, rickshaw", - "nl": "Geschikt voor brede wielen: trekfiets, auto, rickshaw" + "nl": "Geschikt voor brede wielen: trekfiets, auto, rickshaw", + "de": "Geeignet für breite Reifen: Trekkingfahrrad, Auto, Rikscha" } }, { "if": "cycleway:smoothness=very_bad", "then": { "en": "Usable for vehicles with high clearance: light duty off-road vehicle", - "nl": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen" + "nl": "Geschikt voor voertuigen met hoge banden: lichte terreinwagen", + "de": "Geeignet für Fahrzeuge mit großer Bodenfreiheit: leichte Geländewagen" } }, { "if": "cycleway:smoothness=horrible", "then": { "en": "Usable for off-road vehicles: heavy duty off-road vehicle", - "nl": "Geschikt voor terreinwagens: zware terreinwagen" + "nl": "Geschikt voor terreinwagens: zware terreinwagen", + "de": "Geeignet für Geländefahrzeuge: schwerer Geländewagen" } }, { "if": "cycleway:smoothness=very_horrible", "then": { "en": "Usable for specialized off-road vehicles: tractor, ATV", - "nl": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen" + "nl": "Geschikt voor gespecialiseerde terreinwagens: tractor, alleterreinwagen", + "de": "Geeignet für Geländefahrzeuge: Traktor, ATV" } }, { "if": "cycleway:smoothness=impassable", "then": { "en": "Impassable / No wheeled vehicle", - "nl": "Niet geschikt voor voertuigen met wielen" + "nl": "Niet geschikt voor voertuigen met wielen", + "de": "Unpassierbar / Keine bereiften Fahrzeuge" } } ], @@ -478,7 +528,8 @@ { "render": { "en": "This road is made of {surface}", - "nl": "Deze weg is gemaakt van {surface}" + "nl": "Deze weg is gemaakt van {surface}", + "de": "Der Radweg ist aus {surface}" }, "freeform": { "key": "surface" @@ -488,7 +539,8 @@ "if": "surface=unpaved", "then": { "en": "This cycleway is unhardened", - "nl": "Dit fietspad is onverhard" + "nl": "Dit fietspad is onverhard", + "de": "Dieser Radweg ist nicht befestigt" }, "hideInAnswer": true }, @@ -496,7 +548,8 @@ "if": "surface=paved", "then": { "en": "This cycleway is paved", - "nl": "Dit fietspad is geplaveid" + "nl": "Dit fietspad is geplaveid", + "de": "Dieser Radweg hat einen festen Belag" }, "hideInAnswer": true }, @@ -504,28 +557,32 @@ "if": "surface=asphalt", "then": { "en": "This cycleway is made of asphalt", - "nl": "Dit fietspad is gemaakt van asfalt" + "nl": "Dit fietspad is gemaakt van asfalt", + "de": "Der Radweg ist aus Asphalt" } }, { "if": "surface=paving_stones", "then": { "en": "This cycleway is made of smooth paving stones", - "nl": "Dit fietspad is gemaakt van straatstenen" + "nl": "Dit fietspad is gemaakt van straatstenen", + "de": "Dieser Fahrradweg besteht aus ebenen Pflastersteinen" } }, { "if": "surface=concrete", "then": { "en": "This cycleway is made of concrete", - "nl": "Dit fietspad is gemaakt van beton" + "nl": "Dit fietspad is gemaakt van beton", + "de": "Der Radweg ist aus Beton" } }, { "if": "surface=cobblestone", "then": { "en": "This cycleway is made of cobblestone (unhewn or sett)", - "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)" + "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)", + "de": "Dieser Radweg besteht aus Kopfsteinpflaster" }, "hideInAnswer": true }, @@ -533,62 +590,71 @@ "if": "surface=unhewn_cobblestone", "then": { "en": "This cycleway is made of raw, natural cobblestone", - "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien" + "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien", + "de": "Dieser Fahrradweg besteht aus unregelmäßigem, unbehauenem Kopfsteinpflaster" } }, { "if": "surface=sett", "then": { "en": "This cycleway is made of flat, square cobblestone", - "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien" + "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien", + "de": "Dieser Fahrradweg besteht aus regelmäßigem, behauenem Kopfsteinpflaster" } }, { "if": "surface=wood", "then": { "en": "This cycleway is made of wood", - "nl": "Dit fietspad is gemaakt van hout" + "nl": "Dit fietspad is gemaakt van hout", + "de": "Der Radweg ist aus Holz" } }, { "if": "surface=gravel", "then": { "en": "This cycleway is made of gravel", - "nl": "Dit fietspad is gemaakt van grind" + "nl": "Dit fietspad is gemaakt van grind", + "de": "Der Radweg ist aus Schotter" } }, { "if": "surface=fine_gravel", "then": { "en": "This cycleway is made of fine gravel", - "nl": "Dit fietspad is gemaakt van fijn grind" + "nl": "Dit fietspad is gemaakt van fijn grind", + "de": "Dieser Radweg besteht aus feinem Schotter" } }, { "if": "surface=pebblestone", "then": { "en": "This cycleway is made of pebblestone", - "nl": "Dit fietspad is gemaakt van kiezelsteentjes" + "nl": "Dit fietspad is gemaakt van kiezelsteentjes", + "de": "Der Radweg ist aus Kies" } }, { "if": "surface=ground", "then": { "en": "This cycleway is made from raw ground", - "nl": "Dit fietspad is gemaakt van aarde" + "nl": "Dit fietspad is gemaakt van aarde", + "de": "Dieser Radweg besteht aus Rohboden" } } ], "question": { "en": "What is the surface of the street made from?", - "nl": "Waaruit is het oppervlak van de straat gemaakt?" + "nl": "Waaruit is het oppervlak van de straat gemaakt?", + "de": "Was ist der Belag dieser Straße?" }, "id": "Surface of the road" }, { "question": { "en": "What is the smoothness of this street?", - "nl": "Wat is de kwaliteit van deze straat?" + "nl": "Wat is de kwaliteit van deze straat?", + "de": "Wie eben ist diese Straße?" }, "condition": { "or": [ @@ -600,49 +666,57 @@ { "if": "smoothness=excellent", "then": { - "en": "Usable for thin rollers: rollerblade, skateboard" + "en": "Usable for thin rollers: rollerblade, skateboard", + "de": "Geeignet für dünne Rollen: Rollerblades, Skateboard" } }, { "if": "smoothness=good", "then": { - "en": "Usable for thin wheels: racing bike" + "en": "Usable for thin wheels: racing bike", + "de": "Geeignet für dünne Reifen: Rennrad" } }, { "if": "smoothness=intermediate", "then": { - "en": "Usable for normal wheels: city bike, wheelchair, scooter" + "en": "Usable for normal wheels: city bike, wheelchair, scooter", + "de": "Geeignet für normale Reifen: Fahrrad, Rollstuhl, Scooter" } }, { "if": "smoothness=bad", "then": { - "en": "Usable for robust wheels: trekking bike, car, rickshaw" + "en": "Usable for robust wheels: trekking bike, car, rickshaw", + "de": "Geeignet für breite Reifen: Trekkingfahrrad, Auto, Rikscha" } }, { "if": "smoothness=very_bad", "then": { - "en": "Usable for vehicles with high clearance: light duty off-road vehicle" + "en": "Usable for vehicles with high clearance: light duty off-road vehicle", + "de": "Geeignet für Fahrzeuge mit großer Bodenfreiheit: leichte Geländewagen" } }, { "if": "smoothness=horrible", "then": { - "en": "Usable for off-road vehicles: heavy duty off-road vehicle" + "en": "Usable for off-road vehicles: heavy duty off-road vehicle", + "de": "Geeignet für Geländefahrzeuge: schwerer Geländewagen" } }, { "if": "smoothness=very_horrible", "then": { - "en": "Usable for specialized off-road vehicles: tractor, ATV" + "en": "Usable for specialized off-road vehicles: tractor, ATV", + "de": "Geeignet für spezielle Geländewagen: Traktor, ATV" } }, { "if": "smoothness=impassable", "then": { - "en": "Impassable / No wheeled vehicle" + "en": "Impassable / No wheeled vehicle", + "de": "Unpassierbar / Keine bereiften Fahrzeuge" } } ], @@ -668,8 +742,8 @@ ] }, "question": { - "en": "What is the carriage width of this road (in meters)?", - "nl": "Hoe breed is de rijbaan in deze straat (in meters)?" + "en": "What is the carriage width of this road (in meters)?
This is measured curb to curb and thus includes the width of parallell parking lanes", + "nl": "Hoe breed is de rijbaan in deze straat (in meters)?
Dit is
Meet dit van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook" }, "id": "width:carriageway" }, @@ -677,7 +751,8 @@ "id": "cycleway-lane-track-traffic-signs", "question": { "en": "What traffic sign does this cycleway have?", - "nl": "Welk verkeersbord heeft dit fietspad?" + "nl": "Welk verkeersbord heeft dit fietspad?", + "de": "Welches Verkehrszeichen hat dieser Radweg?" }, "condition": { "or": [ @@ -690,7 +765,8 @@ "if": "cycleway:traffic_sign=BE:D7", "then": { "en": "Compulsory cycleway ", - "nl": "Verplicht fietspad " + "nl": "Verplicht fietspad ", + "de": "Vorgeschriebener Radweg " }, "hideInAnswer": "_country!=be" }, @@ -698,7 +774,8 @@ "if": "cycleway:traffic_sign~BE:D7;.*", "then": { "en": "Compulsory cycleway (with supplementary sign)
", - "nl": "Verplicht fietspad (met onderbord)
" + "nl": "Verplicht fietspad (met onderbord)
", + "de": "Vorgeschriebener Radweg (mit Zusatzschild)
" }, "hideInAnswer": true }, @@ -706,7 +783,8 @@ "if": "cycleway:traffic_sign=BE:D9", "then": { "en": "Segregated foot/cycleway ", - "nl": "Afgescheiden voet-/fietspad " + "nl": "Afgescheiden voet-/fietspad ", + "de": "Getrennter Fuß-/Radweg " }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -718,7 +796,8 @@ "if": "cycleway:traffic_sign=BE:D10", "then": { "en": "Unsegregated foot/cycleway ", - "nl": "Gedeeld voet-/fietspad " + "nl": "Gedeeld voet-/fietspad ", + "de": "Gemeinsamer Fuß-/Radweg " }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -730,7 +809,8 @@ "if": "cycleway:traffic_sign=none", "then": { "en": "No traffic sign present", - "nl": "Geen verkeersbord aanwezig" + "nl": "Geen verkeersbord aanwezig", + "de": "Kein Verkehrsschild vorhanden" } } ] @@ -739,7 +819,8 @@ "id": "cycleway-traffic-signs", "question": { "en": "What traffic sign does this cycleway have?", - "nl": "Welk verkeersbord heeft dit fietspad?" + "nl": "Welk verkeersbord heeft dit fietspad?", + "de": "Welches Verkehrszeichen hat dieser Radweg?" }, "condition": { "or": [ @@ -752,7 +833,8 @@ "if": "traffic_sign=BE:D7", "then": { "en": "Compulsory cycleway ", - "nl": "Verplicht fietspad " + "nl": "Verplicht fietspad ", + "de": "Vorgeschriebener Radweg " }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -766,7 +848,8 @@ "if": "traffic_sign~BE:D7;.*", "then": { "en": "Compulsory cycleway (with supplementary sign)
", - "nl": "Verplicht fietspad (met onderbord)
" + "nl": "Verplicht fietspad (met onderbord)
", + "de": "Vorgeschriebener Radweg (mit Zusatzschild)
" }, "hideInAnswer": true }, @@ -774,7 +857,8 @@ "if": "traffic_sign=BE:D9", "then": { "en": "Segregated foot/cycleway ", - "nl": "Afgescheiden voet-/fietspad " + "nl": "Afgescheiden voet-/fietspad ", + "de": "Getrennter Fuß-/Radweg " }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -790,7 +874,8 @@ "if": "traffic_sign=BE:D10", "then": { "en": "Unsegregated foot/cycleway ", - "nl": "Gedeeld voet-/fietspad " + "nl": "Gedeeld voet-/fietspad ", + "de": "Gemeinsamer Fuß-/Radweg " }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -806,7 +891,8 @@ "if": "traffic_sign=none", "then": { "en": "No traffic sign present", - "nl": "Geen verkeersbord aanwezig" + "nl": "Geen verkeersbord aanwezig", + "de": "Kein Verkehrsschild vorhanden" } } ] @@ -896,7 +982,8 @@ "if": "cycleway:traffic_sign:supplementary=none", "then": { "en": "No supplementary traffic sign present", - "nl": "Geen onderbord aanwezig" + "nl": "Geen onderbord aanwezig", + "de": "Kein zusätzliches Verkehrszeichen vorhanden" } } ] @@ -929,7 +1016,8 @@ "if": "traffic_sign=BE:D7;BE:M13", "then": { "en": "", - "nl": "" + "nl": "", + "de": "" }, "hideInAnswer": "_country!=be", "addExtraTags": [ @@ -986,7 +1074,8 @@ "if": "traffic_sign:supplementary=none", "then": { "en": "No supplementary traffic sign present", - "nl": "Geen onderbord aanwezig" + "nl": "Geen onderbord aanwezig", + "de": "Kein zusätzliches Verkehrszeichen vorhanden" } } ] @@ -994,11 +1083,13 @@ { "render": { "en": "The buffer besides this cycleway is {cycleway:buffer} m", - "nl": "De schrikafstand van dit fietspad is {cycleway:buffer} m" + "nl": "De schrikafstand van dit fietspad is {cycleway:buffer} m", + "de": "Der Sicherheitsabstand zu diesem Radweg beträgt {cycleway:buffer} m" }, "question": { "en": "How wide is the gap between the cycleway and the road?", - "nl": "Hoe breed is de ruimte tussen het fietspad en de weg?" + "nl": "Hoe breed is de ruimte tussen het fietspad en de weg?", + "de": "Wie breit ist der Abstand zwischen Radweg und Straße?" }, "condition": { "or": [ @@ -1020,7 +1111,8 @@ "id": "cyclelan-segregation", "question": { "en": "How is this cycleway separated from the road?", - "nl": "Hoe is dit fietspad gescheiden van de weg?" + "nl": "Hoe is dit fietspad gescheiden van de weg?", + "de": "Wie ist der Radweg von der Straße abgegrenzt?" }, "condition": { "or": [ @@ -1033,28 +1125,32 @@ "if": "cycleway:separation=dashed_line", "then": { "en": "This cycleway is separated by a dashed line", - "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep" + "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep", + "de": "Der Radweg ist abgegrenzt durch eine gestrichelte Linie" } }, { "if": "cycleway:separation=solid_line", "then": { "en": "This cycleway is separated by a solid line", - "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep" + "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep", + "de": "Der Radweg ist abgegrenzt durch eine durchgezogene Linie" } }, { "if": "cycleway:separation=parking_lane", "then": { "en": "This cycleway is separated by a parking lane", - "nl": "Dit fietspad is gescheiden van de weg met parkeervakken" + "nl": "Dit fietspad is gescheiden van de weg met parkeervakken", + "de": "Der Radweg ist abgegrenzt durch eine Parkspur" } }, { "if": "cycleway:separation=kerb", "then": { "en": "This cycleway is separated by a kerb", - "nl": "Dit fietspad is gescheiden van de weg met een stoeprand" + "nl": "Dit fietspad is gescheiden van de weg met een stoeprand", + "de": "Dieser Radweg ist getrennt durch einen Bordstein" } } ] @@ -1063,7 +1159,8 @@ "id": "cycleway-segregation", "question": { "en": "How is this cycleway separated from the road?", - "nl": "Hoe is dit fietspad gescheiden van de weg?" + "nl": "Hoe is dit fietspad gescheiden van de weg?", + "de": "Wie ist der Radweg von der Straße abgegrenzt?" }, "condition": { "or": [ @@ -1076,28 +1173,32 @@ "if": "separation=dashed_line", "then": { "en": "This cycleway is separated by a dashed line", - "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep" + "nl": "Dit fietspad is gescheiden van de weg met een onderbroken streep", + "de": "Der Radweg ist abgegrenzt durch eine gestrichelte Linie" } }, { "if": "separation=solid_line", "then": { "en": "This cycleway is separated by a solid line", - "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep" + "nl": "Dit fietspad is gescheiden van de weg met een doorgetrokken streep", + "de": "Der Radweg ist abgegrenzt durch eine durchgezogene Linie" } }, { "if": "separation=parking_lane", "then": { "en": "This cycleway is separated by a parking lane", - "nl": "Dit fietspad is gescheiden van de weg met parkeervakken" + "nl": "Dit fietspad is gescheiden van de weg met parkeervakken", + "de": "Der Radweg ist abgegrenzt durch eine Parkspur" } }, { "if": "separation=kerb", "then": { "en": "This cycleway is separated by a kerb", - "nl": "Dit fietspad is gescheiden van de weg met een stoeprand" + "nl": "Dit fietspad is gescheiden van de weg met een stoeprand", + "de": "Dieser Radweg ist getrennt durch einen Bordstein" } } ] @@ -1175,5 +1276,6 @@ "then": "" } ] - } + }, + "allowSplit": true } \ No newline at end of file diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 8a7fff1ec9..1055366784 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -35,12 +35,7 @@ "mappings": [ { "if": "_recently_surveyed=true", - "then": { - "en": "./assets/layers/defibrillator/aed_checked.svg", - "ru": "./assets/layers/defibrillator/aed_checked.svg", - "it": "./assets/layers/defibrillator/aed_checked.svg", - "fr": "./assets/layers/defibrillator/aed_checked.svg" - } + "then": "./assets/layers/defibrillator/aed_checked.svg" } ] }, @@ -189,7 +184,8 @@ "en": "Not accessible, possibly only for professional use", "nl": "Niet toegankelijk, mogelijk enkel voor professionals", "fr": "Pas accessible, peut-être uniquement à usage professionnel", - "it": "Non accessibile, potrebbe essere solo per uso professionale" + "it": "Non accessibile, potrebbe essere solo per uso professionale", + "de": "Nicht zugänglich, möglicherweise nur für betriebliche Nutzung" } } ], @@ -207,7 +203,8 @@ "en": "Is this a a regular automatic defibrillator or a manual defibrillator for professionals only?", "nl": "Is dit een gewone automatische defibrillator of een manueel toestel enkel voor professionals?", "fr": "Est-ce un défibrillateur automatique normal ou un défibrillateur manuel à usage professionnel uniquement ?", - "it": "Si tratta di un normale defibrillatore automatico o un defibrillatore manuale riservato ai professionisti?" + "it": "Si tratta di un normale defibrillatore automatico o un defibrillatore manuale riservato ai professionisti?", + "de": "Ist dies ein normaler automatischer Defibrillator oder ein manueller Defibrillator nur für Profis?" }, "freeform": { "key": "defibrillator" @@ -235,7 +232,8 @@ "nl": "Dit is een gewone automatische defibrillator", "fr": "C'est un défibrillateur automatique manuel", "it": "È un normale defibrillatore automatico", - "ru": "Это обычный автоматический дефибриллятор" + "ru": "Это обычный автоматический дефибриллятор", + "de": "Dies ist ein normaler automatischer Defibrillator" } } ], diff --git a/assets/layers/direction/direction.json b/assets/layers/direction/direction.json index 4d3fd684d5..75cd375c25 100644 --- a/assets/layers/direction/direction.json +++ b/assets/layers/direction/direction.json @@ -5,7 +5,8 @@ "nl": "Richtingsvisualisatie", "fr": "Visualisation de la direction", "it": "Visualizzazione della direzione", - "ru": "Визуализация направления" + "ru": "Визуализация направления", + "de": "Visualisierung der Richtung" }, "minzoom": 16, "source": { @@ -23,7 +24,8 @@ "en": "This layer visualizes directions", "nl": "Deze laag toont de oriëntatie van een object", "fr": "Cette couche visualise les directions", - "it": "Questo livello visualizza le direzioni" + "it": "Questo livello visualizza le direzioni", + "de": "Diese Ebene visualisiert Richtungen" }, "tagRenderings": [], "icon": { diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json index c6040e3af5..1170a823e4 100644 --- a/assets/layers/drinking_water/drinking_water.json +++ b/assets/layers/drinking_water/drinking_water.json @@ -5,7 +5,7 @@ "nl": "Drinkbaar water", "fr": "Eau potable", "gl": "Auga potábel", - "de": "Trinkwasser", + "de": "Trinkwasserstelle", "it": "Acqua potabile", "ru": "Питьевая вода", "id": "Air minum" @@ -16,7 +16,7 @@ "nl": "Drinkbaar water", "fr": "Eau potable", "gl": "Auga potábel", - "de": "Trinkwasser", + "de": "Trinkwasserstelle", "it": "Acqua potabile", "ru": "Питьевая вода", "id": "Air minum" @@ -61,7 +61,7 @@ "nl": "drinkbaar water", "fr": "eau potable", "gl": "auga potábel", - "de": "trinkwasser", + "de": "Trinkwasserstelle", "it": "acqua potabile", "ru": "питьевая вода", "id": "air minum" @@ -99,7 +99,8 @@ "en": "This drinking water works", "nl": "Deze drinkwaterfontein werkt", "it": "La fontanella funziona", - "fr": "Cette fontaine fonctionne" + "fr": "Cette fontaine fonctionne", + "de": "Diese Trinkwasserstelle funktioniert" } }, { @@ -108,7 +109,8 @@ "en": "This drinking water is broken", "nl": "Deze drinkwaterfontein is kapot", "it": "La fontanella è guasta", - "fr": "Cette fontaine est cassée" + "fr": "Cette fontaine est cassée", + "de": "Diese Trinkwasserstelle ist kaputt" } }, { @@ -117,7 +119,8 @@ "en": "This drinking water is closed", "nl": "Deze drinkwaterfontein is afgesloten", "it": "La fontanella è chiusa", - "fr": "Cette fontaine est fermée" + "fr": "Cette fontaine est fermée", + "de": "Diese Trinkwasserstelle wurde geschlossen" } } ], @@ -161,7 +164,7 @@ "en": "There is another drinking water fountain at {_closest_other_drinking_water_distance} meter", "nl": "Er bevindt zich een ander drinkwaterpunt op {_closest_other_drinking_water_distance} meter", "it": "C’è un’altra fontanella a {_closest_other_drinking_water_distance} metri", - "de": "Ein weiterer Trinkwasserbrunnen befindet sich in {_closest_other_drinking_water_distance} Meter", + "de": "Eine weitere Trinkwasserstelle liegt {_closest_other_drinking_water_distance} Meter entfernt", "fr": "Une autre source d’eau potable est à {_closest_other_drinking_water_distance} mètres a>" }, "condition": "_closest_other_drinking_water_id~*" diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json index 690612341f..eaefef94b1 100644 --- a/assets/layers/etymology/etymology.json +++ b/assets/layers/etymology/etymology.json @@ -38,7 +38,8 @@ "id": "wikipedia-etymology", "question": { "en": "What is the Wikidata-item that this object is named after?", - "nl": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?" + "nl": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?", + "de": "Was ist das Wikidata-Element, nach dem dieses Objekt benannt ist?" }, "freeform": { "key": "name:etymology:wikidata", @@ -71,7 +72,8 @@ }, "render": { "en": "

Wikipedia article of the name giver

{wikipedia(name:etymology:wikidata):max-height:20rem}", - "nl": "

Wikipedia artikel van de naamgever

{wikipedia(name:etymology:wikidata):max-height:20rem}" + "nl": "

Wikipedia artikel van de naamgever

{wikipedia(name:etymology:wikidata):max-height:20rem}", + "de": "

Wikipedia Artikel zur Namensherkunft

{wikipedia(name:etymology:wikidata):max-height:20rem}" }, "condition": "name:etymology!=unknown" }, @@ -87,7 +89,8 @@ "id": "simple etymology", "question": { "en": "What is this object named after?
This might be written on the street name sign", - "nl": "Naar wat is dit object vernoemd?
Dit staat mogelijks vermeld op het straatnaambordje" + "nl": "Naar wat is dit object vernoemd?
Dit staat mogelijks vermeld op het straatnaambordje", + "de": "Wonach ist dieses Objekt benannt?
Das könnte auf einem Straßenschild stehen" }, "render": { "en": "Named after {name:etymology}", @@ -102,7 +105,8 @@ "if": "name:etymology=unknown", "then": { "en": "The origin of this name is unknown in all literature", - "nl": "De oorsprong van deze naam is onbekend in de literatuur" + "nl": "De oorsprong van deze naam is onbekend in de literatuur", + "de": "Der Ursprung dieses Namens ist in der gesamten Literatur unbekannt" } } ], diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index c2c966aac3..44ce21fb10 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -2,7 +2,8 @@ "id": "food", "name": { "nl": "Eetgelegenheden", - "en": "Restaurants and fast food" + "en": "Restaurants and fast food", + "de": "Restaurants und Fast Food" }, "source": { "osmTags": { @@ -64,14 +65,16 @@ "title": { "en": "restaurant", "nl": "restaurant", - "ru": "ресторан" + "ru": "ресторан", + "de": "Restaurant" }, "tags": [ "amenity=restaurant" ], "description": { "nl": "Een eetgegelegenheid waar je aan tafel wordt bediend", - "en": "A formal eating place with sit-down facilities selling full meals served by waiters" + "en": "A formal eating place with sit-down facilities selling full meals served by waiters", + "de": "Ein klassisches Speiselokal mit Sitzgelegenheiten, in dem vollständige Mahlzeiten von Kellnern serviert werden" }, "preciseInput": { "preferredBackground": "map" @@ -81,7 +84,8 @@ "title": { "en": "fastfood", "nl": "fastfood-zaak", - "ru": "быстрое питание" + "ru": "быстрое питание", + "de": "Schnellimbiss" }, "tags": [ "amenity=fast_food" @@ -97,7 +101,8 @@ { "title": { "en": "fries shop", - "nl": "frituur" + "nl": "frituur", + "de": "Pommesbude" }, "tags": [ "amenity=fast_food", @@ -125,7 +130,8 @@ }, "then": { "nl": "Restaurant {name}", - "en": "Restaurant {name}" + "en": "Restaurant {name}", + "de": "Restaurant {name}" } }, { @@ -137,7 +143,8 @@ }, "then": { "nl": "Fastfood-zaak {name}", - "en": "Fastfood {name}" + "en": "Fastfood {name}", + "de": "Schnellrestaurant{name}" } } ] @@ -147,11 +154,13 @@ { "question": { "nl": "Wat is de naam van deze eetgelegenheid?", - "en": "What is the name of this restaurant?" + "en": "What is the name of this restaurant?", + "de": "Wie heißt dieses Restaurant?" }, "render": { "nl": "De naam van deze eetgelegeheid is {name}", - "en": "The name of this restaurant is {name}" + "en": "The name of this restaurant is {name}", + "de": "Das Restaurant heißt {name}" }, "freeform": { "key": "name" @@ -161,7 +170,8 @@ { "question": { "en": "What type of business is this?", - "nl": "Wat voor soort zaak is dit?" + "nl": "Wat voor soort zaak is dit?", + "de": "Um was für ein Geschäft handelt es sich?" }, "mappings": [ { @@ -188,11 +198,13 @@ { "question": { "nl": "Welk soort gerechten worden hier geserveerd?", - "en": "Which food is served here?" + "en": "Which food is served here?", + "de": "Welches Essen gibt es hier?" }, "render": { "nl": "Deze plaats serveert vooral {cuisine}", - "en": "This place mostly serves {cuisine}" + "en": "This place mostly serves {cuisine}", + "de": "An diesem Ort gibt es hauptsächlich {cuisine}" }, "freeform": { "key": "cuisine", @@ -205,21 +217,24 @@ "if": "cuisine=pizza", "then": { "en": "This is a pizzeria", - "nl": "Dit is een pizzeria" + "nl": "Dit is een pizzeria", + "de": "Dies ist eine Pizzeria" } }, { "if": "cuisine=friture", "then": { "en": "This is a friture", - "nl": "Dit is een frituur" + "nl": "Dit is een frituur", + "de": "Dies ist eine Pommesbude" } }, { "if": "cuisine=pasta", "then": { "en": "Mainly serves pasta", - "nl": "Dit is een pastazaak" + "nl": "Dit is een pastazaak", + "de": "Bietet vorwiegend Pastagerichte an" } }, { @@ -300,28 +315,32 @@ { "question": { "nl": "Biedt deze zaak een afhaalmogelijkheid aan?", - "en": "Does this place offer takea-way?" + "en": "Does this place offer takea-way?", + "de": "Ist an diesem Ort Mitnahme möglich?" }, "mappings": [ { "if": "takeaway=only", "then": { "en": "This is a take-away only business", - "nl": "Hier is enkel afhaal mogelijk" + "nl": "Hier is enkel afhaal mogelijk", + "de": "Dieses Geschäft bietet nur Artikel zur Mitnahme an" } }, { "if": "takeaway=yes", "then": { "en": "Take-away is possible here", - "nl": "Eten kan hier afgehaald worden" + "nl": "Eten kan hier afgehaald worden", + "de": "Mitnahme möglich" } }, { "if": "takeaway=no", "then": { "en": "Take-away is not possible here", - "nl": "Hier is geen afhaalmogelijkheid" + "nl": "Hier is geen afhaalmogelijkheid", + "de": "Mitnahme nicht möglich" } } ], @@ -330,7 +349,8 @@ { "question": { "nl": "Heeft deze eetgelegenheid een vegetarische optie?", - "en": "Does this restaurant have a vegetarian option?" + "en": "Does this restaurant have a vegetarian option?", + "de": "Gibt es im das Restaurant vegetarische Speisen?" }, "mappings": [ { @@ -397,35 +417,40 @@ { "question": { "en": "Does this restaurant offer a halal menu?", - "nl": "Heeft dit restaurant halal opties?" + "nl": "Heeft dit restaurant halal opties?", + "de": "Gibt es im das Restaurant halal Speisen?" }, "mappings": [ { "if": "diet:halal=no", "then": { "en": "There are no halal options available", - "nl": "Er zijn geen halal opties aanwezig" + "nl": "Er zijn geen halal opties aanwezig", + "de": "Hier gibt es keine halal Speisen" } }, { "if": "diet:halal=limited", "then": { "en": "There is a small halal menu", - "nl": "Er zijn een beperkt aantal halal opties" + "nl": "Er zijn een beperkt aantal halal opties", + "de": "Hier gibt es wenige halal Speisen" } }, { "if": "diet:halal=yes", "then": { "nl": "Halal menu verkrijgbaar", - "en": "There is a halal menu" + "en": "There is a halal menu", + "de": "Es gibt halal Speisen" } }, { "if": "diet:halal=only", "then": { "nl": "Enkel halal opties zijn beschikbaar", - "en": "Only halal options are available" + "en": "Only halal options are available", + "de": "Es gibt ausschließlich halal Speisen" } } ], @@ -524,7 +549,8 @@ "nl": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?", "fr": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?
", "en": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?
", - "ja": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?
" + "ja": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?
", + "de": "Wenn Sie Ihr eigenes Behältnis mitbringen (z. B. einen Kochtopf und kleine Töpfe), wird es dann zum Verpacken Ihrer Bestellung verwendet?
" }, "mappings": [ { @@ -533,7 +559,8 @@ "nl": "Je mag je eigen containers meenemen om je bestelling in mee te nemen en zo minder afval te maken", "fr": "Vous pouvez apporter vos contenants pour votre commande, limitant l’usage de matériaux à usage unique et les déchets", "en": "You can bring your own containers to get your order, saving on single-use packaging material and thus waste", - "ja": "自分の容器を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます" + "ja": "自分の容器を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます", + "de": "Sie können ihre eigenen Behälter mitbringen, um Ihre Bestellung zu erhalten, was Einwegverpackungsmaterial und damit Abfall spart" } }, { @@ -567,7 +594,8 @@ { "question": { "en": "Opened now", - "nl": "Nu geopened" + "nl": "Nu geopened", + "de": "Aktuell geöffnet" }, "osmTags": "_isOpen=yes" } @@ -579,7 +607,8 @@ { "question": { "en": "Has a vegetarian menu", - "nl": "Heeft een vegetarisch menu" + "nl": "Heeft een vegetarisch menu", + "de": "Hat vegetarische Speisen" }, "osmTags": { "or": [ @@ -598,7 +627,8 @@ { "question": { "en": "Has a vegan menu", - "nl": "Heeft een veganistisch menu" + "nl": "Heeft een veganistisch menu", + "de": "Bietet vegan Speisen an" }, "osmTags": { "or": [ @@ -615,7 +645,8 @@ { "question": { "en": "Has a halal menu", - "nl": "Heeft een halal menu" + "nl": "Heeft een halal menu", + "de": "Hat halal Speisen" }, "osmTags": { "or": [ diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index de82c8bae4..b3fb46860f 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -3,7 +3,7 @@ "name": { "en": "Ghost bikes", "nl": "Witte Fietsen", - "de": "Geisterrad", + "de": "Geisterräder", "it": "Bici fantasma", "fr": "Vélos fantômes", "eo": "Fantombiciklo", @@ -84,7 +84,7 @@ "render": { "en": "A ghost bike is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.", "nl": "Een Witte Fiets (of Spookfiets) is een aandenken aan een fietser die bij een verkeersongeval om het leven kwam. Het gaat over een witgeschilderde fiets die geplaatst werd in de buurt van het ongeval.", - "de": "Ein Geisterrad ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt wird.", + "de": "Ein Geisterrad ist ein weißes Fahrrad, dass zum Gedenken eines tödlich verunglückten Radfahrers vor Ort aufgestellt wurde.", "it": "Una bici fantasma è il memoriale di un ciclista che è morto in un incidente stradale e che ha la forma di una bicicletta bianca piazzata in maniera stabile vicino al luogo dell’incidente.", "fr": "Un vélo fantôme est un monument commémoratif pour un cycliste décédé dans un accident de la route, sous la forme d'un vélo blanc placé en permanence près du lieu de l'accident." } @@ -174,14 +174,16 @@ "nl": "Wanneer werd deze witte fiets geplaatst?", "en": "When was this Ghost bike installed?", "it": "Quando è stata installata questa bici fantasma?", - "fr": "Quand ce vélo fantôme a-t-il été installée ?" + "fr": "Quand ce vélo fantôme a-t-il été installée ?", + "de": "Wann wurde dieses Geisterrad aufgestellt?" }, "render": { "nl": "Geplaatst op {start_date}", "en": "Placed on {start_date}", "it": "Piazzata in data {start_date}", "fr": "Placé le {start_date}", - "ru": "Установлен {start_date}" + "ru": "Установлен {start_date}", + "de": "Aufgestellt am {start_date}" }, "freeform": { "key": "start_date", diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json index b0031e5732..52083262b8 100644 --- a/assets/layers/map/map.json +++ b/assets/layers/map/map.json @@ -31,7 +31,8 @@ "en": "A map, meant for tourists which is permanently installed in the public space", "nl": "Een permantent geinstalleerde kaart", "it": "Una mappa, destinata ai turisti e che è sistemata in maniera permanente in uno spazio pubblico", - "fr": "Une carte, destinée aux touristes, installée en permanence dans l'espace public" + "fr": "Une carte, destinée aux touristes, installée en permanence dans l'espace public", + "de": "Eine Karte, die für Touristen gedacht ist und dauerhaft im öffentlichen Raum aufgestellt ist" }, "tagRenderings": [ "images", diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index 786f5e87bc..5dfb6ef0ba 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -297,7 +297,8 @@ "nl": "Wie is de conservator van dit gebied?
Respecteer privacy - geef deze naam enkel als die duidelijk is gepubliceerd", "en": "Whom is the curator of this nature reserve?
Respect privacy - only fill out a name if this is widely published", "it": "Chi è il curatore di questa riserva naturale?
Rispetta la privacy (scrivi il nome solo se questo è noto pubblicamente)", - "fr": "Qui est en charge de la conservation de la réserve ?
À ne remplir seulement que si le nom est diffusé au public" + "fr": "Qui est en charge de la conservation de la réserve ?
À ne remplir seulement que si le nom est diffusé au public", + "de": "Wer ist der Verwalter dieses Naturschutzgebietes?
Respektieren Sie die Privatsphäre - geben Sie nur dann einen Namen an, wenn dieser allgemein bekannt ist" }, "render": { "nl": "{curator} is de beheerder van dit gebied", @@ -381,7 +382,8 @@ "en": "Surface area: {_surface:ha}Ha", "nl": "Totale oppervlakte: {_surface:ha}Ha", "it": "Area: {_surface:ha} ha", - "fr": "Superficie : {_surface:ha} ha" + "fr": "Superficie : {_surface:ha} ha", + "de": "Grundfläche: {_surface:ha}ha" }, "mappings": [ { diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json index 20f92ad8ba..ab05bd66dd 100644 --- a/assets/layers/observation_tower/observation_tower.json +++ b/assets/layers/observation_tower/observation_tower.json @@ -3,14 +3,16 @@ "name": { "en": "Observation towers", "nl": "Uitkijktorens", - "ru": "Смотровые башни" + "ru": "Смотровые башни", + "de": "Aussichtstürme" }, "minzoom": 8, "title": { "render": { "en": "Observation tower", "nl": "Uitkijktoren", - "ru": "Смотровая башня" + "ru": "Смотровая башня", + "de": "Beobachtungsturm" }, "mappings": [ { @@ -18,25 +20,29 @@ "then": { "en": "{name}", "nl": "{name}", - "ru": "{name}" + "ru": "{name}", + "de": "{name}" } } ] }, "description": { "en": "Towers with a panoramic view", - "nl": "Torens om van het uitzicht te genieten" + "nl": "Torens om van het uitzicht te genieten", + "de": "Türme zur Aussicht auf die umgebende Landschaft" }, "tagRenderings": [ "images", { "question": { "en": "What is the name of this tower?", - "nl": "Heeft deze toren een naam?" + "nl": "Heeft deze toren een naam?", + "de": "Wie heißt dieser Turm?" }, "render": { "en": "This tower is called {name}", - "nl": "Deze toren heet {name}" + "nl": "Deze toren heet {name}", + "de": "Der Name dieses Turms lautet {name}" }, "freeform": { "key": "name" @@ -46,7 +52,8 @@ "if": "noname=yes", "then": { "en": "This tower doesn't have a specific name", - "nl": "Deze toren heeft geen specifieke naam" + "nl": "Deze toren heeft geen specifieke naam", + "de": "Dieser Turm hat keinen eigenen Namen" } } ], @@ -55,11 +62,13 @@ { "question": { "en": "What is the height of this tower?", - "nl": "Hoe hoog is deze toren?" + "nl": "Hoe hoog is deze toren?", + "de": "Wie hoch ist dieser Turm?" }, "render": { "en": "This tower is {height} high", - "nl": "Deze toren is {height} hoog" + "nl": "Deze toren is {height} hoog", + "de": "Dieser Turm ist {height} hoch" }, "freeform": { "key": "height", @@ -70,11 +79,13 @@ { "question": { "en": "Who maintains this tower?", - "nl": "Wie onderhoudt deze toren?" + "nl": "Wie onderhoudt deze toren?", + "de": "Wer betreibt diesen Turm?" }, "render": { "nl": "Wordt onderhouden door {operator}", - "en": "Maintained by {operator}" + "en": "Maintained by {operator}", + "de": "Betrieben von {operator}" }, "freeform": { "key": "operator" @@ -85,11 +96,13 @@ { "question": { "en": "How much does one have to pay to enter this tower?", - "nl": "Hoeveel moet men betalen om deze toren te bezoeken?" + "nl": "Hoeveel moet men betalen om deze toren te bezoeken?", + "de": "Was kostet der Zugang zu diesem Turm?" }, "render": { "en": "Visiting this tower costs {charge}", - "nl": "Deze toren bezoeken kost {charge}" + "nl": "Deze toren bezoeken kost {charge}", + "de": "Der Besuch des Turms kostet {charge}" }, "freeform": { "key": "charge", @@ -107,7 +120,8 @@ }, "then": { "en": "Free to visit", - "nl": "Gratis te bezoeken" + "nl": "Gratis te bezoeken", + "de": "Eintritt kostenlos" } } ], @@ -150,7 +164,8 @@ "title": { "en": "observation tower", "nl": "Uitkijktoren", - "ru": "смотровая башня" + "ru": "смотровая башня", + "de": "Beobachtungsturm" }, "description": { "nl": "Een publiek toegankelijke uitkijktoren" @@ -179,7 +194,8 @@ "human": { "nl": " meter", "en": " meter", - "ru": " метр" + "ru": " метр", + "de": " Meter" } } ], diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index e4cdc4ac2d..d98331acc1 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -27,7 +27,8 @@ "nl": "Deze laag toont picnictafels", "it": "Il livello che mostra i tavoli da picnic", "fr": "La couche montrant les tables de pique-nique", - "ru": "Слой, отображающий столы для пикника" + "ru": "Слой, отображающий столы для пикника", + "de": "Die Ebene zeigt Picknicktische an" }, "tagRenderings": [ { diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 1baaab7cce..5a80bbdefa 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -205,14 +205,16 @@ "en": "Accessible to kids older than {min_age} years", "it": "Accessibile ai bambini di almeno {min_age} anni", "ru": "Доступно для детей старше {min_age} лет", - "fr": "Accessible aux enfants de plus de {min_age} ans" + "fr": "Accessible aux enfants de plus de {min_age} ans", + "de": "Zugang nur für Kinder ab {min_age} Jahren" }, "question": { "nl": "Wat is de minimale leeftijd om op deze speeltuin te mogen?", "en": "What is the minimum age required to access this playground?", "it": "Qual è l’età minima per accedere a questo parco giochi?", "fr": "Quel est l'âge minimal requis pour accéder à ce terrain de jeux ?", - "ru": "С какого возраста доступна эта детская площадка?" + "ru": "С какого возраста доступна эта детская площадка?", + "de": "Ab welchem Alter dürfen Kinder auf diesem Spielplatz spielen?" }, "freeform": { "key": "min_age", @@ -226,13 +228,15 @@ "en": "Accessible to kids of at most {max_age}", "it": "Accessibile ai bambini di età inferiore a {max_age}", "fr": "Accessible aux enfants de {max_age} au maximum", - "ru": "Доступно детям до {max_age}" + "ru": "Доступно детям до {max_age}", + "de": "Zugang nur für Kinder bis maximal {max_age}" }, "question": { "nl": "Wat is de maximaal toegestane leeftijd voor deze speeltuin?", "en": "What is the maximum age allowed to access this playground?", "it": "Qual è l’età massima per accedere a questo parco giochi?", - "fr": "Quel est l’âge maximum autorisé pour utiliser l’aire de jeu ?" + "fr": "Quel est l’âge maximum autorisé pour utiliser l’aire de jeu ?", + "de": "Bis zu welchem Alter dürfen Kinder auf diesem Spielplatz spielen?" }, "freeform": { "key": "max_age", @@ -353,7 +357,8 @@ "nl": "Wie kan men bellen indien er problemen zijn met de speeltuin?", "en": "What is the phone number of the playground maintainer?", "fr": "Quel est le numéro de téléphone du responsable du terrain de jeux ?", - "it": "Qual è il numero di telefono del gestore del campetto?" + "it": "Qual è il numero di telefono del gestore del campetto?", + "de": "Wie lautet die Telefonnummer vom Betreiber des Spielplatzes?" }, "render": { "nl": "De bevoegde dienst kan getelefoneerd worden via {phone}", @@ -428,7 +433,8 @@ "en": "When is this playground accessible?", "fr": "Quand ce terrain de jeux est-il accessible ?", "it": "Quando si può accedere a questo campetto?", - "ru": "Когда открыта эта игровая площадка?" + "ru": "Когда открыта эта игровая площадка?", + "de": "Wann ist dieser Spielplatz zugänglich?" }, "mappings": [ { @@ -438,7 +444,8 @@ "en": "Accessible from sunrise till sunset", "fr": "Accessible du lever au coucher du soleil", "it": "Si può accedere dall'alba al tramonto", - "ru": "Открыто от рассвета до заката" + "ru": "Открыто от рассвета до заката", + "de": "Zugänglich von Sonnenaufgang bis Sonnenuntergang" } }, { @@ -448,7 +455,8 @@ "en": "Always accessible", "fr": "Toujours accessible", "ru": "Всегда доступен", - "it": "Si può sempre accedere" + "it": "Si può sempre accedere", + "de": "Immer zugänglich" } }, { @@ -458,7 +466,8 @@ "en": "Always accessible", "ru": "Всегда доступен", "fr": "Toujours accessible", - "it": "Si può sempre accedere" + "it": "Si può sempre accedere", + "de": "Immer zugänglich" }, "hideInAnswer": true } @@ -523,7 +532,8 @@ "en": "Playground", "ru": "Детская площадка", "fr": "Terrain de jeux", - "it": "Campetto" + "it": "Campetto", + "de": "Spielplatz" } } ], diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 64b6230c16..407751fd95 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -467,7 +467,8 @@ { "question": { "nl": "Binnen of buiten", - "en": "Indoor or outdoor" + "en": "Indoor or outdoor", + "de": "Innen oder Außen" } }, { diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 1e5679d483..e13f818774 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -5,7 +5,8 @@ "fr": "Magasin", "ru": "Магазин", "ja": "店", - "nl": "Winkel" + "nl": "Winkel", + "de": "Geschäft" }, "minzoom": 16, "source": { @@ -21,7 +22,8 @@ "fr": "Magasin", "ru": "Магазин", "ja": "店", - "nl": "Winkel" + "nl": "Winkel", + "de": "Geschäft" }, "mappings": [ { @@ -34,7 +36,8 @@ "en": "{name}", "fr": "{name}", "ru": "{name}", - "ja": "{name}" + "ja": "{name}", + "de": "{name}" } }, { @@ -47,7 +50,8 @@ "en": "{shop}", "fr": "{shop}", "ru": "{shop}", - "ja": "{shop}" + "ja": "{shop}", + "de": "{shop}" } } ] @@ -57,7 +61,8 @@ "fr": "Un magasin", "ja": "ショップ", "nl": "Een winkel", - "ru": "Магазин" + "ru": "Магазин", + "de": "Ein Geschäft" }, "tagRenderings": [ "images", @@ -67,7 +72,8 @@ "fr": "Qu'est-ce que le nom de ce magasin?", "ru": "Как называется этот магазин?", "ja": "このお店の名前は何ですか?", - "nl": "Wat is de naam van deze winkel?" + "nl": "Wat is de naam van deze winkel?", + "de": "Wie ist der Name dieses Geschäfts?" }, "render": "This shop is called {name}", "freeform": { @@ -79,13 +85,15 @@ "render": { "en": "This shop sells {shop}", "fr": "Ce magasin vends {shop}", - "ja": "こちらのお店では{shop}を販売しております" + "ja": "こちらのお店では{shop}を販売しております", + "de": "Dieses Geschäft verkauft {shop}" }, "question": { "en": "What does this shop sell?", "fr": "Que vends ce magasin ?", "ja": "このお店では何を売っていますか?", - "ru": "Что продаётся в этом магазине?" + "ru": "Что продаётся в этом магазине?", + "de": "Was wird in diesem Geschäft verkauft?" }, "freeform": { "key": "shop" @@ -100,7 +108,8 @@ "then": { "en": "Convenience store", "fr": "Épicerie/superette", - "ja": "コンビニエンスストア" + "ja": "コンビニエンスストア", + "de": "Lebensmittelladen" } }, { @@ -114,7 +123,8 @@ "fr": "Supermarché", "ru": "Супермаркет", "ja": "スーパーマーケット", - "nl": "Supermarkt" + "nl": "Supermarkt", + "de": "Supermarkt" } }, { @@ -127,7 +137,8 @@ "en": "Clothing store", "fr": "Magasin de vêtements", "ru": "Магазин одежды", - "ja": "衣料品店" + "ja": "衣料品店", + "de": "Bekleidungsgeschäft" } }, { @@ -141,7 +152,8 @@ "fr": "Coiffeur", "ru": "Парикмахерская", "ja": "理容師", - "nl": "Kapper" + "nl": "Kapper", + "de": "Friseur" } }, { @@ -154,7 +166,8 @@ "en": "Bakery", "fr": "Boulangerie", "ja": "ベーカリー", - "nl": "Bakkerij" + "nl": "Bakkerij", + "de": "Bäckerei" } }, { @@ -166,7 +179,8 @@ "then": { "en": "Car repair (garage)", "fr": "Garagiste", - "ja": "自動車修理(ガレージ)" + "ja": "自動車修理(ガレージ)", + "de": "Autoreparatur (Werkstatt)" } }, { @@ -179,7 +193,8 @@ "en": "Car dealer", "fr": "Concessionnaire", "ru": "Автосалон", - "ja": "自動車ディーラー" + "ja": "自動車ディーラー", + "de": "Autohändler" } } ], @@ -192,14 +207,16 @@ "ca": "{phone}", "id": "{phone}", "ru": "{phone}", - "ja": "{phone}" + "ja": "{phone}", + "de": "{phone}" }, "question": { "en": "What is the phone number?", "fr": "Quel est le numéro de téléphone ?", "ja": "電話番号は何番ですか?", "nl": "Wat is het telefoonnummer?", - "ru": "Какой телефон?" + "ru": "Какой телефон?", + "de": "Wie ist die Telefonnummer?" }, "freeform": { "key": "phone", @@ -214,14 +231,16 @@ "ca": "{website}", "id": "{website}", "ru": "{website}", - "ja": "{website}" + "ja": "{website}", + "de": "{website}" }, "question": { "en": "What is the website of this shop?", "fr": "Quel est le site internet de ce magasin ?", "ja": "このお店のホームページは何ですか?", "nl": "Wat is de website van deze winkel?", - "ru": "Какой веб-сайт у этого магазина?" + "ru": "Какой веб-сайт у этого магазина?", + "de": "Wie lautet die Webseite dieses Geschäfts?" }, "freeform": { "key": "website", @@ -242,7 +261,8 @@ "fr": "Quelle est l'adresse électronique de ce magasin ?", "ja": "このお店のメールアドレスは何ですか?", "ru": "Каков адрес электронной почты этого магазина?", - "nl": "Wat is het e-mailadres van deze winkel?" + "nl": "Wat is het e-mailadres van deze winkel?", + "de": "Wie ist die Email-Adresse dieses Geschäfts?" }, "freeform": { "key": "email", @@ -262,7 +282,8 @@ "fr": "Quels sont les horaires d'ouverture de ce magasin ?", "ja": "この店の営業時間は何時から何時までですか?", "nl": "Wat zijn de openingsuren van deze winkel?", - "ru": "Каковы часы работы этого магазина?" + "ru": "Каковы часы работы этого магазина?", + "de": "Wie sind die Öffnungszeiten dieses Geschäfts?" }, "freeform": { "key": "opening_hours", @@ -302,14 +323,16 @@ "fr": "Magasin", "ru": "Магазин", "ja": "店", - "nl": "Winkel" + "nl": "Winkel", + "de": "Geschäft" }, "description": { "en": "Add a new shop", "fr": "Ajouter un nouveau magasin", "ru": "Добавить новый магазин", "ja": "新しい店を追加する", - "nl": "Voeg een nieuwe winkel toe" + "nl": "Voeg een nieuwe winkel toe", + "de": "Ein neues Geschäft hinzufügen" } } ], diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json index 50e7cd61d3..7f559bf2cd 100644 --- a/assets/layers/slow_roads/slow_roads.json +++ b/assets/layers/slow_roads/slow_roads.json @@ -116,7 +116,8 @@ "en": "The surface is {surface}", "ru": "Поверхность - {surface}", "fr": "La surface en {surface}", - "it": "La superficie è {surface}" + "it": "La superficie è {surface}", + "de": "Die Oberfläche ist {surface}" }, "freeform": { "key": "surface" @@ -129,7 +130,8 @@ "en": "The surface is grass", "ru": "Поверхность - трава", "fr": "La surface est en herbe", - "it": "La superficie è erba" + "it": "La superficie è erba", + "de": "Die Oberfläche ist Gras" } }, { @@ -139,7 +141,8 @@ "en": "The surface is ground", "ru": "Поверхность - земля", "fr": "La surface est en terre", - "it": "La superficie è terreno" + "it": "La superficie è terreno", + "de": "Die Oberfläche ist Erde" } }, { @@ -148,7 +151,8 @@ "nl": "De ondergrond is onverhard", "en": "The surface is unpaved", "fr": "La surface est non pavée", - "it": "La superficie è non pavimentata" + "it": "La superficie è non pavimentata", + "de": "Die Oberfläche ist ohne festen Belag" }, "hideInAnswer": true }, @@ -159,7 +163,8 @@ "en": "The surface is sand", "ru": "Поверхность - песок", "fr": "La surface est en sable", - "it": "La superficie è sabbia" + "it": "La superficie è sabbia", + "de": "Die Oberfläche ist Sand" } }, { @@ -169,7 +174,8 @@ "en": "The surface is paving stones", "ru": "Поверхность - брусчатка", "it": "La superficie è pietre irregolari", - "fr": "La surface est en pierres pavées" + "fr": "La surface est en pierres pavées", + "de": "Die Oberfläche ist aus Pflastersteinen" } }, { @@ -179,7 +185,8 @@ "en": "The surface is asphalt", "ru": "Поверхность - асфальт", "it": "La superficie è asfalto", - "fr": "La surface est en bitume" + "fr": "La surface est en bitume", + "de": "Die Oberfläche ist Asphalt" } }, { @@ -189,7 +196,8 @@ "en": "The surface is concrete", "ru": "Поверхность - бетон", "fr": "La surface est en béton", - "it": "La superficie è calcestruzzo" + "it": "La superficie è calcestruzzo", + "de": "Die Oberfläche ist Beton" } }, { @@ -198,7 +206,8 @@ "nl": "De ondergrond is verhard", "en": "The surface is paved", "fr": "La surface est pavée", - "it": "La superficie è pavimentata" + "it": "La superficie è pavimentata", + "de": "Die Oberfläche ist gepflastert" }, "hideInAnswer": true } diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 90f1dca732..9a4f8c92ca 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -5,7 +5,8 @@ "fr": "Terrains de sport", "en": "Sport pitches", "ru": "Спортивные площадки", - "it": "Campi sportivi" + "it": "Campi sportivi", + "de": "Sportplätze" }, "wayHandling": 1, "minzoom": 12, @@ -25,7 +26,8 @@ "fr": "Terrain de sport", "en": "Sport pitch", "ru": "Спортивная площадка", - "it": "Campo sportivo" + "it": "Campo sportivo", + "de": "Sportplatz" } }, "description": { @@ -33,7 +35,8 @@ "fr": "Un terrain de sport", "en": "A sport pitch", "it": "Un campo sportivo", - "ru": "Спортивная площадка" + "ru": "Спортивная площадка", + "de": "Ein Sportplatz" }, "tagRenderings": [ "images", @@ -42,7 +45,8 @@ "nl": "Hier kan men {sport} beoefenen", "fr": "Ici on joue au {sport}", "en": "{sport} is played here", - "it": "Qui si gioca a {sport}" + "it": "Qui si gioca a {sport}", + "de": "Hier wird {sport} gespielt" }, "freeform": { "key": "sport" @@ -51,7 +55,8 @@ "nl": "Welke sporten kan men hier beoefenen?", "fr": "À quel sport peut-on jouer ici ?", "en": "Which sport can be played here?", - "it": "Quale sport si gioca qui?" + "it": "Quale sport si gioca qui?", + "de": "Welche Sportarten können hier gespielt werden?" }, "multiAnswer": true, "mappings": [ @@ -66,7 +71,8 @@ "fr": "Ici, on joue au basketball", "en": "Basketball is played here", "it": "Qui si gioca a basket", - "ru": "Здесь можно играть в баскетбол" + "ru": "Здесь можно играть в баскетбол", + "de": "Hier wird Basketball gespielt" } }, { @@ -80,7 +86,8 @@ "fr": "Ici, on joue au football", "en": "Soccer is played here", "it": "Qui si gioca a calcio", - "ru": "Здесь можно играть в футбол" + "ru": "Здесь можно играть в футбол", + "de": "Hier wird Fußball gespielt" } }, { @@ -94,7 +101,8 @@ "fr": "C'est une table de ping-pong", "en": "This is a pingpong table", "ru": "Это стол для пинг-понга", - "it": "Questo è un tavolo da ping pong" + "it": "Questo è un tavolo da ping pong", + "de": "Dies ist eine Tischtennisplatte" } }, { @@ -108,7 +116,8 @@ "fr": "Ici, on joue au tennis", "en": "Tennis is played here", "it": "Qui si gioca a tennis", - "ru": "Здесь можно играть в теннис" + "ru": "Здесь можно играть в теннис", + "de": "Hier wird Tennis gespielt" } }, { @@ -122,7 +131,8 @@ "fr": "Ici, on joue au korfball", "en": "Korfball is played here", "it": "Qui si gioca a korfball", - "ru": "Здесь можно играть в корфбол" + "ru": "Здесь можно играть в корфбол", + "de": "Hier wird Kopfball gespielt" } }, { @@ -136,7 +146,8 @@ "fr": "Ici, on joue au basketball", "en": "Basketball is played here", "it": "Qui si gioca a basket", - "ru": "Здесь можно играть в баскетбол" + "ru": "Здесь можно играть в баскетбол", + "de": "Hier wird Basketball gespielt" }, "hideInAnswer": true } @@ -149,14 +160,16 @@ "fr": "De quelle surface est fait ce terrain de sport ?", "en": "Which is the surface of this sport pitch?", "it": "Qual è la superficie di questo campo sportivo?", - "ru": "Какое покрытие на этой спортивной площадке?" + "ru": "Какое покрытие на этой спортивной площадке?", + "de": "Was ist die Oberfläche dieses Sportplatzes?" }, "render": { "nl": "De ondergrond is {surface}", "fr": "La surface est {surface}", "en": "The surface is {surface}", "ru": "Поверхность - {surface}", - "it": "La superficie è {surface}" + "it": "La superficie è {surface}", + "de": "Die Oberfläche ist {surface}" }, "freeform": { "key": "surface" @@ -169,7 +182,8 @@ "fr": "La surface est de l'herbe", "en": "The surface is grass", "ru": "Поверхность - трава", - "it": "La superficie è erba" + "it": "La superficie è erba", + "de": "Die Oberfläche ist Gras" } }, { @@ -179,7 +193,8 @@ "fr": "La surface est du sable", "en": "The surface is sand", "ru": "Поверхность - песок", - "it": "La superficie è sabbia" + "it": "La superficie è sabbia", + "de": "Die Oberfläche ist Sand" } }, { @@ -189,7 +204,8 @@ "fr": "La surface est des pavés", "en": "The surface is paving stones", "ru": "Поверхность - брусчатка", - "it": "La superficie è pietre irregolari" + "it": "La superficie è pietre irregolari", + "de": "Die Oberfläche ist aus Pflastersteinen" } }, { @@ -199,7 +215,8 @@ "fr": "La surface est de l'asphalte", "en": "The surface is asphalt", "ru": "Поверхность - асфальт", - "it": "La superficie è asfalto" + "it": "La superficie è asfalto", + "de": "Die Oberfläche ist Asphalt" } }, { @@ -209,7 +226,8 @@ "fr": "La surface est du béton", "en": "The surface is concrete", "ru": "Поверхность - бетон", - "it": "La superficie è calcestruzzo" + "it": "La superficie è calcestruzzo", + "de": "Die Oberfläche ist Beton" } } ], @@ -222,7 +240,8 @@ "fr": "Est-ce que ce terrain de sport est accessible au public ?", "en": "Is this sport pitch publicly accessible?", "it": "Questo campo sportivo è aperto al pubblico?", - "ru": "Есть ли свободный доступ к этой спортивной площадке?" + "ru": "Есть ли свободный доступ к этой спортивной площадке?", + "de": "Ist dieser Sportplatz öffentlich zugänglich?" }, "mappings": [ { @@ -232,7 +251,8 @@ "fr": "Accessible au public", "en": "Public access", "it": "Aperto al pubblico", - "ru": "Свободный доступ" + "ru": "Свободный доступ", + "de": "Öffentlicher Zugang" } }, { @@ -242,7 +262,8 @@ "fr": "Accès limité (par exemple uniquement sur réservation, à certains horaires…)", "en": "Limited access (e.g. only with an appointment, during certain hours, ...)", "it": "Accesso limitato (p.es. solo con prenotazione, in certi orari, ...)", - "ru": "Ограниченный доступ (напр., только по записи, в определённые часы, ...)" + "ru": "Ограниченный доступ (напр., только по записи, в определённые часы, ...)", + "de": "Eingeschränkter Zugang (z. B. nur mit Termin, zu bestimmten Zeiten, ...)" } }, { @@ -252,7 +273,8 @@ "fr": "Accessible uniquement aux membres du club", "en": "Only accessible for members of the club", "it": "Accesso limitato ai membri dell'associazione", - "ru": "Доступ только членам клуба" + "ru": "Доступ только членам клуба", + "de": "Zugang nur für Vereinsmitglieder" } }, { @@ -261,7 +283,8 @@ "nl": "Privaat en niet toegankelijk", "fr": "Privé - Pas accessible au public", "en": "Private - not accessible to the public", - "it": "Privato - non aperto al pubblico" + "it": "Privato - non aperto al pubblico", + "de": "Privat - kein öffentlicher Zugang" } } ] @@ -273,7 +296,8 @@ "fr": "Doit-on réserver pour utiliser ce terrain de sport ?", "en": "Does one have to make an appointment to use this sport pitch?", "it": "È necessario prenotarsi per usare questo campo sportivo?", - "ru": "Нужна ли предварительная запись для доступа на эту спортивную площадку?" + "ru": "Нужна ли предварительная запись для доступа на эту спортивную площадку?", + "de": "Muss man einen Termin vereinbaren, um diesen Sportplatz zu benutzen?" }, "condition": { "and": [ @@ -289,7 +313,8 @@ "nl": "Reserveren is verplicht om gebruik te maken van dit sportterrein", "fr": "Il est obligatoire de réserver pour utiliser ce terrain de sport", "en": "Making an appointment is obligatory to use this sport pitch", - "it": "La prenotazione è obbligatoria per usare questo campo sportivo" + "it": "La prenotazione è obbligatoria per usare questo campo sportivo", + "de": "Für die Nutzung des Sportplatzes ist eine Voranmeldung erforderlich" } }, { @@ -299,7 +324,8 @@ "fr": "Il est recommendé de réserver pour utiliser ce terrain de sport", "en": "Making an appointment is recommended when using this sport pitch", "it": "La prenotazione è consigliata per usare questo campo sportivo", - "ru": "Желательна предварительная запись для доступа на эту спортивную площадку" + "ru": "Желательна предварительная запись для доступа на эту спортивную площадку", + "de": "Für die Nutzung des Sportplatzes wird eine Voranmeldung empfohlen" } }, { @@ -309,7 +335,8 @@ "fr": "Il est possible de réserver, mais ce n'est pas nécéssaire pour utiliser ce terrain de sport", "en": "Making an appointment is possible, but not necessary to use this sport pitch", "it": "La prenotazione è consentita, ma non è obbligatoria per usare questo campo sportivo", - "ru": "Предварительная запись для доступа на эту спортивную площадку возможна, но не обязательна" + "ru": "Предварительная запись для доступа на эту спортивную площадку возможна, но не обязательна", + "de": "Eine Voranmeldung ist möglich, aber nicht notwendig, um diesen Sportplatz zu nutzen" } }, { @@ -319,7 +346,8 @@ "fr": "On ne peut pas réserver", "en": "Making an appointment is not possible", "it": "Non è possibile prenotare", - "ru": "Невозможна предварительная запись" + "ru": "Невозможна предварительная запись", + "de": "Termine nach Vereinbarung nicht möglich" } } ] @@ -329,7 +357,8 @@ "nl": "Wat is het telefoonnummer van de bevoegde dienst of uitbater?", "fr": "Quel est le numéro de téléphone du gérant ?", "en": "What is the phone number of the operator?", - "it": "Qual è il numero di telefono del gestore?" + "it": "Qual è il numero di telefono del gestore?", + "de": "Wie ist die Telefonnummer des Betreibers?" }, "freeform": { "key": "phone", @@ -343,7 +372,8 @@ "nl": "Wat is het email-adres van de bevoegde dienst of uitbater?", "fr": "Quelle est l'adresse courriel du gérant ?", "en": "What is the email address of the operator?", - "it": "Qual è l'indirizzo email del gestore?" + "it": "Qual è l'indirizzo email del gestore?", + "de": "Wie ist die Email-Adresse des Betreibers?" }, "freeform": { "key": "email", @@ -358,7 +388,8 @@ "fr": "Quand ce terrain est-il accessible ?", "en": "When is this pitch accessible?", "it": "Quando è aperto questo campo sportivo?", - "ru": "В какое время доступна эта площадка?" + "ru": "В какое время доступна эта площадка?", + "de": "Wann ist dieser Sportplatz zugänglich?" }, "render": "Openingsuren: {opening_hours_table()}", "freeform": { @@ -378,7 +409,8 @@ "fr": "Accessible en permanence", "en": "Always accessible", "ru": "Всегда доступен", - "it": "Sempre aperto" + "it": "Sempre aperto", + "de": "Immer zugänglich" } } ], @@ -470,7 +502,8 @@ "fr": "Table de ping-pong", "en": "Tabletennis table", "it": "Tavolo da tennistavolo", - "ru": "Стол для настольного тенниса" + "ru": "Стол для настольного тенниса", + "de": "Tischtennisplatte" }, "tags": [ "leisure=pitch", @@ -483,7 +516,8 @@ "fr": "Terrain de sport", "en": "Sport pitch", "ru": "Спортивная площадка", - "it": "Campo sportivo" + "it": "Campo sportivo", + "de": "Sportplatz" }, "tags": [ "leisure=pitch", diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 7472ffd80a..44be895a15 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -5,7 +5,8 @@ "nl": "Bewakingscamera's", "ru": "Камеры наблюдения", "fr": "Caméras de surveillance", - "it": "Videocamere di sorveglianza" + "it": "Videocamere di sorveglianza", + "de": "Überwachungskameras" }, "minzoom": 12, "source": { @@ -28,7 +29,8 @@ "nl": "Bewakingscamera", "ru": "Камера наблюдения", "fr": "Caméra de surveillance", - "it": "Videocamera di sorveglianza" + "it": "Videocamera di sorveglianza", + "de": "Überwachungskamera" } }, "tagRenderings": [ @@ -39,7 +41,8 @@ "nl": "Wat voor soort camera is dit?", "fr": "Quel genre de caméra est-ce ?", "it": "Di che tipo di videocamera si tratta?", - "ru": "Какая это камера?" + "ru": "Какая это камера?", + "de": "Um welche Kameratyp handelt se sich?" }, "mappings": [ { @@ -52,7 +55,8 @@ "en": "A fixed (non-moving) camera", "nl": "Een vaste camera", "fr": "Une caméra fixe (non mobile)", - "it": "Una videocamera fissa (non semovente)" + "it": "Una videocamera fissa (non semovente)", + "de": "Eine fest montierte (nicht bewegliche) Kamera" } }, { @@ -66,7 +70,8 @@ "nl": "Een dome (bolvormige camera die kan draaien)", "fr": "Une caméra dôme (qui peut tourner)", "it": "Una videocamera a cupola (che può ruotare)", - "ru": "Камера с поворотным механизмом" + "ru": "Камера с поворотным механизмом", + "de": "Eine Kuppelkamera (drehbar)" } }, { @@ -80,7 +85,8 @@ "nl": "Een camera die (met een motor) van links naar rechts kan draaien", "ru": "Панорамная камера", "fr": "Une caméra panoramique", - "it": "Una videocamera panoramica" + "it": "Una videocamera panoramica", + "de": "Eine bewegliche Kamera" } } ], @@ -91,7 +97,8 @@ "en": "In which geographical direction does this camera film?", "nl": "In welke geografische richting filmt deze camera?", "fr": "Dans quelle direction géographique cette caméra filme-t-elle ?", - "it": "In quale direzione geografica punta questa videocamera?" + "it": "In quale direzione geografica punta questa videocamera?", + "de": "In welche Himmelsrichtung ist diese Kamera ausgerichtet?" }, "render": { "en": "Films to a compass heading of {camera:direction}", @@ -143,13 +150,15 @@ "en": "Who operates this CCTV?", "nl": "Wie beheert deze bewakingscamera?", "fr": "Qui exploite ce système de vidéosurveillance ?", - "it": "Chi gestisce questa videocamera a circuito chiuso?" + "it": "Chi gestisce questa videocamera a circuito chiuso?", + "de": "Wer betreibt diese CCTV Kamera?" }, "render": { "en": "Operated by {operator}", "nl": "Beheer door {operator}", "fr": "Exploité par {operator}", - "it": "È gestita da {operator}" + "it": "È gestita da {operator}", + "de": "Betrieben von {operator}" }, "id": "Operator" }, @@ -158,7 +167,8 @@ "en": "What kind of surveillance is this camera", "nl": "Wat soort bewaking wordt hier uitgevoerd?", "fr": "Quel genre de surveillance est cette caméra", - "it": "Che cosa sorveglia questa videocamera" + "it": "Che cosa sorveglia questa videocamera", + "de": "Um was für eine Überwachungskamera handelt es sich" }, "mappings": [ { @@ -184,7 +194,8 @@ "en": "An outdoor, yet private area is surveilled (e.g. a parking lot, a fuel station, courtyard, entrance, private driveway, ...)", "nl": "Een buitenruimte met privaat karakter (zoals een privé-oprit, een parking, tankstation, ...)", "fr": "Une zone extérieure, mais privée, est surveillée (par exemple, un parking, une station-service, une cour, une entrée, une allée privée, etc.)", - "it": "Sorveglia un'area esterna di proprietà privata (un parcheggio, una stazione di servizio, un cortile, un ingresso, un vialetto privato, ...)" + "it": "Sorveglia un'area esterna di proprietà privata (un parcheggio, una stazione di servizio, un cortile, un ingresso, un vialetto privato, ...)", + "de": "Ein privater Außenbereich wird überwacht (z. B. ein Parkplatz, eine Tankstelle, ein Innenhof, ein Eingang, eine private Einfahrt, ...)" } }, { @@ -197,7 +208,8 @@ "nl": "Een private binnenruimte wordt bewaakt, bv. een winkel, een parkeergarage, ...", "en": "A private indoor area is surveilled, e.g. a shop, a private underground parking, ...", "fr": "Une zone intérieure privée est surveillée, par exemple un magasin, un parking souterrain privé…", - "it": "Sorveglia un ambiente interno di proprietà privata, per esempio un negozio, un parcheggio sotterraneo privato, ..." + "it": "Sorveglia un ambiente interno di proprietà privata, per esempio un negozio, un parcheggio sotterraneo privato, ...", + "de": "Ein privater Innenbereich wird überwacht, z. B. ein Geschäft, eine private Tiefgarage, ..." } } ], @@ -208,7 +220,8 @@ "en": "Is the public space surveilled by this camera an indoor or outdoor space?", "nl": "Bevindt de bewaakte publieke ruimte camera zich binnen of buiten?", "fr": "L'espace public surveillé par cette caméra est-il un espace intérieur ou extérieur ?", - "it": "Lo spazio pubblico sorvegliato da questa videocamera è all'aperto o al chiuso?" + "it": "Lo spazio pubblico sorvegliato da questa videocamera è all'aperto o al chiuso?", + "de": "Handelt es sich bei dem von dieser Kamera überwachten öffentlichen Raum um einen Innen- oder Außenbereich?" }, "condition": { "and": [ @@ -222,7 +235,8 @@ "en": "This camera is located indoors", "nl": "Deze camera bevindt zich binnen", "fr": "Cette caméra est située à l'intérieur", - "it": "Questa videocamera si trova al chiuso" + "it": "Questa videocamera si trova al chiuso", + "de": "Diese Kamera befindet sich im Innenraum" } }, { @@ -232,7 +246,8 @@ "nl": "Deze camera bevindt zich buiten", "fr": "Cette caméra est située à l'extérieur", "it": "Questa videocamera si trova all'aperto", - "ru": "Эта камера расположена снаружи" + "ru": "Эта камера расположена снаружи", + "de": "Diese Kamera befindet sich im Freien" } }, { @@ -242,7 +257,8 @@ "nl": "Deze camera bevindt zich waarschijnlijk buiten", "fr": "Cette caméra est probablement située à l'extérieur", "it": "Questa videocamera si trova probabilmente all'esterno", - "ru": "Возможно, эта камера расположена снаружи" + "ru": "Возможно, эта камера расположена снаружи", + "de": "Diese Kamera ist möglicherweise im Freien" }, "hideInAnswer": true } @@ -254,13 +270,15 @@ "en": "On which level is this camera located?", "nl": "Op welke verdieping bevindt deze camera zich?", "fr": "À quel niveau se trouve cette caméra ?", - "it": "A che piano si trova questa videocamera?" + "it": "A che piano si trova questa videocamera?", + "de": "Auf welcher Ebene befindet sich diese Kamera?" }, "render": { "en": "Located on level {level}", "nl": "Bevindt zich op verdieping {level}", "fr": "Situé au niveau {level}", - "it": "Si trova al piano {level}" + "it": "Si trova al piano {level}", + "de": "Befindet sich auf Ebene {level}" }, "freeform": { "key": "level", @@ -279,7 +297,8 @@ "en": "What exactly is surveilled here?", "nl": "Wat wordt hier precies bewaakt?", "fr": "Qu'est-ce qui est surveillé ici ?", - "it": "Che cosa è sorvegliato qui?" + "it": "Che cosa è sorvegliato qui?", + "de": "Was genau wird hier überwacht?" }, "freeform": { "key": "surveillance:zone" @@ -288,7 +307,8 @@ "en": " Surveills a {surveillance:zone}", "nl": "Bewaakt een {surveillance:zone}", "fr": " Surveille un(e) {surveillance:zone}", - "it": " Sorveglia una {surveillance:zone}" + "it": " Sorveglia una {surveillance:zone}", + "de": " Überwacht ein/e {surveillance:zone}" }, "mappings": [ { @@ -301,7 +321,8 @@ "en": "Surveills a parking", "nl": "Bewaakt een parking", "fr": "Surveille un parking", - "it": "Sorveglia un parcheggio" + "it": "Sorveglia un parcheggio", + "de": "Überwacht einen Parkplatz" } }, { @@ -314,7 +335,8 @@ "en": "Surveills the traffic", "nl": "Bewaakt het verkeer", "fr": "Surveille la circulation", - "it": "Sorveglia il traffico" + "it": "Sorveglia il traffico", + "de": "Überwacht den Verkehr" } }, { @@ -327,7 +349,8 @@ "en": "Surveills an entrance", "nl": "Bewaakt een ingang", "fr": "Surveille une entrée", - "it": "Sorveglia un ingresso" + "it": "Sorveglia un ingresso", + "de": "Überwacht einen Eingang" } }, { @@ -340,7 +363,8 @@ "en": "Surveills a corridor", "nl": "Bewaakt een gang", "fr": "Surveille un couloir", - "it": "Sorveglia un corridoio" + "it": "Sorveglia un corridoio", + "de": "Überwacht einen Gang" } }, { @@ -353,7 +377,8 @@ "en": "Surveills a public tranport platform", "nl": "Bewaakt een perron of bushalte", "fr": "Surveille un quai de transport public", - "it": "Sorveglia una pensilina del trasporto pubblico" + "it": "Sorveglia una pensilina del trasporto pubblico", + "de": "Überwacht eine Haltestelle" } }, { @@ -366,7 +391,8 @@ "en": "Surveills a shop", "nl": "Bewaakt een winkel", "fr": "Surveille un magasin", - "it": "Sorveglia un negozio" + "it": "Sorveglia un negozio", + "de": "Überwacht ein Geschäft" } } ], @@ -378,13 +404,15 @@ "nl": "Hoe is deze camera geplaatst?", "fr": "Comment cette caméra est-elle placée ?", "it": "Com'è posizionata questa telecamera?", - "ru": "Как расположена эта камера?" + "ru": "Как расположена эта камера?", + "de": "Wie ist diese Kamera montiert?" }, "render": { "en": "Mounting method: {mount}", "nl": "Montage: {camera:mount}", "fr": "Méthode de montage : {mount}", - "it": "Metodo di montaggio: {mount}" + "it": "Metodo di montaggio: {mount}", + "de": "Montageart: {mount}" }, "freeform": { "key": "camera:mount" @@ -396,7 +424,8 @@ "en": "This camera is placed against a wall", "nl": "Deze camera hangt aan een muur", "fr": "Cette caméra est placée contre un mur", - "it": "Questa telecamera è posizionata contro un muro" + "it": "Questa telecamera è posizionata contro un muro", + "de": "Diese Kamera ist an einer Wand montiert" } }, { @@ -405,7 +434,8 @@ "en": "This camera is placed one a pole", "nl": "Deze camera staat op een paal", "fr": "Cette caméra est placée sur un poteau", - "it": "Questa telecamera è posizionata su un palo" + "it": "Questa telecamera è posizionata su un palo", + "de": "Diese Kamera ist an einer Stange montiert" } }, { @@ -414,7 +444,8 @@ "en": "This camera is placed on the ceiling", "nl": "Deze camera hangt aan het plafond", "fr": "Cette caméra est placée au plafond", - "it": "Questa telecamera è posizionata sul soffitto" + "it": "Questa telecamera è posizionata sul soffitto", + "de": "Diese Kamera ist an der Decke montiert" } } ], diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 7b0366ca9b..e3da8e4182 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -412,21 +412,24 @@ "id": "toilet-handwashing", "question": { "en": "Do these toilets have a sink to wash your hands?", - "nl": "Hebben deze toiletten een lavabo om de handen te wassen?" + "nl": "Hebben deze toiletten een lavabo om de handen te wassen?", + "de": "Verfügt diese Toilette über ein Waschbecken?" }, "mappings": [ { "if": "toilets:handwashing=yes", "then": { "en": "This toilets have a sink to wash your hands", - "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen" + "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen", + "de": "Diese Toilette verfügt über ein Waschbecken" } }, { "if": "toilets:handwashing=no", "then": { "en": "This toilets don't have a sink to wash your hands", - "nl": "Deze toiletten hebben geen lavabo waar men de handen kan wassen" + "nl": "Deze toiletten hebben geen lavabo waar men de handen kan wassen", + "de": "Diese Toilette verfügt über kein Waschbecken" } } ] @@ -435,7 +438,8 @@ "id": "toilet-has-paper", "question": { "en": "Does one have to bring their own toilet paper to this toilet?", - "nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?" + "nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?", + "de": "Muss man für diese Toilette sein eigenes Toilettenpapier mitbringen?" }, "mappings": [ { @@ -449,7 +453,8 @@ "if": "toilets:paper_supplied=no", "then": { "en": "You have to bring your own toilet paper to this toilet", - "nl": "Je moet je eigen toiletpapier meebrengen naar deze toilet" + "nl": "Je moet je eigen toiletpapier meebrengen naar deze toilet", + "de": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen" } } ] @@ -462,7 +467,8 @@ { "question": { "en": "Wheelchair accessible", - "nl": "Rolstoel toegankelijk" + "nl": "Rolstoel toegankelijk", + "de": "Rollstuhlgerecht" }, "osmTags": "wheelchair=yes" } @@ -474,7 +480,8 @@ { "question": { "en": "Has a changing table", - "nl": "Heeft een luiertafel" + "nl": "Heeft een luiertafel", + "de": "Hat einen Wickeltisch" }, "osmTags": "changing_table=yes" } @@ -486,7 +493,8 @@ { "question": { "en": "Free to use", - "nl": "Gratis toegankelijk" + "nl": "Gratis toegankelijk", + "de": "Nutzung kostenlos" }, "osmTags": { "or": [ diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json index fa33cc095a..79c0c92176 100644 --- a/assets/layers/trail/trail.json +++ b/assets/layers/trail/trail.json @@ -3,7 +3,8 @@ "name": { "en": "Trails", "nl": "Wandeltochten", - "ru": "Тропы" + "ru": "Тропы", + "de": "Wanderwege" }, "minzoom": 12, "source": { @@ -23,7 +24,8 @@ "render": { "en": "Trail", "nl": "Wandeltocht", - "ru": "Тропа" + "ru": "Тропа", + "de": "Wanderweg" }, "mappings": [ { @@ -38,7 +40,8 @@ "id": "trail-length", "render": { "en": "The trail is {_length:km} kilometers long", - "nl": "Deze wandeling is {_length:km} kilometer lang" + "nl": "Deze wandeling is {_length:km} kilometer lang", + "de": "Der Wanderweg ist {_length:km} Kilometer lang" } }, { @@ -104,28 +107,32 @@ "if": "colour=blue", "then": { "nl": "Blauwe wandeling", - "en": "Blue trail" + "en": "Blue trail", + "de": "Blauer Weg" } }, { "if": "colour=red", "then": { "nl": "Rode wandeling", - "en": "Red trail" + "en": "Red trail", + "de": "Roter Weg" } }, { "if": "colour=green", "then": { "nl": "Groene wandeling", - "en": "Green trail" + "en": "Green trail", + "de": "Grüner Weg" } }, { "if": "colour=yellow", "then": { "nl": "Gele wandeling", - "en": "Yellow trail" + "en": "Yellow trail", + "de": "Gelber Weg" } } ], diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 6d99b8382c..dd75dd5257 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -50,7 +50,8 @@ "en": "Height: {height}", "it": "Altezza: {height}", "ru": "Высота: {height}", - "fr": "Hauteur : {height}" + "fr": "Hauteur : {height}", + "de": "Höhe: {height}" }, "condition": { "and": [ @@ -69,7 +70,8 @@ "en": "Height: {height} m", "it": "Altezza: {height} m", "ru": "Высота: {height} м", - "fr": "Hauteur : {height} m" + "fr": "Hauteur : {height} m", + "de": "Höhe: {height} m" } } ] @@ -80,7 +82,8 @@ "nl": "Is dit een naald- of loofboom?", "en": "Is this a broadleaved or needleleaved tree?", "it": "Si tratta di un albero latifoglia o aghifoglia?", - "fr": "Cet arbre est-il un feuillu ou un résineux ?" + "fr": "Cet arbre est-il un feuillu ou un résineux ?", + "de": "Ist dies ein Laub- oder Nadelbaum?" }, "mappings": [ { @@ -93,7 +96,8 @@ "nl": "\"\"/ Loofboom", "en": "\"\"/ Broadleaved", "it": "\"\"/ Latifoglia", - "fr": "\"\"/ Feuillu" + "fr": "\"\"/ Feuillu", + "de": "\"\"/ Laubbaum" } }, { @@ -106,7 +110,8 @@ "nl": "\"\"/ Naaldboom", "en": "\"\"/ Needleleaved", "it": "\"\"/ Aghifoglia", - "fr": "\"\"/ Résineux" + "fr": "\"\"/ Résineux", + "de": "\"\"/ Nadelbaum" } }, { @@ -119,7 +124,8 @@ "nl": "\"\"/ Permanent bladloos", "en": "\"\"/ Permanently leafless", "it": "\"\"/ Privo di foglie (permanente)", - "fr": "\"\"/ Sans feuilles (Permanent)" + "fr": "\"\"/ Sans feuilles (Permanent)", + "de": "\"\"/ Dauerhaft blattlos" }, "hideInAnswer": true } @@ -131,7 +137,8 @@ "nl": "Hoe significant is deze boom? Kies het eerste antwoord dat van toepassing is.", "en": "How significant is this tree? Choose the first answer that applies.", "it": "Quanto significativo è questo albero? Scegli la prima risposta che corrisponde.", - "fr": "Quelle est l'importance de cet arbre ? Choisissez la première réponse qui s'applique." + "fr": "Quelle est l'importance de cet arbre ? Choisissez la première réponse qui s'applique.", + "de": "Wie bedeutsam ist dieser Baum? Wählen Sie die erste Antwort, die zutrifft." }, "mappings": [ { @@ -144,7 +151,8 @@ "nl": "De boom valt op door zijn grootte of prominente locatie. Hij is nuttig voor navigatie.", "en": "The tree is remarkable due to its size or prominent location. It is useful for navigation.", "it": "È un albero notevole per le sue dimensioni o per la posizione prominente. È utile alla navigazione.", - "fr": "L'arbre est remarquable en raison de sa taille ou de son emplacement proéminent. Il est utile pour la navigation." + "fr": "L'arbre est remarquable en raison de sa taille ou de son emplacement proéminent. Il est utile pour la navigation.", + "de": "Der Baum ist aufgrund seiner Größe oder seiner markanten Lage bedeutsam. Er ist nützlich zur Orientierung." } }, { @@ -157,7 +165,8 @@ "nl": "De boom is een natuurlijk monument, bijvoorbeeld doordat hij bijzonder oud of van een waardevolle soort is.", "en": "The tree is a natural monument, e.g. because it is especially old, or of a valuable species.", "it": "L’albero è un monumento naturale, ad esempio perché specialmente antico o appartenente a specie importanti.", - "fr": "Cet arbre est un monument naturel (ex : âge, espèce, etc…)" + "fr": "Cet arbre est un monument naturel (ex : âge, espèce, etc…)", + "de": "Der Baum ist ein Naturdenkmal, z. B. weil er besonders alt ist oder zu einer wertvollen Art gehört." } }, { @@ -170,7 +179,8 @@ "nl": "De boom wordt voor landbouwdoeleinden gebruikt, bijvoorbeeld in een boomgaard.", "en": "The tree is used for agricultural purposes, e.g. in an orchard.", "it": "L’albero è usato per scopi agricoli, ad esempio in un frutteto.", - "fr": "Cet arbre est utilisé à but d’agriculture (ex : dans un verger)" + "fr": "Cet arbre est utilisé à but d’agriculture (ex : dans un verger)", + "de": "Der Baum wird für landwirtschaftliche Zwecke genutzt, z. B. in einer Obstplantage." } }, { @@ -183,7 +193,8 @@ "nl": "De boom staat in een park of dergelijke (begraafplaats, schoolterrein, …).", "en": "The tree is in a park or similar (cemetery, school grounds, …).", "it": "L’albero è in un parco o qualcosa di simile (cimitero, aree didattiche, etc.).", - "fr": "Cet arbre est dans un parc ou une aire similaire (ex : cimetière, cour d’école, …)." + "fr": "Cet arbre est dans un parc ou une aire similaire (ex : cimetière, cour d’école, …).", + "de": "Der Baum steht in einem Park oder ähnlichem (Friedhof, Schulgelände, ...)." } }, { @@ -209,7 +220,8 @@ "nl": "Dit is een laanboom.", "en": "This is a tree along an avenue.", "it": "Fa parte di un viale alberato.", - "fr": "C'est un arbre le long d'une avenue." + "fr": "C'est un arbre le long d'une avenue.", + "de": "Dieser Baum steht entlang einer Straße." } }, { @@ -235,7 +247,8 @@ "nl": "De boom staat buiten een woonkern.", "en": "The tree is outside of an urban area.", "it": "L’albero si trova fuori dall’area urbana.", - "fr": "Cet arbre est en zone rurale." + "fr": "Cet arbre est en zone rurale.", + "de": "Dieser Baum steht außerhalb eines städtischen Gebiets." } } ] @@ -247,7 +260,8 @@ "en": "Is this tree evergreen or deciduous?", "it": "È un sempreverde o caduco?", "ru": "Это дерево вечнозелёное или листопадное?", - "fr": "L’arbre est-il à feuillage persistant ou caduc ?" + "fr": "L’arbre est-il à feuillage persistant ou caduc ?", + "de": "Ist dies ein Nadelbaum oder ein Laubbaum?" }, "mappings": [ { @@ -261,7 +275,8 @@ "en": "Deciduous: the tree loses its leaves for some time of the year.", "it": "Caduco: l’albero perde le sue foglie per un periodo dell’anno.", "ru": "Листопадное: у дерева опадают листья в определённое время года.", - "fr": "Caduc : l’arbre perd son feuillage une partie de l’année." + "fr": "Caduc : l’arbre perd son feuillage une partie de l’année.", + "de": "Laubabwerfend: Der Baum verliert für eine gewisse Zeit des Jahres seine Blätter." } }, { @@ -275,7 +290,8 @@ "en": "Evergreen.", "it": "Sempreverde.", "fr": "À feuilles persistantes.", - "ru": "Вечнозелёное." + "ru": "Вечнозелёное.", + "de": "immergrüner Baum." } } ], @@ -292,14 +308,16 @@ "it": "Nome: {name}", "ru": "Название: {name}", "fr": "Nom : {name}", - "id": "Nama: {name}" + "id": "Nama: {name}", + "de": "Name: {name}" }, "question": { "nl": "Heeft de boom een naam?", "en": "Does the tree have a name?", "it": "L’albero ha un nome?", "fr": "L'arbre a-t-il un nom ?", - "ru": "Есть ли у этого дерева название?" + "ru": "Есть ли у этого дерева название?", + "de": "Hat der Baum einen Namen?" }, "freeform": { "key": "name", @@ -320,7 +338,8 @@ "en": "The tree does not have a name.", "it": "L’albero non ha un nome.", "fr": "L'arbre n'a pas de nom.", - "ru": "У этого дерева нет названия." + "ru": "У этого дерева нет названия.", + "de": "Der Baum hat keinen Namen." } } ], @@ -339,7 +358,8 @@ "nl": "Is deze boom erkend als erfgoed?", "en": "Is this tree registered heritage?", "it": "Quest’albero è registrato come patrimonio?", - "fr": "Cet arbre est-il inscrit au patrimoine ?" + "fr": "Cet arbre est-il inscrit au patrimoine ?", + "de": "Ist dieser Baum ein Naturdenkmal?" }, "mappings": [ { @@ -353,7 +373,8 @@ "nl": "\"\"/ Erkend als houtig erfgoed door Onroerend Erfgoed Vlaanderen", "en": "\"\"/ Registered as heritage by Onroerend Erfgoed Flanders", "it": "\"\"/Registrato come patrimonio da Onroerend Erfgoed Flanders", - "fr": "\"\"/ Fait partie du patrimoine par Onroerend Erfgoed" + "fr": "\"\"/ Fait partie du patrimoine par Onroerend Erfgoed", + "de": "\"\"/ Als Denkmal registriert von der Onroerend Erfgoed Flandern" } }, { @@ -367,7 +388,8 @@ "nl": "Erkend als natuurlijk erfgoed door Directie Cultureel Erfgoed Brussel", "en": "Registered as heritage by Direction du Patrimoine culturel Brussels", "it": "Registrato come patrimonio da Direction du Patrimoine culturel di Bruxelles", - "fr": "Enregistré comme patrimoine par la Direction du Patrimoine culturel Bruxelles" + "fr": "Enregistré comme patrimoine par la Direction du Patrimoine culturel Bruxelles", + "de": "Als Denkmal registriert von der Direction du Patrimoine culturel Brüssel" } }, { @@ -395,7 +417,8 @@ "nl": "Niet erkend als erfgoed", "en": "Not registered as heritage", "it": "Non è registrato come patrimonio", - "fr": "Non enregistré comme patrimoine" + "fr": "Non enregistré comme patrimoine", + "de": "Nicht als Denkmal registriert" } }, { @@ -432,7 +455,8 @@ "nl": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?", "en": "What is the ID issued by Onroerend Erfgoed Flanders?", "it": "Qual è l’ID rilasciato da Onroerend Erfgoed Flanders?", - "fr": "Quel est son identifiant donné par Onroerend Erfgoed ?" + "fr": "Quel est son identifiant donné par Onroerend Erfgoed ?", + "de": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?" }, "freeform": { "key": "ref:OnroerendErfgoed", @@ -458,7 +482,8 @@ "nl": "Wat is het Wikidata-ID van deze boom?", "en": "What is the Wikidata ID for this tree?", "it": "Qual è l’ID Wikidata per questo albero?", - "fr": "Quel est l'identifiant Wikidata de cet arbre ?" + "fr": "Quel est l'identifiant Wikidata de cet arbre ?", + "de": "Was ist das passende Wikidata Element zu diesem Baum?" }, "freeform": { "key": "wikidata", @@ -516,13 +541,15 @@ "en": "Broadleaved tree", "it": "Albero latifoglia", "fr": "Arbre feuillu", - "ru": "Лиственное дерево" + "ru": "Лиственное дерево", + "de": "Laubbaum" }, "description": { "nl": "Een boom van een soort die blaadjes heeft, bijvoorbeeld eik of populier.", "en": "A tree of a species with leaves, such as oak or populus.", "it": "Un albero di una specie con foglie larghe come la quercia o il pioppo.", - "fr": "Un arbre d'une espèce avec de larges feuilles, comme le chêne ou le peuplier." + "fr": "Un arbre d'une espèce avec de larges feuilles, comme le chêne ou le peuplier.", + "de": "Ein Baum mit Blättern, z. B. Eiche oder Buche." }, "preciseInput": { "preferredBackground": "photo" @@ -538,14 +565,16 @@ "en": "Needleleaved tree", "it": "Albero aghifoglia", "ru": "Хвойное дерево", - "fr": "Arbre résineux" + "fr": "Arbre résineux", + "de": "Nadelbaum" }, "description": { "nl": "Een boom van een soort met naalden, bijvoorbeeld den of spar.", "en": "A tree of a species with needles, such as pine or spruce.", "it": "Un albero di una specie con aghi come il pino o l’abete.", "ru": "Дерево с хвоей (иглами), например, сосна или ель.", - "fr": "Une espèce d’arbre avec des épines comme le pin ou l’épicéa." + "fr": "Une espèce d’arbre avec des épines comme le pin ou l’épicéa.", + "de": "Ein Baum mit Nadeln, z. B. Kiefer oder Fichte." }, "preciseInput": { "preferredBackground": "photo" @@ -569,7 +598,8 @@ "en": "If you're not sure whether it's a broadleaved or needleleaved tree.", "it": "Qualora non si sia sicuri se si tratta di un albero latifoglia o aghifoglia.", "fr": "Si vous n'êtes pas sûr(e) de savoir s'il s'agit d'un arbre à feuilles larges ou à aiguilles.", - "ru": "Если вы не уверены в том, лиственное это дерево или хвойное." + "ru": "Если вы не уверены в том, лиственное это дерево или хвойное.", + "de": "Wenn Sie nicht sicher sind, ob es sich um einen Laubbaum oder einen Nadelbaum handelt." }, "preciseInput": { "preferredBackground": "photo" diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json index 322fb4eabc..28986dd8ad 100644 --- a/assets/layers/visitor_information_centre/visitor_information_centre.json +++ b/assets/layers/visitor_information_centre/visitor_information_centre.json @@ -53,7 +53,8 @@ }, "description": { "en": "A visitor center offers information about a specific attraction or place of interest where it is located.", - "nl": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd." + "nl": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.", + "de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet." }, "tagRenderings": [], "icon": { diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 98296a9427..7a3691a979 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -3,7 +3,8 @@ "name": { "en": "Waste Basket", "nl": "Vuilnisbak", - "ru": "Контейнер для мусора" + "ru": "Контейнер для мусора", + "de": "Abfalleimer" }, "minzoom": 17, "source": { @@ -17,7 +18,8 @@ "render": { "en": "Waste Basket", "nl": "Vuilnisbak", - "ru": "Контейнер для мусора" + "ru": "Контейнер для мусора", + "de": "Abfalleimer" } }, "description": { @@ -30,7 +32,8 @@ "id": "waste-basket-waste-types", "question": { "en": "What kind of waste basket is this?", - "nl": "Wat voor soort vuilnisbak is dit?" + "nl": "Wat voor soort vuilnisbak is dit?", + "de": "Um was für einen Abfalleimer handelt es sich?" }, "multiAnswer": true, "mappings": [ @@ -38,7 +41,8 @@ "if": "waste=", "then": { "en": "A waste basket for general waste", - "nl": "Een vuilnisbak voor zwerfvuil" + "nl": "Een vuilnisbak voor zwerfvuil", + "de": "Ein Abfalleimer für allgemeinen Müll" }, "hideInAnswer": true }, @@ -46,28 +50,32 @@ "if": "waste=trash", "then": { "en": "A waste basket for general waste", - "nl": "Een vuilnisbak voor zwerfvuil" + "nl": "Een vuilnisbak voor zwerfvuil", + "de": "Ein Abfalleimer für allgemeinen Müll" } }, { "if": "waste=dog_excrement", "then": { "en": "A waste basket for dog excrements", - "nl": "Een vuilnisbak specifiek voor hondenuitwerpselen" + "nl": "Een vuilnisbak specifiek voor hondenuitwerpselen", + "de": "Ein Abfalleimer für Hundekot" } }, { "if": "waste=cigarettes", "then": { "en": "A waste basket for cigarettes", - "nl": "Een vuilnisbak voor sigarettenpeuken" + "nl": "Een vuilnisbak voor sigarettenpeuken", + "de": "Mülleimer für Zigaretten" } }, { "if": "waste=drugs", "then": { "en": "A waste basket for drugs", - "nl": "Een vuilnisbak voor (vervallen) medicatie en drugs" + "nl": "Een vuilnisbak voor (vervallen) medicatie en drugs", + "de": "Mülleimer für Drogen" } }, { @@ -82,7 +90,9 @@ { "id": "dispensing_dog_bags", "question": { - "en": "Does this waste basket have a dispenser for dog excrement bags?" + "en": "Does this waste basket have a dispenser for dog excrement bags?", + "nl": "Heeft deze vuilnisbak een verdeler voor hondenpoepzakjes?", + "de": "Verfügt dieser Abfalleimer über einen Spender für (Hunde-)Kotbeutel?" }, "condition": { "or": [ @@ -100,7 +110,9 @@ ] }, "then": { - "en": "This waste basket has a dispenser for (dog) excrement bags" + "en": "This waste basket has a dispenser for (dog) excrement bags", + "nl": "Deze vuilnisbak heeft een verdeler voor hondenpoepzakjes", + "de": "Dieser Abfalleimer verfügt über einen Spender für (Hunde-)Kotbeutel" } }, { @@ -111,13 +123,17 @@ ] }, "then": { - "en": "This waste basket does not have a dispenser for (dog) excrement bags" + "en": "This waste basket does not have a dispenser for (dog) excrement bags", + "nl": "Deze vuilbak heeft geen verdeler voor hondenpoepzakjes", + "de": "Dieser Abfalleimer hat keinen Spender für (Hunde-)Kotbeutel" } }, { "if": "vending=", "then": { - "en": "This waste basket does not have a dispenser for (dog) excrement bags" + "en": "This waste basket does not have a dispenser for (dog) excrement bags", + "nl": "Deze vuilnisbak heeft geen verdeler voor hondenpoepzakjes", + "de": "Dieser Abfalleimer hat keinen Spender für (Hunde-)Kotbeutel" }, "hideInAnwer": true } @@ -142,7 +158,8 @@ "then": { "en": "Waste Basket", "nl": "Vuilnisbak", - "ru": "Контейнер для мусора" + "ru": "Контейнер для мусора", + "de": "Abfalleimer" } } ] @@ -158,7 +175,8 @@ "title": { "en": "Waste Basket", "nl": "Vuilnisbak", - "ru": "Контейнер для мусора" + "ru": "Контейнер для мусора", + "de": "Abfalleimer" }, "presiceInput": { "preferredBackground": "photo" diff --git a/assets/svg/close.svg b/assets/svg/close.svg index 1d43446560..ded2ef0e4e 100644 --- a/assets/svg/close.svg +++ b/assets/svg/close.svg @@ -2,83 +2,80 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="100" + height="100" + viewBox="0 0 26.458333 26.458334" + version="1.1" + id="svg8" + sodipodi:docname="close.svg" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 0a9a113fec..814e0058a0 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -6,14 +6,18 @@ "render": "{wikipedia():max-height:25rem}", "question": { "en": "What is the corresponding Wikidata entity?", - "nl": "Welk Wikidata-item komt overeen met dit object?" + "nl": "Welk Wikidata-item komt overeen met dit object?", + "de": "Was ist das entsprechende Wikidata Element?", + "pt": "Qual é a entidade Wikidata correspondente?" }, "mappings": [ { "if": "wikidata=", "then": { "en": "No Wikipedia page has been linked yet", - "nl": "Er werd nog geen Wikipedia-pagina gekoppeld" + "nl": "Er werd nog geen Wikipedia-pagina gekoppeld", + "de": "Es wurde noch keine Wikipedia-Seite verlinkt", + "pt": "Ainda não foi vinculada nenhuma página da Wikipédia" }, "hideInAnswer": true } @@ -64,14 +68,18 @@ "render": "WP", "question": { "en": "What is the corresponding item on Wikipedia?", - "nl": "Welk Wikipedia-artikel beschrijft dit object?" + "nl": "Welk Wikipedia-artikel beschrijft dit object?", + "de": "Was ist der entsprechende Artikel auf Wikipedia?", + "pt": "Qual é o item correspondente na Wikipédia?" }, "mappings": [ { "if": "wikidata=", "then": { "en": "Not linked with Wikipedia", - "nl": "Nog geen Wikipedia-artikel bekend" + "nl": "Nog geen Wikipedia-artikel bekend", + "de": "Nicht mit Wikipedia verknüpft", + "pt": "Não vinculado à Wikipédia" } } ], @@ -131,7 +139,8 @@ "en": "Is this place accessible with a wheelchair?", "pt": "Este lugar é acessível a utilizadores de cadeiras de rodas?", "pt_BR": "Este lugar é acessível com uma cadeira de rodas?", - "de": "Ist dieser Ort mit einem Rollstuhl zugänglich?" + "de": "Ist dieser Ort mit einem Rollstuhl zugänglich?", + "fr": "Est-ce que cet endroit est accessible en chaise roulante ?" }, "mappings": [ { @@ -145,7 +154,7 @@ "en": "This place is specially adapated for wheelchair users", "pt": "Este lugar está especialmente adaptado para utilizadores de cadeira de rodas", "pt_BR": "Este lugar é especialmente adaptado para usuários de cadeira de rodas", - "de": "Dieser Ort ist speziell für Rollstuhlfahrer eingerichtet." + "de": "Dieser Ort ist speziell für Rollstuhlfahrer eingerichtet" } }, { @@ -173,7 +182,8 @@ "en": "It is possible to reach this place in a wheelchair, but it is not easy", "pt": "É possível chegar a este local em cadeira de rodas, mas não é fácil", "pt_BR": "É possível chegar a esse local em uma cadeira de rodas, mas não é fácil", - "de": "Es ist möglich, diesen Ort mit einem Rollstuhl zu erreichen, aber es ist nicht einfach" + "de": "Es ist möglich, diesen Ort mit einem Rollstuhl zu erreichen, aber es ist nicht einfach", + "fr": "Il est possible d'accéder à cet endroit en chaise roulante, mais ce n'est pas facile" } }, { @@ -187,7 +197,8 @@ "en": "This place is not reachable with a wheelchair", "pt": "Este lugar não é acessível com uma cadeira de rodas", "pt_BR": "Este lugar não é alcançável com uma cadeira de rodas", - "de": "Dieser Ort ist nicht mit einem Rollstuhl erreichbar" + "de": "Dieser Ort ist nicht mit einem Rollstuhl erreichbar", + "fr": "Cet endroit n'est pas accessible en chaise roulante" } } ] @@ -197,7 +208,8 @@ "en": "Are dogs allowed in this business?", "nl": "Zijn honden toegelaten in deze zaak?", "pt": "Os cães são permitidos neste estabelecimento?", - "de": "Sind Hunde in diesem Geschäft erlaubt?" + "de": "Sind Hunde in diesem Geschäft erlaubt?", + "fr": "Est-ce que les chiens sont admis ici ?" }, "mappings": [ { @@ -206,7 +218,8 @@ "en": "Dogs are allowed", "nl": "honden zijn toegelaten", "pt": "Os cães são permitidos", - "de": "Hunde sind erlaubt" + "de": "Hunde sind erlaubt", + "fr": "Chiens admis" } }, { @@ -215,7 +228,8 @@ "en": "Dogs are not allowed", "nl": "honden zijn niet toegelaten", "pt": "Os cães não são permitidos", - "de": "Hunde sind nicht erlaubt" + "de": "Hunde sind nicht erlaubt", + "fr": "Les chiens ne sont pas admis" } }, { @@ -224,7 +238,8 @@ "en": "Dogs are allowed, but they have to be leashed", "nl": "honden zijn enkel aan de leiband welkom", "pt": "Os cães são permitidos, mas têm de ser presos pela trela", - "de": "Hunde sind erlaubt, müssen aber angeleint sein." + "de": "Hunde sind erlaubt, müssen aber angeleint sein", + "fr": "Les chiens sont admis, mais ils doivent être tenus en laisse" } }, { @@ -233,7 +248,8 @@ "en": "Dogs are allowed and can run around freely", "nl": "honden zijn welkom en mogen vrij rondlopen", "pt": "Os cães são permitidos e podem correr livremente", - "de": "Hunde sind erlaubt und können frei herumlaufen" + "de": "Hunde sind erlaubt und können frei herumlaufen", + "fr": "Les chiens sont admis et peuvent circuler librement" } } ] @@ -298,7 +314,8 @@ "pt": "Que métodos de pagamento são aceites aqui?", "pt_BR": "Quais métodos de pagamento são aceitos aqui?", "id": "Metode pembayaran manakah yang di terima disini?", - "de": "Welche Zahlungsmethoden werden hier akzeptiert?" + "de": "Welche Zahlungsmethoden werden hier akzeptiert?", + "fr": "Quelles sont les méthodes de paiement acceptées ici ?" }, "multiAnswer": true, "mappings": [ @@ -311,7 +328,8 @@ "pt": "Aceitam pagamento com dinheiro aqui", "pt_BR": "Dinheiro é aceito aqui", "id": "Disini menerima pembayaran tunai", - "de": "Hier wird Bargeld akzeptiert" + "de": "Hier wird Bargeld akzeptiert", + "fr": "Paiement en liquide accepté" } }, { @@ -323,7 +341,8 @@ "pt": "Aceitam pagamento com cartões bancários aqui", "pt_BR": "Cartões de pagamento são aceitos aqui", "id": "Disini menerima pembayaran dengan kartu", - "de": "Hier werden Zahlungskarten akzeptiert" + "de": "Hier werden Zahlungskarten akzeptiert", + "fr": "Paiement par carte accepté" } } ] diff --git a/assets/themes/aed/aed_brugge.json b/assets/themes/aed/aed_brugge.json index aad99cd440..2ccf774d84 100644 --- a/assets/themes/aed/aed_brugge.json +++ b/assets/themes/aed/aed_brugge.json @@ -15,6 +15,9 @@ "startLat": 51.25634, "startLon": 3.195682, "startZoom": 12, + "clustering": { + "maxZoom": 0 + }, "layers": [ "defibrillator", { diff --git a/assets/themes/benches/benches.json b/assets/themes/benches/benches.json index d94f88597a..eef8c2dc50 100644 --- a/assets/themes/benches/benches.json +++ b/assets/themes/benches/benches.json @@ -58,6 +58,5 @@ "bench", "bench_at_pt", "picnic_table" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/bicyclelib/bicyclelib.json b/assets/themes/bicyclelib/bicyclelib.json index 1c3a5c000f..09bc1352b5 100644 --- a/assets/themes/bicyclelib/bicyclelib.json +++ b/assets/themes/bicyclelib/bicyclelib.json @@ -42,7 +42,6 @@ "startLon": 0, "startZoom": 1, "widenFactor": 1.5, - "roamingRenderings": [], "layers": [ { "builtin": "bicycle_library", diff --git a/assets/themes/bookcases/bookcases.json b/assets/themes/bookcases/bookcases.json index 0862fbb379..7209162f2f 100644 --- a/assets/themes/bookcases/bookcases.json +++ b/assets/themes/bookcases/bookcases.json @@ -40,7 +40,6 @@ "startLon": 0, "startZoom": 1, "widenFactor": 1, - "roamingRenderings": [], "layers": [ "public_bookcase" ] diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index 9c4f2a1894..0f1c8648a0 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -1,7 +1,6 @@ { "id": "buurtnatuur", "title": { - "#": "DO NOT TRANSLATE THIS THEME - this one is only meant to be in dutch!", "nl": "Breng jouw buurtnatuur in kaart" }, "shortDescription": { @@ -343,263 +342,265 @@ }, "viewpoint" ], - "roamingRenderings": [ - { - "#": "Access tag", - "condition": { - "and": [ - "tourism!~viewpoint" + "overrideAll": { + "tagRenderings+": [ + { + "id": "Access tag", + "condition": { + "and": [ + "tourism!~viewpoint" + ] + }, + "render": { + "nl": "De toegankelijkheid van dit gebied is: {access:description}" + }, + "question": { + "nl": "Is dit gebied toegankelijk?" + }, + "freeform": { + "key": "access:description", + "addExtraTags": [ + "access=" + ] + }, + "mappings": [ + { + "if": { + "and": [ + "access:description=", + "access=", + "leisure=park" + ] + }, + "then": { + "nl": "Dit gebied is vrij toegankelijk" + }, + "hideInAnswer": true + }, + { + "if": { + "and": [ + "access:description=", + "access=yes", + "fee=" + ] + }, + "then": { + "nl": "Vrij toegankelijk" + } + }, + { + "if": { + "and": [ + "access:description=", + "access=no", + "fee=" + ] + }, + "then": { + "nl": "Niet toegankelijk" + } + }, + { + "if": { + "and": [ + "access:description=", + "access=private", + "fee=" + ] + }, + "then": { + "nl": "Niet toegankelijk, want privégebied" + } + }, + { + "if": { + "and": [ + "access:description=", + "access=permissive", + "fee=" + ] + }, + "then": { + "nl": "Toegankelijk, ondanks dat het privegebied is" + } + }, + { + "if": { + "and": [ + "access:description=", + "access=guided", + "fee=" + ] + }, + "then": { + "nl": "Enkel toegankelijk met een gids of tijdens een activiteit" + } + }, + { + "if": { + "and": [ + "access:description=", + "access=yes", + "fee=yes" + ] + }, + "then": { + "nl": "Toegankelijk mits betaling" + } + } ] }, - "render": { - "nl": "De toegankelijkheid van dit gebied is: {access:description}" - }, - "question": { - "nl": "Is dit gebied toegankelijk?" - }, - "freeform": { - "key": "access:description", - "addExtraTags": [ - "access=" - ] - }, - "mappings": [ - { - "if": { - "and": [ - "access:description=", - "access=", - "leisure=park" - ] - }, - "then": { - "nl": "Dit gebied is vrij toegankelijk" - }, - "hideInAnswer": true + { + "id": "Operator tag", + "render": { + "nl": "Beheer door {operator}" }, - { - "if": { - "and": [ - "access:description=", - "access=yes", - "fee=" - ] - }, - "then": { - "nl": "Vrij toegankelijk" - } + "question": { + "nl": "Wie beheert dit gebied?" }, - { - "if": { - "and": [ - "access:description=", - "access=no", - "fee=" - ] - }, - "then": { - "nl": "Niet toegankelijk" - } + "freeform": { + "key": "operator" }, - { - "if": { - "and": [ - "access:description=", - "access=private", - "fee=" - ] + "mappings": [ + { + "if": { + "and": [ + "leisure=park", + "operator=" + ] + }, + "then": "Beheer door de gemeente", + "hideInAnswer": true }, - "then": { - "nl": "Niet toegankelijk, want privégebied" - } - }, - { - "if": { - "and": [ - "access:description=", - "access=permissive", - "fee=" - ] + { + "if": { + "and": [ + "operator=Natuurpunt" + ] + }, + "then": { + "nl": "Dit gebied wordt beheerd door Natuurpunt" + } }, - "then": { - "nl": "Toegankelijk, ondanks dat het privegebied is" - } - }, - { - "if": { - "and": [ - "access:description=", - "access=guided", - "fee=" - ] + { + "if": { + "and": [ + "operator~(n|N)atuurpunt.*" + ] + }, + "then": { + "nl": "Dit gebied wordt beheerd door {operator}" + }, + "hideInAnswer": true }, - "then": { - "nl": "Enkel toegankelijk met een gids of tijdens een activiteit" - } - }, - { - "if": { - "and": [ - "access:description=", - "access=yes", - "fee=yes" - ] + { + "if": { + "and": [ + "operator=Agentschap Natuur en Bos" + ] + }, + "then": { + "nl": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos" + } }, - "then": { - "nl": "Toegankelijk mits betaling" + { + "if": { + "and": [ + "operator:type=private" + ] + }, + "then": "Beheer door een privépersoon", + "hideInAnswer": true + }, + { + "if": { + "and": [ + "operator:type=private", + "operator=" + ] + }, + "then": "Beheer door een privépersoon" } + ], + "condition": { + "and": [ + "leisure!~park", + "tourism!~viewpoint" + ] } - ] - }, - { - "#": "Operator tag", - "render": { - "nl": "Beheer door {operator}" }, - "question": { - "nl": "Wie beheert dit gebied?" - }, - "freeform": { - "key": "operator" - }, - "mappings": [ - { - "if": { - "and": [ - "leisure=park", - "operator=" - ] - }, - "then": "Beheer door de gemeente", - "hideInAnswer": true + { + "id": "Non-editable description {description}", + "render": { + "nl": "Extra info: {description}" }, - { - "if": { - "and": [ - "operator=Natuurpunt" - ] - }, - "then": { - "nl": "Dit gebied wordt beheerd door Natuurpunt" - } - }, - { - "if": { - "and": [ - "operator~(n|N)atuurpunt.*" - ] - }, - "then": { - "nl": "Dit gebied wordt beheerd door {operator}" - }, - "hideInAnswer": true - }, - { - "if": { - "and": [ - "operator=Agentschap Natuur en Bos" - ] - }, - "then": { - "nl": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos" - } - }, - { - "if": { - "and": [ - "operator:type=private" - ] - }, - "then": "Beheer door een privépersoon", - "hideInAnswer": true - }, - { - "if": { - "and": [ - "operator:type=private", - "operator=" - ] - }, - "then": "Beheer door een privépersoon" + "freeform": { + "key": "description" } - ], - "condition": { - "and": [ - "leisure!~park", - "tourism!~viewpoint" - ] - } - }, - { - "#": "Non-editable description {description}", - "render": { - "nl": "Extra info: {description}" }, - "freeform": { - "key": "description" - } - }, - { - "#": "Editable description {description:0}", - "question": "Is er extra info die je kwijt wil?
De naam van het gebied wordt in de volgende vraag gesteld", - "render": { - "nl": "Extra info via buurtnatuur.be: {description:0}" - }, - "freeform": { - "key": "description:0" - } - }, - { - "#": "Name:nl-tag", - "render": { - "nl": "Dit gebied heet {name:nl}" - }, - "question": { - "nl": "Wat is de Nederlandstalige naam van dit gebied?" - }, - "freeform": { - "key": "name:nl" - }, - "condition": { - "and": [ - "name:nl~*", - "viewpoint!~tourism" - ] - } - }, - { - "#": "Name tag", - "render": { - "nl": "Dit gebied heet {name}" - }, - "question": { - "nl": "Wat is de naam van dit gebied?" - }, - "freeform": { - "key": "name", - "addExtraTags": [ - "noname=" - ] - }, - "condition": { - "and": [ - "name:nl=", - "tourism!~viewpoint" - ] - }, - "mappings": [ - { - "if": { - "and": [ - "noname=yes", - "name=" - ] - }, - "then": { - "nl": "Dit gebied heeft geen naam" - } + { + "id": "Editable description {description:0}", + "question": "Is er extra info die je kwijt wil?
De naam van het gebied wordt in de volgende vraag gesteld", + "render": { + "nl": "Extra info via buurtnatuur.be: {description:0}" + }, + "freeform": { + "key": "description:0" } - ] - } - ] + }, + { + "id": "Name:nl-tag", + "render": { + "nl": "Dit gebied heet {name:nl}" + }, + "question": { + "nl": "Wat is de Nederlandstalige naam van dit gebied?" + }, + "freeform": { + "key": "name:nl" + }, + "condition": { + "and": [ + "name:nl~*", + "viewpoint!~tourism" + ] + } + }, + { + "id": "Name tag", + "render": { + "nl": "Dit gebied heet {name}" + }, + "question": { + "nl": "Wat is de naam van dit gebied?" + }, + "freeform": { + "key": "name", + "addExtraTags": [ + "noname=" + ] + }, + "condition": { + "and": [ + "name:nl=", + "tourism!~viewpoint" + ] + }, + "mappings": [ + { + "if": { + "and": [ + "noname=yes", + "name=" + ] + }, + "then": { + "nl": "Dit gebied heeft geen naam" + } + } + ] + } + ] + } } \ No newline at end of file diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index a255aed854..1b060b8240 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -2,7 +2,7 @@ "id": "campersite", "title": { "en": "Campersites", - "nl": "Kampeersite", + "nl": "Camperplaatsen", "it": "Aree camper", "ru": "Кемпинги", "ja": "キャンプサイト", @@ -304,7 +304,8 @@ "zh_Hant": "{capacity} 露營者能夠同時使用這個地方", "fr": "{capacity} personnes peuvent utiliser cet espace en même temps", "pt_BR": "{capacity} campistas podem usar este lugar ao mesmo tempo", - "de": "{capacity} Wohnmobile können diesen Platz gleichzeitig nutzen" + "de": "{capacity} Wohnmobile können diesen Platz gleichzeitig nutzen", + "nl": "{capacity} campers kunnen deze plaats tegelijk gebruiken" }, "question": { "en": "How many campers can stay here? (skip if there is no obvious number of spaces or allowed vehicles)", @@ -314,7 +315,8 @@ "zh_Hant": "多少露營者能夠待在這裡？(如果沒有明顯的空間數字或是允許車輛則可以跳過)", "fr": "Combien de personnes peuvent camper ici ? (Passez s’il n’y a pas de places délimitées)", "pt_BR": "Quantos campistas podem ficar aqui? (pule se não houver um número óbvio de vagas ou veículos permitidos)", - "de": "Wie viele Wohnmobile können hier parken? (Überspringen, wenn es keine offensichtliche Anzahl von Stellplätzen oder erlaubten Fahrzeugen gibt)" + "de": "Wie viele Wohnmobile können hier parken? (Überspringen, wenn es keine offensichtliche Anzahl von Stellplätzen oder erlaubten Fahrzeugen gibt)", + "nl": "Hoeveel campers kunnen hier overnachten? (sla dit over als er geen duidelijk aantal plaatsen of aangeduid maximum is)" }, "freeform": { "key": "capacity", @@ -351,7 +353,8 @@ "zh_Hant": "這裡有網路連線", "fr": "Il y a un accès internet", "pt_BR": "Há acesso à internet", - "de": "Internetzugang ist vorhanden" + "de": "Internetzugang ist vorhanden", + "nl": "Er is internettoegang" } }, { @@ -370,7 +373,8 @@ "zh_Hant": "這裡有網路連線", "fr": "Il y a un accès internet", "pt_BR": "Há acesso à Internet", - "de": "Internetzugang ist vorhanden" + "de": "Internetzugang ist vorhanden", + "nl": "Er is internettoegang" }, "hideInAnswer": true }, @@ -609,7 +613,8 @@ "it": "Maggiori dettagli su questo luogo: {description}", "fr": "Plus de détails à propos du site : {description}", "pt_BR": "Mais detalhes sobre este lugar: {description}", - "de": "Mehr Details über diesen Ort: {description}" + "de": "Mehr Details über diesen Ort: {description}", + "nl": "Meer details over deze plaats: {description}" }, "question": { "en": "Would you like to add a general description of this place? (Do not repeat information previously asked or shown above. Please keep it objective - opinions go into the reviews)", @@ -618,7 +623,8 @@ "zh_Hant": "你想要為這個地方加一般的敘述嗎？(不要重覆加先前問過或提供的資訊，請保持敘述性-請將意見留在評價)", "it": "Desideri aggiungere una descrizione del luogo? (Non vanno ripetute informazioni già richieste e mostrate precedentemente. Si prega di attenersi a dati oggettivi - le opinioni vanno nelle recensioni)", "fr": "Souhaitez-vous ajouter une description générale du lieu ? (Ne pas répéter les informations précédentes et rester neutre, les opinions vont dans les avis)", - "de": "Möchten Sie eine allgemeine Beschreibung für diesen Ort hinzufügen? (Bitte wiederholen Sie keine Informationen, die Sie bereits zuvor angegeben haben. Bitte bleiben Sie objektiv - Meinungen gehen in die Bewertungen ein)" + "de": "Möchten Sie eine allgemeine Beschreibung für diesen Ort hinzufügen? (Bitte wiederholen Sie keine Informationen, die Sie bereits zuvor angegeben haben. Bitte bleiben Sie objektiv - Meinungen gehen in die Bewertungen ein)", + "nl": "Wil je graag een algemene beschrijving toevoegen van deze plaats? (Herhaal hier niet de antwoorden op de vragen die reeds gesteld zijn. Hou het objectief - je kan je mening geven via een review)" }, "freeform": { "key": "description", @@ -664,7 +670,8 @@ "it": "luogo di campeggio", "fr": "Aire de camping", "pt_BR": "local de acampamento", - "de": "Wohnmobilstellplatz" + "de": "Wohnmobilstellplatz", + "nl": "camperplaats" }, "description": { "en": "Add a new official camper site. These are designated places to stay overnight with your camper. They might look like a real camping or just look like a parking. They might not be signposted at all, but just be defined in a municipal decision. A regular parking intended for campers where it is not expected to spend the night, is -not- a camper site ", @@ -672,7 +679,8 @@ "ja": "新しい公式キャンプサイトを追加します。お客様のキャンピングカーで一泊する指定の場所です。本物のキャンプのように見えるかもしれないし、単なる駐車場のように見えるかもしれない。それらは全く署名されていないかもしれませんが、自治体の決定で定義されているだけです。夜を過ごすことが予想されないキャンパー向けの通常の駐車場は、キャンプサイトではない ", "it": "Aggiungi una nuova area di sosta ufficiale per camper. Si tratta di aree destinate alla sosta notturna dei camper. Potrebbe trattarsi di luoghi di campeggio o semplici parcheggi. Potrebbero anche non essere segnalati sul posto, ma semplicemente indicati in una delibera comunale. Un parcheggio destinato ai camper in cui non è però consentito trascorrere la notte -non- va considerato un'area di sosta per camper. ", "fr": "Ajouter une nouvelle aire de camping officielle, destinée à y passer la nuit avec un camping-car. Elle ne nécessite pas d’infrastructures particulières et peut être simplement désignée sous arrêté municipal, un simple parking ne suffit pas à rentrer dans cette catégorie ", - "de": "Fügen Sie einen neuen offiziellen Wohnmobilstellplatz hinzu. Dies sind ausgewiesene Plätze, an denen Sie in Ihrem Wohnmobil übernachten können. Sie können wie ein richtiger Campingplatz oder nur wie ein Parkplatz aussehen. Möglicherweise sind sie gar nicht ausgeschildert, sondern nur in einem Gemeindebeschluss festgelegt. Ein normaler Parkplatz für Wohnmobile, auf dem übernachten nicht zulässig ist, ist kein Wohnmobilstellplatz. " + "de": "Fügen Sie einen neuen offiziellen Wohnmobilstellplatz hinzu. Dies sind ausgewiesene Plätze, an denen Sie in Ihrem Wohnmobil übernachten können. Sie können wie ein richtiger Campingplatz oder nur wie ein Parkplatz aussehen. Möglicherweise sind sie gar nicht ausgeschildert, sondern nur in einem Gemeindebeschluss festgelegt. Ein normaler Parkplatz für Wohnmobile, auf dem Übernachten nicht zulässig ist, ist kein Wohnmobilstellplatz. ", + "nl": "Voeg een nieuwe officiële camperplaats toe. Dit zijn speciaal aangeduide plaatsen waar het toegestaan is om te overnachten met een camper. Ze kunnen er uitzien als een parking, of soms eerder als een camping. Soms staan ze niet ter plaatse aangeduid, maar heeft de gemeente wel degelijk beslist dat dit een camperplaats is. Een parking voor campers waar je niet mag overnachten is géén camperplaats. " } } ], @@ -1078,66 +1086,70 @@ ] } ], - "roamingRenderings": [ - { - "render": { - "en": "This place is operated by {operator}", - "ja": "この場所は{operator}によって運営されます", - "it": "Questo luogo è gestito da {operator}", - "fr": "Ce site est exploité par {operator}", - "de": "Dieser Ort wird betrieben von {operator}" - }, - "question": { - "en": "Who operates this place?", - "ja": "この店は誰が経営しているんですか?", - "it": "Chi gestisce questo luogo?", - "fr": "Qui est l’exploitant du site ?", - "de": "Wer betreibt diesen Ort?" - }, - "freeform": { - "key": "operator" - } - }, - { - "question": { - "en": "Does this place have a power supply?", - "ja": "この場所に電源はありますか?", - "it": "Questo luogo fornisce corrente elettrica?", - "fr": "Ce site a-t’il une source d’électricité ?", - "de": "Hat dieser Ort eine Stromversorgung?" - }, - "mappings": [ - { - "if": { - "and": [ - "power_supply=yes" - ] - }, - "then": { - "en": "This place has a power supply", - "id": "Tempat ini memiliki catu daya", - "ja": "この場所には電源があります", - "it": "Questo luogo fornisce corrente elettrica", - "fr": "Ce site a une source d’alimentation", - "de": "Dieser Ort hat eine Stromversorgung" - } + "overrideAll": { + "tagRenderings+": [ + { + "id": "operator", + "render": { + "en": "This place is operated by {operator}", + "ja": "この場所は{operator}によって運営されます", + "it": "Questo luogo è gestito da {operator}", + "fr": "Ce site est exploité par {operator}", + "de": "Dieser Ort wird betrieben von {operator}" }, - { - "if": { - "and": [ - "power_supply=no" - ] - }, - "then": { - "en": "This place does not have power supply", - "id": "Tempat ini tidak memiliki sumber listrik", - "ja": "この場所には電源がありません", - "it": "Questo luogo non fornisce corrente elettrica", - "fr": "Ce site n’a pas de source d’alimentation", - "de": "Dieser Ort hat keine Stromversorgung" - } + "question": { + "en": "Who operates this place?", + "ja": "この店は誰が経営しているんですか?", + "it": "Chi gestisce questo luogo?", + "fr": "Qui est l’exploitant du site ?", + "de": "Wer betreibt diesen Ort?" + }, + "freeform": { + "key": "operator" } - ] - } - ] + }, + { + "id": "power_supply", + "question": { + "en": "Does this place have a power supply?", + "ja": "この場所に電源はありますか?", + "it": "Questo luogo fornisce corrente elettrica?", + "fr": "Ce site a-t’il une source d’électricité ?", + "de": "Hat dieser Ort eine Stromversorgung?" + }, + "mappings": [ + { + "if": { + "and": [ + "power_supply=yes" + ] + }, + "then": { + "en": "This place has a power supply", + "id": "Tempat ini memiliki catu daya", + "ja": "この場所には電源があります", + "it": "Questo luogo fornisce corrente elettrica", + "fr": "Ce site a une source d’alimentation", + "de": "Dieser Ort hat eine Stromversorgung" + } + }, + { + "if": { + "and": [ + "power_supply=no" + ] + }, + "then": { + "en": "This place does not have power supply", + "id": "Tempat ini tidak memiliki sumber listrik", + "ja": "この場所には電源がありません", + "it": "Questo luogo non fornisce corrente elettrica", + "fr": "Ce site n’a pas de source d’alimentation", + "de": "Dieser Ort hat keine Stromversorgung" + } + } + ] + } + ] + } } \ No newline at end of file diff --git a/assets/themes/charging_stations/charging_stations.json b/assets/themes/charging_stations/charging_stations.json index 15d55a1b3f..fdf9a0bdce 100644 --- a/assets/themes/charging_stations/charging_stations.json +++ b/assets/themes/charging_stations/charging_stations.json @@ -46,6 +46,5 @@ "defaultBackgroundId": "CartoDB.Voyager", "layers": [ "charging_station" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index b5720d4ae0..76ae6841d8 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -454,11 +454,13 @@ { "question": { "en": "How much bolts does this route have before reaching the moulinette?", - "fr": "Combien de prises cette voie possède avant d’atteindre la moulinette ?" + "fr": "Combien de prises cette voie possède avant d’atteindre la moulinette ?", + "de": "Wie viele Haken gibt es auf dieser Kletterroute bevor der Umlenker bzw. Standhaken erreicht ist?" }, "render": { "en": "This route has {climbing:bolts} bolts", - "fr": "Cette voie a {climbing:bolts} prises" + "fr": "Cette voie a {climbing:bolts} prises", + "de": "Diese Kletterroute hat {climbing:bolts} Haken" }, "freeform": { "key": "climbing:bolts", @@ -472,7 +474,8 @@ "if": "climbing:bolted=no", "then": { "en": "This route is not bolted", - "fr": "Cette voie n’a pas de prises" + "fr": "Cette voie n’a pas de prises", + "de": "Auf dieser Kletterroute sind keine Haken vorhanden" }, "hideInAnswer": true }, @@ -480,7 +483,8 @@ "if": "climbing:bolted=no&climbing:bolts=", "then": { "en": "This route is not bolted", - "fr": "Cette voie n’a pas de prises" + "fr": "Cette voie n’a pas de prises", + "de": "Auf dieser Kletterroute sind keine Haken vorhanden" } } ], @@ -933,527 +937,6 @@ "wayHandling": 0 } ], - "roamingRenderings": [ - { - "#": "Website", - "question": { - "en": "Is there a (unofficial) website with more informations (e.g. topos)?", - "de": "Gibt es eine (inoffizielle) Website mit mehr Informationen (z.B. Topos)?", - "ja": "もっと情報のある(非公式の)ウェブサイトはありますか(例えば、topos)?", - "nl": "Is er een (onofficiële) website met meer informatie (b.v. met topos)?", - "ru": "Есть ли (неофициальный) веб-сайт с более подробной информацией (напр., topos)?", - "fr": "Existe-t’il un site avec plus d’informations (ex : topographie) ?" - }, - "condition": { - "and": [ - "leisure!~sports_centre", - "sport=climbing", - "office=", - "club=" - ] - }, - "render": "{url}", - "freeform": { - "key": "url", - "type": "url" - } - }, - { - "#": "Access from containing feature", - "mappings": [ - { - "if": "_embedding_feature:access=yes", - "then": { - "en": "The containing feature states that this is publicly accessible
{_embedding_feature:access:description}", - "nl": "Een omvattend element geeft aan dat dit publiek toegangkelijk is
{_embedding_feature:access:description}", - "fr": "L’élément englobant indique un accès libre
{_embedding_feature:access:description}" - } - }, - { - "if": "_embedding_feature:access=permit", - "then": { - "en": "The containing feature states that a permit is needed to access
{_embedding_feature:access:description}", - "nl": "Een omvattend element geeft aan dat een toelating nodig is om hier te klimmen
{_embedding_feature:access:description}", - "fr": "L’élément englobant indique qu’ une autorisation d’accès est nécessaire
{_embedding_feature:access:description}" - } - }, - { - "if": "_embedding_feature:access=customers", - "then": { - "en": "The containing feature states that this is only accessible to customers
{_embedding_feature:access:description}", - "fr": "L’élément englobant indique que l’accès est réservés aux clients
{_embedding_feature:access:description}" - } - }, - { - "if": "_embedding_feature:access=members", - "then": { - "en": "The containing feature states that this is only accessible to club members
{_embedding_feature:access:description}", - "fr": "L’élément englobant indique que l’accès est réservé aux membres
{_embedding_feature:access:description}" - } - }, - { - "if": "_embedding_feature:access=no", - "then": "Not accessible as stated by the containing feature" - } - ], - "condition": "_embedding_feature:access~*" - }, - { - "#": "Access", - "question": { - "en": "Who can access here?", - "fr": "Qui peut y accéder ?", - "de": "Wer hat hier Zugang?" - }, - "mappings": [ - { - "if": "access=yes", - "then": { - "en": "Publicly accessible to anyone", - "fr": "Libre d’accès", - "de": "Öffentlich zugänglich für jedermann" - } - }, - { - "if": "access=permit", - "then": { - "en": "You need a permit to access here", - "fr": "Une autorisation est nécessaire", - "de": "Zugang nur mit Genehmigung" - } - }, - { - "if": "access=customers", - "then": { - "en": "Only custumers", - "fr": "Réservé aux clients", - "de": "Nur für Kunden" - } - }, - { - "if": "access=members", - "then": { - "en": "Only club members", - "ru": "Только членам клуба", - "fr": "Réservé aux membres", - "de": "Nur für Vereinsmitglieder" - } - }, - { - "if": "access=no", - "then": "Not accessible" - } - ], - "condition": { - "and": [ - "climbing!=no", - "office=", - "club=", - { - "or": [ - "sport=climbing", - "climbing:sport=yes" - ] - }, - { - "or": [ - "access~*", - "_embedding_feature:access=" - ] - } - ] - } - }, - { - "#": "Access description (without _embedding_feature:access:description)", - "render": "{access:description}", - "freeform": { - "key": "access:description" - } - }, - { - "#": "Avg length?", - "render": { - "de": "Die Routen sind durchschnittlich {canonical(climbing:length)} lang", - "en": "The routes are {canonical(climbing:length)} long on average", - "nl": "De klimroutes zijn gemiddeld {canonical(climbing:length)} lang", - "ja": "ルートの長さは平均で{canonical(climbing:length)}です", - "fr": "Les voies font {canonical(climbing:length)} de long en moyenne" - }, - "condition": { - "and": [ - "climbing!~route", - "office=", - "club=", - "climbing:toprope!=no", - { - "or": [ - "sport=climbing", - "climbing:sport=yes", - "climbing=traditional", - "climbing=gym" - ] - } - ] - }, - "question": { - "de": "Wie lang sind die Routen (durchschnittlich) in Metern?", - "en": "What is the (average) length of the routes in meters?", - "nl": "Wat is de (gemiddelde) lengte van de klimroutes, in meter?", - "ja": "ルートの(平均)長さはメートル単位でいくつですか?", - "fr": "Quelle est la longueur moyenne des voies en mètres ?" - }, - "freeform": { - "key": "climbing:length", - "type": "pnat" - } - }, - { - "#": "Difficulty-min", - "question": { - "de": "Welche Schwierigkeit hat hier die leichteste Route (französisch/belgisches System)?", - "en": "What is the level of the easiest route here, accoring to the french classification system?", - "nl": "Wat is het niveau van de makkelijkste route, volgens het Franse classificatiesysteem?", - "ja": "ここで一番簡単なルートのレベルは、フランスのランク評価システムで何ですか?", - "fr": "Quel est le niveau de la voie la plus simple selon la classification franco-belge ?" - }, - "render": { - "de": "Die leichteste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)", - "en": "The minimal difficulty is {climbing:grade:french:min} according to the french/belgian system", - "nl": "De minimale klimmoeilijkheid is {climbing:grade:french:min} volgens het Franse/Belgische systeem", - "ja": "フランス/ベルギーのランク評価システムでは、最小の難易度は{climbing:grade:french:min}です", - "fr": "La difficulté minimale est {climbing:grade:french:min} selon la classification franco-belge" - }, - "freeform": { - "key": "climbing:grade:french:min" - }, - "condition": { - "and": [ - "climbing!~route", - "office=", - "club=", - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - } - ] - } - }, - { - "#": "Difficulty-max", - "question": { - "de": "Welche Schwierigkeit hat hier die schwerste Route (französisch/belgisches System)?", - "en": "What is the level of the most difficult route here, accoring to the french classification system?", - "nl": "Wat is het niveau van de moeilijkste route, volgens het Franse classificatiesysteem?", - "ja": "フランスのランク評価によると、ここで一番難しいルートのレベルはどれくらいですか?", - "fr": "Quel est le niveau de la voie la plus difficile selon la classification franco-belge ?" - }, - "render": { - "de": "Die schwerste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)", - "en": "The maximal difficulty is {climbing:grade:french:max} according to the french/belgian system", - "nl": "De maximale klimmoeilijkheid is {climbing:grade:french:max} volgens het Franse/Belgische systeem", - "ja": "フランス/ベルギーのランク評価システムでは、最大の難易度は{climbing:grade:french:max}です", - "fr": "La difficulté maximale est {climbing:grade:french:max} selon la classification franco-belge" - }, - "freeform": { - "key": "climbing:grade:french:max" - }, - "condition": { - "and": [ - "climbing!~route", - "office=", - "club=", - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - } - ] - } - }, - { - "#": "Boldering?", - "question": { - "de": "Kann hier gebouldert werden?", - "en": "Is bouldering possible here?", - "nl": "Is het mogelijk om hier te bolderen?", - "ja": "ここでボルダリングはできますか?", - "nb_NO": "Er buldring mulig her?", - "fr": "L’escalade de bloc est-elle possible ici ?" - }, - "mappings": [ - { - "if": "climbing:boulder=yes", - "then": { - "de": "Hier kann gebouldert werden", - "en": "Bouldering is possible here", - "nl": "Bolderen kan hier", - "ja": "ボルダリングはここで可能です", - "nb_NO": "Buldring er mulig her", - "fr": "L’escalade de bloc est possible" - } - }, - { - "if": "climbing:boulder=no", - "then": { - "de": "Hier kann nicht gebouldert werden", - "en": "Bouldering is not possible here", - "nl": "Bolderen kan hier niet", - "ja": "ここではボルダリングはできません", - "nb_NO": "Buldring er ikke mulig her", - "fr": "L’escalade de bloc n’est pas possible" - } - }, - { - "if": "climbing:boulder=limited", - "then": { - "de": "Bouldern ist hier nur an wenigen Routen möglich", - "en": "Bouldering is possible, allthough there are only a few routes", - "nl": "Bolderen kan hier, maar er zijn niet zoveel routes", - "ja": "ボルダリングは可能ですが、少しのルートしかありません", - "fr": "L’escalade de bloc est possible sur des voies précises" - } - }, - { - "if": "climbing:boulder~*", - "then": { - "de": "Hier gibt es {climbing:boulder} Boulder-Routen", - "en": "There are {climbing:boulder} boulder routes", - "nl": "Er zijn hier {climbing:boulder} bolderroutes", - "ja": "{climbing:boulder} ボルダールートがある", - "fr": "Il y a {climbing:boulder} voies d’escalade de bloc" - }, - "hideInAnswer": true - } - ], - "condition": { - "and": [ - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - }, - "office=", - "club=" - ] - } - }, - { - "#": "Toproping?", - "question": { - "de": "Ist Toprope-Klettern hier möglich?", - "en": "Is toprope climbing possible here?", - "nl": "Is het mogelijk om hier te toprope-klimmen?", - "ja": "ここでtoprope登坂はできますか?", - "fr": "Est-il possible d’escalader à la moulinette ?" - }, - "mappings": [ - { - "if": "climbing:toprope=yes", - "then": { - "de": "Toprope-Klettern ist hier möglich", - "en": "Toprope climbing is possible here", - "nl": "Toprope-klimmen kan hier", - "ja": "ここでToprope登坂ができます", - "fr": "L’escalade à la moulinette est possible" - } - }, - { - "if": "climbing:toprope=no", - "then": { - "de": "Toprope-Climbing ist hier nicht möglich", - "en": "Toprope climbing is not possible here", - "nl": "Toprope-klimmen kan hier niet", - "ja": "ここではToprope登坂はできません", - "fr": "L’escalade à la moulinette n’est pas possible" - } - }, - { - "if": "climbing:toprope~*", - "then": { - "de": "Hier gibt es {climbing:toprope} Toprope-Routen", - "en": "There are {climbing:toprope} toprope routes", - "nl": "Er zijn hier {climbing:toprope} toprope routes", - "ja": "{climbing:toprope} 登坂ルートがある", - "fr": "{climbing:toprope} voies sont équipées de moulinettes" - }, - "hideInAnswer": true - } - ], - "condition": { - "and": [ - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - }, - "office=", - "club=" - ] - } - }, - { - "#": "Sportclimbing?", - "question": { - "de": "Ist hier Sportklettern möglich (feste Ankerpunkte)?", - "en": "Is sport climbing possible here on fixed anchors?", - "nl": "Is het mogelijk om hier te sportklimmen/voorklimmen op reeds aangebrachte haken?", - "ja": "ここでは固定アンカー式のスポーツクライミングはできますか?" - }, - "mappings": [ - { - "if": "climbing:sport=yes", - "then": { - "de": "Sportklettern ist hier möglich", - "en": "Sport climbing is possible here", - "nl": "Sportklimmen/voorklimmen kan hier", - "ru": "Здесь можно заняться спортивным скалолазанием", - "ja": "ここでスポーツクライミングができます" - } - }, - { - "if": "climbing:sport=no", - "then": { - "de": "Sportklettern ist hier nicht möglich", - "en": "Sport climbing is not possible here", - "nl": "Sportklimmen/voorklimmen kan hier niet", - "ru": "Спортивное скалолазание здесь невозможно", - "ja": "ここではスポーツクライミングはできません" - } - }, - { - "if": "climbing:sport~*", - "then": { - "de": "Hier gibt es {climbing:sport} Sportkletter-Routen", - "en": "There are {climbing:sport} sport climbing routes", - "nl": "Er zijn hier {climbing:sport} sportklimroutes/voorklimroutes", - "ja": "スポーツクライミングの {climbing:sport} ルートがある" - }, - "hideInAnswer": true - } - ], - "condition": { - "and": [ - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - }, - "office=", - "club=" - ] - } - }, - { - "#": "Traditional climbing?", - "question": { - "de": "Ist hier traditionelles Klettern möglich (eigene Sicherung z.B. mit Klemmkleilen)?", - "en": "Is traditional climbing possible here (using own gear e.g. chocks)?", - "nl": "Is het mogelijk om hier traditioneel te klimmen?
(Dit is klimmen met klemblokjes en friends)", - "ja": "伝統的な登山はここで可能ですか(例えば、チョックのような独自のギアを使用して)？" - }, - "mappings": [ - { - "if": "climbing:traditional=yes", - "then": { - "de": "Traditionelles Klettern ist hier möglich", - "en": "Traditional climbing is possible here", - "nl": "Traditioneel klimmen kan hier", - "ja": "ここでは伝統的な登山が可能です" - } - }, - { - "if": "climbing:traditional=no", - "then": { - "de": "Traditionelles Klettern ist hier nicht möglich", - "en": "Traditional climbing is not possible here", - "nl": "Traditioneel klimmen kan hier niet", - "ja": "伝統的な登山はここではできない" - } - }, - { - "if": "climbing:traditional~*", - "then": { - "de": "Hier gibt es {climbing:traditional} Routen für traditionelles Klettern", - "en": "There are {climbing:traditional} traditional climbing routes", - "nl": "Er zijn hier {climbing:traditional} traditionele klimroutes", - "ja": "{climbing:traditional} の伝統的な登山ルートがある" - }, - "hideInAnswer": true - } - ], - "condition": { - "and": [ - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - }, - "office=", - "club=" - ] - } - }, - { - "#": "Speed climbing?", - "question": { - "de": "Gibt es hier eine Speedkletter-Wand?", - "en": "Is there a speed climbing wall?", - "nl": "Is er een snelklimmuur (speed climbing)?", - "ja": "スピードクライミングウォールはありますか?" - }, - "condition": { - "and": [ - "leisure=sports_centre", - { - "or": [ - "climbing:sport=yes", - "sport=climbing" - ] - }, - "office=", - "club=" - ] - }, - "mappings": [ - { - "if": "climbing:speed=yes", - "then": { - "de": "Hier gibt es eine Speedkletter-Wand", - "en": "There is a speed climbing wall", - "nl": "Er is een snelklimmuur voor speed climbing", - "ja": "スピードクライミングウォールがある" - } - }, - { - "if": "climbing:speed=no", - "then": { - "de": "Hier gibt es keine Speedkletter-Wand", - "en": "There is no speed climbing wall", - "nl": "Er is geen snelklimmuur voor speed climbing", - "ja": "スピードクライミングウォールがない" - } - }, - { - "if": "climbing:speed~*", - "then": { - "de": "Hier gibt es {climbing:speed} Speedkletter-Routen", - "en": "There are {climbing:speed} speed climbing walls", - "nl": "Er zijn hier {climbing:speed} snelklimmuren", - "ja": "{climbing:speed} のスピードクライミングウォールがある" - }, - "hideInAnswer": true - } - ] - } - ], "overrideAll": { "titleIcons": [ { @@ -1524,6 +1007,527 @@ } ] } + ], + "tagRenderings+": [ + { + "id": "Website", + "question": { + "en": "Is there a (unofficial) website with more informations (e.g. topos)?", + "de": "Gibt es eine (inoffizielle) Website mit mehr Informationen (z.B. Topos)?", + "ja": "もっと情報のある(非公式の)ウェブサイトはありますか(例えば、topos)?", + "nl": "Is er een (onofficiële) website met meer informatie (b.v. met topos)?", + "ru": "Есть ли (неофициальный) веб-сайт с более подробной информацией (напр., topos)?", + "fr": "Existe-t’il un site avec plus d’informations (ex : topographie) ?" + }, + "condition": { + "and": [ + "leisure!~sports_centre", + "sport=climbing", + "office=", + "club=" + ] + }, + "render": "{url}", + "freeform": { + "key": "url", + "type": "url" + } + }, + { + "id": "Access from containing feature", + "mappings": [ + { + "if": "_embedding_feature:access=yes", + "then": { + "en": "The containing feature states that this is publicly accessible
{_embedding_feature:access:description}", + "nl": "Een omvattend element geeft aan dat dit publiek toegangkelijk is
{_embedding_feature:access:description}", + "fr": "L’élément englobant indique un accès libre
{_embedding_feature:access:description}" + } + }, + { + "if": "_embedding_feature:access=permit", + "then": { + "en": "The containing feature states that a permit is needed to access
{_embedding_feature:access:description}", + "nl": "Een omvattend element geeft aan dat een toelating nodig is om hier te klimmen
{_embedding_feature:access:description}", + "fr": "L’élément englobant indique qu’ une autorisation d’accès est nécessaire
{_embedding_feature:access:description}" + } + }, + { + "if": "_embedding_feature:access=customers", + "then": { + "en": "The containing feature states that this is only accessible to customers
{_embedding_feature:access:description}", + "fr": "L’élément englobant indique que l’accès est réservés aux clients
{_embedding_feature:access:description}" + } + }, + { + "if": "_embedding_feature:access=members", + "then": { + "en": "The containing feature states that this is only accessible to club members
{_embedding_feature:access:description}", + "fr": "L’élément englobant indique que l’accès est réservé aux membres
{_embedding_feature:access:description}" + } + }, + { + "if": "_embedding_feature:access=no", + "then": "Not accessible as stated by the containing feature" + } + ], + "condition": "_embedding_feature:access~*" + }, + { + "id": "Access", + "question": { + "en": "Who can access here?", + "fr": "Qui peut y accéder ?", + "de": "Wer hat hier Zugang?" + }, + "mappings": [ + { + "if": "access=yes", + "then": { + "en": "Publicly accessible to anyone", + "fr": "Libre d’accès", + "de": "Öffentlich zugänglich für jedermann" + } + }, + { + "if": "access=permit", + "then": { + "en": "You need a permit to access here", + "fr": "Une autorisation est nécessaire", + "de": "Zugang nur mit Genehmigung" + } + }, + { + "if": "access=customers", + "then": { + "en": "Only custumers", + "fr": "Réservé aux clients", + "de": "Nur für Kunden" + } + }, + { + "if": "access=members", + "then": { + "en": "Only club members", + "ru": "Только членам клуба", + "fr": "Réservé aux membres", + "de": "Nur für Vereinsmitglieder" + } + }, + { + "if": "access=no", + "then": "Not accessible" + } + ], + "condition": { + "and": [ + "climbing!=no", + "office=", + "club=", + { + "or": [ + "sport=climbing", + "climbing:sport=yes" + ] + }, + { + "or": [ + "access~*", + "_embedding_feature:access=" + ] + } + ] + } + }, + { + "id": "Access description (without _embedding_feature:access:description)", + "render": "{access:description}", + "freeform": { + "key": "access:description" + } + }, + { + "id": "Avg length?", + "render": { + "de": "Die Routen sind durchschnittlich {canonical(climbing:length)} lang", + "en": "The routes are {canonical(climbing:length)} long on average", + "nl": "De klimroutes zijn gemiddeld {canonical(climbing:length)} lang", + "ja": "ルートの長さは平均で{canonical(climbing:length)}です", + "fr": "Les voies font {canonical(climbing:length)} de long en moyenne" + }, + "condition": { + "and": [ + "climbing!~route", + "office=", + "club=", + "climbing:toprope!=no", + { + "or": [ + "sport=climbing", + "climbing:sport=yes", + "climbing=traditional", + "climbing=gym" + ] + } + ] + }, + "question": { + "de": "Wie lang sind die Routen (durchschnittlich) in Metern?", + "en": "What is the (average) length of the routes in meters?", + "nl": "Wat is de (gemiddelde) lengte van de klimroutes, in meter?", + "ja": "ルートの(平均)長さはメートル単位でいくつですか?", + "fr": "Quelle est la longueur moyenne des voies en mètres ?" + }, + "freeform": { + "key": "climbing:length", + "type": "pnat" + } + }, + { + "id": "Difficulty-min", + "question": { + "de": "Welche Schwierigkeit hat hier die leichteste Route (französisch/belgisches System)?", + "en": "What is the level of the easiest route here, accoring to the french classification system?", + "nl": "Wat is het niveau van de makkelijkste route, volgens het Franse classificatiesysteem?", + "ja": "ここで一番簡単なルートのレベルは、フランスのランク評価システムで何ですか?", + "fr": "Quel est le niveau de la voie la plus simple selon la classification franco-belge ?" + }, + "render": { + "de": "Die leichteste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)", + "en": "The minimal difficulty is {climbing:grade:french:min} according to the french/belgian system", + "nl": "De minimale klimmoeilijkheid is {climbing:grade:french:min} volgens het Franse/Belgische systeem", + "ja": "フランス/ベルギーのランク評価システムでは、最小の難易度は{climbing:grade:french:min}です", + "fr": "La difficulté minimale est {climbing:grade:french:min} selon la classification franco-belge" + }, + "freeform": { + "key": "climbing:grade:french:min" + }, + "condition": { + "and": [ + "climbing!~route", + "office=", + "club=", + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + } + ] + } + }, + { + "id": "Difficulty-max", + "question": { + "de": "Welche Schwierigkeit hat hier die schwerste Route (französisch/belgisches System)?", + "en": "What is the level of the most difficult route here, accoring to the french classification system?", + "nl": "Wat is het niveau van de moeilijkste route, volgens het Franse classificatiesysteem?", + "ja": "フランスのランク評価によると、ここで一番難しいルートのレベルはどれくらいですか?", + "fr": "Quel est le niveau de la voie la plus difficile selon la classification franco-belge ?" + }, + "render": { + "de": "Die schwerste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)", + "en": "The maximal difficulty is {climbing:grade:french:max} according to the french/belgian system", + "nl": "De maximale klimmoeilijkheid is {climbing:grade:french:max} volgens het Franse/Belgische systeem", + "ja": "フランス/ベルギーのランク評価システムでは、最大の難易度は{climbing:grade:french:max}です", + "fr": "La difficulté maximale est {climbing:grade:french:max} selon la classification franco-belge" + }, + "freeform": { + "key": "climbing:grade:french:max" + }, + "condition": { + "and": [ + "climbing!~route", + "office=", + "club=", + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + } + ] + } + }, + { + "id": "Boldering?", + "question": { + "de": "Kann hier gebouldert werden?", + "en": "Is bouldering possible here?", + "nl": "Is het mogelijk om hier te bolderen?", + "ja": "ここでボルダリングはできますか?", + "nb_NO": "Er buldring mulig her?", + "fr": "L’escalade de bloc est-elle possible ici ?" + }, + "mappings": [ + { + "if": "climbing:boulder=yes", + "then": { + "de": "Hier kann gebouldert werden", + "en": "Bouldering is possible here", + "nl": "Bolderen kan hier", + "ja": "ボルダリングはここで可能です", + "nb_NO": "Buldring er mulig her", + "fr": "L’escalade de bloc est possible" + } + }, + { + "if": "climbing:boulder=no", + "then": { + "de": "Hier kann nicht gebouldert werden", + "en": "Bouldering is not possible here", + "nl": "Bolderen kan hier niet", + "ja": "ここではボルダリングはできません", + "nb_NO": "Buldring er ikke mulig her", + "fr": "L’escalade de bloc n’est pas possible" + } + }, + { + "if": "climbing:boulder=limited", + "then": { + "de": "Bouldern ist hier nur an wenigen Routen möglich", + "en": "Bouldering is possible, allthough there are only a few routes", + "nl": "Bolderen kan hier, maar er zijn niet zoveel routes", + "ja": "ボルダリングは可能ですが、少しのルートしかありません", + "fr": "L’escalade de bloc est possible sur des voies précises" + } + }, + { + "if": "climbing:boulder~*", + "then": { + "de": "Hier gibt es {climbing:boulder} Boulder-Routen", + "en": "There are {climbing:boulder} boulder routes", + "nl": "Er zijn hier {climbing:boulder} bolderroutes", + "ja": "{climbing:boulder} ボルダールートがある", + "fr": "Il y a {climbing:boulder} voies d’escalade de bloc" + }, + "hideInAnswer": true + } + ], + "condition": { + "and": [ + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + }, + "office=", + "club=" + ] + } + }, + { + "id": "Toproping?", + "question": { + "de": "Ist Toprope-Klettern hier möglich?", + "en": "Is toprope climbing possible here?", + "nl": "Is het mogelijk om hier te toprope-klimmen?", + "ja": "ここでtoprope登坂はできますか?", + "fr": "Est-il possible d’escalader à la moulinette ?" + }, + "mappings": [ + { + "if": "climbing:toprope=yes", + "then": { + "de": "Toprope-Klettern ist hier möglich", + "en": "Toprope climbing is possible here", + "nl": "Toprope-klimmen kan hier", + "ja": "ここでToprope登坂ができます", + "fr": "L’escalade à la moulinette est possible" + } + }, + { + "if": "climbing:toprope=no", + "then": { + "de": "Toprope-Climbing ist hier nicht möglich", + "en": "Toprope climbing is not possible here", + "nl": "Toprope-klimmen kan hier niet", + "ja": "ここではToprope登坂はできません", + "fr": "L’escalade à la moulinette n’est pas possible" + } + }, + { + "if": "climbing:toprope~*", + "then": { + "de": "Hier gibt es {climbing:toprope} Toprope-Routen", + "en": "There are {climbing:toprope} toprope routes", + "nl": "Er zijn hier {climbing:toprope} toprope routes", + "ja": "{climbing:toprope} 登坂ルートがある", + "fr": "{climbing:toprope} voies sont équipées de moulinettes" + }, + "hideInAnswer": true + } + ], + "condition": { + "and": [ + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + }, + "office=", + "club=" + ] + } + }, + { + "id": "Sportclimbing?", + "question": { + "de": "Ist hier Sportklettern möglich (feste Ankerpunkte)?", + "en": "Is sport climbing possible here on fixed anchors?", + "nl": "Is het mogelijk om hier te sportklimmen/voorklimmen op reeds aangebrachte haken?", + "ja": "ここでは固定アンカー式のスポーツクライミングはできますか?" + }, + "mappings": [ + { + "if": "climbing:sport=yes", + "then": { + "de": "Sportklettern ist hier möglich", + "en": "Sport climbing is possible here", + "nl": "Sportklimmen/voorklimmen kan hier", + "ru": "Здесь можно заняться спортивным скалолазанием", + "ja": "ここでスポーツクライミングができます" + } + }, + { + "if": "climbing:sport=no", + "then": { + "de": "Sportklettern ist hier nicht möglich", + "en": "Sport climbing is not possible here", + "nl": "Sportklimmen/voorklimmen kan hier niet", + "ru": "Спортивное скалолазание здесь невозможно", + "ja": "ここではスポーツクライミングはできません" + } + }, + { + "if": "climbing:sport~*", + "then": { + "de": "Hier gibt es {climbing:sport} Sportkletter-Routen", + "en": "There are {climbing:sport} sport climbing routes", + "nl": "Er zijn hier {climbing:sport} sportklimroutes/voorklimroutes", + "ja": "スポーツクライミングの {climbing:sport} ルートがある" + }, + "hideInAnswer": true + } + ], + "condition": { + "and": [ + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + }, + "office=", + "club=" + ] + } + }, + { + "id": "Traditional climbing?", + "question": { + "de": "Ist hier traditionelles Klettern möglich (eigene Sicherung z.B. mit Klemmkleilen)?", + "en": "Is traditional climbing possible here (using own gear e.g. chocks)?", + "nl": "Is het mogelijk om hier traditioneel te klimmen?
(Dit is klimmen met klemblokjes en friends)", + "ja": "伝統的な登山はここで可能ですか(例えば、チョックのような独自のギアを使用して)？" + }, + "mappings": [ + { + "if": "climbing:traditional=yes", + "then": { + "de": "Traditionelles Klettern ist hier möglich", + "en": "Traditional climbing is possible here", + "nl": "Traditioneel klimmen kan hier", + "ja": "ここでは伝統的な登山が可能です" + } + }, + { + "if": "climbing:traditional=no", + "then": { + "de": "Traditionelles Klettern ist hier nicht möglich", + "en": "Traditional climbing is not possible here", + "nl": "Traditioneel klimmen kan hier niet", + "ja": "伝統的な登山はここではできない" + } + }, + { + "if": "climbing:traditional~*", + "then": { + "de": "Hier gibt es {climbing:traditional} Routen für traditionelles Klettern", + "en": "There are {climbing:traditional} traditional climbing routes", + "nl": "Er zijn hier {climbing:traditional} traditionele klimroutes", + "ja": "{climbing:traditional} の伝統的な登山ルートがある" + }, + "hideInAnswer": true + } + ], + "condition": { + "and": [ + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + }, + "office=", + "club=" + ] + } + }, + { + "id": "Speed climbing?", + "question": { + "de": "Gibt es hier eine Speedkletter-Wand?", + "en": "Is there a speed climbing wall?", + "nl": "Is er een snelklimmuur (speed climbing)?", + "ja": "スピードクライミングウォールはありますか?" + }, + "condition": { + "and": [ + "leisure=sports_centre", + { + "or": [ + "climbing:sport=yes", + "sport=climbing" + ] + }, + "office=", + "club=" + ] + }, + "mappings": [ + { + "if": "climbing:speed=yes", + "then": { + "de": "Hier gibt es eine Speedkletter-Wand", + "en": "There is a speed climbing wall", + "nl": "Er is een snelklimmuur voor speed climbing", + "ja": "スピードクライミングウォールがある" + } + }, + { + "if": "climbing:speed=no", + "then": { + "de": "Hier gibt es keine Speedkletter-Wand", + "en": "There is no speed climbing wall", + "nl": "Er is geen snelklimmuur voor speed climbing", + "ja": "スピードクライミングウォールがない" + } + }, + { + "if": "climbing:speed~*", + "then": { + "de": "Hier gibt es {climbing:speed} Speedkletter-Routen", + "en": "There are {climbing:speed} speed climbing walls", + "nl": "Er zijn hier {climbing:speed} snelklimmuren", + "ja": "{climbing:speed} のスピードクライミングウォールがある" + }, + "hideInAnswer": true + } + ] + } ] } } \ No newline at end of file diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index 3392671981..9f332e1576 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -43,105 +43,6 @@ "maxZoom": 12, "minNeededElements": 200 }, - "roamingRenderings": [ - { - "question": { - "nl": "Is deze straat een fietsstraat?", - "en": "Is this street a cyclestreet?", - "ja": "この通りはcyclestreetですか?", - "nb_NO": "Er denne gaten en sykkelvei?", - "de": "Ist diese Straße eine Fahrradstraße?" - }, - "mappings": [ - { - "if": { - "and": [ - "cyclestreet=yes", - "maxspeed=30", - "overtaking:motor_vehicle=no", - "proposed:cyclestreet=" - ] - }, - "then": { - "nl": "Deze straat is een fietsstraat (en dus zone 30)", - "en": "This street is a cyclestreet (and has a speed limit of 30 km/h)", - "ja": "cyclestreet(最高速度は30km/h)", - "nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)", - "de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)" - } - }, - { - "if": { - "and": [ - "cyclestreet=yes", - "proposed:cyclestreet=" - ] - }, - "then": { - "nl": "Deze straat i een fietsstraat", - "en": "This street is a cyclestreet", - "ja": "この通りはcyclestreetだ", - "nb_NO": "Denne gaten er en sykkelvei", - "de": "Diese Straße ist eine Fahrradstraße" - }, - "hideInAnswer": true - }, - { - "if": { - "and": [ - "cyclestreet=", - "proposed:cyclestreet=yes" - ] - }, - "then": { - "nl": "Deze straat wordt binnenkort een fietsstraat", - "en": "This street will become a cyclstreet soon", - "ja": "この通りはまもなくcyclstreetになるだろう", - "nb_NO": "Denne gaten vil bli sykkelvei ganske snart", - "de": "Diese Straße wird bald eine Fahrradstraße sein" - } - }, - { - "if": { - "and": [ - "cyclestreet=", - "proposed:cyclestreet=", - "overtaking:motor_vehicle=" - ] - }, - "then": { - "nl": "Deze straat is geen fietsstraat", - "en": "This street is not a cyclestreet", - "ja": "この通りはcyclestreetではない", - "nb_NO": "Denne gaten er ikke en sykkelvei", - "it": "Questa strada non è una strada ciclabile", - "de": "Diese Straße ist keine Fahrradstraße" - } - } - ] - }, - { - "question": { - "nl": "Wanneer wordt deze straat een fietsstraat?", - "en": "When will this street become a cyclestreet?", - "ja": "この通りはいつcyclestreetになるんですか?", - "it": "Questa strada diventerà una strada ciclabile quando?", - "de": "Wann wird diese Straße eine Fahrradstraße?" - }, - "render": { - "nl": "Deze straat wordt fietsstraat op {cyclestreet:start_date}", - "en": "This street will become a cyclestreet at {cyclestreet:start_date}", - "ja": "この通りは{cyclestreet:start_date}に、cyclestreetになります", - "it": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}", - "de": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" - }, - "condition": "proposed:cyclestreet=yes", - "freeform": { - "type": "date", - "key": "cyclestreet:start_date" - } - } - ], "layers": [ { "id": "fietsstraat", @@ -304,6 +205,107 @@ } ], "overrideAll": { - "allowSplit": true + "allowSplit": true, + "tagRenderings+": [ + { + "id": "is_cyclestreet", + "question": { + "nl": "Is deze straat een fietsstraat?", + "en": "Is this street a cyclestreet?", + "ja": "この通りはcyclestreetですか?", + "nb_NO": "Er denne gaten en sykkelvei?", + "de": "Ist diese Straße eine Fahrradstraße?" + }, + "mappings": [ + { + "if": { + "and": [ + "cyclestreet=yes", + "maxspeed=30", + "overtaking:motor_vehicle=no", + "proposed:cyclestreet=" + ] + }, + "then": { + "nl": "Deze straat is een fietsstraat (en dus zone 30)", + "en": "This street is a cyclestreet (and has a speed limit of 30 km/h)", + "ja": "cyclestreet(最高速度は30km/h)", + "nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)", + "de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)" + } + }, + { + "if": { + "and": [ + "cyclestreet=yes", + "proposed:cyclestreet=" + ] + }, + "then": { + "nl": "Deze straat i een fietsstraat", + "en": "This street is a cyclestreet", + "ja": "この通りはcyclestreetだ", + "nb_NO": "Denne gaten er en sykkelvei", + "de": "Diese Straße ist eine Fahrradstraße" + }, + "hideInAnswer": true + }, + { + "if": { + "and": [ + "cyclestreet=", + "proposed:cyclestreet=yes" + ] + }, + "then": { + "nl": "Deze straat wordt binnenkort een fietsstraat", + "en": "This street will become a cyclstreet soon", + "ja": "この通りはまもなくcyclstreetになるだろう", + "nb_NO": "Denne gaten vil bli sykkelvei ganske snart", + "de": "Diese Straße wird bald eine Fahrradstraße sein" + } + }, + { + "if": { + "and": [ + "cyclestreet=", + "proposed:cyclestreet=", + "overtaking:motor_vehicle=" + ] + }, + "then": { + "nl": "Deze straat is geen fietsstraat", + "en": "This street is not a cyclestreet", + "ja": "この通りはcyclestreetではない", + "nb_NO": "Denne gaten er ikke en sykkelvei", + "it": "Questa strada non è una strada ciclabile", + "de": "Diese Straße ist keine Fahrradstraße" + } + } + ] + }, + { + "id": "future_cyclestreet", + "question": { + "nl": "Wanneer wordt deze straat een fietsstraat?", + "en": "When will this street become a cyclestreet?", + "ja": "この通りはいつcyclestreetになるんですか?", + "it": "Questa strada diventerà una strada ciclabile quando?", + "de": "Wann wird diese Straße eine Fahrradstraße?" + }, + "render": { + "nl": "Deze straat wordt fietsstraat op {cyclestreet:start_date}", + "en": "This street will become a cyclestreet at {cyclestreet:start_date}", + "ja": "この通りは{cyclestreet:start_date}に、cyclestreetになります", + "it": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}", + "de": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" + }, + "condition": "proposed:cyclestreet=yes", + "freeform": { + "type": "date", + "key": "cyclestreet:start_date" + } + } + ] } } \ No newline at end of file diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json index 47a6267368..490e4757b9 100644 --- a/assets/themes/cyclofix/cyclofix.json +++ b/assets/themes/cyclofix/cyclofix.json @@ -5,7 +5,7 @@ "nl": "Cyclofix - een open kaart voor fietsers", "fr": "Cyclofix - Une carte ouverte pour les cyclistes", "gl": "Cyclofix - Un mapa aberto para os ciclistas", - "de": "Cyclofix - eine offene Karte für Radfahrer", + "de": "Cyclofix - eine freie Karte für Radfahrer", "ru": "Cyclofix - открытая карта для велосипедистов", "ja": "Cyclofix - サイクリストのためのオープンマップ", "zh_Hant": "單車修正 - 單車騎士的開放地圖", @@ -16,7 +16,7 @@ "nl": "Het doel van deze kaart is om fietsers een gebruiksvriendelijke oplossing te bieden voor het vinden van de juiste infrastructuur voor hun behoeften.

U kunt uw exacte locatie volgen (enkel mobiel) en in de linkerbenedenhoek categorieën selecteren die voor u relevant zijn. U kunt deze tool ook gebruiken om 'spelden' aan de kaart toe te voegen of te bewerken en meer gegevens te verstrekken door de vragen te beantwoorden.

Alle wijzigingen die u maakt worden automatisch opgeslagen in de wereldwijde database van OpenStreetMap en kunnen door anderen vrij worden hergebruikt.

Bekijk voor meer info over cyclofix ook cyclofix.osm.be.", "fr": "Le but de cette carte est de présenter aux cyclistes une solution facile à utiliser pour trouver l'infrastructure appropriée à leurs besoins.

Vous pouvez suivre votre localisation précise (mobile uniquement) et sélectionner les couches qui vous concernent dans le coin inférieur gauche. Vous pouvez également utiliser cet outil pour ajouter ou modifier des épingles (points d'intérêt) sur la carte et fournir plus de données en répondant aux questions.

Toutes les modifications que vous apportez seront automatiquement enregistrées dans la base de données mondiale d'OpenStreetMap et peuvent être librement réutilisées par d'autres.

Pour plus d'informations sur le projet cyclofix, rendez-vous sur cyclofix.osm.be.", "gl": "O obxectivo deste mapa é amosar ós ciclistas unha solución doada de empregar para atopar a infraestrutura axeitada para as súas necesidades.

Podes obter a túa localización precisa (só para dispositivos móbiles) e escoller as capas que sexan relevantes para ti na esquina inferior esquerda. Tamén podes empregar esta ferramenta para engadir ou editar puntos de interese ó mapa e fornecer máis datos respondendo as cuestións.

Todas as modificacións que fagas serán gardadas de xeito automático na base de datos global do OpenStreetMap e outros poderán reutilizalos libremente.

Para máis información sobre o proxecto cyclofix, vai a cyclofix.osm.be.", - "de": "Das Ziel dieser Karte ist es, den Radfahrern eine einfach zu benutzende Lösung zu präsentieren, um die geeignete Infrastruktur für ihre Bedürfnisse zu finden.

Sie können Ihren genauen Standort verfolgen (nur mobil) und in der linken unteren Ecke die für Sie relevanten Ebenen auswählen. Sie können dieses Tool auch verwenden, um Pins (Points of Interest/Interessante Orte) zur Karte hinzuzufügen oder zu bearbeiten und mehr Daten durch Beantwortung der Fragen bereitstellen.

Alle Änderungen, die Sie vornehmen, werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei wiederverwendet werden.

Weitere Informationen über das Projekt Cyclofix finden Sie unter cyclofix.osm.be.", + "de": "Mit dieser Karte soll Radfahrern eine einfache Lösung bereitgestellt werden, um die passende Farradinfrastruktur zu finden.

Sie können Ihren genauen Standort verfolgen (nur mobil) und in der linken unteren Ecke die für Sie relevanten Ebenen auswählen. Sie können dieses Tool auch verwenden, um Pins (Points of Interest/Interessante Orte) zur Karte hinzuzufügen oder zu bearbeiten und mehr Daten durch Beantwortung der Fragen bereitstellen.

Ihre Änderungen, werden automatisch in der Datenbank von OpenStreetMap gespeichert und können von anderen frei verwendet werden.

Weitere Informationen über Cyclofix finden Sie unter cyclofix.osm.be.", "ja": "このマップの目的は、サイクリストのニーズに適した施設を見つけるための使いやすいソリューションを提供することです。

正確な位置を追跡し(モバイルのみ)、左下コーナーで関連するレイヤを選択できます。このツールを使用して、マップにピン(注目点)を追加または編集したり、質問に答えることでより多くのデータを提供することもできます。

変更内容はすべてOpenStreetMapのグローバルデータベースに自動的に保存され、他のユーザーが自由に再利用できます。

cyclofixプロジェクトの詳細については、 cyclofix.osm.be を参照してください。", "zh_Hant": "這份地圖的目的是為單車騎士能夠輕易顯示滿足他們需求的相關設施。

你可以追蹤你確切位置 (只有行動版)，以及在左下角選擇相關的圖層。你可以使用這工具在地圖新增或編輯釘子，以及透過回答問題來提供更多資訊。

所有你的變動都會自動存在開放街圖這全球資料圖，並且能被任何人自由取用。

你可以到 cyclofix.osm.be 閱讀更多資訊。", "it": "Questa mappa offre a chi va in bici una soluzione semplice per trovare tutte le infrastrutture di cui ha bisogno.

Puoi tracciare la tua posizione esatta (solo su mobile) e selezionare i livelli che ti interessano nell'angolo in basso a sinistra. Puoi anche usare questo strumento per aggiungere o modificare punti di interesse alla mappa e aggiungere nuove informazioni rispendendo alle domande.

Tutte le modifiche che apporterai saranno automaticamente salvate nel database mondiale di OpenStreetMap e potranno essere liberamente riutilizzate da tutti e tutte.

Per maggiori informazioni sul progetto ciclofix, visita cyclofix.osm.be." @@ -57,6 +57,5 @@ "bike_themed_object", "bike_cleaning", "bike_parking" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/drinking_water/drinking_water.json b/assets/themes/drinking_water/drinking_water.json index 819f0cfb89..9eda4b7f71 100644 --- a/assets/themes/drinking_water/drinking_water.json +++ b/assets/themes/drinking_water/drinking_water.json @@ -8,7 +8,7 @@ "ja": "飲料水", "zh_Hant": "飲用水", "it": "Acqua potabile", - "de": "Trinkwasser" + "de": "Trinkwasserstelle" }, "description": { "en": "On this map, publicly accessible drinking water spots are shown and can be easily added", @@ -18,7 +18,7 @@ "zh_Hant": "在這份地圖上，公共可及的飲水點可以顯示出來，也能輕易的增加", "it": "Questa mappa mostra tutti i luoghi in cui è disponibile acqua potabile ed è possibile aggiungerne di nuovi", "ru": "На этой карте показываются и могут быть легко добавлены общедоступные точки питьевой воды", - "de": "Auf dieser Karte sind öffentlich zugängliche Trinkwasserstellen eingezeichnet und können leicht hinzugefügt werden" + "de": "Eine Karte zum Anzeigen und Bearbeiten öffentlicher Trinkwasserstellen" }, "language": [ "en", @@ -40,6 +40,5 @@ "widenFactor": 2, "layers": [ "drinking_water" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/etymology.json b/assets/themes/etymology.json index 375cf5bf51..735f119de6 100644 --- a/assets/themes/etymology.json +++ b/assets/themes/etymology.json @@ -13,7 +13,7 @@ "description": { "en": "On this map, you can see what an object is named after. The streets, buildings, ... come from OpenStreetMap which got linked with Wikidata. In the popup, you'll see the Wikipedia article (if it exists) or a wikidata box of what the object is named after. If the object itself has a wikipedia page, that'll be shown too.

You can help contribute too!Zoom in enough and all streets will show up. You can click one and a Wikidata-search box will popup. With a few clicks, you can add an etymology link. Note that you need a free OpenStreetMap account to do this.", "nl": "Op deze kaart zie je waar een plaats naar is vernoemd. De straten, gebouwen, ... komen uit OpenStreetMap, waar een link naar Wikidata werd gelegd. In de popup zie je het Wikipedia-artikel van hetgeen naarwaar het vernoemd is of de Wikidata-box.

Je kan zelf ook meehelpen!Als je ver inzoomt, krijg je alle straten te zien. Klik je een straat aan, dan krijg je een zoekfunctie waarmee je snel een nieuwe link kan leggen. Je hebt hiervoor een gratis OpenStreetMap account nodig.", - "de": "Auf dieser Karte können Sie sehen, nach was ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, das mit Wikidata verknüpft wurde. Die Informationen stammen aus Wikipedia." + "de": "Auf dieser Karte können Sie sehen, wonach ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, das mit Wikidata verknüpft wurde. In dem Popup sehen Sie den Wikipedia-Artikel (falls vorhanden) oder ein Wikidata-Feld, nach dem das Objekt benannt ist. Wenn das Objekt selbst eine Wikipedia-Seite hat, wird auch diese angezeigt.

Sie können auch einen Beitrag leisten!Zoomen Sie genug hinein und alle Straßen werden angezeigt. Wenn Sie auf eine Straße klicken, öffnet sich ein Wikidata-Suchfeld. Mit ein paar Klicks können Sie einen Etymologie-Link hinzufügen. Beachten Sie, dass Sie dazu ein kostenloses OpenStreetMap-Konto benötigen." }, "language": [ "en", @@ -28,6 +28,10 @@ "startZoom": 1, "widenFactor": 2, "socialImage": "", + "clustering": { + "maxZoom": 14, + "minNeededElements": 250 + }, "layers": [ "etymology", { @@ -36,7 +40,8 @@ "id": "streets_without_etymology", "name": { "en": "Streets without etymology information", - "nl": "Straten zonder etymologische informatie" + "nl": "Straten zonder etymologische informatie", + "de": "Straßen ohne Informationen zur Namensherkunft" }, "minzoom": 18, "source": { @@ -56,7 +61,8 @@ "id": "parks_and_forests_without_etymology", "name": { "en": "Parks and forests without etymology information", - "nl": "Parken en bossen zonder etymologische informatie" + "nl": "Parken en bossen zonder etymologische informatie", + "de": "Parks und Waldflächen ohne Informationen zur Namensherkunft" }, "minzoom": 18, "source": { @@ -75,5 +81,5 @@ } } ], - "hideFromOverview": true + "hideFromOverview": false } \ No newline at end of file diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json index 526dd699cf..d9fc9ed62d 100644 --- a/assets/themes/facadegardens/facadegardens.json +++ b/assets/themes/facadegardens/facadegardens.json @@ -456,6 +456,5 @@ ], "wayHandling": 1 } - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json index 235a5f65a1..e74e38bec1 100644 --- a/assets/themes/fritures/fritures.json +++ b/assets/themes/fritures/fritures.json @@ -54,6 +54,5 @@ "filter": null } } - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json index 68ce79228d..9f9e84fab6 100644 --- a/assets/themes/fruit_trees/fruit_trees.json +++ b/assets/themes/fruit_trees/fruit_trees.json @@ -172,6 +172,5 @@ } ] } - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/ghostbikes/ghostbikes.json b/assets/themes/ghostbikes/ghostbikes.json index 7c9aec38bd..97c5806172 100644 --- a/assets/themes/ghostbikes/ghostbikes.json +++ b/assets/themes/ghostbikes/ghostbikes.json @@ -24,7 +24,7 @@ "title": { "en": "Ghost bikes", "nl": "Witte Fietsen", - "de": "Geisterrad", + "de": "Geisterräder", "ja": "ゴーストバイク", "nb_NO": "Spøkelsessykler", "zh_Hant": "幽靈單車", @@ -43,7 +43,7 @@ "description": { "en": "A ghost bike is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.

On this map, one can see all the ghost bikes which are known by OpenStreetMap. Is a ghost bike missing? Everyone can add or update information here - you only need to have a (free) OpenStreetMap account.", "nl": "Een Witte Fiets of Spookfiets is een aandenken aan een fietser die bij een verkeersongeval om het leven kwam. Het gaat om een fiets die volledig wit is geschilderd en in de buurt van het ongeval werd geinstalleerd.

Op deze kaart zie je alle witte fietsen die door OpenStreetMap gekend zijn. Ontbreekt er een Witte Fiets of wens je informatie aan te passen? Meld je dan aan met een (gratis) OpenStreetMap account.", - "de": "Ein Geisterrad ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt ist.

Auf dieser Karte kann man alle Geisterräder sehen, die OpenStreetMap kennt. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen lediglich einen (kostenlosen) OpenStreetMap-Account.", + "de": "Ein Geisterrad ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt ist.

Auf dieser Karte kann man alle Geisterräder sehen, die in OpenStreetMap eingetragen sind. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen lediglich einen (kostenlosen) OpenStreetMap-Account.", "ja": "ゴーストバイクは、交通事故で死亡したサイクリストを記念するもので、事故現場の近くに恒久的に置かれた白い自転車の形をしています。

このマップには、OpenStreetMapで知られているゴーストバイクがすべて表示されます。ゴーストバイクは行方不明ですか?誰でもここで情報の追加や更新ができます。必要なのは(無料の)OpenStreetMapアカウントだけです。", "zh_Hant": "幽靈單車是用來紀念死於交通事故的單車騎士，在事發地點附近放置白色單車。

在這份地圖上面，你可以看到所有在開放街圖已知的幽靈單車。有缺漏的幽靈單車嗎？所有人都可以在這邊新增或是更新資訊-只有你有(免費)開放街圖帳號。", "fr": "Les vélos fantômes sont des mémoriaux pour les cyclistes tuées sur la route, prenant la forme de vélos blancs placés à proximité des faits.

Cette carte indique leur emplacement à partir d’OpenStreetMap. Il est possible de contribuer aux informations ici, sous réserve d’avoir un compte OpenStreetMap (gratuit)." diff --git a/assets/themes/grb.json b/assets/themes/grb.json index a0f32cdc6e..9c62526175 100644 --- a/assets/themes/grb.json +++ b/assets/themes/grb.json @@ -19,7 +19,6 @@ "startLon": 3.231, "startZoom": 14, "widenFactor": 2, - "cacheTimeout": 3600, "socialImage": "", "layers": [ { @@ -29,6 +28,7 @@ }, "minzoom": 12, "source": { + "maxCacheAge": 0, "osmTags": { "and": [ "fixme~*", @@ -201,6 +201,5 @@ } ], "hideFromOverview": true, - "roamingRenderings": [], "defaultBackgroundId": "AGIVFlandersGRB" } \ No newline at end of file diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json index 3a94dbb1be..a46b53d12a 100644 --- a/assets/themes/hailhydrant/hailhydrant.json +++ b/assets/themes/hailhydrant/hailhydrant.json @@ -18,7 +18,8 @@ "en": "On this map you can find and update hydrants, fire stations, ambulance stations, and extinguishers in your favorite neighborhoods. \n\nYou can track your precise location (mobile only) and select layers that are relevant for you in the bottom left corner. You can also use this tool to add or edit pins (points of interest) to the map and provide additional details by answering available questions. \n\nAll changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others.", "ja": "このマップでは、お気に入りの近隣にある消火栓、消防署、救急ステーション、消火器を検索して更新できます。\n\n正確な位置を追跡し(モバイルのみ)、左下コーナーで関連するレイヤを選択できます。このツールを使用して、マップにピン(注視点)を追加または編集したり、利用可能な質問に答えることによって追加の詳細を提供することもできます。\n\nすべての変更は自動的にOpenStreetMapのグローバルデータベースに保存され、他のユーザが自由に再利用できます。", "zh_Hant": "在這份地圖上面你可以在你喜愛的社區尋找與更新消防栓、消防隊、急救站與滅火器。\n\n你可以追蹤確切位置 (只有行動版) 以及在左下角選擇與你相關的圖層。你也可以使用這工具新增或編輯地圖上的釘子 (興趣點)，以及透過回答一些問題提供額外的資訊。\n\n所有你做出的變動都會自動存到開放街圖這個全球資料庫，而且能自由讓其他人取用。", - "fr": "Sur cette carte on trouve et met à jour les bornes incendies, extincteurs, casernes de pompiers et ambulanciers dans son quartier.
Les options en haut à gauche permettent de localiser sa position (sur téléphone) et de filtrer les éléments. Il est possible d’utiliser cet outil pour ajouter et éditer les points d’intérêt de la carte et d’y ajouter des détails en répondant aux questions.
Toutes les modifications sont automatiquement enregistrées dans la base de données OpenStreetMap et peuvent êtres librement réutilisées par d’autres." + "fr": "Sur cette carte on trouve et met à jour les bornes incendies, extincteurs, casernes de pompiers et ambulanciers dans son quartier.
Les options en haut à gauche permettent de localiser sa position (sur téléphone) et de filtrer les éléments. Il est possible d’utiliser cet outil pour ajouter et éditer les points d’intérêt de la carte et d’y ajouter des détails en répondant aux questions.
Toutes les modifications sont automatiquement enregistrées dans la base de données OpenStreetMap et peuvent êtres librement réutilisées par d’autres.", + "de": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren. \n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen. \n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden." }, "language": [ "en", @@ -26,6 +27,7 @@ "zh_Hant", "ru", "fr", + "de", "nb_NO", "it", "id" @@ -47,7 +49,8 @@ "zh_Hant": "消防栓地圖", "nb_NO": "Kart over brannhydranter", "ru": "Карта пожарных гидрантов", - "fr": "Carte des bornes incendie" + "fr": "Carte des bornes incendie", + "de": "Karte der Hydranten" }, "minzoom": 14, "source": { @@ -63,7 +66,8 @@ "ru": "Гидрант", "ja": "消火栓", "nb_NO": "Brannhydrant", - "fr": "Bornes incendie" + "fr": "Bornes incendie", + "de": "Hydrant" } }, "description": { @@ -72,7 +76,8 @@ "zh_Hant": "顯示消防栓的地圖圖層。", "nb_NO": "Kartlag for å vise brannhydranter.", "ru": "Слой карты, отображающий пожарные гидранты.", - "fr": "Couche des bornes incendie." + "fr": "Couche des bornes incendie.", + "de": "Kartenebene zur Anzeige von Hydranten." }, "tagRenderings": [ { @@ -82,14 +87,16 @@ "ja": "消火栓の色は何色ですか?", "nb_NO": "Hvilken farge har brannhydranten?", "ru": "Какого цвета гидрант?", - "fr": "Quelle est la couleur de la borne ?" + "fr": "Quelle est la couleur de la borne ?", + "de": "Welche Farbe hat der Hydrant?" }, "render": { "en": "The hydrant color is {colour}", "ja": "消火栓の色は{color}です", "nb_NO": "Brannhydranter er {colour}", "ru": "Цвет гидранта {colour}", - "fr": "La borne est {colour}" + "fr": "La borne est {colour}", + "de": "Der Hydrant hat die Farbe {colour}" }, "freeform": { "key": "colour" @@ -105,7 +112,8 @@ "en": "The hydrant color is unknown.", "ja": "消火栓の色は不明です。", "ru": "Цвет гидранта не определён.", - "fr": "La borne est de couleur inconnue." + "fr": "La borne est de couleur inconnue.", + "de": "Die Farbe des Hydranten ist unbekannt." }, "hideInAnswer": true }, @@ -119,7 +127,8 @@ "en": "The hydrant color is yellow.", "ja": "消火栓の色は黄色です。", "ru": "Гидрант жёлтого цвета.", - "fr": "La borne est jaune." + "fr": "La borne est jaune.", + "de": "Die Farbe des Hydranten ist gelb." } }, { @@ -133,7 +142,8 @@ "ja": "消火栓の色は赤です。", "it": "L'idrante è rosso.", "ru": "Гидрант красного цвета.", - "fr": "La borne est rouge." + "fr": "La borne est rouge.", + "de": "Die Farbe des Hydranten ist rot." } } ] @@ -145,7 +155,8 @@ "ja": "どんな消火栓なんですか?", "it": "Di che tipo è questo idrante?", "ru": "К какому типу относится этот гидрант?", - "fr": "De quel type de borne s’agit-il ?" + "fr": "De quel type de borne s’agit-il ?", + "de": "Um welche Art von Hydrant handelt es sich?" }, "freeform": { "key": "fire_hydrant:type" @@ -155,7 +166,8 @@ "ru": " Тип гидранта: {fire_hydrant:type}", "ja": " 消火栓のタイプ:{fire_hydrant:type}", "it": " Tipo di idrante: {fire_hydrant:type}", - "fr": " Type de borne : {fire_hydrant:type}" + "fr": " Type de borne : {fire_hydrant:type}", + "de": " Hydranten-Typ: {fire_hydrant:type}" }, "mappings": [ { @@ -169,7 +181,8 @@ "ja": "消火栓の種類は不明です。", "it": "Il tipo di idrante è sconosciuto.", "ru": "Тип гидранта не определён.", - "fr": "La borne est de type inconnu." + "fr": "La borne est de type inconnu.", + "de": "Der Typ des Hydranten ist unbekannt." }, "hideInAnswer": true }, @@ -182,7 +195,8 @@ "then": { "en": " Pillar type.", "ja": " ピラー型。", - "fr": " Pilier." + "fr": " Pilier.", + "de": " Säulenart." } }, { @@ -194,7 +208,8 @@ "then": { "en": " Pipe type.", "ja": " パイプ型。", - "fr": " Tuyau." + "fr": " Tuyau.", + "de": " Rohrtyp." } }, { @@ -208,7 +223,8 @@ "id": " Jenis dinding.", "ru": " Тип стены.", "ja": " 壁型。", - "fr": " Mural." + "fr": " Mural.", + "de": " Wandtyp." } }, { @@ -220,7 +236,8 @@ "then": { "en": " Underground type.", "ja": "地下式。", - "fr": " Enterré." + "fr": " Enterré.", + "de": " Untergrundtyp." } } ] @@ -230,12 +247,14 @@ "question": { "en": "Update the lifecycle status of the hydrant.", "ja": "消火栓のライフサイクルステータスを更新します。", - "fr": "Mettre à jour l’état de la borne." + "fr": "Mettre à jour l’état de la borne.", + "de": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten." }, "render": { "en": "Lifecycle status", "ja": "ライフサイクルステータス", - "fr": "État" + "fr": "État", + "de": "Lebenszyklus-Status" }, "freeform": { "key": "disused:emergency" @@ -251,7 +270,8 @@ "en": "The hydrant is (fully or partially) working.", "ja": "消火栓は(完全にまたは部分的に)機能しています。", "ru": "Гидрант (полностью или частично) в рабочем состоянии.", - "fr": "La borne est en état, ou partiellement en état, de fonctionner." + "fr": "La borne est en état, ou partiellement en état, de fonctionner.", + "de": "Der Hydrant ist (ganz oder teilweise) in Betrieb." } }, { @@ -264,7 +284,8 @@ "then": { "en": "The hydrant is unavailable.", "ja": "消火栓は使用できません。", - "fr": "La borne est hors-service." + "fr": "La borne est hors-service.", + "de": "Der Hydrant ist nicht verfügbar." } }, { @@ -278,7 +299,8 @@ "en": "The hydrant has been removed.", "ja": "消火栓が撤去されました。", "ru": "Гидрант демонтирован.", - "fr": "La borne a été retirée." + "fr": "La borne a été retirée.", + "de": "Der Hydrant wurde entfernt." } } ] @@ -307,12 +329,14 @@ "ru": "Пожарный гидрант", "ja": "消火栓", "nb_NO": "Brannhydrant", - "fr": "Borne incendie" + "fr": "Borne incendie", + "de": "Löschwasser-Hydrant" }, "description": { "en": "A hydrant is a connection point where firefighters can tap water. It might be located underground.", "ja": "消火栓は消防士が水を汲み上げることができる接続点です。地下にあるかもしれません。", - "fr": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée." + "fr": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée.", + "de": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden." } } ], @@ -325,7 +349,8 @@ "ja": "消火器の地図です。", "nb_NO": "Kart over brannhydranter", "ru": "Карта огнетушителей.", - "fr": "Couche des extincteurs." + "fr": "Couche des extincteurs.", + "de": "Karte mit Feuerlöschern." }, "minzoom": 14, "source": { @@ -341,7 +366,8 @@ "ru": "Огнетушители", "ja": "消火器", "nb_NO": "Brannslokkere", - "fr": "Exctincteurs" + "fr": "Exctincteurs", + "de": "Feuerlöscher" } }, "description": { @@ -350,7 +376,8 @@ "zh_Hant": "顯示消防栓的地圖圖層。", "nb_NO": "Kartlag for å vise brannslokkere.", "ru": "Слой карты, отображающий огнетушители.", - "fr": "Couche des lances à incendie." + "fr": "Couche des lances à incendie.", + "de": "Kartenebene zur Anzeige von Hydranten." }, "tagRenderings": [ { @@ -359,13 +386,15 @@ "en": "Location: {location}", "ja": "場所:{location}", "ru": "Местоположение: {location}", - "fr": "Emplacement : {location}" + "fr": "Emplacement : {location}", + "de": "Standort: {location}" }, "question": { "en": "Where is it positioned?", "ja": "どこにあるんですか?", "ru": "Где это расположено?", - "fr": "Où est-elle positionnée ?" + "fr": "Où est-elle positionnée ?", + "de": "Wo befindet er sich?" }, "mappings": [ { @@ -378,7 +407,8 @@ "en": "Found indoors.", "ja": "屋内にある。", "ru": "Внутри.", - "fr": "Intérieur." + "fr": "Intérieur.", + "de": "Im Innenraum vorhanden." } }, { @@ -391,7 +421,8 @@ "en": "Found outdoors.", "ja": "屋外にある。", "ru": "Снаружи.", - "fr": "Extérieur." + "fr": "Extérieur.", + "de": "Im Außenraum vorhanden." } } ], @@ -423,13 +454,15 @@ "ja": "消火器", "nb_NO": "Brannslukker", "ru": "Огнетушитель", - "fr": "Extincteur" + "fr": "Extincteur", + "de": "Feuerlöscher" }, "description": { "en": "A fire extinguisher is a small, portable device used to stop a fire", "ja": "消火器は、火災を止めるために使用される小型で携帯可能な装置である", "ru": "Огнетушитель - небольшое переносное устройство для тушения огня", - "fr": "Un extincteur est un appareil portatif servant à éteindre un feu" + "fr": "Un extincteur est un appareil portatif servant à éteindre un feu", + "de": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen" } } ], @@ -443,7 +476,8 @@ "nb_NO": "Kart over brannstasjoner", "it": "Mappa delle caserme dei vigili del fuoco", "ru": "Карта пожарных частей", - "fr": "Couche des stations de pompiers" + "fr": "Couche des stations de pompiers", + "de": "Karte der Feuerwachen" }, "minzoom": 12, "source": { @@ -461,7 +495,8 @@ "ru": "Пожарная часть", "nb_NO": "Brannstasjon", "it": "Caserma dei vigili del fuoco", - "fr": "Station de pompiers" + "fr": "Station de pompiers", + "de": "Feuerwache" } }, "description": { @@ -469,7 +504,8 @@ "ja": "消防署を表示するためのマップレイヤ。", "it": "Livello che mostra le caserme dei vigili del fuoco.", "ru": "Слой карты, отображающий пожарные части.", - "fr": "Couche des stations de pompiers." + "fr": "Couche des stations de pompiers.", + "de": "Kartenebene zur Darstellung von Feuerwachen." }, "tagRenderings": [ { @@ -482,7 +518,8 @@ "ja": "この消防署の名前は何ですか?", "ru": "Как называется эта пожарная часть?", "it": "Come si chiama questa caserma dei vigili del fuoco?", - "fr": "Quel est le nom de la station ?" + "fr": "Quel est le nom de la station ?", + "de": "Wie lautet der Name dieser Feuerwache?" }, "render": { "en": "This station is called {name}.", @@ -649,12 +686,14 @@ "en": "Fire station", "ja": "消防署", "ru": "Пожарная часть", - "fr": "Caserne de pompiers" + "fr": "Caserne de pompiers", + "de": "Feuerwache" }, "description": { "en": "A fire station is a place where the fire trucks and firefighters are located when not in operation.", "ja": "消防署は、運転していないときに消防車や消防士がいる場所です。", - "fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions." + "fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions.", + "de": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind." } } ] @@ -854,7 +893,8 @@ "en": "Add an ambulance station to the map", "ja": "救急ステーション(消防署)をマップに追加する", "ru": "Добавить станцию скорой помощи на карту", - "fr": "Ajouter une station d’ambulances à la carte" + "fr": "Ajouter une station d’ambulances à la carte", + "de": "Eine Rettungsstation der Karte hinzufügen" } } ], diff --git a/assets/themes/maps/maps.json b/assets/themes/maps/maps.json index 52d757a9da..b14817ee69 100644 --- a/assets/themes/maps/maps.json +++ b/assets/themes/maps/maps.json @@ -6,7 +6,8 @@ "fr": "Carte des cartes", "ja": "マップのマップ", "zh_Hant": "地圖的地圖", - "ru": "Карта карт" + "ru": "Карта карт", + "de": "Eine Karte der Karten" }, "shortDescription": { "en": "This theme shows all (touristic) maps that OpenStreetMap knows of", @@ -28,7 +29,8 @@ "fr", "ja", "zh_Hant", - "ru" + "ru", + "de" ], "maintainer": "MapComplete", "icon": "./assets/themes/maps/logo.svg", @@ -40,6 +42,5 @@ "socialImage": "", "layers": [ "map" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/nature/nature.json b/assets/themes/nature/nature.json index 0f8004e2c0..edd29baf35 100644 --- a/assets/themes/nature/nature.json +++ b/assets/themes/nature/nature.json @@ -26,6 +26,5 @@ "map", "information_board", "nature_reserve" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json index ecbe8afe95..78866a9680 100644 --- a/assets/themes/natuurpunt/natuurpunt.json +++ b/assets/themes/natuurpunt/natuurpunt.json @@ -3,11 +3,13 @@ "customCss": "./assets/themes/natuurpunt/natuurpunt.css", "title": { "nl": "Natuurgebieden", - "en": "Nature Reserves" + "en": "Nature Reserves", + "de": "Naturschutzgebiete" }, "shortDescription": { "nl": "Deze kaart toont de natuurgebieden van Natuurpunt", - "en": "This map shows the nature reserves of Natuurpunt" + "en": "This map shows the nature reserves of Natuurpunt", + "de": "Diese Karte zeigt Naturschutzgebiete des flämischen Naturverbands Natuurpunt" }, "description": { "nl": "Op deze kaart vind je alle natuurgebieden die Natuurpunt ter beschikking stelt", @@ -15,7 +17,8 @@ }, "language": [ "nl", - "en" + "en", + "de" ], "mustHaveLanguage": [ "nl" diff --git a/assets/themes/observation_towers/observation_towers.json b/assets/themes/observation_towers/observation_towers.json index 3ab5a6b58f..20406a939b 100644 --- a/assets/themes/observation_towers/observation_towers.json +++ b/assets/themes/observation_towers/observation_towers.json @@ -2,19 +2,23 @@ "id": "observation_towers", "title": { "en": "Observation towers", - "nl": "Uitkijktorens" + "nl": "Uitkijktorens", + "de": "Aussichtstürme" }, "shortDescription": { "en": "Publicly accessible towers to enjoy the view", - "nl": "Publieke uitkijktorens om van het panorama te genieten" + "nl": "Publieke uitkijktorens om van het panorama te genieten", + "de": "Öffentlich zugänglicher Aussichtsturm" }, "description": { "nl": "Publieke uitkijktorens om van het panorama te genieten", - "en": "Publicly accessible towers to enjoy the view" + "en": "Publicly accessible towers to enjoy the view", + "de": "Öffentlich zugänglicher Aussichtsturm" }, "language": [ "en", - "nl" + "nl", + "de" ], "maintainer": "", "icon": "./assets/layers/observation_tower/Tower_observation.svg", diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json index a437a06bd2..04282bcaeb 100644 --- a/assets/themes/openwindpowermap/openwindpowermap.json +++ b/assets/themes/openwindpowermap/openwindpowermap.json @@ -2,17 +2,20 @@ "id": "openwindpowermap", "title": { "en": "OpenWindPowerMap", - "fr": "OpenWindPowerMap" + "fr": "OpenWindPowerMap", + "de": "OpenWindPowerMap" }, "maintainer": "Seppe Santens", "icon": "./assets/themes/openwindpowermap/wind_turbine.svg", "description": { "en": "A map for showing and editing wind turbines.", - "fr": "Une carte indiquant les éoliennes et permettant leur édition." + "fr": "Une carte indiquant les éoliennes et permettant leur édition.", + "de": "Eine Karte zum Anzeigen und Bearbeiten von Windkraftanlagen." }, "language": [ "en", "fr", + "de", "nl" ], "version": "2021-06-18", @@ -28,7 +31,8 @@ "name": { "en": "wind turbine", "nl": "windturbine", - "fr": "Éolienne" + "fr": "Éolienne", + "de": "Windrad" }, "source": { "osmTags": "generator:source=wind" @@ -39,7 +43,8 @@ "render": { "en": "wind turbine", "nl": "windturbine", - "fr": "éolienne" + "fr": "éolienne", + "de": "Windrad" }, "mappings": [ { @@ -147,7 +152,8 @@ "title": { "en": "wind turbine", "nl": "windturbine", - "fr": "Éolienne" + "fr": "Éolienne", + "de": "Windrad" } } ], @@ -166,7 +172,8 @@ "human": { "en": " megawatts", "nl": " megawatt", - "fr": " megawatts" + "fr": " megawatts", + "de": " Megawatt" } }, { @@ -178,7 +185,8 @@ "human": { "en": " kilowatts", "nl": " kilowatt", - "fr": " kilowatts" + "fr": " kilowatts", + "de": " Kilowatt" } }, { @@ -190,7 +198,8 @@ "human": { "en": " watts", "nl": " watt", - "fr": " watts" + "fr": " watts", + "de": " Watt" } }, { @@ -202,7 +211,8 @@ "human": { "en": " gigawatts", "nl": " gigawatt", - "fr": " gigawatts" + "fr": " gigawatts", + "de": " Gigawatt" } } ], @@ -222,7 +232,8 @@ "human": { "en": " meter", "nl": " meter", - "fr": " mètres" + "fr": " mètres", + "de": " Meter" } } ] diff --git a/assets/themes/parkings/parkings.json b/assets/themes/parkings/parkings.json index ca322052ce..ab62475175 100644 --- a/assets/themes/parkings/parkings.json +++ b/assets/themes/parkings/parkings.json @@ -2,19 +2,23 @@ "id": "parkings", "title": { "nl": "Parking", - "en": "Parking" + "en": "Parking", + "de": "Parken" }, "shortDescription": { "nl": "Deze kaart toont verschillende parkeerplekken", - "en": "This map shows different parking spots" + "en": "This map shows different parking spots", + "de": "Diese Karte zeigt Parkplätze" }, "description": { "nl": "Deze kaart toont verschillende parkeerplekken", - "en": "This map shows different parking spots" + "en": "This map shows different parking spots", + "de": "Diese Karte zeigt Parkplätze" }, "language": [ "nl", - "en" + "en", + "de" ], "maintainer": "", "icon": "./assets/themes/parkings/parkings.svg", @@ -26,6 +30,5 @@ "socialImage": "", "layers": [ "parking" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/personal/personal.json b/assets/themes/personal/personal.json index d0218d014e..4b88eefa53 100644 --- a/assets/themes/personal/personal.json +++ b/assets/themes/personal/personal.json @@ -46,6 +46,5 @@ "startZoom": 16, "widenFactor": 1.2, "overpassMaxZoom": 0, - "layers": [], - "roamingRenderings": [] + "layers": [] } \ No newline at end of file diff --git a/assets/themes/play_forests/play_forests.json b/assets/themes/play_forests/play_forests.json index 5c65a702a5..96aedcf5db 100644 --- a/assets/themes/play_forests/play_forests.json +++ b/assets/themes/play_forests/play_forests.json @@ -23,6 +23,5 @@ "socialImage": "", "layers": [ "play_forest" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/playgrounds/playgrounds.json b/assets/themes/playgrounds/playgrounds.json index 2908a88b47..b60c955753 100644 --- a/assets/themes/playgrounds/playgrounds.json +++ b/assets/themes/playgrounds/playgrounds.json @@ -6,7 +6,8 @@ "fr": "Aires de jeux", "ja": "遊び場", "zh_Hant": "遊樂場", - "ru": "Игровые площадки" + "ru": "Игровые площадки", + "de": "Spielpläzte" }, "shortDescription": { "nl": "Een kaart met speeltuinen", @@ -14,7 +15,8 @@ "fr": "Une carte des aires de jeux", "ja": "遊び場のある地図", "zh_Hant": "遊樂場的地圖", - "ru": "Карта игровых площадок" + "ru": "Карта игровых площадок", + "de": "Eine Karte mit Spielplätzen" }, "description": { "nl": "Op deze kaart vind je speeltuinen en kan je zelf meer informatie en foto's toevoegen", @@ -30,7 +32,8 @@ "fr", "ja", "zh_Hant", - "ru" + "ru", + "de" ], "maintainer": "", "icon": "./assets/themes/playgrounds/playground.svg", @@ -42,6 +45,5 @@ "socialImage": "", "layers": [ "playground" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json index d90c5a1c39..a6a30a3720 100644 --- a/assets/themes/postboxes/postboxes.json +++ b/assets/themes/postboxes/postboxes.json @@ -1,16 +1,19 @@ { "id": "postboxes", "title": { - "en": "Postbox and Post Office Map" + "en": "Postbox and Post Office Map", + "de": "Karte mit Briefkästen und Poststellen" }, "shortDescription": { - "en": "A map showing postboxes and post offices" + "en": "A map showing postboxes and post offices", + "de": "Eine Karte die Briefkästen und Poststellen anzeigt" }, "description": { "en": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. " }, "language": [ - "en" + "en", + "de" ], "maintainer": "", "icon": "./assets/themes/postboxes/postbox.svg", @@ -28,7 +31,8 @@ { "id": "postboxes", "name": { - "en": "Postboxes" + "en": "Postboxes", + "de": "Brieflästen" }, "minzoom": 12, "source": { @@ -36,11 +40,13 @@ }, "title": { "render": { - "en": "Postbox" + "en": "Postbox", + "de": "Briefkasten" } }, "description": { - "en": "The layer showing postboxes." + "en": "The layer showing postboxes.", + "de": "Die Ebene zeigt Briefkästen." }, "tagRenderings": [ "images", @@ -67,7 +73,8 @@ "amenity=post_box" ], "title": { - "en": "postbox" + "en": "postbox", + "de": "Briefkasten" } } ], @@ -84,7 +91,8 @@ { "id": "postoffices", "name": { - "en": "Post offices" + "en": "Post offices", + "de": "Poststellen" }, "minzoom": 12, "source": { @@ -92,11 +100,13 @@ }, "title": { "render": { - "en": "Post Office" + "en": "Post Office", + "de": "Poststelle" } }, "description": { - "en": "A layer showing post offices." + "en": "A layer showing post offices.", + "de": "Eine Ebene mit Postämtern." }, "tagRenderings": [ "images", @@ -119,7 +129,8 @@ { "if": "opening_hours=24/7", "then": { - "en": "24/7 opened (including holidays)" + "en": "24/7 opened (including holidays)", + "de": "durchgehend geöffnet (auch an Feiertagen)" } } ], @@ -151,7 +162,8 @@ "amenity=post_office" ], "title": { - "en": "Post Office" + "en": "Post Office", + "de": "Poststelle" } } ], @@ -162,7 +174,8 @@ "options": [ { "question": { - "en": "Currently open" + "en": "Currently open", + "de": "Aktuell geöffnet" }, "osmTags": "_isOpen=yes" } diff --git a/assets/themes/shops/shops.json b/assets/themes/shops/shops.json index 878225a90e..a6d904a436 100644 --- a/assets/themes/shops/shops.json +++ b/assets/themes/shops/shops.json @@ -5,12 +5,14 @@ "fr": "Carte des magasins", "ja": "オープン ショップ マップ", "zh_Hant": "開放商店地圖", - "ru": "Открыть карту магазинов" + "ru": "Открыть карту магазинов", + "de": "Freie Geschäftskarte" }, "shortDescription": { "en": "An editable map with basic shop information", "fr": "Carte modifiable affichant les informations de base des magasins", - "ja": "基本的なショップ情報を含む編集可能なマップ" + "ja": "基本的なショップ情報を含む編集可能なマップ", + "de": "Eine bearbeitbare Karte mit grundlegenden Geschäftsinformationen" }, "description": { "en": "On this map, one can mark basic information about shops, add opening hours and phone numbers", @@ -24,9 +26,7 @@ "ja", "zh_Hant", "ru", - "nl", - "ca", - "id" + "de" ], "maintainer": "MapComplete", "icon": "./assets/themes/shops/shop.svg", diff --git a/assets/themes/sport_pitches/sport_pitches.json b/assets/themes/sport_pitches/sport_pitches.json index 4db24cdd69..cf7197dd4a 100644 --- a/assets/themes/sport_pitches/sport_pitches.json +++ b/assets/themes/sport_pitches/sport_pitches.json @@ -6,7 +6,8 @@ "en": "Sport pitches", "ja": "スポーツ競技場", "zh_Hant": "運動場地", - "ru": "Спортивные площадки" + "ru": "Спортивные площадки", + "de": "Sportplätze" }, "shortDescription": { "nl": "Deze kaart toont sportvelden", @@ -14,14 +15,16 @@ "en": "A map showing sport pitches", "ja": "スポーツ競技場を示す地図", "zh_Hant": "顯示運動場地的地圖", - "ru": "Карта, отображающая спортивные площадки" + "ru": "Карта, отображающая спортивные площадки", + "de": "Eine Karte mit Sportplätzen" }, "description": { "nl": "Een sportveld is een ingerichte plaats met infrastructuur om een sport te beoefenen", "fr": "Un terrain de sport est une zone faite pour pratiquer un sport", "en": "A sport pitch is an area where sports are played", "ja": "スポーツ競技場は、スポーツが行われる場所です", - "zh_Hant": "運動場地是進行運動的地方" + "zh_Hant": "運動場地是進行運動的地方", + "de": "Ein Sportplatz ist eine Fläche, auf der Sportarten gespielt werden" }, "language": [ "nl", @@ -29,7 +32,8 @@ "en", "ja", "zh_Hant", - "ru" + "ru", + "de" ], "maintainer": "", "icon": "./assets/layers/sport_pitch/table_tennis.svg", @@ -41,6 +45,5 @@ "socialImage": "", "layers": [ "sport_pitch" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json index a61633b23b..3d5586b52e 100644 --- a/assets/themes/surveillance/surveillance.json +++ b/assets/themes/surveillance/surveillance.json @@ -5,7 +5,8 @@ "nl": "Surveillance under Surveillance", "ja": "監視カメラの監視", "zh_Hant": "被監視的監視器", - "fr": "Surveillance" + "fr": "Surveillance", + "de": "Überwachung unter Überwachung" }, "shortDescription": { "en": "Surveillance cameras and other means of surveillance", @@ -13,7 +14,8 @@ "ja": "監視カメラおよびその他の監視手段", "zh_Hant": "監視鏡頭與其他型式的監視", "fr": "Caméras et autres dispositifs de surveillance", - "pl": "Kamery monitorujące i inne środki nadzoru" + "pl": "Kamery monitorujące i inne środki nadzoru", + "de": "Überwachungskameras und andere Mittel zur Überwachung" }, "description": { "en": "On this open map, you can find surveillance cameras.", @@ -21,7 +23,8 @@ "ja": "このオープンマップでは、監視カメラを確認できます。", "zh_Hant": "在這份開放地圖，你可以找到監視鏡頭。", "fr": "Cette carte indique l’emplacement des caméras de surveillance.", - "pl": "Na tej otwartej mapie można znaleźć kamery monitoringu." + "pl": "Na tej otwartej mapie można znaleźć kamery monitoringu.", + "de": "Auf dieser offenen Karte finden Sie Überwachungskameras." }, "language": [ "en", @@ -29,6 +32,7 @@ "ja", "zh_Hant", "fr", + "de", "pl" ], "maintainer": "", @@ -43,6 +47,5 @@ "layers": [ "direction", "surveillance_camera" - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json index 733b94d9f8..911cf7ac91 100644 --- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json +++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json @@ -7,6 +7,9 @@ "en", "nl" ], + "mustHaveLanguage": [ + "nl" + ], "title": { "nl": "Toeristisch relevante info" }, diff --git a/assets/themes/toilets/toilets.json b/assets/themes/toilets/toilets.json index 1d1567de42..de62c5c14a 100644 --- a/assets/themes/toilets/toilets.json +++ b/assets/themes/toilets/toilets.json @@ -2,7 +2,7 @@ "id": "toilets", "title": { "en": "Open Toilet Map", - "de": "Offene Toilette Karte", + "de": "Freie Toilettenkarte", "fr": "Carte des WC et toilettes publiques", "nl": "Open Toilettenkaart", "ru": "Открытая карта туалетов", @@ -12,7 +12,7 @@ }, "description": { "en": "A map of public toilets", - "de": "Eine Karte der öffentlichen Toiletten", + "de": "Eine Karte mit öffentlich zugänglichen Toiletten", "fr": "Carte affichant les WC et toilettes publiques", "nl": "Een kaart met openbare toiletten", "ru": "Карта общественных туалетов", diff --git a/assets/themes/trees/trees.json b/assets/themes/trees/trees.json index 7c2baa8ac2..960367dad2 100644 --- a/assets/themes/trees/trees.json +++ b/assets/themes/trees/trees.json @@ -8,7 +8,8 @@ "ru": "Деревья", "ja": "樹木", "zh_Hant": "樹木", - "pl": "Drzewa" + "pl": "Drzewa", + "de": "Bäume" }, "shortDescription": { "nl": "Breng bomen in kaart", @@ -18,7 +19,8 @@ "ja": "すべての樹木をマッピングする", "zh_Hant": "所有樹木的地圖", "ru": "Карта деревьев", - "pl": "Sporządzić mapę wszystkich drzew" + "pl": "Sporządzić mapę wszystkich drzew", + "de": "Kartieren Sie alle Bäume" }, "description": { "nl": "Breng bomen in kaart!", @@ -27,7 +29,8 @@ "it": "Mappa tutti gli alberi!", "ja": "すべての樹木をマッピングします!", "zh_Hant": "繪製所有樹木！", - "ru": "Нанесите все деревья на карту!" + "ru": "Нанесите все деревья на карту!", + "de": "Kartieren Sie alle Bäume!" }, "language": [ "nl", @@ -37,7 +40,8 @@ "ru", "ja", "zh_Hant", - "pl" + "pl", + "de" ], "maintainer": "Midgard", "icon": "./assets/themes/trees/logo.svg", @@ -55,6 +59,5 @@ "layers": [ "tree_node" ], - "roamingRenderings": [], "defaultBackgroundId": "AGIV" } \ No newline at end of file diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 4a9ab30ab5..aa0aeed0b4 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -1,17 +1,21 @@ { "id": "uk_addresses", "title": { - "en": "UK Addresses" + "en": "UK Addresses", + "de": "Adressen in Großbritannien" }, "shortDescription": { - "en": "Help to build an open dataset of UK addresses" + "en": "Help to build an open dataset of UK addresses", + "de": "Helfen Sie beim Aufbau eines offenen Datensatzes britischer Adressen" }, "description": { "en": "Contribute to OpenStreetMap by filling out address information", - "nl": "Draag bij aan OpenStreetMap door adresinformatie in te vullen" + "nl": "Draag bij aan OpenStreetMap door adresinformatie in te vullen", + "de": "Tragen Sie zu OpenStreetMap bei, indem Sie Adressinformationen ausfüllen" }, "language": [ "en", + "de", "nl" ], "maintainer": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett", @@ -36,7 +40,8 @@ "maxZoom": 20, "defaultState": false, "name": { - "en": "Property boundaries by osmuk.org" + "en": "Property boundaries by osmuk.org", + "de": "Grenzverläufe gemäß osmuk.org" } } ], @@ -113,7 +118,8 @@ { "id": "addresses", "name": { - "en": "Known addresses in OSM" + "en": "Known addresses in OSM", + "de": "Bekannte Adressen in OSM" }, "minzoom": 18, "source": { @@ -133,28 +139,33 @@ ], "title": { "render": { - "en": "Known address" + "en": "Known address", + "de": "Bekannte Adresse" } }, "description": { "en": "Addresses", - "nl": "Adressen" + "nl": "Adressen", + "de": "Adressen" }, "tagRenderings": [ { "id": "uk_addresses_explanation_osm", "render": { - "en": "This address is saved in OpenStreetMap" + "en": "This address is saved in OpenStreetMap", + "de": "Diese Adresse ist in OpenStreetMap gespeichert" } }, { "id": "uk_addresses_housenumber", "render": { "en": "The housenumber is {addr:housenumber}", - "nl": "Het huisnummer is {addr:housenumber}" + "nl": "Het huisnummer is {addr:housenumber}", + "de": "Die Hausnummer ist {addr:housenumber}" }, "question": { - "en": "What is the number of this house?" + "en": "What is the number of this house?", + "de": "Wie lautet die Nummer dieses Hauses?" }, "freeform": { "key": "addr:housenumber", @@ -171,7 +182,8 @@ }, "then": { "en": "This building has no house number", - "nl": "Dit gebouw heeft geen huisnummer" + "nl": "Dit gebouw heeft geen huisnummer", + "de": "Dieses Gebäude hat keine Hausnummer" } } ] @@ -179,10 +191,12 @@ { "id": "uk_addresses_street", "render": { - "en": "This address is in street {addr:street}" + "en": "This address is in street {addr:street}", + "de": "Diese Adresse befindet sich in der Straße {addr:street}" }, "question": { - "en": "What street is this address located in?" + "en": "What street is this address located in?", + "de": "In welcher Straße befindet sich diese Adresse?" }, "freeform": { "key": "addr:street" @@ -274,6 +288,5 @@ "render": "0" } } - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json index 6bb40ae6c2..3702180831 100644 --- a/assets/themes/waste_basket/waste_basket.json +++ b/assets/themes/waste_basket/waste_basket.json @@ -7,11 +7,13 @@ }, "shortDescription": { "en": "A map with waste baskets", - "nl": "Een kaart met vuilnisbakken" + "nl": "Een kaart met vuilnisbakken", + "de": "Eine Karte mit Abfalleimern" }, "description": { "en": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself", - "nl": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen" + "nl": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen", + "de": "Auf dieser Karte finden Sie Abfalleimer in Ihrer Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, können Sie ihn selbst hinzufügen" }, "language": [ "en", @@ -33,6 +35,5 @@ "minzoom": 12 } } - ], - "roamingRenderings": [] + ] } \ No newline at end of file diff --git a/assets/welcome_message.json b/assets/welcome_message.json index db78072220..d2a3fc2577 100644 --- a/assets/welcome_message.json +++ b/assets/welcome_message.json @@ -7,13 +7,13 @@ }, { "start_date": "2022-04-11", - "end_date": "2022-04-17", + "end_date": "2022-04-18", "message": "The 15th of april is World Art Day - the ideal moment to go out, enjoy some artwork and add missing artwork to the map. And of course, you can snap some pictures", "featured_theme": "artwork" }, { "start_date": "2022-03-24", - "end_date": "2022-01-30", + "end_date": "2022-03-31", "message": "The 22nd of March is World Water Day. Time to go out and find all the public drinking water spots!", "featured_theme": "drinking_water" }, @@ -40,13 +40,13 @@ }, { "start_date": "2021-10-25", - "end_date": "2021-10-31", + "end_date": "2021-11-01", "message": "Did you know you could link OpenStreetMap with Wikidata? With name:etymology:wikidata, it is even possible to link to whom or what a feature is named after. Quite some volunteers have done this - because it is interesting or for the Equal Street Names-project. For this, a new theme has been created which shows the Wikipedia page and Wikimedia-images of this tag and which makes it easy to link them both with the search box. Give it a try!", "featured_theme": "etymology" }, { "start_date": "2021-10-17", - "end_date": "2021-10-24", + "end_date": "2021-10-25", "message": "

Hi all!

Thanks for using MapComplete. It has been quite a ride since it's inception, a bit over a year ago. MapComplete has grown significantly recently, which you can read more about on in my diary entry.

Furthermore, NicoleLaine made a really cool new theme about postboxes, so make sure to check it out!

", "featured_theme": "postboxes" } diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css index 63c10a8d0c..ee61e9cea2 100644 --- a/css/index-tailwind-output.css +++ b/css/index-tailwind-output.css @@ -856,10 +856,6 @@ video { margin-left: 0.75rem; } -.mb-2 { - margin-bottom: 0.5rem; -} - .mr-4 { margin-right: 1rem; } @@ -924,6 +920,14 @@ video { margin-right: 0.75rem; } +.mb-2 { + margin-bottom: 0.5rem; +} + +.mb-0 { + margin-bottom: 0px; +} + .box-border { box-sizing: border-box; } @@ -988,10 +992,6 @@ video { height: 3rem; } -.h-5 { - height: 1.25rem; -} - .h-screen { height: 100vh; } @@ -1279,10 +1279,6 @@ video { border-width: 2px; } -.border-b-2 { - border-bottom-width: 2px; -} - .border-b { border-bottom-width: 1px; } @@ -1316,11 +1312,6 @@ video { background-color: rgba(255, 255, 255, var(--tw-bg-opacity)); } -.bg-blue-50 { - --tw-bg-opacity: 1; - background-color: rgba(239, 246, 255, var(--tw-bg-opacity)); -} - .bg-blue-100 { --tw-bg-opacity: 1; background-color: rgba(219, 234, 254, var(--tw-bg-opacity)); @@ -1386,32 +1377,28 @@ video { padding: 0.5rem; } -.p-0\.5 { - padding: 0.125rem; -} - .p-0 { padding: 0px; } +.p-0\.5 { + padding: 0.125rem; +} + .pl-2 { padding-left: 0.5rem; } -.pt-3 { - padding-top: 0.75rem; +.pb-20 { + padding-bottom: 5rem; } -.pb-3 { - padding-bottom: 0.75rem; +.pt-1 { + padding-top: 0.25rem; } -.pl-4 { - padding-left: 1rem; -} - -.pb-0 { - padding-bottom: 0px; +.pb-1 { + padding-bottom: 0.25rem; } .pl-1 { @@ -1426,6 +1413,10 @@ video { padding-top: 1.5rem; } +.pb-3 { + padding-bottom: 0.75rem; +} + .pl-5 { padding-left: 1.25rem; } @@ -1434,6 +1425,10 @@ video { padding-right: 0.75rem; } +.pl-4 { + padding-left: 1rem; +} + .pr-4 { padding-right: 1rem; } @@ -2187,6 +2182,7 @@ li::marker { .leaflet-popup-content { width: 45em !important; + margin: 0.25rem !important; } .leaflet-div-icon { @@ -2422,8 +2418,8 @@ li::marker { flex-direction: row; } - .md\:p-0 { - padding: 0px; + .md\:rounded-xl { + border-radius: 0.75rem; } .md\:p-1 { @@ -2442,6 +2438,14 @@ li::marker { padding: 0.75rem; } + .md\:pt-0 { + padding-top: 0px; + } + + .md\:pb-0 { + padding-bottom: 0px; + } + .md\:pt-4 { padding-top: 1rem; } @@ -2461,11 +2465,6 @@ li::marker { line-height: 1.75rem; } - .md\:shadow-none { - --tw-shadow: 0 0 #0000; - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); - } - .md\:w-160 { width: 40rem; } diff --git a/index.css b/index.css index 6eb113abcf..108f02fe27 100644 --- a/index.css +++ b/index.css @@ -424,6 +424,7 @@ li::marker { .leaflet-popup-content { width: 45em !important; + margin: 0.25rem !important; } .leaflet-div-icon { diff --git a/langs/de.json b/langs/de.json index a97714ccae..ae55b7bccd 100644 --- a/langs/de.json +++ b/langs/de.json @@ -10,25 +10,25 @@ "ccb": "unter der 'CC-BY-Lizenz'", "uploadFailed": "Wir konnten Ihr Bild nicht hochladen. Haben Sie eine aktive Internetverbindung und sind APIs von Dritten erlaubt? Der Brave Browser oder UMatrix blockieren diese eventuell.", "respectPrivacy": "Bitte respektieren Sie die Privatsphäre. Fotografieren Sie weder Personen noch Nummernschilder. Benutzen Sie keine urheberrechtlich geschützten Quellen wie z.B. Google Maps oder Google Streetview.", - "uploadDone": "Ihr Bild wurde hinzugefügt. Vielen Dank für Ihre Hilfe!", + "uploadDone": "Ihr Bild wurde hinzugefügt. Vielen Dank für Ihre Hilfe!", "dontDelete": "Abbrechen", "doDelete": "Bild entfernen", "isDeleted": "Gelöscht" }, "centerMessage": { "loadingData": "Daten werden geladen…", - "zoomIn": "Vergrößern, um die Daten anzuzeigen oder zu bearbeiten", + "zoomIn": "Ausschnitt vergrößern, um Daten anzuzeigen oder zu bearbeiten", "ready": "Erledigt!", "retrying": "Laden von Daten fehlgeschlagen. Erneuter Versuch in {count} Sekunden …" }, "index": { "#": "Dieser Text wird über die Thema-Auswahlschaltfläche gezeigt, wenn kein Thema geladen ist", "title": "Willkommen bei MapComplete", - "intro": "MapComplete ist eine OpenStreetMap-Anwendung, mit der Informationen zu einem bestimmten Thema angezeigt und angepasst werden können.", + "intro": "MapComplete ist eine OpenStreetMap-Anwendung, mit der Informationen zu Objekten eines bestimmten Themas angezeigt und angepasst werden können.", "pickTheme": "Wähle unten ein Thema, um zu starten." }, "general": { - "loginWithOpenStreetMap": "Anmeldung mit OpenStreetMap", + "loginWithOpenStreetMap": "Bei OpenStreetMap anmelden", "welcomeBack": "Sie sind eingeloggt, willkommen zurück!", "loginToStart": "Anmelden, um diese Frage zu beantworten", "search": { @@ -61,7 +61,7 @@ "disableFiltersExplanation": "Einige Elemente können durch einen Filter ausgeblendet sein", "disableFilters": "Alle Filter deaktivieren" }, - "pickLanguage": "Wählen Sie eine Sprache: ", + "pickLanguage": "Sprache wählen: ", "about": "OpenStreetMap für ein bestimmtes Thema einfach bearbeiten und hinzufügen", "nameInlineQuestion": "Der Name dieser {category} ist $$$", "noNameCategory": "{category} ohne Namen", @@ -73,11 +73,11 @@ "emailOf": "Wie lautet die E-Mail-Adresse der {category}?", "emailIs": "Die E-Mail-Adresse dieser {category} lautet {email}" }, - "openStreetMapIntro": "

Eine offene Karte

Wäre es nicht toll, wenn es eine offene Karte gäbe, die von jedem angepasst und benutzt werden könnte? Eine Karte, zu der jeder seine Interessen hinzufügen kann? Dann bräuchte man all diese Websites mit unterschiedlichen, kleinen und inkompatiblen Karten (die immer veraltet sind) nicht mehr.

OpenStreetMap ist diese offene Karte. Die Kartendaten können kostenlos verwendet werden (mit Attribution und Veröffentlichung von Änderungen an diesen Daten). Darüber hinaus können Sie die Karte kostenlos ändern und Fehler beheben, wenn Sie ein Konto erstellen. Diese Website basiert ebenfalls auf OpenStreetMap. Wenn Sie eine Frage hier beantworten, geht die Antwort auch dorthin.

Viele Menschen und Anwendungen nutzen OpenStreetMap bereits: Maps.me, OsmAnd, verschiedene spezialisierte Routenplaner, die Hintergrundkarten auf Facebook, Instagram,...
Sogar Apple Maps und Bing Maps verwenden OpenStreetMap in ihren Karten!

Wenn Sie hier einen Punkt hinzufügen oder eine Frage beantworten, wird er nach einer Weile in all diesen Anwendungen sichtbar sein.

", + "openStreetMapIntro": "

Eine freie Karte

Wäre es nicht toll, wenn es eine freie Karte gäbe, die von jedem angepasst und genutzt werden könnte? Eine Karte, zu der jeder Informationen hinzufügen kann? Dann bräuchte man all diese Webseiten mit unterschiedlichen, eingeschränkten und veralteten Karten nicht mehr.

OpenStreetMap ist diese freie Karte. Alle Kartendaten können kostenlos verwendet werden (mit Attribution und Veröffentlichung von Änderungen an diesen Daten). Darüber hinaus können Sie die Karte kostenlos ändern und Fehler beheben, wenn Sie ein Konto erstellen. Diese Webseite basiert ebenfalls auf OpenStreetMap. Wenn Sie eine Frage hier beantworten, geht die Antwort auch dorthin.

Viele Menschen und Anwendungen nutzen OpenStreetMap bereits: Maps.me, OsmAnd, verschiedene spezialisierte Routenplaner, die Hintergrundkarten auf Facebook, Instagram, ...<br/>Sogar Apple Maps und Bing Maps verwenden OpenStreetMap in ihren Karten!

Wenn Sie hier einen Punkt hinzufügen oder eine Frage beantworten, wird er nach einer Weile in all diesen Anwendungen sichtbar sein.

", "sharescreen": { "intro": "

Diese Karte teilen

Sie können diese Karte teilen, indem Sie den untenstehenden Link kopieren und an Freunde und Familie schicken:", - "addToHomeScreen": "

Zum Startbildschirm hinzufügen

Sie können diese Website einfach zum Startbildschirm Ihres Smartphones hinzufügen, um ein natives Gefühl zu erhalten. Klicken Sie dazu in der URL-Leiste auf die Schaltfläche 'Zum Startbildschirm hinzufügen'.", - "embedIntro": "

Auf Ihrer Website einbetten

Bitte, betten Sie diese Karte in Ihre Website ein.
Wir ermutigen Sie, es zu tun - Sie müssen nicht einmal um Erlaubnis fragen.
Es ist kostenlos und wird es immer sein. Je mehr Leute sie benutzen, desto wertvoller wird sie.", + "addToHomeScreen": "

Zum Startbildschirm hinzufügen

Sie können diese Webseite zum Startbildschirm Ihres Smartphones hinzufügen, um ein natives Gefühl zu erhalten. Klicken Sie dazu in der Adressleiste auf die Schaltfläche 'Zum Startbildschirm hinzufügen'.", + "embedIntro": "

Auf Ihrer Website einbetten

Bitte betten Sie diese Karte in Ihre Webseite ein.
Wir ermutigen Sie, es zu tun - Sie müssen nicht einmal um Erlaubnis fragen.
Es ist kostenlos und wird es immer sein. Je mehr Leute sie benutzen, desto wertvoller wird sie.", "copiedToClipboard": "Link in die Zwischenablage kopiert", "thanksForSharing": "Danke für das Teilen!", "editThisTheme": "Dieses Thema bearbeiten", @@ -106,10 +106,10 @@ "getStartedNewAccount": " oder ein neues Konto anlegen", "noTagsSelected": "Keine Tags ausgewählt", "customThemeIntro": "

Benutzerdefinierte Themes

Dies sind zuvor besuchte benutzergenerierte Themen.", - "aboutMapcomplete": "

Über MapComplete

MapComplete ist ein OpenStreetMap-Editor, der jedem helfen soll, auf einfache Weise Informationen zu einem Einzelthema hinzuzufügen.

Nur Merkmale, die für ein einzelnes Thema relevant sind, werden mit einigen vordefinierten Fragen gezeigt, um die Dinge einfach und extrem benutzerfreundlich zu halten. Der Themen-Betreuer kann auch eine Sprache für die Schnittstelle wählen, Elemente deaktivieren oder sogar in eine andere Website ohne jegliches UI-Element einbetten.

Ein weiterer wichtiger Teil von MapComplete ist jedoch, immer den nächsten Schritt anzubietenum mehr über OpenStreetMap zu erfahren:

  • Ein iframe ohne UI-Elemente verlinkt zu einer Vollbildversion
  • Die Vollbildversion bietet Informationen über OpenStreetMap
  • Wenn Sie nicht eingeloggt sind, werden Sie gebeten, sich einzuloggen
  • Wenn Sie eine einzige Frage beantwortet haben, dürfen Sie Punkte hinzufügen
  • An einem bestimmten Punkt erscheinen die tatsächlich hinzugefügten Tags, die später mit dem Wiki verlinkt werden...

Fällt Ihnen ein Problem mit MapComplete auf? Haben Sie einen Feature-Wunsch? Wollen Sie beim Übersetzen helfen? Gehen Sie zum Quellcode oder zur Problemverfolgung.

", + "aboutMapcomplete": "

Über MapComplete

Mit MapComplete können Sie OpenStreetMap mit Informationen zu einem einzigen Thema anreichern. Beantworten Sie ein paar Fragen, und innerhalb von Minuten werden Ihre Beiträge rund um den Globus verfügbar sein! Der Themen-Maintainer definiert Elemente, Fragen und Sprachen für das Thema.

Mehr erfahren

MapComplete bietet immer den nächsten Schritt, um mehr über OpenStreetMap zu erfahren.

  • Wenn es in eine Website eingebettet wird, verlinkt der Iframe zu einer Vollbildversion von MapComplete
  • Die Vollbildversion bietet Informationen über OpenStreetMap
  • Das Betrachten funktioniert ohne Login, aber das Bearbeiten erfordert ein OSM-Login.
  • Wenn Sie nicht eingeloggt sind, werden Sie aufgefordert, sich anzumelden
  • Nach der Beantwortung einer einzelnen Frage können Sie der Karte neue Punkte hinzufügen
  • Nach einer Weile werden aktuelle OSM-Tags angezeigt, die später mit dem Wiki verlinkt sind


Haben Sie ein Problem bemerkt? Haben Sie einen Funktionswunsch? Möchten Sie bei der Übersetzung helfen? Besuchen Sie den Quellcode oder den Issue Tracker

Möchten Sie Ihren Fortschritt sehen? Verfolgen Sie die Anzahl der Änderungen auf OsmCha.

", "backgroundMap": "Hintergrundkarte", "layerSelection": { - "zoomInToSeeThisLayer": "Vergrößern, um diese Ebene zu sehen", + "zoomInToSeeThisLayer": "Ausschnitt vergrößern, um diese Ebene anzuzeigen", "title": "Ebenen auswählen" }, "weekdays": { @@ -164,12 +164,13 @@ "downloadAsPdf": "PDF der aktuellen Karte herunterladen", "downloadGeojson": "Sichtbare Daten als geojson herunterladen", "includeMetaData": "Metadaten übernehmen (letzter Bearbeiter, berechnete Werte, ...)", - "noDataLoaded": "Noch keine Daten geladen. Download ist in Kürze verfügbar" + "noDataLoaded": "Noch keine Daten geladen. Download ist in Kürze verfügbar", + "licenseInfo": "

Copyright-Hinweis

Die bereitgestellten Daten sind unter ODbL verfügbar. Die Wiederverwendung dieser Daten ist für jeden Zweck frei, aber
  • die Namensnennung © OpenStreetMap contributors ist erforderlich
  • Jede Änderung dieser Daten muss unter der gleichen Lizenz veröffentlicht werden
Bitte lesen Sie den vollständigen Copyright-Hinweis für weitere Details" }, "pdf": { "versionInfo": "v{version} - erstellt am {date}" }, - "loginOnlyNeededToEdit": "wenn du die Karte bearbeiten willst" + "loginOnlyNeededToEdit": "zum Bearbeiten der Karte" }, "favourite": { "panelIntro": "

Ihr persönliches Thema

Aktivieren Sie Ihre Lieblingsebenen aus allen offiziellen Themen", diff --git a/langs/en.json b/langs/en.json index 8fd307d982..cee2bae0c6 100644 --- a/langs/en.json +++ b/langs/en.json @@ -10,7 +10,8 @@ "ccb": "under the CC-BY-license", "uploadFailed": "Could not upload your picture. Are you connected to the Internet, and allow third party API's? The Brave browser or the uMatrix plugin might block them.", "respectPrivacy": "Do not photograph people nor license plates. Do not upload Google Maps, Google Streetview or other copyrighted sources.", - "uploadDone": "Your picture has been added. Thanks for helping out!", + "uploadDone": "Your picture has been added. Thanks for helping out!", + "uploadMultipleDone": "{count} pictures have been added. Thanks for helping out!", "dontDelete": "Cancel", "doDelete": "Remove image", "isDeleted": "Deleted", @@ -32,7 +33,7 @@ "split": { "split": "Split", "cancel": "Cancel", - "inviteToSplit": "Split this road", + "inviteToSplit": "Split this road in smaller segments. This allows to give different properties to parts of the road.", "loginToSplit": "You must be logged in to split a road", "splitTitle": "Choose on the map where to split this road", "hasBeenSplit": "This way has been split" @@ -228,11 +229,11 @@ "wikipediaboxTitle": "Wikipedia", "failed": "Loading the wikipedia entry failed", "loading": "Loading Wikipedia...", - "noWikipediaPage": "This wikidata item has no corresponding wikipedia page yet.", - "searchWikidata": "Search on wikidata", + "noWikipediaPage": "This Wikidata item has no corresponding Wikipedia page yet.", + "searchWikidata": "Search on Wikidata", "noResults": "Nothing found for {search}", "doSearch": "Search above to see results", - "createNewWikidata": "Create a new wikidata item" + "createNewWikidata": "Create a new Wikidata item" } }, "favourite": { @@ -284,4 +285,4 @@ "partOfRelation": "This feature is part of a relation. Use another editor to move it", "cancel": "Cancel move" } -} \ No newline at end of file +} diff --git a/langs/layers/de.json b/langs/layers/de.json index 40a1b38c98..46ea03b703 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -541,9 +541,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "name": "Fahrradstationen (Reparatur, Pumpe oder beides)", "presets": { "0": { @@ -947,6 +944,12 @@ "options": { "0": { "question": "Alle Anschlüsse" + }, + "3": { + "question": "Hat einen
Chademo
Stecker" + }, + "7": { + "question": "Hat einen
Tesla Supercharger
Stecker" } } } @@ -986,7 +989,7 @@ "then": "Authentifizierung per Debitkarte ist möglich" }, "7": { - "then": "Keine Authentifizierung erforderlich" + "then": "Das Aufladen ist hier (auch) ohne Authentifizierung möglich" } }, "question": "Welche Authentifizierung ist an der Ladestation möglich?" @@ -1082,19 +1085,19 @@ "Operational status": { "mappings": { "0": { - "then": "Diese Ladestation ist kaputt" + "then": "Diese Ladestation funktioniert" }, "1": { - "then": "Hier ist eine Ladestation geplant" + "then": "Diese Ladestation ist kaputt" }, "2": { - "then": "Hier wird eine Ladestation gebaut" + "then": "Hier ist eine Ladestation geplant" }, "3": { - "then": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar" + "then": "Hier wird eine Ladestation gebaut" }, "4": { - "then": "Diese Ladestation funktioniert" + "then": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar" } }, "question": "Ist dieser Ladepunkt in Betrieb?" @@ -1146,8 +1149,48 @@ "capacity": { "question": "Wie viele Fahrzeuge können hier gleichzeitig geladen werden?", "render": "{capacity} Fahrzeuge können hier gleichzeitig geladen werden" + }, + "email": { + "question": "Wie ist die Email-Adresse des Betreibers?", + "render": "Bei Problemen senden Sie eine E-Mail an {email}" + }, + "maxstay": { + "mappings": { + "0": { + "then": "Keine Höchstparkdauer" + } + }, + "question": "Was ist die Höchstdauer des Aufenthalts hier?", + "render": "Die maximale Parkzeit beträgt {canonical(maxstay)}" + }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "Bezahlung mit einer speziellen App" + }, + "1": { + "then": "Bezahlung mit einer Mitgliedskarte" + } + } + } + }, + "phone": { + "question": "Welche Nummer kann man anrufen, wenn es ein Problem mit dieser Ladestation gibt?", + "render": "Bei Problemen, anrufen unter {phone}" + }, + "ref": { + "question": "Wie lautet die Kennung dieser Ladestation?", + "render": "Die Kennziffer ist {ref}" + }, + "website": { + "question": "Wie ist die Webseite des Betreibers?", + "render": "Weitere Informationen auf {website}" } }, + "title": { + "render": "Ladestation" + }, "units": { "0": { "applicableUnits": { @@ -1156,24 +1199,488 @@ "humanSingular": " Minute" }, "1": { - "human": " Stunden" + "human": " Stunden", + "humanSingular": " Stunde" }, "2": { - "human": " Tage" + "human": " Tage", + "humanSingular": " Tag" + } + } + }, + "1": { + "applicableUnits": { + "0": { + "human": "Volt" + } + } + }, + "3": { + "applicableUnits": { + "0": { + "human": "Kilowatt" + }, + "1": { + "human": "Megawatt" } } } } }, "crossings": { - "name": "Kreuzungen" + "description": "Übergänge für Fußgänger und Radfahrer", + "name": "Kreuzungen", + "presets": { + "0": { + "description": "Kreuzung für Fußgänger und/oder Radfahrer", + "title": "Kreuzung" + }, + "1": { + "description": "Ampel an einer Straße", + "title": "Ampel" + } + }, + "tagRenderings": { + "crossing-bicycle-allowed": { + "mappings": { + "0": { + "then": "Radfahrer können diese Kreuzung nutzen" + }, + "1": { + "then": "Radfahrer können diese Kreuzung nicht nutzen" + } + }, + "question": "Können Radfahrer diese Kreuzung nutzen?" + }, + "crossing-button": { + "mappings": { + "1": { + "then": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern." + } + }, + "question": "Hat diese Ampel eine Taste, um ein grünes Signal anzufordern?" + }, + "crossing-continue-through-red": { + "mappings": { + "0": { + "then": "Ein Radfahrer kann bei roter Ampel geradeaus fahren " + }, + "1": { + "then": "Ein Radfahrer kann bei roter Ampel geradeaus fahren" + }, + "2": { + "then": "Ein Radfahrer kann bei roter Ampel nicht geradeaus fahren" + } + }, + "question": "Kann ein Radfahrer bei roter Ampel geradeaus fahren?" + }, + "crossing-has-island": { + "mappings": { + "0": { + "then": "Der Übergang hat eine Verkehrsinsel" + }, + "1": { + "then": "Diese Ampel hat eine Taste, um ein grünes Signal anzufordern" + } + }, + "question": "Gibt es an diesem Übergang eine Verkehrsinsel?" + }, + "crossing-is-zebra": { + "mappings": { + "0": { + "then": "Dies ist ein Zebrastreifen" + }, + "1": { + "then": "Dies ist kein Zebrastreifen" + } + }, + "question": "Ist das ein Zebrastreifen?" + }, + "crossing-right-turn-through-red": { + "mappings": { + "0": { + "then": "Ein Radfahrer kann bei roter Ampel rechts abbiegen " + }, + "1": { + "then": "Ein Radfahrer kann bei roter Ampel rechts abbiegen" + }, + "2": { + "then": "Ein Radfahrer kann bei roter Ampel nicht rechts abbiegen" + } + }, + "question": "Kann ein Radfahrer bei roter Ampel rechts abbiegen?" + }, + "crossing-tactile": { + "mappings": { + "0": { + "then": "An dieser Kreuzung gibt es ein Blindenleitsystem" + }, + "1": { + "then": "Diese Kreuzung hat kein Blindenleitsystem" + } + }, + "question": "Gibt es an dieser Kreuzung ein Blindenleitsystem?" + }, + "crossing-type": { + "mappings": { + "0": { + "then": "Kreuzungen ohne Ampeln" + }, + "1": { + "then": "Kreuzungen mit Ampeln" + }, + "2": { + "then": "Zebrastreifen" + } + }, + "question": "Was ist das für eine Kreuzung?" + } + }, + "title": { + "mappings": { + "0": { + "then": "Ampel" + }, + "1": { + "then": "Kreuzung mit Ampeln" + } + }, + "render": "Kreuzung" + } }, "cycleways_and_roads": { + "name": "Radwege und Straßen", + "tagRenderings": { + "Cycleway type for a road": { + "mappings": { + "0": { + "then": "Es gibt eine geteilte Fahrspur" + }, + "1": { + "then": "Es gibt eine Spur neben der Straße (getrennt durch eine Straßenmarkierung)" + }, + "2": { + "then": "Es gibt einen Weg, aber keinen Radweg, der auf der Karte getrennt von dieser Straße eingezeichnet ist." + }, + "3": { + "then": "Hier ist ein getrennter Radweg vorhanden" + }, + "4": { + "then": "Es gibt keinen Radweg" + }, + "5": { + "then": "Es gibt keinen Radweg" + } + }, + "question": "Was für ein Radweg ist hier?" + }, + "Cycleway:smoothness": { + "mappings": { + "0": { + "then": "Geeignet für dünne Rollen: Rollerblades, Skateboard" + }, + "1": { + "then": "Geeignet für dünne Reifen: Rennrad" + }, + "2": { + "then": "Geeignet für normale Reifen: Fahrrad, Rollstuhl, Scooter" + }, + "3": { + "then": "Geeignet für breite Reifen: Trekkingfahrrad, Auto, Rikscha" + }, + "4": { + "then": "Geeignet für Fahrzeuge mit großer Bodenfreiheit: leichte Geländewagen" + }, + "5": { + "then": "Geeignet für Geländefahrzeuge: schwerer Geländewagen" + }, + "6": { + "then": "Geeignet für Geländefahrzeuge: Traktor, ATV" + }, + "7": { + "then": "Unpassierbar / Keine bereiften Fahrzeuge" + } + }, + "question": "Wie eben ist dieser Radweg?" + }, + "Cycleway:surface": { + "mappings": { + "0": { + "then": "Dieser Radweg hat keinen festen Belag" + }, + "1": { + "then": "Dieser Radweg hat einen festen Belag" + }, + "2": { + "then": "Der Radweg ist aus Asphalt" + }, + "3": { + "then": "Dieser Fahrradweg besteht aus ebenen Pflastersteinen" + }, + "4": { + "then": "Der Radweg ist aus Beton" + }, + "5": { + "then": "Dieser Radweg besteht aus Kopfsteinpflaster" + }, + "6": { + "then": "Dieser Fahrradweg besteht aus unregelmäßigem, unbehauenem Kopfsteinpflaster" + }, + "7": { + "then": "Dieser Fahrradweg besteht aus regelmäßigem, behauenem Kopfsteinpflaster" + }, + "8": { + "then": "Der Radweg ist aus Holz" + }, + "9": { + "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + } + }, + "question": "Was ist der Belag dieses Radwegs?", + "render": "Der Radweg ist aus {cycleway:surface}" + }, + "Is this a cyclestreet? (For a road)": { + "mappings": { + "0": { + "then": "Dies ist eine Fahrradstraße in einer 30km/h Zone." + }, + "1": { + "then": "Dies ist eine Fahrradstraße" + }, + "2": { + "then": "Dies ist keine Fahrradstraße." + } + }, + "question": "Ist das eine Fahrradstraße" + }, + "Maxspeed (for road)": { + "mappings": { + "0": { + "then": "Die Höchstgeschwindigkeit ist 20 km/h" + }, + "1": { + "then": "Die Höchstgeschwindigkeit ist 30 km/h" + }, + "2": { + "then": "Die Höchstgeschwindigkeit ist 50 km/h" + }, + "3": { + "then": "Die Höchstgeschwindigkeit ist 70 km/h" + }, + "4": { + "then": "Die Höchstgeschwindigkeit ist 90 km/h" + } + }, + "question": "Was ist die Höchstgeschwindigkeit auf dieser Straße?", + "render": "Die Höchstgeschwindigkeit auf dieser Straße beträgt {maxspeed} km/h" + }, + "Surface of the road": { + "mappings": { + "0": { + "then": "Dieser Radweg ist nicht befestigt" + }, + "1": { + "then": "Dieser Radweg hat einen festen Belag" + }, + "2": { + "then": "Der Radweg ist aus Asphalt" + }, + "3": { + "then": "Dieser Fahrradweg besteht aus ebenen Pflastersteinen" + }, + "4": { + "then": "Der Radweg ist aus Beton" + }, + "5": { + "then": "Dieser Radweg besteht aus Kopfsteinpflaster" + }, + "6": { + "then": "Dieser Fahrradweg besteht aus unregelmäßigem, unbehauenem Kopfsteinpflaster" + }, + "7": { + "then": "Dieser Fahrradweg besteht aus regelmäßigem, behauenem Kopfsteinpflaster" + }, + "8": { + "then": "Der Radweg ist aus Holz" + }, + "9": { + "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + } + }, + "question": "Was ist der Belag dieser Straße?", + "render": "Der Radweg ist aus {surface}" + }, + "Surface of the street": { + "mappings": { + "0": { + "then": "Geeignet für dünne Rollen: Rollerblades, Skateboard" + }, + "1": { + "then": "Geeignet für dünne Reifen: Rennrad" + }, + "2": { + "then": "Geeignet für normale Reifen: Fahrrad, Rollstuhl, Scooter" + }, + "3": { + "then": "Geeignet für breite Reifen: Trekkingfahrrad, Auto, Rikscha" + }, + "4": { + "then": "Geeignet für Fahrzeuge mit großer Bodenfreiheit: leichte Geländewagen" + }, + "5": { + "then": "Geeignet für Geländefahrzeuge: schwerer Geländewagen" + }, + "6": { + "then": "Geeignet für spezielle Geländewagen: Traktor, ATV" + }, + "7": { + "then": "Unpassierbar / Keine bereiften Fahrzeuge" + } + }, + "question": "Wie eben ist diese Straße?" + }, + "cyclelan-segregation": { + "mappings": { + "0": { + "then": "Der Radweg ist abgegrenzt durch eine gestrichelte Linie" + }, + "1": { + "then": "Der Radweg ist abgegrenzt durch eine durchgezogene Linie" + }, + "2": { + "then": "Der Radweg ist abgegrenzt durch eine Parkspur" + }, + "3": { + "then": "Dieser Radweg ist getrennt durch einen Bordstein" + } + }, + "question": "Wie ist der Radweg von der Straße abgegrenzt?" + }, + "cycleway-lane-track-traffic-signs": { + "mappings": { + "0": { + "then": "Vorgeschriebener Radweg " + }, + "1": { + "then": "Vorgeschriebener Radweg (mit Zusatzschild)
" + }, + "2": { + "then": "Getrennter Fuß-/Radweg " + }, + "3": { + "then": "Gemeinsamer Fuß-/Radweg " + }, + "4": { + "then": "Kein Verkehrsschild vorhanden" + } + }, + "question": "Welches Verkehrszeichen hat dieser Radweg?" + }, + "cycleway-segregation": { + "mappings": { + "0": { + "then": "Der Radweg ist abgegrenzt durch eine gestrichelte Linie" + }, + "1": { + "then": "Der Radweg ist abgegrenzt durch eine durchgezogene Linie" + }, + "2": { + "then": "Der Radweg ist abgegrenzt durch eine Parkspur" + }, + "3": { + "then": "Dieser Radweg ist getrennt durch einen Bordstein" + } + }, + "question": "Wie ist der Radweg von der Straße abgegrenzt?" + }, + "cycleway-traffic-signs": { + "mappings": { + "0": { + "then": "Vorgeschriebener Radweg " + }, + "1": { + "then": "Vorgeschriebener Radweg (mit Zusatzschild)
" + }, + "2": { + "then": "Getrennter Fuß-/Radweg " + }, + "3": { + "then": "Gemeinsamer Fuß-/Radweg " + }, + "4": { + "then": "Kein Verkehrsschild vorhanden" + } + }, + "question": "Welches Verkehrszeichen hat dieser Radweg?" + }, + "cycleway-traffic-signs-D7-supplementary": { + "mappings": { + "1": { + "then": "" + }, + "6": { + "then": "Kein zusätzliches Verkehrszeichen vorhanden" + } + } + }, + "cycleway-traffic-signs-supplementary": { + "mappings": { + "6": { + "then": "Kein zusätzliches Verkehrszeichen vorhanden" + } + } + }, + "cycleways_and_roads-cycleway:buffer": { + "question": "Wie breit ist der Abstand zwischen Radweg und Straße?", + "render": "Der Sicherheitsabstand zu diesem Radweg beträgt {cycleway:buffer} m" + }, + "is lit?": { + "mappings": { + "0": { + "then": "Diese Straße ist beleuchtet" + }, + "1": { + "then": "Diese Straße ist nicht beleuchtet" + }, + "2": { + "then": "Diese Straße ist nachts beleuchtet" + }, + "3": { + "then": "Diese Straße ist durchgehend beleuchtet" + } + }, + "question": "Ist diese Straße beleuchtet?" + } + }, "title": { "mappings": { "0": { "then": "Radweg" }, + "2": { + "then": "Fahrradspur" + }, + "3": { + "then": "Radweg neben der Straße" + }, "4": { "then": "Fahrradstraße" } @@ -1202,6 +1709,9 @@ }, "3": { "then": "Nicht für die Öffentlichkeit zugänglich (z.B. nur für das Personal, die Eigentümer, ...)" + }, + "4": { + "then": "Nicht zugänglich, möglicherweise nur für betriebliche Nutzung" } }, "question": "Ist dieser Defibrillator frei zugänglich?", @@ -1211,8 +1721,12 @@ "mappings": { "0": { "then": "Dies ist ein manueller Defibrillator für den professionellen Einsatz" + }, + "1": { + "then": "Dies ist ein normaler automatischer Defibrillator" } }, + "question": "Ist dies ein normaler automatischer Defibrillator oder ein manueller Defibrillator nur für Profis?", "render": "Es gibt keine Informationen über den Gerätetyp" }, "defibrillator-defibrillator:location": { @@ -1293,11 +1807,15 @@ "render": "Defibrillator" } }, + "direction": { + "description": "Diese Ebene visualisiert Richtungen", + "name": "Visualisierung der Richtung" + }, "drinking_water": { - "name": "Trinkwasser", + "name": "Trinkwasserstelle", "presets": { "0": { - "title": "trinkwasser" + "title": "Trinkwasserstelle" } }, "tagRenderings": { @@ -1313,27 +1831,169 @@ "question": "Wie einfach ist es, Wasserflaschen zu füllen?" }, "Still in use?": { + "mappings": { + "0": { + "then": "Diese Trinkwasserstelle funktioniert" + }, + "1": { + "then": "Diese Trinkwasserstelle ist kaputt" + }, + "2": { + "then": "Diese Trinkwasserstelle wurde geschlossen" + } + }, "question": "Ist diese Trinkwasserstelle noch in Betrieb?", "render": "Der Betriebsstatus ist {operational_status" }, "render-closest-drinking-water": { - "render": "Ein weiterer Trinkwasserbrunnen befindet sich in {_closest_other_drinking_water_distance} Meter" + "render": "Eine weitere Trinkwasserstelle liegt {_closest_other_drinking_water_distance} Meter entfernt" } }, "title": { - "render": "Trinkwasser" + "render": "Trinkwasserstelle" } }, "etymology": { "description": "Alle Objekte, die eine bekannte Namensherkunft haben", "tagRenderings": { "simple etymology": { + "mappings": { + "0": { + "then": "Der Ursprung dieses Namens ist in der gesamten Literatur unbekannt" + } + }, + "question": "Wonach ist dieses Objekt benannt?
Das könnte auf einem Straßenschild stehen", "render": "Benannt nach {name:etymology}" + }, + "wikipedia-etymology": { + "question": "Was ist das Wikidata-Element, nach dem dieses Objekt benannt ist?", + "render": "

Wikipedia Artikel zur Namensherkunft

{wikipedia(name:etymology:wikidata):max-height:20rem}" + } + } + }, + "food": { + "filter": { + "0": { + "options": { + "0": { + "question": "Aktuell geöffnet" + } + } + }, + "1": { + "options": { + "0": { + "question": "Hat vegetarische Speisen" + } + } + }, + "2": { + "options": { + "0": { + "question": "Bietet vegan Speisen an" + } + } + }, + "3": { + "options": { + "0": { + "question": "Hat halal Speisen" + } + } + } + }, + "name": "Restaurants und Fast Food", + "presets": { + "0": { + "description": "Ein klassisches Speiselokal mit Sitzgelegenheiten, in dem vollständige Mahlzeiten von Kellnern serviert werden", + "title": "Restaurant" + }, + "1": { + "title": "Schnellimbiss" + }, + "2": { + "title": "Pommesbude" + } + }, + "tagRenderings": { + "Cuisine": { + "mappings": { + "0": { + "then": "Dies ist eine Pizzeria" + }, + "1": { + "then": "Dies ist eine Pommesbude" + }, + "2": { + "then": "Bietet vorwiegend Pastagerichte an" + } + }, + "question": "Welches Essen gibt es hier?", + "render": "An diesem Ort gibt es hauptsächlich {cuisine}" + }, + "Fastfood vs restaurant": { + "question": "Um was für ein Geschäft handelt es sich?" + }, + "Name": { + "question": "Wie heißt dieses Restaurant?", + "render": "Das Restaurant heißt {name}" + }, + "Takeaway": { + "mappings": { + "0": { + "then": "Dieses Geschäft bietet nur Artikel zur Mitnahme an" + }, + "1": { + "then": "Mitnahme möglich" + }, + "2": { + "then": "Mitnahme nicht möglich" + } + }, + "question": "Ist an diesem Ort Mitnahme möglich?" + }, + "Vegetarian (no friture)": { + "question": "Gibt es im das Restaurant vegetarische Speisen?" + }, + "friture-take-your-container": { + "mappings": { + "0": { + "then": "Sie können ihre eigenen Behälter mitbringen, um Ihre Bestellung zu erhalten, was Einwegverpackungsmaterial und damit Abfall spart" + } + }, + "question": "Wenn Sie Ihr eigenes Behältnis mitbringen (z. B. einen Kochtopf und kleine Töpfe), wird es dann zum Verpacken Ihrer Bestellung verwendet?
" + }, + "halal (no friture)": { + "mappings": { + "0": { + "then": "Hier gibt es keine halal Speisen" + }, + "1": { + "then": "Hier gibt es wenige halal Speisen" + }, + "2": { + "then": "Es gibt halal Speisen" + }, + "3": { + "then": "Es gibt ausschließlich halal Speisen" + } + }, + "question": "Gibt es im das Restaurant halal Speisen?" + } + }, + "title": { + "mappings": { + "0": { + "then": "Restaurant {name}" + }, + "1": { + "then": "Schnellrestaurant{name}" + } } } }, "ghost_bike": { - "name": "Geisterrad", + "name": "Geisterräder", "presets": { "0": { "title": "Geisterrad" @@ -1341,7 +2001,7 @@ }, "tagRenderings": { "ghost-bike-explanation": { - "render": "Ein Geisterrad ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt wird." + "render": "Ein Geisterrad ist ein weißes Fahrrad, dass zum Gedenken eines tödlich verunglückten Radfahrers vor Ort aufgestellt wurde." }, "ghost_bike-inscription": { "question": "Wie lautet die Inschrift auf diesem Geisterrad?", @@ -1359,6 +2019,10 @@ "ghost_bike-source": { "question": "Auf welcher Webseite kann man mehr Informationen über das Geisterrad oder den Unfall finden?", "render": "Mehr Informationen" + }, + "ghost_bike-start_date": { + "question": "Wann wurde dieses Geisterrad aufgestellt?", + "render": "Aufgestellt am {start_date}" } }, "title": { @@ -1382,6 +2046,7 @@ } }, "map": { + "description": "Eine Karte, die für Touristen gedacht ist und dauerhaft im öffentlichen Raum aufgestellt ist", "name": "Karten", "presets": { "0": { @@ -1426,6 +2091,9 @@ }, "nature_reserve": { "tagRenderings": { + "Curator": { + "question": "Wer ist der Verwalter dieses Naturschutzgebietes?
Respektieren Sie die Privatsphäre - geben Sie nur dann einen Namen an, wenn dieser allgemein bekannt ist" + }, "Dogs?": { "mappings": { "0": { @@ -1443,6 +2111,9 @@ "Email": { "render": "{email}" }, + "Surface area": { + "render": "Grundfläche: {_surface:ha}ha" + }, "Website": { "question": "Auf welcher Webseite kann man mehr Informationen über dieses Naturschutzgebiet finden?" }, @@ -1451,7 +2122,62 @@ } } }, + "observation_tower": { + "description": "Türme zur Aussicht auf die umgebende Landschaft", + "name": "Aussichtstürme", + "presets": { + "0": { + "title": "Beobachtungsturm" + } + }, + "tagRenderings": { + "Fee": { + "mappings": { + "0": { + "then": "Eintritt kostenlos" + } + }, + "question": "Was kostet der Zugang zu diesem Turm?", + "render": "Der Besuch des Turms kostet {charge}" + }, + "Height": { + "question": "Wie hoch ist dieser Turm?", + "render": "Dieser Turm ist {height} hoch" + }, + "Operator": { + "question": "Wer betreibt diesen Turm?", + "render": "Betrieben von {operator}" + }, + "name": { + "mappings": { + "0": { + "then": "Dieser Turm hat keinen eigenen Namen" + } + }, + "question": "Wie heißt dieser Turm?", + "render": "Der Name dieses Turms lautet {name}" + } + }, + "title": { + "mappings": { + "0": { + "then": "{name}" + } + }, + "render": "Beobachtungsturm" + }, + "units": { + "0": { + "applicableUnits": { + "0": { + "human": " Meter" + } + } + } + } + }, "picnic_table": { + "description": "Die Ebene zeigt Picknicktische an", "name": "Picknick-Tische", "presets": { "0": { @@ -1479,6 +2205,11 @@ "playground": { "description": "Spielplätze", "name": "Spielplätze", + "presets": { + "0": { + "title": "Spielplatz" + } + }, "tagRenderings": { "Playground-wheelchair": { "mappings": { @@ -1529,11 +2260,34 @@ }, "question": "Ist dieser Spielplatz nachts beleuchtet?" }, + "playground-max_age": { + "question": "Bis zu welchem Alter dürfen Kinder auf diesem Spielplatz spielen?", + "render": "Zugang nur für Kinder bis maximal {max_age}" + }, + "playground-min_age": { + "question": "Ab welchem Alter dürfen Kinder auf diesem Spielplatz spielen?", + "render": "Zugang nur für Kinder ab {min_age} Jahren" + }, + "playground-opening_hours": { + "mappings": { + "0": { + "then": "Zugänglich von Sonnenaufgang bis Sonnenuntergang" + }, + "1": { + "then": "Immer zugänglich" + }, + "2": { + "then": "Immer zugänglich" + } + }, + "question": "Wann ist dieser Spielplatz zugänglich?" + }, "playground-operator": { "question": "Wer betreibt diesen Spielplatz?", "render": "Betrieben von {operator}" }, "playground-phone": { + "question": "Wie lautet die Telefonnummer vom Betreiber des Spielplatzes?", "render": "{phone}" }, "playground-surface": { @@ -1578,6 +2332,15 @@ }, "public_bookcase": { "description": "Ein Bücherschrank am Straßenrand mit Büchern, für jedermann zugänglich", + "filter": { + "2": { + "options": { + "0": { + "question": "Innen oder Außen" + } + } + } + }, "name": "Bücherschränke", "presets": { "0": { @@ -1680,7 +2443,337 @@ "render": "Bücherschrank" } }, + "shops": { + "description": "Ein Geschäft", + "name": "Geschäft", + "presets": { + "0": { + "description": "Ein neues Geschäft hinzufügen", + "title": "Geschäft" + } + }, + "tagRenderings": { + "shops-email": { + "question": "Wie ist die Email-Adresse dieses Geschäfts?" + }, + "shops-name": { + "question": "Wie ist der Name dieses Geschäfts?" + }, + "shops-opening_hours": { + "question": "Wie sind die Öffnungszeiten dieses Geschäfts?" + }, + "shops-phone": { + "question": "Wie ist die Telefonnummer?", + "render": "{phone}" + }, + "shops-shop": { + "mappings": { + "0": { + "then": "Lebensmittelladen" + }, + "1": { + "then": "Supermarkt" + }, + "2": { + "then": "Bekleidungsgeschäft" + }, + "3": { + "then": "Friseur" + }, + "4": { + "then": "Bäckerei" + }, + "5": { + "then": "Autoreparatur (Werkstatt)" + }, + "6": { + "then": "Autohändler" + } + }, + "question": "Was wird in diesem Geschäft verkauft?", + "render": "Dieses Geschäft verkauft {shop}" + }, + "shops-website": { + "question": "Wie lautet die Webseite dieses Geschäfts?", + "render": "{website}" + } + }, + "title": { + "mappings": { + "0": { + "then": "{name}" + }, + "1": { + "then": "{shop}" + } + }, + "render": "Geschäft" + } + }, + "slow_roads": { + "tagRenderings": { + "slow_roads-surface": { + "mappings": { + "0": { + "then": "Die Oberfläche ist Gras" + }, + "1": { + "then": "Die Oberfläche ist Erde" + }, + "2": { + "then": "Die Oberfläche ist ohne festen Belag" + }, + "3": { + "then": "Die Oberfläche ist Sand" + }, + "4": { + "then": "Die Oberfläche ist aus Pflastersteinen" + }, + "5": { + "then": "Die Oberfläche ist Asphalt" + }, + "6": { + "then": "Die Oberfläche ist Beton" + }, + "7": { + "then": "Die Oberfläche ist gepflastert" + } + }, + "render": "Die Oberfläche ist {surface}" + } + } + }, + "sport_pitch": { + "description": "Ein Sportplatz", + "name": "Sportplätze", + "presets": { + "0": { + "title": "Tischtennisplatte" + }, + "1": { + "title": "Sportplatz" + } + }, + "tagRenderings": { + "sport-pitch-access": { + "mappings": { + "0": { + "then": "Öffentlicher Zugang" + }, + "1": { + "then": "Eingeschränkter Zugang (z. B. nur mit Termin, zu bestimmten Zeiten, ...)" + }, + "2": { + "then": "Zugang nur für Vereinsmitglieder" + }, + "3": { + "then": "Privat - kein öffentlicher Zugang" + } + }, + "question": "Ist dieser Sportplatz öffentlich zugänglich?" + }, + "sport-pitch-reservation": { + "mappings": { + "0": { + "then": "Für die Nutzung des Sportplatzes ist eine Voranmeldung erforderlich" + }, + "1": { + "then": "Für die Nutzung des Sportplatzes wird eine Voranmeldung empfohlen" + }, + "2": { + "then": "Eine Voranmeldung ist möglich, aber nicht notwendig, um diesen Sportplatz zu nutzen" + }, + "3": { + "then": "Termine nach Vereinbarung nicht möglich" + } + }, + "question": "Muss man einen Termin vereinbaren, um diesen Sportplatz zu benutzen?" + }, + "sport_pitch-email": { + "question": "Wie ist die Email-Adresse des Betreibers?" + }, + "sport_pitch-opening_hours": { + "mappings": { + "1": { + "then": "Immer zugänglich" + } + }, + "question": "Wann ist dieser Sportplatz zugänglich?" + }, + "sport_pitch-phone": { + "question": "Wie ist die Telefonnummer des Betreibers?" + }, + "sport_pitch-sport": { + "mappings": { + "0": { + "then": "Hier wird Basketball gespielt" + }, + "1": { + "then": "Hier wird Fußball gespielt" + }, + "2": { + "then": "Dies ist eine Tischtennisplatte" + }, + "3": { + "then": "Hier wird Tennis gespielt" + }, + "4": { + "then": "Hier wird Kopfball gespielt" + }, + "5": { + "then": "Hier wird Basketball gespielt" + } + }, + "question": "Welche Sportarten können hier gespielt werden?", + "render": "Hier wird {sport} gespielt" + }, + "sport_pitch-surface": { + "mappings": { + "0": { + "then": "Die Oberfläche ist Gras" + }, + "1": { + "then": "Die Oberfläche ist Sand" + }, + "2": { + "then": "Die Oberfläche ist aus Pflastersteinen" + }, + "3": { + "then": "Die Oberfläche ist Asphalt" + }, + "4": { + "then": "Die Oberfläche ist Beton" + } + }, + "question": "Was ist die Oberfläche dieses Sportplatzes?", + "render": "Die Oberfläche ist {surface}" + } + }, + "title": { + "render": "Sportplatz" + } + }, + "surveillance_camera": { + "name": "Überwachungskameras", + "tagRenderings": { + "Camera type: fixed; panning; dome": { + "mappings": { + "0": { + "then": "Eine fest montierte (nicht bewegliche) Kamera" + }, + "1": { + "then": "Eine Kuppelkamera (drehbar)" + }, + "2": { + "then": "Eine bewegliche Kamera" + } + }, + "question": "Um welche Kameratyp handelt se sich?" + }, + "Indoor camera? This isn't clear for 'public'-cameras": { + "mappings": { + "0": { + "then": "Diese Kamera befindet sich im Innenraum" + }, + "1": { + "then": "Diese Kamera befindet sich im Freien" + }, + "2": { + "then": "Diese Kamera ist möglicherweise im Freien" + } + }, + "question": "Handelt es sich bei dem von dieser Kamera überwachten öffentlichen Raum um einen Innen- oder Außenbereich?" + }, + "Level": { + "question": "Auf welcher Ebene befindet sich diese Kamera?", + "render": "Befindet sich auf Ebene {level}" + }, + "Operator": { + "question": "Wer betreibt diese CCTV Kamera?", + "render": "Betrieben von {operator}" + }, + "Surveillance type: public, outdoor, indoor": { + "mappings": { + "1": { + "then": "Ein privater Außenbereich wird überwacht (z. B. ein Parkplatz, eine Tankstelle, ein Innenhof, ein Eingang, eine private Einfahrt, ...)" + }, + "2": { + "then": "Ein privater Innenbereich wird überwacht, z. B. ein Geschäft, eine private Tiefgarage, ..." + } + }, + "question": "Um was für eine Überwachungskamera handelt es sich" + }, + "Surveillance:zone": { + "mappings": { + "0": { + "then": "Überwacht einen Parkplatz" + }, + "1": { + "then": "Überwacht den Verkehr" + }, + "2": { + "then": "Überwacht einen Eingang" + }, + "3": { + "then": "Überwacht einen Gang" + }, + "4": { + "then": "Überwacht eine Haltestelle" + }, + "5": { + "then": "Überwacht ein Geschäft" + } + }, + "question": "Was genau wird hier überwacht?", + "render": " Überwacht ein/e {surveillance:zone}" + }, + "camera:mount": { + "mappings": { + "0": { + "then": "Diese Kamera ist an einer Wand montiert" + }, + "1": { + "then": "Diese Kamera ist an einer Stange montiert" + }, + "2": { + "then": "Diese Kamera ist an der Decke montiert" + } + }, + "question": "Wie ist diese Kamera montiert?", + "render": "Montageart: {mount}" + }, + "direction. We don't ask this for a dome on a pole or ceiling as it has a 360° view": { + "question": "In welche Himmelsrichtung ist diese Kamera ausgerichtet?" + } + }, + "title": { + "render": "Überwachungskamera" + } + }, "toilet": { + "filter": { + "0": { + "options": { + "0": { + "question": "Rollstuhlgerecht" + } + } + }, + "1": { + "options": { + "0": { + "question": "Hat einen Wickeltisch" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nutzung kostenlos" + } + } + } + }, "name": "Toiletten", "presets": { "0": { @@ -1736,6 +2829,25 @@ "question": "Wie viel muss man für diese Toiletten bezahlen?", "render": "Die Gebühr beträgt {charge}" }, + "toilet-handwashing": { + "mappings": { + "0": { + "then": "Diese Toilette verfügt über ein Waschbecken" + }, + "1": { + "then": "Diese Toilette verfügt über kein Waschbecken" + } + }, + "question": "Verfügt diese Toilette über ein Waschbecken?" + }, + "toilet-has-paper": { + "mappings": { + "1": { + "then": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen" + } + }, + "question": "Muss man für diese Toilette sein eigenes Toilettenpapier mitbringen?" + }, "toilets-changing-table": { "mappings": { "0": { @@ -1791,13 +2903,136 @@ "render": "Toilette" } }, + "trail": { + "name": "Wanderwege", + "tagRenderings": { + "Color": { + "mappings": { + "0": { + "then": "Blauer Weg" + }, + "1": { + "then": "Roter Weg" + }, + "2": { + "then": "Grüner Weg" + }, + "3": { + "then": "Gelber Weg" + } + } + }, + "trail-length": { + "render": "Der Wanderweg ist {_length:km} Kilometer lang" + } + }, + "title": { + "render": "Wanderweg" + } + }, "tree_node": { "name": "Baum", "presets": { + "0": { + "description": "Ein Baum mit Blättern, z. B. Eiche oder Buche.", + "title": "Laubbaum" + }, + "1": { + "description": "Ein Baum mit Nadeln, z. B. Kiefer oder Fichte.", + "title": "Nadelbaum" + }, "2": { + "description": "Wenn Sie nicht sicher sind, ob es sich um einen Laubbaum oder einen Nadelbaum handelt.", "title": "Baum" } }, + "tagRenderings": { + "tree-decidouous": { + "mappings": { + "0": { + "then": "Laubabwerfend: Der Baum verliert für eine gewisse Zeit des Jahres seine Blätter." + }, + "1": { + "then": "immergrüner Baum." + } + }, + "question": "Ist dies ein Nadelbaum oder ein Laubbaum?" + }, + "tree-denotation": { + "mappings": { + "0": { + "then": "Der Baum ist aufgrund seiner Größe oder seiner markanten Lage bedeutsam. Er ist nützlich zur Orientierung." + }, + "1": { + "then": "Der Baum ist ein Naturdenkmal, z. B. weil er besonders alt ist oder zu einer wertvollen Art gehört." + }, + "2": { + "then": "Der Baum wird für landwirtschaftliche Zwecke genutzt, z. B. in einer Obstplantage." + }, + "3": { + "then": "Der Baum steht in einem Park oder ähnlichem (Friedhof, Schulgelände, ...)." + }, + "5": { + "then": "Dieser Baum steht entlang einer Straße." + }, + "7": { + "then": "Dieser Baum steht außerhalb eines städtischen Gebiets." + } + }, + "question": "Wie bedeutsam ist dieser Baum? Wählen Sie die erste Antwort, die zutrifft." + }, + "tree-height": { + "mappings": { + "0": { + "then": "Höhe: {height} m" + } + }, + "render": "Höhe: {height}" + }, + "tree-heritage": { + "mappings": { + "0": { + "then": "\"\"/ Als Denkmal registriert von der Onroerend Erfgoed Flandern" + }, + "1": { + "then": "Als Denkmal registriert von der Direction du Patrimoine culturel Brüssel" + }, + "3": { + "then": "Nicht als Denkmal registriert" + } + }, + "question": "Ist dieser Baum ein Naturdenkmal?" + }, + "tree-leaf_type": { + "mappings": { + "0": { + "then": "\"\"/ Laubbaum" + }, + "1": { + "then": "\"\"/ Nadelbaum" + }, + "2": { + "then": "\"\"/ Dauerhaft blattlos" + } + }, + "question": "Ist dies ein Laub- oder Nadelbaum?" + }, + "tree_node-name": { + "mappings": { + "0": { + "then": "Der Baum hat keinen Namen." + } + }, + "question": "Hat der Baum einen Namen?", + "render": "Name: {name}" + }, + "tree_node-ref:OnroerendErfgoed": { + "question": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?" + }, + "tree_node-wikidata": { + "question": "Was ist das passende Wikidata Element zu diesem Baum?" + } + }, "title": { "mappings": { "0": { @@ -1825,6 +3060,7 @@ } }, "visitor_information_centre": { + "description": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet.", "name": "Besucherinformationszentrum", "title": { "mappings": { @@ -1836,7 +3072,59 @@ } }, "waste_basket": { - "description": "Dies ist ein öffentlicher Abfalleimer, in den Sie Ihren Müll entsorgen können." + "description": "Dies ist ein öffentlicher Abfalleimer, in den Sie Ihren Müll entsorgen können.", + "iconSize": { + "mappings": { + "0": { + "then": "Abfalleimer" + } + } + }, + "name": "Abfalleimer", + "presets": { + "0": { + "title": "Abfalleimer" + } + }, + "tagRenderings": { + "dispensing_dog_bags": { + "mappings": { + "0": { + "then": "Dieser Abfalleimer verfügt über einen Spender für (Hunde-)Kotbeutel" + }, + "1": { + "then": "Dieser Abfalleimer hat keinen Spender für (Hunde-)Kotbeutel" + }, + "2": { + "then": "Dieser Abfalleimer hat keinen Spender für (Hunde-)Kotbeutel" + } + }, + "question": "Verfügt dieser Abfalleimer über einen Spender für (Hunde-)Kotbeutel?" + }, + "waste-basket-waste-types": { + "mappings": { + "0": { + "then": "Ein Abfalleimer für allgemeinen Müll" + }, + "1": { + "then": "Ein Abfalleimer für allgemeinen Müll" + }, + "2": { + "then": "Ein Abfalleimer für Hundekot" + }, + "3": { + "then": "Mülleimer für Zigaretten" + }, + "4": { + "then": "Mülleimer für Drogen" + } + }, + "question": "Um was für einen Abfalleimer handelt es sich?" + } + }, + "title": { + "render": "Abfalleimer" + } }, "watermill": { "name": "Wassermühle" diff --git a/langs/layers/en.json b/langs/layers/en.json index ac83b2b58d..bc4d34c4af 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -544,9 +544,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "name": "Bike stations (repair, pump or both)", "presets": { "0": { @@ -1009,6 +1006,15 @@ "presets": { "0": { "title": "Charging station" + }, + "1": { + "title": "charging station for e-bikes" + }, + "2": { + "title": "charging station for cars" + }, + "3": { + "title": "charging station" } }, "tagRenderings": { @@ -1169,19 +1175,19 @@ "Operational status": { "mappings": { "0": { - "then": "This charging station is broken" + "then": "This charging station works" }, "1": { - "then": "A charging station is planned here" + "then": "This charging station is broken" }, "2": { - "then": "A charging station is constructed here" + "then": "A charging station is planned here" }, "3": { - "then": "This charging station has beed permanently disabled and is not in use anymore but is still visible" + "then": "A charging station is constructed here" }, "4": { - "then": "This charging station works" + "then": "This charging station has beed permanently disabled and is not in use anymore but is still visible" } }, "question": "Is this charging point in use?" @@ -1228,186 +1234,30 @@ }, "access": { "question": "Who is allowed to use this charging station?", - "render": "Access is {access}" + "render": "Access is {access}", + "mappings": { + "0": { + "then": "Anyone can use this charging station (payment might be needed)" + }, + "1": { + "then": "Anyone can use this charging station (payment might be needed)" + }, + "2": { + "then": "Only customers of the place this station belongs to can use this charging station
E.g. a charging station operated by hotel which is only usable by their guests" + }, + "3": { + "then": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)" + } + } }, "capacity": { "question": "How much vehicles can be charged here at the same time?", "render": "{capacity} vehicles can be charged here at the same time" }, - "current-0": { - "mappings": { - "0": { - "then": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most 16 A" - } - }, - "question": "What current do the plugs with
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", - "render": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most {socket:schuko:current}A" - }, - "current-1": { - "mappings": { - "0": { - "then": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most 16 A" - } - }, - "question": "What current do the plugs with
European wall plug with ground pin (CEE7/4 type E)
offer?", - "render": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most {socket:typee:current}A" - }, - "current-10": { - "mappings": { - "0": { - "then": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most 125 A" - }, - "1": { - "then": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most 350 A" - } - }, - "question": "What current do the plugs with
Tesla Supercharger CCS (a branded type2_css)
offer?", - "render": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most {socket:tesla_supercharger_ccs:current}A" - }, - "current-11": { - "mappings": { - "0": { - "then": "
Tesla Supercharger (destination)
outputs at most 125 A" - }, - "1": { - "then": "
Tesla Supercharger (destination)
outputs at most 350 A" - } - }, - "question": "What current do the plugs with
Tesla Supercharger (destination)
offer?", - "render": "
Tesla Supercharger (destination)
outputs at most {socket:tesla_destination:current}A" - }, - "current-12": { - "mappings": { - "0": { - "then": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 16 A" - }, - "1": { - "then": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 32 A" - } - }, - "question": "What current do the plugs with
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
offer?", - "render": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most {socket:tesla_destination:current}A" - }, - "current-13": { - "mappings": { - "0": { - "then": "
USB to charge phones and small electronics
outputs at most 1 A" - }, - "1": { - "then": "
USB to charge phones and small electronics
outputs at most 2 A" - } - }, - "question": "What current do the plugs with
USB to charge phones and small electronics
offer?", - "render": "
USB to charge phones and small electronics
outputs at most {socket:USB-A:current}A" - }, - "current-14": { - "question": "What current do the plugs with
Bosch Active Connect with 3 pins and cable
offer?", - "render": "
Bosch Active Connect with 3 pins and cable
outputs at most {socket:bosch_3pin:current}A" - }, - "current-15": { - "question": "What current do the plugs with
Bosch Active Connect with 5 pins and cable
offer?", - "render": "
Bosch Active Connect with 5 pins and cable
outputs at most {socket:bosch_5pin:current}A" - }, - "current-2": { - "mappings": { - "0": { - "then": "
Chademo
outputs at most 120 A" - } - }, - "question": "What current do the plugs with
Chademo
offer?", - "render": "
Chademo
outputs at most {socket:chademo:current}A" - }, - "current-3": { - "mappings": { - "0": { - "then": "
Type 1 with cable (J1772)
outputs at most 32 A" - } - }, - "question": "What current do the plugs with
Type 1 with cable (J1772)
offer?", - "render": "
Type 1 with cable (J1772)
outputs at most {socket:type1_cable:current}A" - }, - "current-4": { - "mappings": { - "0": { - "then": "
Type 1 without cable (J1772)
outputs at most 32 A" - } - }, - "question": "What current do the plugs with
Type 1 without cable (J1772)
offer?", - "render": "
Type 1 without cable (J1772)
outputs at most {socket:type1:current}A" - }, - "current-5": { - "mappings": { - "0": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 50 A" - }, - "1": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 125 A" - } - }, - "question": "What current do the plugs with
Type 1 CCS (aka Type 1 Combo)
offer?", - "render": "
Type 1 CCS (aka Type 1 Combo)
outputs at most {socket:type1_combo:current}A" - }, - "current-6": { - "mappings": { - "0": { - "then": "
Tesla Supercharger
outputs at most 125 A" - }, - "1": { - "then": "
Tesla Supercharger
outputs at most 350 A" - } - }, - "question": "What current do the plugs with
Tesla Supercharger
offer?", - "render": "
Tesla Supercharger
outputs at most {socket:tesla_supercharger:current}A" - }, - "current-7": { - "mappings": { - "0": { - "then": "
Type 2 (mennekes)
outputs at most 16 A" - }, - "1": { - "then": "
Type 2 (mennekes)
outputs at most 32 A" - } - }, - "question": "What current do the plugs with
Type 2 (mennekes)
offer?", - "render": "
Type 2 (mennekes)
outputs at most {socket:type2:current}A" - }, - "current-8": { - "mappings": { - "0": { - "then": "
Type 2 CCS (mennekes)
outputs at most 125 A" - }, - "1": { - "then": "
Type 2 CCS (mennekes)
outputs at most 350 A" - } - }, - "question": "What current do the plugs with
Type 2 CCS (mennekes)
offer?", - "render": "
Type 2 CCS (mennekes)
outputs at most {socket:type2_combo:current}A" - }, - "current-9": { - "mappings": { - "0": { - "then": "
Type 2 with cable (mennekes)
outputs at most 16 A" - }, - "1": { - "then": "
Type 2 with cable (mennekes)
outputs at most 32 A" - } - }, - "question": "What current do the plugs with
Type 2 with cable (mennekes)
offer?", - "render": "
Type 2 with cable (mennekes)
outputs at most {socket:type2_cable:current}A" - }, "email": { "question": "What is the email address of the operator?", "render": "In case of problems, send an email to {email}" }, - "fee/charge": { - "mappings": { - "0": { - "then": "Free to use" - } - }, - "question": "How much does one have to pay to use this charging station?", - "render": "Using this charging station costs {charge}" - }, "maxstay": { "mappings": { "0": { @@ -1497,353 +1347,37 @@ "question": "How much plugs of type
Type 2 with cable (mennekes)
are available here?", "render": "There are {socket:type2_cable} plugs of type
Type 2 with cable (mennekes)
available here" }, - "power-output-0": { - "mappings": { - "0": { - "then": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most 3.6 kw" - } - }, - "question": "What power output does a single plug of type
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", - "render": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most {socket:schuko:output}" - }, - "power-output-1": { - "mappings": { - "0": { - "then": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most 3 kw" - }, - "1": { - "then": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most 22 kw" - } - }, - "question": "What power output does a single plug of type
European wall plug with ground pin (CEE7/4 type E)
offer?", - "render": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most {socket:typee:output}" - }, - "power-output-10": { - "mappings": { - "0": { - "then": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most 50 kw" - } - }, - "question": "What power output does a single plug of type
Tesla Supercharger CCS (a branded type2_css)
offer?", - "render": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most {socket:tesla_supercharger_ccs:output}" - }, - "power-output-11": { - "mappings": { - "0": { - "then": "
Tesla Supercharger (destination)
outputs at most 120 kw" - }, - "1": { - "then": "
Tesla Supercharger (destination)
outputs at most 150 kw" - }, - "2": { - "then": "
Tesla Supercharger (destination)
outputs at most 250 kw" - } - }, - "question": "What power output does a single plug of type
Tesla Supercharger (destination)
offer?", - "render": "
Tesla Supercharger (destination)
outputs at most {socket:tesla_destination:output}" - }, - "power-output-12": { - "mappings": { - "0": { - "then": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 11 kw" - }, - "1": { - "then": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most 22 kw" - } - }, - "question": "What power output does a single plug of type
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
offer?", - "render": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs at most {socket:tesla_destination:output}" - }, - "power-output-13": { - "mappings": { - "0": { - "then": "
USB to charge phones and small electronics
outputs at most 5w" - }, - "1": { - "then": "
USB to charge phones and small electronics
outputs at most 10w" - } - }, - "question": "What power output does a single plug of type
USB to charge phones and small electronics
offer?", - "render": "
USB to charge phones and small electronics
outputs at most {socket:USB-A:output}" - }, - "power-output-14": { - "question": "What power output does a single plug of type
Bosch Active Connect with 3 pins and cable
offer?", - "render": "
Bosch Active Connect with 3 pins and cable
outputs at most {socket:bosch_3pin:output}" - }, - "power-output-15": { - "question": "What power output does a single plug of type
Bosch Active Connect with 5 pins and cable
offer?", - "render": "
Bosch Active Connect with 5 pins and cable
outputs at most {socket:bosch_5pin:output}" - }, - "power-output-2": { - "mappings": { - "0": { - "then": "
Chademo
outputs at most 50 kw" - } - }, - "question": "What power output does a single plug of type
Chademo
offer?", - "render": "
Chademo
outputs at most {socket:chademo:output}" - }, - "power-output-3": { - "mappings": { - "0": { - "then": "
Type 1 with cable (J1772)
outputs at most 3.7 kw" - }, - "1": { - "then": "
Type 1 with cable (J1772)
outputs at most 7 kw" - } - }, - "question": "What power output does a single plug of type
Type 1 with cable (J1772)
offer?", - "render": "
Type 1 with cable (J1772)
outputs at most {socket:type1_cable:output}" - }, - "power-output-4": { - "mappings": { - "0": { - "then": "
Type 1 without cable (J1772)
outputs at most 3.7 kw" - }, - "1": { - "then": "
Type 1 without cable (J1772)
outputs at most 6.6 kw" - }, - "2": { - "then": "
Type 1 without cable (J1772)
outputs at most 7 kw" - }, - "3": { - "then": "
Type 1 without cable (J1772)
outputs at most 7.2 kw" - } - }, - "question": "What power output does a single plug of type
Type 1 without cable (J1772)
offer?", - "render": "
Type 1 without cable (J1772)
outputs at most {socket:type1:output}" - }, - "power-output-5": { - "mappings": { - "0": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 50 kw" - }, - "1": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 62.5 kw" - }, - "2": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 150 kw" - }, - "3": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs at most 350 kw" - } - }, - "question": "What power output does a single plug of type
Type 1 CCS (aka Type 1 Combo)
offer?", - "render": "
Type 1 CCS (aka Type 1 Combo)
outputs at most {socket:type1_combo:output}" - }, - "power-output-6": { - "mappings": { - "0": { - "then": "
Tesla Supercharger
outputs at most 120 kw" - }, - "1": { - "then": "
Tesla Supercharger
outputs at most 150 kw" - }, - "2": { - "then": "
Tesla Supercharger
outputs at most 250 kw" - } - }, - "question": "What power output does a single plug of type
Tesla Supercharger
offer?", - "render": "
Tesla Supercharger
outputs at most {socket:tesla_supercharger:output}" - }, - "power-output-7": { - "mappings": { - "0": { - "then": "
Type 2 (mennekes)
outputs at most 11 kw" - }, - "1": { - "then": "
Type 2 (mennekes)
outputs at most 22 kw" - } - }, - "question": "What power output does a single plug of type
Type 2 (mennekes)
offer?", - "render": "
Type 2 (mennekes)
outputs at most {socket:type2:output}" - }, - "power-output-8": { - "mappings": { - "0": { - "then": "
Type 2 CCS (mennekes)
outputs at most 50 kw" - } - }, - "question": "What power output does a single plug of type
Type 2 CCS (mennekes)
offer?", - "render": "
Type 2 CCS (mennekes)
outputs at most {socket:type2_combo:output}" - }, - "power-output-9": { - "mappings": { - "0": { - "then": "
Type 2 with cable (mennekes)
outputs at most 11 kw" - }, - "1": { - "then": "
Type 2 with cable (mennekes)
outputs at most 22 kw" - } - }, - "question": "What power output does a single plug of type
Type 2 with cable (mennekes)
offer?", - "render": "
Type 2 with cable (mennekes)
outputs at most {socket:type2_cable:output}" - }, "ref": { "question": "What is the reference number of this charging station?", "render": "Reference number is {ref}" }, - "voltage-0": { - "mappings": { - "0": { - "then": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs 230 volt" - } - }, - "question": "What voltage do the plugs with
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", - "render": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs {socket:schuko:voltage} volt" - }, - "voltage-1": { - "mappings": { - "0": { - "then": "
European wall plug with ground pin (CEE7/4 type E)
outputs 230 volt" - } - }, - "question": "What voltage do the plugs with
European wall plug with ground pin (CEE7/4 type E)
offer?", - "render": "
European wall plug with ground pin (CEE7/4 type E)
outputs {socket:typee:voltage} volt" - }, - "voltage-10": { - "mappings": { - "0": { - "then": "
Tesla Supercharger CCS (a branded type2_css)
outputs 500 volt" - }, - "1": { - "then": "
Tesla Supercharger CCS (a branded type2_css)
outputs 920 volt" - } - }, - "question": "What voltage do the plugs with
Tesla Supercharger CCS (a branded type2_css)
offer?", - "render": "
Tesla Supercharger CCS (a branded type2_css)
outputs {socket:tesla_supercharger_ccs:voltage} volt" - }, - "voltage-11": { - "mappings": { - "0": { - "then": "
Tesla Supercharger (destination)
outputs 480 volt" - } - }, - "question": "What voltage do the plugs with
Tesla Supercharger (destination)
offer?", - "render": "
Tesla Supercharger (destination)
outputs {socket:tesla_destination:voltage} volt" - }, - "voltage-12": { - "mappings": { - "0": { - "then": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs 230 volt" - }, - "1": { - "then": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs 400 volt" - } - }, - "question": "What voltage do the plugs with
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
offer?", - "render": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla)
outputs {socket:tesla_destination:voltage} volt" - }, - "voltage-13": { - "mappings": { - "0": { - "then": "
USB to charge phones and small electronics
outputs 5 volt" - } - }, - "question": "What voltage do the plugs with
USB to charge phones and small electronics
offer?", - "render": "
USB to charge phones and small electronics
outputs {socket:USB-A:voltage} volt" - }, - "voltage-14": { - "question": "What voltage do the plugs with
Bosch Active Connect with 3 pins and cable
offer?", - "render": "
Bosch Active Connect with 3 pins and cable
outputs {socket:bosch_3pin:voltage} volt" - }, - "voltage-15": { - "question": "What voltage do the plugs with
Bosch Active Connect with 5 pins and cable
offer?", - "render": "
Bosch Active Connect with 5 pins and cable
outputs {socket:bosch_5pin:voltage} volt" - }, - "voltage-2": { - "mappings": { - "0": { - "then": "
Chademo
outputs 500 volt" - } - }, - "question": "What voltage do the plugs with
Chademo
offer?", - "render": "
Chademo
outputs {socket:chademo:voltage} volt" - }, - "voltage-3": { - "mappings": { - "0": { - "then": "
Type 1 with cable (J1772)
outputs 200 volt" - }, - "1": { - "then": "
Type 1 with cable (J1772)
outputs 240 volt" - } - }, - "question": "What voltage do the plugs with
Type 1 with cable (J1772)
offer?", - "render": "
Type 1 with cable (J1772)
outputs {socket:type1_cable:voltage} volt" - }, - "voltage-4": { - "mappings": { - "0": { - "then": "
Type 1 without cable (J1772)
outputs 200 volt" - }, - "1": { - "then": "
Type 1 without cable (J1772)
outputs 240 volt" - } - }, - "question": "What voltage do the plugs with
Type 1 without cable (J1772)
offer?", - "render": "
Type 1 without cable (J1772)
outputs {socket:type1:voltage} volt" - }, - "voltage-5": { - "mappings": { - "0": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs 400 volt" - }, - "1": { - "then": "
Type 1 CCS (aka Type 1 Combo)
outputs 1000 volt" - } - }, - "question": "What voltage do the plugs with
Type 1 CCS (aka Type 1 Combo)
offer?", - "render": "
Type 1 CCS (aka Type 1 Combo)
outputs {socket:type1_combo:voltage} volt" - }, - "voltage-6": { - "mappings": { - "0": { - "then": "
Tesla Supercharger
outputs 480 volt" - } - }, - "question": "What voltage do the plugs with
Tesla Supercharger
offer?", - "render": "
Tesla Supercharger
outputs {socket:tesla_supercharger:voltage} volt" - }, - "voltage-7": { - "mappings": { - "0": { - "then": "
Type 2 (mennekes)
outputs 230 volt" - }, - "1": { - "then": "
Type 2 (mennekes)
outputs 400 volt" - } - }, - "question": "What voltage do the plugs with
Type 2 (mennekes)
offer?", - "render": "
Type 2 (mennekes)
outputs {socket:type2:voltage} volt" - }, - "voltage-8": { - "mappings": { - "0": { - "then": "
Type 2 CCS (mennekes)
outputs 500 volt" - }, - "1": { - "then": "
Type 2 CCS (mennekes)
outputs 920 volt" - } - }, - "question": "What voltage do the plugs with
Type 2 CCS (mennekes)
offer?", - "render": "
Type 2 CCS (mennekes)
outputs {socket:type2_combo:voltage} volt" - }, - "voltage-9": { - "mappings": { - "0": { - "then": "
Type 2 with cable (mennekes)
outputs 230 volt" - }, - "1": { - "then": "
Type 2 with cable (mennekes)
outputs 400 volt" - } - }, - "question": "What voltage do the plugs with
Type 2 with cable (mennekes)
offer?", - "render": "
Type 2 with cable (mennekes)
outputs {socket:type2_cable:voltage} volt" - }, "website": { "question": "What is the website of the operator?", "render": "More info on {website}" + }, + "fee": { + "mappings": { + "0": { + "then": "Free to use" + }, + "1": { + "then": "Free to use (without authenticating)" + }, + "2": { + "then": "Free to use, but one has to authenticate" + }, + "3": { + "then": "Paid use, but free for customers of the hotel/pub/hospital/... who operates the charging station" + }, + "4": { + "then": "Paid use" + } + }, + "question": "Does one have to pay to use this charging station?" + }, + "charge": { + "question": "How much does one have to pay to use this charging station?", + "render": "Using this charging station costs {charge}" } }, "title": { @@ -2376,7 +1910,7 @@ "question": "Is this street lit?" }, "width:carriageway": { - "question": "What is the carriage width of this road (in meters)?", + "question": "What is the carriage width of this road (in meters)?
This is measured curb to curb and thus includes the width of parallell parking lanes", "render": "The carriage width of this road is {width:carriageway}m" } }, @@ -2402,13 +1936,6 @@ } }, "defibrillator": { - "icon": { - "mappings": { - "0": { - "then": "./assets/layers/defibrillator/aed_checked.svg" - } - } - }, "name": "Defibrillators", "presets": { "0": { @@ -3395,154 +2922,6 @@ "render": "Sport pitch" } }, - "street_lamps": { - "name": "Street Lamps", - "presets": { - "0": { - "title": "street lamp" - } - }, - "tagRenderings": { - "colour": { - "mappings": { - "0": { - "then": "This lamp emits white light" - }, - "1": { - "then": "This lamp emits green light" - }, - "2": { - "then": "This lamp emits orange light" - } - }, - "question": "What colour light does this lamp emit?", - "render": "This lamp emits {light:colour} light" - }, - "count": { - "mappings": { - "0": { - "then": "This lamp has 1 fixture" - }, - "1": { - "then": "This lamp has 2 fixtures" - } - }, - "question": "How many fixtures does this light have?", - "render": "This lamp has {light:count} fixtures" - }, - "direction": { - "question": "Where does this lamp point to?", - "render": "This lamp points towards {light:direction}" - }, - "lamp_mount": { - "mappings": { - "0": { - "then": "This lamp sits atop of a straight mast" - }, - "1": { - "then": "This lamp sits at the end of a bent mast" - } - }, - "question": "How is this lamp mounted to the pole?" - }, - "lit": { - "mappings": { - "0": { - "then": "This lamp is lit at night" - }, - "1": { - "then": "This lamp is lit 24/7" - }, - "2": { - "then": "This lamp is lit based on motion" - }, - "3": { - "then": "This lamp is lit based on demand (e.g. with a pushbutton)" - } - }, - "question": "When is this lamp lit?" - }, - "method": { - "mappings": { - "0": { - "then": "This lamp is lit electrically" - }, - "1": { - "then": "This lamp uses LEDs" - }, - "2": { - "then": "This lamp uses incandescent lighting" - }, - "3": { - "then": "This lamp uses halogen lighting" - }, - "4": { - "then": "This lamp uses discharge lamps (unknown type)" - }, - "5": { - "then": "This lamp uses a mercury-vapour lamp (lightly blueish)" - }, - "6": { - "then": "This lamp uses metal-halide lamps (bright white)" - }, - "7": { - "then": "This lamp uses fluorescent lighting" - }, - "8": { - "then": "This lamp uses sodium lamps (unknown type)" - }, - "9": { - "then": "This lamp uses low pressure sodium lamps (monochrome orange)" - }, - "10": { - "then": "This lamp uses high pressure sodium lamps (orange with white)" - }, - "11": { - "then": "This lamp is lit using gas" - } - }, - "question": "What kind of lighting does this lamp use?" - }, - "ref": { - "question": "What is the reference number of this street lamp?", - "render": "This street lamp has the reference number {ref}" - }, - "support": { - "mappings": { - "0": { - "then": "This lamp is suspended using cables" - }, - "1": { - "then": "This lamp is mounted on a ceiling" - }, - "2": { - "then": "This lamp is mounted in the ground" - }, - "3": { - "then": "This lamp is mounted on a short pole (mostly < 1.5m)" - }, - "4": { - "then": "This lamp is mounted on a pole" - }, - "5": { - "then": "This lamp is mounted directly to the wall" - }, - "6": { - "then": "This lamp is mounted to the wall using a metal bar" - } - }, - "question": "How is this street lamp mounted?" - } - }, - "title": { - "mappings": { - "0": { - "then": "Street Lamp {ref}" - } - }, - "render": "Street Lamp" - } - }, "surveillance_camera": { "name": "Surveillance camera's", "tagRenderings": { @@ -4047,5 +3426,153 @@ }, "watermill": { "name": "Watermill" + }, + "street_lamps": { + "name": "Street Lamps", + "presets": { + "0": { + "title": "street lamp" + } + }, + "tagRenderings": { + "colour": { + "mappings": { + "0": { + "then": "This lamp emits white light" + }, + "1": { + "then": "This lamp emits green light" + }, + "2": { + "then": "This lamp emits orange light" + } + }, + "question": "What colour light does this lamp emit?", + "render": "This lamp emits {light:colour} light" + }, + "count": { + "mappings": { + "0": { + "then": "This lamp has 1 fixture" + }, + "1": { + "then": "This lamp has 2 fixtures" + } + }, + "question": "How many fixtures does this light have?", + "render": "This lamp has {light:count} fixtures" + }, + "direction": { + "question": "Where does this lamp point to?", + "render": "This lamp points towards {light:direction}" + }, + "lamp_mount": { + "mappings": { + "0": { + "then": "This lamp sits atop of a straight mast" + }, + "1": { + "then": "This lamp sits at the end of a bent mast" + } + }, + "question": "How is this lamp mounted to the pole?" + }, + "lit": { + "mappings": { + "0": { + "then": "This lamp is lit at night" + }, + "1": { + "then": "This lamp is lit 24/7" + }, + "2": { + "then": "This lamp is lit based on motion" + }, + "3": { + "then": "This lamp is lit based on demand (e.g. with a pushbutton)" + } + }, + "question": "When is this lamp lit?" + }, + "method": { + "mappings": { + "0": { + "then": "This lamp is lit electrically" + }, + "1": { + "then": "This lamp uses LEDs" + }, + "2": { + "then": "This lamp uses incandescent lighting" + }, + "3": { + "then": "This lamp uses halogen lighting" + }, + "4": { + "then": "This lamp uses discharge lamps (unknown type)" + }, + "5": { + "then": "This lamp uses a mercury-vapour lamp (lightly blueish)" + }, + "6": { + "then": "This lamp uses metal-halide lamps (bright white)" + }, + "7": { + "then": "This lamp uses fluorescent lighting" + }, + "8": { + "then": "This lamp uses sodium lamps (unknown type)" + }, + "9": { + "then": "This lamp uses low pressure sodium lamps (monochrome orange)" + }, + "10": { + "then": "This lamp uses high pressure sodium lamps (orange with white)" + }, + "11": { + "then": "This lamp is lit using gas" + } + }, + "question": "What kind of lighting does this lamp use?" + }, + "ref": { + "question": "What is the reference number of this street lamp?", + "render": "This street lamp has the reference number {ref}" + }, + "support": { + "mappings": { + "0": { + "then": "This lamp is suspended using cables" + }, + "1": { + "then": "This lamp is mounted on a ceiling" + }, + "2": { + "then": "This lamp is mounted in the ground" + }, + "3": { + "then": "This lamp is mounted on a short pole (mostly < 1.5m)" + }, + "4": { + "then": "This lamp is mounted on a pole" + }, + "5": { + "then": "This lamp is mounted directly to the wall" + }, + "6": { + "then": "This lamp is mounted to the wall using a metal bar" + } + }, + "question": "How is this street lamp mounted?" + } + }, + "title": { + "mappings": { + "0": { + "then": "Street Lamp {ref}" + } + }, + "render": "Street Lamp" + } } } \ No newline at end of file diff --git a/langs/layers/fi.json b/langs/layers/fi.json index a13231cd6f..91972fd665 100644 --- a/langs/layers/fi.json +++ b/langs/layers/fi.json @@ -90,9 +90,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "presets": { "0": { "title": "Pyöräpumppu" diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 7892204ad5..b4c06d558a 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -453,9 +453,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "name": "Station velo (réparation, pompe à vélo)", "presets": { "0": { @@ -749,13 +746,6 @@ } }, "defibrillator": { - "icon": { - "mappings": { - "0": { - "then": "./assets/layers/defibrillator/aed_checked.svg" - } - } - }, "name": "Défibrillateurs", "presets": { "0": { diff --git a/langs/layers/it.json b/langs/layers/it.json index aa52a52244..229bb82e01 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -453,9 +453,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "name": "Stazioni bici (riparazione, gonfiaggio o entrambi)", "presets": { "0": { @@ -752,11 +749,11 @@ "description": "Una stazione di ricarica", "name": "Stazioni di ricarica", "tagRenderings": { - "Auth phone": { + "Network": { "question": "A quale rete appartiene questa stazione di ricarica?", "render": "{network}" }, - "Authentication": { + "OH": { "question": "Quali sono gli orari di apertura di questa stazione di ricarica?" } }, @@ -765,13 +762,6 @@ } }, "defibrillator": { - "icon": { - "mappings": { - "0": { - "then": "./assets/layers/defibrillator/aed_checked.svg" - } - } - }, "name": "Defibrillatori", "presets": { "0": { diff --git a/langs/layers/ja.json b/langs/layers/ja.json index 5c5b0d1d69..b3385cb209 100644 --- a/langs/layers/ja.json +++ b/langs/layers/ja.json @@ -76,11 +76,11 @@ "description": "充電ステーション", "name": "充電ステーション", "tagRenderings": { - "Auth phone": { + "Network": { "question": "この充電ステーションの運営チェーンはどこですか?", "render": "{network}" }, - "Authentication": { + "OH": { "question": "この充電ステーションはいつオープンしますか?" } }, diff --git a/langs/layers/nan.json b/langs/layers/nan.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/langs/layers/nan.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json index 47a02bc8e7..0ca42f3e8f 100644 --- a/langs/layers/nb_NO.json +++ b/langs/layers/nb_NO.json @@ -174,10 +174,10 @@ "description": "En ladestasjon", "name": "Ladestasjoner", "tagRenderings": { - "Auth phone": { + "Network": { "render": "{network}" }, - "Authentication": { + "OH": { "question": "Når åpnet denne ladestasjonen?" } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index d3f3f6d41e..bec8ca3730 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1051,6 +1051,13 @@ } } }, + "1": { + "options": { + "0": { + "question": "Enkel werkende oplaadpunten" + } + } + }, "2": { "options": { "0": { @@ -1206,24 +1213,25 @@ "31": { "then": "
Bosch Active Connect met 5 pinnen aan een kabel
" } - } + }, + "question": "Welke aansluitingen zijn hier beschikbaar?" }, "Operational status": { "mappings": { "0": { - "then": "Dit oplaadpunt is kapot" + "then": "Dit oplaadpunt werkt" }, "1": { - "then": "Hier zal binnenkort een oplaadpunt gebouwd worden" + "then": "Dit oplaadpunt is kapot" }, "2": { - "then": "Hier wordt op dit moment een oplaadpunt gebouwd" + "then": "Hier zal binnenkort een oplaadpunt gebouwd worden" }, "3": { - "then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig" + "then": "Hier wordt op dit moment een oplaadpunt gebouwd" }, "4": { - "then": "Dit oplaadpunt werkt" + "then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig" } }, "question": "Is dit oplaadpunt operationeel?" @@ -1232,176 +1240,6 @@ "question": "Hoeveel voertuigen kunnen hier opgeladen worden?", "render": "{capacity} voertuigen kunnen hier op hetzelfde moment opgeladen worden" }, - "current-0": { - "mappings": { - "0": { - "then": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een stroom van maximaal 16 A" - } - }, - "question": "Welke stroom levert de stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
?", - "render": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een stroom van maximaal {socket:schuko:current}A" - }, - "current-1": { - "mappings": { - "0": { - "then": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een stroom van maximaal 16 A" - } - }, - "question": "Welke stroom levert de stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
?", - "render": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een stroom van maximaal {socket:typee:current}A" - }, - "current-10": { - "mappings": { - "0": { - "then": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal 125 A" - }, - "1": { - "then": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal 350 A" - } - }, - "question": "Welke stroom levert de stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
?", - "render": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal {socket:tesla_supercharger_ccs:current}A" - }, - "current-11": { - "mappings": { - "0": { - "then": "
Tesla Supercharger (destination)
levert een stroom van maximaal 125 A" - }, - "1": { - "then": "
Tesla Supercharger (destination)
levert een stroom van maximaal 350 A" - } - }, - "question": "Welke stroom levert de stekker van type
Tesla Supercharger (destination)
?", - "render": "
Tesla Supercharger (destination)
levert een stroom van maximaal {socket:tesla_destination:current}A" - }, - "current-12": { - "mappings": { - "0": { - "then": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal 16 A" - }, - "1": { - "then": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal 32 A" - } - }, - "question": "Welke stroom levert de stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
?", - "render": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal {socket:tesla_destination:current}A" - }, - "current-13": { - "mappings": { - "0": { - "then": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal 1 A" - }, - "1": { - "then": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal 2 A" - } - }, - "question": "Welke stroom levert de stekker van type
USB om GSMs en kleine electronica op te laden
?", - "render": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal {socket:USB-A:current}A" - }, - "current-14": { - "question": "Welke stroom levert de stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
?", - "render": "
Bosch Active Connect met 3 pinnen aan een kabel
levert een stroom van maximaal {socket:bosch_3pin:current}A" - }, - "current-15": { - "question": "Welke stroom levert de stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
?", - "render": "
Bosch Active Connect met 5 pinnen aan een kabel
levert een stroom van maximaal {socket:bosch_5pin:current}A" - }, - "current-2": { - "mappings": { - "0": { - "then": "
Chademo
levert een stroom van maximaal 120 A" - } - }, - "question": "Welke stroom levert de stekker van type
Chademo
?", - "render": "
Chademo
levert een stroom van maximaal {socket:chademo:current}A" - }, - "current-3": { - "mappings": { - "0": { - "then": "
Type 1 met kabel (J1772)
levert een stroom van maximaal 32 A" - } - }, - "question": "Welke stroom levert de stekker van type
Type 1 met kabel (J1772)
?", - "render": "
Type 1 met kabel (J1772)
levert een stroom van maximaal {socket:type1_cable:current}A" - }, - "current-4": { - "mappings": { - "0": { - "then": "
Type 1 zonder kabel (J1772)
levert een stroom van maximaal 32 A" - } - }, - "question": "Welke stroom levert de stekker van type
Type 1 zonder kabel (J1772)
?", - "render": "
Type 1 zonder kabel (J1772)
levert een stroom van maximaal {socket:type1:current}A" - }, - "current-5": { - "mappings": { - "0": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal 50 A" - }, - "1": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal 125 A" - } - }, - "question": "Welke stroom levert de stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
?", - "render": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal {socket:type1_combo:current}A" - }, - "current-6": { - "mappings": { - "0": { - "then": "
Tesla Supercharger
levert een stroom van maximaal 125 A" - }, - "1": { - "then": "
Tesla Supercharger
levert een stroom van maximaal 350 A" - } - }, - "question": "Welke stroom levert de stekker van type
Tesla Supercharger
?", - "render": "
Tesla Supercharger
levert een stroom van maximaal {socket:tesla_supercharger:current}A" - }, - "current-7": { - "mappings": { - "0": { - "then": "
Type 2 (mennekes)
levert een stroom van maximaal 16 A" - }, - "1": { - "then": "
Type 2 (mennekes)
levert een stroom van maximaal 32 A" - } - }, - "question": "Welke stroom levert de stekker van type
Type 2 (mennekes)
?", - "render": "
Type 2 (mennekes)
levert een stroom van maximaal {socket:type2:current}A" - }, - "current-8": { - "mappings": { - "0": { - "then": "
Type 2 CCS (mennekes)
levert een stroom van maximaal 125 A" - }, - "1": { - "then": "
Type 2 CCS (mennekes)
levert een stroom van maximaal 350 A" - } - }, - "question": "Welke stroom levert de stekker van type
Type 2 CCS (mennekes)
?", - "render": "
Type 2 CCS (mennekes)
levert een stroom van maximaal {socket:type2_combo:current}A" - }, - "current-9": { - "mappings": { - "0": { - "then": "
Type 2 met kabel (J1772)
levert een stroom van maximaal 16 A" - }, - "1": { - "then": "
Type 2 met kabel (J1772)
levert een stroom van maximaal 32 A" - } - }, - "question": "Welke stroom levert de stekker van type
Type 2 met kabel (J1772)
?", - "render": "
Type 2 met kabel (J1772)
levert een stroom van maximaal {socket:type2_cable:current}A" - }, - "fee/charge": { - "mappings": { - "0": { - "then": "Gratis te gebruiken" - } - }, - "question": "Hoeveel kost het gebruik van dit oplaadpunt?", - "render": "Dit oplaadpunt gebruiken kost {charge}" - }, "maxstay": { "mappings": { "0": { @@ -1487,345 +1325,156 @@ "question": "Hoeveel stekkers van type
Type 2 met kabel (J1772)
heeft dit oplaadpunt?", "render": "Hier zijn {socket:type2_cable} stekkers van het type
Type 2 met kabel (J1772)
" }, - "power-output-0": { - "mappings": { - "0": { - "then": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een vermogen van maximaal 3.6 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
?", - "render": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een vermogen van maximaal {socket:schuko:output}" + "website": { + "question": "Wat is de website waar men meer info kan vinden over dit oplaadpunt?", + "render": "Meer informatie op {website}" }, - "power-output-1": { + "ref": { + "question": "Wat is het referentienummer van dit oplaadstation?", + "render": "Het referentienummer van dit oplaadpunt is {ref}" + }, + "phone": { + "question": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?", + "render": "Bij problemen, bel naar {phone}" + }, + "fee": { "mappings": { "0": { - "then": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een vermogen van maximaal 3 kw" + "then": "Gratis te gebruiken" }, "1": { - "then": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een vermogen van maximaal 22 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
?", - "render": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een vermogen van maximaal {socket:typee:output}" - }, - "power-output-10": { - "mappings": { - "0": { - "then": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een vermogen van maximaal 50 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
?", - "render": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een vermogen van maximaal {socket:tesla_supercharger_ccs:output}" - }, - "power-output-11": { - "mappings": { - "0": { - "then": "
Tesla Supercharger (destination)
levert een vermogen van maximaal 120 kw" - }, - "1": { - "then": "
Tesla Supercharger (destination)
levert een vermogen van maximaal 150 kw" + "then": "Gratis te gebruiken (zonder aan te melden)" }, "2": { - "then": "
Tesla Supercharger (destination)
levert een vermogen van maximaal 250 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Tesla Supercharger (destination)
?", - "render": "
Tesla Supercharger (destination)
levert een vermogen van maximaal {socket:tesla_destination:output}" - }, - "power-output-12": { - "mappings": { - "0": { - "then": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal 11 kw" - }, - "1": { - "then": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal 22 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
?", - "render": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal {socket:tesla_destination:output}" - }, - "power-output-13": { - "mappings": { - "0": { - "then": "
USB om GSMs en kleine electronica op te laden
levert een vermogen van maximaal 5w" - }, - "1": { - "then": "
USB om GSMs en kleine electronica op te laden
levert een vermogen van maximaal 10w" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
USB om GSMs en kleine electronica op te laden
?", - "render": "
USB om GSMs en kleine electronica op te laden
levert een vermogen van maximaal {socket:USB-A:output}" - }, - "power-output-14": { - "question": "Welk vermogen levert een enkele stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
?", - "render": "
Bosch Active Connect met 3 pinnen aan een kabel
levert een vermogen van maximaal {socket:bosch_3pin:output}" - }, - "power-output-15": { - "question": "Welk vermogen levert een enkele stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
?", - "render": "
Bosch Active Connect met 5 pinnen aan een kabel
levert een vermogen van maximaal {socket:bosch_5pin:output}" - }, - "power-output-2": { - "mappings": { - "0": { - "then": "
Chademo
levert een vermogen van maximaal 50 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Chademo
?", - "render": "
Chademo
levert een vermogen van maximaal {socket:chademo:output}" - }, - "power-output-3": { - "mappings": { - "0": { - "then": "
Type 1 met kabel (J1772)
levert een vermogen van maximaal 3.7 kw" - }, - "1": { - "then": "
Type 1 met kabel (J1772)
levert een vermogen van maximaal 7 kw" - } - }, - "question": "Welk vermogen levert een enkele stekker van type
Type 1 met kabel (J1772)
?", - "render": "
Type 1 met kabel (J1772)
levert een vermogen van maximaal {socket:type1_cable:output}" - }, - "power-output-4": { - "mappings": { - "0": { - "then": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 3.7 kw" - }, - "1": { - "then": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 6.6 kw" - }, - "2": { - "then": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 7 kw" + "then": "Gratis te gebruiken, maar aanmelden met een applicatie is verplicht" }, "3": { - "then": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal 7.2 kw" + "then": "Betalend te gebruiken, maar gratis voor klanten van het bijhorende hotel/café/ziekenhuis/..." + }, + "4": { + "then": "Betalend" } }, - "question": "Welk vermogen levert een enkele stekker van type
Type 1 zonder kabel (J1772)
?", - "render": "
Type 1 zonder kabel (J1772)
levert een vermogen van maximaal {socket:type1:output}" + "question": "Moet men betalen om dit oplaadpunt te gebruiken?" }, - "power-output-5": { + "email": { + "question": "Wat is het email-adres van de operator?", + "render": "Bij problemen, email naar {email}" + }, + "charge": { + "question": "Hoeveel moet men betalen om dit oplaadpunt te gebruiken?", + "render": "Dit oplaadpunt gebruiken kost {charge}" + }, + "access": { "mappings": { "0": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 50 kw" + "then": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)" }, "1": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 62.5 kw" + "then": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)" }, "2": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 150 kw" + "then": "Enkel klanten van de bijhorende plaats mogen dit oplaadpunt gebruiken
Bijvoorbeeld een oplaadpunt op de parking van een restaurant dat enkel door klanten van het restaurant gebruikt mag worden" }, "3": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal 350 kw" + "then": "Niet toegankelijk voor het publiek Enkel toegankelijk voor de eigenaar, medewerkers ,... " } }, - "question": "Welk vermogen levert een enkele stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
?", - "render": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een vermogen van maximaal {socket:type1_combo:output}" + "question": "Wie mag er dit oplaadpunt gebruiken?", + "render": "Toegang voor {access}" }, - "power-output-6": { + "Type": { "mappings": { "0": { - "then": "
Tesla Supercharger
levert een vermogen van maximaal 120 kw" + "then": "Fietsen kunnen hier opgeladen worden" }, "1": { - "then": "
Tesla Supercharger
levert een vermogen van maximaal 150 kw" + "then": "Elektrische auto's kunnen hier opgeladen worden" }, "2": { - "then": "
Tesla Supercharger
levert een vermogen van maximaal 250 kw" + "then": "Electrische scooters (snorfiets of bromfiets) kunnen hier opgeladen worden" + }, + "3": { + "then": "Vrachtwagens kunnen hier opgeladen worden" + }, + "4": { + "then": "Bussen kunnen hier opgeladen worden" } }, - "question": "Welk vermogen levert een enkele stekker van type
Tesla Supercharger
?", - "render": "
Tesla Supercharger
levert een vermogen van maximaal {socket:tesla_supercharger:output}" + "question": "Welke voertuigen kunnen hier opgeladen worden?" }, - "power-output-7": { + "Parking:fee": { "mappings": { "0": { - "then": "
Type 2 (mennekes)
levert een vermogen van maximaal 11 kw" + "then": "Geen extra parkeerkost tijdens het opladen" }, "1": { - "then": "
Type 2 (mennekes)
levert een vermogen van maximaal 22 kw" + "then": "Tijdens het opladen moet er parkeergeld betaald worden" } }, - "question": "Welk vermogen levert een enkele stekker van type
Type 2 (mennekes)
?", - "render": "
Type 2 (mennekes)
levert een vermogen van maximaal {socket:type2:output}" + "question": "Moet men parkeergeld betalen tijdens het opladen?" }, - "power-output-8": { + "Operator": { "mappings": { "0": { - "then": "
Type 2 CCS (mennekes)
levert een vermogen van maximaal 50 kw" + "then": "Eigenlijk is {operator} het netwerk waarvan het deel uitmaakt" } }, - "question": "Welk vermogen levert een enkele stekker van type
Type 2 CCS (mennekes)
?", - "render": "
Type 2 CCS (mennekes)
levert een vermogen van maximaal {socket:type2_combo:output}" + "question": "Wie beheert dit oplaadpunt?", + "render": "Wordt beheerd door {operator}" }, - "power-output-9": { + "OH": { "mappings": { "0": { - "then": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal 11 kw" + "then": "24/7 open - ook tijdens vakanties" + } + }, + "question": "Wanneer is dit oplaadpunt beschikbaar??" + }, + "Network": { + "mappings": { + "0": { + "then": "Maakt geen deel uit van een groter netwerk" }, "1": { - "then": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal 22 kw" + "then": "Maakt geen deel uit van een groter netwerk" } }, - "question": "Welk vermogen levert een enkele stekker van type
Type 2 met kabel (J1772)
?", - "render": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal {socket:type2_cable:output}" + "question": "Is dit oplaadpunt deel van een groter netwerk?", + "render": "Maakt deel uit van het {network}-netwerk" }, - "voltage-0": { + "Authentication": { "mappings": { "0": { - "then": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
heeft een spanning van 230 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
", - "render": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
heeft een spanning van {socket:schuko:voltage} volt" - }, - "voltage-1": { - "mappings": { - "0": { - "then": "
Europese stekker met aardingspin (CEE7/4 type E)
heeft een spanning van 230 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
", - "render": "
Europese stekker met aardingspin (CEE7/4 type E)
heeft een spanning van {socket:typee:voltage} volt" - }, - "voltage-10": { - "mappings": { - "0": { - "then": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft een spanning van 500 volt" + "then": "Aanmelden met een lidkaart is mogelijk" }, "1": { - "then": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft een spanning van 920 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
", - "render": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft een spanning van {socket:tesla_supercharger_ccs:voltage} volt" - }, - "voltage-11": { - "mappings": { - "0": { - "then": "
Tesla Supercharger (destination)
heeft een spanning van 480 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Tesla Supercharger (destination)
", - "render": "
Tesla Supercharger (destination)
heeft een spanning van {socket:tesla_destination:voltage} volt" - }, - "voltage-12": { - "mappings": { - "0": { - "then": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van 230 volt" + "then": "Aanmelden via een applicatie is mogelijk" }, - "1": { - "then": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van 400 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
", - "render": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van {socket:tesla_destination:voltage} volt" - }, - "voltage-13": { - "mappings": { - "0": { - "then": "
USB om GSMs en kleine electronica op te laden
heeft een spanning van 5 volt" - } - }, - "question": "Welke spanning levert de stekker van type
USB om GSMs en kleine electronica op te laden
", - "render": "
USB om GSMs en kleine electronica op te laden
heeft een spanning van {socket:USB-A:voltage} volt" - }, - "voltage-14": { - "question": "Welke spanning levert de stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
", - "render": "
Bosch Active Connect met 3 pinnen aan een kabel
heeft een spanning van {socket:bosch_3pin:voltage} volt" - }, - "voltage-15": { - "question": "Welke spanning levert de stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
", - "render": "
Bosch Active Connect met 5 pinnen aan een kabel
heeft een spanning van {socket:bosch_5pin:voltage} volt" - }, - "voltage-2": { - "mappings": { - "0": { - "then": "
Chademo
heeft een spanning van 500 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Chademo
", - "render": "
Chademo
heeft een spanning van {socket:chademo:voltage} volt" - }, - "voltage-3": { - "mappings": { - "0": { - "then": "
Type 1 met kabel (J1772)
heeft een spanning van 200 volt" + "2": { + "then": "Aanmelden door te bellen naar een telefoonnummer is mogelijk" }, - "1": { - "then": "
Type 1 met kabel (J1772)
heeft een spanning van 240 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Type 1 met kabel (J1772)
", - "render": "
Type 1 met kabel (J1772)
heeft een spanning van {socket:type1_cable:voltage} volt" - }, - "voltage-4": { - "mappings": { - "0": { - "then": "
Type 1 zonder kabel (J1772)
heeft een spanning van 200 volt" + "3": { + "then": "Aanmelden via SMS is mogelijk" }, - "1": { - "then": "
Type 1 zonder kabel (J1772)
heeft een spanning van 240 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Type 1 zonder kabel (J1772)
", - "render": "
Type 1 zonder kabel (J1772)
heeft een spanning van {socket:type1:voltage} volt" - }, - "voltage-5": { - "mappings": { - "0": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
heeft een spanning van 400 volt" + "4": { + "then": "Aanmelden via NFC is mogelijk" }, - "1": { - "then": "
Type 1 CCS (ook gekend als Type 1 Combo)
heeft een spanning van 1000 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
", - "render": "
Type 1 CCS (ook gekend als Type 1 Combo)
heeft een spanning van {socket:type1_combo:voltage} volt" - }, - "voltage-6": { - "mappings": { - "0": { - "then": "
Tesla Supercharger
heeft een spanning van 480 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Tesla Supercharger
", - "render": "
Tesla Supercharger
heeft een spanning van {socket:tesla_supercharger:voltage} volt" - }, - "voltage-7": { - "mappings": { - "0": { - "then": "
Type 2 (mennekes)
heeft een spanning van 230 volt" + "5": { + "then": "Aanmelden met Money Card is mogelijk" }, - "1": { - "then": "
Type 2 (mennekes)
heeft een spanning van 400 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Type 2 (mennekes)
", - "render": "
Type 2 (mennekes)
heeft een spanning van {socket:type2:voltage} volt" - }, - "voltage-8": { - "mappings": { - "0": { - "then": "
Type 2 CCS (mennekes)
heeft een spanning van 500 volt" + "6": { + "then": "Aanmelden met een betaalkaart is mogelijk" }, - "1": { - "then": "
Type 2 CCS (mennekes)
heeft een spanning van 920 volt" + "7": { + "then": "Hier opladen is (ook) mogelijk zonder aan te melden" } }, - "question": "Welke spanning levert de stekker van type
Type 2 CCS (mennekes)
", - "render": "
Type 2 CCS (mennekes)
heeft een spanning van {socket:type2_combo:voltage} volt" + "question": "Hoe kan men zich aanmelden aan dit oplaadstation?" }, - "voltage-9": { - "mappings": { - "0": { - "then": "
Type 2 met kabel (J1772)
heeft een spanning van 230 volt" - }, - "1": { - "then": "
Type 2 met kabel (J1772)
heeft een spanning van 400 volt" - } - }, - "question": "Welke spanning levert de stekker van type
Type 2 met kabel (J1772)
", - "render": "
Type 2 met kabel (J1772)
heeft een spanning van {socket:type2_cable:voltage} volt" + "Auth phone": { + "question": "Wat is het telefoonnummer dat men moet bellen of SMS'en om zich aan te melden?", + "render": "Aanmelden door te bellen of te SMS'en naar {authentication:phone_call:number}" } }, "units": { @@ -1869,7 +1518,26 @@ } } } - } + }, + "title": { + "render": "Oplaadpunten" + }, + "presets": { + "0": { + "title": "gewone stekker (bedoeld om electrische fietsen op te laden)" + }, + "1": { + "title": "oplaadpunt voor elektrische fietsen" + }, + "2": { + "title": "oplaadstation voor elektrische auto's" + }, + "3": { + "title": "oplaadstation" + } + }, + "name": "Oplaadpunten", + "description": "Oplaadpunten" }, "crossings": { "description": "Oversteekplaatsen voor voetgangers en fietsers", @@ -2329,7 +1997,7 @@ "question": "Is deze weg verlicht?" }, "width:carriageway": { - "question": "Hoe breed is de rijbaan in deze straat (in meters)?", + "question": "Hoe breed is de rijbaan in deze straat (in meters)?
Dit is
Meet dit van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook", "render": "De breedte van deze rijbaan in deze straat is {width:carriageway}m" } }, @@ -3623,154 +3291,6 @@ "render": "Sportterrein" } }, - "street_lamps": { - "name": "Straatlantaarns", - "presets": { - "0": { - "title": "straatlantaarn" - } - }, - "tagRenderings": { - "colour": { - "mappings": { - "0": { - "then": "Deze lantaarn geeft wit licht" - }, - "1": { - "then": "Deze lantaarn geeft groen licht" - }, - "2": { - "then": "Deze lantaarn geeft oranje licht" - } - }, - "question": "Wat voor kleur licht geeft deze lantaarn?", - "render": "Deze lantaarn geeft {light:colour} licht" - }, - "count": { - "mappings": { - "0": { - "then": "Deze lantaarn heeft 1 lamp" - }, - "1": { - "then": "Deze lantaarn heeft 2 lampen" - } - }, - "question": "Hoeveel lampen heeft deze lantaarn?", - "render": "Deze lantaarn heeft {light:count} lampen" - }, - "direction": { - "question": "Waar is deze lamp heengericht?", - "render": "Deze lantaarn is gericht naar {light:direction}" - }, - "lamp_mount": { - "mappings": { - "0": { - "then": "Deze lantaarn zit boven op een rechte paal" - }, - "1": { - "then": "Deze lantaarn zit aan het eind van een gebogen paal" - } - }, - "question": "Hoe zit deze lantaarn aan de paal?" - }, - "lit": { - "mappings": { - "0": { - "then": "Deze lantaarn is 's nachts verlicht" - }, - "1": { - "then": "Deze lantaarn is 24/7 verlicht" - }, - "2": { - "then": "Deze lantaarn is verlicht op basis van beweging" - }, - "3": { - "then": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)" - } - }, - "question": "Wanneer is deze lantaarn verlicht?" - }, - "method": { - "mappings": { - "0": { - "then": "Deze lantaarn is elektrisch verlicht" - }, - "1": { - "then": "Deze lantaarn gebruikt LEDs" - }, - "2": { - "then": "Deze lantaarn gebruikt gloeilampen" - }, - "3": { - "then": "Deze lantaarn gebruikt halogeen verlichting" - }, - "4": { - "then": "Deze lantaarn gebruikt gasontladingslampen (onbekend type)" - }, - "5": { - "then": "Deze lantaarn gebruikt een kwiklamp (enigszins blauwachtig)" - }, - "6": { - "then": "Deze lantaarn gebruikt metaalhalidelampen" - }, - "7": { - "then": "Deze lantaarn gebruikt fluorescentieverlichting (TL en spaarlamp)" - }, - "8": { - "then": "Deze lantaarn gebruikt natriumlampen (onbekend type)" - }, - "9": { - "then": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)" - }, - "10": { - "then": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)" - }, - "11": { - "then": "Deze lantaarn wordt verlicht met gas" - } - }, - "question": "Wat voor verlichting gebruikt deze lantaarn?" - }, - "ref": { - "question": "Wat is het nummer van deze straatlantaarn?", - "render": "Deze straatlantaarn heeft het nummer {ref}" - }, - "support": { - "mappings": { - "0": { - "then": "Deze lantaarn hangt aan kabels" - }, - "1": { - "then": "Deze lantaarn hangt aan een plafond" - }, - "2": { - "then": "Deze lantaarn zit in de grond" - }, - "3": { - "then": "Deze lantaarn zit op een korte paal (meestal < 1.5m)" - }, - "4": { - "then": "Deze lantaarn zit op een paal" - }, - "5": { - "then": "Deze lantaarn hangt direct aan de muur" - }, - "6": { - "then": "Deze lantaarn hangt aan de muur met een metalen balk" - } - }, - "question": "Hoe is deze straatlantaarn gemonteerd?" - } - }, - "title": { - "mappings": { - "0": { - "then": "Straatlantaarn {ref}" - } - }, - "render": "Straatlantaarn" - } - }, "surveillance_camera": { "name": "Bewakingscamera's", "tagRenderings": { @@ -4308,6 +3828,20 @@ } }, "question": "Wat voor soort vuilnisbak is dit?" + }, + "dispensing_dog_bags": { + "mappings": { + "0": { + "then": "Deze vuilnisbak heeft een verdeler voor hondenpoepzakjes" + }, + "1": { + "then": "Deze vuilbak heeft geen verdeler voor hondenpoepzakjes" + }, + "2": { + "then": "Deze vuilnisbak heeft geen verdeler voor hondenpoepzakjes" + } + }, + "question": "Heeft deze vuilnisbak een verdeler voor hondenpoepzakjes?" } }, "title": { @@ -4366,5 +3900,153 @@ }, "render": "Watermolens" } + }, + "street_lamps": { + "name": "Straatlantaarns", + "presets": { + "0": { + "title": "straatlantaarn" + } + }, + "tagRenderings": { + "colour": { + "mappings": { + "0": { + "then": "Deze lantaarn geeft wit licht" + }, + "1": { + "then": "Deze lantaarn geeft groen licht" + }, + "2": { + "then": "Deze lantaarn geeft oranje licht" + } + }, + "question": "Wat voor kleur licht geeft deze lantaarn?", + "render": "Deze lantaarn geeft {light:colour} licht" + }, + "count": { + "mappings": { + "0": { + "then": "Deze lantaarn heeft 1 lamp" + }, + "1": { + "then": "Deze lantaarn heeft 2 lampen" + } + }, + "question": "Hoeveel lampen heeft deze lantaarn?", + "render": "Deze lantaarn heeft {light:count} lampen" + }, + "direction": { + "question": "Waar is deze lamp heengericht?", + "render": "Deze lantaarn is gericht naar {light:direction}" + }, + "lamp_mount": { + "mappings": { + "0": { + "then": "Deze lantaarn zit boven op een rechte paal" + }, + "1": { + "then": "Deze lantaarn zit aan het eind van een gebogen paal" + } + }, + "question": "Hoe zit deze lantaarn aan de paal?" + }, + "lit": { + "mappings": { + "0": { + "then": "Deze lantaarn is 's nachts verlicht" + }, + "1": { + "then": "Deze lantaarn is 24/7 verlicht" + }, + "2": { + "then": "Deze lantaarn is verlicht op basis van beweging" + }, + "3": { + "then": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)" + } + }, + "question": "Wanneer is deze lantaarn verlicht?" + }, + "method": { + "mappings": { + "0": { + "then": "Deze lantaarn is elektrisch verlicht" + }, + "1": { + "then": "Deze lantaarn gebruikt LEDs" + }, + "2": { + "then": "Deze lantaarn gebruikt gloeilampen" + }, + "3": { + "then": "Deze lantaarn gebruikt halogeen verlichting" + }, + "4": { + "then": "Deze lantaarn gebruikt gasontladingslampen (onbekend type)" + }, + "5": { + "then": "Deze lantaarn gebruikt een kwiklamp (enigszins blauwachtig)" + }, + "6": { + "then": "Deze lantaarn gebruikt metaalhalidelampen" + }, + "7": { + "then": "Deze lantaarn gebruikt fluorescentieverlichting (TL en spaarlamp)" + }, + "8": { + "then": "Deze lantaarn gebruikt natriumlampen (onbekend type)" + }, + "9": { + "then": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)" + }, + "10": { + "then": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)" + }, + "11": { + "then": "Deze lantaarn wordt verlicht met gas" + } + }, + "question": "Wat voor verlichting gebruikt deze lantaarn?" + }, + "ref": { + "question": "Wat is het nummer van deze straatlantaarn?", + "render": "Deze straatlantaarn heeft het nummer {ref}" + }, + "support": { + "mappings": { + "0": { + "then": "Deze lantaarn hangt aan kabels" + }, + "1": { + "then": "Deze lantaarn hangt aan een plafond" + }, + "2": { + "then": "Deze lantaarn zit in de grond" + }, + "3": { + "then": "Deze lantaarn zit op een korte paal (meestal < 1.5m)" + }, + "4": { + "then": "Deze lantaarn zit op een paal" + }, + "5": { + "then": "Deze lantaarn hangt direct aan de muur" + }, + "6": { + "then": "Deze lantaarn hangt aan de muur met een metalen balk" + } + }, + "question": "Hoe is deze straatlantaarn gemonteerd?" + } + }, + "title": { + "mappings": { + "0": { + "then": "Straatlantaarn {ref}" + } + }, + "render": "Straatlantaarn" + } } } \ No newline at end of file diff --git a/langs/layers/pt.json b/langs/layers/pt.json index 5cdf2f56ae..461c8c5415 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -338,9 +338,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "presets": { "0": { "description": "Um aparelho para encher os seus pneus num local fixa no espaço público

Exemplos de bombas de bicicletas

" diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json index 923a5d76d5..1bea7cdf89 100644 --- a/langs/layers/pt_BR.json +++ b/langs/layers/pt_BR.json @@ -338,9 +338,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "name": "Estações de bicicletas (reparo, bomba ou ambos)", "presets": { "0": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 66f7d0cb07..33c93089d7 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -400,9 +400,6 @@ } }, "bike_repair_station": { - "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg" - }, "presets": { "0": { "title": "Велосипедный насос" @@ -643,11 +640,11 @@ } }, "tagRenderings": { - "Auth phone": { + "Network": { "question": "К какой сети относится эта станция?", "render": "{network}" }, - "Authentication": { + "OH": { "question": "В какое время работает эта зарядная станция?" } }, @@ -715,13 +712,6 @@ } }, "defibrillator": { - "icon": { - "mappings": { - "0": { - "then": "./assets/layers/defibrillator/aed_checked.svg" - } - } - }, "name": "Дефибрилляторы", "presets": { "0": { diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index b0afffb78a..e5e5f65bf9 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -449,11 +449,11 @@ "description": "充電站", "name": "充電站", "tagRenderings": { - "Auth phone": { + "Network": { "question": "充電站所屬的網路是？", "render": "{network}" }, - "Authentication": { + "OH": { "question": "何時是充電站開放使用的時間？" } }, diff --git a/langs/nl.json b/langs/nl.json index fa7a85612f..33a2cf04ee 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -10,10 +10,12 @@ "ccb": "onder de CC-BY-licentie", "uploadFailed": "Afbeelding uploaden mislukt. Heb je internet? Gebruik je Brave of UMatrix? Dan moet je derde partijen toelaten.", "respectPrivacy": "Fotografeer geen mensen of nummerplaten. Voeg geen Google Maps, Google Streetview of foto's met auteursrechten toe.", - "uploadDone": "Je afbeelding is toegevoegd. Bedankt om te helpen!", + "uploadDone": "Je afbeelding is toegevoegd. Bedankt om te helpen!", "dontDelete": "Terug", "doDelete": "Verwijder afbeelding", - "isDeleted": "Verwijderd" + "isDeleted": "Verwijderd", + "uploadMultipleDone": "{count} afbeeldingen zijn toegevoegd. Bedankt voor je bijdrage!", + "toBig": "Je afbeelding is te groot, namelijk {actual_size}. Gelieve afbeeldingen van maximaal {max_size} te gebruiken" }, "centerMessage": { "loadingData": "Data wordt geladen...", @@ -24,8 +26,9 @@ "index": { "#": "These texts are shown above the theme buttons when no theme is loaded", "title": "Welkom bij MapComplete", - "intro": "MapComplete is een OpenStreetMap applicatie waar informatie over een specifiek thema bekeken en aangepast kan worden.", - "pickTheme": "Kies hieronder een thema om te beginnen." + "intro": "MapComplete is een OpenStreetMap-applicatie waar informatie over een specifiek thema bekeken en aangepast kan worden.", + "pickTheme": "Kies hieronder een thema om te beginnen.", + "featuredThemeTitle": "Thema van de week" }, "general": { "loginWithOpenStreetMap": "Aanmelden met OpenStreetMap", @@ -51,7 +54,10 @@ "layerNotEnabled": "De laag {layer} is gedeactiveerd. Activeer deze om een punt toe te voegen", "presetInfo": "Het nieuwe punt krijgt de attributen {tags}", "disableFiltersExplanation": "Interessepunten kunnen verborgen zijn door een filter", - "disableFilters": "Zet alle filters af" + "disableFilters": "Zet alle filters af", + "hasBeenImported": "Dit punt is reeds geimporteerd", + "warnVisibleForEveryone": "Je toevoeging is voor iedereen zichtbaar", + "zoomInMore": "Zoom meer in om dit punt te importeren" }, "pickLanguage": "Kies je taal: ", "about": "Bewerk en voeg data toe aan OpenStreetMap over een specifiek onderwerp op een gemakkelijke manier", @@ -128,7 +134,9 @@ "intro": "

Meer thematische kaarten

Vind je het leuk om geodata te verzamelen?
Hier vind je meer kaartthemas.", "requestATheme": "Wil je een eigen kaartthema, vraag dit in de issue tracker.", "streetcomplete": "Een andere, gelijkaardige Android-applicatie is StreetComplete.", - "createYourOwnTheme": "Maak je eigen MapComplete-kaart" + "createYourOwnTheme": "Maak je eigen MapComplete-kaart", + "previouslyHiddenTitle": "Eerder bezochte verborgen themas", + "hiddenExplanation": "Deze thema's zijn enkel zichtbaar indien je de link kent. Je hebt {hidden_discovered} van {total_hidden} verborgen thema's ontdekt" }, "readYourMessages": "Gelieve eerst je berichten op OpenStreetMap te lezen alvorens nieuwe punten toe te voegen.", "fewChangesBefore": "Gelieve eerst enkele vragen van bestaande punten te beantwoorden vooraleer zelf punten toe te voegen.", @@ -137,7 +145,7 @@ "getStartedNewAccount": " of maak een nieuwe account aan", "noTagsSelected": "Geen tags geselecteerd", "customThemeIntro": "

Onofficiële thema's

De onderstaande thema's heb je eerder bezocht en zijn gemaakt door andere OpenStreetMappers.", - "aboutMapcomplete": "

Over MapComplete

Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! De maker van het thema bepaalt de elementen, vragen en taalversies voor het thema.

Ontdek meer

MapComplete biedt altijd de volgende stap naar meer OpenStreetMap:

  • Indien ingebed in een website linkt het iframe naar de volledige MapComplete
  • De volledige versie heeft uitleg over OpenStreetMap
  • Bekijken kan altijd, maar wijzigen vereist een OSM-account
  • Als je niet aangemeld bent, wordt je gevraagd dit te doen
  • Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen
  • Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki

Merk je een bug of wil je een extra feature? Wil je helpen vertalen? Bezoek dan de broncode en issue tracker.

Wil je je vorderingen zien? Volg de edits op OsmCha.

", + "aboutMapcomplete": "

Over MapComplete

Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! De maker van het thema bepaalt de elementen, vragen en taalversies voor het thema.

Ontdek meer

MapComplete biedt altijd de volgende stap naar meer OpenStreetMap:

  • Indien ingebed in een website linkt het iframe naar de volledige MapComplete
  • De volledige versie heeft uitleg over OpenStreetMap
  • Bekijken kan altijd, maar wijzigen vereist een OSM-account
  • Als je niet aangemeld bent, wordt je gevraagd dit te doen
  • Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen
  • Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki

Merk je een bug of wil je een extra feature? Wil je helpen vertalen? Bezoek dan de broncode en issue tracker.

Wil je je vorderingen zien? Volg de edits op OsmCha.

", "backgroundMap": "Achtergrondkaart", "layerSelection": { "zoomInToSeeThisLayer": "Vergroot de kaart om deze laag te zien", @@ -181,7 +189,10 @@ "save": "Opslaan", "returnToTheMap": "Ga terug naar de kaart", "pdf": { - "versionInfo": "v{version} - gemaakt op {date}" + "versionInfo": "v{version} - gemaakt op {date}", + "attr": "Kaartgegevens © OpenStreetMap-bijdragers, herbruikbaar volgens ODbL", + "generatedWith": "Gemaakt met MapComplete.osm.be", + "attrBackground": "Achtergrondlaag: {background}" }, "osmLinkTooltip": "Bekijk dit object op OpenStreetMap om de geschiedenis te zien en meer te kunnen aanpassen", "oneSkippedQuestion": "Een vraag werd overgeslaan", @@ -196,9 +207,27 @@ "downloadGeoJsonHelper": "Compatibel met QGIS, ArcGIS, ESRI, ...", "downloadGeojson": "Download de zichtbare data als geojson", "downloadAsPdfHelper": "Perfect om de huidige kaart af te printen", - "downloadAsPdf": "Download een PDF van de huidig zichtbare kaart" + "downloadAsPdf": "Download een PDF van de huidig zichtbare kaart", + "title": "Download de zichtbare data", + "exporting": "Aan het exporteren..." }, - "cancel": "Annuleren" + "cancel": "Annuleren", + "testing": "Testmode - wijzigingen worden niet opgeslaan", + "openTheMap": "Naar de kaart", + "wikipedia": { + "failed": "Het wikipedia-artikel inladen is mislukt", + "wikipediaboxTitle": "Wikipedia", + "loading": "Wikipedia aan het laden...", + "noWikipediaPage": "Dit Wikidata-item heeft nog geen overeenkomstig Wikipedia-artikel", + "createNewWikidata": "Maak een nieuw Wikidata-item", + "searchWikidata": "Zoek op Wikidata", + "noResults": "Niet gevonden voor {search}", + "doSearch": "Zoek hierboven om resultaten te zien" + }, + "histogram": { + "error_loading": "Kan het histogram niet laden" + }, + "loading": "Aan het laden..." }, "reviews": { "title": "{count} beoordelingen", @@ -231,7 +260,57 @@ "reasons": { "notFound": "Het kon niet gevonden worden", "disused": "Het wordt niet meer onderhouden of is verwijderd", - "test": "Dit punt was een test en was nooit echt aanwezig" - } + "test": "Dit punt was een test en was nooit echt aanwezig", + "duplicate": "Dit punt is een duplicaat van een ander punt" + }, + "cancel": "Annuleer", + "isDeleted": "Dit object is verwijderd", + "delete": "Verwijder", + "partOfOthers": "Dit punt maakt deel uit van een lijn, oppervlakte of een relatie en kan niet verwijderd worden.", + "whyDelete": "Waarom moet dit punt van de kaart verwijderd worden?", + "loginToDelete": "Je moet aangemeld zijn om een object van de kaart te verwijderen", + "onlyEditedByLoggedInUser": "Dit punt is enkel door jezelf bewerkt, je kan dit veilig verwijderen.", + "cannotBeDeleted": "Dit object kan niet van de kaart verwijderd worden", + "safeDelete": "Dit punt kan veilig verwijderd worden van de kaart.", + "isntAPoint": "Enkel punten kunnen verwijderd worden, het geselecteerde object is een lijn, een oppervlakte of een relatie.", + "notEnoughExperience": "Dit punt is door iemand anders gemaakt.", + "useSomethingElse": "Gebruik een ander OpenStreetMap-editeerprogramma om dit object te verwijderen", + "loading": "Aan het bekijken of dit object veilig verwijderd kan worden." + }, + "move": { + "cannotBeMoved": "Dit object kan niet verplaatst worden.", + "inviteToMove": { + "reasonRelocation": "Verplaats dit punt naar een andere locatie omdat het verhuisd is", + "reasonInaccurate": "Verbeter de precieze locatie van dit punt", + "generic": "Verplaats dit punt" + }, + "pointIsMoved": "Dit punt is verplaatst", + "confirmMove": "Verplaats", + "reasons": { + "reasonRelocation": "Dit object is verhuisd naar een andere locatie", + "reasonInaccurate": "De locatie van dit object is niet accuraat en moet een paar meter verschoven worden" + }, + "partOfAWay": "Dit punt is deel van een lijn of een oppervlakte. Gebruik een ander OpenStreetMap-bewerkprogramma om het te verplaatsen", + "partOfRelation": "Dit punt maakt deel uit van een relatie. Gebruik een ander OpenStreetMap-bewerkprogramma om het te verplaatsen", + "cancel": "Annuleer verplaatsing", + "loginToMove": "Je moet aangemeld zijn om een punt te verplaatsen", + "zoomInFurther": "Zoom verder in om de verplaatsing te bevestigen", + "isRelation": "Dit object is een relatie en kan niet verplaatst worden", + "inviteToMoveAgain": "Verplaats dit punt opnieuw", + "moveTitle": "Verplaats dit punt", + "whyMove": "Waarom verplaats je dit punt?", + "selectReason": "Waarom verplaats je dit object?", + "isWay": "Dit object is een lijn of een oppervlakte. Gebruik een ander OpenStreetMap-bewerkprogramma op het te verplaatsen." + }, + "split": { + "cancel": "Annuleer knippen", + "split": "Knip weg", + "splitTitle": "Duid op de kaart aan waar de weg geknipt moet worden", + "inviteToSplit": "Knip deze weg in kleinere segmenten (om andere eigenschappen per segment toe te kennen)", + "loginToSplit": "Je moet aangemeld zijn om een weg te knippen", + "hasBeenSplit": "Deze weg is verknipt" + }, + "multi_apply": { + "autoApply": "Wijzigingen aan eigenschappen {attr_names} zullen ook worden uitgevoerd op {count} andere objecten." } } diff --git a/langs/pt.json b/langs/pt.json index 92db819cb1..21667811d9 100644 --- a/langs/pt.json +++ b/langs/pt.json @@ -9,7 +9,7 @@ "isDeleted": "Eliminada", "doDelete": "Remover imagem", "dontDelete": "Cancelar", - "uploadDone": "A sua imagem foi adicionada. Obrigado pela ajuda!", + "uploadDone": "A sua imagem foi adicionada. Obrigado pela ajuda!", "respectPrivacy": "Não fotografe pessoas nem placas de veículos. Não envie imagens do Google Maps, do Google Streetview ou outras fontes protegidas por direitos de autor.", "uploadFailed": "Não foi possível enviar a sua imagem. Está conectado à Internet e permite APIs de terceiros? O navegador \"Brave\" ou o plugin \"uMatrix\" podem estar a bloqueá-los.", "ccb": "sob a licença CC-BY", diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index 5b457a60b9..24b5582b65 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -12,7 +12,7 @@ "then": "Hunde sind nicht erlaubt" }, "2": { - "then": "Hunde sind erlaubt, müssen aber angeleint sein." + "then": "Hunde sind erlaubt, müssen aber angeleint sein" }, "3": { "then": "Hunde sind erlaubt und können frei herumlaufen" @@ -65,7 +65,7 @@ "wheelchair-access": { "mappings": { "0": { - "then": "Dieser Ort ist speziell für Rollstuhlfahrer eingerichtet." + "then": "Dieser Ort ist speziell für Rollstuhlfahrer eingerichtet" }, "1": { "then": "Dieser Ort ist mit einem Rollstuhl leicht zu erreichen" @@ -78,6 +78,22 @@ } }, "question": "Ist dieser Ort mit einem Rollstuhl zugänglich?" + }, + "wikipedia": { + "mappings": { + "0": { + "then": "Es wurde noch keine Wikipedia-Seite verlinkt" + } + }, + "question": "Was ist das entsprechende Wikidata Element?" + }, + "wikipedialink": { + "mappings": { + "0": { + "then": "Nicht mit Wikipedia verknüpft" + } + }, + "question": "Was ist der entsprechende Artikel auf Wikipedia?" } } } \ No newline at end of file diff --git a/langs/shared-questions/fr.json b/langs/shared-questions/fr.json index 4f1f52590c..7f0de79045 100644 --- a/langs/shared-questions/fr.json +++ b/langs/shared-questions/fr.json @@ -3,6 +3,23 @@ "description": { "question": "Y a-t-il quelque chose de pertinent que vous n'avez pas pu donner à la dernière question ? Ajoutez-le ici.
Ne répétez pas des réponses déjà données" }, + "dog-access": { + "mappings": { + "0": { + "then": "Chiens admis" + }, + "1": { + "then": "Les chiens ne sont pas admis" + }, + "2": { + "then": "Les chiens sont admis, mais ils doivent être tenus en laisse" + }, + "3": { + "then": "Les chiens sont admis et peuvent circuler librement" + } + }, + "question": "Est-ce que les chiens sont admis ici ?" + }, "email": { "question": "Quelle est l'adresse courriel de {name} ?" }, @@ -28,11 +45,33 @@ "question": "Quelles sont les horaires d'ouverture de {name} ?", "render": "

Horaires d'ouverture

{opening_hours_table(opening_hours)}" }, + "payment-options": { + "mappings": { + "0": { + "then": "Paiement en liquide accepté" + }, + "1": { + "then": "Paiement par carte accepté" + } + }, + "question": "Quelles sont les méthodes de paiement acceptées ici ?" + }, "phone": { "question": "Quel est le numéro de téléphone de {name} ?" }, "website": { "question": "Quel est le site web de {name} ?" + }, + "wheelchair-access": { + "mappings": { + "2": { + "then": "Il est possible d'accéder à cet endroit en chaise roulante, mais ce n'est pas facile" + }, + "3": { + "then": "Cet endroit n'est pas accessible en chaise roulante" + } + }, + "question": "Est-ce que cet endroit est accessible en chaise roulante ?" } } } \ No newline at end of file diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json index fbd7309863..b1f25a4351 100644 --- a/langs/shared-questions/pt.json +++ b/langs/shared-questions/pt.json @@ -78,6 +78,22 @@ } }, "question": "Este lugar é acessível a utilizadores de cadeiras de rodas?" + }, + "wikipedia": { + "mappings": { + "0": { + "then": "Ainda não foi vinculada nenhuma página da Wikipédia" + } + }, + "question": "Qual é a entidade Wikidata correspondente?" + }, + "wikipedialink": { + "mappings": { + "0": { + "then": "Não vinculado à Wikipédia" + } + }, + "question": "Qual é o item correspondente na Wikipédia?" } } } \ No newline at end of file diff --git a/langs/themes/de.json b/langs/themes/de.json index d81b087491..e01564288a 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -36,7 +36,7 @@ "name": "Wohnmobilstellplätze", "presets": { "0": { - "description": "Fügen Sie einen neuen offiziellen Wohnmobilstellplatz hinzu. Dies sind ausgewiesene Plätze, an denen Sie in Ihrem Wohnmobil übernachten können. Sie können wie ein richtiger Campingplatz oder nur wie ein Parkplatz aussehen. Möglicherweise sind sie gar nicht ausgeschildert, sondern nur in einem Gemeindebeschluss festgelegt. Ein normaler Parkplatz für Wohnmobile, auf dem übernachten nicht zulässig ist, ist kein Wohnmobilstellplatz. ", + "description": "Fügen Sie einen neuen offiziellen Wohnmobilstellplatz hinzu. Dies sind ausgewiesene Plätze, an denen Sie in Ihrem Wohnmobil übernachten können. Sie können wie ein richtiger Campingplatz oder nur wie ein Parkplatz aussehen. Möglicherweise sind sie gar nicht ausgeschildert, sondern nur in einem Gemeindebeschluss festgelegt. Ein normaler Parkplatz für Wohnmobile, auf dem Übernachten nicht zulässig ist, ist kein Wohnmobilstellplatz. ", "title": "Wohnmobilstellplatz" } }, @@ -233,21 +233,23 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Wer betreibt diesen Ort?", - "render": "Dieser Ort wird betrieben von {operator}" - }, - "1": { - "mappings": { - "0": { - "then": "Dieser Ort hat eine Stromversorgung" - }, - "1": { - "then": "Dieser Ort hat keine Stromversorgung" - } + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Wer betreibt diesen Ort?", + "render": "Dieser Ort wird betrieben von {operator}" }, - "question": "Hat dieser Ort eine Stromversorgung?" + "1": { + "mappings": { + "0": { + "then": "Dieser Ort hat eine Stromversorgung" + }, + "1": { + "then": "Dieser Ort hat keine Stromversorgung" + } + }, + "question": "Hat dieser Ort eine Stromversorgung?" + } } }, "shortDescription": "Finden Sie Plätze zum Übernachten mit Ihrem Wohnmobil", @@ -316,6 +318,18 @@ } }, "tagRenderings": { + "Bolts": { + "mappings": { + "0": { + "then": "Auf dieser Kletterroute sind keine Haken vorhanden" + }, + "1": { + "then": "Auf dieser Kletterroute sind keine Haken vorhanden" + } + }, + "question": "Wie viele Haken gibt es auf dieser Kletterroute bevor der Umlenker bzw. Standhaken erreicht ist?", + "render": "Diese Kletterroute hat {climbing:bolts} Haken" + }, "Difficulty": { "question": "Wie hoch ist der Schwierigkeitsgrad dieser Kletterroute nach dem französisch/belgischen System?", "render": "Die Schwierigkeit ist {climbing:grade:french} entsprechend des französisch/belgischen Systems" @@ -428,6 +442,113 @@ } }, "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Gibt es eine (inoffizielle) Website mit mehr Informationen (z.B. Topos)?" + }, + "2": { + "mappings": { + "0": { + "then": "Öffentlich zugänglich für jedermann" + }, + "1": { + "then": "Zugang nur mit Genehmigung" + }, + "2": { + "then": "Nur für Kunden" + }, + "3": { + "then": "Nur für Vereinsmitglieder" + } + }, + "question": "Wer hat hier Zugang?" + }, + "4": { + "question": "Wie lang sind die Routen (durchschnittlich) in Metern?", + "render": "Die Routen sind durchschnittlich {canonical(climbing:length)} lang" + }, + "5": { + "question": "Welche Schwierigkeit hat hier die leichteste Route (französisch/belgisches System)?", + "render": "Die leichteste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)" + }, + "6": { + "question": "Welche Schwierigkeit hat hier die schwerste Route (französisch/belgisches System)?", + "render": "Die schwerste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)" + }, + "7": { + "mappings": { + "0": { + "then": "Hier kann gebouldert werden" + }, + "1": { + "then": "Hier kann nicht gebouldert werden" + }, + "2": { + "then": "Bouldern ist hier nur an wenigen Routen möglich" + }, + "3": { + "then": "Hier gibt es {climbing:boulder} Boulder-Routen" + } + }, + "question": "Kann hier gebouldert werden?" + }, + "8": { + "mappings": { + "0": { + "then": "Toprope-Klettern ist hier möglich" + }, + "1": { + "then": "Toprope-Climbing ist hier nicht möglich" + }, + "2": { + "then": "Hier gibt es {climbing:toprope} Toprope-Routen" + } + }, + "question": "Ist Toprope-Klettern hier möglich?" + }, + "9": { + "mappings": { + "0": { + "then": "Sportklettern ist hier möglich" + }, + "1": { + "then": "Sportklettern ist hier nicht möglich" + }, + "2": { + "then": "Hier gibt es {climbing:sport} Sportkletter-Routen" + } + }, + "question": "Ist hier Sportklettern möglich (feste Ankerpunkte)?" + }, + "10": { + "mappings": { + "0": { + "then": "Traditionelles Klettern ist hier möglich" + }, + "1": { + "then": "Traditionelles Klettern ist hier nicht möglich" + }, + "2": { + "then": "Hier gibt es {climbing:traditional} Routen für traditionelles Klettern" + } + }, + "question": "Ist hier traditionelles Klettern möglich (eigene Sicherung z.B. mit Klemmkleilen)?" + }, + "11": { + "mappings": { + "0": { + "then": "Hier gibt es eine Speedkletter-Wand" + }, + "1": { + "then": "Hier gibt es keine Speedkletter-Wand" + }, + "2": { + "then": "Hier gibt es {climbing:speed} Speedkletter-Routen" + } + }, + "question": "Gibt es hier eine Speedkletter-Wand?" + } + }, "units+": { "0": { "applicableUnits": { @@ -441,113 +562,6 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Gibt es eine (inoffizielle) Website mit mehr Informationen (z.B. Topos)?" - }, - "2": { - "mappings": { - "0": { - "then": "Öffentlich zugänglich für jedermann" - }, - "1": { - "then": "Zugang nur mit Genehmigung" - }, - "2": { - "then": "Nur für Kunden" - }, - "3": { - "then": "Nur für Vereinsmitglieder" - } - }, - "question": "Wer hat hier Zugang?" - }, - "4": { - "question": "Wie lang sind die Routen (durchschnittlich) in Metern?", - "render": "Die Routen sind durchschnittlich {canonical(climbing:length)} lang" - }, - "5": { - "question": "Welche Schwierigkeit hat hier die leichteste Route (französisch/belgisches System)?", - "render": "Die leichteste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)" - }, - "6": { - "question": "Welche Schwierigkeit hat hier die schwerste Route (französisch/belgisches System)?", - "render": "Die schwerste Route hat hier die Schwierigkeit {climbing:grade:french:min} (französisch/belgisches System)" - }, - "7": { - "mappings": { - "0": { - "then": "Hier kann gebouldert werden" - }, - "1": { - "then": "Hier kann nicht gebouldert werden" - }, - "2": { - "then": "Bouldern ist hier nur an wenigen Routen möglich" - }, - "3": { - "then": "Hier gibt es {climbing:boulder} Boulder-Routen" - } - }, - "question": "Kann hier gebouldert werden?" - }, - "8": { - "mappings": { - "0": { - "then": "Toprope-Klettern ist hier möglich" - }, - "1": { - "then": "Toprope-Climbing ist hier nicht möglich" - }, - "2": { - "then": "Hier gibt es {climbing:toprope} Toprope-Routen" - } - }, - "question": "Ist Toprope-Klettern hier möglich?" - }, - "9": { - "mappings": { - "0": { - "then": "Sportklettern ist hier möglich" - }, - "1": { - "then": "Sportklettern ist hier nicht möglich" - }, - "2": { - "then": "Hier gibt es {climbing:sport} Sportkletter-Routen" - } - }, - "question": "Ist hier Sportklettern möglich (feste Ankerpunkte)?" - }, - "10": { - "mappings": { - "0": { - "then": "Traditionelles Klettern ist hier möglich" - }, - "1": { - "then": "Traditionelles Klettern ist hier nicht möglich" - }, - "2": { - "then": "Hier gibt es {climbing:traditional} Routen für traditionelles Klettern" - } - }, - "question": "Ist hier traditionelles Klettern möglich (eigene Sicherung z.B. mit Klemmkleilen)?" - }, - "11": { - "mappings": { - "0": { - "then": "Hier gibt es eine Speedkletter-Wand" - }, - "1": { - "then": "Hier gibt es keine Speedkletter-Wand" - }, - "2": { - "then": "Hier gibt es {climbing:speed} Speedkletter-Routen" - } - }, - "question": "Gibt es hier eine Speedkletter-Wand?" - } - }, "title": "Offene Kletterkarte" }, "cycle_highways": { @@ -594,42 +608,56 @@ } } }, - "roamingRenderings": { - "0": { - "mappings": { - "0": { - "then": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)" + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)" + }, + "1": { + "then": "Diese Straße ist eine Fahrradstraße" + }, + "2": { + "then": "Diese Straße wird bald eine Fahrradstraße sein" + }, + "3": { + "then": "Diese Straße ist keine Fahrradstraße" + } }, - "1": { - "then": "Diese Straße ist eine Fahrradstraße" - }, - "2": { - "then": "Diese Straße wird bald eine Fahrradstraße sein" - }, - "3": { - "then": "Diese Straße ist keine Fahrradstraße" - } + "question": "Ist diese Straße eine Fahrradstraße?" }, - "question": "Ist diese Straße eine Fahrradstraße?" - }, - "1": { - "question": "Wann wird diese Straße eine Fahrradstraße?", - "render": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" + "1": { + "question": "Wann wird diese Straße eine Fahrradstraße?", + "render": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" + } } }, "shortDescription": "Eine Karte von Fahrradstraßen", "title": "Fahrradstraßen" }, "cyclofix": { - "description": "Das Ziel dieser Karte ist es, den Radfahrern eine einfach zu benutzende Lösung zu präsentieren, um die geeignete Infrastruktur für ihre Bedürfnisse zu finden.

Sie können Ihren genauen Standort verfolgen (nur mobil) und in der linken unteren Ecke die für Sie relevanten Ebenen auswählen. Sie können dieses Tool auch verwenden, um Pins (Points of Interest/Interessante Orte) zur Karte hinzuzufügen oder zu bearbeiten und mehr Daten durch Beantwortung der Fragen bereitstellen.

Alle Änderungen, die Sie vornehmen, werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei wiederverwendet werden.

Weitere Informationen über das Projekt Cyclofix finden Sie unter cyclofix.osm.be.", - "title": "Cyclofix - eine offene Karte für Radfahrer" + "description": "Mit dieser Karte soll Radfahrern eine einfache Lösung bereitgestellt werden, um die passende Farradinfrastruktur zu finden.

Sie können Ihren genauen Standort verfolgen (nur mobil) und in der linken unteren Ecke die für Sie relevanten Ebenen auswählen. Sie können dieses Tool auch verwenden, um Pins (Points of Interest/Interessante Orte) zur Karte hinzuzufügen oder zu bearbeiten und mehr Daten durch Beantwortung der Fragen bereitstellen.

Ihre Änderungen, werden automatisch in der Datenbank von OpenStreetMap gespeichert und können von anderen frei verwendet werden.

Weitere Informationen über Cyclofix finden Sie unter cyclofix.osm.be.", + "title": "Cyclofix - eine freie Karte für Radfahrer" }, "drinking_water": { - "description": "Auf dieser Karte sind öffentlich zugängliche Trinkwasserstellen eingezeichnet und können leicht hinzugefügt werden", - "title": "Trinkwasser" + "description": "Eine Karte zum Anzeigen und Bearbeiten öffentlicher Trinkwasserstellen", + "title": "Trinkwasserstelle" }, "etymology": { - "description": "Auf dieser Karte können Sie sehen, nach was ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, das mit Wikidata verknüpft wurde. Die Informationen stammen aus Wikipedia.", + "description": "Auf dieser Karte können Sie sehen, wonach ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, das mit Wikidata verknüpft wurde. In dem Popup sehen Sie den Wikipedia-Artikel (falls vorhanden) oder ein Wikidata-Feld, nach dem das Objekt benannt ist. Wenn das Objekt selbst eine Wikipedia-Seite hat, wird auch diese angezeigt.

Sie können auch einen Beitrag leisten!Zoomen Sie genug hinein und alle Straßen werden angezeigt. Wenn Sie auf eine Straße klicken, öffnet sich ein Wikidata-Suchfeld. Mit ein paar Klicks können Sie einen Etymologie-Link hinzufügen. Beachten Sie, dass Sie dazu ein kostenloses OpenStreetMap-Konto benötigen.", + "layers": { + "1": { + "override": { + "name": "Straßen ohne Informationen zur Namensherkunft" + } + }, + "2": { + "override": { + "name": "Parks und Waldflächen ohne Informationen zur Namensherkunft" + } + } + }, "shortDescription": "Was ist der Ursprung eines Ortsnamens?", "title": "Open Etymology Map" }, @@ -732,8 +760,8 @@ } }, "ghostbikes": { - "description": "Ein Geisterrad ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt ist.

Auf dieser Karte kann man alle Geisterräder sehen, die OpenStreetMap kennt. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen lediglich einen (kostenlosen) OpenStreetMap-Account.", - "title": "Geisterrad" + "description": "Ein Geisterrad ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt ist.

Auf dieser Karte kann man alle Geisterräder sehen, die in OpenStreetMap eingetragen sind. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen lediglich einen (kostenlosen) OpenStreetMap-Account.", + "title": "Geisterräder" }, "hackerspaces": { "description": "Auf dieser Karte können Sie Hackerspaces sehen, einen neuen Hackerspace hinzufügen oder Daten direkt aktualisieren", @@ -812,15 +840,307 @@ "shortDescription": "Eine Karte von Hackerspaces", "title": "Hackerspaces" }, + "hailhydrant": { + "description": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren. \n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen. \n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.", + "layers": { + "0": { + "description": "Kartenebene zur Anzeige von Hydranten.", + "name": "Karte der Hydranten", + "presets": { + "0": { + "description": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden.", + "title": "Löschwasser-Hydrant" + } + }, + "tagRenderings": { + "hydrant-color": { + "mappings": { + "0": { + "then": "Die Farbe des Hydranten ist unbekannt." + }, + "1": { + "then": "Die Farbe des Hydranten ist gelb." + }, + "2": { + "then": "Die Farbe des Hydranten ist rot." + } + }, + "question": "Welche Farbe hat der Hydrant?", + "render": "Der Hydrant hat die Farbe {colour}" + }, + "hydrant-state": { + "mappings": { + "0": { + "then": "Der Hydrant ist (ganz oder teilweise) in Betrieb." + }, + "1": { + "then": "Der Hydrant ist nicht verfügbar." + }, + "2": { + "then": "Der Hydrant wurde entfernt." + } + }, + "question": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten.", + "render": "Lebenszyklus-Status" + }, + "hydrant-type": { + "mappings": { + "0": { + "then": "Der Typ des Hydranten ist unbekannt." + }, + "1": { + "then": " Säulenart." + }, + "2": { + "then": " Rohrtyp." + }, + "3": { + "then": " Wandtyp." + }, + "4": { + "then": " Untergrundtyp." + } + }, + "question": "Um welche Art von Hydrant handelt es sich?", + "render": " Hydranten-Typ: {fire_hydrant:type}" + } + }, + "title": { + "render": "Hydrant" + } + }, + "1": { + "description": "Kartenebene zur Anzeige von Hydranten.", + "name": "Karte mit Feuerlöschern.", + "presets": { + "0": { + "description": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen", + "title": "Feuerlöscher" + } + }, + "tagRenderings": { + "extinguisher-location": { + "mappings": { + "0": { + "then": "Im Innenraum vorhanden." + }, + "1": { + "then": "Im Außenraum vorhanden." + } + }, + "question": "Wo befindet er sich?", + "render": "Standort: {location}" + } + }, + "title": { + "render": "Feuerlöscher" + } + }, + "2": { + "description": "Kartenebene zur Darstellung von Feuerwachen.", + "name": "Karte der Feuerwachen", + "presets": { + "0": { + "description": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind.", + "title": "Feuerwache" + } + }, + "tagRenderings": { + "station-name": { + "question": "Wie lautet der Name dieser Feuerwache?" + } + }, + "title": { + "render": "Feuerwache" + } + }, + "3": { + "presets": { + "0": { + "description": "Eine Rettungsstation der Karte hinzufügen" + } + } + } + } + }, + "maps": { + "title": "Eine Karte der Karten" + }, + "natuurpunt": { + "shortDescription": "Diese Karte zeigt Naturschutzgebiete des flämischen Naturverbands Natuurpunt", + "title": "Naturschutzgebiete" + }, + "observation_towers": { + "description": "Öffentlich zugänglicher Aussichtsturm", + "shortDescription": "Öffentlich zugänglicher Aussichtsturm", + "title": "Aussichtstürme" + }, + "openwindpowermap": { + "description": "Eine Karte zum Anzeigen und Bearbeiten von Windkraftanlagen.", + "layers": { + "0": { + "name": "Windrad", + "presets": { + "0": { + "title": "Windrad" + } + }, + "title": { + "render": "Windrad" + }, + "units": { + "0": { + "applicableUnits": { + "0": { + "human": " Megawatt" + }, + "1": { + "human": " Kilowatt" + }, + "2": { + "human": " Watt" + }, + "3": { + "human": " Gigawatt" + } + } + }, + "1": { + "applicableUnits": { + "0": { + "human": " Meter" + } + } + } + } + } + }, + "title": "OpenWindPowerMap" + }, + "parkings": { + "description": "Diese Karte zeigt Parkplätze", + "shortDescription": "Diese Karte zeigt Parkplätze", + "title": "Parken" + }, "personal": { "description": "Erstellen Sie ein persönliches Thema auf der Grundlage aller verfügbaren Ebenen aller Themen", "title": "Persönliches Thema" }, + "playgrounds": { + "shortDescription": "Eine Karte mit Spielplätzen", + "title": "Spielpläzte" + }, + "postboxes": { + "layers": { + "0": { + "description": "Die Ebene zeigt Briefkästen.", + "name": "Brieflästen", + "presets": { + "0": { + "title": "Briefkasten" + } + }, + "title": { + "render": "Briefkasten" + } + }, + "1": { + "description": "Eine Ebene mit Postämtern.", + "filter": { + "0": { + "options": { + "0": { + "question": "Aktuell geöffnet" + } + } + } + }, + "name": "Poststellen", + "presets": { + "0": { + "title": "Poststelle" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "durchgehend geöffnet (auch an Feiertagen)" + } + } + } + }, + "title": { + "render": "Poststelle" + } + } + }, + "shortDescription": "Eine Karte die Briefkästen und Poststellen anzeigt", + "title": "Karte mit Briefkästen und Poststellen" + }, + "shops": { + "shortDescription": "Eine bearbeitbare Karte mit grundlegenden Geschäftsinformationen", + "title": "Freie Geschäftskarte" + }, + "sport_pitches": { + "description": "Ein Sportplatz ist eine Fläche, auf der Sportarten gespielt werden", + "shortDescription": "Eine Karte mit Sportplätzen", + "title": "Sportplätze" + }, + "surveillance": { + "description": "Auf dieser offenen Karte finden Sie Überwachungskameras.", + "shortDescription": "Überwachungskameras und andere Mittel zur Überwachung", + "title": "Überwachung unter Überwachung" + }, "toilets": { - "description": "Eine Karte der öffentlichen Toiletten", - "title": "Offene Toilette Karte" + "description": "Eine Karte mit öffentlich zugänglichen Toiletten", + "title": "Freie Toilettenkarte" + }, + "trees": { + "description": "Kartieren Sie alle Bäume!", + "shortDescription": "Kartieren Sie alle Bäume", + "title": "Bäume" + }, + "uk_addresses": { + "description": "Tragen Sie zu OpenStreetMap bei, indem Sie Adressinformationen ausfüllen", + "layers": { + "1": { + "description": "Adressen", + "name": "Bekannte Adressen in OSM", + "tagRenderings": { + "uk_addresses_explanation_osm": { + "render": "Diese Adresse ist in OpenStreetMap gespeichert" + }, + "uk_addresses_housenumber": { + "mappings": { + "0": { + "then": "Dieses Gebäude hat keine Hausnummer" + } + }, + "question": "Wie lautet die Nummer dieses Hauses?", + "render": "Die Hausnummer ist {addr:housenumber}" + }, + "uk_addresses_street": { + "question": "In welcher Straße befindet sich diese Adresse?", + "render": "Diese Adresse befindet sich in der Straße {addr:street}" + } + }, + "title": { + "render": "Bekannte Adresse" + } + } + }, + "shortDescription": "Helfen Sie beim Aufbau eines offenen Datensatzes britischer Adressen", + "tileLayerSources": { + "0": { + "name": "Grenzverläufe gemäß osmuk.org" + } + }, + "title": "Adressen in Großbritannien" }, "waste_basket": { + "description": "Auf dieser Karte finden Sie Abfalleimer in Ihrer Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, können Sie ihn selbst hinzufügen", + "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } } \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index d6560316ea..7712adc64c 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -233,25 +233,27 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Who operates this place?", - "render": "This place is operated by {operator}" - }, - "1": { - "mappings": { - "0": { - "then": "This place has a power supply" - }, - "1": { - "then": "This place does not have power supply" - } - }, - "question": "Does this place have a power supply?" - } - }, "shortDescription": "Find sites to spend the night with your camper", - "title": "Campersites" + "title": "Campersites", + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Who operates this place?", + "render": "This place is operated by {operator}" + }, + "1": { + "mappings": { + "0": { + "then": "This place has a power supply" + }, + "1": { + "then": "This place does not have power supply" + } + }, + "question": "Does this place have a power supply?" + } + } + } }, "charging_stations": { "description": "On this open map, one can find and mark information about charging stations", @@ -463,129 +465,129 @@ } } } - } - }, - "roamingRenderings": { - "0": { - "question": "Is there a (unofficial) website with more informations (e.g. topos)?" }, - "1": { - "mappings": { - "0": { - "then": "The containing feature states that this is publicly accessible
{_embedding_feature:access:description}" - }, - "1": { - "then": "The containing feature states that a permit is needed to access
{_embedding_feature:access:description}" - }, - "2": { - "then": "The containing feature states that this is only accessible to customers
{_embedding_feature:access:description}" - }, - "3": { - "then": "The containing feature states that this is only accessible to club members
{_embedding_feature:access:description}" + "tagRenderings+": { + "0": { + "question": "Is there a (unofficial) website with more informations (e.g. topos)?" + }, + "1": { + "mappings": { + "0": { + "then": "The containing feature states that this is publicly accessible
{_embedding_feature:access:description}" + }, + "1": { + "then": "The containing feature states that a permit is needed to access
{_embedding_feature:access:description}" + }, + "2": { + "then": "The containing feature states that this is only accessible to customers
{_embedding_feature:access:description}" + }, + "3": { + "then": "The containing feature states that this is only accessible to club members
{_embedding_feature:access:description}" + } } + }, + "2": { + "mappings": { + "0": { + "then": "Publicly accessible to anyone" + }, + "1": { + "then": "You need a permit to access here" + }, + "2": { + "then": "Only custumers" + }, + "3": { + "then": "Only club members" + } + }, + "question": "Who can access here?" + }, + "4": { + "question": "What is the (average) length of the routes in meters?", + "render": "The routes are {canonical(climbing:length)} long on average" + }, + "5": { + "question": "What is the level of the easiest route here, accoring to the french classification system?", + "render": "The minimal difficulty is {climbing:grade:french:min} according to the french/belgian system" + }, + "6": { + "question": "What is the level of the most difficult route here, accoring to the french classification system?", + "render": "The maximal difficulty is {climbing:grade:french:max} according to the french/belgian system" + }, + "7": { + "mappings": { + "0": { + "then": "Bouldering is possible here" + }, + "1": { + "then": "Bouldering is not possible here" + }, + "2": { + "then": "Bouldering is possible, allthough there are only a few routes" + }, + "3": { + "then": "There are {climbing:boulder} boulder routes" + } + }, + "question": "Is bouldering possible here?" + }, + "8": { + "mappings": { + "0": { + "then": "Toprope climbing is possible here" + }, + "1": { + "then": "Toprope climbing is not possible here" + }, + "2": { + "then": "There are {climbing:toprope} toprope routes" + } + }, + "question": "Is toprope climbing possible here?" + }, + "9": { + "mappings": { + "0": { + "then": "Sport climbing is possible here" + }, + "1": { + "then": "Sport climbing is not possible here" + }, + "2": { + "then": "There are {climbing:sport} sport climbing routes" + } + }, + "question": "Is sport climbing possible here on fixed anchors?" + }, + "10": { + "mappings": { + "0": { + "then": "Traditional climbing is possible here" + }, + "1": { + "then": "Traditional climbing is not possible here" + }, + "2": { + "then": "There are {climbing:traditional} traditional climbing routes" + } + }, + "question": "Is traditional climbing possible here (using own gear e.g. chocks)?" + }, + "11": { + "mappings": { + "0": { + "then": "There is a speed climbing wall" + }, + "1": { + "then": "There is no speed climbing wall" + }, + "2": { + "then": "There are {climbing:speed} speed climbing walls" + } + }, + "question": "Is there a speed climbing wall?" } - }, - "2": { - "mappings": { - "0": { - "then": "Publicly accessible to anyone" - }, - "1": { - "then": "You need a permit to access here" - }, - "2": { - "then": "Only custumers" - }, - "3": { - "then": "Only club members" - } - }, - "question": "Who can access here?" - }, - "4": { - "question": "What is the (average) length of the routes in meters?", - "render": "The routes are {canonical(climbing:length)} long on average" - }, - "5": { - "question": "What is the level of the easiest route here, accoring to the french classification system?", - "render": "The minimal difficulty is {climbing:grade:french:min} according to the french/belgian system" - }, - "6": { - "question": "What is the level of the most difficult route here, accoring to the french classification system?", - "render": "The maximal difficulty is {climbing:grade:french:max} according to the french/belgian system" - }, - "7": { - "mappings": { - "0": { - "then": "Bouldering is possible here" - }, - "1": { - "then": "Bouldering is not possible here" - }, - "2": { - "then": "Bouldering is possible, allthough there are only a few routes" - }, - "3": { - "then": "There are {climbing:boulder} boulder routes" - } - }, - "question": "Is bouldering possible here?" - }, - "8": { - "mappings": { - "0": { - "then": "Toprope climbing is possible here" - }, - "1": { - "then": "Toprope climbing is not possible here" - }, - "2": { - "then": "There are {climbing:toprope} toprope routes" - } - }, - "question": "Is toprope climbing possible here?" - }, - "9": { - "mappings": { - "0": { - "then": "Sport climbing is possible here" - }, - "1": { - "then": "Sport climbing is not possible here" - }, - "2": { - "then": "There are {climbing:sport} sport climbing routes" - } - }, - "question": "Is sport climbing possible here on fixed anchors?" - }, - "10": { - "mappings": { - "0": { - "then": "Traditional climbing is possible here" - }, - "1": { - "then": "Traditional climbing is not possible here" - }, - "2": { - "then": "There are {climbing:traditional} traditional climbing routes" - } - }, - "question": "Is traditional climbing possible here (using own gear e.g. chocks)?" - }, - "11": { - "mappings": { - "0": { - "then": "There is a speed climbing wall" - }, - "1": { - "then": "There is no speed climbing wall" - }, - "2": { - "then": "There are {climbing:speed} speed climbing walls" - } - }, - "question": "Is there a speed climbing wall?" } }, "title": "Open Climbing Map" @@ -634,31 +636,33 @@ } } }, - "roamingRenderings": { - "0": { - "mappings": { - "0": { - "then": "This street is a cyclestreet (and has a speed limit of 30 km/h)" - }, - "1": { - "then": "This street is a cyclestreet" - }, - "2": { - "then": "This street will become a cyclstreet soon" - }, - "3": { - "then": "This street is not a cyclestreet" - } - }, - "question": "Is this street a cyclestreet?" - }, - "1": { - "question": "When will this street become a cyclestreet?", - "render": "This street will become a cyclestreet at {cyclestreet:start_date}" - } - }, "shortDescription": "A map of cyclestreets", - "title": "Cyclestreets" + "title": "Cyclestreets", + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "This street is a cyclestreet (and has a speed limit of 30 km/h)" + }, + "1": { + "then": "This street is a cyclestreet" + }, + "2": { + "then": "This street will become a cyclstreet soon" + }, + "3": { + "then": "This street is not a cyclestreet" + } + }, + "question": "Is this street a cyclestreet?" + }, + "1": { + "question": "When will this street become a cyclestreet?", + "render": "This street will become a cyclestreet at {cyclestreet:start_date}" + } + } + } }, "cyclofix": { "description": "The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs.

You can track your precise location (mobile only) and select layers that are relevant for you in the bottom left corner. You can also use this tool to add or edit pins (points of interest) to the map and provide more data by answering the questions.

All changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others.

For more information about the cyclofix project, go to cyclofix.osm.be.", @@ -1227,62 +1231,6 @@ "shortDescription": "A map showing sport pitches", "title": "Sport pitches" }, - "street_lighting": { - "description": "On this map you can find everything about street lighting", - "layers": { - "1": { - "name": "Lit streets", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "This street is lit" - }, - "1": { - "then": "This road is not lit" - }, - "2": { - "then": "This street is lit at night" - }, - "3": { - "then": "This street is lit 24/7" - } - }, - "question": "Is this street lit?" - } - }, - "title": { - "render": "Lit street" - } - }, - "2": { - "name": "All streets", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "This street is lit" - }, - "1": { - "then": "This road is not lit" - }, - "2": { - "then": "This street is lit at night" - }, - "3": { - "then": "This street is lit 24/7" - } - }, - "question": "Is this street lit?" - } - }, - "title": { - "render": "Street" - } - } - }, - "title": "Street Lighting" - }, "surveillance": { "description": "On this open map, you can find surveillance cameras.", "shortDescription": "Surveillance cameras and other means of surveillance", @@ -1338,5 +1286,61 @@ "description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself", "shortDescription": "A map with waste baskets", "title": "Waste Basket" + }, + "street_lighting": { + "description": "On this map you can find everything about street lighting", + "layers": { + "1": { + "name": "Lit streets", + "tagRenderings": { + "lit": { + "mappings": { + "0": { + "then": "This street is lit" + }, + "1": { + "then": "This road is not lit" + }, + "2": { + "then": "This street is lit at night" + }, + "3": { + "then": "This street is lit 24/7" + } + }, + "question": "Is this street lit?" + } + }, + "title": { + "render": "Lit street" + } + }, + "2": { + "name": "All streets", + "tagRenderings": { + "lit": { + "mappings": { + "0": { + "then": "This street is lit" + }, + "1": { + "then": "This road is not lit" + }, + "2": { + "then": "This street is lit at night" + }, + "3": { + "then": "This street is lit 24/7" + } + }, + "question": "Is this street lit?" + } + }, + "title": { + "render": "Street" + } + } + }, + "title": "Street Lighting" } } \ No newline at end of file diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 0c73fa52cb..f258a5cb04 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -225,21 +225,23 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Qui est l’exploitant du site ?", - "render": "Ce site est exploité par {operator}" - }, - "1": { - "mappings": { - "0": { - "then": "Ce site a une source d’alimentation" - }, - "1": { - "then": "Ce site n’a pas de source d’alimentation" - } + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Qui est l’exploitant du site ?", + "render": "Ce site est exploité par {operator}" }, - "question": "Ce site a-t’il une source d’électricité ?" + "1": { + "mappings": { + "0": { + "then": "Ce site a une source d’alimentation" + }, + "1": { + "then": "Ce site n’a pas de source d’alimentation" + } + }, + "question": "Ce site a-t’il une source d’électricité ?" + } } }, "shortDescription": "Trouver des sites pour passer la nuit avec votre camping-car", @@ -439,6 +441,87 @@ } }, "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Existe-t’il un site avec plus d’informations (ex : topographie) ?" + }, + "1": { + "mappings": { + "0": { + "then": "L’élément englobant indique un accès libre
{_embedding_feature:access:description}" + }, + "1": { + "then": "L’élément englobant indique qu’ une autorisation d’accès est nécessaire
{_embedding_feature:access:description}" + }, + "2": { + "then": "L’élément englobant indique que l’accès est réservés aux clients
{_embedding_feature:access:description}" + }, + "3": { + "then": "L’élément englobant indique que l’accès est réservé aux membres
{_embedding_feature:access:description}" + } + } + }, + "2": { + "mappings": { + "0": { + "then": "Libre d’accès" + }, + "1": { + "then": "Une autorisation est nécessaire" + }, + "2": { + "then": "Réservé aux clients" + }, + "3": { + "then": "Réservé aux membres" + } + }, + "question": "Qui peut y accéder ?" + }, + "4": { + "question": "Quelle est la longueur moyenne des voies en mètres ?", + "render": "Les voies font {canonical(climbing:length)} de long en moyenne" + }, + "5": { + "question": "Quel est le niveau de la voie la plus simple selon la classification franco-belge ?", + "render": "La difficulté minimale est {climbing:grade:french:min} selon la classification franco-belge" + }, + "6": { + "question": "Quel est le niveau de la voie la plus difficile selon la classification franco-belge ?", + "render": "La difficulté maximale est {climbing:grade:french:max} selon la classification franco-belge" + }, + "7": { + "mappings": { + "0": { + "then": "L’escalade de bloc est possible" + }, + "1": { + "then": "L’escalade de bloc n’est pas possible" + }, + "2": { + "then": "L’escalade de bloc est possible sur des voies précises" + }, + "3": { + "then": "Il y a {climbing:boulder} voies d’escalade de bloc" + } + }, + "question": "L’escalade de bloc est-elle possible ici ?" + }, + "8": { + "mappings": { + "0": { + "then": "L’escalade à la moulinette est possible" + }, + "1": { + "then": "L’escalade à la moulinette n’est pas possible" + }, + "2": { + "then": "{climbing:toprope} voies sont équipées de moulinettes" + } + }, + "question": "Est-il possible d’escalader à la moulinette ?" + } + }, "units+": { "0": { "applicableUnits": { @@ -452,87 +535,6 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Existe-t’il un site avec plus d’informations (ex : topographie) ?" - }, - "1": { - "mappings": { - "0": { - "then": "L’élément englobant indique un accès libre
{_embedding_feature:access:description}" - }, - "1": { - "then": "L’élément englobant indique qu’ une autorisation d’accès est nécessaire
{_embedding_feature:access:description}" - }, - "2": { - "then": "L’élément englobant indique que l’accès est réservés aux clients
{_embedding_feature:access:description}" - }, - "3": { - "then": "L’élément englobant indique que l’accès est réservé aux membres
{_embedding_feature:access:description}" - } - } - }, - "2": { - "mappings": { - "0": { - "then": "Libre d’accès" - }, - "1": { - "then": "Une autorisation est nécessaire" - }, - "2": { - "then": "Réservé aux clients" - }, - "3": { - "then": "Réservé aux membres" - } - }, - "question": "Qui peut y accéder ?" - }, - "4": { - "question": "Quelle est la longueur moyenne des voies en mètres ?", - "render": "Les voies font {canonical(climbing:length)} de long en moyenne" - }, - "5": { - "question": "Quel est le niveau de la voie la plus simple selon la classification franco-belge ?", - "render": "La difficulté minimale est {climbing:grade:french:min} selon la classification franco-belge" - }, - "6": { - "question": "Quel est le niveau de la voie la plus difficile selon la classification franco-belge ?", - "render": "La difficulté maximale est {climbing:grade:french:max} selon la classification franco-belge" - }, - "7": { - "mappings": { - "0": { - "then": "L’escalade de bloc est possible" - }, - "1": { - "then": "L’escalade de bloc n’est pas possible" - }, - "2": { - "then": "L’escalade de bloc est possible sur des voies précises" - }, - "3": { - "then": "Il y a {climbing:boulder} voies d’escalade de bloc" - } - }, - "question": "L’escalade de bloc est-elle possible ici ?" - }, - "8": { - "mappings": { - "0": { - "then": "L’escalade à la moulinette est possible" - }, - "1": { - "then": "L’escalade à la moulinette n’est pas possible" - }, - "2": { - "then": "{climbing:toprope} voies sont équipées de moulinettes" - } - }, - "question": "Est-il possible d’escalader à la moulinette ?" - } - }, "title": "Open Climbing Map" }, "cyclofix": { diff --git a/langs/themes/id.json b/langs/themes/id.json index b9e07e1ad1..8fd97982c5 100644 --- a/langs/themes/id.json +++ b/langs/themes/id.json @@ -52,14 +52,16 @@ } } }, - "roamingRenderings": { - "1": { - "mappings": { - "0": { - "then": "Tempat ini memiliki catu daya" - }, - "1": { - "then": "Tempat ini tidak memiliki sumber listrik" + "overrideAll": { + "tagRenderings+": { + "1": { + "mappings": { + "0": { + "then": "Tempat ini memiliki catu daya" + }, + "1": { + "then": "Tempat ini tidak memiliki sumber listrik" + } } } } diff --git a/langs/themes/it.json b/langs/themes/it.json index b1a3980281..2b71cfcffa 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -225,21 +225,23 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Chi gestisce questo luogo?", - "render": "Questo luogo è gestito da {operator}" - }, - "1": { - "mappings": { - "0": { - "then": "Questo luogo fornisce corrente elettrica" - }, - "1": { - "then": "Questo luogo non fornisce corrente elettrica" - } + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Chi gestisce questo luogo?", + "render": "Questo luogo è gestito da {operator}" }, - "question": "Questo luogo fornisce corrente elettrica?" + "1": { + "mappings": { + "0": { + "then": "Questo luogo fornisce corrente elettrica" + }, + "1": { + "then": "Questo luogo non fornisce corrente elettrica" + } + }, + "question": "Questo luogo fornisce corrente elettrica?" + } } }, "shortDescription": "Trova aree dove passare la notte con il tuo camper", @@ -310,17 +312,19 @@ } } }, - "roamingRenderings": { - "0": { - "mappings": { - "3": { - "then": "Questa strada non è una strada ciclabile" + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "3": { + "then": "Questa strada non è una strada ciclabile" + } } + }, + "1": { + "question": "Questa strada diventerà una strada ciclabile quando?", + "render": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}" } - }, - "1": { - "question": "Questa strada diventerà una strada ciclabile quando?", - "render": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}" } } }, diff --git a/langs/themes/ja.json b/langs/themes/ja.json index a42d749bb0..de0493785d 100644 --- a/langs/themes/ja.json +++ b/langs/themes/ja.json @@ -225,21 +225,23 @@ } } }, - "roamingRenderings": { - "0": { - "question": "この店は誰が経営しているんですか?", - "render": "この場所は{operator}によって運営されます" - }, - "1": { - "mappings": { - "0": { - "then": "この場所には電源があります" - }, - "1": { - "then": "この場所には電源がありません" - } + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "この店は誰が経営しているんですか?", + "render": "この場所は{operator}によって運営されます" }, - "question": "この場所に電源はありますか?" + "1": { + "mappings": { + "0": { + "then": "この場所には電源があります" + }, + "1": { + "then": "この場所には電源がありません" + } + }, + "question": "この場所に電源はありますか?" + } } }, "shortDescription": "キャンパーと夜を共にするキャンプサイトを見つける", @@ -379,94 +381,96 @@ } } }, - "roamingRenderings": { - "0": { - "question": "もっと情報のある(非公式の)ウェブサイトはありますか(例えば、topos)?" - }, - "4": { - "question": "ルートの(平均)長さはメートル単位でいくつですか?", - "render": "ルートの長さは平均で{canonical(climbing:length)}です" - }, - "5": { - "question": "ここで一番簡単なルートのレベルは、フランスのランク評価システムで何ですか?", - "render": "フランス/ベルギーのランク評価システムでは、最小の難易度は{climbing:grade:french:min}です" - }, - "6": { - "question": "フランスのランク評価によると、ここで一番難しいルートのレベルはどれくらいですか?", - "render": "フランス/ベルギーのランク評価システムでは、最大の難易度は{climbing:grade:french:max}です" - }, - "7": { - "mappings": { - "0": { - "then": "ボルダリングはここで可能です" - }, - "1": { - "then": "ここではボルダリングはできません" - }, - "2": { - "then": "ボルダリングは可能ですが、少しのルートしかありません" - }, - "3": { - "then": "{climbing:boulder} ボルダールートがある" - } + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "もっと情報のある(非公式の)ウェブサイトはありますか(例えば、topos)?" }, - "question": "ここでボルダリングはできますか?" - }, - "8": { - "mappings": { - "0": { - "then": "ここでToprope登坂ができます" - }, - "1": { - "then": "ここではToprope登坂はできません" - }, - "2": { - "then": "{climbing:toprope} 登坂ルートがある" - } + "4": { + "question": "ルートの(平均)長さはメートル単位でいくつですか?", + "render": "ルートの長さは平均で{canonical(climbing:length)}です" }, - "question": "ここでtoprope登坂はできますか?" - }, - "9": { - "mappings": { - "0": { - "then": "ここでスポーツクライミングができます" - }, - "1": { - "then": "ここではスポーツクライミングはできません" - }, - "2": { - "then": "スポーツクライミングの {climbing:sport} ルートがある" - } + "5": { + "question": "ここで一番簡単なルートのレベルは、フランスのランク評価システムで何ですか?", + "render": "フランス/ベルギーのランク評価システムでは、最小の難易度は{climbing:grade:french:min}です" }, - "question": "ここでは固定アンカー式のスポーツクライミングはできますか?" - }, - "10": { - "mappings": { - "0": { - "then": "ここでは伝統的な登山が可能です" - }, - "1": { - "then": "伝統的な登山はここではできない" - }, - "2": { - "then": "{climbing:traditional} の伝統的な登山ルートがある" - } + "6": { + "question": "フランスのランク評価によると、ここで一番難しいルートのレベルはどれくらいですか?", + "render": "フランス/ベルギーのランク評価システムでは、最大の難易度は{climbing:grade:french:max}です" }, - "question": "伝統的な登山はここで可能ですか(例えば、チョックのような独自のギアを使用して)？" - }, - "11": { - "mappings": { - "0": { - "then": "スピードクライミングウォールがある" + "7": { + "mappings": { + "0": { + "then": "ボルダリングはここで可能です" + }, + "1": { + "then": "ここではボルダリングはできません" + }, + "2": { + "then": "ボルダリングは可能ですが、少しのルートしかありません" + }, + "3": { + "then": "{climbing:boulder} ボルダールートがある" + } }, - "1": { - "then": "スピードクライミングウォールがない" - }, - "2": { - "then": "{climbing:speed} のスピードクライミングウォールがある" - } + "question": "ここでボルダリングはできますか?" }, - "question": "スピードクライミングウォールはありますか?" + "8": { + "mappings": { + "0": { + "then": "ここでToprope登坂ができます" + }, + "1": { + "then": "ここではToprope登坂はできません" + }, + "2": { + "then": "{climbing:toprope} 登坂ルートがある" + } + }, + "question": "ここでtoprope登坂はできますか?" + }, + "9": { + "mappings": { + "0": { + "then": "ここでスポーツクライミングができます" + }, + "1": { + "then": "ここではスポーツクライミングはできません" + }, + "2": { + "then": "スポーツクライミングの {climbing:sport} ルートがある" + } + }, + "question": "ここでは固定アンカー式のスポーツクライミングはできますか?" + }, + "10": { + "mappings": { + "0": { + "then": "ここでは伝統的な登山が可能です" + }, + "1": { + "then": "伝統的な登山はここではできない" + }, + "2": { + "then": "{climbing:traditional} の伝統的な登山ルートがある" + } + }, + "question": "伝統的な登山はここで可能ですか(例えば、チョックのような独自のギアを使用して)？" + }, + "11": { + "mappings": { + "0": { + "then": "スピードクライミングウォールがある" + }, + "1": { + "then": "スピードクライミングウォールがない" + }, + "2": { + "then": "{climbing:speed} のスピードクライミングウォールがある" + } + }, + "question": "スピードクライミングウォールはありますか?" + } } }, "title": "登山地図を開く" @@ -498,27 +502,29 @@ } } }, - "roamingRenderings": { - "0": { - "mappings": { - "0": { - "then": "cyclestreet(最高速度は30km/h)" + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "cyclestreet(最高速度は30km/h)" + }, + "1": { + "then": "この通りはcyclestreetだ" + }, + "2": { + "then": "この通りはまもなくcyclstreetになるだろう" + }, + "3": { + "then": "この通りはcyclestreetではない" + } }, - "1": { - "then": "この通りはcyclestreetだ" - }, - "2": { - "then": "この通りはまもなくcyclstreetになるだろう" - }, - "3": { - "then": "この通りはcyclestreetではない" - } + "question": "この通りはcyclestreetですか?" }, - "question": "この通りはcyclestreetですか?" - }, - "1": { - "question": "この通りはいつcyclestreetになるんですか?", - "render": "この通りは{cyclestreet:start_date}に、cyclestreetになります" + "1": { + "question": "この通りはいつcyclestreetになるんですか?", + "render": "この通りは{cyclestreet:start_date}に、cyclestreetになります" + } } }, "shortDescription": "cyclestreetsの地図", diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index dc5599dabb..d00366f03c 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -108,17 +108,19 @@ } } }, - "roamingRenderings": { - "7": { - "mappings": { - "0": { - "then": "Buldring er mulig her" + "overrideAll": { + "tagRenderings+": { + "7": { + "mappings": { + "0": { + "then": "Buldring er mulig her" + }, + "1": { + "then": "Buldring er ikke mulig her" + } }, - "1": { - "then": "Buldring er ikke mulig her" - } - }, - "question": "Er buldring mulig her?" + "question": "Er buldring mulig her?" + } } }, "title": "Åpent klatrekart" @@ -136,23 +138,25 @@ "name": "Alle gater" } }, - "roamingRenderings": { - "0": { - "mappings": { - "0": { - "then": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)" + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)" + }, + "1": { + "then": "Denne gaten er en sykkelvei" + }, + "2": { + "then": "Denne gaten vil bli sykkelvei ganske snart" + }, + "3": { + "then": "Denne gaten er ikke en sykkelvei" + } }, - "1": { - "then": "Denne gaten er en sykkelvei" - }, - "2": { - "then": "Denne gaten vil bli sykkelvei ganske snart" - }, - "3": { - "then": "Denne gaten er ikke en sykkelvei" - } - }, - "question": "Er denne gaten en sykkelvei?" + "question": "Er denne gaten en sykkelvei?" + } } }, "shortDescription": "Et kart over sykkelveier" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 3d2097f3e8..5dcbdcda9a 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -97,71 +97,73 @@ } } }, - "roamingRenderings": { - "0": { - "mappings": { - "0": { - "then": "Dit gebied is vrij toegankelijk" - }, - "1": { - "then": "Vrij toegankelijk" - }, - "2": { - "then": "Niet toegankelijk" - }, - "3": { - "then": "Niet toegankelijk, want privégebied" - }, - "4": { - "then": "Toegankelijk, ondanks dat het privegebied is" - }, - "5": { - "then": "Enkel toegankelijk met een gids of tijdens een activiteit" - }, - "6": { - "then": "Toegankelijk mits betaling" - } - }, - "question": "Is dit gebied toegankelijk?", - "render": "De toegankelijkheid van dit gebied is: {access:description}" - }, - "1": { - "mappings": { - "1": { - "then": "Dit gebied wordt beheerd door Natuurpunt" - }, - "2": { - "then": "Dit gebied wordt beheerd door {operator}" - }, - "3": { - "then": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos" - } - }, - "question": "Wie beheert dit gebied?", - "render": "Beheer door {operator}" - }, - "2": { - "render": "Extra info: {description}" - }, - "3": { - "render": "Extra info via buurtnatuur.be: {description:0}" - }, - "4": { - "question": "Wat is de Nederlandstalige naam van dit gebied?", - "render": "Dit gebied heet {name:nl}" - }, - "5": { - "mappings": { - "0": { - "then": "Dit gebied heeft geen naam" - } - }, - "question": "Wat is de naam van dit gebied?", - "render": "Dit gebied heet {name}" - } - }, "shortDescription": "Met deze tool kan je natuur in je buurt in kaart brengen en meer informatie geven over je favoriete plekje", - "title": "Breng jouw buurtnatuur in kaart" + "title": "Breng jouw buurtnatuur in kaart", + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Dit gebied is vrij toegankelijk" + }, + "1": { + "then": "Vrij toegankelijk" + }, + "2": { + "then": "Niet toegankelijk" + }, + "3": { + "then": "Niet toegankelijk, want privégebied" + }, + "4": { + "then": "Toegankelijk, ondanks dat het privegebied is" + }, + "5": { + "then": "Enkel toegankelijk met een gids of tijdens een activiteit" + }, + "6": { + "then": "Toegankelijk mits betaling" + } + }, + "question": "Is dit gebied toegankelijk?", + "render": "De toegankelijkheid van dit gebied is: {access:description}" + }, + "1": { + "mappings": { + "1": { + "then": "Dit gebied wordt beheerd door Natuurpunt" + }, + "2": { + "then": "Dit gebied wordt beheerd door {operator}" + }, + "3": { + "then": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos" + } + }, + "question": "Wie beheert dit gebied?", + "render": "Beheer door {operator}" + }, + "2": { + "render": "Extra info: {description}" + }, + "3": { + "render": "Extra info via buurtnatuur.be: {description:0}" + }, + "4": { + "question": "Wat is de Nederlandstalige naam van dit gebied?", + "render": "Dit gebied heet {name:nl}" + }, + "5": { + "mappings": { + "0": { + "then": "Dit gebied heeft geen naam" + } + }, + "question": "Wat is de naam van dit gebied?", + "render": "Dit gebied heet {name}" + } + } + } }, "cafes_and_pubs": { "description": "Cafés, kroegen en drinkgelegenheden", @@ -195,6 +197,24 @@ }, "caravansites-website": { "render": "Officiële website: : {website}" + }, + "caravansites-internet": { + "mappings": { + "0": { + "then": "Er is internettoegang" + }, + "1": { + "then": "Er is internettoegang" + } + } + }, + "caravansites-description": { + "question": "Wil je graag een algemene beschrijving toevoegen van deze plaats? (Herhaal hier niet de antwoorden op de vragen die reeds gesteld zijn. Hou het objectief - je kan je mening geven via een review)", + "render": "Meer details over deze plaats: {description}" + }, + "caravansites-capacity": { + "question": "Hoeveel campers kunnen hier overnachten? (sla dit over als er geen duidelijk aantal plaatsen of aangeduid maximum is)", + "render": "{capacity} campers kunnen deze plaats tegelijk gebruiken" } }, "title": { @@ -204,11 +224,17 @@ } }, "render": "Camperplaats {name}" + }, + "presets": { + "0": { + "description": "Voeg een nieuwe officiële camperplaats toe. Dit zijn speciaal aangeduide plaatsen waar het toegestaan is om te overnachten met een camper. Ze kunnen er uitzien als een parking, of soms eerder als een camping. Soms staan ze niet ter plaatse aangeduid, maar heeft de gemeente wel degelijk beslist dat dit een camperplaats is. Een parking voor campers waar je niet mag overnachten is géén camperplaats. ", + "title": "camperplaats" + } } } }, "shortDescription": "Vind locaties waar je de nacht kan doorbrengen met je mobilehome", - "title": "Kampeersite" + "title": "Camperplaatsen" }, "charging_stations": { "shortDescription": "Een wereldwijde kaart van oplaadpunten", @@ -379,106 +405,106 @@ } } } - } - }, - "roamingRenderings": { - "0": { - "question": "Is er een (onofficiële) website met meer informatie (b.v. met topos)?" }, - "1": { - "mappings": { - "0": { - "then": "Een omvattend element geeft aan dat dit publiek toegangkelijk is
{_embedding_feature:access:description}" - }, - "1": { - "then": "Een omvattend element geeft aan dat een toelating nodig is om hier te klimmen
{_embedding_feature:access:description}" + "tagRenderings+": { + "0": { + "question": "Is er een (onofficiële) website met meer informatie (b.v. met topos)?" + }, + "1": { + "mappings": { + "0": { + "then": "Een omvattend element geeft aan dat dit publiek toegangkelijk is
{_embedding_feature:access:description}" + }, + "1": { + "then": "Een omvattend element geeft aan dat een toelating nodig is om hier te klimmen
{_embedding_feature:access:description}" + } } + }, + "4": { + "question": "Wat is de (gemiddelde) lengte van de klimroutes, in meter?", + "render": "De klimroutes zijn gemiddeld {canonical(climbing:length)} lang" + }, + "5": { + "question": "Wat is het niveau van de makkelijkste route, volgens het Franse classificatiesysteem?", + "render": "De minimale klimmoeilijkheid is {climbing:grade:french:min} volgens het Franse/Belgische systeem" + }, + "6": { + "question": "Wat is het niveau van de moeilijkste route, volgens het Franse classificatiesysteem?", + "render": "De maximale klimmoeilijkheid is {climbing:grade:french:max} volgens het Franse/Belgische systeem" + }, + "7": { + "mappings": { + "0": { + "then": "Bolderen kan hier" + }, + "1": { + "then": "Bolderen kan hier niet" + }, + "2": { + "then": "Bolderen kan hier, maar er zijn niet zoveel routes" + }, + "3": { + "then": "Er zijn hier {climbing:boulder} bolderroutes" + } + }, + "question": "Is het mogelijk om hier te bolderen?" + }, + "8": { + "mappings": { + "0": { + "then": "Toprope-klimmen kan hier" + }, + "1": { + "then": "Toprope-klimmen kan hier niet" + }, + "2": { + "then": "Er zijn hier {climbing:toprope} toprope routes" + } + }, + "question": "Is het mogelijk om hier te toprope-klimmen?" + }, + "9": { + "mappings": { + "0": { + "then": "Sportklimmen/voorklimmen kan hier" + }, + "1": { + "then": "Sportklimmen/voorklimmen kan hier niet" + }, + "2": { + "then": "Er zijn hier {climbing:sport} sportklimroutes/voorklimroutes" + } + }, + "question": "Is het mogelijk om hier te sportklimmen/voorklimmen op reeds aangebrachte haken?" + }, + "10": { + "mappings": { + "0": { + "then": "Traditioneel klimmen kan hier" + }, + "1": { + "then": "Traditioneel klimmen kan hier niet" + }, + "2": { + "then": "Er zijn hier {climbing:traditional} traditionele klimroutes" + } + }, + "question": "Is het mogelijk om hier traditioneel te klimmen?
(Dit is klimmen met klemblokjes en friends)" + }, + "11": { + "mappings": { + "0": { + "then": "Er is een snelklimmuur voor speed climbing" + }, + "1": { + "then": "Er is geen snelklimmuur voor speed climbing" + }, + "2": { + "then": "Er zijn hier {climbing:speed} snelklimmuren" + } + }, + "question": "Is er een snelklimmuur (speed climbing)?" } - }, - "4": { - "question": "Wat is de (gemiddelde) lengte van de klimroutes, in meter?", - "render": "De klimroutes zijn gemiddeld {canonical(climbing:length)} lang" - }, - "5": { - "question": "Wat is het niveau van de makkelijkste route, volgens het Franse classificatiesysteem?", - "render": "De minimale klimmoeilijkheid is {climbing:grade:french:min} volgens het Franse/Belgische systeem" - }, - "6": { - "question": "Wat is het niveau van de moeilijkste route, volgens het Franse classificatiesysteem?", - "render": "De maximale klimmoeilijkheid is {climbing:grade:french:max} volgens het Franse/Belgische systeem" - }, - "7": { - "mappings": { - "0": { - "then": "Bolderen kan hier" - }, - "1": { - "then": "Bolderen kan hier niet" - }, - "2": { - "then": "Bolderen kan hier, maar er zijn niet zoveel routes" - }, - "3": { - "then": "Er zijn hier {climbing:boulder} bolderroutes" - } - }, - "question": "Is het mogelijk om hier te bolderen?" - }, - "8": { - "mappings": { - "0": { - "then": "Toprope-klimmen kan hier" - }, - "1": { - "then": "Toprope-klimmen kan hier niet" - }, - "2": { - "then": "Er zijn hier {climbing:toprope} toprope routes" - } - }, - "question": "Is het mogelijk om hier te toprope-klimmen?" - }, - "9": { - "mappings": { - "0": { - "then": "Sportklimmen/voorklimmen kan hier" - }, - "1": { - "then": "Sportklimmen/voorklimmen kan hier niet" - }, - "2": { - "then": "Er zijn hier {climbing:sport} sportklimroutes/voorklimroutes" - } - }, - "question": "Is het mogelijk om hier te sportklimmen/voorklimmen op reeds aangebrachte haken?" - }, - "10": { - "mappings": { - "0": { - "then": "Traditioneel klimmen kan hier" - }, - "1": { - "then": "Traditioneel klimmen kan hier niet" - }, - "2": { - "then": "Er zijn hier {climbing:traditional} traditionele klimroutes" - } - }, - "question": "Is het mogelijk om hier traditioneel te klimmen?
(Dit is klimmen met klemblokjes en friends)" - }, - "11": { - "mappings": { - "0": { - "then": "Er is een snelklimmuur voor speed climbing" - }, - "1": { - "then": "Er is geen snelklimmuur voor speed climbing" - }, - "2": { - "then": "Er zijn hier {climbing:speed} snelklimmuren" - } - }, - "question": "Is er een snelklimmuur (speed climbing)?" } }, "title": "Open klimkaart" @@ -515,31 +541,33 @@ } } }, - "roamingRenderings": { - "0": { - "mappings": { - "0": { - "then": "Deze straat is een fietsstraat (en dus zone 30)" - }, - "1": { - "then": "Deze straat i een fietsstraat" - }, - "2": { - "then": "Deze straat wordt binnenkort een fietsstraat" - }, - "3": { - "then": "Deze straat is geen fietsstraat" - } - }, - "question": "Is deze straat een fietsstraat?" - }, - "1": { - "question": "Wanneer wordt deze straat een fietsstraat?", - "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}" - } - }, "shortDescription": "Een kaart met alle gekende fietsstraten", - "title": "Fietsstraten" + "title": "Fietsstraten", + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Deze straat is een fietsstraat (en dus zone 30)" + }, + "1": { + "then": "Deze straat i een fietsstraat" + }, + "2": { + "then": "Deze straat wordt binnenkort een fietsstraat" + }, + "3": { + "then": "Deze straat is geen fietsstraat" + } + }, + "question": "Is deze straat een fietsstraat?" + }, + "1": { + "question": "Wanneer wordt deze straat een fietsstraat?", + "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}" + } + } + } }, "cyclofix": { "description": "Het doel van deze kaart is om fietsers een gebruiksvriendelijke oplossing te bieden voor het vinden van de juiste infrastructuur voor hun behoeften.

U kunt uw exacte locatie volgen (enkel mobiel) en in de linkerbenedenhoek categorieën selecteren die voor u relevant zijn. U kunt deze tool ook gebruiken om 'spelden' aan de kaart toe te voegen of te bewerken en meer gegevens te verstrekken door de vragen te beantwoorden.

Alle wijzigingen die u maakt worden automatisch opgeslagen in de wereldwijde database van OpenStreetMap en kunnen door anderen vrij worden hergebruikt.

Bekijk voor meer info over cyclofix ook cyclofix.osm.be.", @@ -897,6 +925,53 @@ "shortDescription": "Deze kaart toont sportvelden", "title": "Sportvelden" }, + "surveillance": { + "description": "Op deze open kaart kan je bewakingscamera's vinden.", + "shortDescription": "Bewakingscameras en dergelijke", + "title": "Surveillance under Surveillance" + }, + "toerisme_vlaanderen": { + "description": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
  • Eetgelegenheden
  • Cafés en bars
  • (Fiets)oplaadpunten
  • Fietspompen, fietserverhuur en fietswinkels
  • Uitkijktorens
  • ...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken.", + "descriptionTail": "Met de steun van Toerisme Vlaanderen", + "shortDescription": "Een kaart om toeristisch relevante info op aan te duiden", + "title": "Toeristisch relevante info" + }, + "toilets": { + "description": "Een kaart met openbare toiletten", + "title": "Open Toilettenkaart" + }, + "trees": { + "description": "Breng bomen in kaart!", + "shortDescription": "Breng bomen in kaart", + "title": "Bomen" + }, + "uk_addresses": { + "description": "Draag bij aan OpenStreetMap door adresinformatie in te vullen", + "layers": { + "1": { + "description": "Adressen", + "tagRenderings": { + "uk_addresses_housenumber": { + "mappings": { + "0": { + "then": "Dit gebouw heeft geen huisnummer" + } + }, + "render": "Het huisnummer is {addr:housenumber}" + } + } + } + } + }, + "waste_basket": { + "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen", + "shortDescription": "Een kaart met vuilnisbakken", + "title": "Vuilnisbak" + }, + "street_lighting_assen": { + "description": "Op deze kaart vind je alles over straatlantaarns + een dataset van Assen", + "title": "Straatverlichting - Assen" + }, "street_lighting": { "description": "Op deze kaart vind je alles over straatlantaarns", "layers": { @@ -952,52 +1027,5 @@ } }, "title": "Straatverlichting" - }, - "street_lighting_assen": { - "description": "Op deze kaart vind je alles over straatlantaarns + een dataset van Assen", - "title": "Straatverlichting - Assen" - }, - "surveillance": { - "description": "Op deze open kaart kan je bewakingscamera's vinden.", - "shortDescription": "Bewakingscameras en dergelijke", - "title": "Surveillance under Surveillance" - }, - "toerisme_vlaanderen": { - "description": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
  • Eetgelegenheden
  • Cafés en bars
  • (Fiets)oplaadpunten
  • Fietspompen, fietserverhuur en fietswinkels
  • Uitkijktorens
  • ...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken.", - "descriptionTail": "Met de steun van Toerisme Vlaanderen", - "shortDescription": "Een kaart om toeristisch relevante info op aan te duiden", - "title": "Toeristisch relevante info" - }, - "toilets": { - "description": "Een kaart met openbare toiletten", - "title": "Open Toilettenkaart" - }, - "trees": { - "description": "Breng bomen in kaart!", - "shortDescription": "Breng bomen in kaart", - "title": "Bomen" - }, - "uk_addresses": { - "description": "Draag bij aan OpenStreetMap door adresinformatie in te vullen", - "layers": { - "1": { - "description": "Adressen", - "tagRenderings": { - "uk_addresses_housenumber": { - "mappings": { - "0": { - "then": "Dit gebouw heeft geen huisnummer" - } - }, - "render": "Het huisnummer is {addr:housenumber}" - } - } - } - } - }, - "waste_basket": { - "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen", - "shortDescription": "Een kaart met vuilnisbakken", - "title": "Vuilnisbak" } } \ No newline at end of file diff --git a/langs/themes/ru.json b/langs/themes/ru.json index e473c91cee..6923005264 100644 --- a/langs/themes/ru.json +++ b/langs/themes/ru.json @@ -269,24 +269,26 @@ } } }, - "roamingRenderings": { - "0": { - "question": "Есть ли (неофициальный) веб-сайт с более подробной информацией (напр., topos)?" - }, - "2": { - "mappings": { - "3": { - "then": "Только членам клуба" + "overrideAll": { + "tagRenderings+": { + "0": { + "question": "Есть ли (неофициальный) веб-сайт с более подробной информацией (напр., topos)?" + }, + "2": { + "mappings": { + "3": { + "then": "Только членам клуба" + } } - } - }, - "9": { - "mappings": { - "0": { - "then": "Здесь можно заняться спортивным скалолазанием" - }, - "1": { - "then": "Спортивное скалолазание здесь невозможно" + }, + "9": { + "mappings": { + "0": { + "then": "Здесь можно заняться спортивным скалолазанием" + }, + "1": { + "then": "Спортивное скалолазание здесь невозможно" + } } } } diff --git a/package-lock.json b/package-lock.json index a21cb12e71..ca84f2e65b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "jspdf": "^2.3.1", "latlon2country": "^1.1.3", "leaflet": "^1.7.1", - "leaflet-providers": "^1.10.2", + "leaflet-providers": "^1.13.0", "leaflet-simple-map-screenshoter": "^0.4.4", "leaflet.markercluster": "^1.4.1", "libphonenumber": "0.0.10", @@ -10035,9 +10035,9 @@ "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==" }, "node_modules/leaflet-providers": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/leaflet-providers/-/leaflet-providers-1.12.0.tgz", - "integrity": "sha512-pU/mR4B+NbayBGCg5/88dmRq7t1EGiNPhsVGV3yqHuDn594vIwus4CiPVW0RtiKJNKg8Vf1pILAbFl0i+yk+lQ==" + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/leaflet-providers/-/leaflet-providers-1.13.0.tgz", + "integrity": "sha512-f/sN5wdgBbVA2jcCYzScIfYNxKdn2wBJP9bu+5cRX9Xj6g8Bt1G9Sr8WgJAt/ckIFIc3LVVxCBNFpSCfTuUElg==" }, "node_modules/leaflet-simple-map-screenshoter": { "version": "0.4.4", @@ -25965,9 +25965,9 @@ "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==" }, "leaflet-providers": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/leaflet-providers/-/leaflet-providers-1.12.0.tgz", - "integrity": "sha512-pU/mR4B+NbayBGCg5/88dmRq7t1EGiNPhsVGV3yqHuDn594vIwus4CiPVW0RtiKJNKg8Vf1pILAbFl0i+yk+lQ==" + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/leaflet-providers/-/leaflet-providers-1.13.0.tgz", + "integrity": "sha512-f/sN5wdgBbVA2jcCYzScIfYNxKdn2wBJP9bu+5cRX9Xj6g8Bt1G9Sr8WgJAt/ckIFIc3LVVxCBNFpSCfTuUElg==" }, "leaflet-simple-map-screenshoter": { "version": "0.4.4", diff --git a/package.json b/package.json index f480e7dc00..ea7d04f0f6 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "jspdf": "^2.3.1", "latlon2country": "^1.1.3", "leaflet": "^1.7.1", - "leaflet-providers": "^1.10.2", + "leaflet-providers": "^1.13.0", "leaflet-simple-map-screenshoter": "^0.4.4", "leaflet.markercluster": "^1.4.1", "libphonenumber": "0.0.10", diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index d97c235cba..e4c981decf 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -118,6 +118,9 @@ class LayerOverviewUtils { if (themeFile["units"] !== undefined) { themeErrorCount.push("The theme " + themeFile.id + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) ") } + if (themeFile["roamingRenderings"] !== undefined) { + themeErrorCount.push("Theme " + themeFile.id + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead") + } for (const layer of themeFile.layers) { if (typeof layer === "string") { if (!knownLayerIds.has(layer)) { @@ -142,7 +145,7 @@ class LayerOverviewUtils { } } - const referencedLayers = Utils.NoNull(themeFile.layers.map(layer => { + const referencedLayers = Utils.NoNull([].concat(...themeFile.layers.map(layer => { if(typeof layer === "string"){ return layer } @@ -150,7 +153,12 @@ class LayerOverviewUtils { return layer["builtin"] } return undefined - })) + }).map(layerName => { + if(typeof layerName === "string"){ + return [layerName] + } + return layerName + }))) themeFile.layers = themeFile.layers .filter(l => typeof l != "string") // We remove all the builtin layer references as they don't work with ts-node for some weird reason @@ -169,7 +177,8 @@ class LayerOverviewUtils { const neededLanguages = themeFile["mustHaveLanguage"] if (neededLanguages !== undefined) { console.log("Checking language requerements for ", theme.id, "as it must have", neededLanguages.join(", ")) - const allTranslations = [].concat(Translation.ExtractAllTranslationsFrom(theme, theme.id), ...referencedLayers.map(layerId => Translation.ExtractAllTranslationsFrom(knownLayerIds.get(layerId), theme.id+"->"+layerId))) + const allTranslations = [].concat(Translation.ExtractAllTranslationsFrom(theme, theme.id), + ...referencedLayers.map(layerId => Translation.ExtractAllTranslationsFrom(knownLayerIds.get(layerId), theme.id+"->"+layerId))) for (const neededLanguage of neededLanguages) { allTranslations .filter(t => t.tr.translations[neededLanguage] === undefined && t.tr.translations["*"] === undefined) @@ -213,4 +222,4 @@ class LayerOverviewUtils { } } -new LayerOverviewUtils().main(process.argv) \ No newline at end of file +new LayerOverviewUtils().main(process.argv) diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts index d6d8c11d20..7880605494 100644 --- a/scripts/generateTranslations.ts +++ b/scripts/generateTranslations.ts @@ -33,7 +33,7 @@ class TranslationPart { } const v = translations[translationsKey] if (typeof (v) != "string") { - console.error("Non-string object in translation while trying to add more translations to '", translationsKey ,"': ", v) + console.error("Non-string object in translation while trying to add more translations to '", translationsKey, "': ", v) throw "Error in an object depicting a translation: a non-string object was found. (" + context + ")\n You probably put some other section accidentally in the translation" } this.contents.set(translationsKey, v) @@ -166,7 +166,13 @@ function transformTranslation(obj: any, depth = 1) { if (key.match("^[a-zA-Z0-9_]*$") === null) { throw "Invalid character in key: " + key } - values += (Utils.Times((_) => " ", depth)) + key + ": " + transformTranslation(obj[key], depth + 1) + ",\n" + const value = obj[key] + + if (isTranslation(value)) { + values += (Utils.Times((_) => " ", depth)) + "get " + key + "() { return new Translation(" + JSON.stringify(value) + ") }" + ",\n" + } else { + values += (Utils.Times((_) => " ", depth)) + key + ": " + transformTranslation(value, depth + 1) + ",\n" + } } return `{${values}}`; @@ -300,9 +306,9 @@ function MergeTranslation(source: any, target: any, language: string, context: s } if (typeof sourceV === "object") { if (targetV === undefined) { - try{ - target[language] = sourceV; - }catch(e){ + try { + target[language] = sourceV; + } catch (e) { throw `At context${context}: Could not add a translation in language ${language} due to ${e}` } } else { diff --git a/scripts/lint.ts b/scripts/lint.ts index a4f3902a64..fe79b61303 100644 --- a/scripts/lint.ts +++ b/scripts/lint.ts @@ -46,6 +46,11 @@ for (const themeFile of themeFiles) { // @ts-ignore fixLayerConfig(layerConfig) } + + if(themeFile.parsed["roamingRenderings"] !== undefined && themeFile.parsed["roamingRenderings"].length == 0){ + delete themeFile.parsed["roamingRenderings"] + } + writeFileSync(themeFile.path, JSON.stringify(themeFile.parsed, null, " ")) } -//*/ \ No newline at end of file +//*/ diff --git a/test/Actors.spec.ts b/test/Actors.spec.ts new file mode 100644 index 0000000000..b53cfd5c7b --- /dev/null +++ b/test/Actors.spec.ts @@ -0,0 +1,143 @@ +import T from "./TestHelper"; +import State from "../State"; +import {AllKnownLayouts} from "../Customizations/AllKnownLayouts"; +import SelectedElementTagsUpdater from "../Logic/Actors/SelectedElementTagsUpdater"; +import UserRelatedState from "../Logic/State/UserRelatedState"; +import {Utils} from "../Utils"; +import ScriptUtils from "../scripts/ScriptUtils"; +import SelectedFeatureHandler from "../Logic/Actors/SelectedFeatureHandler"; +import {UIEventSource} from "../Logic/UIEventSource"; +import {ElementStorage} from "../Logic/ElementStorage"; +import Loc from "../Models/Loc"; + +export default class ActorsSpec extends T { + + constructor() { + + const latestTags = { + "amenity": "public_bookcase", + "books": "children;adults", + "capacity": "25", + "description": "Deze boekenruilkast vindt je recht tegenover de Pim Pam Poem", + "image:0": "https://i.imgur.com/Z8a69UG.jpg", + "name": "Stubbekwartier-buurtbibliotheek", + "nobrand": "yes", + "opening_hours": "24/7", + "operator": "Huisbewoner", + "public_bookcase:type": "reading_box" + } + + Utils.injectJsonDownloadForTests( + "https://www.openstreetmap.org/api/0.6/node/5568693115", + { + "version": "0.6", + "generator": "CGImap 0.8.5 (1815943 spike-06.openstreetmap.org)", + "copyright": "OpenStreetMap and contributors", + "attribution": "http://www.openstreetmap.org/copyright", + "license": "http://opendatacommons.org/licenses/odbl/1-0/", + "elements": [{ + "type": "node", + "id": 5568693115, + "lat": 51.2179199, + "lon": 3.2154662, + "timestamp": "2021-08-21T16:22:55Z", + "version": 6, + "changeset": 110034454, + "user": "Pieter Vander Vennet", + "uid": 3818858, + "tags": latestTags + }] + } + ) + + super("Actors", [ + [ + "download latest version", + () => { + const state = new UserRelatedState(AllKnownLayouts.allKnownLayouts.get("bookcases")) + const feature = { + "type": "Feature", + "id": "node/5568693115", + "properties": { + "amenity": "public_bookcase", + "books": "children;adults", + "capacity": "25", + "description": "Deze boekenruilkast vindt je recht tegenover de Pim Pam Poem", + "image:0": "https://i.imgur.com/Z8a69UG.jpg", + "name": "OUTDATED NAME", + "nobrand": "yes", + "opening_hours": "24/7", + "operator": "Huisbewoner", + "public_bookcase:type": "reading_box", + "id": "node/5568693115", + "_lat": "51.2179199", + "_lon": "3.2154662", + "fixme": "SOME FIXME" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 3.2154662, + 51.2179199 + ] + }, + "bbox": { + "maxLat": 51.2179199, + "maxLon": 3.2154662, + "minLat": 51.2179199, + "minLon": 3.2154662 + }, + "_lon": 3.2154662, + "_lat": 51.2179199 + } + state.allElements.addOrGetElement(feature) + SelectedElementTagsUpdater.installCallback(state) + + // THis should trigger a download of the latest feaures and update the tags + // However, this doesn't work with ts-node for some reason + state.selectedElement.setData(feature) + + SelectedElementTagsUpdater.applyUpdate(state, latestTags, feature.properties.id) + + // The name should be updated + T.equals("Stubbekwartier-buurtbibliotheek", feature.properties.name) + // The fixme should be removed + T.equals(undefined, feature.properties.fixme) + + }], + ["Hash without selected element should download geojson from OSM-API", async () => { + const hash = new UIEventSource("node/5568693115") + const selected = new UIEventSource(undefined) + const loc = new UIEventSource({ + lat: 0, + lon: 0, + zoom: 0 + }) + + + loc.addCallback(_ => { + T.equals("node/5568693115", selected.data.properties.id) + T.equals(14, loc.data.zoom) + T.equals( 51.2179199, loc.data.lat) + }) + + new SelectedFeatureHandler(hash, { + selectedElement: selected, + allElements: new ElementStorage(), + featurePipeline: undefined, + locationControl: loc, + layoutToUse: undefined + }) + + + + + }] + + + ]); + + } + + +} \ No newline at end of file diff --git a/test/RelationSplitHandler.spec.ts b/test/RelationSplitHandler.spec.ts index 43d57de873..0d13e7dc59 100644 --- a/test/RelationSplitHandler.spec.ts +++ b/test/RelationSplitHandler.spec.ts @@ -1,88 +1,418 @@ import T from "./TestHelper"; -import {InPlaceReplacedmentRTSH} from "../Logic/Osm/Actions/RelationSplitHandler"; +import {InPlaceReplacedmentRTSH, TurnRestrictionRSH} from "../Logic/Osm/Actions/RelationSplitHandler"; import {OsmObject, OsmRelation} from "../Logic/Osm/OsmObject"; import {Changes} from "../Logic/Osm/Changes"; import {Utils} from "../Utils"; export default class RelationSplitHandlerSpec extends T { - - private static async split(): Promise { - // Lets mimick a split action of https://www.openstreetmap.org/way/295132739 - - const relation: OsmRelation = await OsmObject.DownloadObjectAsync("relation/9572808") - const originalNodeIds = [5273988967, - 170497153, - 1507524582, - 4524321710, - 170497155, - 170497157, - 170497158, - 3208166179, - 1507524610, - 170497160, - 3208166178, - 1507524573, - 1575932830, - 6448669326] - - const withSplit = [[5273988967, - 170497153, - 1507524582, - 4524321710, - 170497155, - 170497157, - 170497158], - [ - 3208166179, - 1507524610, - 170497160, - 3208166178, - 1507524573, - 1575932830, - 6448669326]] - - const splitter = new InPlaceReplacedmentRTSH( - { - relation: relation, - originalWayId: 295132739, - allWayIdsInOrder: [295132739, -1], - originalNodes: originalNodeIds, - allWaysNodesInOrder: withSplit - },"no-theme") - const changeDescription = await splitter.CreateChangeDescriptions(new Changes()) - const allIds = changeDescription[0].changes["members"].map(m => m.ref).join(",") - const expected = "687866206,295132739,-1,690497698" - if (allIds.indexOf(expected) < 0) { - throw "Invalid order or the split ways. If this suddenly breaks, the parent relation at https://osm.org/relation/9572808 has probably changed and the test must be updated" - } - } - constructor() { - + Utils.injectJsonDownloadForTests( "https://www.openstreetmap.org/api/0.6/node/1124134958/ways", - {"version":"0.6","generator":"CGImap 0.8.5 (2937646 spike-07.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"way","id":97038428,"timestamp":"2019-06-19T12:26:24Z","version":6,"changeset":71399984,"user":"Pieter Vander Vennet","uid":3818858,"nodes":[1124134958,323729212,323729351,2542460408,187073405],"tags":{"highway":"residential","name":"Brugs-Kerkhofstraat","sett:pattern":"arc","surface":"sett"}},{"type":"way","id":97038434,"timestamp":"2019-06-19T12:26:24Z","version":5,"changeset":71399984,"user":"Pieter Vander Vennet","uid":3818858,"nodes":[1124134958,1124135024,187058607],"tags":{"bicycle":"use_sidepath","highway":"residential","name":"Kerkhofblommenstraat","sett:pattern":"arc","surface":"sett"}},{"type":"way","id":97038435,"timestamp":"2017-12-21T21:41:08Z","version":4,"changeset":54826837,"user":"Jakka","uid":2403313,"nodes":[1124134958,2576628889,1124135035,5298371485,5298371495],"tags":{"bicycle":"use_sidepath","highway":"residential","name":"Kerkhofblommenstraat"}},{"type":"way","id":251446313,"timestamp":"2019-01-07T19:22:47Z","version":4,"changeset":66106872,"user":"M!dgard","uid":763799,"nodes":[1124134958,5243143198,4555715455],"tags":{"foot":"yes","highway":"service"}}]} + { + "version": "0.6", + "generator": "CGImap 0.8.5 (2937646 spike-07.openstreetmap.org)", + "copyright": "OpenStreetMap and contributors", + "attribution": "http://www.openstreetmap.org/copyright", + "license": "http://opendatacommons.org/licenses/odbl/1-0/", + "elements": [{ + "type": "way", + "id": 97038428, + "timestamp": "2019-06-19T12:26:24Z", + "version": 6, + "changeset": 71399984, + "user": "Pieter Vander Vennet", + "uid": 3818858, + "nodes": [1124134958, 323729212, 323729351, 2542460408, 187073405], + "tags": { + "highway": "residential", + "name": "Brugs-Kerkhofstraat", + "sett:pattern": "arc", + "surface": "sett" + } + }, { + "type": "way", + "id": 97038434, + "timestamp": "2019-06-19T12:26:24Z", + "version": 5, + "changeset": 71399984, + "user": "Pieter Vander Vennet", + "uid": 3818858, + "nodes": [1124134958, 1124135024, 187058607], + "tags": { + "bicycle": "use_sidepath", + "highway": "residential", + "name": "Kerkhofblommenstraat", + "sett:pattern": "arc", + "surface": "sett" + } + }, { + "type": "way", + "id": 97038435, + "timestamp": "2017-12-21T21:41:08Z", + "version": 4, + "changeset": 54826837, + "user": "Jakka", + "uid": 2403313, + "nodes": [1124134958, 2576628889, 1124135035, 5298371485, 5298371495], + "tags": {"bicycle": "use_sidepath", "highway": "residential", "name": "Kerkhofblommenstraat"} + }, { + "type": "way", + "id": 251446313, + "timestamp": "2019-01-07T19:22:47Z", + "version": 4, + "changeset": 66106872, + "user": "M!dgard", + "uid": 763799, + "nodes": [1124134958, 5243143198, 4555715455], + "tags": {"foot": "yes", "highway": "service"} + }] + } ) - - Utils.injectJsonDownloadForTests( - "https://www.openstreetmap.org/api/0.6/relation/9572808", - {"version":"0.6","generator":"CGImap 0.8.5 (3128319 spike-07.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"relation","id":9572808,"timestamp":"2021-08-12T12:44:06Z","version":11,"changeset":109573204,"user":"A67-A67","uid":553736,"members":[{"type":"way","ref":173662702,"role":""},{"type":"way","ref":467606230,"role":""},{"type":"way","ref":126267167,"role":""},{"type":"way","ref":301897426,"role":""},{"type":"way","ref":687866206,"role":""},{"type":"way","ref":295132739,"role":""},{"type":"way","ref":690497698,"role":""},{"type":"way","ref":627893684,"role":""},{"type":"way","ref":295132741,"role":""},{"type":"way","ref":301903120,"role":""},{"type":"way","ref":672541156,"role":""},{"type":"way","ref":126264330,"role":""},{"type":"way","ref":280440853,"role":""},{"type":"way","ref":838499667,"role":""},{"type":"way","ref":838499663,"role":""},{"type":"way","ref":690497623,"role":""},{"type":"way","ref":301902946,"role":""},{"type":"way","ref":280460715,"role":""},{"type":"way","ref":972534369,"role":""},{"type":"way","ref":695680702,"role":""},{"type":"way","ref":690497860,"role":""},{"type":"way","ref":295410363,"role":""},{"type":"way","ref":823864063,"role":""},{"type":"way","ref":663172088,"role":""},{"type":"way","ref":659950322,"role":""},{"type":"way","ref":659950323,"role":""},{"type":"way","ref":230180094,"role":""},{"type":"way","ref":690497912,"role":""},{"type":"way","ref":39588765,"role":""}],"tags":{"distance":"13 km","name":"Abdijenroute","network":"lcn","old_name":"Spoorlijn 58","operator":"Toerisme West-Vlaanderen","railway":"abandoned","route":"bicycle","type":"route","wikipedia":"nl:Spoorlijn 58"}}]} - ) - - Utils.injectJsonDownloadForTests( - "https://www.openstreetmap.org/api/0.6/way/687866206/full", - {"version":"0.6","generator":"CGImap 0.8.5 (2601512 spike-07.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"node","id":5273988959,"lat":51.1811406,"lon":3.2427712,"timestamp":"2021-07-29T21:14:53Z","version":6,"changeset":108847202,"user":"kaart_fietser","uid":11022240,"tags":{"network:type":"node_network","rwn_ref":"32"}},{"type":"node","id":6448669326,"lat":51.1811346,"lon":3.242891,"timestamp":"2019-05-04T22:44:12Z","version":1,"changeset":69891295,"user":"Pieter Vander Vennet","uid":3818858,"tags":{"barrier":"bollard"}},{"type":"way","id":687866206,"timestamp":"2019-05-06T20:52:20Z","version":2,"changeset":69951497,"user":"noelbov","uid":8054928,"nodes":[6448669326,5273988959],"tags":{"highway":"cycleway","name":"Abdijenroute","railway":"abandoned","surface":"asphalt"}}]} - ) Utils.injectJsonDownloadForTests( - "https://www.openstreetmap.org/api/0.6/way/690497698/full" , - {"version":"0.6","generator":"CGImap 0.8.5 (3023311 spike-07.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"node","id":170497152,"lat":51.1832353,"lon":3.2498759,"timestamp":"2018-04-24T00:29:37Z","version":7,"changeset":58357376,"user":"Pieter Vander Vennet","uid":3818858},{"type":"node","id":2988218625,"lat":51.1835053,"lon":3.2503067,"timestamp":"2018-09-24T21:48:46Z","version":2,"changeset":62895918,"user":"A67-A67","uid":553736},{"type":"node","id":5273988967,"lat":51.182659,"lon":3.249004,"timestamp":"2017-12-09T18:40:21Z","version":1,"changeset":54493533,"user":"CacherB","uid":1999108},{"type":"way","id":690497698,"timestamp":"2021-07-29T21:14:53Z","version":3,"changeset":108847202,"user":"kaart_fietser","uid":11022240,"nodes":[2988218625,170497152,5273988967],"tags":{"highway":"cycleway","lit":"no","name":"Abdijenroute","oneway":"no","railway":"abandoned","surface":"compacted"}}]} + "https://www.openstreetmap.org/api/0.6/relation/9572808", + { + "version": "0.6", + "generator": "CGImap 0.8.5 (3128319 spike-07.openstreetmap.org)", + "copyright": "OpenStreetMap and contributors", + "attribution": "http://www.openstreetmap.org/copyright", + "license": "http://opendatacommons.org/licenses/odbl/1-0/", + "elements": [{ + "type": "relation", + "id": 9572808, + "timestamp": "2021-08-12T12:44:06Z", + "version": 11, + "changeset": 109573204, + "user": "A67-A67", + "uid": 553736, + "members": [{"type": "way", "ref": 173662702, "role": ""}, { + "type": "way", + "ref": 467606230, + "role": "" + }, {"type": "way", "ref": 126267167, "role": ""}, { + "type": "way", + "ref": 301897426, + "role": "" + }, {"type": "way", "ref": 687866206, "role": ""}, { + "type": "way", + "ref": 295132739, + "role": "" + }, {"type": "way", "ref": 690497698, "role": ""}, { + "type": "way", + "ref": 627893684, + "role": "" + }, {"type": "way", "ref": 295132741, "role": ""}, { + "type": "way", + "ref": 301903120, + "role": "" + }, {"type": "way", "ref": 672541156, "role": ""}, { + "type": "way", + "ref": 126264330, + "role": "" + }, {"type": "way", "ref": 280440853, "role": ""}, { + "type": "way", + "ref": 838499667, + "role": "" + }, {"type": "way", "ref": 838499663, "role": ""}, { + "type": "way", + "ref": 690497623, + "role": "" + }, {"type": "way", "ref": 301902946, "role": ""}, { + "type": "way", + "ref": 280460715, + "role": "" + }, {"type": "way", "ref": 972534369, "role": ""}, { + "type": "way", + "ref": 695680702, + "role": "" + }, {"type": "way", "ref": 690497860, "role": ""}, { + "type": "way", + "ref": 295410363, + "role": "" + }, {"type": "way", "ref": 823864063, "role": ""}, { + "type": "way", + "ref": 663172088, + "role": "" + }, {"type": "way", "ref": 659950322, "role": ""}, { + "type": "way", + "ref": 659950323, + "role": "" + }, {"type": "way", "ref": 230180094, "role": ""}, { + "type": "way", + "ref": 690497912, + "role": "" + }, {"type": "way", "ref": 39588765, "role": ""}], + "tags": { + "distance": "13 km", + "name": "Abdijenroute", + "network": "lcn", + "old_name": "Spoorlijn 58", + "operator": "Toerisme West-Vlaanderen", + "railway": "abandoned", + "route": "bicycle", + "type": "route", + "wikipedia": "nl:Spoorlijn 58" + } + }] + } + ) + + Utils.injectJsonDownloadForTests( + "https://www.openstreetmap.org/api/0.6/way/687866206/full", + { + "version": "0.6", + "generator": "CGImap 0.8.5 (2601512 spike-07.openstreetmap.org)", + "copyright": "OpenStreetMap and contributors", + "attribution": "http://www.openstreetmap.org/copyright", + "license": "http://opendatacommons.org/licenses/odbl/1-0/", + "elements": [{ + "type": "node", + "id": 5273988959, + "lat": 51.1811406, + "lon": 3.2427712, + "timestamp": "2021-07-29T21:14:53Z", + "version": 6, + "changeset": 108847202, + "user": "kaart_fietser", + "uid": 11022240, + "tags": {"network:type": "node_network", "rwn_ref": "32"} + }, { + "type": "node", + "id": 6448669326, + "lat": 51.1811346, + "lon": 3.242891, + "timestamp": "2019-05-04T22:44:12Z", + "version": 1, + "changeset": 69891295, + "user": "Pieter Vander Vennet", + "uid": 3818858, + "tags": {"barrier": "bollard"} + }, { + "type": "way", + "id": 687866206, + "timestamp": "2019-05-06T20:52:20Z", + "version": 2, + "changeset": 69951497, + "user": "noelbov", + "uid": 8054928, + "nodes": [6448669326, 5273988959], + "tags": { + "highway": "cycleway", + "name": "Abdijenroute", + "railway": "abandoned", + "surface": "asphalt" + } + }] + } + ) + + Utils.injectJsonDownloadForTests( + "https://www.openstreetmap.org/api/0.6/way/690497698/full", + { + "version": "0.6", + "generator": "CGImap 0.8.5 (3023311 spike-07.openstreetmap.org)", + "copyright": "OpenStreetMap and contributors", + "attribution": "http://www.openstreetmap.org/copyright", + "license": "http://opendatacommons.org/licenses/odbl/1-0/", + "elements": [{ + "type": "node", + "id": 170497152, + "lat": 51.1832353, + "lon": 3.2498759, + "timestamp": "2018-04-24T00:29:37Z", + "version": 7, + "changeset": 58357376, + "user": "Pieter Vander Vennet", + "uid": 3818858 + }, { + "type": "node", + "id": 2988218625, + "lat": 51.1835053, + "lon": 3.2503067, + "timestamp": "2018-09-24T21:48:46Z", + "version": 2, + "changeset": 62895918, + "user": "A67-A67", + "uid": 553736 + }, { + "type": "node", + "id": 5273988967, + "lat": 51.182659, + "lon": 3.249004, + "timestamp": "2017-12-09T18:40:21Z", + "version": 1, + "changeset": 54493533, + "user": "CacherB", + "uid": 1999108 + }, { + "type": "way", + "id": 690497698, + "timestamp": "2021-07-29T21:14:53Z", + "version": 3, + "changeset": 108847202, + "user": "kaart_fietser", + "uid": 11022240, + "nodes": [2988218625, 170497152, 5273988967], + "tags": { + "highway": "cycleway", + "lit": "no", + "name": "Abdijenroute", + "oneway": "no", + "railway": "abandoned", + "surface": "compacted" + } + }] + } + ) + Utils.injectJsonDownloadForTests( + "https://www.openstreetmap.org/api/0.6/relation/4374576" , + {"version":"0.6","generator":"CGImap 0.8.5 (1266692 spike-06.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"relation","id":4374576,"timestamp":"2014-12-23T21:42:27Z","version":2,"changeset":27660623,"user":"escada","uid":436365,"members":[{"type":"way","ref":318616190,"role":"from"},{"type":"node","ref":1407529979,"role":"via"},{"type":"way","ref":143298912,"role":"to"}],"tags":{"restriction":"no_right_turn","type":"restriction"}}]} + ) + + Utils.injectJsonDownloadForTests( + "https://www.openstreetmap.org/api/0.6/way/143298912/full" , + {"version":"0.6","generator":"CGImap 0.8.5 (4046166 spike-07.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"node","id":26343912,"lat":51.2146847,"lon":3.2397007,"timestamp":"2015-04-11T10:40:56Z","version":5,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":26343913,"lat":51.2161912,"lon":3.2386907,"timestamp":"2015-04-11T10:40:56Z","version":6,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":26343914,"lat":51.2193456,"lon":3.2360696,"timestamp":"2015-04-11T10:40:56Z","version":5,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":26343915,"lat":51.2202816,"lon":3.2352429,"timestamp":"2015-04-11T10:40:56Z","version":5,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":875668688,"lat":51.2131868,"lon":3.2406009,"timestamp":"2015-04-11T10:40:56Z","version":4,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":1109632153,"lat":51.2207068,"lon":3.234882,"timestamp":"2015-04-11T10:40:55Z","version":3,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":1109632154,"lat":51.220784,"lon":3.2348394,"timestamp":"2021-05-30T08:01:17Z","version":4,"changeset":105557550,"user":"albertino","uid":499281},{"type":"node","id":1109632177,"lat":51.2205082,"lon":3.2350441,"timestamp":"2015-04-11T10:40:55Z","version":3,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":1407529961,"lat":51.2168476,"lon":3.2381772,"timestamp":"2015-04-11T10:40:55Z","version":2,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":1407529969,"lat":51.2155155,"lon":3.23917,"timestamp":"2011-08-21T20:08:27Z","version":1,"changeset":9088257,"user":"toeklk","uid":219908},{"type":"node","id":1407529979,"lat":51.212694,"lon":3.2409595,"timestamp":"2015-04-11T10:40:55Z","version":6,"changeset":30139621,"user":"M!dgard","uid":763799,"tags":{"highway":"traffic_signals"}},{"type":"node","id":1634435395,"lat":51.2129189,"lon":3.2408257,"timestamp":"2012-02-15T19:37:51Z","version":1,"changeset":10695640,"user":"Eimai","uid":6072},{"type":"node","id":1634435396,"lat":51.2132508,"lon":3.2405417,"timestamp":"2012-02-15T19:37:51Z","version":1,"changeset":10695640,"user":"Eimai","uid":6072},{"type":"node","id":1634435397,"lat":51.2133918,"lon":3.2404416,"timestamp":"2015-04-11T10:40:55Z","version":2,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":1974988033,"lat":51.2127459,"lon":3.240928,"timestamp":"2012-10-20T12:24:13Z","version":1,"changeset":13566903,"user":"skyman81","uid":955688},{"type":"node","id":3250129361,"lat":51.2127906,"lon":3.2409016,"timestamp":"2018-12-19T00:00:33Z","version":2,"changeset":65596519,"user":"beardhatcode","uid":5439560,"tags":{"crossing":"traffic_signals","highway":"crossing"}},{"type":"node","id":3250129363,"lat":51.2149189,"lon":3.2395571,"timestamp":"2015-04-11T10:40:56Z","version":2,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":3450326133,"lat":51.2139571,"lon":3.2401205,"timestamp":"2015-04-11T10:40:26Z","version":1,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":3450326135,"lat":51.2181385,"lon":3.2370893,"timestamp":"2015-04-11T10:40:26Z","version":1,"changeset":30139621,"user":"M!dgard","uid":763799},{"type":"node","id":4794847239,"lat":51.2191224,"lon":3.2362584,"timestamp":"2019-08-27T23:07:05Z","version":2,"changeset":73816461,"user":"Pieter Vander Vennet","uid":3818858},{"type":"node","id":8493044168,"lat":51.2130348,"lon":3.2407284,"timestamp":"2021-03-06T21:52:51Z","version":1,"changeset":100555232,"user":"kaart_fietser","uid":11022240,"tags":{"highway":"traffic_signals","traffic_signals":"traffic_lights"}},{"type":"node","id":8792687918,"lat":51.2207505,"lon":3.2348579,"timestamp":"2021-06-02T18:27:15Z","version":1,"changeset":105735092,"user":"albertino","uid":499281},{"type":"way","id":143298912,"timestamp":"2021-06-02T18:27:15Z","version":15,"changeset":105735092,"user":"albertino","uid":499281,"nodes":[1407529979,1974988033,3250129361,1634435395,8493044168,875668688,1634435396,1634435397,3450326133,26343912,3250129363,1407529969,26343913,1407529961,3450326135,4794847239,26343914,26343915,1109632177,1109632153,8792687918,1109632154],"tags":{"cycleway:right":"track","highway":"primary","lanes":"2","lit":"yes","maxspeed":"70","name":"Buiten Kruisvest","oneway":"yes","ref":"R30","surface":"asphalt","wikipedia":"nl:Buiten Kruisvest"}}]} ) super("relationsplithandler", [ ["split 295132739", - () => RelationSplitHandlerSpec.split().then(_ => console.log("OK"))] + async () => { + // Lets mimick a split action of https://www.openstreetmap.org/way/295132739 + + const relation: OsmRelation = await OsmObject.DownloadObjectAsync("relation/9572808") + const originalNodeIds = [5273988967, + 170497153, + 1507524582, + 4524321710, + 170497155, + 170497157, + 170497158, + 3208166179, + 1507524610, + 170497160, + 3208166178, + 1507524573, + 1575932830, + 6448669326] + + const withSplit = [[5273988967, + 170497153, + 1507524582, + 4524321710, + 170497155, + 170497157, + 170497158], + [ + 3208166179, + 1507524610, + 170497160, + 3208166178, + 1507524573, + 1575932830, + 6448669326]] + + const splitter = new InPlaceReplacedmentRTSH( + { + relation: relation, + originalWayId: 295132739, + allWayIdsInOrder: [295132739, -1], + originalNodes: originalNodeIds, + allWaysNodesInOrder: withSplit + }, "no-theme") + const changeDescription = await splitter.CreateChangeDescriptions(new Changes()) + const allIds = changeDescription[0].changes["members"].map(m => m.ref).join(",") + const expected = "687866206,295132739,-1,690497698" + T.isTrue(allIds.indexOf(expected) >= 0, "didn't find the expected order of ids in the relation to test") + }], + ["split https://www.openstreetmap.org/way/143298912 (turn restriction relation)", + async () => { + + + const relation: OsmRelation = await OsmObject.DownloadObjectAsync("relation/4374576") + const originalNodeIds = + [ + 1407529979, + 1974988033, + 3250129361, + 1634435395, + 8493044168, + 875668688, + 1634435396, + 1634435397, + 3450326133, + 26343912, + 3250129363, + 1407529969, + 26343913, + 1407529961, + 3450326135, + 4794847239, + 26343914, + 26343915, + 1109632177, + 1109632153, + 8792687918, + 1109632154 + + ] + + const withSplit = [[ + 1407529979, // The via point + 1974988033, + 3250129361, + 1634435395, + 8493044168, + 875668688, + 1634435396, + 1634435397, + 3450326133, + 26343912, + 3250129363, + 1407529969, + 26343913], + [ + 1407529961, + 3450326135, + 4794847239, + 26343914, + 26343915, + 1109632177, + 1109632153, + 8792687918, + 1109632154 + + ]] + + const splitter = new TurnRestrictionRSH( + { + relation: relation, + originalWayId: 143298912, + allWayIdsInOrder: [-1, 143298912], + originalNodes: originalNodeIds, + allWaysNodesInOrder: withSplit + }, "no-theme") + const changeDescription = await splitter.CreateChangeDescriptions(new Changes()) + const allIds = changeDescription[0].changes["members"].map(m => m.type+"/"+ m.ref+"-->"+m.role).join(",") + const expected = "way/318616190-->from,node/1407529979-->via,way/-1-->to" + T.equals(expected, allIds) + + + // Reversing the ids has no effect + const splitterReverse = new TurnRestrictionRSH( + { + relation: relation, + originalWayId: 143298912, + allWayIdsInOrder: [143298912, -1], + originalNodes: originalNodeIds, + allWaysNodesInOrder: withSplit + }, "no-theme") + const changesReverse = await splitterReverse.CreateChangeDescriptions(new Changes()) + T.equals(0, changesReverse.length, "Reverse turn restriction split did generate a changedescription, should not be needed") + + } + ] ]); } } \ No newline at end of file diff --git a/test/TestAll.ts b/test/TestAll.ts index cf1d4d1745..9b23957d10 100644 --- a/test/TestAll.ts +++ b/test/TestAll.ts @@ -12,6 +12,7 @@ import {Utils} from "../Utils"; import TileFreshnessCalculatorSpec from "./TileFreshnessCalculator.spec"; import WikidataSpecTest from "./Wikidata.spec.test"; import ImageProviderSpec from "./ImageProvider.spec"; +import ActorsSpec from "./Actors.spec"; ScriptUtils.fixUtils() @@ -27,7 +28,8 @@ const allTests = [ new SplitActionSpec(), new TileFreshnessCalculatorSpec(), new WikidataSpecTest(), - new ImageProviderSpec() + new ImageProviderSpec(), + new ActorsSpec() ] Utils.externalDownloadFunction = async (url) => { diff --git a/test/TestHelper.ts b/test/TestHelper.ts index b55186e7c9..ab7139160e 100644 --- a/test/TestHelper.ts +++ b/test/TestHelper.ts @@ -19,6 +19,7 @@ export default class T { try { test(); } catch (e) { + console.log("ERROR: ", e, e.stack) failures.push({testsuite: this.name, name: name, msg: "" + e}); } }