Update to iD v2.18.4

vendor/assets/iD/iD.js

@@ -40309,11 +40309,11 @@
 	        return new osmNode({
 	            id:  uid,
 	            visible: typeof obj.visible === 'boolean' ? obj.visible : true,
-	            version: obj.version.toString(),
-	            changeset: obj.changeset.toString(),
+	            version: obj.version && obj.version.toString(),
+	            changeset: obj.changeset && obj.changeset.toString(),
 	            timestamp: obj.timestamp,
 	            user: obj.user,
-	            uid: obj.uid.toString(),
+	            uid: obj.uid && obj.uid.toString(),
 	            loc: [parseFloat(obj.lon), parseFloat(obj.lat)],
 	            tags: obj.tags
 	        });
@@ -40323,11 +40323,11 @@
 	        return new osmWay({
 	            id:  uid,
 	            visible: typeof obj.visible === 'boolean' ? obj.visible : true,
-	            version: obj.version.toString(),
-	            changeset: obj.changeset.toString(),
+	            version: obj.version && obj.version.toString(),
+	            changeset: obj.changeset && obj.changeset.toString(),
 	            timestamp: obj.timestamp,
 	            user: obj.user,
-	            uid: obj.uid.toString(),
+	            uid: obj.uid && obj.uid.toString(),
 	            tags: obj.tags,
 	            nodes: getNodesJSON(obj)
 	        });
@@ -40337,11 +40337,11 @@
 	        return new osmRelation({
 	            id:  uid,
 	            visible: typeof obj.visible === 'boolean' ? obj.visible : true,
-	            version: obj.version.toString(),
-	            changeset: obj.changeset.toString(),
+	            version: obj.version && obj.version.toString(),
+	            changeset: obj.changeset && obj.changeset.toString(),
 	            timestamp: obj.timestamp,
 	            user: obj.user,
-	            uid: obj.uid.toString(),
+	            uid: obj.uid && obj.uid.toString(),
 	            tags: obj.tags,
 	            members: getMembersJSON(obj)
 	        });
