From 52f4b7dcdd22313c09216acb40795f316252576b Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 10 Oct 2020 10:14:23 -0400 Subject: [PATCH 1/3] Adding Chatrau d' Ax --- data/brands/shop/furniture.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/brands/shop/furniture.json b/data/brands/shop/furniture.json index 336921474af..da331ff1e5f 100644 --- a/data/brands/shop/furniture.json +++ b/data/brands/shop/furniture.json @@ -974,6 +974,17 @@ "name:ja": "フランフラン", "shop": "furniture" } + }, + { + "displayName": "Chateau d'Ax", + "id": "", + "locationSet": {"include": ["ao", "be", "ca", "cn", "hr", "fx", "de", "gp", "hk", "it", "mt", "mq", "mu", "ma", "mz", "prt", "pt", "re", "sg", "si", "es", "ch", "twn", "tn", "us", "vn"]}, + "tags":{ + "brand": "Chateau d'Ax", + "name": "Chateau d'Ax", + "brand:wikidata": "Q100249791", + "shop": "furniture" + } } ] } \ No newline at end of file From d9d9de75c378557cd26dde7e612f0494ced92341 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 10 Oct 2020 10:15:51 -0400 Subject: [PATCH 2/3] Ran nmp build --- data/brands/amenity/social_facility.json | 31 +++++++------- data/brands/shop/bed.json | 3 +- data/brands/shop/furniture.json | 51 +++++++++++++++++++----- data/transit/route/train.json | 12 ++++-- 4 files changed, 68 insertions(+), 29 deletions(-) diff --git a/data/brands/amenity/social_facility.json b/data/brands/amenity/social_facility.json index bad9a1dcb07..e113ee200b0 100644 --- a/data/brands/amenity/social_facility.json +++ b/data/brands/amenity/social_facility.json @@ -2,6 +2,7 @@ "brands/amenity/social_facility": [ { "displayName": "Bahnhofsmission", + "id": "bahnhofsmission-da0ff2", "locationSet": {"include": ["de"]}, "tags": { "amenity": "social_facility", @@ -15,6 +16,7 @@ }, { "displayName": "Bahnhofsozialdienst", + "id": "bahnhofsozialdienst-257965", "locationSet": {"include": ["at"]}, "tags": { "amenity": "social_facility", @@ -26,19 +28,6 @@ "social_facility:for": "homeless;underprivileged" } }, - { - "displayName": "Stationswerk", - "locationSet": {"include": ["nl"]}, - "tags": { - "amenity": "social_facility", - "brand": "Stationswerk", - "brand:wikidata": "Q801713", - "brand:wikipedia": "nl:Stationswerk", - "name": "Stationswerk", - "social_facility": "outreach", - "social_facility:for": "homeless;underprivileged" - } - }, { "displayName": "Boys & Girls Club", "id": "boysandgirlsclub-233ba4", @@ -106,6 +95,20 @@ "social_facility:for": "senior" } }, + { + "displayName": "Stationswerk", + "id": "stationswerk-51bde1", + "locationSet": {"include": ["nl"]}, + "tags": { + "amenity": "social_facility", + "brand": "Stationswerk", + "brand:wikidata": "Q801713", + "brand:wikipedia": "nl:Stationswerk", + "name": "Stationswerk", + "social_facility": "outreach", + "social_facility:for": "homeless;underprivileged" + } + }, { "displayName": "Vet Center", "id": "vetcenter-233ba4", @@ -186,4 +189,4 @@ } } ] -} +} \ No newline at end of file diff --git a/data/brands/shop/bed.json b/data/brands/shop/bed.json index c4818cb99fd..f4baef7a9b1 100644 --- a/data/brands/shop/bed.json +++ b/data/brands/shop/bed.json @@ -51,6 +51,7 @@ }, { "displayName": "France Literie", + "id": "franceliterie-fe1cb3", "locationSet": {"include": ["fr"]}, "tags": { "brand": "Dreams", @@ -170,4 +171,4 @@ } } ] -} +} \ No newline at end of file diff --git a/data/brands/shop/furniture.json b/data/brands/shop/furniture.json index da331ff1e5f..2ce6334267f 100644 --- a/data/brands/shop/furniture.json +++ b/data/brands/shop/furniture.json @@ -211,6 +211,46 @@ "shop": "furniture" } }, + { + "displayName": "Chateau d'Ax", + "id": "chateaudax-0d1cef", + "locationSet": { + "include": [ + "ao", + "be", + "ca", + "ch", + "cn", + "de", + "es", + "fx", + "gp", + "hk", + "hr", + "it", + "ma", + "mq", + "mt", + "mu", + "mz", + "prt", + "pt", + "re", + "sg", + "si", + "tn", + "twn", + "us", + "vn" + ] + }, + "tags": { + "brand": "Chateau d'Ax", + "brand:wikidata": "Q100249791", + "name": "Chateau d'Ax", + "shop": "furniture" + } + }, { "displayName": "Conforama", "id": "conforama-86a0f7", @@ -974,17 +1014,6 @@ "name:ja": "フランフラン", "shop": "furniture" } - }, - { - "displayName": "Chateau d'Ax", - "id": "", - "locationSet": {"include": ["ao", "be", "ca", "cn", "hr", "fx", "de", "gp", "hk", "it", "mt", "mq", "mu", "ma", "mz", "prt", "pt", "re", "sg", "si", "es", "ch", "twn", "tn", "us", "vn"]}, - "tags":{ - "brand": "Chateau d'Ax", - "name": "Chateau d'Ax", - "brand:wikidata": "Q100249791", - "shop": "furniture" - } } ] } \ No newline at end of file diff --git a/data/transit/route/train.json b/data/transit/route/train.json index bf72e0b914c..2a4b1b99e88 100644 --- a/data/transit/route/train.json +++ b/data/transit/route/train.json @@ -214,7 +214,10 @@ "displayName": "Cercanías València", "id": "cercaniasvalencia-8dd936", "locationSet": {"include": ["es"]}, - "matchNames": ["rodalia valència", "rodalia de valència"], + "matchNames": [ + "rodalia de valència", + "rodalia valència" + ], "tags": { "network": "Cercanías València", "network:wikidata": "Q2689944", @@ -1051,7 +1054,10 @@ "displayName": "Rodalies de Catalunya", "id": "rodaliesdecatalunya-19c4af", "locationSet": {"include": ["es", "fr"]}, - "matchNames": ["Cercanías de Cataluña", "Rodalies de Catalunya", "Cercanías de Catalunya"], + "matchNames": [ + "cercanías de catalunya", + "cercanías de cataluña" + ], "tags": { "network": "Rodalies de Catalunya", "network:wikidata": "Q3322422", @@ -1863,4 +1869,4 @@ } } ] -} +} \ No newline at end of file From 814d13f3036bcb854f035d48d0991f2a1722082f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 10 Oct 2020 11:19:19 -0400 Subject: [PATCH 3/3] Fixed duplicate --- data/brands/shop/furniture.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/brands/shop/furniture.json b/data/brands/shop/furniture.json index 2ce6334267f..f1d8efec5c8 100644 --- a/data/brands/shop/furniture.json +++ b/data/brands/shop/furniture.json @@ -213,7 +213,7 @@ }, { "displayName": "Chateau d'Ax", - "id": "chateaudax-0d1cef", + "id": "chateaudax-c96b56", "locationSet": { "include": [ "ao", @@ -233,13 +233,12 @@ "mt", "mu", "mz", - "prt", "pt", "re", "sg", "si", "tn", - "twn", + "tw", "us", "vn" ]