Move hotel to 'tourism_accomodation', include hostels, fix #2070

This commit is contained in:
Pieter Vander Vennet 2024-08-12 23:49:46 +02:00
parent fde4e24abe
commit 8277bd3a1c
34 changed files with 647 additions and 754 deletions

View file

@ -1,68 +0,0 @@
{
"minzoom": 12,
"pointRendering": [
{id":
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/hostels/hostel.svg"
}
]
}
],
"tagRenderings": [
"images",
"reviews",
{
"id": "name",
"question": {
"en": "What is the name of this hostel?"
},
"render": {
"en": "This hostel is called {name}"
},
"freeform": {
"key": "name"
}
},
{
"builtin": "brand",
"override": {
"question": {
"en": "Is this hostel part of a bigger brand?"
}
}
},
"contact",
"internet-all",
"dog-access"
],
"lineRendering": [
{
"width": 1,
"color": "blue"
}
],
"name": {
"en": "Hostels"
},
"id": "hostel",
"description": {
"en": "A hostel is a type of tourist accomodation where people can sleep in a room shared with strangers"
},
"source": {
"osmTags": "tourism=hostel"
},
"title": {
"render": {
"en": "Hostel {name}"
}
}
}

View file

@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
viewBox="0 0 16 16"
height="16"
width="16"
version="1.1"
sodipodi:docname="hostel.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1242"
inkscape:window-height="733"
id="namedview4592"
showgrid="false"
inkscape:zoom="16.857143"
inkscape:cx="7"
inkscape:cy="4.6271186"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
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" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<rect
style="visibility:hidden;fill:none;stroke:none;stroke-width:1.14285719"
id="canvas"
y="2.3841858e-07"
x="8.5149496e-09"
height="16"
width="16" />
<path
id="hostel"
d="m 4,1.1428573 c -0.9467737,0 -1.7142857,0.7675121 -1.7142857,1.7142858 0,0.9467736 0.767512,1.7142856 1.7142857,1.7142856 0.9467737,0 1.7142857,-0.767512 1.7142857,-1.7142856 C 5.7142857,1.9103694 4.9467737,1.1428573 4,1.1428573 Z m 2.8571428,1.1428572 v 2.2857142 h 6.8571432 c 0,-1.1428571 -1.1842,-2.2857142 -2.285714,-2.2857142 z M 4,8.0000001 c -0.9467737,0 -1.7142857,0.767512 -1.7142857,1.7142857 0,0.9467742 0.767512,1.7142852 1.7142857,1.7142852 0.9467737,0 1.7142857,-0.767511 1.7142857,-1.7142852 C 5.7142857,8.7675121 4.9467737,8.0000001 4,8.0000001 Z m 2.8571428,1.1428571 v 2.2857138 l 6.8571432,0.01473 c 0,-1.157577 -1.1842,-2.3004346 -2.285714,-2.3004346 z"
style="fill:#0092da;stroke-width:1.14285719"
inkscape:connector-curvature="0" />
<rect
y="1.1428573"
x="8.5149496e-09"
height="14.857142"
width="1.1428571"
id="rect814"
style="opacity:1;fill:#0092da;fill-opacity:1;stroke:none;stroke-width:0.13977952;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
<rect
ry="0.5714286"
y="2.3841858e-07"
x="-5.9604645e-08"
height="14.857142"
width="1.1428571"
id="rect814-7"
style="opacity:1;fill:#0092da;fill-opacity:1;stroke:none;stroke-width:0.13977952;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
<rect
y="4.5714283"
x="14.857142"
height="11.428571"
width="1.1428571"
id="rect814-3"
style="opacity:1;fill:#0092da;fill-opacity:1;stroke:none;stroke-width:0.12259473;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
<rect
ry="0.5714286"
y="2.2857144"
x="14.857142"
height="13.714286"
width="1.1428571"
id="rect814-7-2"
style="opacity:1;fill:#0092da;fill-opacity:1;stroke:none;stroke-width:0.13429582;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
<rect
transform="rotate(90)"
y="-14.857142"
x="5.7142859"
height="14.857142"
width="1.1428572"
id="rect814-2"
style="opacity:1;fill:#0092da;fill-opacity:1;stroke:none;stroke-width:0.13977952;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
<rect
transform="rotate(90)"
y="-14.857142"
x="12.571429"
height="14.857142"
width="1.1428572"
id="rect814-2-7"
style="opacity:1;fill:#0092da;fill-opacity:1;stroke:none;stroke-width:0.13977952;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
</svg>

Before

Width:  |  Height:  |  Size: 4.4 KiB

View file

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

View file

@ -1,12 +0,0 @@
[
{
"path": "hostel.svg",
"license": "CC0-1.0",
"authors": [
"OSM-Carto"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Hostel-16.svg"
]
}
]

View file

