Merge pull request #944 from pietervdvn/feature/OnWheels

Feature/on wheels

assets/layers/doctors/doctors.json

@@ -38,6 +38,18 @@
         "phone",
         "email",
         "website",
+        {
+            "question": {
+                "en": "What is the name of this doctors place?"
+            },
+            "render": {
+                "en": "This doctors place is called {name}"
+            },
+            "freeform": {
+                "key": "name"
+            },
+            "id": "name"
+        },
         {
             "condition": "amenity=doctors",
             "id": "specialty",
@@ -120,13 +132,7 @@
     "mapRendering": [
         {
             "icon": {
-        "render": "circle:white;./assets/layers/doctors/doctors.svg",
+                "render": "circle:white;./assets/layers/doctors/doctors.svg"
-        "mappings": [
-          {
-            "if": "amenity=dentist",
-            "then": "circle:white;./assets/layers/doctors/dentist.svg"
-          }
-        ]
             },
             "iconSize": "40,40,center",
             "location": [

assets/layers/doctors/license_info.json

@@ -1,9 +1,9 @@
 [
   {
     "path": "dentist.svg",
-    "license": "cc0",
+    "license": "CC0",
     "authors": [
-      "osmcarto"
+      "OSM Carto"
     ],
     "sources": [
       "https://wiki.openstreetmap.org/wiki/File:Dentist-14.svg"

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"

assets/themes/onwheels/crest.svg

@@ -0,0 +1,11 @@
+<svg width="400" height="400" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M397 200C397 308.8 308.8 397 200 397C91.1999 397 3 308.8 3 200C3 91.1999 91.1999 3 200 3C308.8 3 397 91.1999 397 200Z" fill="#22CA60" stroke="#E62222" stroke-width="6"/>
+<path d="M242.105 240.241L137.282 291.429L155.338 312.97L167.374 327.329L185.428 348.868L254.141 254.6L242.105 240.241Z" fill="#ECF0F1"/>
+<path d="M138.93 283.603L122.535 283.627L190.077 364.206L192.964 348.067L138.93 283.603Z" fill="#FE5757"/>
+<path d="M242.105 240.241L224.633 248.772L242.689 270.312L254.141 254.6L242.105 240.241ZM201.309 260.11L177.983 271.447L212.214 312.285L227.45 291.296L201.309 260.11ZM154.752 282.898L137.282 291.429L155.338 312.97L167.374 327.329L185.428 348.868L196.88 333.157L154.754 282.9L154.752 282.898Z" fill="#E62222"/>
+<path d="M122.535 283.627L190.077 364.206L185.257 368.246L117.714 287.667L122.535 283.627Z" fill="#E62222"/>
+<path d="M243.871 187.187C241.2 193.219 236.746 198.533 230.685 202.228C214.87 211.87 194.229 206.866 184.586 191.05C180.892 184.991 179.363 178.227 179.755 171.642L162.087 167.358C160.538 178.79 162.721 190.803 169.195 201.422C184.17 225.982 216.219 233.753 240.777 218.78C251.396 212.306 258.87 202.636 262.73 191.761L243.871 187.187Z" fill="#FCFCFF"/>
+<path d="M220.03 69.1601C228.136 64.2175 230.701 53.639 225.759 45.5323C220.816 37.4256 210.237 34.8606 202.131 39.8032C194.024 44.7458 191.459 55.3243 196.402 63.431C201.344 71.5377 211.923 74.1027 220.03 69.1601Z" fill="#FCFCFF"/>
+<path d="M250.824 98.9454L218.518 118.642L225.708 88.9832C225.995 88.2028 226.192 87.3988 226.294 86.5735L226.353 86.3324L226.329 86.3268C226.556 84.0714 226.115 81.7309 224.844 79.6478C222.814 76.3168 219.268 74.5145 215.635 74.5114L215.635 74.5081L159.854 75.8435L159.857 75.9264C158.38 76.1088 156.92 76.5767 155.568 77.4013C153.203 78.8428 151.63 81.0604 150.891 83.5185L150.871 83.5137L150.823 83.7119C150.755 83.956 150.696 84.1972 150.645 84.4453L143.544 113.732L143.57 113.739C143.012 116.342 143.389 119.153 144.885 121.608C147.987 126.696 154.623 128.303 159.709 125.202C162.164 123.706 163.786 121.379 164.482 118.809L164.509 118.816L164.574 118.548L164.58 118.522L169.753 97.19L185.053 96.8249L174.632 139.811C170.442 144.547 167.246 149.967 165.048 155.739L182.58 159.99C185.251 153.959 189.705 148.644 195.764 144.951C211.581 135.307 232.221 140.313 241.863 156.128C245.557 162.187 247.086 168.952 246.694 175.536L265.414 180.077C266.655 169.003 264.383 157.449 258.132 147.197C253.744 140 247.883 134.257 241.182 130.094L252.845 122.983L275.833 160.687C278.935 165.775 285.572 167.384 290.66 164.282C295.748 161.18 297.356 154.541 294.255 149.455L265.65 102.538C262.549 97.4527 255.91 95.8446 250.824 98.9454Z" fill="#FCFCFF"/>
+<path d="M104.007 155.511C105.121 154.899 105.528 153.5 104.917 152.386C104.305 151.272 102.905 150.865 101.791 151.476L95.7395 154.8C91.283 157.248 89.6546 162.845 92.1022 167.301C94.5498 171.758 100.147 173.386 104.603 170.938L130.828 156.535C131.942 155.923 132.349 154.524 131.737 153.41C131.125 152.296 129.726 151.889 128.612 152.501L102.387 166.904C100.159 168.128 97.3605 167.313 96.1367 165.085C94.9129 162.857 95.7272 160.059 97.9554 158.835L104.007 155.511ZM79.7999 168.806C80.914 168.194 81.3211 166.795 80.7092 165.681C80.0973 164.567 78.6981 164.16 77.584 164.772L73.5495 166.988C65.7507 171.271 62.9009 181.066 67.1842 188.864C71.4675 196.663 81.262 199.513 89.0608 195.23L145.544 164.207C146.659 163.595 147.066 162.196 146.454 161.082C145.842 159.968 144.443 159.56 143.329 160.172L86.8449 191.195C81.2743 194.255 74.2783 192.219 71.2187 186.648C68.1592 181.078 70.1948 174.082 75.7654 171.022L79.7999 168.806ZM136.054 185.174C137.168 184.562 137.575 183.163 136.963 182.049C136.351 180.935 134.952 180.528 133.838 181.14L103.579 197.759C99.1225 200.207 97.494 205.803 99.9417 210.26C102.389 214.716 107.986 216.345 112.443 213.897L118.494 210.573C119.608 209.961 120.016 208.562 119.404 207.448C118.792 206.334 117.393 205.927 116.278 206.539L110.227 209.863C107.998 211.086 105.2 210.272 103.976 208.044C102.752 205.816 103.567 203.017 105.795 201.793L136.054 185.174Z" fill="white"/>
+</svg>

assets/themes/onwheels/license_info.json

@@ -0,0 +1,10 @@
+[
+  {
+    "path": "crest.svg",
+    "license": "CC0",
+    "authors": [
+      "Free Wheelies"
+    ],
+    "sources": []
+  }
+]

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
+      }
+    ]
+  }
+}