Merge pull request #7428 from openstreetmap/imagery_index

Imagery index

FAQ.md

@@ -15,8 +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)
-project.  If you know of a more recent imagery source that is licensed for this use,
+iD's list of available background imagery sources come from the [@ideditor/imagery-index](https://github.com/ideditor/imagery-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.
 
 

PRIVACY.md

@@ -24,7 +24,7 @@ Details on that are [here](https://github.com/openstreetmap/iD/blob/master/modul
 
 ### Background imagery and other third party services
 
-If you use background or streetside imagery to aid your edits, your browser must fetch information and images from a third-party imagery host. That use is governed by the respective privacy policies of each imagery host. The [Editor Layer Index](https://github.com/osmlab/editor-layer-index) and [iD Editor GitHub code](https://github.com/openstreetmap/iD/blob/master/modules/ui/map_data.js) provides detailed information as to imagery layer available in iD. In addition, you may use third party services to assist your editing or check for errors. See [here](https://github.com/openstreetmap/iD/tree/master/modules/services) for details. If you do not wish to interact with these third parties, do not use these features.
+If you use background or streetside imagery to aid your edits, your browser must fetch information and images from a third-party imagery host. That use is governed by the respective privacy policies of each imagery host. The [Imagery Index](https://github.com/ideditor/imagery-index) and [iD Editor GitHub code](https://github.com/openstreetmap/iD/blob/master/modules/ui/map_data.js) provide detailed information as to imagery layers available in iD. In addition, you may use third party services to assist your editing or check for errors. See [here](https://github.com/openstreetmap/iD/tree/master/modules/services) for details. If you do not wish to interact with these third parties, do not use these features.
 
 ### Name Suggestion Index
 
@@ -37,4 +37,5 @@ If you believe that we hold information that would allow us to correct, amend, o
 
 ### Changelog
 
-* _2019-Dec-17_ - Initial version.
+* _2020-Mar-02_ - Swap osmlab/editor-layer-index -> ideditor/imagery-index
+* _2019-Dec-17_ - Initial version.

README.md

@@ -87,16 +87,18 @@ development, see [CONTRIBUTING.md](CONTRIBUTING.md).
 iD is available under the [ISC License](https://opensource.org/licenses/ISC).
 See the [LICENSE.md](LICENSE.md) file for more details.
 
-iD also bundles portions of the following open source software.
+iD also relies on 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)
 * [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)
 * [Mapillary JS (MIT)](https://github.com/mapillary/mapillary-js)
+* [Pannellum (MIT)](https://github.com/mpetroff/pannellum)
 * [name-suggestion-index (BSD-3-Clause)](https://github.com/osmlab/name-suggestion-index)
 * [osm-community-index (ISC)](https://github.com/osmlab/osm-community-index)
+* [imagery-index (ISC)](https://github.com/ideditor/imagery-index)
 
 
 ## Thank you

RELEASING.md

@@ -16,11 +16,8 @@ on the iD project, and then create this file with contents like<br><pre>
 #### Update `2.x` branch
 ```bash
 $  git checkout 2.x
-$  rm -rf node_modules/editor-layer-index/
-$  npm install
-$  npm run imagery
+$  npm run install
 $  npm run all
-$  git add . && git commit -m 'npm run imagery'
 $  npm run translations
 $  git add . && git commit -m 'npm run translations'
 ```

data/core.yaml

@@ -733,7 +733,7 @@ en:
     custom_background:
       tooltip: Edit custom background
       header: Custom Background Settings
-      instructions: "Enter a tile URL template. Valid tokens are:\n   {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n   {-y} or {ty} for flipped TMS-style Y coordinates\n   {u} for quadtile scheme\n   {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}"
+      instructions: "Enter a tile URL template below.\n\nSupported WMS tokens:\n  `{proj}`: requested projection (`EPSG:3857` only)\n  `{wkid}`: same as proj, but without the EPSG (`3857` only)\n  `{width}`, `{height}`: requested image dimensions (`256` only)\n  `{bbox}`: requested bounding box (e.g. `minX,minY,maxX,maxY`)\n\nSupported TMS tokens:\n  `{zoom}` or `{z}, `{x}`, `{y}`: Z/X/Y tile coordinates\n  `{-y}` or `{ty}`: flipped TMS-style Y coordinates\n  `{switch:a,b,c}`: DNS server multiplexing\n  `{u}`: quadtile (Bing) scheme\n\nExample:\n{example}"
       template:
         placeholder: Enter a url template
     custom_data: