Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix more themes

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-11-13 12:46:15 +01:00
parent d2a813b009
commit 255347fc06
16 changed files with 303 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/layers/named_streets/named_streets.json
View file

@ -11,7 +11,7 @@
},
"minzoom": 18,
"shownByDefault": false,
"pointRendering": [],
"pointRendering": null,
"lineRendering": [
{
"color": "#ccc",

10
assets/layers/stairs/license_info.json
View file

@ -6,5 +6,15 @@
"Robin van der Linde"
],
"sources": []
},
{
"path": "stairs.svg",
"license": "CC-BY SA 4.0",
"authors": [
" \tFont Awesome"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Stairs-solid.svg"
]
}
]

17
assets/layers/stairs/stairs.json
View file

@ -39,7 +39,22 @@
}
]
},
"pointRendering": [],
"pointRendering": [
{
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/stairs/stairs.svg"
}
],
"location": [
"point"
]
}
],
"lineRendering": [
{
"color": "gray",

1
assets/layers/stairs/stairs.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M384 64c0-17.7 14.3-32 32-32H544c17.7 0 32 14.3 32 32s-14.3 32-32 32H448v96c0 17.7-14.3 32-32 32H320v96c0 17.7-14.3 32-32 32H192v96c0 17.7-14.3 32-32 32H32c-17.7 0-32-14.3-32-32s14.3-32 32-32h96V320c0-17.7 14.3-32 32-32h96V192c0-17.7 14.3-32 32-32h96V64z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 502 B

2
assets/layers/stairs/stairs.svg.license Normal file
View file

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

2
assets/layers/transit_routes/transit_routes.json
View file

@ -63,7 +63,7 @@
},
"icons.defaults"
],
"pointRendering": [],
"pointRendering": null,
"lineRendering": [
{
"color": {

2
assets/layers/walls_and_buildings/walls_and_buildings.json
View file

@ -43,7 +43,7 @@
"cs": "Zeď nebo budova"
}
},
"pointRendering": [],
"pointRendering": null,
"lineRendering": [
{
"color": "#fff",

44
assets/themes/bag/bag.json
View file

@ -101,9 +101,49 @@
"question": "What kind of building is this?"
}
],
"pointRendering": [],
"pointRendering": null,
"lineRendering": [
{}
{
"width": {
"render": "2",
"mappings": [
{
"if": "fixme~*",
"then": "5"
}
]
},
"color": {
"render": "#00c",
"mappings": [
{
"if": "fixme~*",
"then": "#ff00ff"
},
{
"if": "building=house",
"then": "#a00"
},
{
"if": "building=shed",
"then": "#563e02"
},
{
"if": {
"or": [
"building=garage",
"building=garages"
]
},
"then": "#f9bfbb"
},
{
"if": "building=yes",
"then": "#0774f2"
}
]
}
}
]
},
{

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

@ -910,9 +910,42 @@
}
}
],
"pointRendering": [],
"pointRendering": [
{
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": {
"render": "./assets/themes/campersite/caravan.svg",
"mappings": [
{
"if": {
"and": [
"fee=no"
]
},
"then": "./assets/themes/campersite/caravan_green.svg"
}
]
}
}
],
"iconSize": "40,40",
"location": [
"point",
"centroid"
],
"anchor": "center"
}
],
"lineRendering": [
{}
{
"color": "#00f",
"width": "8"
}
]
},
{
@ -1510,9 +1543,29 @@
}
}
],
"pointRendering": [],
"pointRendering": [
{
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/themes/campersite/sanitary_dump_station.svg"
}
],
"iconSize": "32,32",
"location": [
"point"
],
"anchor": "center"
}
],
"lineRendering": [
{}
{
"color": "#00f",
"width": "8"
}
]
}
],
@ -1623,4 +1676,4 @@
]
},
"widenFactor": 1.5
}
}

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

@ -228,9 +228,41 @@
]
}
],
"pointRendering": [],
"pointRendering": null,
"lineRendering": [
{}
{
"color": {
"render": "#ff7392",
"mappings": [
{
"if": "state=",
"then": "#00acfc"
},
{
"if": "state=temporary",
"then": "#00acfc"
}
]
},
"width": "4",
"dashArray": {
"render": "",
"mappings": [
{
"if": "state=temporary",
"then": "12 10"
},
{
"if": "note:state=has_highway_no",
"then": "0 8"
},
{
"if": "note:state=has_highway_under_construction",
"then": "12 10"
}
]
}
}
]
}
],
@ -242,4 +274,4 @@
"clustering": {
"maxZoom": 1
}
}
}

3
assets/themes/cyclenodes/cyclenodes.json
View file

