From: Martin Raifer Date: Thu, 29 Feb 2024 10:04:27 +0000 (+0100) Subject: Update to iD v2.28.1 X-Git-Tag: live~220^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1c3220577b0a263588f2b41b94ce7309535987af Update to iD v2.28.1 --- diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js index b2d625139..0c6f719a4 100644 --- a/vendor/assets/iD/iD.js +++ b/vendor/assets/iD/iD.js @@ -22289,7 +22289,7 @@ // package.json var package_default = { name: "iD", - version: "2.28.0", + version: "2.28.1", description: "A friendly editor for OpenStreetMap", main: "dist/iD.min.js", repository: "github:openstreetmap/iD", @@ -30102,8 +30102,6 @@ if (_this.tags[k2] || !tags[k2]) { tags[k2] = "yes"; } - } else if (addTags[k2] === "") { - delete tags[k2]; } else { tags[k2] = addTags[k2]; } @@ -78303,13 +78301,13 @@ Object.values(vals[0].presets).forEach((preset) => preset.suggestion = true); Object.values(vals[0].presets).forEach((preset) => { if (preset.tags["brand:wikidata"]) { - preset.addTags["brand:wikipedia"] = ""; + preset.removeTags = { "brand:wikipedia": "*", ...preset.removeTags || preset.addTags || preset.tags }; } if (preset.tags["operator:wikidata"]) { - preset.addTags["operator:wikipedia"] = ""; + preset.removeTags = { "operator:wikipedia": "*", ...preset.removeTags || preset.addTags || preset.tags }; } if (preset.tags["network:wikidata"]) { - preset.addTags["network:wikipedia"] = ""; + preset.removeTags = { "network:wikipedia": "*", ...preset.removeTags || preset.addTags || preset.tags }; } }); _mainPresetIndex.merge({ diff --git a/vendor/assets/iD/iD/data/address_formats.min.json b/vendor/assets/iD/iD/data/address_formats.min.json index 3235ffb6e..ef6087afc 100644 --- a/vendor/assets/iD/iD/data/address_formats.min.json +++ b/vendor/assets/iD/iD/data/address_formats.min.json @@ -1 +1 @@ -[{"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["au"],"format":[["unit","housenumber","street"],["suburb","state","postcode"]]},{"countryCodes":["id"],"format":[["unit","housename"],["street","housenumber","neighbourhood"],["subdistrict","district"],["city","province","postcode"]]},{"countryCodes":["gb"],"format":[["housename"],["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["ie"],"format":[["housename"],["housenumber","street+place"],["city"],["postcode"]]},{"countryCodes":["at","bg","ch","de","si","pl","lt"],"format":[["street+place","housenumber"],["postcode","city"]]},{"countryCodes":["ad","ba","be","dk","es","gr","hr","it","pt","se","sm","va"],"format":[["street+place","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fi","is","li","nl","no"],"format":[["street","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fr","lu"],"format":[["housenumber","street+place"],["postcode","city"]]},{"countryCodes":["mo"],"format":[["housenumber","street"],["postcode","city"]]},{"countryCodes":["br"],"format":[["street+place"],["housenumber","suburb"],["city","postcode"]]},{"countryCodes":["vn"],"format":[["housenumber","street"],["subdistrict"],["district"],["city"],["province","postcode"]]},{"countryCodes":["ca"],"format":[["housenumber","street","unit"],["city","province","postcode"]]},{"countryCodes":["us"],"format":[["housenumber","street","unit"],["city","state","postcode"]]},{"countryCodes":["tw"],"format":[["postcode","city","district"],["street+place"],["housenumber","floor","unit"]]},{"countryCodes":["jp"],"format":[["postcode","province","county"],["city","suburb"],["quarter","neighbourhood"],["block_number","housenumber"]],"dropdowns":["postcode","province","county","city","suburb","quarter","neighbourhood","block_number"],"widths":{"postcode":0.3,"province":0.35,"county":0.35,"city":0.65,"suburb":0.35,"quarter":0.5,"neighbourhood":0.5,"block_number":0.5,"housenumber":0.5}},{"countryCodes":["kr"],"format":[["province","city","district"],["street","housenumber","unit"],["postcode"]]},{"countryCodes":["tr"],"format":[["neighbourhood"],["street+place","housenumber"],["postcode","district","city"]]},{"countryCodes":["ua"],"format":[["housenumber","postcode"],["street+place"]]},{"countryCodes":["cn"],"format":[["postcode","province"],["city","district"],["street","housenumber"]],"widths":{"postcode":0.3,"province":0.7,"city":0.5,"district":0.5,"street":0.7,"housenumber":0.3}},{"countryCodes":["bo"],"format":[["street","housenumber"],["neighbourhood","city"]],"widths":{"street":0.7,"housenumber":0.3,"neighbourhood":0.5,"city":0.5}},{"countryCodes":["pe"],"format":[["street","housenumber"],["neighbourhood"],["city","state","postcode"]],"dropdowns":["street","neighbourhood","city","state","postcode"],"widths":{"street":0.7,"housenumber":0.3,"city":0.4,"state":0.4,"postcode":0.2}},{"countryCodes":["mx"],"format":[["street","housenumber"],["neighbourhood"],["postcode","city","state"]]},{"countryCodes":["lv"],"format":[["street","housenumber"],["housename","subdistrict"],["district","city","postcode"]],"dropdowns":["street","city","subdistrict","district","postcode"],"widths":{"street":0.7,"housenumber":0.3,"housename":0.4,"subdistrict":0.6,"district":0.4,"city":0.4,"postcode":0.2}},{"countryCodes":["in"],"format":[["housenumber","street"],["city","postcode"],["district"]]},{"countryCodes":["ru"],"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["cz","sk"],"format":[["street","housenumber"],["postcode","city"]]},{"countryCodes":["ph"],"format":[["unit","housename","housenumber","street"],["neighbourhood","district","city"],["postcode","province"]]},{"countryCodes":["hu"],"format":[["postcode","city"],["street","housenumber"]]}] \ No newline at end of file +[{"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["au"],"format":[["unit","housenumber","street"],["suburb","state","postcode"]]},{"countryCodes":["id"],"format":[["unit","housename"],["street","housenumber","neighbourhood"],["subdistrict","district"],["city","province","postcode"]]},{"countryCodes":["gb"],"format":[["housename"],["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["ie"],"format":[["housename"],["housenumber","street+place"],["city"],["postcode"]]},{"countryCodes":["at","bg","ch","de","si","pl","lt"],"format":[["street+place","housenumber"],["postcode","city"]]},{"countryCodes":["ad","ba","be","dk","es","gr","hr","it","pt","se","sm","va"],"format":[["street+place","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fi","is","li","nl","no"],"format":[["street","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fr","lu"],"format":[["housenumber","street+place"],["postcode","city"]]},{"countryCodes":["mo"],"format":[["housenumber","street"],["postcode","city"]]},{"countryCodes":["nz"],"format":[["housenumber","street"],["suburb"],["city","postcode"]]},{"countryCodes":["br"],"format":[["street+place"],["housenumber","suburb"],["city","postcode"]]},{"countryCodes":["vn"],"format":[["housenumber","street"],["subdistrict"],["district"],["city"],["province","postcode"]]},{"countryCodes":["ca"],"format":[["housenumber","street","unit"],["city","province","postcode"]]},{"countryCodes":["us"],"format":[["housenumber","street","unit"],["city","state","postcode"]]},{"countryCodes":["tw"],"format":[["postcode","city","district"],["street+place"],["housenumber","floor","unit"]]},{"countryCodes":["jp"],"format":[["postcode","province","county"],["city","suburb"],["quarter","neighbourhood"],["block_number","housenumber"]],"dropdowns":["postcode","province","county","city","suburb","quarter","neighbourhood","block_number"],"widths":{"postcode":0.3,"province":0.35,"county":0.35,"city":0.65,"suburb":0.35,"quarter":0.5,"neighbourhood":0.5,"block_number":0.5,"housenumber":0.5}},{"countryCodes":["kr"],"format":[["province","city","district"],["street","housenumber","unit"],["postcode"]]},{"countryCodes":["tr"],"format":[["neighbourhood"],["street+place","housenumber"],["postcode","district","city"]]},{"countryCodes":["ua"],"format":[["housenumber","postcode"],["street+place"]]},{"countryCodes":["cn"],"format":[["postcode","province"],["city","district"],["street","housenumber"]],"widths":{"postcode":0.3,"province":0.7,"city":0.5,"district":0.5,"street":0.7,"housenumber":0.3}},{"countryCodes":["bo"],"format":[["street","housenumber"],["neighbourhood","city"]],"widths":{"street":0.7,"housenumber":0.3,"neighbourhood":0.5,"city":0.5}},{"countryCodes":["pe"],"format":[["street","housenumber"],["neighbourhood"],["city","state","postcode"]],"dropdowns":["street","neighbourhood","city","state","postcode"],"widths":{"street":0.7,"housenumber":0.3,"city":0.4,"state":0.4,"postcode":0.2}},{"countryCodes":["mx"],"format":[["street","housenumber"],["neighbourhood"],["postcode","city","state"]]},{"countryCodes":["lv"],"format":[["street","housenumber"],["housename","subdistrict"],["district","city","postcode"]],"dropdowns":["street","city","subdistrict","district","postcode"],"widths":{"street":0.7,"housenumber":0.3,"housename":0.4,"subdistrict":0.6,"district":0.4,"city":0.4,"postcode":0.2}},{"countryCodes":["in"],"format":[["housenumber","street"],["city","postcode"],["district"]]},{"countryCodes":["ru"],"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["cz","sk"],"format":[["street","housenumber"],["postcode","city"]]},{"countryCodes":["ph"],"format":[["unit","housename","housenumber","street"],["neighbourhood","district","city"],["postcode","province"]]},{"countryCodes":["hu"],"format":[["postcode","city"],["street","housenumber"]]}] \ No newline at end of file