Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Refactoring: split icons into proper layered icons, fix and rerun shops-thief

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-10-06 23:56:50 +02:00
parent d6cd0516bb
commit 19a760178b
307 changed files with 26845 additions and 116541 deletions
Download patch file Download diff file Expand all files Collapse all files

36
assets/layers/address/address.json
View file

@ -270,25 +270,29 @@
"condition": "addr:housenumber~*"
},
"iconSize": "50,50",
"icon": {
"render": "./assets/layers/address/housenumber_blank.svg",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
"marker": [
{
"icon": {
"render": "./assets/layers/address/housenumber_blank.svg",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"addr:street="
]
},
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
}
]
}
]
},
}
],
"location": [
"point",
"centroid"

181
assets/layers/advertising/advertising.json
View file

@ -1278,104 +1278,91 @@
"point",
"centroid"
],
"icon": {
"render": "./assets/themes/advertising/sign.svg",
"mappings": [
{
"if": {
"or": [
"advertising=billboard"
]
},
"then": "./assets/themes/advertising/billboard.svg"
},
{
"if": "advertising=board",
"then": "./assets/themes/advertising/board.svg"
},
{
"if": "advertising=column",
"then": "./assets/themes/advertising/column.svg"
},
{
"if": "advertising=flag",
"then": "./assets/themes/advertising/flag.svg"
},
{
"if": {
"and": [
"advertising=poster_box",
"_referencing_ways=[\"way/-1\"]"
]
},
"then": "brick_wall_square;./assets/themes/advertising/poster_box_no_support.svg"
},
{
"if": {
"and": [
"advertising=poster_box",
"_referencing_ways~*"
]
},
"then": "./assets/themes/advertising/poster_box_no_support.svg"
},
{
"if": "advertising=poster_box",
"then": "./assets/themes/advertising/poster_box.svg"
},
{
"if": {
"and": [
"advertising=screen",
"_referencing_ways=[\"way/-1\"]"
]
},
"then": "brick_wall_square;./assets/themes/advertising/screen_no_support.svg"
},
{
"if": {
"and": [
"advertising=screen",
"_referencing_ways~*"
]
},
"then": "./assets/themes/advertising/screen_no_support.svg"
},
{
"if": "advertising=screen",
"then": "./assets/themes/advertising/screen.svg"
},
{
"if": "advertising=sculpture",
"then": "./assets/themes/advertising/sculpture.svg"
},
{
"if": {
"and": [
"advertising=sign",
"_referencing_ways=[\"way/-1\"]"
]
},
"then": "brick_wall_square;./assets/themes/advertising/sign.svg"
},
{
"if": "advertising=sign",
"then": "./assets/themes/advertising/sign.svg"
},
{
"if": "advertising=tarp",
"then": "./assets/themes/advertising/tarp.svg"
},
{
"if": "advertising=totem",
"then": "./assets/themes/advertising/totem.svg"
},
{
"if": "advertising=wall_painting",
"then": "./assets/themes/advertising/wall_painting.svg"
"marker": [
{
"icon": {
"mappings": [
{
"if": "_referencing_ways=[\"way/-1\"]",
"then": "brick_wall_square"
}
]
}
]
},
},
{
"icon": {
"render": "./assets/themes/advertising/sign.svg",
"mappings": [
{
"if": {
"or": [
"advertising=billboard"
]
},
"then": "./assets/themes/advertising/billboard.svg"
},
{
"if": "advertising=board",
"then": "./assets/themes/advertising/board.svg"
},
{
"if": "advertising=column",
"then": "./assets/themes/advertising/column.svg"
},
{
"if": "advertising=flag",
"then": "./assets/themes/advertising/flag.svg"
},
{
"if": {
"and": [
"advertising=poster_box",
"_referencing_ways~*"
]
},
"then": "./assets/themes/advertising/poster_box_no_support.svg"
},
{
"if": "advertising=poster_box",
"then": "./assets/themes/advertising/poster_box.svg"
},
{
"if": {
"and": [
"advertising=screen",
"_referencing_ways~*"
]
},
"then": "./assets/themes/advertising/screen_no_support.svg"
},
{
"if": "advertising=screen",
"then": "./assets/themes/advertising/screen.svg"
},
{
"if": "advertising=sculpture",
"then": "./assets/themes/advertising/sculpture.svg"
},
{
"if": "advertising=sign",
"then": "./assets/themes/advertising/sign.svg"
},
{
"if": "advertising=tarp",
"then": "./assets/themes/advertising/tarp.svg"
},
{
"if": "advertising=totem",
"then": "./assets/themes/advertising/totem.svg"
},
{
"if": "advertising=wall_painting",
"then": "./assets/themes/advertising/wall_painting.svg"
}
]
}
}
],
"iconSize": {
"render": "40,40",
"mappings": [

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

@ -378,13 +378,17 @@
],
"pointRendering": [
{
"icon": "./assets/themes/hailhydrant/Twemoji_1f691.svg",
"iconSize": "35,35",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
}
]
}
],
"lineRendering": [

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

@ -800,7 +800,15 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/themes/artwork/artwork.svg",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/themes/artwork/artwork.svg"
}
],
"location": [
"point",
"centroid"
@ -812,15 +820,5 @@
"color": "#0000ff",
"width": "10"
}
],
"pl": {
"title": {
"mappings": {
"0": {
"then": "{name}"
}
},
"render": "turbina wiatrowa"
}
}
]
}

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

@ -476,6 +476,23 @@
]
}
},
"pointRendering": [
{
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/atm/atm.svg"
}
],
"location": [
"point",
"centroid"
]
}
],
"filter": [
"open_now",
{
@ -495,14 +512,5 @@
]
}
],
"pointRendering": [
{
"icon": "circle:white;./assets/layers/atm/atm.svg",
"location": [
"point",
"centroid"
]
}
],
"lineRendering": []
}

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

@ -107,7 +107,15 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/layers/bank/bank.svg",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/bank/bank.svg"
}
],
"location": [
"point",
"centroid"

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

@ -604,7 +604,11 @@
},
"pointRendering": [
{
"icon": "./assets/layers/barrier/barrier.svg",
"marker": [
{
"icon": "./assets/layers/barrier/barrier.svg"
}
],
"location": [
"point"
]

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

@ -1125,7 +1125,6 @@
],
"pointRendering": [
{
"icon": "circle:#99bd54;./assets/layers/bench/bench.svg",
"iconSize": "35,35",
"iconBadges": [
{
@ -1137,7 +1136,16 @@
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "#99bd54"
},
{
"icon": "./assets/layers/bench/bench.svg"
}
]
}
],
"lineRendering": []

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

@ -259,12 +259,20 @@
},
"pointRendering": [
{
"icon": "circle:white;./assets/themes/benches/bench_public_transport.svg",
"iconSize": "35,35",
"location": [
"point"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/themes/benches/bench_public_transport.svg"
}
]
}
],
"lineRendering": [

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

@ -328,7 +328,6 @@
"deletion": true,
"pointRendering": [
{
"icon": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg",
"iconBadges": [
{
"if": "opening_hours~*",
@ -344,7 +343,16 @@
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "pin",
"color": "#22ff55"
},
{
"icon": "./assets/layers/bicycle_library/bicycle_library.svg"
}
]
}
],
"lineRendering": [

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

@ -586,13 +586,17 @@
},
"pointRendering": [
{
"icon": "./assets/themes/bicycle_rental/logo.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/bicycle_rental/logo.svg"
}
]
}
],
"lineRendering": [

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

@ -316,7 +316,6 @@
},
"pointRendering": [
{
"icon": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg",
"iconBadges": [
{
"if": {
@ -333,7 +332,16 @@
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "pin",
"color": "#ffffff"
},
{
"icon": "./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
}
]
}
],
"lineRendering": [

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

@ -351,12 +351,20 @@
},
"pointRendering": [
{
"icon": "pin:#684c2b;./assets/layers/bike_cafe/bike_cafe.svg",
"iconSize": "50,50",
"anchor": "bottom",
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "pin",
"color": "#684c2b"
},
{
"icon": "./assets/layers/bike_cafe/bike_cafe.svg"
}
]
}
],

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