@ -114,7 +114,8 @@
"width": "4",
"color": "#00a703"
}
]
],
"pointRendering":null
},
{
"id": "node",

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

@ -103,9 +103,74 @@
"tagRenderings": [
"images"
],
"pointRendering": [],
"pointRendering": [
{
"marker": [
{
"icon": {
"render": "./assets/themes/cyclestreets/F111.svg",
"mappings": [
{
"if": "traffic_sign=DE:244.1,1020-30",
"then": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg"
},
{
"if": "traffic_sign=DE:244.1,1022-12,1024-10",
"then": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg"
},
{
"if": "traffic_sign=DE:244.1,1022-12",
"then": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg"
},
{
"if": "traffic_sign=DE:244.1,1024-10",
"then": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg"
},
{
"if": "_country=de",
"then": "./assets/themes/cyclestreets/Zeichen_244.svg"
},
{
"if": "_country=fi",
"then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg"
}
]
}
}
],
"iconSize": {
"render": "40,40,center",
"mappings": [
{
"if": {
"or": [
"traffic_sign=DE:244.1,1020-30",
"traffic_sign=DE:244.1,1022-12,1024-10"
]
},
"then": "40,62,center"
},
{
"if": {
"or": [
"traffic_sign=DE:244.1,1022-12",
"traffic_sign=DE:244.1,1024-10"
]
},
"then": "40,70,center"
}
]
},
"location": [
"projected_centerpoint"
]
}
],
"lineRendering": [
{}
{
"color": "#0000ff",
"width": "10"
}
]
},
{
@ -193,9 +258,35 @@
"tagRenderings": [
"images"
],
"pointRendering": [],
"pointRendering": [
{
"marker": [
{
"icon": {
"render": "./assets/themes/cyclestreets/F113.svg",
"mappings": [
{
"if": "_country=de",
"then": "./assets/themes/cyclestreets/Zeichen_244a.svg"
},
{
"if": "_country=fi",
"then": "./assets/themes/cyclestreets/Finland_road_sign_E29.svg"
}
]
}
}
],
"location": [
"projected_centerpoint"
]
}
],
"lineRendering": [
{}
{
"color": "#09f9dd",
"width": "5"
}
]
},
{
@ -273,9 +364,45 @@
"tagRenderings": [
"images"
],
"pointRendering": [],
"pointRendering": [
{
"marker": [
{
"icon": "./assets/svg/pencil.svg"
}
],
"location": [
"projected_centerpoint"
]
}
],
"lineRendering": [
{}
{
"color": {
"render": "#aaaaaa",
"mappings": [
{
"then": "#0000ff",
"if": {
"or": [
"cyclestreet=yes",
"bicycle_road=yes"
]
}
},
{
"then": "#09f9dd",
"if": {
"or": [
"proposed:cyclestreet=yes",
"proposed:bicycle_road=yes"
]
}
}
]
},
"width": "5"
}
]
}
],
@ -646,4 +773,4 @@
"maxZoom": 12,
"minNeededElements": 200
}
}
}

9
assets/themes/fruit_trees/fruit_tree.svg
View file

File diff suppressed because one or more lines are too long
Side by side

Before

Width:  |  Height:  |  Size: 9.1 KiB

2
assets/themes/fruit_trees/fruit_tree.svg.license
View file

@ -1,2 +0,0 @@
SPDX-FileCopyrightText: The Noun Project
SPDX-License-Identifier: CC0-1.0

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

@ -1,151 +0,0 @@
{
"id": "fruit_trees",
"title": {
"nl": "Open Boomgaardenkaart"
},
"description": {
"nl": "Op deze kaart vindt je boomgaarden en fruitbomen"
},
"shortDescription": {
"nl": "Boomgaarden en fruitbomen"
},
"icon": "./assets/themes/fruit_trees/fruit_tree.svg",
"hideFromOverview": true,
"layers": [
{
"id": "orchards",
"name": {
"nl": "Boomgaarden"
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
"landuse=orchard"
]
}
},
"title": {
"render": {
"nl": "Boomgaard"
}
},
"tagRenderings": [
"images"
],
"presets": [
{
"tags": [
"landuse=orchard",
"fixme=Added with mapcomplete - geometry still to draw"
],
"title": {
"nl": "een boomgaard"
},
"description": {
"nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
}
}
],
"pointRendering": [],
"lineRendering": [
{}
]
},
{
"id": "fruitboom",
"name": {
"nl": "Boom"
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
"natural=tree"
]
}
},
"title": {
"render": {
"nl": "Boom"
}
},
"description": {
"nl": "Een boom"
},
"tagRenderings": [
{
"render": {
"nl": "De soort is {species:nl}"
},
"question": {
"nl": "Wat is de soort van deze boom (in het Nederlands)?"
},
"freeform": {
"key": "species:nl"
},
"id": "fruitboom-species:nl"
},
{
"render": {
"nl": "Het ras (taxon) van deze boom is <b>{taxon}</b>"
},
"question": {
"nl": "Wat is het taxon (ras) van deze boom?"
},
"freeform": {
"key": "taxon"
},
"condition": {
"and": [
"species:nl~*"
]
},
"id": "fruitboom-taxon"
},
{
"render": {
"nl": "Beschrijving: <i>{description}</i>"
},
"question": {
"nl": "Welke beschrijving past bij deze boom?"
},
"freeform": {
"key": "description"
},
"id": "fruitboom-description"
},
{
"render": {
"nl": "Referentienummer: <b>{ref}</b>"
},
"question": {
"nl": "Is er een refernetienummer?"
},
"freeform": {
"key": "ref"
},
"id": "fruitboom-ref"
}
],
"presets": [
{
"tags": [
"natural=tree"
],
"title": {
"nl": "een boom"
},
"description": {
"nl": "Voeg hier een boom toe"
}
}
],
"pointRendering": [],
"lineRendering": [
{}
]
}
],
"widenFactor": 2
}

12
assets/themes/fruit_trees/license_info.json
View file

@ -1,12 +0,0 @@
[
{
"path": "fruit_tree.svg",
"license": "CC0-1.0",
"authors": [
"The Noun Project"
],
"sources": [
"https://upload.wikimedia.org/wikipedia/commons/4/4e/Low_Hanging_Fruit_-_The_Noun_Project.svg"
]
}
]