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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-18 10:47:58 +02:00
commit 008ed859bb
228 changed files with 778708 additions and 38704 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/themes/bicyclelib/bicyclelib.json
View file

@ -38,7 +38,7 @@
{
"builtin": "bicycle_library",
"override": {
"minZoom": 0
"minzoom": 0
}
}
]

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

@ -34,7 +34,9 @@
"osmTags": {
"or": [
"leisure=nature_reserve",
"boundary=protected_area"
{
"and": ["boundary=protected_area","protect_class!=22"]
}
]
}
},
@ -149,15 +151,7 @@
"_overlapWithUpperLayers=Math.max(...feat.overlapWith('nature_reserve_buurtnatuur').map(o => o.overlap))/feat.area",
"_tooMuchOverlap=Number(feat.properties._overlapWithUpperLayers) > 0.1 ? 'yes' :'no'"
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": "_tooMuchOverlap=yes",
"then": "no"
}
]
},
"isShown": "_tooMuchOverlap!=yes",
"title": {
"render": {
"nl": "Park"
@ -257,15 +251,7 @@
"_overlapWithUpperLayers=Math.max(...feat.overlapWith('parks','nature_reserve_buurtnatuur').map(o => o.overlap))/feat.area",
"_tooMuchOverlap=Number(feat.properties._overlapWithUpperLayers) > 0.1 ? 'yes' : 'no'"
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": "_tooMuchOverlap=yes",
"then": "no"
}
]
},
"isShown": "_tooMuchOverlap!=yes",
"title": {
"render": {
"nl": "Bos"

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

@ -73,15 +73,7 @@
]
}
},
"isShown": {
"render": "yes",
"mappings": [
{
"if": "id!~way/.*",
"then": "no"
}
]
},
"isShown": "id~way/.*",
"description": {
"nl": "Een fietsstraat is een straat waar gemotoriseerd verkeer een fietser niet mag inhalen",
"en": "A cyclestreet is a street where motorized traffic is not allowed to overtake a cyclist",

16
assets/themes/grb_import/grb.json
View file

@ -630,18 +630,10 @@
}
}
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": {
"and": [
"_imported_osm_object_found=true",
"_imported_osm_still_fresh=true"
]
},
"then": "no"
}
"isShown":{
"or": [
"_imported_osm_object_found!=true",
"_imported_osm_still_fresh!=true"
]
},
"mapRendering": [

8
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -283,6 +283,10 @@
"if": "theme=postboxes",
"then": "./assets/themes/postboxes/postbox.svg"
},
{
"if": "theme=rainbow_crossings",
"then": "./assets/themes/rainbow_crossings/logo.svg"
},
{
"if": "theme=shops",
"then": "./assets/themes/shops/shop.svg"
@ -331,6 +335,10 @@
"if": "theme=uk_addresses",
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
},
{
"if": "theme=walls_and_buildings",
"then": "./assets/layers/walls_and_buildings/walls_and_buildings.png"
},
{
"if": "theme=waste",
"then": "./assets/layers/recycling/recycling-14.svg"

40
assets/themes/onwheels/onwheels.json
View file

@ -4,7 +4,7 @@
"en": "OnWheels"
},
"description": {
"en": "On this map, publicly weelchair accessible places are shown and can be easily added"
"en": "On this map, publicly wheelchair accessible places are shown and can be easily added"
},
"maintainer": "MapComplete",
"icon": "./assets/themes/onwheels/crest.svg",
@ -27,12 +27,48 @@
"shops",
"toilet",
"viewpoint",
"doctors"
"doctors",
"walls_and_buildings"
],
"overrideAll": {
<<<<<<< HEAD
"minZoom": "15",
"mapRendering": [
{
=======
"+calculatedTags": [
"_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]",
"_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width"
],
"+tagRenderings": [
{
"id": "_poi_entrance:width",
"condition": "entrance=",
"render": {
"en": "This door has a width of {canonical(_poi_entrance:width)} meter",
"nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter",
"de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter",
"es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros"
},
"freeform": {
"key": "_poi_entrance:width",
"type": "distance"
},
"mappings": [
{
"if": "_poi_entrance:width=",
"then": {
"en": "This entrance has no width information"
}
}
]
}
],
"minzoom": "15",
"mapRendering": [
{
>>>>>>> develop
"label": null
}
]

20
assets/themes/postal_codes/postal_codes.json
View file

@ -117,15 +117,7 @@
"dashArray": "8 8"
}
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": "_country!=be",
"then": "no"
}
]
}
"isShown": "_country=be"
},
{
"id": "wrong_postal_code",
@ -196,15 +188,7 @@
]
}
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": "_country!=be",
"then": "no"
}
]
}
"isShown": "_country=be"
}
]
}

