From 59ebbd2542679c3e4dce5f18061576d7a4488483 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 18 Jul 2022 12:54:21 -0700 Subject: [PATCH 1/8] Add more playground presets --- data/fields/subject.json | 5 +++++ data/fields/subject/wikidata.json | 9 +++++++++ data/presets/playground/activitypanel.json | 12 ++++++++++++ data/presets/playground/aerialrotator.json | 15 +++++++++++++++ data/presets/playground/bridge.json | 17 +++++++++++++++++ data/presets/playground/climbingwall.json | 12 ++++++++++++ data/presets/playground/funnel_ball.json | 10 ++++++++++ data/presets/playground/map.json | 20 ++++++++++++++++++++ data/presets/playground/sledding.json | 10 ++++++++++ data/presets/playground/splash_pad.json | 11 +++++++++++ data/presets/playground/teenshelter.json | 11 +++++++++++ data/presets/playground/trampoline.json | 11 +++++++++++ data/presets/playground/tunnel_tube.json | 12 ++++++++++++ data/presets/playground/water.json | 12 ++++++++++++ 14 files changed, 167 insertions(+) create mode 100644 data/fields/subject.json create mode 100644 data/fields/subject/wikidata.json create mode 100644 data/presets/playground/activitypanel.json create mode 100644 data/presets/playground/aerialrotator.json create mode 100644 data/presets/playground/bridge.json create mode 100644 data/presets/playground/climbingwall.json create mode 100644 data/presets/playground/funnel_ball.json create mode 100644 data/presets/playground/map.json create mode 100644 data/presets/playground/sledding.json create mode 100644 data/presets/playground/splash_pad.json create mode 100644 data/presets/playground/teenshelter.json create mode 100644 data/presets/playground/trampoline.json create mode 100644 data/presets/playground/tunnel_tube.json create mode 100644 data/presets/playground/water.json diff --git a/data/fields/subject.json b/data/fields/subject.json new file mode 100644 index 0000000000..6793936ae5 --- /dev/null +++ b/data/fields/subject.json @@ -0,0 +1,5 @@ +{ + "key": "subject", + "type": "text", + "label": "Subject" +} diff --git a/data/fields/subject/wikidata.json b/data/fields/subject/wikidata.json new file mode 100644 index 0000000000..b3cadff990 --- /dev/null +++ b/data/fields/subject/wikidata.json @@ -0,0 +1,9 @@ +{ + "key": "species:wikidata", + "keys": [ + "species:wikidata", + "species:wikipedia" + ], + "type": "wikidata", + "label": "Subject Wikidata" +} diff --git a/data/presets/playground/activitypanel.json b/data/presets/playground/activitypanel.json new file mode 100644 index 0000000000..8a43061a66 --- /dev/null +++ b/data/presets/playground/activitypanel.json @@ -0,0 +1,12 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "line", + "area" + ], + "tags": { + "playground": "activitypanel" + }, + "name": "Play Activity Panel" +} diff --git a/data/presets/playground/aerialrotator.json b/data/presets/playground/aerialrotator.json new file mode 100644 index 0000000000..04528d2222 --- /dev/null +++ b/data/presets/playground/aerialrotator.json @@ -0,0 +1,15 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point" + ], + "tags": { + "playground": "aerialrotator" + }, + "name": "Hanging Spinner", + "aliases": [ + "Aerial Rotator", + "Aerial Spinner", + "Hanging Roundabout" + ] +} diff --git a/data/presets/playground/bridge.json b/data/presets/playground/bridge.json new file mode 100644 index 0000000000..0ad07258fb --- /dev/null +++ b/data/presets/playground/bridge.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "line", + "area" + ], + "moreFields": [ + "{playground}", + "length", + "width" + ], + "tags": { + "playground": "bridge" + }, + "name": "Play Bridge" +} diff --git a/data/presets/playground/climbingwall.json b/data/presets/playground/climbingwall.json new file mode 100644 index 0000000000..8e38f06444 --- /dev/null +++ b/data/presets/playground/climbingwall.json @@ -0,0 +1,12 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "line", + "area" + ], + "tags": { + "playground": "climbingwall" + }, + "name": "Play Climbing Wall" +} diff --git a/data/presets/playground/funnel_ball.json b/data/presets/playground/funnel_ball.json new file mode 100644 index 0000000000..de86e23084 --- /dev/null +++ b/data/presets/playground/funnel_ball.json @@ -0,0 +1,10 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point" + ], + "tags": { + "playground": "funnel_ball" + }, + "name": "Funnel Ball" +} diff --git a/data/presets/playground/map.json b/data/presets/playground/map.json new file mode 100644 index 0000000000..17f7fdc1c6 --- /dev/null +++ b/data/presets/playground/map.json @@ -0,0 +1,20 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "line", + "area" + ], + "fields": [ + "subject", + "surface" + ], + "moreFields": [ + "colour", + "subject/wikidata" + ], + "tags": { + "playground": "map" + }, + "name": "Painted Playground Map" +} diff --git a/data/presets/playground/sledding.json b/data/presets/playground/sledding.json new file mode 100644 index 0000000000..c16405a838 --- /dev/null +++ b/data/presets/playground/sledding.json @@ -0,0 +1,10 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point" + ], + "tags": { + "playground": "sledding" + }, + "name": "Play Sledding Hill" +} diff --git a/data/presets/playground/splash_pad.json b/data/presets/playground/splash_pad.json new file mode 100644 index 0000000000..f54e5fe4fc --- /dev/null +++ b/data/presets/playground/splash_pad.json @@ -0,0 +1,11 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "area" + ], + "tags": { + "playground": "splash_pad" + }, + "name": "Play Splash Pad" +} diff --git a/data/presets/playground/teenshelter.json b/data/presets/playground/teenshelter.json new file mode 100644 index 0000000000..d199a43fb0 --- /dev/null +++ b/data/presets/playground/teenshelter.json @@ -0,0 +1,11 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "area" + ], + "tags": { + "playground": "teenshelter" + }, + "name": "Teen Shelter" +} diff --git a/data/presets/playground/trampoline.json b/data/presets/playground/trampoline.json new file mode 100644 index 0000000000..945e70cd0c --- /dev/null +++ b/data/presets/playground/trampoline.json @@ -0,0 +1,11 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "area" + ], + "tags": { + "playground": "trampoline" + }, + "name": "Play Trampoline" +} diff --git a/data/presets/playground/tunnel_tube.json b/data/presets/playground/tunnel_tube.json new file mode 100644 index 0000000000..9bfdf0413a --- /dev/null +++ b/data/presets/playground/tunnel_tube.json @@ -0,0 +1,12 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "line", + "area" + ], + "tags": { + "playground": "tunnel_tube" + }, + "name": "Play Tunnel" +} diff --git a/data/presets/playground/water.json b/data/presets/playground/water.json new file mode 100644 index 0000000000..2f3c04b50e --- /dev/null +++ b/data/presets/playground/water.json @@ -0,0 +1,12 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point", + "line", + "area" + ], + "tags": { + "playground": "water" + }, + "name": "Play Water Pump/Screw" +} From 21ad18b4c556232bcd99bc9b2f28e166ca07787d Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 18 Jul 2022 21:14:15 -0700 Subject: [PATCH 2/8] Fixes to Trampoline/Painted Playground Map presets * Use `temaki-compass` icon for `playground=map` as suggested * Remove `line` geometry from `playground=map` * Rename `playground=trampoline` preset to just 'Trampoline' --- data/presets/playground/map.json | 3 +-- data/presets/playground/trampoline.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/presets/playground/map.json b/data/presets/playground/map.json index 17f7fdc1c6..bc4fe05058 100644 --- a/data/presets/playground/map.json +++ b/data/presets/playground/map.json @@ -1,8 +1,7 @@ { - "icon": "maki-playground", + "icon": "temaki-compass", "geometry": [ "point", - "line", "area" ], "fields": [ diff --git a/data/presets/playground/trampoline.json b/data/presets/playground/trampoline.json index 945e70cd0c..4a283811cb 100644 --- a/data/presets/playground/trampoline.json +++ b/data/presets/playground/trampoline.json @@ -7,5 +7,5 @@ "tags": { "playground": "trampoline" }, - "name": "Play Trampoline" + "name": "Trampoline" } From 0af2cd8e9eb61658e8a3bf16356dbf5bcc24ad0d Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 18 Jul 2022 21:48:41 -0700 Subject: [PATCH 3/8] Distinguish between pitch/playground for funnel ball/tetherball --- data/presets/leisure/pitch/funnel_ball.json | 16 ++++++++++++++++ data/presets/playground/funnel_ball.json | 2 +- data/presets/playground/tetherball.json | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 data/presets/leisure/pitch/funnel_ball.json create mode 100644 data/presets/playground/tetherball.json diff --git a/data/presets/leisure/pitch/funnel_ball.json b/data/presets/leisure/pitch/funnel_ball.json new file mode 100644 index 0000000000..dc612f542c --- /dev/null +++ b/data/presets/leisure/pitch/funnel_ball.json @@ -0,0 +1,16 @@ +{ + "icon": "maki-pitch", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "pitch", + "sport": "funnel_ball" + }, + "reference": { + "key": "sport", + "value": "funnel_ball" + }, + "name": "Funnel Ball Court" +} diff --git a/data/presets/playground/funnel_ball.json b/data/presets/playground/funnel_ball.json index de86e23084..49f807a748 100644 --- a/data/presets/playground/funnel_ball.json +++ b/data/presets/playground/funnel_ball.json @@ -6,5 +6,5 @@ "tags": { "playground": "funnel_ball" }, - "name": "Funnel Ball" + "name": "Funnel Ball Funnel" } diff --git a/data/presets/playground/tetherball.json b/data/presets/playground/tetherball.json new file mode 100644 index 0000000000..f78989fe91 --- /dev/null +++ b/data/presets/playground/tetherball.json @@ -0,0 +1,10 @@ +{ + "icon": "maki-playground", + "geometry": [ + "point" + ], + "tags": { + "playground": "tetherball" + }, + "name": "Tetherball Pole" +} From 12386ca8cbbeb8ec79c3199fac04a61accb69191 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 18 Jul 2022 21:52:36 -0700 Subject: [PATCH 4/8] Add Gaga Pit preset --- data/presets/leisure/pitch/gaga.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/presets/leisure/pitch/gaga.json diff --git a/data/presets/leisure/pitch/gaga.json b/data/presets/leisure/pitch/gaga.json new file mode 100644 index 0000000000..ac7ee96dc4 --- /dev/null +++ b/data/presets/leisure/pitch/gaga.json @@ -0,0 +1,16 @@ +{ + "icon": "maki-pitch", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "pitch", + "sport": "gaga" + }, + "reference": { + "key": "sport", + "value": "gaga" + }, + "name": "Gaga Pit" +} From 5a0e6af959f219a3809fbf081b284d7f8a6ff941 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 18 Jul 2022 21:54:03 -0700 Subject: [PATCH 5/8] Add terms to Gaga Pit preset --- data/presets/leisure/pitch/gaga.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/presets/leisure/pitch/gaga.json b/data/presets/leisure/pitch/gaga.json index ac7ee96dc4..f78bea62d6 100644 --- a/data/presets/leisure/pitch/gaga.json +++ b/data/presets/leisure/pitch/gaga.json @@ -12,5 +12,8 @@ "key": "sport", "value": "gaga" }, + "terms": [ + "gaga ball" + ], "name": "Gaga Pit" } From 49cd8be372d546541aee578591f713d414c25620 Mon Sep 17 00:00:00 2001 From: arch0345 Date: Tue, 19 Jul 2022 16:35:29 -0700 Subject: [PATCH 6/8] Use for specific icons --- data/presets/leisure/pitch/four_square.json | 2 +- data/presets/playground/sledding.json | 2 +- data/presets/playground/splash_pad.json | 2 +- data/presets/playground/teenshelter.json | 2 +- data/presets/playground/water.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/presets/leisure/pitch/four_square.json b/data/presets/leisure/pitch/four_square.json index 5480e842d1..4fc54ea4c6 100644 --- a/data/presets/leisure/pitch/four_square.json +++ b/data/presets/leisure/pitch/four_square.json @@ -1,5 +1,5 @@ { - "icon": "maki-pitch", + "icon": "fas-border-all", "geometry": [ "area", "point" diff --git a/data/presets/playground/sledding.json b/data/presets/playground/sledding.json index c16405a838..332fa220a6 100644 --- a/data/presets/playground/sledding.json +++ b/data/presets/playground/sledding.json @@ -1,5 +1,5 @@ { - "icon": "maki-playground", + "icon": "temaki-sledding", "geometry": [ "point" ], diff --git a/data/presets/playground/splash_pad.json b/data/presets/playground/splash_pad.json index f54e5fe4fc..e96e2bad68 100644 --- a/data/presets/playground/splash_pad.json +++ b/data/presets/playground/splash_pad.json @@ -1,5 +1,5 @@ { - "icon": "maki-playground", + "icon": "temaki-fountain", "geometry": [ "point", "area" diff --git a/data/presets/playground/teenshelter.json b/data/presets/playground/teenshelter.json index d199a43fb0..f3813e385d 100644 --- a/data/presets/playground/teenshelter.json +++ b/data/presets/playground/teenshelter.json @@ -1,5 +1,5 @@ { - "icon": "maki-playground", + "icon": "maki-shelter", "geometry": [ "point", "area" diff --git a/data/presets/playground/water.json b/data/presets/playground/water.json index 2f3c04b50e..2399309e95 100644 --- a/data/presets/playground/water.json +++ b/data/presets/playground/water.json @@ -1,5 +1,5 @@ { - "icon": "maki-playground", + "icon": "temaki-water", "geometry": [ "point", "line", From 222730be5fa96062ff32d46720d033a6cf6f74a6 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 21 Jul 2022 18:17:07 +0200 Subject: [PATCH 7/8] fix tag of subject/wikidata field --- data/fields/subject/wikidata.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/fields/subject/wikidata.json b/data/fields/subject/wikidata.json index b3cadff990..40789bd67e 100644 --- a/data/fields/subject/wikidata.json +++ b/data/fields/subject/wikidata.json @@ -1,8 +1,8 @@ { - "key": "species:wikidata", + "key": "subject:wikidata", "keys": [ - "species:wikidata", - "species:wikipedia" + "subject:wikidata", + "subject:wikipedia" ], "type": "wikidata", "label": "Subject Wikidata" From 07f243f7dfb0660cb0688451122099d34013a863 Mon Sep 17 00:00:00 2001 From: archpdx Date: Thu, 21 Jul 2022 10:07:20 -0700 Subject: [PATCH 8/8] Update data/presets/playground/map.json Co-authored-by: Martin Raifer --- data/presets/playground/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/playground/map.json b/data/presets/playground/map.json index bc4fe05058..8130e66ba3 100644 --- a/data/presets/playground/map.json +++ b/data/presets/playground/map.json @@ -5,12 +5,12 @@ "area" ], "fields": [ - "subject", + "subject/wikidata", "surface" ], "moreFields": [ "colour", - "subject/wikidata" + "subject" ], "tags": { "playground": "map"