Merge develop

This commit is contained in:
Pieter Vander Vennet 2023-10-11 04:37:19 +02:00
commit e1a785ba9c
34 changed files with 1406 additions and 1306 deletions

View file

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

View file

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

View file

@ -47,7 +47,7 @@
"osmTags": "building~*",
"maxCacheAge": 0
},
"minzoom": 19,
"minzoom": 18,
"calculatedTags": [
"_surface:strict:=feat(get)('_surface')"
],
@ -115,10 +115,23 @@
},
"maxCacheAge": 0
},
"minzoom": 19,
"pointRendering": [],
"lineRendering": [
{}
"minzoom": 18,
"pointRendering": [
{
"label": {
"render": "<div style='color: black' class='rounded-full p-1 font-bold relative'>{addr:housenumber}</div>",
"condition": "addr:housenumber~*"
},
"location": [
"point",
"centroid"
]
},
{
"width": {
"render": 1
}
}
]
},
{
@ -142,7 +155,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 */ )",
@ -309,7 +322,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}`",
@ -339,4 +352,4 @@
}
],
"hideFromOverview": true
}
}

View file

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

View file

@ -468,7 +468,10 @@
"guidepost"
],
"override": {
"minzoom": 15
"minzoom": 15,
"mapRendering": [{
"iconSize": "30,30"
}]
}
}
],

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"
]
}

View file

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

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
}
}

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"
}
}

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
}
},
{
@ -114,7 +114,7 @@
]
},
"presets": null,
"minzoom": 19
"minzoom": 18
}
},
{
@ -127,7 +127,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/stations/bicycle_parking.svg"
@ -145,7 +145,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/stations/rental_bicycle.svg"
@ -163,7 +163,7 @@
]
},
"presets": null,
"minzoom": 19
"minzoom": 18
}
},
{
@ -179,7 +179,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering+": [
{
"color": "#00f",
@ -198,7 +198,7 @@
]
},
"presets": null,
"minzoom": 19,
"minzoom": 18,
"mapRendering+": [
{
"color": "yellow",
@ -219,13 +219,13 @@
"clock"
],
"override": {
"minzoom": 19
"minzoom": 18
}
},
{
"builtin": "bench",
"override": {
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "./assets/themes/stations/bench.svg"
@ -236,7 +236,7 @@
{
"builtin": "drinking_water",
"override": {
"minzoom": 19,
"minzoom": 18,
"mapRendering": [
{
"icon": "circle:white;./assets/themes/stations/drinking_water.svg"
@ -277,7 +277,7 @@
"zh_Hant": "時刻表"
}
},
"minzoom": 19,
"minzoom": 18,
"source": {
"osmTags": {
"and": [
@ -391,4 +391,4 @@
]
}
]
}
}

View file

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

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"
}
}