@ -249,7 +249,6 @@
},
"pointRendering": [
{
"icon": "./assets/layers/bike_cleaning/bike_cleaning.svg",
"iconBadges": [
{
"if": {
@ -270,7 +269,12 @@
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "./assets/layers/bike_cleaning/bike_cleaning.svg"
}
]
}
],
"lineRendering": []

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

@ -716,13 +716,21 @@
},
"pointRendering": [
{
"icon": "pin:#5473de;./assets/layers/bike_parking/parking.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "pin",
"color": "#5473de"
},
{
"icon": "./assets/layers/bike_parking/parking.svg"
}
]
}
],
"lineRendering": [

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

@ -999,53 +999,107 @@
},
"pointRendering": [
{
"icon": {
"render": "pin:#88d32c;./assets/layers/bike_repair_station/repair_station.svg",
"mappings": [
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes",
"service:bicycle:pump:operational_status=broken"
]
},
"then": "pin:#88d32c;./assets/layers/bike_repair_station/repair_station_broken_pump.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes"
]
},
"then": "pin:#30abf0;./assets/layers/bike_repair_station/repair_station_pump.svg"
},
{
"if": {
"and": [
"service:bicycle:pump:operational_status=broken",
"service:bicycle:tools=no"
]
},
"then": "pin:black;./assets/layers/bike_repair_station/broken_pump.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
{
"or": [
"service:bicycle:tools=no",
"service:bicycle:tools="
"marker": [
{
"icon": "pin",
"color": {
"render": "#88d32c",
"mappings": [
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes",
"service:bicycle:pump:operational_status=broken"
]
}
]
},
"then": "pin:#e1783a;./assets/layers/bike_repair_station/pump.svg"
},
"then": "#88d32c"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes"
]
},
"then": "#30abf0"
},
{
"if": {
"and": [
"service:bicycle:pump:operational_status=broken",
"service:bicycle:tools=no"
]
},
"then": "black"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
{
"or": [
"service:bicycle:tools=no",
"service:bicycle:tools="
]
}
]
},
"then": "#e1783a"
}
]
}
]
},
},
{
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg",
"mappings": [
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes",
"service:bicycle:pump:operational_status=broken"
]
},
"then": "./assets/layers/bike_repair_station/repair_station_broken_pump.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.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
{
"or": [
"service:bicycle:tools=no",
"service:bicycle:tools="
]
}
]
},
"then": "./assets/layers/bike_repair_station/pump.svg"
}
]
}
}
],
"iconBadges": [
{
"if": "operator=De Fietsambassade Gent",

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

@ -867,19 +867,47 @@
"deletion": true,
"pointRendering": [
{
"icon": {
"render": "pin:#f04c4c;./assets/layers/bike_shop/repair_shop.svg",
"mappings": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
"marker": [
{
"icon": {
"render": "pin",
"mappings": [
{
"if": "operator=De Fietsambassade Gent",
"then": null
}
]
},
{
"if": "service:bicycle:retail=yes",
"then": "pin:#353d57;./assets/layers/bike_shop/shop.svg"
"color": {
"render": "#f04c4c",
"mappings": [
{
"if": "operator=De Fietsambassade Gent",
"then": null
},
{
"if": "service:bicycle:retail=yes",
"then": "#353d57"
}
]
}
]
},
},
{
"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"
}
]
}
}
],
"iconBadges": [
{
"if": "opening_hours~*",

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

@ -84,13 +84,17 @@
},
"pointRendering": [
{
"icon": "./assets/layers/bike_themed_object/other_services.svg",
"iconSize": "50,50",
"location": [
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "./assets/layers/bike_themed_object/other_services.svg"
}
]
}
],
"lineRendering": [

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

@ -167,12 +167,20 @@
},
"pointRendering": [
{
"icon": "circle:white;./assets/layers/binocular/telescope.svg",
"iconSize": "40,40",
"location": [
"point"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/binocular/telescope.svg"
}
]
}
],
"lineRendering": [

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

@ -408,21 +408,25 @@
},
"pointRendering": [
{
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg",
"mappings": [
{
"if": {
"or": [
"building=yes",
"shelter=yes",
"amenity=shelter"
]
},
"then": "./assets/layers/birdhide/birdshelter.svg"
"marker": [
{
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg",
"mappings": [
{
"if": {
"or": [
"building=yes",
"shelter=yes",
"amenity=shelter"
]
},
"then": "./assets/layers/birdhide/birdshelter.svg"
}
]
}
]
},
}
],
"location": [
"point",
"centroid"

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

@ -333,19 +333,6 @@
},
"pointRendering": [
{
"icon": {
"render": "circle:white;./assets/layers/cafe_pub/pub.svg",
"mappings": [
{
"if": "amenity=cafe",
"then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
},
{
"if": "amenity=nightclub",
"then": "circle:white;./assets/layers/cafe_pub/nightclub.svg"
}
]
},
"iconBadges": [
{
"if": "opening_hours~*",
@ -363,6 +350,23 @@
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": {
"render": "circle:white;./assets/layers/cafe_pub/pub.svg",
"mappings": [
{
"if": "amenity=cafe",
"then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
},
{
"if": "amenity=nightclub",
"then": "circle:white;./assets/layers/cafe_pub/nightclub.svg"
}
]
}
}
]
}
],

12
assets/layers/car_rental/car_rental.json
View file

@ -118,12 +118,20 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/layers/car_rental/car_rental.svg",
"location": [
"point",
"centroid"
],
"label": "<div class='bg-white block p-1 rounded'>{name}</div>"
"label": "<div class='bg-white block p-1 rounded'>{name}</div>",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/car_rental/car_rental.svg"
}
]
}
],
"lineRendering": [

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

@ -5238,60 +5238,32 @@
"point",
"centroid"
],
"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"
}
]
},
"iconBadges": [
"marker": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "close:#c22;"
"icon": "pin",
"color": "#fff"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
"icon": {
"render": "./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"or": [
"motorcar=yes",
"car=yes"
]
"if": "bicycle=yes",
"then": "./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
}
],
"anchor": "bottom",
"iconSize": "50,50"
]
}
],
"lineRendering": []

43
assets/layers/charging_station/charging_station.protojson
View file

@ -728,30 +728,37 @@
}
}
],
"mapRendering": [
"lineRendering": [],
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"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"
]
"marker": [{
"icon": "pin",
"color": "#fff"
},{
"icon": {
"render":"./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "./assets/themes/charging_stations/bicycle.svg"
},
"then": "pin:#fff;./assets/themes/charging_stations/car.svg"
}
]
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
}
}],
"iconBadges": [
{
"if": {

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

@ -307,13 +307,17 @@
],
"pointRendering": [
{
"icon": "./assets/themes/climbing/climbing_no_rope.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/climbing/climbing_no_rope.svg"
}
]
}
],
"lineRendering": [

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

@ -165,7 +165,6 @@
],
"pointRendering": [
{
"icon": "./assets/themes/climbing/club.svg",
"iconBadges": [
{
"if": "opening_hours~*",
@ -185,7 +184,12 @@
}
]
},
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/climbing/club.svg"
}
]
}
],
"lineRendering": []

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

