midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Refactoring: moved pointRenderingConfig into seperate part of the configuration, removed roaming rendering capabilities

Browse source
This commit is contained in:
pietervdvn 2021-10-19 03:00:57 +02:00
parent 584ade8e61
commit 1852eb8e52
74 changed files with 1868 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Customizations/SharedTagRenderings.ts
View file

@ -15,7 +15,7 @@ export default class SharedTagRenderings {
const d = new Map<string, TagRenderingConfig>()
for (const key of Array.from(configJsons.keys())) {
try {
d.set(key, new TagRenderingConfig(configJsons.get(key), undefined, `SharedTagRenderings.${key}`))
d.set(key, new TagRenderingConfig(configJsons.get(key), `SharedTagRenderings.${key}`))
} catch (e) {
if (!Utils.runningFromConsole) {
console.error("BUG: could not parse", key, " from questions.json or icons.json - this error happened during the build step of the SharedTagRenderings", e)

10
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -27,7 +27,6 @@ export default class PointRenderingConfig extends WithContextLoader {
this.iconOverlays = (json.iconOverlays ?? []).map((overlay, i) => {
let tr = new TagRenderingConfig(
overlay.then,
undefined,
`iconoverlays.${i}`
);
if (
@ -93,15 +92,6 @@ export default class PointRenderingConfig extends WithContextLoader {
return n;
}
function rendernum(tr: TagRenderingConfig, deflt: number) {
const str = Number(render(tr, "" + deflt));
const n = Number(str);
if (isNaN(n)) {
return deflt;
}
return n;
}
function render(tr: TagRenderingConfig, deflt?: string) {
if (tags === undefined) {
return deflt

11
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -37,9 +37,8 @@ export default class TagRenderingConfig {
readonly then: Translation
readonly hideInAnswer: boolean | TagsFilter
}[]
readonly roaming: boolean;
constructor(json: string | TagRenderingConfigJson, conditionIfRoaming: TagsFilter, context?: string) {
constructor(json: string | TagRenderingConfigJson, context?: string) {
if (json === "questions") {
// Very special value
@ -61,13 +60,7 @@ export default class TagRenderingConfig {
this.id = json.id ?? "";
this.render = Translations.T(json.render, context + ".render");
this.question = Translations.T(json.question, context + ".question");
this.roaming = json.roaming ?? false;
const condition = TagUtils.Tag(json.condition ?? {"and": []}, `${context}.condition`);
if (this.roaming && conditionIfRoaming !== undefined) {
this.condition = new And([condition, conditionIfRoaming]);
} else {
this.condition = condition;
}
this.condition = TagUtils.Tag(json.condition ?? {"and": []}, `${context}.condition`);
if (json.freeform) {
if(json.freeform.addExtraTags !== undefined && json.freeform.addExtraTags.map === undefined){

6
Models/ThemeConfig/WithContextLoader.ts
View file

@ -24,7 +24,6 @@ export default class WithContextLoader {
}
return new TagRenderingConfig(
deflt,
undefined,
`${this._context}.${key}.default value`
);
}
@ -36,7 +35,6 @@ export default class WithContextLoader {
}
return new TagRenderingConfig(
v,
undefined,
`${this._context}.${key}`
);
}
@ -72,7 +70,7 @@ export default class WithContextLoader {
)}`;
}
const tr = new TagRenderingConfig("questions", undefined, context);
const tr = new TagRenderingConfig("questions", context);
renderings.push(tr)
continue;
}
@ -81,7 +79,6 @@ export default class WithContextLoader {
const sharedJson = SharedTagRenderings.SharedTagRenderingJson.get(renderingId)
const tr = new TagRenderingConfig(
Utils.Merge(renderingJson["override"], sharedJson),
undefined,
`${context}.tagrendering[${i}]+override`
);
renderings.push(tr)
@ -106,7 +103,6 @@ export default class WithContextLoader {
const tr = new TagRenderingConfig(
<TagRenderingConfigJson>renderingJson,
undefined,
`${context}.tagrendering[${i}]`
);
renderings.push(tr)

69
UI/Input/LocationInput.ts
View file

@ -6,7 +6,6 @@ import BaseLayer from "../../Models/BaseLayer";
import Combine from "../Base/Combine";
import Svg from "../../Svg";
import State from "../../State";
import AvailableBaseLayers from "../../Logic/Actors/AvailableBaseLayers";
import {GeoOperations} from "../../Logic/GeoOperations";
import ShowDataMultiLayer from "../ShowDataLayer/ShowDataMultiLayer";
import StaticFeatureSource from "../../Logic/FeatureSource/Sources/StaticFeatureSource";
@ -16,7 +15,6 @@ import {FixedUiElement} from "../Base/FixedUiElement";
import ShowDataLayer from "../ShowDataLayer/ShowDataLayer";
import BaseUIElement from "../BaseUIElement";
import Toggle from "./Toggle";
import {start} from "repl";
export default class LocationInput extends InputElement<Loc> implements MinimapObj {
@ -25,12 +23,17 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
id: "matchpoint", source: {
osmTags: {and: []}
},
icon: "./assets/svg/crosshair-empty.svg"
mapRendering: [{
location: ["point"],
icon: "./assets/svg/crosshair-empty.svg"
}]
}, "matchpoint icon", true
)
IsSelected: UIEventSource<boolean> = new UIEventSource<boolean>(false);
public readonly snappedOnto: UIEventSource<any> = new UIEventSource<any>(undefined)
public readonly _matching_layer: LayerConfig;
public readonly leafletMap: UIEventSource<any>
private _centerLocation: UIEventSource<Loc>;
private readonly mapBackground: UIEventSource<BaseLayer>;
/**
@ -43,10 +46,7 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
private readonly _maxSnapDistance: number
private readonly _snappedPointTags: any;
private readonly _bounds: UIEventSource<BBox>;
public readonly _matching_layer: LayerConfig;
private readonly map: BaseUIElement & MinimapObj;
public readonly leafletMap: UIEventSource<any>
private readonly clickLocation: UIEventSource<Loc>;
private readonly _minZoom: number;
@ -83,7 +83,7 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
}
this._matching_layer = matchingLayer;
} else {
this._matching_layer = LocationInput.matchLayer
this._matching_layer = LocationInput.matchLayer
}
this._snappedPoint = options.centerLocation.map(loc => {
@ -158,25 +158,29 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
IsValid(t: Loc): boolean {
return t !== undefined;
}
installBounds(factor: number | BBox, showRange?: boolean): void {
this.map.installBounds(factor, showRange)
}
protected InnerConstructElement(): HTMLElement {
try {
const self = this;
const hasMoved = new UIEventSource(false)
const startLocation = { ...this._centerLocation.data }
this._centerLocation. addCallbackD(newLocation => {
const startLocation = {...this._centerLocation.data}
this._centerLocation.addCallbackD(newLocation => {
const f = 100000
console.log(newLocation.lon, startLocation.lon)
const diff = (Math.abs(newLocation.lon * f - startLocation.lon* f ) + Math.abs(newLocation.lat* f - startLocation.lat* f ))
if(diff < 1){
const diff = (Math.abs(newLocation.lon * f - startLocation.lon * f) + Math.abs(newLocation.lat * f - startLocation.lat * f))
if (diff < 1) {
return;
}
hasMoved.setData(true)
return true;
})
this.clickLocation.addCallbackAndRunD(location => this._centerLocation.setData(location))
if (this._snapTo !== undefined) {
if (this._snapTo !== undefined) {
// Show the lines to snap to
new ShowDataMultiLayer({
features: new StaticFeatureSource(this._snapTo, true),
@ -184,7 +188,7 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
zoomToFeatures: false,
leafletMap: this.map.leafletMap,
layers: State.state.filteredLayers,
allElements: State.state.allElements
allElements: State.state.allElements
}
)
// Show the central point
@ -194,16 +198,16 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
}
return [{feature: loc}];
})
new ShowDataLayer({
features: new StaticFeatureSource(matchPoint, true),
enablePopups: false,
zoomToFeatures: false,
leafletMap: this.map.leafletMap,
layerToShow: this._matching_layer,
allElements: State.state.allElements,
selectedElement: State.state.selectedElement
})
new ShowDataLayer({
features: new StaticFeatureSource(matchPoint, true),
enablePopups: false,
zoomToFeatures: false,
leafletMap: this.map.leafletMap,
layerToShow: this._matching_layer,
allElements: State.state.allElements,
selectedElement: State.state.selectedElement
})
}
this.mapBackground.map(layer => {
const leaflet = this.map.leafletMap.data
@ -216,19 +220,19 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
leaflet.setZoom(layer.max_zoom - 1)
}, [this.map.leafletMap])
const animatedHand = Svg.hand_ui()
.SetStyle("width: 2rem; height: unset;")
.SetClass("hand-drag-animation block pointer-events-none")
return new Combine([
new Combine([
Svg.move_arrows_ui()
.SetClass("block relative pointer-events-none")
.SetStyle("left: -2.5rem; top: -2.5rem; width: 5rem; height: 5rem")
]).SetClass("block w-0 h-0 z-10 relative")
]).SetClass("block w-0 h-0 z-10 relative")
.SetStyle("background: rgba(255, 128, 128, 0.21); left: 50%; top: 50%; opacity: 0.5"),
new Toggle(undefined,
animatedHand, hasMoved)
.SetClass("block w-0 h-0 z-10 relative")
@ -244,9 +248,4 @@ export default class LocationInput extends InputElement<Loc> implements MinimapO
}
}
installBounds(factor: number | BBox, showRange?: boolean): void {
this.map.installBounds(factor, showRange)
}
}

2
UI/Popup/DeleteWizard.ts
View file

@ -264,7 +264,7 @@ export default class DeleteWizard extends Toggle {
]
}, undefined, "Delete wizard"
}, "Delete wizard"
)
}

4
UI/Popup/FeatureInfoBox.ts
View file

@ -37,7 +37,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
private static GenerateTitleBar(tags: UIEventSource<any>,
layerConfig: LayerConfig): BaseUIElement {
const title = new TagRenderingAnswer(tags, layerConfig.title ?? new TagRenderingConfig("POI", undefined))
const title = new TagRenderingAnswer(tags, layerConfig.title ?? new TagRenderingConfig("POI"))
.SetClass("break-words font-bold sm:p-0.5 md:p-1 sm:p-1.5 md:p-2");
const titleIcons = new Combine(
layerConfig.titleIcons.map(icon => new TagRenderingAnswer(tags, icon,
@ -132,7 +132,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
new VariableUiElement(
State.state.featureSwitchIsDebugging.map(isDebugging => {
if (isDebugging) {
const config: TagRenderingConfig = new TagRenderingConfig({render: "{all_tags()}"}, new Tag("id", ""), "");
const config: TagRenderingConfig = new TagRenderingConfig({render: "{all_tags()}"}, "");
return new TagRenderingAnswer(tags, config, "all_tags")
}
})

11
UI/Popup/SplitRoadWizard.ts
View file

@ -21,8 +21,13 @@ export default class SplitRoadWizard extends Toggle {
private static splitLayerStyling = new LayerConfig({
id: "splitpositions",
source: {osmTags: "_cutposition=yes"},
icon: {render: "circle:white;./assets/svg/scissors.svg"},
iconSize: {render: "30,30,center"},
mapRendering: [
{
location: ["point"],
icon: {render: "circle:white;./assets/svg/scissors.svg"},
iconSize: {render: "30,30,center"}
}
],
}, "(BUILTIN) SplitRoadWizard.ts", true)
public dialogIsOpened: UIEventSource<boolean>
@ -61,7 +66,7 @@ export default class SplitRoadWizard extends Toggle {
miniMap.installBounds(BBox.get(roadElement).pad(0.25), false)
// Define how a cut is displayed on the map
// Datalayer displaying the road and the cut points (if any)
new ShowDataLayer({
features: new StaticFeatureSource(splitPoints, true),

13
assets/layers/artwork/artwork.json
View file

@ -394,5 +394,16 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/artwork/artwork.svg"
},
"location": [
"point",
"centroid"
]
}
]
}

8
assets/layers/barrier/barrier.json
View file

@ -323,5 +323,13 @@
},
"id": "Overlap (cyclebarrier)"
}
],
"mapRendering": [
{
"icon": "./assets/layers/barrier/barrier.svg",
"location": [
"point"
]
}
]
}

15
assets/layers/bench/bench.json
View file

@ -644,5 +644,18 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/layers/bench/bench.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point"
]
}
]
}

15
assets/layers/bench_at_pt/bench_at_pt.json
View file

@ -148,5 +148,18 @@
},
"color": {
"render": "#00f"
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/benches/bench_public_transport.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point"
]
}
]
}

28
assets/layers/bicycle_library/bicycle_library.json
View file

@ -287,5 +287,31 @@
"color": {
"render": "#c00"
},
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,bottom"
},
"location": [
"point",
"centroid"
]
}
]
}

26
assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
View file

@ -276,5 +276,29 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
},
"iconOverlays": [
{
"if": {
"or": [
"operational_status=broken",
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
}
],
"iconSize": "50,50,bottom",
"location": [
"point",
"centroid"
]
}
]
}

16
assets/layers/bike_cafe/bike_cafe.json
View file

@ -365,5 +365,19 @@
]
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/layers/bike_cafe/bike_cafe.svg"
},
"iconSize": {
"render": "50,50,bottom"
},
"location": [
"point",
"centroid"
]
}
]
}

28
assets/layers/bike_cleaning/bike_cleaning.json
View file

@ -162,5 +162,31 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/bike_cleaning/bike_cleaning.svg"
},
"iconOverlays": [
{
"if": {
"and": [
"service:bicycle:cleaning~*",
"amenity!=bike_wash"
]
},
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg",
"roaming": true
},
"badge": true
}
],
"iconSize": "50,50,bottom",
"location": [
"point"
]
}
]
}

14
assets/layers/bike_parking/bike_parking.json
View file

@ -551,5 +551,17 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/bike_parking/parking.svg"
},
"iconSize": "40,40,bottom",
"location": [
"point",
"centroid"
]
}
]
}

75
assets/layers/bike_repair_station/bike_repair_station.json
View file

@ -768,5 +768,78 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"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"
},
"mappings": [
{
"if": {
"and": [
"service:bicycle:pump=no",
"service:bicycle:pump:operational_status=broken"
]
},
"then": "./assets/layers/bike_repair_station/repair_station.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes"
]
},
"then": "./assets/layers/bike_repair_station/repair_station_pump.svg"
},
{
"if": {
"and": [
"service:bicycle:pump:operational_status=broken",
"service:bicycle:tools=no"
]
},
"then": "./assets/layers/bike_repair_station/broken_pump_2.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
{
"or": [
"service:bicycle:tools=no",
"service:bicycle:tools="
]
}
]
},
"then": "./assets/layers/bike_repair_station/pump.svg"
}
]
},
"iconOverlays": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,bottom"
},
"location": [
"point",
"centroid"
]
}
]
}

38
assets/layers/bike_shop/bike_shop.json
View file

@ -711,5 +711,41 @@
"color": {
"render": "#c00"
},
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/layers/bike_shop/repair_shop.svg",
"mappings": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
},
{
"if": "service:bicycle:retail=yes",
"then": "./assets/layers/bike_shop/shop.svg"
}
]
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,bottom"
},
"location": [
"point",
"centroid"
]
}
]
}

16
assets/layers/bike_themed_object/bike_themed_object.json
View file

@ -69,5 +69,19 @@
"render": "#AB76D5"
},
"presets": [],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/layers/bike_themed_object/other_services.svg"
},
"iconSize": {
"render": "50,50,bottom"
},
"location": [
"point",
"centroid"
]
}
]
}

15
assets/layers/binocular/binocular.json
View file

@ -127,5 +127,18 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/binocular/telescope.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}

26
assets/layers/birdhide/birdhide.json
View file

@ -309,5 +309,29 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": {
"nl": "./assets/layers/birdhide/birdhide.svg"
},
"mappings": [
{
"if": {
"or": [
"building=yes",
"shelter=yes",
"amenity=shelter"
]
},
"then": "./assets/layers/birdhide/birdshelter.svg"
}
]
},
"location": [
"point"
]
}
]
}

33
assets/layers/cafe_pub/cafe_pub.json
View file

@ -203,5 +203,36 @@
]
}
},
"allowMove": true
"allowMove": true,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/cafe_pub/pub.svg",
"mappings": [
{
"if": "amenity=cafe",
"then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
}
]
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"label": {
"mappings": [
{
"if": "name~*",
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
}
]
},
"location": [
"point"
]
}
]
}

64
assets/layers/charging_station/charging_station.json
View file

@ -3729,5 +3729,69 @@
],
"eraseInvalidValues": true
}
],
"mapRendering": [
{
"icon": {
"render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "pin:#fff;./assets/themes/charging_stations/car.svg"
}
]
},
"iconOverlays": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "cross_bottom_right:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg",
"badge": true
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,bottom"
},
"location": [
"point"
]
}
]
}

18
assets/layers/cluster_style/cluster_style.json
View file

@ -36,5 +36,21 @@
"then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>{kilocount}K</div>"
}
]
}
},
"mapRendering": [
{
"label": {
"render": "<div class='rounded-full text-xl font-bold' style='width: 2rem; height: 2rem; background: white'>{showCount}</div>",
"mappings": [
{
"if": "showCount>1000",
"then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>{kilocount}K</div>"
}
]
},
"location": [
"point"
]
}
]
}

21
assets/layers/crossings/crossings.json
View file

@ -331,5 +331,26 @@
}
]
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/layers/crossings/pedestrian_crossing.svg",
"mappings": [
{
"if": {
"or": [
"highway=traffic_signals",
"crossing=traffic_signals"
]
},
"then": "./assets/layers/crossings/traffic_lights.svg"
}
]
},
"location": [
"point"
]
}
]
}

15
assets/layers/cycleways_and_roads/cycleways_and_roads.json
View file

@ -1176,5 +1176,18 @@
}
]
},
"allowSplit": true
"allowSplit": true,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/cycle_infra/bicycleway.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}

23
assets/layers/defibrillator/defibrillator.json
View file

@ -553,5 +553,26 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/aed/aed.svg",
"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"
}
}
]
},
"location": [
"point"
]
}
]
}

24
assets/layers/direction/direction.json
View file

@ -43,5 +43,27 @@
"color": "--catch-detail-color",
"stroke": "0",
"presets": [],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "direction_gradient:var(--catch-detail-color)",
"#": "For some weird reason, showing the icon in the layer control panel breaks the svg-gradient (because the svg gradient has a global color or smthng) - so we use a different icon without gradient",
"mappings": [
{
"if": "id=node/-1",
"then": "direction:var(--catch-detail-color)"
}
]
},
"iconSize": "200,200,center",
"location": [
"point",
"centroid"
],
"rotation": {
"render": "{_direction:numerical}deg"
}
}
]
}

25
assets/layers/drinking_water/drinking_water.json
View file

@ -179,5 +179,28 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg"
},
"iconOverlays": [
{
"if": {
"or": [
"operational_status=broken",
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
}
],
"iconSize": "40,40,bottom",
"location": [
"point"
]
}
]
}

26
assets/layers/etymology/etymology.json
View file

@ -167,5 +167,29 @@
"then": "#fcca05aa"
}
]
}
},
"mapRendering": [
{
"icon": {
"render": "pin:#05d7fcaa;./assets/layers/etymology/logo.svg",
"mappings": [
{
"if": {
"and": [
"name:etymology=",
"name:etymology:wikidata="
]
},
"then": "pin:#fcca05aa;./assets/layers/etymology/logo.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}

54
assets/layers/food/food.json
View file

@ -635,5 +635,57 @@
]
}
},
"allowMove": true
"allowMove": true,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/food/restaurant.svg",
"mappings": [
{
"if": {
"and": [
"amenity=fast_food",
"cuisine=friture"
]
},
"then": "circle:white;./assets/layers/food/fries.svg"
},
{
"if": "amenity=fast_food",
"then": "circle:white;./assets/layers/food/fastfood.svg"
}
]
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{
"if": {
"or": [
"diet:vegetarian=yes",
"diet:vegan=yes"
]
},
"then": {
"render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
},
"badge": true
}
],
"label": {
"mappings": [
{
"if": "name~*",
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
}
]
},
"location": [
"point"
]
}
]
}

11
assets/layers/ghost_bike/ghost_bike.json
View file

@ -202,5 +202,14 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": "./assets/layers/ghost_bike/ghost_bike.svg",
"iconSize": "40,40,bottom",
"location": [
"point"
]
}
]
}

10
assets/layers/grass_in_parks/grass_in_parks.json
View file

@ -51,5 +51,15 @@
"id": "grass-in-parks-reviews",
"render": "{reviews(name, landuse=grass )}"
}
],
"mapRendering": [
{
"icon": "./assets/themes/playgrounds/playground.svg",
"iconSize": "40,40,center",
"location": [
"point",
"centroid"
]
}
]
}

15
assets/layers/home_location/home_location.json
View file

@ -13,5 +13,18 @@
},
"color": {
"render": "#00f"
}
},
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/svg/home.svg"
},
"iconSize": {
"render": "20,20,center"
},
"location": [
"point"
]
}
]
}

15
assets/layers/information_board/information_board.json
View file

@ -68,5 +68,18 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/information_board/board.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}

44
assets/layers/map/map.json
View file

@ -240,5 +240,47 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/map/map.svg",
"mappings": [
{
"if": {
"and": [
"map_source=OpenStreetMap",
"map_source:attribution=sticker"
]
},
"then": "./assets/layers/map/map-stickered.svg"
},
{
"if": {
"and": [
"map_source=OpenStreetMap",
"map_source:attribution=yes"
]
},
"then": "./assets/layers/map/osm-logo-white-bg.svg"
},
{
"if": {
"and": [
"map_source=OpenStreetMap"
]
},
"then": "./assets/layers/map/osm-logo-buggy-attr.svg"
}
]
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point",
"centroid"
]
}
]
}

14
assets/layers/nature_reserve/nature_reserve.json
View file

@ -461,5 +461,19 @@
}
]
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/layers/nature_reserve/nature_reserve.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point",
"centroid"
]
}
]
}

15
assets/layers/observation_tower/observation_tower.json
View file

@ -189,5 +189,18 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/observation_tower/Tower_observation.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}

15
assets/layers/parking/parking.json
View file

@ -94,5 +94,18 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/parking/parking.svg"
},
"iconSize": {
"render": "36,36,center"
},
"location": [
"point"
]
}
]
}

15
assets/layers/picnic_table/picnic_table.json
View file

@ -114,5 +114,18 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point"
]
}
]
}

16
assets/layers/play_forest/play_forest.json
View file

@ -116,5 +116,19 @@
"description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.<br/><img src='./assets/layers/play_forest/icon.svg'/>"
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/layers/play_forest/icon.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
}

46
assets/layers/playground/playground.json
View file

@ -535,5 +535,49 @@
"leisure="
]
}
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/playgrounds/playground.svg"
},
"iconOverlays": [
{
"if": {
"and": [
"opening_hours!=24/7",
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,center",
"mappings": [
{
"if": "id~node/.*",
"then": "40,40,center"
},
{
"if": "_size_classification=small",
"then": "25,25,center"
},
{
"if": "_size_classification=medium",
"then": "40,40,center"
},
{
"if": "_size_classification=large",
"then": "60,60,center"
}
]
},
"location": [
"point",
"centroid"
]
}
]
}

19
assets/layers/public_bookcase/public_bookcase.json
View file

@ -485,5 +485,24 @@
}
]
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/bookcases/bookcase.svg;"
},
"label": {
"mappings": [
{
"if": "name~*",
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
}
]
},
"location": [
"point",
"centroid"
]
}
]
}

23
assets/layers/shops/shops.json
View file

@ -322,5 +322,26 @@
]
}
},
"allowMove": true
"allowMove": true,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/shops/shop.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
}

10
assets/layers/slow_roads/slow_roads.json
View file

@ -252,5 +252,13 @@
"color": {
"render": "#eaba2a"
},
"presets": []
"presets": [],
"mapRendering": [
{
"icon": "./assets/layers/slow_roads/slow_road.svg",
"location": [
"point"
]
}
]
}

73
assets/layers/sport_pitch/sport_pitch.json
View file

@ -490,5 +490,78 @@
"fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
]
}
],
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/sport_pitch/sport_pitch.svg",
"mappings": [
{
"if": {
"or": [
"sport=baseball",
"sport=basketball",
"sport=beachvolleyball",
"sport=boules",
"sport=skateboard",
"sport=soccer",
"sport=table_tennis",
"sport=tennis",
"sport=volleyball"
]
},
"then": "circle:white;./assets/layers/sport_pitch/{sport}.svg"
}
]
},
"iconOverlays": [
{
"if": {
"and": [
"opening_hours!=24/7",
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
},
{
"if": {
"or": [
"access=customers",
"access=private",
"access=no"
]
},
"then": "circle:white;./assets/layers/sport_pitch/lock.svg",
"badge": true
}
],
"iconSize": {
"render": "25,25,center",
"mappings": [
{
"if": {
"or": [
"_size_classification=medium",
"id~node/.*"
]
},
"then": "40,40,center"
},
{
"if": "_size_classification=small",
"then": "25,25,center"
},
{
"if": "_size_classification=large",
"then": "50,50,center"
}
]
},
"location": [
"point"
]
}
]
}

54
assets/layers/surveillance_camera/surveillance_camera.json
View file

@ -480,5 +480,57 @@
"title": "Surveillance camera"
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/surveillance/logo.svg",
"mappings": [
{
"if": "camera:type=dome",
"then": "./assets/themes/surveillance/dome.svg"
},
{
"if": "_direction:leftright=right",
"then": "./assets/themes/surveillance/cam_right.svg"
},
{
"if": "_direction:leftright=left",
"then": "./assets/themes/surveillance/cam_left.svg"
}
]
},
"iconSize": {
"mappings": [
{
"if": "camera:type=dome",
"then": "50,50,center"
},
{
"if": "_direction:leftright~*",
"then": "100,35,center"
}
],
"render": "50,50,center"
},
"location": [
"point",
"centroid"
],
"rotation": {
"#": "Note: {camera:direction} is substituted by a number, giving the string 'calc(123deg + 90deg)' ; it is this string that is used as css property, which interprets the calc",
"render": "calc({_direction:numerical}deg + 90deg)",
"mappings": [
{
"if": "camera:type=dome",
"then": "0"
},
{
"if": "_direction:leftright=right",
"then": "calc({_direction:numerical}deg - 90deg)"
}
]
}
}
]
}

27
assets/layers/toilet/toilet.json
View file

@ -511,5 +511,30 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/toilet/toilets.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:white;./assets/layers/toilet/wheelchair.svg"
},
{
"if": {
"or": [
"toilets:position=urinals",
"toilets:position=urinal"
]
},
"then": "./assets/layers/toilet/urinal.svg"
}
]
},
"location": [
"point"
]
}
]
}

25
assets/layers/trail/trail.json
View file

@ -206,5 +206,28 @@
},
"dashArray": {
"render": "5 5"
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/trail/trail.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "./assets/layers/trail/wheelchair.svg"
},
{
"if": "pushchair=yes",
"then": "./assets/layers/trail/pushchair.svg"
}
]
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point"
]
}
]
}

33
assets/layers/tree_node/tree_node.json
View file

@ -582,5 +582,36 @@
},
"deletion": {
"minNeededChangesets": 5
}
},
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/trees/unknown.svg",
"mappings": [
{
"if": {
"and": [
"leaf_type=broadleaved"
]
},
"then": "circle:#ffffff;./assets/themes/trees/broadleaved.svg"
},
{
"if": {
"and": [
"leaf_type=needleleaved"
]
},
"then": "circle:#ffffff;./assets/themes/trees/needleleaved.svg"
}
]
},
"iconSize": {
"render": "40,40,bottom"
},
"location": [
"point"
]
}
]
}

9
assets/layers/viewpoint/viewpoint.json
View file

@ -70,5 +70,14 @@
},
"id": "viewpoint-description"
}
],
"mapRendering": [
{
"icon": "./assets/layers/viewpoint/viewpoint.svg",
"iconSize": "20,20,center",
"location": [
"point"
]
}
]
}

10
assets/layers/village_green/village_green.json
View file

@ -35,5 +35,15 @@
"id": "village_green-reviews",
"render": "{reviews(name, landuse=village_green )}"
}
],
"mapRendering": [
{
"icon": "./assets/themes/playgrounds/playground.svg",
"iconSize": "40,40,center",
"location": [
"point",
"centroid"
]
}
]
}

15
assets/layers/visitor_information_centre/visitor_information_centre.json
View file

@ -66,5 +66,18 @@
"render": "#E64C00"
},
"presets": [],
"wayHandling": 1
"wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "./assets/layers/visitor_information_centre/information.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}

29
assets/layers/waste_basket/waste_basket.json
View file

@ -177,5 +177,32 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/waste_basket/waste_basket.svg"
},
"iconSize": {
"render": "40,40,center",
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak",
"ru": "Контейнер для мусора"
}
}
]
},
"location": [
"point"
]
}
]
}

15
assets/layers/watermill/watermill.json
View file

@ -171,5 +171,18 @@
},
"color": {
"render": "#FFC0CB"
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/layers/watermill/watermill.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
}

17
assets/themes/aed/aed_brugge.json
View file

@ -42,6 +42,23 @@
"iconSize": "20,20,center",
"tagRenderings": [
"all_tags"
],
"mapRendering": [
{
"icon": {
"render": "circle:red",
"mappings": [
{
"if": "_has_closeby_feature=yes",
"then": "circle:#008000aa"
}
]
},
"iconSize": "20,20,center",
"location": [
"point"
]
}
]
}
],

39
assets/themes/buurtnatuur/buurtnatuur.json
View file

@ -124,6 +124,19 @@
"nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
},
{
@ -222,6 +235,19 @@
"nl": "Voeg een ontbrekend park toe"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
@ -339,6 +365,19 @@
"nl": "Voeg een ontbrekend bos toe aan de kaart"
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
"viewpoint"

39
assets/themes/campersite/campersite.json
View file

@ -676,7 +676,31 @@
}
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/campersite/caravan.svg",
"mappings": [
{
"if": {
"and": [
"fee=no"
]
},
"then": "circle:white;./assets/themes/campersite/caravan_green.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
},
{
"id": "dumpstations",
@ -1075,6 +1099,19 @@
"de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom."
}
}
],
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
},
"iconSize": {
"render": "32,32,center"
},
"location": [
"point"
]
}
]
}
],

84
assets/themes/climbing/climbing.json
View file

@ -215,7 +215,27 @@
}
}
],
"wayHandling": 1
"wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/club.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
"id": "climbing_gym",
@ -313,7 +333,27 @@
"iconSize": {
"render": "40,40,center"
},
"wayHandling": 1
"wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/climbing_gym.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
"id": "climbing_route",
@ -532,7 +572,21 @@
]
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/climbing/climbing_route.svg"
},
"iconSize": {
"render": "28,28,center"
},
"location": [
"point",
"centroid"
]
}
]
},
{
"id": "climbing",
@ -801,6 +855,20 @@
"_difficulty_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:grade:french'])",
"_length_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:length'])",
"_contained_climbing_routes_count=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').length"
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/climbing_no_rope.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
},
{
@ -930,7 +998,15 @@
"color": {
"render": "#ddff55AA"
},
"wayHandling": 0
"wayHandling": 0,
"mapRendering": [
{
"icon": "./assets/themes/climbing/climbing_unknown.svg",
"location": [
"point"
]
}
]
}
],
"roamingRenderings": [

7
assets/themes/cycle_highways/cycle_highways.json
View file

@ -233,6 +233,13 @@
}
]
}
],
"mapRendering": [
{
"location": [
"point"
]
}
]
}
],

24
assets/themes/cyclestreets/cyclestreets.json
View file

@ -183,6 +183,14 @@
"width": "10",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F111.svg",
"location": [
"point"
]
}
]
},
{
@ -235,6 +243,14 @@
"width": "5",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
"point"
]
}
]
},
{
@ -300,6 +316,14 @@
},
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/svg/pencil.svg",
"location": [
"point"
]
}
]
}
],

73
assets/themes/facadegardens/facadegardens.json
View file

@ -454,7 +454,78 @@
}
}
],
"wayHandling": 1
"wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/facadegardens/geveltuin.svg",
"mappings": [
{
"if": {
"and": [
"direct_sunlight=yes"
]
},
"then": "circle:white;./assets/themes/facadegardens/zon.svg"
},
{
"if": {
"and": [
"direct_sunlight=partial"
]
},
"then": "circle:white;./assets/themes/facadegardens/halfzon.svg"
},
{
"if": {
"and": [
"direct_sunlight=no"
]
},
"then": "circle:white;./assets/themes/facadegardens/schaduw.svg"
}
]
},
"iconOverlays": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
"badge": true
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
"badge": true
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
"badge": true
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
"badge": true
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg",
"badge": true
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
}
],
"roamingRenderings": []

26
assets/themes/fruit_trees/fruit_trees.json
View file

@ -68,6 +68,19 @@
"nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
}
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
@ -170,6 +183,19 @@
"nl": "Voeg hier een boom toe"
}
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/fruit_trees/fruit_tree.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}
],

21
assets/themes/grb.json
View file

@ -197,7 +197,26 @@
"render": "#00f"
},
"wayHandling": 2,
"presets": []
"presets": [],
"mapRendering": [
{
"label": {
"mappings": [
{
"if": "addr:housenumber~*",
"then": "<div style='background-color: white; font: large; width: 1.5em; height: 1.5em; border-radius: 100%'>{addr:housenumber}</div>"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
}
],
"hideFromOverview": true,

29
assets/themes/hackerspaces/hackerspaces.json
View file

@ -233,7 +233,34 @@
"leisure=hackerspace"
]
}
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hackerspaces/glider.svg",
"mappings": [
{
"if": {
"and": [
"hackerspace=makerspace"
]
},
"then": {
"en": "./assets/themes/hackerspaces/led.png",
"de": "./assets/themes/hackerspaces/led.png"
}
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
}
]
}

61
assets/themes/hailhydrant/hailhydrant.json
View file

@ -316,7 +316,21 @@
}
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/hydrant.svg"
},
"iconSize": {
"render": "20,20,center"
},
"location": [
"point",
"centroid"
]
}
]
},
{
"id": "extinguisher",
@ -433,7 +447,20 @@
}
}
],
"wayHandling": 1
"wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
},
"iconSize": {
"render": "20,20,center"
},
"location": [
"point"
]
}
]
},
{
"id": "fire_stations",
@ -657,6 +684,20 @@
"fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions."
}
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point",
"centroid"
]
}
]
},
{
@ -858,7 +899,21 @@
}
}
],
"wayHandling": 2
"wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point",
"centroid"
]
}
]
}
],
"defaultBackgroundId": "HDM_HOT"

188
assets/themes/natuurpunt/natuurpunt.json
View file

@ -54,9 +54,13 @@
},
"minzoom": 13,
"minzoomVisible": 0,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
}
]
}
},
{
@ -74,9 +78,13 @@
"isOsmCache": "duplicate"
},
"minzoom": 1,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
},
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
}
],
"presets": []
}
},
@ -93,9 +101,13 @@
"isOsmCache": true
},
"minzoom": 1,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
}
}
]
}
},
{
@ -112,19 +124,23 @@
"isOsmCache": true
},
"minzoom": 10,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/walk_wheelchair.svg"
},
{
"if": "pushchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/walk_wheelchair.svg"
},
{
"if": "pushchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
}
]
}
]
}
}
]
}
},
{
@ -136,19 +152,23 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/toilets.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/wheelchair.svg"
},
{
"if": "toilets:position=urinals",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/toilets.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/wheelchair.svg"
},
{
"if": "toilets:position=urinals",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
}
]
}
]
}
}
]
}
},
{
@ -160,10 +180,14 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
"mappings": null
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
"mappings": null
}
}
]
}
},
{
@ -175,9 +199,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
}
}
]
}
},
{
@ -189,34 +217,42 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
}
}
]
}
},
{
"builtin": "parking",
"override": {
"minzoom": "16",
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
"mappings": [
{
"if": "amenity=bicycle_parking",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
}
]
},
"iconOverlays": [
"mapRendering": [
{
"if": "amenity=motorcycle_parking",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
"badge": true
},
{
"if": "capacity:disabled=yes",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
"badge": true
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
"mappings": [
{
"if": "amenity=bicycle_parking",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
}
]
},
"iconOverlays": [
{
"if": "amenity=motorcycle_parking",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
"badge": true
},
{
"if": "capacity:disabled=yes",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
"badge": true
}
]
}
]
}
@ -230,9 +266,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
}
}
]
}
},
{
@ -244,9 +284,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
}
}
]
}
},
{
@ -258,9 +302,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
}
}
]
}
}
],

17
assets/themes/openwindpowermap/openwindpowermap.json
View file

@ -227,6 +227,23 @@
}
]
}
],
"mapRendering": [
{
"icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
"label": {
"mappings": [
{
"if": "generator:output:electricity~^[0-9]+.*[W]$",
"then": "<div style='background-color: rgba(0,0,0,0.3); color: white; font-size: 8px; padding: 0.25em; border-radius:0.5em'>{generator:output:electricity}</div>"
}
]
},
"iconSize": "40, 40, bottom",
"location": [
"point"
]
}
]
}
],

37
assets/themes/postboxes/postboxes.json
View file

@ -79,7 +79,21 @@
"razed:amenity=post_box"
]
}
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/postboxes/postbox.svg"
},
"iconSize": {
"render": "40,40,bottom"
},
"location": [
"point",
"centroid"
]
}
]
},
{
"id": "postoffices",
@ -168,6 +182,27 @@
}
]
}
],
"mapRendering": [
{
"icon": {
"render": "square:white;./assets/themes/postboxes/post_office.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,bottom"
},
"location": [
"point",
"centroid"
]
}
]
}
]

19
assets/themes/speelplekken/speelplekken.json
View file

@ -36,7 +36,14 @@
"color": "#444444",
"width": {
"render": "1"
}
},
"mapRendering": [
{
"location": [
"point"
]
}
]
},
{
"builtin": "play_forest",
@ -252,7 +259,15 @@
},
"width": {
"render": "9"
}
},
"mapRendering": [
{
"icon": "./assets/themes/speelplekken/walking_route.svg",
"location": [
"point"
]
}
]
}
],
"clustering": {

63
assets/themes/uk_addresses/uk_addresses.json
View file

@ -108,6 +108,29 @@
}
]
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
"mappings": [
{
"if": "_embedding_object:id~*",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
},
{
"if": "_imported=yes",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
@ -254,7 +277,36 @@
"then": "#ff0"
}
]
}
},
"mapRendering": [
{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_ok.svg",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
"id": "named_streets",
@ -272,7 +324,14 @@
},
"width": {
"render": "0"
}
},
"mapRendering": [
{
"location": [
"point"
]
}
]
}
],
"roamingRenderings": []

4
css/index-tailwind-output.css
View file

@ -924,6 +924,10 @@ video {
margin-right: 0.75rem;
}
.mb-0 {
margin-bottom: 0px;
}
.box-border {
box-sizing: border-box;
}

4
test/Tag.spec.ts
View file

@ -166,7 +166,7 @@ export default class TagSpec extends T {
}
],
condition: "x="
}, undefined, "Tests");
}, "Tests");
equal(undefined, tr.GetRenderValue({"foo": "bar"}));
equal("Has no name", tr.GetRenderValue({"noname": "yes"})?.txt);
@ -483,7 +483,7 @@ export default class TagSpec extends T {
]
};
const tagRendering = new TagRenderingConfig(config, null, "test");
const tagRendering = new TagRenderingConfig(config, "test");
equal(true, tagRendering.IsKnown({bottle: "yes"}))
equal(false, tagRendering.IsKnown({}))
}],