@ -1,145 +0,0 @@
{
"id": "hotel",
"name": {
"en": "Hotels",
"nl": "Hotels",
"de": "Hotels",
"pa_PK": "ہوٹل",
"ru": "Гостиницы",
"fr": "Hôtels",
"ca": "Hotels",
"cs": "Hotely",
"pl": "Hotele"
},
"description": {
"en": "Layer showing all hotels",
"nl": "Laag die alle hotels toont",
"de": "Eine Ebene mit Hotels",
"fr": "Couche affichant les hôtels",
"ca": "Capa que mostra tots els hotels",
"cs": "Vrstva zobrazující všechny hotely",
"pl": "Warstwa pokazująca wszystkie hotele"
},
"source": {
"osmTags": "tourism=hotel"
},
"minzoom": 13,
"title": {
"render": {
"en": "Hotel",
"nl": "Hotel",
"de": "Hotel",
"pa_PK": "ہوٹل",
"fr": "Hôtel",
"ca": "Hotel",
"cs": "Hotel",
"pl": "Hotel"
},
"mappings": [
{
"if": "name~*",
"then": {
"en": "Hotel {name}",
"nl": "Hotel {name}",
"de": "Hotel {name}",
"fr": "Hôtel {name}",
"ca": "Hotel {name}",
"cs": "Hotel {name}",
"pl": "Hotel {name}"
}
}
]
},
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"iconSize": "40,40",
"anchor": "center",
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/hotel/hotel.svg"
}
]
}
],
"lineRendering": [],
"presets": [
{
"title": {
"en": "a hotel",
"nl": "een hotel",
"de": "ein Hotel",
"ca": "un hotel",
"ru": "гостиница",
"fr": "un hôtel",
"cs": "hotel",
"pl": "hotel"
},
"tags": [
"tourism=hotel"
]
}
],
"tagRenderings": [
"images",
"reviews",
{
"id": "name",
"freeform": {
"key": "name",
"placeholder": {
"en": "Name of the hotel",
"nl": "Naam van het hotel",
"de": "Name des Hotels",
"ru": "Название гостиницы",
"fr": "Nom de l'hôtel",
"ca": "Nom de l'hotel",
"cs": "Název hotelu",
"pl": "Nazwa hotelu"
}
},
"question": {
"en": "What is the name of this hotel?",
"nl": "Wat is de naam van dit hotel?",
"de": "Wie lautet der Name des Hotels?",
"ru": "Как называется эта гостиница?",
"fr": "Quel est le nom de cet hôtel ?",
"ca": "Quin és el nom d'aquest hotel?",
"cs": "Jak se tento hotel jmenuje?",
"pl": "Jak nazywa się ten hotel?"
},
"render": {
"en": "This hotel is called {name}",
"nl": "Dit hotel heet {name}",
"de": "Der Name des Hotels lautet {name}",
"ca": "Aquest hotel es diu {name}",
"fr": "Cet hôtel s'appelle {name}",
"cs": "Tento hotel se jmenuje {name}",
"pl": "Nazwa tego hotelu to {name}"
}
},
{
"builtin": "brand",
"override": {
"question": {
"en": "Is this hotel part of a bigger brand?"
}
}
},
"contact",
"wheelchair-access",
"internet-all",
"dog-access"
],
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": true
}
}

View file

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="500"
height="500"
viewBox="0 0 500 500"
version="1.1"
id="svg4"
sodipodi:docname="hotel.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="defs8" />
<sodipodi:namedview
id="namedview6"
pagecolor="#ffffff"
bordercolor="#111111"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="0.5912918"
inkscape:cx="43.125915"
inkscape:cy="341.6249"
inkscape:window-width="1920"
inkscape:window-height="1007"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg4">
<sodipodi:guide
position="-213.39489,250.02313"
orientation="0,-1"
id="guide827" />
</sodipodi:namedview>
<path
d="m 20.793355,103.8662 c -9.838754,0 -17.7594848,7.92073 -17.7594848,17.75948 v 17.75948 142.07589 35.51898 17.75949 53.27845 H 38.552842 V 334.73952 316.98003 H 464.78049 v 53.27845 17.75949 h 17.7595 17.75948 v -17.75949 -53.27845 -35.51898 -71.03793 -17.75949 c 0,-9.83876 -7.92073,-17.75949 -17.75948,-17.75949 -9.83876,0 -17.7595,7.92073 -17.7595,17.75949 v 17.75949 71.03793 H 38.552842 V 139.38516 121.62568 c 0,-9.83875 -7.920731,-17.75948 -17.759487,-17.75948 z m 106.556915,35.51896 c -29.424876,0 -53.278458,23.85359 -53.278458,53.27847 0,29.42487 23.853582,53.27845 53.278458,53.27845 29.42487,0 53.27845,-23.85358 53.27845,-53.27845 0,-29.42488 -23.85358,-53.27847 -53.27845,-53.27847 z m 88.79743,35.51898 v 71.03794 h 213.11382 c 0,-35.51896 -36.80387,-71.03794 -71.03793,-71.03794 z"
id="path2"
style="stroke-width:35.519" />
</svg>

