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 2023-10-14 22:41:52 +02:00
commit 2001ef09bf
50 changed files with 1443 additions and 1341 deletions
Download patch file Download diff file Expand all files Collapse all files

53
assets/layers/guidepost/guidepost.json Normal file
View file

@ -0,0 +1,53 @@
{
"id": "guidepost",
"name": {
"en": "Guideposts"
},
"description": {
"en": "Guideposts (also known as fingerposts or finger posts) are often found along official hiking/cycling/riding/skiing routes to indicate the directions to different destinations"
},
"source": {
"osmTags": "information=guidepost"
},
"minzoom": 14,
"presets": [
{
"title": {
"en": "a guidepost"
},
"tags": [
"information=guidepost",
"tourism=information"
],
"description": {
"en": "A guidepost (also known as fingerpost) is often found along official hiking/cycling/riding/skiing routes to indicate the directions to different destinations"
},
"exampleImages": [
"./assets/layers/guidepost/guidepost_example.jpg"
]
}
],
"deletion": true,
"allowMove": {
"enableImproveAccuracy": "true",
"enableRelocation": "false"
},
"title": {
"render": {
"en": "Guidepost"
}
},
"mapRendering": [
{
"location": [
"centroid",
"point"
],
"icon": "./assets/layers/guidepost/guidepost.svg",
"anchor": "bottom"
}
],
"tagRenderings": [
"images"
]
}

61
assets/layers/guidepost/guidepost.svg Normal file
View file

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
width="500"
height="500"
viewBox="0 0 500 500"
id="svg2"
sodipodi:docname="guidepost.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"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<sodipodi:namedview
id="namedview7"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="0.4932029"
inkscape:cx="111.51597"
inkscape:cy="276.76236"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<rect
width="499.41919"
height="499.41919"
x="0"
y="0"
id="canvas"
style="visibility:hidden;fill:none;stroke:none;stroke-width:35.6728" />
<path
d="m 249.7096,8.9181999 c -13.3773,0 -26.7546,8.9182001 -26.7546,26.7546001 v 463.74639 h 53.5092 V 35.6728 c 0,-17.8364 -13.3773,-26.7546001 -26.7546,-26.7546001 z M 71.345599,35.6728 0,89.181999 71.345599,142.6912 H 214.0368 V 35.6728 Z M 285.3824,142.6912 v 107.0184 h 142.6912 l 71.34559,-53.5092 -71.34559,-53.5092 z"
id="guidepost"
style="fill:#555555;fill-opacity:1;stroke:none;stroke-width:35.6728" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

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

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: OSM Carto
SPDX-License-Identifier: CC0-1.0

BIN
assets/layers/guidepost/guidepost_example.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 78 KiB

2
assets/layers/guidepost/guidepost_example.jpg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Mschaeuble
SPDX-License-Identifier: CC0-1.0

22
assets/layers/guidepost/license_info.json Normal file
View file

@ -0,0 +1,22 @@
[
{
"path": "guidepost.svg",
"license": "CC0-1.0",
"authors": [
"OSM Carto"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Guidepost-14.svg"
]
},
{
"path": "guidepost_example.jpg",
"license": "CC0-1.0",
"authors": [
"Mschaeuble"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Signpost.jpg"
]
}
]

2
assets/layers/guidepost/signpost_example.jpg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Mschaeuble
SPDX-License-Identifier: CC0-1.0

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

@ -20,7 +20,7 @@
]
}
},
"minzoom": 19,
"minzoom": 18,
"title": {
"render": {
"en": "Ticket Machine",

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

@ -13,7 +13,7 @@
"source": {
"osmTags": "amenity=ticket_validator"
},
"minzoom": 19,
"minzoom": 18,
"title": {
"render": {
"en": "Ticket Validator",

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

@ -47,7 +47,7 @@
"osmTags": "building~*",
"maxCacheAge": 0
},
"minzoom": 19,
"minzoom": 18,
"calculatedTags": [
"_surface:strict:=feat(get)('_surface')"
],
@ -154,7 +154,7 @@
},
"maxCacheAge": 0
},
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"label": {
@ -194,7 +194,7 @@
"osmTags": "identificatie~*",
"maxCacheAge": 0
},
"minzoom": 19,
"minzoom": 18,
"calculatedTags": [
"_overlaps_with_buildings=overlapWith(feat)('osm:buildings').filter(f => f.feat.properties.id.indexOf('-') < 0)",
"_overlaps_with=feat(get)('_overlaps_with_buildings').find(f => f.overlap > 1 /* square meter */ )",
@ -379,7 +379,7 @@
"osmTags": "identificatie~*",
"maxCacheAge": 0
},
"minzoom": 19,
"minzoom": 18,
"calculatedTags": [
"_closed_osm_addr:=closest(feat)('osm:adresses').properties",
"_bag_obj:addr:housenumber=`${feat.properties.huisnummer}${feat.properties.huisletter}${(feat.properties.toevoeging != '') ? '-' : ''}${feat.properties.toevoeging}`",
@ -427,4 +427,4 @@
}
],
"hideFromOverview": true
}
}

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

@ -68,7 +68,7 @@
{
"builtin": "kerbs",
"override": {
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"iconBadges": [
@ -112,4 +112,4 @@
},
"stairs"
]
}
}

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

@ -464,10 +464,14 @@
{
"builtin": [
"toilet",
"drinking_water"
"drinking_water",
"guidepost"
],
"override": {
"minzoom": 15
"minzoom": 15,
"mapRendering": [{
"iconSize": "30,30"
}]
}
}
],

