Split doctors-layer into 'doctors', 'physiotherapist' and 'dentist' layers

Models/ThemeConfig/TagRenderingConfig.ts

@@ -684,9 +684,8 @@ export default class TagRenderingConfig {
         let condition: BaseUIElement = undefined
         if (this.condition !== undefined && !this.condition?.matchesProperties({})) {
             condition = new Combine([
-                "Only visible if ",
+                "This tagrendering is only visible in the popup if the following condition is met:",
-                new FixedUiElement(this.condition.asHumanString(false, false, {})).SetClass("code"),
+                new FixedUiElement(this.condition.asHumanString(false, false, {})).SetClass("code")
-                " is shown",
             ])
         }
 

assets/layers/dentist/dentist.json

@@ -0,0 +1,71 @@
+{
+  "id": "dentist",
+  "name": {
+    "en": "Dentist",
+    "nl": "Tandarts"
+  },
+  "description": {
+    "en": "This layer shows dentist offices"
+  },
+  "source": {
+    "osmTags":      "amenity=dentist"
+  },
+  "title": {
+    "render": {
+      "en": "Dentist Office {name}",
+      "de": "Arztpraxis {name}",
+      "nl": "Dokterspraktijk {name}",
+      "fr": "Cabinet medical {name}"
+    }
+  },
+  "minzoom": 13,
+  "tagRenderings": [
+    "images",
+    "opening_hours",
+    "phone",
+    "email",
+    "website",
+    {
+      "question": {
+        "en": "What is the name of this dentist?"
+      },
+      "render": {
+        "en": "This dentist is called {name}"
+      },
+      "freeform": {
+        "key": "name"
+      },
+      "id": "name"
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a dentists office",
+        "de": "eine Zahnarztpraxis",
+        "nl": "een tandartspraktijk",
+        "fr": "un cabinet de dentistes"
+      },
+      "tags": [
+        "amenity=dentist"
+      ]
+    }
+  ],
+  "filter": [
+    "open_now"
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "circle:white;./assets/layers/dentist/dentist.svg"
+      },
+      "iconSize": "40,40,center",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "deletion": true,
+  "allowMove": true
+}

assets/layers/dentist/license_info.json

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

assets/layers/doctors/doctors.json

@@ -8,19 +8,11 @@
     "pa_PK": "ڈاکٹر"
   },
   "description": {
-    "en": "This layer shows doctor offices, dentists and other healthcare facilities",
+    "en": "This layer shows doctor offices"
-    "de": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen",
-    "nl": "Deze laag toont dokterspraktijken, tandartsen en andere gezondheidszorgfaciliteiten",
-    "fr": "Ce calque montre les cabinets médicaux, les dentistes et autres établissements de santé"
   },
   "source": {
-    "osmTags": {
+    "osmTags":         "amenity=doctors"
-      "or": [
+    
-        "amenity=doctors",
-        "amenity=dentist",
-        "healthcare=physiotherapist"
-      ]
-    }
   },
   "title": {
     "render": {
@@ -28,29 +20,12 @@
       "de": "Arztpraxis {name}",
       "nl": "Dokterspraktijk {name}",
       "fr": "Cabinet medical {name}"
-    },
+    }
-    "mappings": [
-      {
-        "if": "amenity=doctors",
-        "then": "Doctors Office {name}"
-      },
-      {
-        "if": "amenity=dentist",
-        "then": "Dentists office {name}"
-      },
-      {
-        "if": "healthcare=physiotherapist",
-        "then": "Physiotherapists office {name}"
-      }
-    ]
   },
   "minzoom": 13,
   "tagRenderings": [
+    
     "images",
-    "opening_hours",
-    "phone",
-    "email",
-    "website",
     {
       "question": {
         "en": "What is the name of this doctors place?",
@@ -69,8 +44,11 @@
       },
       "id": "name"
     },
+    "opening_hours_by_appointment",
+    "phone",
+    "email",
+    "website",
     {
-      "condition": "amenity=doctors",
       "id": "specialty",
       "render": {
         "en": "This doctor is specialized in {healthcare:speciality}",
@@ -87,6 +65,7 @@
       "freeform": {
         "key": "healthcare:speciality"
       },
+      "multiAnswer": true,
       "mappings": [
         {
           "if": "healthcare:speciality=general",
@@ -138,28 +117,6 @@
       "tags": [
         "amenity=doctors"
       ]
-    },
-    {
-      "title": {
-        "en": "a dentists office",
-        "de": "eine Zahnarztpraxis",
-        "nl": "een tandartspraktijk",
-        "fr": "un cabinet de dentistes"
-      },
-      "tags": [
-        "amenity=dentist"
-      ]
-    },
-    {
-      "title": {
-        "en": "a physiotherapists office",
-        "de": "Praxis eines Physiotherapeuten",
-        "nl": "een fysiotherapeutenpraktijk",
-        "fr": "un cabinet de kinésithérapeutes"
-      },
-      "tags": [
-        "healthcare=physiotherapist"
-      ]
     }
   ],
   "filter": [
@@ -177,5 +134,6 @@
       ]
     }
   ],
-  "deletion": true
+  "deletion": true,
-}
+  "allowMove": true
+}