Before

Width:  |  Height:  |  Size: 2 KiB

View file

@ -1,2 +0,0 @@
SPDX-FileCopyrightText: Andy Allan; Michael Glanznig; Adamant36; Paul Dicker
SPDX-License-Identifier: CC0-1.0

View file

@ -1,15 +0,0 @@
[
{
"path": "hotel.svg",
"license": "CC0-1.0",
"authors": [
"Andy Allan",
"Michael Glanznig",
"Adamant36",
"Paul Dicker"
],
"sources": [
"https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/tourism/hotel.svg"
]
}
]

View file

@ -42,7 +42,7 @@
],
"marker": [
{
"icon": "./assets/layers/hotel/hotel.svg"
"icon": "./assets/layers/tourism_accomodation/hotel.svg"
}
],
"iconSize": "27,27"

View file

@ -2906,14 +2906,16 @@
{
"id": "brand",
"question": {
"en": "Is this part of a bigger brand?"
"en": "Is {title()} part of a bigger brand?"
},
"render": {
"en": "Part of {brand}"
},
"freeform": {
"key": "brand",
"addExtraTags": ["nobrand="]
"addExtraTags": [
"nobrand="
]
},
"mappings": [
{

View file

@ -0,0 +1,130 @@
{
"minzoom": 12,
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "circle",
"color": "white"
},
{
"icon": {
"mappings": [
{
"if": "tourism=hostel",
"then": "./assets/layers/tourism_accomodation/hostel.svg"
},
{
"if": "tourism=hotel",
"then": "./assets/layers/tourism_accomodation/hotel.svg"
}
],
"render": "./assets/layers/tourism_accomodation/hostel.svg"
}
}
]
}
],
"tagRenderings": [
"images",
"reviews",
{
"id": "name",
"question": {
"en": "What is the name of this {title()}?"
},
"render": {
"en": "{name}"
},
"freeform": {
"key": "name"
}
},
"{preset_type_select()}",
"brand",
"contact",
"wheelchair-access",
"internet-all",
"dog-access"
],
"lineRendering": [
{
"width": 1,
"color": "blue"
}
],
"name": {
"en": "Tourism accomodation"
},
"id": "tourism_accomodation",
"description": {},
"presets": [
{
"title": {
"en": "a hotel",
"nl": "een hotel",
"de": "ein Hotel",
"ca": "un hotel",
"ru": "гостиница",
"fr": "un hôtel",
"cs": "hotel",
"pl": "hotel"
},
"description": {
"en": "A hotel is an establishment that provides paid lodging, usually on a short-term basis. Rooms are not shared with strangers."
},
"tags": [
"tourism=hotel"
]
},
{
"tags": [
"tourism=hostel"
],
"title": {
"en": "a hostel"
},
"description": {
"en": "A hostel is a type of tourist accommodation where people can sleep in a room shared with strangers"
}
}
],
"source": {
"osmTags": {
"or": [
"tourism=hostel",
"tourism=hotel"
]
}
},
"title": {
"mappings": [
{
"if": "tourism=hotel",
"then": {
"en": "Hotel {name}",
"nl": "Hotel {name}",
"de": "Hotel {name}",
"fr": "Hôtel {name}",
"ca": "Hotel {name}",
"cs": "Hotel {name}",
"pl": "Hotel {name}"
}
},
{
"if": "tourism=hostel",
"then": {
"en": "Hostel {name}"
}
}
],
"render": {
"en": "Tourist accomodation {name}"
}
},
"allowMove": true
}

View file

@ -45,7 +45,9 @@
},
{
"id": "profile-title",
"labels": ["hidden"],
"labels": [
"hidden"
],
"icon": "user_circle",
"render": {
"*": "<h3>{_name}</h3>"
@ -63,7 +65,8 @@
{
"id": "profile-description",
"labels": [
"profile-content","hidden"
"profile-content",
"hidden"
],
"render": {
"*": "{_description_html}"
@ -71,7 +74,6 @@
"mappings": [
{
"if": "_description=",
"then": {
"special": {
"type": "link",
@ -98,7 +100,8 @@
{
"id": "edit-profile",
"labels": [
"profile-content","hidden"
"profile-content",
"hidden"
],
"condition": "_description!=",
"render": {
@ -126,7 +129,8 @@
{
"id": "verified-mastodon",
"labels": [
"profile-content","hidden"
"profile-content",
"hidden"
],
"mappings": [
{
@ -157,7 +161,8 @@
{
"id": "cscount-thanks",
"labels": [
"profile-content","hidden"
"profile-content",
"hidden"
],
"mappings": [
{
@ -180,7 +185,8 @@
{
"id": "translation-thanks",
"labels": [
"profile-content","hidden"
"profile-content",
"hidden"
],
"mappings": [
{
@ -197,7 +203,8 @@
{
"id": "contributor-thanks",
"labels": [
"profile-content","hidden"
"profile-content",
"hidden"
],
"mappings": [
{