@ -481,7 +481,6 @@
],
"pointRendering": [
{
"icon": "./assets/themes/climbing/climbing_gym.svg",
"iconBadges": [
{
"if": "opening_hours~*",
@ -501,7 +500,12 @@
}
]
},
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/climbing/climbing_gym.svg"
}
]
}
],
"lineRendering": []

6
assets/layers/climbing_opportunity/climbing_opportunity.json
View file

@ -122,7 +122,11 @@
],
"pointRendering": [
{
"icon": "./assets/themes/climbing/climbing_unknown.svg",
"marker": [
{
"icon": "./assets/themes/climbing/climbing_unknown.svg"
}
],
"location": [
"point",
"centroid"

12
assets/layers/climbing_route/climbing_route.json
View file

@ -228,7 +228,6 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/themes/climbing/climbing_route.svg",
"iconSize": "28,28",
"location": [
"point",
@ -251,7 +250,16 @@
}
]
},
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/themes/climbing/climbing_route.svg"
}
]
}
],
"lineRendering": [

20
assets/layers/clock/clock.json
View file

@ -494,15 +494,19 @@
"point",
"centroid"
],
"icon": {
"render": "./assets/layers/clock/clock.svg",
"mappings": [
{
"if": "display=digital",
"then": "./assets/layers/clock/clock_digital.svg"
"marker": [
{
"icon": {
"render": "./assets/layers/clock/clock.svg",
"mappings": [
{
"if": "display=digital",
"then": "./assets/layers/clock/clock_digital.svg"
}
]
}
]
},
}
],
"iconSize": {
"render": "40,40,center",
"mappings": [

141
assets/layers/conflation/conflation.json
View file

@ -7,48 +7,108 @@
"title": "Conflation",
"pointRendering": [
{
"location": "point",
"icon": {
"render": "addSmall:#000",
"mappings": [
{
"if": "detach=yes",
"then": "circle:white;close:#c33"
}
]
},
"iconSize": "10,10",
"anchor": "center"
},
{
"location": "end",
"icon": {
"render": "circle:#0f0",
"mappings": [
{
"if": "reprojection=yes",
"then": "none:#f00"
"location": [
"point"
],
"marker": [
{
"color": {
"render": "#000",
"mappings": [
{
"if": "detach=yes",
"then": "white"
}
]
},
{
"if": "move=no",
"then": "ring:#0f0"
"icon": {
"render": "addSmall:#000",
"mappings": [
{
"if": "detach=yes",
"then": "white"
}
]
}
]
},
},
{
"icon": {
"mappings": [
{
"if": "detach=yes",
"then": "close"
}
]
},
"color": "#C33"
}
],
"iconSize": "10,10",
"anchor": "center"
},
{
"location": "start",
"icon": {
"render": "square:#f00",
"mappings": [
{
"if": "reprojection=yes",
"then": "reload:#f00"
"location": [
"end"
],
"marker": [
{
"icon": {
"render": "circle",
"mappings": [
{
"if": "reprojection=yes",
"then": "none"
},
{
"if": "move=no",
"then": "ring"
}
]
},
"color": {
"render": "#0f0",
"mappings": [
{
"if": "reprojection=yes",
"then": "#f00"
},
{
"if": "move=no",
"then": "#0f0"
}
]
}
]
},
}
],
"iconSize": "10,10",
"anchor": "center"
},
{
"location": [
"start"
],
"marker": [
{
"icon": {
"render": "square",
"mappings": [
{
"if": "reprojection=yes",
"then": "reload"
}
]
},
"color": {
"render": "#f00",
"mappings": [
{
"if": "reprojection=yes",
"then": "#f00"
}
]
}
}
],
"iconSize": {
"render": "10,10,center",
"mappings": [
@ -71,16 +131,7 @@
}
]
},
"color": "#00f",
"dasharray": {
"render": "",
"mappings": [
{
"if": "resulting-geometry=yes",
"then": "6 6"
}
]
}
"color": "#00f"
}
]
}

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

@ -27,9 +27,13 @@
"centroid"
],
"iconSize": "50,50",
"icon": "./assets/layers/crab_address/housenumber_blank.svg",
"label": "<div style='margin-top: -42px; color: white' class='rounded-full p-1 font-bold relative'>{_HNRLABEL}</div>",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/layers/crab_address/housenumber_blank.svg"
}
]
}
],
"lineRendering": []

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

@ -647,20 +647,24 @@
],
"pointRendering": [
{
"icon": {
"render": "./assets/layers/crossings/pedestrian_crossing.svg",
"mappings": [
{
"if": {
"or": [
"highway=traffic_signals",
"crossing=traffic_signals"
]
},
"then": "./assets/layers/crossings/traffic_lights.svg"
"marker": [
{
"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"
]

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

@ -1695,10 +1695,14 @@
},
"pointRendering": [
{
"icon": "./assets/themes/cycle_infra/bicycleway.svg",
"iconSize": "40,40",
"location": [
"point"
],
"marker": [
{
"icon": "./assets/themes/cycle_infra/bicycleway.svg"
}
]
}
],

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

@ -683,7 +683,7 @@
},
"allowMove": {
"enableRelocation": false,
"enableImproveAccuraccy": true
"enableImproveAccuracy": true
},
"filter": [
"has_image",
@ -691,15 +691,23 @@
],
"pointRendering": [
{
"icon": {
"render": "square:#008754;./assets/layers/defibrillator/defibrillator.svg",
"mappings": [
{
"if": "_recently_surveyed=true",
"then": "square:#28ba3d;./assets/layers/defibrillator/defibrillator.svg"
"marker": [
{
"icon": "square",
"color": {
"render": "#008754",
"mappings": [
{
"if": "_recently_surveyed=true",
"then": "#28ba3d"
}
]
}
]
},
},
{
"icon": "./assets/layers/defibrillator/defibrillator.svg"
}
],
"location": [
"point"
]

12
assets/layers/dentist/dentist.json
View file

@ -76,13 +76,21 @@
"allowMove": true,
"pointRendering": [
{
"icon": "circle:white;./assets/layers/dentist/dentist.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/dentist/dentist.svg"
}
]
}
],
"lineRendering": []

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

@ -35,14 +35,19 @@
"presets": [],
"pointRendering": [
{
"icon": "direction_gradient:var(--catch-detail-color)",
"iconSize": "200,200",
"location": [
"point",
"centroid"
],
"rotation": "{_direction:numerical}deg",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "direction_gradient",
"color": "var(--catch-detail-color)"
}
]
}
],
"lineRendering": [

12
assets/layers/doctors/doctors.json
View file

@ -147,13 +147,21 @@
"allowMove": true,
"pointRendering": [
{
"icon": "circle:white;./assets/layers/doctors/doctors.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/doctors/doctors.svg"
}
]
}
],
"lineRendering": []

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

@ -177,7 +177,6 @@
"point",
"centroid"
],
"icon": "./assets/layers/dogpark/dog-park.svg",
"iconSize": "40,40",
"label": {
"mappings": [
@ -187,7 +186,12 @@
}
]
},
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/layers/dogpark/dog-park.svg"
}
]
}
],
"lineRendering": [

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

@ -256,7 +256,6 @@
},
"pointRendering": [
{
"icon": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg",
"iconBadges": [
{
"if": {
@ -273,7 +272,16 @@
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "pin",
"color": "#6BC4F7"
},
{
"icon": "./assets/layers/drinking_water/drips.svg"
}
]
}
],
"lineRendering": []

12
assets/layers/elevator/elevator.json
View file

@ -331,7 +331,6 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/layers/elevator/elevator_wheelchair.svg",
"iconSize": "40,40",
"location": [
"point",
@ -348,7 +347,16 @@
"then": "close:#c33"
}
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/elevator/elevator_wheelchair.svg"
}
]
}
],
"lineRendering": []

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

