From d167fe77232b502ccef4ee051c8d73f948100dd0 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 12 Aug 2024 10:07:33 +0200
Subject: [PATCH] Themes: add hostel, cleanup of hotel

---
 assets/layers/hostel/hostel.json        |  68 +++++++++++++++
 assets/layers/hostel/hostel.svg         | 109 ++++++++++++++++++++++++
 assets/layers/hostel/hostel.svg.license |   2 +
 assets/layers/hostel/license_info.json  |  12 +++
 assets/layers/hotel/hotel.json          |  17 ++--
 assets/layers/questions/questions.json  |  25 ++++++
 assets/themes/hotels/hotels.json        |   1 +
 7 files changed, 228 insertions(+), 6 deletions(-)
 create mode 100644 assets/layers/hostel/hostel.json
 create mode 100644 assets/layers/hostel/hostel.svg
 create mode 100644 assets/layers/hostel/hostel.svg.license
 create mode 100644 assets/layers/hostel/license_info.json

diff --git a/assets/layers/hostel/hostel.json b/assets/layers/hostel/hostel.json
new file mode 100644
index 000000000..93c4bf262
--- /dev/null
+++ b/assets/layers/hostel/hostel.json
@@ -0,0 +1,68 @@
+{
+  "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}"
+    }
+  }
+}
diff --git a/assets/layers/hostel/hostel.svg b/assets/layers/hostel/hostel.svg
new file mode 100644
index 000000000..7cda45f6b
--- /dev/null
+++ b/assets/layers/hostel/hostel.svg
@@ -0,0 +1,109 @@
+<?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>
diff --git a/assets/layers/hostel/hostel.svg.license b/assets/layers/hostel/hostel.svg.license
new file mode 100644
index 000000000..eb7905b0c
--- /dev/null
+++ b/assets/layers/hostel/hostel.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: OSM-Carto
+SPDX-License-Identifier: CC0
\ No newline at end of file
diff --git a/assets/layers/hostel/license_info.json b/assets/layers/hostel/license_info.json
new file mode 100644
index 000000000..ae6b3f1a3
--- /dev/null
+++ b/assets/layers/hostel/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "hostel.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "OSM-Carto"
+    ],
+    "sources": [
+      ""
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/hotel/hotel.json b/assets/layers/hotel/hotel.json
index 11de3d088..ad4f73b3b 100644
--- a/assets/layers/hotel/hotel.json
+++ b/assets/layers/hotel/hotel.json
@@ -125,13 +125,18 @@
         "pl": "Nazwa tego hotelu to {name}"
       }
     },
-    "phone",
-    "email",
-    "website",
+    {
+      "builtin": "brand",
+      "override": {
+        "question": {
+          "en": "Is this hotel part of a bigger brand?"
+        }
+      }
+    },
+    "contact",
     "wheelchair-access",
-    "internet",
-    "internet-fee",
-    "internet-ssid"
+    "internet-all",
+    "dog-access"
   ],
   "allowMove": {
     "enableImproveAccuracy": true,
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 0a8dc2d88..a93570559 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2902,6 +2902,31 @@
       "render": {
         "*": "{preset_description()}"
       }
+    },
+    {
+      "id": "brand",
+      "question": {
+        "en": "Is this part of a bigger brand?"
+      },
+      "render": {
+        "en": "Part of {brand}"
+      },
+      "freeform": {
+        "key": "brand",
+        "addExtraTags": ["nobrand="]
+      },
+      "mappings": [
+        {
+          "if": "nobrand=yes",
+          "addExtraTags": [
+            "brand=",
+            "brand:wikidata="
+          ],
+          "then": {
+            "en": "Not part of a bigger brand"
+          }
+        }
+      ]
     }
   ]
 }
diff --git a/assets/themes/hotels/hotels.json b/assets/themes/hotels/hotels.json
index 0ac067212..70d033f40 100644
--- a/assets/themes/hotels/hotels.json
+++ b/assets/themes/hotels/hotels.json
@@ -35,6 +35,7 @@
   "startLon": 4.3755,
   "layers": [
     "hotel",
+    "hostel",
     {
       "builtin": [
         "love_hotel"