Merge remote-tracking branch 'upstream/pull/3574'

vendor/assets/iD/iD.js

@@ -22236,7 +22236,7 @@
 
   // package.json
   var name = "iD";
-  var version = "2.21.0";
+  var version = "2.21.1";
   var description = "A friendly editor for OpenStreetMap";
   var main = "dist/iD.min.js";
   var repository = "github:openstreetmap/iD";
@@ -35011,12 +35011,19 @@
           if (!endEarly) {
             const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent2 - 1)}}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))`);
             const hrRegex = new RegExp(`^ {0,${Math.min(3, indent2 - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
+            const fencesBeginRegex = new RegExp(`^( {0,${Math.min(3, indent2 - 1)}})(\`\`\`|~~~)`);
             while (src) {
               rawLine = src.split("\n", 1)[0];
               line = rawLine;
               if (this.options.pedantic) {
                 line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, "  ");
               }
+              if (fencesBeginRegex.test(line)) {
+                break;
+              }
+              if (this.rules.block.heading.test(line)) {
+                break;
+              }
               if (nextBulletRegex.test(line)) {
                 break;
               }
@@ -37743,6 +37750,7 @@ ${content}</tr>
       "shop/alcohol",
       "shop/beer",
       "shop/beverages",
+      "shop/kiosk",
       "shop/wine"
     ],
     camping: [
@@ -37770,6 +37778,7 @@ ${content}</tr>
       "shop/convenience",
       "shop/cosmetics",
       "shop/grocery",
+      "shop/kiosk",
       "shop/newsagent",
       "shop/perfumery"
     ],
@@ -37788,6 +37797,7 @@ ${content}</tr>
       "shop/computer",
       "shop/electronics",
       "shop/hifi",
+      "shop/kiosk",
       "shop/mobile",
       "shop/mobile_phone",
       "shop/telecommunication"
@@ -37836,6 +37846,7 @@ ${content}</tr>
       "shop/confectionary",
       "shop/confectionery",
       "shop/food",
+      "shop/kiosk",
       "shop/ice_cream",
       "shop/pastry",
       "shop/tea"
@@ -37850,6 +37861,7 @@ ${content}</tr>
       "shop/gift",
       "shop/card",
       "shop/cards",
+      "shop/kiosk",
       "shop/stationery"
     ],
     hardware: [
@@ -37936,6 +37948,7 @@ ${content}</tr>
       "amenity/car_rental",
       "amenity/truck_rental",
       "amenity/vehicle_rental",
+      "shop/kiosk",
       "shop/rental"
     ],
     school: [
@@ -37971,6 +37984,7 @@ ${content}</tr>
     ],
     vending: [
       "amenity/vending_machine",
+      "shop/kiosk",
       "shop/vending_machine"
     ],
     weight_loss: [
@@ -43142,7 +43156,7 @@ ${content}</tr>
       return source;
     };
     source.url = function(coord2) {
-      var result = _template.replace(/#.*/su, "");
+      var result = _template.replace(/#[\s\S]*/u, "");
       if (result === "")
         return result;
       if (!source.type || source.id === "custom") {
@@ -67997,7 +68011,7 @@ ${content}</tr>
     const dispatch10 = dispatch_default("enter", "exit", "change");
     let context = utilRebind({}, dispatch10, "on");
     let _deferred2 = /* @__PURE__ */ new Set();
-    context.version = "2.21.0";
+    context.version = "2.21.1";
     context.privacyVersion = "20201202";
     context.initialHashParams = window.location.hash ? utilStringQs(window.location.hash) : {};
     context.changeset = null;

vendor/assets/iD/iD/locales/index.min.json

@@ -1 +1 @@
-{"af":{"rtl":false,"pct":0.04},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":1},"ar-AA":{"rtl":true,"pct":0.01},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.16},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.2},"bg":{"rtl":false,"pct":0.45},"bg-BG":{"rtl":false,"pct":0},"bg@Cyrl":{"rtl":false,"pct":0},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"br":{"rtl":false,"pct":0},"bs":{"rtl":false,"pct":0.02},"ca":{"rtl":false,"pct":0.5},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":1},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.03},"da":{"rtl":false,"pct":0.49},"de":{"rtl":false,"pct":1},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.36},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.21},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.75},"es":{"rtl":false,"pct":0.99},"et":{"rtl":false,"pct":0.17},"eu":{"rtl":false,"pct":0.05},"fa":{"rtl":true,"pct":0.58},"fa-IR":{"rtl":true,"pct":0},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.39},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.97},"fr-FR":{"rtl":false,"pct":0.08},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.59},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.7},"he-IL":{"rtl":true,"pct":0},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.18},"hu":{"rtl":false,"pct":0.92},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.08},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.34},"it":{"rtl":false,"pct":0.62},"ja":{"rtl":false,"pct":0.96},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0.01},"kn":{"rtl":false,"pct":0.06},"ko":{"rtl":false,"pct":0.34},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0},"ky":{"rtl":false,"pct":0},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.15},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.27},"mg":{"rtl":false,"pct":0.06},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.4},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.14},"my":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.01},"nl":{"rtl":false,"pct":0.74},"nl-NL":{"rtl":false,"pct":0},"nn":{"rtl":false,"pct":0.02},"no":{"rtl":false,"pct":0.51},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.75},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.66},"pt-BR":{"rtl":false,"pct":0.58},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.14},"ru":{"rtl":false,"pct":0.51},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.03},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.58},"sl":{"rtl":false,"pct":0.16},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.01},"sq":{"rtl":false,"pct":0.08},"sr":{"rtl":false,"pct":0.37},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":0.96},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.08},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.01},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.03},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.69},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":0.93},"ur":{"rtl":true,"pct":0},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.88},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.1},"zh":{"rtl":false,"pct":0.02},"zh-CN":{"rtl":false,"pct":0.79},"zh-HK":{"rtl":false,"pct":0.33},"zh-TW":{"rtl":false,"pct":0.86},"zu":{"rtl":false,"pct":0}}
+{"af":{"rtl":false,"pct":0.04},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":1},"ar-AA":{"rtl":true,"pct":0.01},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.16},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.19},"bg":{"rtl":false,"pct":0.44},"bg-BG":{"rtl":false,"pct":0},"bg@Cyrl":{"rtl":false,"pct":0},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"br":{"rtl":false,"pct":0},"bs":{"rtl":false,"pct":0.02},"ca":{"rtl":false,"pct":0.49},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":1},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.03},"da":{"rtl":false,"pct":0.48},"de":{"rtl":false,"pct":1},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.35},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.21},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.74},"es":{"rtl":false,"pct":1},"et":{"rtl":false,"pct":0.17},"eu":{"rtl":false,"pct":0.05},"fa":{"rtl":true,"pct":0.58},"fa-IR":{"rtl":true,"pct":0},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.39},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.96},"fr-FR":{"rtl":false,"pct":0.08},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.58},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.69},"he-IL":{"rtl":true,"pct":0},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.17},"hu":{"rtl":false,"pct":0.91},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.08},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.33},"it":{"rtl":false,"pct":0.61},"ja":{"rtl":false,"pct":0.95},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0.01},"kn":{"rtl":false,"pct":0.06},"ko":{"rtl":false,"pct":0.34},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0},"ky":{"rtl":false,"pct":0},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.15},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.27},"mg":{"rtl":false,"pct":0.06},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.4},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.13},"my":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.01},"nl":{"rtl":false,"pct":0.73},"nl-NL":{"rtl":false,"pct":0},"nn":{"rtl":false,"pct":0.02},"no":{"rtl":false,"pct":0.5},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.74},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.65},"pt-BR":{"rtl":false,"pct":0.58},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.13},"ru":{"rtl":false,"pct":0.5},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.03},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.57},"sl":{"rtl":false,"pct":0.16},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.01},"sq":{"rtl":false,"pct":0.08},"sr":{"rtl":false,"pct":0.36},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":0.95},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.08},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.01},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.03},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.68},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":0.93},"ur":{"rtl":true,"pct":0.05},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.91},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.1},"zh":{"rtl":false,"pct":0.02},"zh-CN":{"rtl":false,"pct":0.77},"zh-HK":{"rtl":false,"pct":0.33},"zh-TW":{"rtl":false,"pct":0.86},"zu":{"rtl":false,"pct":0}}