@ -389,7 +389,6 @@
],
"pointRendering": [
{
"icon": "circle:#FFFFFF00;./assets/themes/elongated_coin/penny.svg",
"location": [
"point",
"centroid"
@ -399,6 +398,15 @@
"if": "opening_hours~*",
"then": "icons.isOpen"
}
],
"marker": [
{
"icon": "circle",
"color": "#FFFFFF00"
},
{
"icon": "./assets/themes/elongated_coin/penny.svg"
}
]
}
],

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

@ -550,15 +550,23 @@
"point",
"centroid"
],
"icon": {
"render": "circle:white;./assets/layers/entrance/entrance.svg",
"mappings": [
{
"if": "entrance=emergency",
"then": "circle:white;./assets/layers/entrance/emergency_door.svg"
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": {
"render": "./assets/layers/entrance/entrance.svg",
"mappings": [
{
"if": "entrance=emergency",
"then": "./assets/layers/entrance/emergency_door.svg"
}
]
}
]
}
}
]
}
],
"lineRendering": []

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

@ -267,25 +267,29 @@
],
"pointRendering": [
{
"icon": {
"render": "pin:#05d7fcaa",
"mappings": [
{
"if": {
"and": [
"name:etymology=",
"name:etymology:wikidata="
]
},
"then": "pin:#fcca05aa"
}
]
},
"iconSize": "40,40",
"location": [
"point"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": {
"render": "pin:#05d7fcaa",
"mappings": [
{
"if": {
"and": [
"name:etymology=",
"name:etymology:wikidata="
]
},
"then": "pin:#fcca05aa"
}
]
}
}
]
}
],
"lineRendering": [

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

@ -164,13 +164,17 @@
],
"pointRendering": [
{
"icon": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg",
"iconSize": "20,20",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
}
]
}
],
"lineRendering": []

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

@ -297,13 +297,17 @@
],
"pointRendering": [
{
"icon": "./assets/themes/hailhydrant/Twemoji12_1f692.svg",
"iconSize": "35,35",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
}
]
}
],
"lineRendering": [

12
assets/layers/fitness_centre/fitness_centre.json
View file

@ -99,7 +99,6 @@
"point",
"centroid"
],
"icon": "circle:white;./assets/layers/fitness_centre/gym.svg",
"iconSize": "40,40",
"label": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>",
"iconBadges": [
@ -108,7 +107,16 @@
"then": "icons.isOpen"
}
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/fitness_centre/gym.svg"
}
]
}
],
"lineRendering": []

12
assets/layers/fitness_station/fitness_station.json
View file

@ -425,7 +425,6 @@
"point",
"centroid"
],
"icon": "circle:white;./assets/layers/fitness_station/fitness.svg",
"iconSize": "40,40",
"iconBadges": [
{
@ -438,7 +437,16 @@
"then": "icons.isOpen"
}
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/fitness_station/fitness.svg"
}
]
}
],
"lineRendering": []

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

@ -78,8 +78,12 @@
"centroid",
"point"
],
"icon": "./assets/svg/bug.svg",
"label": "<div class='bg-white rounded p-2'>{fixme}</div>"
"label": "<div class='bg-white rounded p-2'>{fixme}</div>",
"marker": [
{
"icon": "./assets/svg/bug.svg"
}
]
}
],
"lineRendering": [

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

@ -1165,24 +1165,6 @@
},
"pointRendering": [
{
"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"
}
]
},
"iconBadges": [
{
"if": "opening_hours~*",
@ -1222,6 +1204,28 @@
"location": [
"point",
"centroid"
],
"marker": [
{
"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"
}
]
}
}
]
}
],

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

@ -282,13 +282,17 @@
},
"pointRendering": [
{
"icon": "./assets/layers/ghost_bike/ghost_bike.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "./assets/layers/ghost_bike/ghost_bike.svg"
}
]
}
],
"lineRendering": []

12
assets/layers/governments/governments.json
View file

@ -68,13 +68,21 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/layers/governments/government.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/governments/government.svg"
}
]
}
],
"lineRendering": []

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

@ -5,15 +5,20 @@
"source": "special",
"pointRendering": [
{
"icon": {
"render": "crosshair:var(--catch-detail-color)",
"mappings": [
{
"if": "speed>2",
"then": "gps_arrow"
"marker": [
{
"color": "--catch-detail-color",
"icon": {
"render": "crosshair",
"mappings": [
{
"if": "speed>2",
"then": "gps_arrow"
}
]
}
]
},
}
],
"iconSize": "40,40",
"pitchAlignment": "map",
"rotation": {

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

@ -11,9 +11,14 @@
"point",
"centroid"
],
"icon": "square:red",
"iconSize": "5,5",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "square",
"color": "red"
}
]
}
],
"lineRendering": []

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

@ -347,19 +347,23 @@
"deletion": true,
"pointRendering": [
{
"icon": {
"render": "./assets/themes/hackerspaces/glider.svg",
"mappings": [
{
"if": {
"and": [
"hackerspace=makerspace"
]
},
"then": "./assets/themes/hackerspaces/led.png"
"marker": [
{
"icon": {
"render": "./assets/themes/hackerspaces/glider.svg",
"mappings": [
{
"if": {
"and": [
"hackerspace=makerspace"
]
},
"then": "./assets/themes/hackerspaces/led.png"
}
]
}
]
},
}
],
"iconSize": "40,40",
"location": [
"point",

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

@ -5,11 +5,19 @@
"source": "special",
"pointRendering": [
{
"icon": "circle:white;./assets/svg/home.svg",
"iconSize": "20,20",
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/svg/home.svg"
}
]
}
],

12
assets/layers/hospital/hospital.json
View file

@ -117,13 +117,21 @@
],
"pointRendering": [
{
"icon": "circle:white;./assets/layers/hospital/hospital.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/hospital/hospital.svg"
}
]
}
],
"lineRendering": [

12
assets/layers/hotel/hotel.json
View file

@ -107,9 +107,17 @@
"point",
"centroid"
],
"icon": "circle:white;./assets/layers/hotel/hotel.svg",
"iconSize": "40,40",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/hotel/hotel.svg"
}
]
}
],
"lineRendering": []

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

@ -527,13 +527,17 @@
],
"pointRendering": [
{
"icon": "./assets/themes/hailhydrant/hydrant.svg",
"iconSize": "20,20",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/themes/hailhydrant/hydrant.svg"
}
]
}
],
"lineRendering": [

1
assets/layers/id_presets/fas-bowl-rice.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M176 56c0-13.3 10.7-24 24-24h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H200c-13.3 0-24-10.7-24-24zm24 48h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H200c-13.3 0-24-10.7-24-24s10.7-24 24-24zM56 176H72c13.3 0 24 10.7 24 24s-10.7 24-24 24H56c-13.3 0-24-10.7-24-24s10.7-24 24-24zM0 283.4C0 268.3 12.3 256 27.4 256H484.6c15.1 0 27.4 12.3 27.4 27.4c0 70.5-44.4 130.7-106.7 154.1L403.5 452c-2 16-15.6 28-31.8 28H140.2c-16.1 0-29.8-12-31.8-28l-1.8-14.4C44.4 414.1 0 353.9 0 283.4zM224 200c0-13.3 10.7-24 24-24h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H248c-13.3 0-24-10.7-24-24zm-96 0c0-13.3 10.7-24 24-24h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H152c-13.3 0-24-10.7-24-24zm-24-96h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H104c-13.3 0-24-10.7-24-24s10.7-24 24-24zm216 96c0-13.3 10.7-24 24-24h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H344c-13.3 0-24-10.7-24-24zm-24-96h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H296c-13.3 0-24-10.7-24-24s10.7-24 24-24zm120 96c0-13.3 10.7-24 24-24h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H440c-13.3 0-24-10.7-24-24zm-24-96h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H392c-13.3 0-24-10.7-24-24s10.7-24 24-24zM296 32h16c13.3 0 24 10.7 24 24s-10.7 24-24 24H296c-13.3 0-24-10.7-24-24s10.7-24 24-24z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
assets/layers/id_presets/fas-bowl-rice.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Font-Awesome icon set
SPDX-License-Identifier: CC-BY 4.0

1
assets/layers/id_presets/fas-jar.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M32 32C32 14.3 46.3 0 64 0H256c17.7 0 32 14.3 32 32s-14.3 32-32 32H64C46.3 64 32 49.7 32 32zM0 160c0-35.3 28.7-64 64-64H256c35.3 0 64 28.7 64 64V448c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V160zm96 64c-17.7 0-32 14.3-32 32v96c0 17.7 14.3 32 32 32H224c17.7 0 32-14.3 32-32V256c0-17.7-14.3-32-32-32H96z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 596 B

2
assets/layers/id_presets/fas-jar.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Font-Awesome icon set
SPDX-License-Identifier: CC-BY 4.0

1
assets/layers/id_presets/fas-plate-wheat.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M176 32c44.2 0 80 35.8 80 80v16c0 8.8-7.2 16-16 16c-44.2 0-80-35.8-80-80V48c0-8.8 7.2-16 16-16zM56 64h48c13.3 0 24 10.7 24 24s-10.7 24-24 24H56c-13.3 0-24-10.7-24-24s10.7-24 24-24zM24 136H136c13.3 0 24 10.7 24 24s-10.7 24-24 24H24c-13.3 0-24-10.7-24-24s10.7-24 24-24zm8 96c0-13.3 10.7-24 24-24h48c13.3 0 24 10.7 24 24s-10.7 24-24 24H56c-13.3 0-24-10.7-24-24zM272 48c0-8.8 7.2-16 16-16c44.2 0 80 35.8 80 80v16c0 8.8-7.2 16-16 16c-44.2 0-80-35.8-80-80V48zM400 32c44.2 0 80 35.8 80 80v16c0 8.8-7.2 16-16 16c-44.2 0-80-35.8-80-80V48c0-8.8 7.2-16 16-16zm80 160v16c0 44.2-35.8 80-80 80c-8.8 0-16-7.2-16-16V256c0-44.2 35.8-80 80-80c8.8 0 16 7.2 16 16zM352 176c8.8 0 16 7.2 16 16v16c0 44.2-35.8 80-80 80c-8.8 0-16-7.2-16-16V256c0-44.2 35.8-80 80-80zm-96 16v16c0 44.2-35.8 80-80 80c-8.8 0-16-7.2-16-16V256c0-44.2 35.8-80 80-80c8.8 0 16 7.2 16 16zM3.5 347.6C1.6 332.9 13 320 27.8 320H484.2c14.8 0 26.2 12.9 24.4 27.6C502.3 397.8 464.2 437 416 446v2c0 17.7-14.3 32-32 32H128c-17.7 0-32-14.3-32-32v-2c-48.2-9-86.3-48.2-92.5-98.4z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

2
assets/layers/id_presets/fas-plate-wheat.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Font-Awesome icon set
SPDX-License-Identifier: CC-BY 4.0

5803
assets/layers/id_presets/id_presets.json
View file

File diff suppressed because it is too large Load diff

30
assets/layers/id_presets/license_info.json
View file

@ -49,6 +49,16 @@
"https://github.com/FortAwesome/Font-Awesome"
]
},
{
"path": "fas-bowl-rice.svg",
"license": "CC-BY 4.0",
"authors": [
"Font-Awesome icon set"
],
"sources": [
"https://github.com/FortAwesome/Font-Awesome"
]
},
{
"path": "fas-camera-retro.svg",
"license": "CC-BY-4.0",
@ -209,6 +219,16 @@
"https://github.com/FortAwesome/Font-Awesome"
]
},
{
"path": "fas-jar.svg",
"license": "CC-BY 4.0",
"authors": [
"Font-Awesome icon set"
],
"sources": [
"https://github.com/FortAwesome/Font-Awesome"
]
},
{
"path": "fas-key.svg",
"license": "CC-BY-4.0",
@ -299,6 +319,16 @@
"https://github.com/FortAwesome/Font-Awesome"
]
},
{
"path": "fas-plate-wheat.svg",
"license": "CC-BY 4.0",
"authors": [
"Font-Awesome icon set"
],
"sources": [
"https://github.com/FortAwesome/Font-Awesome"
]
},
{
"path": "fas-plug.svg",
"license": "CC-BY-4.0",

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

@ -15,9 +15,14 @@
"point",
"centroid"
],
"icon": "square:red;",
"iconSize": "15,15",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "square",
"color": "red"
}
]
}
],
"lineRendering": []

76
assets/layers/indoors/indoors.json
View file

@ -435,43 +435,47 @@
"point",
"centroid"
],
"icon": {
"mappings": [
{
"if": {
"or": [
"room=administration",
"room=auditorium",
"room=bedroom",
"room=chapel",
"room=class",
"room=computer",
"room=conference",
"room=crypt",
"room=kitchen",
"room=laboratory",
"room=library",
"room=locker",
"room=nursery",
"room=office",
"room=prison_cell",
"room=restaurant",
"room=security_check",
"room=sport",
"room=storage",
"room=technical",
"room=toilets",
"room=waiting"
]
},
"then": "./assets/layers/indoors/room_{room}.svg"
},
{
"if": "room=toilet",
"then": "./assets/layers/indoors/room_toilets.svg"
"marker": [
{
"icon": {
"mappings": [
{
"if": {
"or": [
"room=administration",
"room=auditorium",
"room=bedroom",
"room=chapel",
"room=class",
"room=computer",
"room=conference",
"room=crypt",
"room=kitchen",
"room=laboratory",
"room=library",
"room=locker",
"room=nursery",
"room=office",
"room=prison_cell",
"room=restaurant",
"room=security_check",
"room=sport",
"room=storage",
"room=technical",
"room=toilets",
"room=waiting"
]
},
"then": "./assets/layers/indoors/room_{room}.svg"
},
{
"if": "room=toilet",
"then": "./assets/layers/indoors/room_toilets.svg"
}
]
}
]
},
}
],
"iconSize": "15,15",
"anchor": "bottom"
}

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

