From a0096f9bd6fe5788aa2d491320f792db94c44a7d Mon Sep 17 00:00:00 2001 From: AlexanderRebai Date: Mon, 11 Jul 2022 09:34:46 +0000 Subject: [PATCH 1/3] able to add name of the doctors office --- assets/layers/doctors/doctors.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json index e69fb27a41..e1d2037ae7 100644 --- a/assets/layers/doctors/doctors.json +++ b/assets/layers/doctors/doctors.json @@ -38,6 +38,16 @@ "phone", "email", "website", + { + "question": { + "en": "What is the name of this doctors place?" + }, + "render": "This doctors place is called {name}", + "freeform": { + "key": "name" + }, + "id": "name" + }, { "condition": "amenity=doctors", "id": "specialty", From 3cf5bd8dc601d870d3578625803662531ba3475f Mon Sep 17 00:00:00 2001 From: AlexanderRebai Date: Mon, 11 Jul 2022 11:45:09 +0000 Subject: [PATCH 2/3] Created a first version for onWheels layer --- assets/layers/doctors/license_info.json | 10 +++++ .../mapcomplete-changes.json | 4 ++ assets/themes/onwheels/crest.svg | 12 ++++++ assets/themes/onwheels/license_info.json | 10 +++++ assets/themes/onwheels/onwheels.json | 40 +++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 assets/themes/onwheels/crest.svg create mode 100644 assets/themes/onwheels/license_info.json create mode 100644 assets/themes/onwheels/onwheels.json diff --git a/assets/layers/doctors/license_info.json b/assets/layers/doctors/license_info.json index 90889fdc6c..cc0457d850 100644 --- a/assets/layers/doctors/license_info.json +++ b/assets/layers/doctors/license_info.json @@ -1,4 +1,14 @@ [ + { + "path": "dentist.svg", + "license": "CC0", + "authors": [ + "OSM Carto" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Dentist-14.svg" + ] + }, { "path": "doctors.svg", "license": "cc0", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 8fc630f67c..e618af73ba 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -243,6 +243,10 @@ "if": "theme=observation_towers", "then": "./assets/layers/observation_tower/Tower_observation.svg" }, + { + "if": "theme=onwheels", + "then": "./assets/themes/onwheels/crest.svg" + }, { "if": "theme=openwindpowermap", "then": "./assets/themes/openwindpowermap/logo.svg" diff --git a/assets/themes/onwheels/crest.svg b/assets/themes/onwheels/crest.svg new file mode 100644 index 0000000000..5f23194f7a --- /dev/null +++ b/assets/themes/onwheels/crest.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/themes/onwheels/license_info.json b/assets/themes/onwheels/license_info.json new file mode 100644 index 0000000000..9f2dcf81aa --- /dev/null +++ b/assets/themes/onwheels/license_info.json @@ -0,0 +1,10 @@ +[ + { + "path": "crest.svg", + "license": "CC0", + "authors": [ + "Free Wheelies" + ], + "sources": [] + } +] \ No newline at end of file diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json new file mode 100644 index 0000000000..822a75349c --- /dev/null +++ b/assets/themes/onwheels/onwheels.json @@ -0,0 +1,40 @@ +{ + "id": "onwheels", + "title": { + "en": "OnWheels" + }, + "description": { + "en": "On this map, publicly weelchair accessible places are shown and can be easily added" + }, + "maintainer": "MapComplete", + "icon": "./assets/themes/onwheels/crest.svg", + "version": "0", + "startLat": 50.8465573, + "defaultBackgroundId": "CartoDB.Voyager", + "startLon": 4.351697, + "startZoom": 16, + "widenFactor": 2, + "layers": [ + "bike_repair_station", + "bike_shop", + "cafe_pub", + "entrance", + "food", + "kerbs", + "parking", + "picnic_table", + "school", + "shops", + "toilet", + "viewpoint", + "doctors" + ], + "overrideAll" : { + "minZoom" : "15", + "mapRendering" : [ + { + "label" : null + } + ] + } +} \ No newline at end of file From bfdc1056a0d8034f49e3a72c89769fefc8153ede Mon Sep 17 00:00:00 2001 From: AlexanderRebai Date: Mon, 11 Jul 2022 14:06:37 +0000 Subject: [PATCH 3/3] fixed language english and crest background --- assets/layers/doctors/doctors.json | 4 +++- assets/themes/onwheels/crest.svg | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json index e1d2037ae7..236d13c542 100644 --- a/assets/layers/doctors/doctors.json +++ b/assets/layers/doctors/doctors.json @@ -42,7 +42,9 @@ "question": { "en": "What is the name of this doctors place?" }, - "render": "This doctors place is called {name}", + "render": { + "en": "This doctors place is called {name}" + }, "freeform": { "key": "name" }, diff --git a/assets/themes/onwheels/crest.svg b/assets/themes/onwheels/crest.svg index 5f23194f7a..383b543b1e 100644 --- a/assets/themes/onwheels/crest.svg +++ b/assets/themes/onwheels/crest.svg @@ -1,5 +1,4 @@ - @@ -7,6 +6,6 @@ - +