Merge branch 'develop' into feature/layerserver

pietervdvn · Feb 20, 2024 · f5e1cde · f5e1cde
2 parents c08191d + e6ec24d
commit f5e1cde
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 117 deletions.
diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
@@ -300,6 +300,19 @@
         "type": "date"
       },
       "id": "ghost_bike-start_date"
+    },
+     {
+      "id": "wikidata",
+      "render": {
+        "special": {
+          "type": "wikipedia",
+          "keyToShowWikipediaFor": "subject:wikidata"
+        },
+        "before": {
+          "en": "<h3>Wikipedia page about the deceased person</h3>"
+        }
+      },
+      "condition": "subject:wikidata~*"
     }
   ],
   "deletion": {

diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@@ -409,6 +409,8 @@
     "toilet.toilet-changing_table:location",
     "toilet.toilet-handwashing",
     "toilet.toilet-has-paper",
+    "toilet.menstrual_products",
+    "toilet.menstrual_products_location",
     {
       "builtin": "description",
       "override": {

diff --git a/src/UI/InputElement/Validators/FediverseValidator.ts b/src/UI/InputElement/Validators/FediverseValidator.ts
@@ -17,6 +17,7 @@ export default class FediverseValidator extends Validator {
      * @param s
      */
     reformat(s: string): string {
+        s = s.trim()
         if (!s.startsWith("@")) {
             s = "@" + s
         }
@@ -35,6 +36,7 @@ export default class FediverseValidator extends Validator {
         return undefined
     }
     getFeedback(s: string): Translation | undefined {
+        s = s.trim()
         const match = s.match(FediverseValidator.usernameAtServer)
         console.log("Match:", match)
         if (match) {