@ -79,12 +79,16 @@
},
"pointRendering": [
{
"icon": "./assets/layers/information_board/board.svg",
"iconSize": "40,40",
"location": [
"point"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/layers/information_board/board.svg"
}
]
}
],
"lineRendering": [

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

@ -396,27 +396,31 @@
"location": [
"point"
],
"icon": {
"render": "./assets/layers/kerbs/KerbIcon.svg",
"mappings": [
{
"if": "kerb=raised",
"then": "./assets/layers/kerbs/raised.svg"
},
{
"if": "kerb=lowered",
"then": "./assets/layers/kerbs/lowered.svg"
},
{
"if": "kerb=flush",
"then": "./assets/layers/kerbs/flush.svg"
},
{
"if": "kerb=no",
"then": "./assets/layers/kerbs/no.svg"
"marker": [
{
"icon": {
"render": "./assets/layers/kerbs/KerbIcon.svg",
"mappings": [
{
"if": "kerb=raised",
"then": "./assets/layers/kerbs/raised.svg"
},
{
"if": "kerb=lowered",
"then": "./assets/layers/kerbs/lowered.svg"
},
{
"if": "kerb=flush",
"then": "./assets/layers/kerbs/flush.svg"
},
{
"if": "kerb=no",
"then": "./assets/layers/kerbs/no.svg"
}
]
}
]
}
}
]
}
],
"lineRendering": [

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

@ -186,18 +186,22 @@
}
]
},
"icon": {
"mappings": [
{
"if": "amenity=kindergarten",
"then": "circle:white;./assets/layers/kindergarten_childcare/kindergarten.svg"
},
{
"if": "amenity=childcare",
"then": "circle:white;./assets/layers/kindergarten_childcare/childcare.svg"
"marker": [
{
"icon": {
"mappings": [
{
"if": "amenity=kindergarten",
"then": "circle:white;./assets/layers/kindergarten_childcare/kindergarten.svg"
},
{
"if": "amenity=childcare",
"then": "circle:white;./assets/layers/kindergarten_childcare/childcare.svg"
}
]
}
]
}
}
]
}
],
"lineRendering": [

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

@ -88,24 +88,28 @@
],
"pointRendering": [
{
"icon": {
"mappings": [
{
"if": {
"and": [
"has_note_layer=yes",
"has_presets=no"
]
},
"then": "./assets/svg/note.svg"
},
{
"if": "number_of_presets=1",
"then": "{first_preset}"
"marker": [
{
"icon": {
"mappings": [
{
"if": {
"and": [
"has_note_layer=yes",
"has_presets=no"
]
},
"then": "./assets/svg/note.svg"
},
{
"if": "number_of_presets=1",
"then": "{first_preset}"
}
],
"render": "<div class='relative'> <img src='./assets/svg/add_pin.svg' class='absolute' style='height: 50px'> <div class='absolute top-0 left-0 rounded-full overflow-hidden noselect' style='width: 40px; height: 40px'><div class='flex slide min-w-min' style='animation: slide linear {number_of_presets}s infinite; width: calc( (1 + {number_of_presets}) * 40px ); height: 40px'>{renderings}{first_preset}</div></div></div>"
}
],
"render": "<div class='relative'> <img src='./assets/svg/add_pin.svg' class='absolute' style='height: 50px'> <div class='absolute top-0 left-0 rounded-full overflow-hidden noselect' style='width: 40px; height: 40px'><div class='flex slide min-w-min' style='animation: slide linear {number_of_presets}s infinite; width: calc( (1 + {number_of_presets}) * 40px ); height: 40px'>{renderings}{first_preset}</div></div></div>"
},
}
],
"labelCssClasses": "text-sm min-w-min px-2 rounded-full text-white opacity-65 whitespace-nowrap block-ruby",
"labelCss": "background: #00000088",
"label": {

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

@ -350,37 +350,41 @@
},
"pointRendering": [
{
"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"
"marker": [
{
"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": "50,50",
"location": [
"point",

77
assets/layers/maproulette/maproulette.json
View file

@ -309,43 +309,48 @@
"point",
"centroid"
],
"icon": {
"render": "./assets/layers/maproulette/logomark.svg",
"mappings": [
{
"if": "status=0",
"then": "pin:#959DFF"
},
{
"if": "status=1",
"then": "pin:#65D2DA"
},
{
"if": "status=2",
"then": "pin:#F7BB59"
},
{
"if": "status=3",
"then": "pin:#F7BB59"
},
{
"if": "status=4",
"then": "pin:#737373"
},
{
"if": "status=5",
"then": "pin:#CCB186"
},
{
"if": "status=6",
"then": "pin:#FF5E63"
},
{
"if": "status=9",
"then": "pin:#FF349C"
"marker": [
{
"icon": "pin",
"color": {
"render": "#00",
"mappings": [
{
"if": "status=0",
"then": "#959DFF"
},
{
"if": "status=1",
"then": "#65D2DA"
},
{
"if": "status=2",
"then": "#F7BB59"
},
{
"if": "status=3",
"then": "#F7BB59"
},
{
"if": "status=4",
"then": "#737373"
},
{
"if": "status=5",
"then": "#CCB186"
},
{
"if": "status=6",
"then": "#FF5E63"
},
{
"if": "status=9",
"then": "#FF349C"
}
]
}
]
},
}
],
"iconSize": "40,40",
"anchor": "bottom"
}

94
assets/layers/maproulette_challenge/maproulette_challenge.json
View file

@ -204,43 +204,67 @@
"point",
"centroid"
],
"icon": {
"render": "./assets/layers/maproulette/logomark.svg",
"mappings": [
{
"if": "mr_taskStatus=Created",
"then": "pin:#959DFF"
"marker": [
{
"color": {
"mappings": [
{
"if": "mr_taskStatus=Created",
"then": "#959DFF"
},
{
"if": "mr_taskStatus=Fixed",
"then": "#65D2DA"
},
{
"if": "mr_taskStatus=False positive",
"then": "#F7BB59"
},
{
"if": "mr_taskStatus=Skipped",
"then": "#F7BB59"
},
{
"if": "mr_taskStatus=Deleted",
"then": "#737373"
},
{
"if": "mr_taskStatus=Already fixed",
"then": "#CCB186"
},
{
"if": "mr_taskStatus=Too hard",
"then": "#FF5E63"
},
{
"if": "mr_taskStatus=Disabled",
"then": "#FF349C"
}
]
},
{
"if": "mr_taskStatus=Fixed",
"then": "pin:#65D2DA"
},
{
"if": "mr_taskStatus=False positive",
"then": "pin:#F7BB59"
},
{
"if": "mr_taskStatus=Skipped",
"then": "pin:#F7BB59"
},
{
"if": "mr_taskStatus=Deleted",
"then": "pin:#737373"
},
{
"if": "mr_taskStatus=Already fixed",
"then": "pin:#CCB186"
},
{
"if": "mr_taskStatus=Too hard",
"then": "pin:#FF5E63"
},
{
"if": "mr_taskStatus=Disabled",
"then": "pin:#FF349C"
"icon": {
"render": "./assets/layers/maproulette/logomark.svg",
"mappings": [
{
"if": {
"or": [
"mr_taskStatus=Created",
"mr_taskStatus=Fixed",
"mr_taskStatus=False positive",
"mr_taskStatus=Skipped",
"mr_taskStatus=Deleted",
"mr_taskStatus=Already fixed",
"mr_taskStatus=Already fixed",
"mr_taskStatus=Disabled",
"mr_taskStatus=Too hard"
]
},
"then": "pin"
}
]
}
]
},
}
],
"iconSize": "40,40",
"anchor": "bottom"
}

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

@ -175,19 +175,23 @@
],
"pointRendering": [
{
"icon": {
"render": null,
"mappings": [
{
"if": "maxspeed~[1-9]0|1[0-4]0",
"then": "./assets/themes/maxspeed/maxspeed_{maxspeed} mph.svg"
},
{
"if": "maxspeed~[1-9]0|1[0-4]0 mph",
"then": "./assets/themes/maxspeed/maxspeed_{maxspeed}.svg"
"marker": [
{
"icon": {
"render": null,
"mappings": [
{
"if": "maxspeed~[1-9]0|1[0-4]0",
"then": "./assets/themes/maxspeed/maxspeed_{maxspeed} mph.svg"
},
{
"if": "maxspeed~[1-9]0|1[0-4]0 mph",
"then": "./assets/themes/maxspeed/maxspeed_{maxspeed}.svg"
}
]
}
]
},
}
],
"iconSize": "32,32",
"location": [
"point",

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

@ -41,7 +41,15 @@
"centroid",
"point"
],
"icon": "circle:white;./assets/layers/memorial/plaque.svg"
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/memorial/plaque.svg"
}
]
}
],
"lineRendering": []

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

@ -537,13 +537,17 @@
],
"pointRendering": [
{
"icon": "./assets/layers/nature_reserve/nature_reserve.svg",
"iconSize": "50,50",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/layers/nature_reserve/nature_reserve.svg"
}
]
}
],
"lineRendering": [

20
assets/layers/note/note.json
View file

@ -339,15 +339,19 @@
"point",
"centroid"
],
"icon": {
"render": "note",
"mappings": [
{
"if": "closed_at~*",
"then": "resolved"
"marker": [
{
"icon": {
"render": "note",
"mappings": [
{
"if": "closed_at~*",
"then": "resolved"
}
]
}
]
},
}
],
"iconSize": "40,40",
"iconBadges": [
{

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

@ -346,13 +346,21 @@
},
"pointRendering": [
{
"icon": "circle:white;./assets/layers/observation_tower/Tower_observation.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/observation_tower/Tower_observation.svg"
}
]
}
],
"lineRendering": []

12
assets/layers/osm_community_index/osm_community_index.json
View file

@ -154,12 +154,20 @@
},
"pointRendering": [
{
"icon": "pin:#6BC4F7;./assets/layers/osm_community_index/osm.svg",
"iconSize": "40,40",
"location": [
"point"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "pin",
"color": "#6BC4F7"
},
{
"icon": "./assets/layers/osm_community_index/osm.svg"
}
]
}
],
"lineRendering": [

12
assets/layers/parcel_lockers/parcel_lockers.json
View file

@ -304,7 +304,6 @@
"deletion": true,
"pointRendering": [
{
"icon": "square:white;./assets/layers/parcel_lockers/parcel_lockers.svg",
"iconBadges": [
{
"if": "opening_hours~*",
@ -316,7 +315,16 @@
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "square",
"color": "white"
},
{
"icon": "./assets/layers/parcel_lockers/parcel_lockers.svg"
}
]
}
],
"lineRendering": []

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

@ -280,7 +280,6 @@
},
"pointRendering": [
{
"icon": "./assets/layers/parking/parking.svg",
"iconSize": "36,36",
"location": [
"point",
@ -297,7 +296,12 @@
"then": "circle:white;./assets/layers/toilet/wheelchair.svg"
}
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/layers/parking/parking.svg"
}
]
}
],
"lineRendering": [

20
assets/layers/parking_spaces/parking_spaces.json
View file

@ -212,15 +212,19 @@
},
"pointRendering": [
{
"icon": {
"render": "./assets/layers/parking_spaces/parking_space.svg",
"mappings": [
{
"if": "parking_space=disabled",
"then": "./assets/layers/toilet/wheelchair.svg"
"marker": [
{
"icon": {
"render": "./assets/layers/parking_spaces/parking_space.svg",
"mappings": [
{
"if": "parking_space=disabled",
"then": "./assets/layers/toilet/wheelchair.svg"
}
]
}
]
},
}
],
"iconSize": "20,20",
"location": [
"point",

12
assets/layers/parking_ticket_machine/parking_ticket_machine.json
View file

@ -91,9 +91,17 @@
"point",
"centroid"
],
"icon": "square:white;./assets/layers/parking_ticket_machine/parking_tickets.svg",
"iconSize": "20,20",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "square",
"color": "white"
},
{
"icon": "./assets/layers/parking_ticket_machine/parking_tickets.svg"
}
]
}
],
"lineRendering": []