68
assets/themes/rainbow_crossings/crossing.svg Normal file
View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 600 600"
width="600"
height="600"
version="1.1"
id="svg20"
sodipodi:docname="crossing.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs24" />
<sodipodi:namedview
id="namedview22"
pagecolor="#ffffff"
bordercolor="#111111"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
showgrid="false"
inkscape:zoom="0.75881737"
inkscape:cx="-111.35749"
inkscape:cy="312.32812"
inkscape:window-width="1920"
inkscape:window-height="1007"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg20" />
<rect
style="fill:#959a99;fill-opacity:1;stroke-linecap:round"
id="rect845"
width="602.2915"
height="602.07373"
x="-1.5249536"
y="-1.9649721" />
<rect
x="51.805016"
y="120.82925"
width="100"
height="400"
fill="#ffffff"
stroke-width="2"
stroke="#000000"
id="rect14" />
<rect
x="251.80501"
y="120.82925"
width="100"
height="400"
fill="#ffffff"
stroke-width="2"
stroke="#000000"
id="rect16" />
<rect
x="451.80502"
y="120.82925"
width="100"
height="400"
fill="#ffffff"
stroke-width="2"
stroke="#000000"
id="rect18" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

18
assets/themes/rainbow_crossings/license_info.json Normal file
View file

@ -0,0 +1,18 @@
[
{
"path": "crossing.svg",
"license": "CC0",
"authors": [
"bxl-forever"
],
"sources": []
},
{
"path": "logo.svg",
"license": "CC0",
"authors": [
"bxl-forever"
],
"sources": []
}
]

12
assets/themes/rainbow_crossings/logo.svg Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600" viewBox="0 0 600 600">
<rect fill="#750787" width="600" height="600" />
<rect fill="#004dff" width="500" height="600" />
<rect fill="#008026" width="400" height="600" />
<rect fill="#ffed00" width="300" height="600" />
<rect fill="#ff8c00" width="200" height="600" />
<rect fill="#e40303" width="100" height="600" />
<rect x="50" y="100" width="100" height="400" fill="#ffffff" stroke-width="2" stroke="#000000"></rect>
<rect x="250" y="100" width="100" height="400" fill="#ffffff" stroke-width="2" stroke="#000000"></rect>
<rect x="450" y="100" width="100" height="400" fill="#ffffff" stroke-width="2" stroke="#000000"></rect>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 758 B

43
assets/themes/rainbow_crossings/rainbow_crossings.json Normal file
View file

@ -0,0 +1,43 @@
{
"id": "rainbow_crossings",
"title": {
"en": "Rainbow pedestrian crossings"
},
"description": {
"en": "On this map, rainbow-painted pedestrian crossings are shown and can be easily added"
},
"maintainer": "",
"icon": "./assets/themes/rainbow_crossings/logo.svg",
"version": "0",
"startLat": 50.8465573,
"defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"widenFactor": 2,
"layers": [
{
"builtin": "rainbow_crossings",
"override": {
"minzoom": 10,
"id": "rainbow_crossing_high_zoom",
"name": null,
"=presets": [],
"source": {
"osmTags": {
"and+": [
"crossing:marking=rainbow"
]
}
}
}
},
"rainbow_crossings",
{
"builtin": "cycleways_and_roads",
"override": {
"minzoom": 18,
"name": null
}
}
]
}

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

@ -288,14 +288,6 @@
"then": "./assets/themes/speelplekken/youtube.svg"
}
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": "_is_shadowed=yes",
"then": "no"
}
]
}
"isShown":"_is_shadowed!=yes"
}
}

4
assets/themes/street_lighting/street_lighting.json
View file

@ -51,7 +51,7 @@
]
}
},
"minZoom": 16,
"minzoom": 16,
"title": {
"render": {
"en": "Lit street",
@ -171,7 +171,7 @@
]
}
},
"minZoom": 19,
"minzoom": 19,
"title": {
"render": {
"en": "Street",

21
assets/themes/walls_and_buildings/walls_and_buildings.json Normal file
View file

@ -0,0 +1,21 @@
{
"id": "walls_and_buildings",
"title": {
"en": "Walls and buildings"
},
"description": {
"en": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user."
},
"maintainer": "MapComplete",
"icon": "./assets/layers/walls_and_buildings/walls_and_buildings.png",
"version": "0",
"startLat": 50.8465573,
"defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"widenFactor": 2,
"layers": [
"walls_and_buildings",
"entrance"
]
}