From 7f4027c4ca500d1d32d712a4c34f4caf15f32ca4 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 21 Jul 2023 13:42:41 +0200 Subject: [PATCH 01/10] Add preset `stolperstein` with deprecations and `memorial:addr` field --- data/deprecated.json | 8 +++++++ data/fields/memorial/addr.json | 10 ++++++++ .../historic/memorial/stolperstein.json | 24 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 data/fields/memorial/addr.json create mode 100644 data/presets/historic/memorial/stolperstein.json diff --git a/data/deprecated.json b/data/deprecated.json index 6ed1c7ef..07e75267 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -1932,5 +1932,13 @@ { "old": {"pstn": "pole"}, "replace": {"man_made": "utility_pole", "utility": "telecom"} + }, + { + "old": {"memorial:type": "stolperstein"}, + "replace": {"memorial": "stolperstein"} + }, + { + "old": {"memorial:text": "*"}, + "replace": {"memorial": "$1"} } ] diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr.json new file mode 100644 index 00000000..c125a032 --- /dev/null +++ b/data/fields/memorial/addr.json @@ -0,0 +1,10 @@ +{ + "type": "address", + "keys": [ + "memorial:addr:city", + "memorial:addr:street", + "memorial:addr:postcode", + "memorial:addr:housenumber" + ], + "label": "Nearest building address" +} diff --git a/data/presets/historic/memorial/stolperstein.json b/data/presets/historic/memorial/stolperstein.json new file mode 100644 index 00000000..1b0219da --- /dev/null +++ b/data/presets/historic/memorial/stolperstein.json @@ -0,0 +1,24 @@ +{ + "icon": "temaki-plaque", + "fields": [ + "name", + "inscription", + "subject/wikidata", + "image" + ], + "moreFields": [ + "website", + "wikimedia_commons", + "memorial/addr", + "address" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "historic": "memorial", + "memorial": "stolperstein" + }, + "name": "Memorial Plaque Stolperstein" +} From 9614d42a139cd16cf17ea028e5a2df3d3880531c Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 21 Jul 2023 14:04:35 +0200 Subject: [PATCH 02/10] Preset "stolperstein": Update wikidata Following https://github.com/openstreetmap/id-tagging-schema/issues/318#issuecomment-1272789217 --- data/presets/historic/memorial/stolperstein.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/historic/memorial/stolperstein.json b/data/presets/historic/memorial/stolperstein.json index 1b0219da..1c27a70e 100644 --- a/data/presets/historic/memorial/stolperstein.json +++ b/data/presets/historic/memorial/stolperstein.json @@ -3,10 +3,11 @@ "fields": [ "name", "inscription", - "subject/wikidata", + "wikidata", "image" ], "moreFields": [ + "subject/wikidata", "website", "wikimedia_commons", "memorial/addr", From eaca7fa5fc4c77232d50b854faa42cd625bb81b7 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 21 Jul 2023 14:06:22 +0200 Subject: [PATCH 03/10] Field "memorial:addr" fix missing key --- data/fields/memorial/addr.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr.json index c125a032..3aea8592 100644 --- a/data/fields/memorial/addr.json +++ b/data/fields/memorial/addr.json @@ -1,5 +1,6 @@ { "type": "address", + "key": "addr", "keys": [ "memorial:addr:city", "memorial:addr:street", From 74b934cfdf8f35611cba5f6ed26ac24afac53b46 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 21 Jul 2023 14:24:15 +0200 Subject: [PATCH 04/10] Fix "stolperstein" deprecation --- data/deprecated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/deprecated.json b/data/deprecated.json index 07e75267..8a13ee4f 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -1939,6 +1939,6 @@ }, { "old": {"memorial:text": "*"}, - "replace": {"memorial": "$1"} + "replace": {"inscription": "$1"} } ] From 391bffed208e4c03c5d1da0671f558dbb0b9dd25 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 21 Jul 2023 14:25:36 +0200 Subject: [PATCH 05/10] Preset "stolperstein": update field/moreField - having "image" visible when the "wikimedia_commons" from moreFields is shown looks wrong, so now both are optional - reorder fields --- data/presets/historic/memorial/stolperstein.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/presets/historic/memorial/stolperstein.json b/data/presets/historic/memorial/stolperstein.json index 1c27a70e..da959c66 100644 --- a/data/presets/historic/memorial/stolperstein.json +++ b/data/presets/historic/memorial/stolperstein.json @@ -3,15 +3,15 @@ "fields": [ "name", "inscription", - "wikidata", - "image" + "wikidata" ], "moreFields": [ - "subject/wikidata", - "website", - "wikimedia_commons", "memorial/addr", - "address" + "address", + "subject/wikidata", + "image", + "wikimedia_commons", + "website" ], "geometry": [ "point", From 8e90f9954fa716e6df3bece0af461e1bd4731462 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 23 Jul 2023 17:23:39 +0200 Subject: [PATCH 06/10] Preset/stolperstein: Make preset EU only Following https://github.com/openstreetmap/id-tagging-schema/pull/964#pullrequestreview-1541084558 - rename file to follow convention that locationSets should be part of the filename - add Q46 which represents europe Code via https://location-conflation.com/?locationSet=%7B%20include%3A%20%5B%27q46%27%5D%20%7D%0A --- .../memorial/{stolperstein.json => stolperstein-EU.json} | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) rename data/presets/historic/memorial/{stolperstein.json => stolperstein-EU.json} (77%) diff --git a/data/presets/historic/memorial/stolperstein.json b/data/presets/historic/memorial/stolperstein-EU.json similarity index 77% rename from data/presets/historic/memorial/stolperstein.json rename to data/presets/historic/memorial/stolperstein-EU.json index da959c66..fbdbe58f 100644 --- a/data/presets/historic/memorial/stolperstein.json +++ b/data/presets/historic/memorial/stolperstein-EU.json @@ -21,5 +21,10 @@ "historic": "memorial", "memorial": "stolperstein" }, - "name": "Memorial Plaque Stolperstein" + "name": "Memorial Plaque Stolperstein", + "locationSet": { + "include": [ + "Q46" + ] + } } From 4721b908677f257ccfe6701958d720e3c90d9e29 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 23 Jul 2023 17:31:48 +0200 Subject: [PATCH 07/10] Preset/stolperstein: Update address fields - remove "addr:" field since small usage and discouraged - add addr_string which is the thing used most often - update addr_addr to only show if at least "memorial:addr:street" is present --- data/fields/memorial/{addr.json => addr_addr.json} | 7 +++++-- data/fields/memorial/addr_string.json | 5 +++++ data/presets/historic/memorial/stolperstein-EU.json | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) rename data/fields/memorial/{addr.json => addr_addr.json} (56%) create mode 100644 data/fields/memorial/addr_string.json diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr_addr.json similarity index 56% rename from data/fields/memorial/addr.json rename to data/fields/memorial/addr_addr.json index 3aea8592..238c70c2 100644 --- a/data/fields/memorial/addr.json +++ b/data/fields/memorial/addr_addr.json @@ -1,11 +1,14 @@ { "type": "address", - "key": "addr", + "key": "memorial:addr", "keys": [ "memorial:addr:city", "memorial:addr:street", "memorial:addr:postcode", "memorial:addr:housenumber" ], - "label": "Nearest building address" + "label": "Nearest Building Address", + "prerequisiteTag": { + "key": "memorial:addr:street" + } } diff --git a/data/fields/memorial/addr_string.json b/data/fields/memorial/addr_string.json new file mode 100644 index 00000000..2b432cee --- /dev/null +++ b/data/fields/memorial/addr_string.json @@ -0,0 +1,5 @@ +{ + "type": "text", + "key": "memorial:addr", + "label": "Nearest Building Address" +} diff --git a/data/presets/historic/memorial/stolperstein-EU.json b/data/presets/historic/memorial/stolperstein-EU.json index fbdbe58f..6b883c05 100644 --- a/data/presets/historic/memorial/stolperstein-EU.json +++ b/data/presets/historic/memorial/stolperstein-EU.json @@ -6,8 +6,8 @@ "wikidata" ], "moreFields": [ - "memorial/addr", - "address", + "memorial/addr_string", + "memorial/addr_addr", "subject/wikidata", "image", "wikimedia_commons", From ebc109974199bba493d05cc4d762cebc78f95533 Mon Sep 17 00:00:00 2001 From: Tobias Date: Mon, 24 Jul 2023 10:35:48 +0200 Subject: [PATCH 08/10] Preset/stolperstein: Remove memorial:addr field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `prerequisiteTag` did work nicely. However, the `"type": "address"` only allows to set `addr:*` keys, so we cannot re used it as is. Removing it for now… --- .../memorial/{addr_string.json => addr.json} | 0 data/fields/memorial/addr_addr.json | 14 -------------- .../presets/historic/memorial/stolperstein-EU.json | 3 +-- 3 files changed, 1 insertion(+), 16 deletions(-) rename data/fields/memorial/{addr_string.json => addr.json} (100%) delete mode 100644 data/fields/memorial/addr_addr.json diff --git a/data/fields/memorial/addr_string.json b/data/fields/memorial/addr.json similarity index 100% rename from data/fields/memorial/addr_string.json rename to data/fields/memorial/addr.json diff --git a/data/fields/memorial/addr_addr.json b/data/fields/memorial/addr_addr.json deleted file mode 100644 index 238c70c2..00000000 --- a/data/fields/memorial/addr_addr.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "address", - "key": "memorial:addr", - "keys": [ - "memorial:addr:city", - "memorial:addr:street", - "memorial:addr:postcode", - "memorial:addr:housenumber" - ], - "label": "Nearest Building Address", - "prerequisiteTag": { - "key": "memorial:addr:street" - } -} diff --git a/data/presets/historic/memorial/stolperstein-EU.json b/data/presets/historic/memorial/stolperstein-EU.json index 6b883c05..b0bd468e 100644 --- a/data/presets/historic/memorial/stolperstein-EU.json +++ b/data/presets/historic/memorial/stolperstein-EU.json @@ -6,8 +6,7 @@ "wikidata" ], "moreFields": [ - "memorial/addr_string", - "memorial/addr_addr", + "memorial/addr", "subject/wikidata", "image", "wikimedia_commons", From 0fe03d767c1da389809f5a3644956e9ffb56cddc Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 3 Aug 2023 18:32:57 +0200 Subject: [PATCH 09/10] add secondary memorial:addr:* field for when the subtag schema is used --- data/fields/memorial/addr.json | 5 ++++- data/fields/memorial/addr_subtags.json | 16 ++++++++++++++++ .../historic/memorial/stolperstein-EU.json | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 data/fields/memorial/addr_subtags.json diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr.json index 2b432cee..469dff76 100644 --- a/data/fields/memorial/addr.json +++ b/data/fields/memorial/addr.json @@ -1,5 +1,8 @@ { "type": "text", "key": "memorial:addr", - "label": "Nearest Building Address" + "label": "Nearest Building Address", + "prerequisiteTag": { + "keyNot": "memorial:addr:housenumber" + } } diff --git a/data/fields/memorial/addr_subtags.json b/data/fields/memorial/addr_subtags.json new file mode 100644 index 00000000..b9439777 --- /dev/null +++ b/data/fields/memorial/addr_subtags.json @@ -0,0 +1,16 @@ +{ + "type": "address", + "key": "memorial:addr", + "keys": [ + "memorial:addr:city", + "memorial:addr:housename", + "memorial:addr:housenumber", + "memorial:addr:place", + "memorial:addr:postcode", + "memorial:addr:street" + ], + "label": "{memorial/addr}", + "prerequisiteTag": { + "key": "memorial:addr:housenumber" + } +} diff --git a/data/presets/historic/memorial/stolperstein-EU.json b/data/presets/historic/memorial/stolperstein-EU.json index b0bd468e..4de1e172 100644 --- a/data/presets/historic/memorial/stolperstein-EU.json +++ b/data/presets/historic/memorial/stolperstein-EU.json @@ -7,6 +7,7 @@ ], "moreFields": [ "memorial/addr", + "memorial/addr_subtags", "subject/wikidata", "image", "wikimedia_commons", From 9fbb9c2a4322bfa86bf8e0674bd8f2b5a2d4f337 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 17 Aug 2023 16:59:20 +0200 Subject: [PATCH 10/10] Preset/stolpersteine: User `*:street` instead of `housenumber` to trigger special address section Thanks at 0fe03d76 --- data/fields/memorial/addr.json | 2 +- data/fields/memorial/addr_subtags.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr.json index 469dff76..3d3e5079 100644 --- a/data/fields/memorial/addr.json +++ b/data/fields/memorial/addr.json @@ -3,6 +3,6 @@ "key": "memorial:addr", "label": "Nearest Building Address", "prerequisiteTag": { - "keyNot": "memorial:addr:housenumber" + "keyNot": "memorial:addr:street" } } diff --git a/data/fields/memorial/addr_subtags.json b/data/fields/memorial/addr_subtags.json index b9439777..8e00e999 100644 --- a/data/fields/memorial/addr_subtags.json +++ b/data/fields/memorial/addr_subtags.json @@ -11,6 +11,6 @@ ], "label": "{memorial/addr}", "prerequisiteTag": { - "key": "memorial:addr:housenumber" + "key": "memorial:addr:street" } }