assets/layers/doctors/license_info.json

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

assets/layers/physiotherapist/doctors.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="500"
+   height="500"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,1 C 5.83929,1 4.667834,1.5047052 3.875,2.5 3.187514,3.3630449 3,4 2.90625,5.0000004 0.01009,5.0238004 0,6.0817104 0,13 l 14,0 C 14,6.0817104 13.9899,5.0237504 11.09375,5.0000004 11,4 10.795537,3.3460958 10.125,2.5 9.334655,1.5027279 8.16071,1 7,1 z M 7,3 C 8.281412,2.99511 9,4 9.0625,5.0000004 l -4.125,0 C 5,4 5.718588,3.0048937 7,3 z m -1,3.0000004 2,0 L 8,8 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"
+     id="doctor" style="fill:#BF0000" />
+</svg>

assets/layers/physiotherapist/license_info.json

@@ -0,0 +1,12 @@
+[
+  {
+    "path": "doctors.svg",
+    "license": "cc0",
+    "authors": [
+      "osmcarto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Doctors-14.svg"
+    ]
+  }
+]

assets/layers/physiotherapist/physiotherapist.json

@@ -0,0 +1,73 @@
+{
+  "id": "physiotherapist",
+  "name": {
+    "en": "Physiotherapist",
+    "nl": "Kinesist"
+  },
+  "description": {
+    "en": "This layer shows physiotherapists",
+    "nl": "Deze laag toont kinesisten"
+  },
+  "source": {
+    "osmTags": "healthcare=physiotherapist"
+  },
+  "title": {
+    "render": {
+      "en": "Physiotherapist {name}",
+      "nl": "Kinesist {name}"
+    }
+  },
+  "minzoom": 13,
+  "tagRenderings": [
+    "images",
+    {
+      "question": {
+        "en": "What is the name of this physiotherapists office?",
+        "nl": "Wat is de naam van deze kinesistenpraktijk?"
+      },
+      "render": {
+        "en": "This physiotherapists office is called {name}",
+        "nl": "Deze kinesistenpraktijk heet {name}"
+      },
+      "freeform": {
+        "key": "name"
+      },
+      "id": "name"
+    },
+    "opening_hours_by_appointment",
+    "phone",
+    "email",
+    "website"
+
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a physiotherapists office",
+        "de": "Praxis eines Physiotherapeuten",
+        "nl": "een fysiotherapeutenpraktijk",
+        "fr": "un cabinet de kinésithérapeutes"
+      },
+      "tags": [
+        "healthcare=physiotherapist"
+      ]
+    }
+  ],
+  "filter": [
+    "open_now"
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "circle:white;./assets/layers/physiotherapist/doctors.svg"
+      },
+      "iconSize": "40,40,center",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "deletion": true,
+  "allowMove": true
+}

assets/tagRenderings/questions.json

@@ -681,6 +681,26 @@
       ]
     }
   },
+  "opening_hours_by_appointment": {
+    "builtin": "opening_hours",
+    "override": {
+      "mappings": [
+        {
+          "if": "opening_hours=\"by appointment\"",
+          "then": {
+            "en": "Only by appointment"
+          }
+        },
+        {
+          "if": "opening_hours~i~\"by appointment\"|by appointment",
+          "then": {
+            "en": "Only by appointment"
+          },
+          "hideInAnswer": true
+        }
+      ]
+    }
+  },
   "service:electricity": {
     "#": "service:socket describes if a pub, restaurant or café offers electricity to their customers.",
     "question": {
@@ -1471,4 +1491,4 @@
       "es": "El nombre de red es <b>{internet_access:ssid}</b>"
     }
   }
-}
+}

assets/themes/healthcare/healthcare.json

@@ -15,7 +15,7 @@
     "de": "Auf dieser Karte werden verschiedene Gesundheitseinrichtungen angezeigt",
     "fr": "Cette carte affiche différents éléments liés à la santé",
     "da": "På dette kort er forskellige sundhedsrelaterede emner vist",
-    "nl": "Op deze kaart vind je dokters en apothekers"
+    "nl": "Op deze kaart vind je dokters, apothekers, kinesisten, ziekenhuizen en andere gezondheidsgerelateerde diensten"
   },
   "icon": "./assets/layers/doctors/doctors.svg",
   "startLat": 50.8465573,
@@ -25,7 +25,9 @@
   "widenFactor": 2,
   "layers": [
     "doctors",
+    "physiotherapist",
+    "dentist",
     "hospital",
     "pharmacy"
   ]
-}
+}

assets/themes/mapcomplete-changes/mapcomplete-changes.json

