bun run all

Author: UKChris-osm

data/brands/amenity/cafe.json

@@ -760,13 +760,15 @@
     },
     {
       "displayName": "Boheme",
-      "id": "boheme",
+      "id": "boheme-4351d9",
       "locationSet": {"include": ["es"]},
       "tags": {
         "amenity": "cafe",
         "brand": "Boheme",
         "brand:wikidata": "Q140089658",
-        "name": "Boheme"
+        "cuisine": "coffee_shop",
+        "name": "Boheme",
+        "takeaway": "yes"
       }
     },
     {

data/brands/shop/bakery.json

@@ -411,7 +411,7 @@
     },
     {
       "displayName": "Baluard Barceloneta",
-      "id": "baluard",
+      "id": "baluardbarceloneta-0ef3f4",
       "locationSet": {"include": ["es"]},
       "tags": {
         "brand": "Baluard Barceloneta",
@@ -1020,15 +1020,15 @@
     },
     {
       "displayName": "Forn de Cabrianes",
-      "id": "forndecabrianes",
+      "id": "forndecabrianes-0ef3f4",
       "locationSet": {"include": ["es"]},
       "tags": {
         "brand": "Forn de Cabrianes",
         "brand:wikidata": "Q140089594",
         "name": "Forn de Cabrianes",
         "shop": "bakery"
       }
-    },    
+    },
     {
       "displayName": "Fornetti",
       "id": "fornetti-0c6f37",
@@ -1721,7 +1721,7 @@
     },
     {
       "displayName": "Macxipa",
-      "id": "macxipa",
+      "id": "macxipa-0ef3f4",
       "locationSet": {"include": ["es"]},
       "tags": {
         "brand": "Macxipa",
@@ -2671,33 +2671,33 @@
         "shop": "bakery"
       }
     },
+    {
+      "displayName": "Valerio's Tropical Bakeshop",
+      "id": "valeriostropicalbakeshop-515502",
+      "locationSet": {"include": ["ca", "us"]},
+      "tags": {
+        "brand": "Valerio's Tropical Bakeshop",
+        "brand:wikidata": "Q125537872",
+        "name": "Valerio's Tropical Bakeshop",
+        "shop": "bakery"
+      }
+    },
     {
       "displayName": "Valero",
-      "id": "valero",
+      "id": "valero-0ef3f4",
       "locationSet": {"include": ["es"]},
       "matchNames": [
+        "forn de pa valero",
         "forn valero",
-        "valero forn tradicional",
         "valero forn de pa",
-        "forn de pa valero"
+        "valero forn tradicional"
       ],
       "tags": {
         "brand": "Valero",
         "brand:wikidata": "Q140089514",
         "name": "Valero",
         "shop": "bakery"
       }
-    },    
-    {
-      "displayName": "Valerio's Tropical Bakeshop",
-      "id": "valeriostropicalbakeshop-515502",
-      "locationSet": {"include": ["ca", "us"]},
-      "tags": {
-        "brand": "Valerio's Tropical Bakeshop",
-        "brand:wikidata": "Q125537872",
-        "name": "Valerio's Tropical Bakeshop",
-        "shop": "bakery"
-      }
     },
     {
       "displayName": "Vincent",

data/brands/shop/pastry.json

@@ -175,18 +175,15 @@
     },
     {
       "displayName": "Demasié",
-      "id": "demasie",
-      "locationSet": {"include": ["es", "ad"]},
-      "matchNames": [
-        "demasie",
-        "cookies demasie"
-      ],
+      "id": "demasie-c90c6a",
+      "locationSet": {"include": ["ad", "es"]},
+      "matchNames": ["cookies demasie"],
       "tags": {
+        "alt_name": "Demasie",
         "brand": "Demasié",
         "brand:wikidata": "Q140089894",
         "name": "Demasié",
-        "shop": "pastry",
-        "alt_name": "Demasie"
+        "shop": "pastry"
       }
     },
     {

data/transit/railway/station.json

@@ -8,16 +8,14 @@
   "items": [
     {
       "note": "Auto create railway/station for all route/train - #7576, #4765",
+      "templateExclude": ["european sleeper"],
       "templateSource": "transit/route/train",
       "templateTags": {
         "public_transport": "station",
         "railway": "station",
         "route": "",
         "train": "yes"
-      },
-      "templateExclude": [
-        "european sleeper"
-      ]
+      }
     }
   ]
 }

data/transit/route/train.json

@@ -13,17 +13,6 @@
     }
   },
   "items": [
-    {
-      "displayName": "European Sleeper",
-      "locationSet": {"include": ["ch", "nl", "de", "be", "cz", "it", "fx"]},
-      "tags": {
-        "operator": "European Sleeper",
-        "operator:wikidata": "Q112134716",
-        "network": "European Sleeper",
-        "network:wikidata": "Q112134716",
-        "route": "train"
-      }
-    },
     {
       "displayName": "A-Welle",
       "id": "awelle-d5549f",
@@ -648,6 +637,28 @@
         "route": "train"
       }
     },
+    {
+      "displayName": "European Sleeper",
+      "id": "europeansleeper-a508a4",
+      "locationSet": {
+        "include": [
+          "be",
+          "ch",
+          "cz",
+          "de",
+          "fx",
+          "it",
+          "nl"
+        ]
+      },
+      "tags": {
+        "network": "European Sleeper",
+        "network:wikidata": "Q112134716",
+        "operator": "European Sleeper",
+        "operator:wikidata": "Q112134716",
+        "route": "train"
+      }
+    },
     {
       "displayName": "Eurostar",
       "id": "eurostar-8a1522",