A pass at conflict resolution.

CHANGELOG.md

@@ -204,9 +204,9 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 #### :mega: Release Highlights
 * Upgrade to tagging schema v6 ([#9477]):
-  * Add new `date` field for tags like `check_date`
-  * Add [Röntgen icon set](https://github.com/enzet/map-machine#r%C3%B6ntgen-icon-set)
-  * Combo fields can now specify arbitrary icons for individual tag values
+    * Add new `date` field for tags like `check_date`
+    * Add [Röntgen icon set](https://github.com/enzet/map-machine#r%C3%B6ntgen-icon-set)
+    * Combo fields can now specify arbitrary icons for individual tag values
 #### :bug: Bugfixes
 * Fix context "edit" menu on touchscreens: render labels properly and always open the touch-specific edit menu ([#9425])
 #### :hammer: Development
@@ -230,6 +230,12 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Rotate _Mapbox Satellite_ imagery access token
 
 
+# 2.24.1
+##### 2023-Jan-25
+
+* Rotate Mapbox Satellite imagery access token
+
+
 # 2.24.0
 ##### 2023-Jan-19
 

FAQ.md

@@ -15,7 +15,7 @@ To report an issue with missing or cloudy imagery:
 * _For Bing Satellite layer:_ Open the location in [Bing Maps](https://www.bing.com/maps), click the "Feedback" button and choose "Report a map problem" option.
 * _For Esri World Imagery:_ You can open a new issue using the [Imagery Map Feedback tool](https://www.arcgis.com/home/item.html?id=ebdfa4146680410bb952c7d532ea5407).
 
-iD's list of available background imagery sources come from the [editor-layer-index](https://github.com/osmlab/editor-layer-index)
+iD's list of available background imagery sources come from the [ohm-editor-layer-index](https://github.com/openhistoricalmap/ohm-editor-layer-index)
 project.  If you know of a more recent imagery source that is licensed for this use,
 please open a request there with the link and license details.
 

README.md

@@ -78,7 +78,7 @@ iD also bundles portions of the following open source software.
 
 * [D3.js (BSD-3-Clause)](https://github.com/d3/d3)
 * [CLDR (Unicode Consortium Terms of Use)](https://github.com/unicode-cldr/cldr-json)
-* [editor-layer-index (CC-BY-SA 3.0)](https://github.com/osmlab/editor-layer-index)
+* [ohm-editor-layer-index (CC-BY-SA 3.0)](https://github.com/openhistoricalmap/ohm-editor-layer-index)
 * [Font Awesome (CC-BY 4.0)](https://fontawesome.com/license)
 * [Maki (CC0 1.0)](https://github.com/mapbox/maki)
 * [Temaki (CC0 1.0)](https://github.com/ideditor/temaki)

config/id.js

@@ -13,7 +13,7 @@ const nsiCdnUrl = ENV__ID_NSI_CDN_URL
 // api urls and settings
 const defaultOsmApiConnections = {
   live: {
-    url: 'https://www.openstreetmap.org',
+    url: 'https://www.openhistoricalmap.org',
     client_id: '0tmNTmd0Jo1dQp4AUmMBLtGiD9YpMuXzHefitcuVStc',
     client_secret: 'BTlNrNxIPitHdL4sP2clHw5KLoee9aKkA7dQbc0Bj7Q'
   },

dist/data/address_formats.min.json

@@ -0,0 +1 @@
+[{"format":[["housenumber","street"],["city","postcode"]]},{"countryCodes":["au"],"format":[["unit","housenumber","street"],["suburb","state","postcode"]]},{"countryCodes":["gb"],"format":[["housename"],["housenumber","street"],["city","postcode"]]},{"countryCodes":["ie"],"format":[["housename"],["housenumber","street"],["city"],["postcode"]]},{"countryCodes":["at","bg","ch","de","si","pl"],"format":[["street","housenumber"],["postcode","city"]]},{"countryCodes":["ad","ba","be","cz","dk","es","fi","gr","hr","is","it","li","nl","no","pt","se","sk","sm","va"],"format":[["street","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fr","lu","mo"],"format":[["housenumber","street"],["postcode","city"]]},{"countryCodes":["br"],"format":[["street"],["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"],["place","street"],["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":["tr"],"format":[["neighbourhood"],["street","housenumber"],["postcode","district","city"]]},{"countryCodes":["ua"],"format":[["housenumber","postcode"],["street"]]},{"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}}]