6
assets/layers/pedestrian_path/pedestrian_path.json
View file

@ -27,9 +27,13 @@
},
"pointRendering": [
{
"icon": "./assets/svg/bug.svg",
"location": [
"point"
],
"marker": [
{
"icon": "./assets/svg/bug.svg"
}
]
}
],

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

@ -173,7 +173,6 @@
"allowMove": true,
"pointRendering": [
{
"icon": "./assets/layers/pharmacy/pharmacy.svg",
"iconSize": "40,40",
"location": [
"point",
@ -193,7 +192,12 @@
}
]
},
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "./assets/layers/pharmacy/pharmacy.svg"
}
]
}
],
"lineRendering": []

12
assets/layers/physiotherapist/physiotherapist.json
View file

@ -70,13 +70,21 @@
"allowMove": true,
"pointRendering": [
{
"icon": "circle:white;./assets/layers/physiotherapist/doctors.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/physiotherapist/doctors.svg"
}
]
}
],
"lineRendering": []

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

@ -137,13 +137,21 @@
},
"pointRendering": [
{
"icon": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg",
"iconSize": "35,35",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "#e6cf39"
},
{
"icon": "./assets/layers/picnic_table/picnic_table.svg"
}
]
}
],
"lineRendering": []

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

@ -108,13 +108,17 @@
],
"pointRendering": [
{
"icon": "./assets/layers/play_forest/icon.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "./assets/layers/play_forest/icon.svg"
}
]
}
],
"lineRendering": [

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

@ -601,7 +601,6 @@
},
"pointRendering": [
{
"icon": "./assets/themes/playgrounds/playground.svg",
"iconBadges": [
{
"if": {
@ -637,6 +636,11 @@
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "./assets/themes/playgrounds/playground.svg"
}
]
}
],

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

@ -79,13 +79,17 @@
},
"pointRendering": [
{
"icon": "./assets/layers/postboxes/postbox.svg",
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "bottom"
"anchor": "bottom",
"marker": [
{
"icon": "./assets/layers/postboxes/postbox.svg"
}
]
}
],
"lineRendering": [

12
assets/layers/postoffices/postoffices.json
View file

@ -480,7 +480,6 @@
],
"pointRendering": [
{
"icon": "square:white;./assets/layers/postoffices/post_office.svg",
"iconBadges": [
{
"if": "opening_hours~*",
@ -496,7 +495,16 @@
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "square",
"color": "white"
},
{
"icon": "./assets/layers/postoffices/post_office.svg"
}
]
}
],
"lineRendering": [

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

@ -571,7 +571,6 @@
],
"pointRendering": [
{
"icon": "circle:#ffffff;./assets/themes/bookcases/bookcase.svg",
"label": {
"mappings": [
{
@ -583,6 +582,15 @@
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "circle",
"color": "#ffffff"
},
{
"icon": "./assets/themes/bookcases/bookcase.svg"
}
]
}
],

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

@ -76,7 +76,6 @@
],
"pointRendering": [
{
"icon": "./assets/themes/stations/rail-light.svg",
"location": [
"point",
"centroid"
@ -88,7 +87,12 @@
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{ref}</div>"
}
]
}
},
"marker": [
{
"icon": "./assets/themes/stations/rail-light.svg"
}
]
}
],
"lineRendering": [

20
assets/layers/rainbow_crossings/rainbow_crossings.json
View file

@ -113,15 +113,19 @@
],
"pointRendering": [
{
"icon": {
"render": "./assets/themes/rainbow_crossings/crossing.svg",
"mappings": [
{
"if": "surface:colour=rainbow",
"then": "./assets/themes/rainbow_crossings/logo.svg"
"marker": [
{
"icon": {
"render": "./assets/themes/rainbow_crossings/crossing.svg",
"mappings": [
{
"if": "surface:colour=rainbow",
"then": "./assets/themes/rainbow_crossings/logo.svg"
}
]
}
]
},
}
],
"iconSize": "40,40",
"location": [
"point",

12
assets/layers/reception_desk/reception_desk.json
View file

@ -115,9 +115,17 @@
"point",
"centroid"
],
"icon": "circle:white;./assets/layers/reception_desk/reception_desk.svg",
"iconSize": "40,40",
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/reception_desk/reception_desk.svg"
}
]
}
],
"lineRendering": []

430
assets/layers/recycling/recycling.json
View file

@ -1135,219 +1135,6 @@
"point",
"centroid"
],
"icon": {
"render": "circle:white;./assets/layers/recycling/recycling-14.svg",
"mappings": [
{
"if": {
"and": [
"_waste_amount=1",
"recycling:batteries=yes"
]
},
"then": "circle:white;./assets/layers/recycling/batteries.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:beverage_cartons=yes"
]
},
"then": "circle:white;./assets/layers/recycling/beverage_cartons.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:cans=yes"
]
},
"then": "circle:white;./assets/layers/recycling/cans.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:clothes=yes"
]
},
"then": "circle:white;./assets/layers/recycling/clothes.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:cooking_oil=yes"
]
},
"then": "circle:white;./assets/layers/recycling/cooking_oil.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:engine_oil=yes"
]
},
"then": "circle:white;./assets/layers/recycling/engine_oil.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:fluorescent_tubes=yes"
]
},
"then": "circle:white;./assets/layers/recycling/fluorescent_tubes.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:glass=yes"
]
},
"then": "circle:white;./assets/layers/recycling/glass.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:glass_bottles=yes"
]
},
"then": "circle:white;./assets/layers/recycling/glass_bottles.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
{
"or": [
"recycling:green_waste=yes",
"recycling:organic=yes"
]
}
]
},
"then": "circle:white;./assets/layers/recycling/garden_waste.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:light_bulbs=yes"
]
},
"then": "circle:white;./assets/layers/recycling/light_bulbs.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:newspaper=yes"
]
},
"then": "circle:white;./assets/layers/recycling/newspaper.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:paper=yes"
]
},
"then": "circle:white;./assets/layers/recycling/paper.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:plastic_bottles=yes"
]
},
"then": "circle:white;./assets/layers/recycling/plastic_bottles.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:plastic_packaging=yes"
]
},
"then": "circle:white;./assets/layers/recycling/plastic_packaging.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:plastic=yes"
]
},
"then": "circle:white;./assets/layers/recycling/plastic.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:printer_cartridges=yes"
]
},
"then": "circle:white;./assets/layers/recycling/printer_cartridges.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:scrap_metal=yes"
]
},
"then": "circle:white;./assets/layers/recycling/scrap_metal.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:shoes=yes"
]
},
"then": "circle:white;./assets/layers/recycling/shoes.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
{
"or": [
"recycling:small_appliances=yes",
"recycling:small_electric_appliances=yes"
]
}
]
},
"then": "circle:white;./assets/layers/recycling/small_electrical_appliances.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:waste=yes"
]
},
"then": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:needles=yes"
]
},
"then": "circle:white;./assets/layers/recycling/needles.svg"
}
]
},
"iconBadges": [
{
"if": {
@ -1566,6 +1353,223 @@
},
"then": "circle:white;./assets/layers/recycling/bicycles.svg"
}
],
"marker": [
{
"icon": {
"render": "circle:white;./assets/layers/recycling/recycling-14.svg",
"mappings": [
{
"if": {
"and": [
"_waste_amount=1",
"recycling:batteries=yes"
]
},
"then": "circle:white;./assets/layers/recycling/batteries.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:beverage_cartons=yes"
]
},
"then": "circle:white;./assets/layers/recycling/beverage_cartons.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:cans=yes"
]
},
"then": "circle:white;./assets/layers/recycling/cans.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:clothes=yes"
]
},
"then": "circle:white;./assets/layers/recycling/clothes.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:cooking_oil=yes"
]
},
"then": "circle:white;./assets/layers/recycling/cooking_oil.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:engine_oil=yes"
]
},
"then": "circle:white;./assets/layers/recycling/engine_oil.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:fluorescent_tubes=yes"
]
},
"then": "circle:white;./assets/layers/recycling/fluorescent_tubes.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:glass=yes"
]
},
"then": "circle:white;./assets/layers/recycling/glass.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:glass_bottles=yes"
]
},
"then": "circle:white;./assets/layers/recycling/glass_bottles.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
{
"or": [
"recycling:green_waste=yes",
"recycling:organic=yes"
]
}
]
},
"then": "circle:white;./assets/layers/recycling/garden_waste.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:light_bulbs=yes"
]
},
"then": "circle:white;./assets/layers/recycling/light_bulbs.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:newspaper=yes"
]
},
"then": "circle:white;./assets/layers/recycling/newspaper.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:paper=yes"
]
},
"then": "circle:white;./assets/layers/recycling/paper.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:plastic_bottles=yes"
]
},
"then": "circle:white;./assets/layers/recycling/plastic_bottles.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:plastic_packaging=yes"
]
},
"then": "circle:white;./assets/layers/recycling/plastic_packaging.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:plastic=yes"
]
},
"then": "circle:white;./assets/layers/recycling/plastic.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:printer_cartridges=yes"
]
},
"then": "circle:white;./assets/layers/recycling/printer_cartridges.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:scrap_metal=yes"
]
},
"then": "circle:white;./assets/layers/recycling/scrap_metal.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:shoes=yes"
]
},
"then": "circle:white;./assets/layers/recycling/shoes.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
{
"or": [
"recycling:small_appliances=yes",
"recycling:small_electric_appliances=yes"
]
}
]
},
"then": "circle:white;./assets/layers/recycling/small_electrical_appliances.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:waste=yes"
]
},
"then": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:needles=yes"
]
},
"then": "circle:white;./assets/layers/recycling/needles.svg"
}
]
}
}
]
}
],

12
assets/layers/school/school.json
View file

@ -395,7 +395,6 @@
},
"pointRendering": [
{
"icon": "circle:white;./assets/layers/school/school.svg",
"label": {
"mappings": [
{
@ -409,7 +408,16 @@
"point",
"centroid"
],
"anchor": "center"
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/school/school.svg"
}
]
}
],
"lineRendering": [

Some files were not shown because too many files have changed in this diff Show more