14
assets/themes/guideposts/guideposts.json Normal file
View file

@ -0,0 +1,14 @@
{
"id": "guideposts",
"title": {
"en": "Guideposts"
},
"description": {
"en": "Guideposts (also known as fingerposts or finger posts) are often found along official hiking, cycling, skiing or horseback riding routes to indicate the directions to different destinations. Additionally, they are often named after a region or place and show the altitude.\n\nThe position of a signpost can be used by a hiker/biker/rider/skier as a confirmation of the current position, especially if they use a printed map without a GPS receiver. "
},
"icon": "./assets/layers/guidepost/guidepost.svg",
"startZoom": 2,
"layers": [
"guidepost"
]
}

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

@ -111,8 +111,8 @@
"=presets": [],
"=name": null,
"override": {
"minzoom": 19
"minzoom": 18
}
}
]
}
}

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

@ -32,7 +32,7 @@
{
"builtin": "indoors",
"override": {
"minzoom": 19,
"minzoom": 18,
"name": null,
"passAllFeatures": true
}
@ -43,7 +43,7 @@
"name": null,
"tagRendering": null,
"title": "null",
"minzoom": 19,
"minzoom": 18,
"shownByDefault": false
}
},
@ -71,7 +71,7 @@
{
"builtin": "entrance",
"override": {
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/onwheels/entrance.svg"
@ -131,7 +131,7 @@
{
"builtin": "kerbs",
"override": {
"minzoom": 19,
"minzoom": 18,
"syncSelection": "theme-only",
"mapRendering": [
{
@ -289,7 +289,7 @@
{
"builtin": "toilet",
"override": {
"minzoom": 19,
"minzoom": 18,
"syncSelection": "theme-only",
"mapRendering": [
{
@ -349,7 +349,7 @@
{
"builtin": "reception_desk",
"override": {
"minzoom": 19,
"minzoom": 18,
"syncSelection": "theme-only"
}
},
@ -357,7 +357,7 @@
{
"builtin": "elevator",
"override": {
"minzoom": 19,
"minzoom": 18,
"syncSelection": "theme-only",
"mapRendering": [
{
@ -524,4 +524,4 @@
]
},
"enableDownload": true
}
}

6
assets/themes/pets/pets.json
View file

@ -165,7 +165,7 @@
{
"builtin": "food",
"override": {
"minzoom": 19,
"minzoom": 18,
"filter": null,
"name": null
}
@ -181,7 +181,7 @@
{
"builtin": "shops",
"override": {
"minzoom": 19,
"minzoom": 18,
"filter": null,
"presets": [
{
@ -220,4 +220,4 @@
}
],
"credits": "Niels Elgaard Larsen"
}
}

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

@ -32,7 +32,7 @@
{
"builtin": "indoors",
"override": {
"minzoom": 19,
"minzoom": 18,
"passAllFeatures": true,
"mapRendering": [
{},
@ -50,7 +50,7 @@
{
"builtin": "stairs",
"override": {
"minzoom": 19
"minzoom": 18
}
},
{
@ -130,7 +130,7 @@
]
},
"presets": null,
"minzoom": 19
"minzoom": 18
}
},
{
@ -143,7 +143,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/stations/bicycle_parking.svg"
@ -161,7 +161,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/stations/rental_bicycle.svg"
@ -179,7 +179,7 @@
]
},
"presets": null,
"minzoom": 19
"minzoom": 18
}
},
{
@ -195,7 +195,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering+": [
{
"color": "#00f",
@ -214,7 +214,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering+": [
{
"color": "yellow",
@ -235,13 +235,13 @@
"clock"
],
"override": {
"minzoom": 19
"minzoom": 18
}
},
{
"builtin": "bench",
"override": {
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "./assets/themes/stations/bench.svg"
@ -252,7 +252,7 @@
{
"builtin": "drinking_water",
"override": {
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/stations/drinking_water.svg"
@ -293,7 +293,7 @@
"zh_Hant": "時刻表"
}
},
"minzoom": 19,
"minzoom": 18,
"source": {
"osmTags": {
"and": [
@ -412,4 +412,4 @@
]
}
]
}
}

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

@ -221,7 +221,7 @@
]
}
},
"minzoom": 19,
"minzoom": 18,
"title": {
"render": {
"en": "Street",
@ -361,4 +361,4 @@
}
],
"credits": "Robin van der Linde"
}
}

11
assets/themes/transit/transit.json
View file

@ -36,22 +36,19 @@
{
"builtin": "bike_parking",
"override": {
"minzoom": 19,
"minzoomVisible": 19
"minzoom": 18
}
},
{
"builtin": "parking",
"override": {
"minzoom": 19,
"minzoomVisible": 19
"minzoom": 18
}
},
{
"builtin": "shelter",
"override": {
"minzoom": 19,
"minzoomVisible": 19,
"minzoom": 18,
"source": {
"osmTags": {
"and": [
@ -67,4 +64,4 @@
}
],
"credits": "Robin van der Linde"
}
}

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

@ -32,7 +32,7 @@
51.190748429411705
]
],
"defaultBackgroundId": "CartoDB.DarkMatterNoLabels",
"defaultBackgroundId": "alidade.smooth_dark",
"layers": [
{
"id": "street_with_width",
@ -271,4 +271,4 @@
]
}
]
}
}