@@ -1,16 +1,13 @@
 {
   "id": "mapcomplete-changes",
   "title": {
-    "en": "Changes made with MapComplete",
+    "en": "Changes made with MapComplete"
-    "de": "Mit MapComplete vorgenommene Änderungen"
   },
   "shortDescription": {
-    "en": "Shows changes made by MapComplete",
+    "en": "Shows changes made by MapComplete"
-    "de": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden"
   },
   "description": {
-    "en": "This maps shows all the changes made with MapComplete",
+    "en": "This maps shows all the changes made with MapComplete"
-    "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen"
   },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
@@ -23,10 +20,7 @@
     {
       "id": "mapcomplete-changes",
       "name": {
-        "en": "Changeset centers",
+        "en": "Changeset centers"
-        "ca": "Centres del conjunt de canvis",
-        "de": "Zentrum der Änderungssätze",
-        "pa_PK": "تبدیلیاں دے کیندر"
       },
       "minzoom": 0,
       "source": {
@@ -37,48 +31,41 @@
       },
       "title": {
         "render": {
-          "en": "Changeset for {theme}",
+          "en": "Changeset for {theme}"
-          "de": "Änderungssatz für {theme}"
         }
       },
       "description": {
-        "en": "Shows all MapComplete changes",
+        "en": "Shows all MapComplete changes"
-        "de": "Zeigt alle MapComplete-Änderungen"
       },
       "tagRenderings": [
         {
           "id": "show_changeset_id",
           "render": {
-            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
+            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
-            "de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
           }
         },
         {
           "id": "contributor",
           "question": {
-            "en": "What contributor did make this change?",
+            "en": "What contributor did make this change?"
-            "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
           },
           "freeform": {
             "key": "user"
           },
           "render": {
-            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
+            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
-            "de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
           }
         },
         {
           "id": "theme-id",
           "question": {
-            "en": "What theme was used to make this change?",
+            "en": "What theme was used to make this change?"
-            "de": "Welches Thema wurde für diese Änderung verwendet?"
           },
           "freeform": {
             "key": "theme"
           },
           "render": {
-            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
+            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
-            "de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           }
         },
         {
@@ -87,23 +74,19 @@
             "key": "locale"
           },
           "question": {
-            "en": "What locale (language) was this change made in?",
+            "en": "What locale (language) was this change made in?"
-            "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?"
           },
           "render": {
-            "en": "User locale is {locale}",
+            "en": "User locale is {locale}"
-            "de": "Benutzergebietsschema ist {locale}"
           }
         },
         {
           "id": "host",
           "render": {
-            "en": "Change with with <a href='{host}'>{host}</a>",
+            "en": "Change with with <a href='{host}'>{host}</a>"
-            "de": "Geändert über <a href='{host}'>{host}</a>"
           },
           "question": {
-            "en": "What host (website) was this change made with?",
+            "en": "What host (website) was this change made with?"
-            "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
           },
           "freeform": {
             "key": "host"
@@ -436,9 +419,7 @@
                 }
               ],
               "question": {
-                "en": "Themename contains {search}",
+                "en": "Themename contains {search}"
-                "ca": "El nom de la petició conté {search}",
-                "de": "Themename enthält {search}"
               }
             }
           ]
@@ -454,8 +435,7 @@
                 }
               ],
               "question": {
-                "en": "Made by contributor {search}",
+                "en": "Made by contributor {search}"
-                "de": "Erstellt vom Mitwirkenden {search}"
               }
             }
           ]
@@ -471,8 +451,7 @@
                 }
               ],
               "question": {
-                "en": "<b>Not</b> made by contributor {search}",
+                "en": "<b>Not</b> made by contributor {search}"
-                "de": "<b>Nicht</b> von Mitwirkendem {search}"
               }
             }
           ]
@@ -489,8 +468,7 @@
                 }
               ],
               "question": {
-                "en": "Made before {search}",
+                "en": "Made before {search}"
-                "de": "Erstellt vor {search}"
               }
             }
           ]
@@ -507,8 +485,7 @@
                 }
               ],
               "question": {
-                "en": "Made after {search}",
+                "en": "Made after {search}"
-                "de": "Erstellt nach {search}"
               }
             }
           ]
@@ -524,8 +501,7 @@
                 }
               ],
               "question": {
-                "en": "User language (iso-code) {search}",
+                "en": "User language (iso-code) {search}"
-                "de": "Benutzersprache (ISO-Code) {search}"
               }
             }
           ]
@@ -541,8 +517,7 @@
                 }
               ],
               "question": {
-                "en": "Made with host {search}",
+                "en": "Made with host {search}"
-                "de": "Erstellt mit host {search}"
               }
             }
           ]
@@ -557,8 +532,7 @@
           {
             "id": "link_to_more",
             "render": {
-              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
+              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
-              "de": "Weitere Statistiken finden Sie unter <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
             }
           },
           {