@@ -62437,7 +62437,7 @@
 	        // Guess a type based on the tokens present in the template
 	        // (This is for 'custom' source, where we don't know)
 	        if (!source.type) {
-	            if (/\{(proj|wkid|bbox)\}/.test(_template)) {
+	            if (/SERVICE=WMS|\{(proj|wkid|bbox)\}/.test(_template)) {
 	                source.type = 'wms';
 	                source.projection = 'EPSG:3857';  // guess
 	            } else if (/\{(x|y)\}/.test(_template)) {
@@ -62484,23 +62484,30 @@
 	              switch (key) {
 	                case 'width':
 	                case 'height':
-	                  return tileSize;
+	                    return tileSize;
 	                case 'proj':
-	                  return projection;
+	                    return projection;
 	                case 'wkid':
-	                  return projection.replace(/^EPSG:/, '');
+	                    return projection.replace(/^EPSG:/, '');
 	                case 'bbox':
-	                  return minXmaxY.x + ',' + maxXminY.y + ',' + maxXminY.x + ',' + minXmaxY.y;
+	                    // WMS 1.3 flips x/y for some coordinate systems including EPSG:4326 - #7557
+	                    if (projection === 'EPSG:4326' &&
+	                        // The CRS parameter implies version 1.3 (prior versions use SRS)
+	                        /VERSION=1.3|CRS={proj}/.test(source.template())) {
+	                        return maxXminY.y + ',' + minXmaxY.x + ',' + minXmaxY.y + ',' + maxXminY.x;
+	                    } else {
+	                        return minXmaxY.x + ',' + maxXminY.y + ',' + maxXminY.x + ',' + minXmaxY.y;
+	                    }
 	                case 'w':
-	                  return minXmaxY.x;
+	                    return minXmaxY.x;
 	                case 's':
-	                  return maxXminY.y;
+	                    return maxXminY.y;
 	                case 'n':
-	                  return maxXminY.x;
+	                    return maxXminY.x;
 	                case 'e':
-	                  return minXmaxY.y;
+	                    return minXmaxY.y;
 	                default:
-	                  return token;
+	                    return token;
 	              }
 	            });
 
@@ -76921,7 +76928,7 @@
 	        point: _t('modes.add_point.title'),
 	        line: _t('modes.add_line.title'),
 	        area: _t('modes.add_area.title'),
-	        note: _t('modes.add_note.title'),
+	        note: _t('modes.add_note.label'),
 	        delete: _t('operations.delete.title'),
 	        move: _t('operations.move.title'),
 	        orthogonalize: _t('operations.orthogonalize.title'),
@@ -117991,7 +117998,7 @@
 	  var context = utilRebind({}, dispatch$1, 'on');
 	  var _deferred = new Set();
 
-	  context.version = '2.18.3';
+	  context.version = '2.18.4';
 	  context.privacyVersion = '20200407';
 
 	  // iD will alter the hash so cache the parameters intended to setup the session

vendor/assets/iD/iD/locales/en.json

@@ -231,7 +231,7 @@
                 },
                 "too_bendy": {
                     "single": "This can't be straightened because it bends too much.",
-                    "multiple": "These can't be straighted because they bend too much."
+                    "multiple": "These can't be straightened because they bend too much."
                 },
                 "connected_to_hidden": {
                     "single": "This can't be straightened because it is connected to a hidden feature.",
@@ -1096,7 +1096,7 @@
                 "delete": "Leave Deleted",
                 "download_changes": "Or download osmChange file",
                 "done": "All conflicts resolved!",
-                "help": "Another user changed some of the same map features you changed.\nClick on each feature below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
+                "help": "Another user changed some of the same map features you changed. Click on each feature below for more details about the conflict, and choose whether to keep your changes or the other user's changes."
             }
         },
         "merge_remote_changes": {

vendor/assets/iD/iD/locales/sat.json

@@ -1 +1 @@
-{"sat":{"icons":{"download":"ᱟᱹᱛᱩᱨ ᱟᱬᱜᱚ","information":"ᱞᱟᱹᱭ ᱥᱚᱫᱚᱨ","remove":"ᱚᱰᱚᱠ","undo":"ᱯᱟᱪᱷᱞᱟᱭ ᱢᱮ","zoom_to":"ᱡᱩᱢ ᱛᱮ","copy":"ᱱᱚᱠᱚᱞ","view_on":"{domain} ᱨᱮ ᱫᱮᱠᱷᱟᱣᱢᱮ","favorite":"ᱠᱩᱥᱤᱠᱚ","list":"ᱛᱟᱞᱠᱟ","text":"ᱚᱞ ᱠᱚ","deselect":"ᱵᱚᱱᱫᱚᱭ"},"toolbar":{"recent":"ᱱᱤᱛᱚᱜᱼᱟ","favorites":"ᱠᱩᱥᱤᱠᱚ","add_feature":"ᱯᱷᱤᱪᱚᱨ ᱮᱢ ᱥᱮᱞᱣᱫ ᱢᱮ"},"modes":{"add_feature":{"title":"ᱯᱷᱤᱪᱚᱨ ᱥᱮᱞᱮᱫ ᱢᱮ","description":"ᱱᱚᱠᱥᱟ ᱨᱮ ᱯᱷᱤᱪᱨᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ ᱾","key":"ᱴᱮᱵ","result":"{count} ᱚᱨᱡᱚ","results":"{count} ᱚᱨᱡᱚ ᱠᱚ"},"add_area":{"title":"ᱴᱚᱴᱷᱟ","filter_tooltip":"ᱴᱚᱴᱷᱟ"},"add_line":{"title":"ᱜᱟᱨ","filter_tooltip":"ᱜᱟᱨ"},"add_point":{"title":"ᱵᱤᱸᱫᱩ","filter_tooltip":"ᱵᱤᱸᱫᱩ ᱠᱚ"},"add_note":{"title":"ᱱᱚᱴ","label":"ᱱᱚᱴ ᱥᱮᱞᱮᱫ ᱢᱮ"}},"operations":{"add":{"annotation":{"note":"ᱠᱷᱟᱴᱚ ᱠᱟᱛᱷᱟ ᱥᱮᱞᱮᱫ ᱮᱱᱟ ᱾"}},"paste":{"title":"ᱞᱟᱴᱷᱟ","annotation":{"single":"ᱯᱷᱤᱪᱚᱨ ᱞᱟᱴᱷᱟ ᱮᱱᱟ ","multiple":"ᱞᱟᱴᱷᱟᱠᱟᱱ {n} ᱯᱷᱤᱪᱚᱨ ᱾"}},"straighten":{"key":"S"},"delete":{"title":"ᱜᱮᱫ ᱜᱤᱰᱤ"}},"commit":{"cancel":"ᱵᱟᱰ","changes":"ᱵᱚᱫᱚᱞᱠᱩ ({count})","errors":"ᱵᱷᱩᱞ"},"map_data":{"layers":{"notes":{"title":"OpenStreetMap ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ"}}},"help":{"notes":{"title":"ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ","add_note_h":"ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱮᱞᱮᱫ","save_note_h":"ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱟᱱᱪᱟᱣ"}},"issues":{"errors":{"list_title":"ᱵᱷᱩᱞ ({count})"}},"intro":{"ok":"ᱴᱷᱤᱠ"}}}
+{"sat":{"icons":{"download":"ᱟᱹᱛᱩᱨ ᱟᱬᱜᱚ","information":"ᱞᱟᱹᱭ ᱥᱚᱫᱚᱨ","remove":"ᱚᱰᱚᱠ","undo":"ᱯᱟᱪᱷᱞᱟᱭ ᱢᱮ","zoom_to":"ᱡᱩᱢ ᱛᱮ","copy":"ᱱᱚᱠᱚᱞ","view_on":"{domain} ᱨᱮ ᱫᱮᱠᱷᱟᱣᱢᱮ","favorite":"ᱠᱩᱥᱤᱠᱚ","list":"ᱛᱟᱞᱠᱟ","text":"ᱚᱞ ᱠᱚ","deselect":"ᱟᱞᱚ ᱪᱚᱭᱚᱱ"},"toolbar":{"inspect":"ᱯᱟᱱᱛᱮ","undo_redo":"ᱢᱟᱲᱟᱝ / ᱨᱩᱟᱹᱲ ᱟᱹᱜᱩ","recent":"ᱱᱤᱛᱚᱜᱼᱟ","favorites":"ᱠᱩᱥᱤᱠᱚ","add_feature":"ᱯᱷᱤᱪᱚᱨ ᱮᱢ ᱥᱮᱞᱮᱫ ᱢᱮ"},"title":{"format":{"context":"{base} – {context}","changes":"({changes}) {base}","changes_context":"({changes}) {base} – {context}"},"labeled_and_more":"{labeled} ᱟᱨ {count} ᱟᱨᱦᱚᱸ"},"modes":{"add_feature":{"title":"ᱯᱷᱤᱪᱚᱨ ᱥᱮᱞᱮᱫ ᱢᱮ","description":"ᱱᱚᱠᱥᱟ ᱨᱮ ᱯᱷᱤᱪᱨᱚ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ ᱾","key":"ᱴᱮᱵ","result":"{count} ᱚᱨᱡᱚ","results":"{count} ᱚᱨᱡᱚ ᱠᱚ"},"add_area":{"title":"ᱴᱚᱴᱷᱟ","description":"ᱯᱟᱨᱠ, ᱯᱟᱠᱟ ᱚᱲᱟᱜ, ᱫᱚᱨᱮᱭᱟ ᱟᱨ ᱵᱟᱝ ᱚᱞᱜᱟ ᱡᱟᱭᱜᱟ ᱱᱚᱠᱥᱟ ᱨᱮ ᱥᱮᱞᱮᱫ ᱢᱮ ᱾","filter_tooltip":"ᱴᱚᱴᱷᱟ"},"add_line":{"title":"ᱜᱟᱨ","filter_tooltip":"ᱜᱟᱨ"},"add_point":{"title":"ᱵᱤᱸᱫᱩ","filter_tooltip":"ᱵᱤᱸᱫᱩ ᱠᱚ"},"add_note":{"title":"ᱱᱚᱴ","label":"ᱱᱚᱴ ᱥᱮᱞᱮᱫ ᱢᱮ"}},"operations":{"add":{"annotation":{"note":"ᱠᱷᱟᱴᱚ ᱠᱟᱛᱷᱟ ᱥᱮᱞᱮᱫ ᱮᱱᱟ ᱾"}},"paste":{"title":"ᱞᱟᱴᱷᱟ","annotation":{"single":"ᱯᱷᱤᱪᱚᱨ ᱞᱟᱴᱷᱟ ᱮᱱᱟ ","multiple":"ᱞᱟᱴᱷᱟᱠᱟᱱ {n} ᱯᱷᱤᱪᱚᱨ ᱾"}},"straighten":{"key":"S","annotation":{"points":"ᱟᱹᱰᱤᱜᱟᱱ ᱴᱤᱰᱟᱹᱜ ᱥᱤᱫᱷᱟᱭ ᱢᱮ ᱾","line":"ᱜᱟᱨ ᱥᱤᱫᱷᱟ ᱮᱱᱟ ᱾","lines":"ᱟᱹᱰᱤᱜᱟᱱ ᱜᱟᱨ ᱥᱤᱫᱷᱟᱮᱱᱟ ᱾"},"too_bendy":{"single":"ᱱᱚᱶᱟ ᱫᱚ ᱵᱟᱭ ᱥᱤᱫᱷᱟᱫ ᱜᱟᱸᱚᱜ-ᱟ  ᱪᱮᱫᱟᱜ ᱱᱚᱣᱟ ᱫᱚ ᱟᱹᱰᱤ ᱠᱟᱹᱲᱵᱝ ᱠᱟᱱᱟ ᱾","multiple":"ᱱᱚᱶᱟ ᱫᱚ ᱵᱟᱭ ᱥᱤᱫᱷᱟᱹ ᱜᱟᱸᱚᱜ-ᱟ ᱪᱮᱫᱟᱜ ᱱᱚᱶᱟ ᱫᱚ ᱟᱹᱰᱤ ᱠᱟᱹᱲᱵᱩᱝ ᱠᱟᱱᱟ ᱾"}},"delete":{"title":"ᱜᱮᱫ ᱜᱤᱰᱤ"}},"commit":{"cancel":"ᱵᱟᱰ","changes":"ᱵᱚᱫᱚᱞᱠᱩ ({count})","errors":"ᱵᱷᱩᱞ"},"map_data":{"layers":{"notes":{"title":"OpenStreetMap ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ"}}},"help":{"notes":{"title":"ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ","add_note_h":"ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱮᱞᱮᱫ","save_note_h":"ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱟᱱᱪᱟᱣ"}},"issues":{"errors":{"list_title":"ᱵᱷᱩᱞ ({count})"}},"intro":{"ok":"ᱴᱷᱤᱠ"}}}