Merge pull request 'Some fixes' (#2294) from Robin-van-der-Linde/MapComplete:RobinLinde-patch-1 into develop

Reviewed-on: #2294
Reviewed-by: Pieter Vander Vennet <pietervdvn@nerdlab.nohost.me>

.vscode/extensions.json

@@ -2,10 +2,10 @@
   "recommendations": [
     "esbenp.prettier-vscode",
     "eamodio.gitlens",
-    "github.vscode-pull-request-github",
     "svelte.svelte-vscode",
     "bradlc.vscode-tailwindcss",
     "editorconfig.editorconfig",
-    "dbaeumer.vscode-eslint"
+    "dbaeumer.vscode-eslint",
+    "robin-van-der-linde.mapcompletevscode"
   ]
 }

assets/layers/charging_station/charging_station.json

@@ -2200,7 +2200,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:voltage={{commonVoltages}} V",
+            "if": "{{key}}:voltage={{commonVoltages}}",
             "then": {
               "en": "{{description}} outputs {{commonVoltages}} volt",
               "nl": "{{description}} heeft een spanning van {{commonVoltages}} volt",
@@ -2238,7 +2238,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:current={{commonCurrent}} A",
+            "if": "{{key}}:current={{commonCurrent}}",
             "then": {
               "en": "{{description}} outputs at most {{commonCurrent}} A",
               "nl": "{{description}} levert een stroom van maximaal {{commonCurrent}} A",

assets/layers/charging_station/charging_station.proto.json

@@ -266,7 +266,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:voltage={{commonVoltages}} V",
+            "if": "{{key}}:voltage={{commonVoltages}}",
             "then": {
               "en": "{{description}} outputs {{commonVoltages}} volt",
               "nl": "{{description}} heeft een spanning van {{commonVoltages}} volt",
@@ -299,7 +299,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:current={{commonCurrent}} A",
+            "if": "{{key}}:current={{commonCurrent}}",
             "then": {
               "en": "{{description}} outputs at most {{commonCurrent}} A",
               "nl": "{{description}} levert een stroom van maximaal {{commonCurrent}} A"
@@ -332,8 +332,8 @@
           "mappings": {
             "if": "{{key}}:output={{commonOutput}}",
             "then": {
-              "en": "{{description}} outputs at most {{commonOutput}} A",
+              "en": "{{description}} outputs at most {{commonOutput}} kW",
-              "nl": "{{description}} levert een vermogen van maximaal {{commonOutput}} A"
+              "nl": "{{description}} levert een vermogen van maximaal {{commonOutput}} kW"
             }
           },
           "condition": {

assets/layers/vending_machine/vending_machine.json

@@ -26,6 +26,7 @@
       ]
     }
   },
+  "minzoom": 13,
   "calculatedTags": [
     "_vending_count=feat.properties.vending.split(';').length"
   ],

assets/themes/vending_machine/vending_machine.json

@@ -62,7 +62,10 @@
       "override": {
         "isCounted": false,
         "name": null,
-        "minzoom": 18
+        "minzoom": 16,
+        "=filter": {
+          "sameAs": "vending_machine"
+        }
       }
     },
     {
@@ -70,7 +73,10 @@
       "override": {
         "isCounted": false,
         "name": null,
-        "minzoom": 18
+        "minzoom": 13,
+        "=filter": {
+          "sameAs": "vending_machine"
+        }
       }
     },
     {
@@ -78,8 +84,11 @@
       "override": {
         "isCounted": false,
         "name": null,
-        "minzoom": 18
+        "minzoom": 16,
+        "=filter": {
+          "sameAs": "vending_machine"
+        }
       }
     }
   ]
-}
+}

langs/ko.json

@@ -144,13 +144,13 @@
             "import": {
                 "hasBeenImported": "이 객체는 추가되었습니다",
                 "howToTest": "테스트하려면 URL에 <b>test=true</b> 또는 <b>backend=osm-test</b>를 추가하세요. 변경사항은 콘솔에 출력됩니다. 실제로 가져오기 버튼을 활성화하려면 이 테마를 공식화하기 위한 PR을 열어주세요.",
-                "importTags": "이 요소는에 {tag}가 부여됩니다",
+                "importTags": "이 요소는에 {tags}가 부여됩니다",
                 "officialThemesOnly": "비공식 테마에서는 사고를 방지하기 위해 가져오기 버튼이 비활성화됩니다",
                 "wrongType": "이 요소는 경로나 길이 아니기 때문에 추가할 수 없습니다",
                 "wrongTypeToConflate": "이 요소는 경로나 길이 아니기 때문에, 통합할 수 없습니다",
                 "zoomInMore": "이 요소를 추가하기 위해서 확대하세요"
             },
-            "importTags": "이 요소는에 {tag}가 부여됩니다",
+            "importTags": "이 요소는에 {tags}가 부여됩니다",
             "intro": "데이터가 없는 영역을 클릭했습니다.<br/>",
             "layerNotEnabled": "기능을 추가하려면 레이어 {layer}를 먼저 활성화해야 합니다",
             "openLayerControl": "레이어 조정 상자 열기",

langs/layers/de.json

@@ -2732,7 +2732,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} liefert maximal {{commonOutput}} A"
+                            "then": "{{description}} liefert maximal {{commonOutput}}"
                         },
                         "question": "Welche Leistung liefert ein einzelner Stecker des Typs {{description}}?",
                         "render": "{{description}} liefert maximal {canonical({{key}}:output)}"

langs/layers/en.json

@@ -2761,7 +2761,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} outputs at most {{commonOutput}} A"
+                            "then": "{{description}} outputs at most {{commonOutput}}"
                         },
                         "question": "What power output does a single plug of type {{description}} offer?",
                         "render": "{{description}} outputs at most {canonical({{key}}:output)}"

langs/layers/es.json

@@ -2724,7 +2724,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} entrega como máximo {{commonOutput}} A"
+                            "then": "{{description}} entrega como máximo {{commonOutput}}"
                         },
                         "question": "¿Qué potencia de salida ofrece un solo enchufe del tipo {{description}}?",
                         "render": "{{description}} entrega como máximo {canonical({{key}}:output)}"

langs/layers/nl.json

@@ -2728,7 +2728,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} levert een vermogen van maximaal {{commonOutput}} A"
+                            "then": "{{description}} levert een vermogen van maximaal {{commonOutput}}"
                         },
                         "question": "Welk vermogen levert een enkele stekker van type {{description}}?",
                         "render": "{{description}} levert een vermogen van maximaal {canonical({{key}}:output)}"

langs/themes/ko.json

@@ -176,7 +176,7 @@
                         "0": {
                             "mappings": {
                                 "0": {
-                                    "then": "<span class='subtle'>이<a href='#{_embedding_feature:id}'>포함된 요소</a>따르면, 이는</span>접근이 가능합니다<br/>{_embedding_feature:access:description"
+                                    "then": "<span class='subtle'>이<a href='#{_embedding_feature:id}'>포함된 요소</a>따르면, 이는</span>접근이 가능합니다<br/>{_embedding_feature:access:description}"
                                 },
                                 "1": {
                                     "then": "<span class='subtle'>이 <a href='#{_embedding_feature:id}'>포함된 요소</a>에 따르면,</span>접근을 위한 허가가 필요합니다<br/>{_embedding_feature:access:description}"