Merge branch '2.3'

Conflicts:
	.gitignore
	WME_OpenMaps.user.js

.gitignore

@@ -1,3 +1,3 @@
 .settings
 .project
-.tern-project
+.tern-project

README.md

@@ -1,16 +1,22 @@
 # WME Open Maps
 
-This userscript augments the [Waze Map Editor](https://www.waze.com/editor/) by adding additional maps such as the cadastre as layer. These maps can be made semi-transparant so the satellite imagery is still visible.
+This userscript augments the [Waze Map Editor](https://www.waze.com/editor/) by adding additional maps such as the cadastre as layer. The maps available here are open data that can be used within commercial applications such as Waze.
 
-### Current maps configured
+## How to use
+
+![Open Maps layers](http://tomputtemans.com/waze-scripts/images/Sidebar.png)
+
+The script adds a tab with a selection list that will contain any maps that are available for the current view of the map. It is also possible to easily disable the satellite imagery in Waze from here should you have an alternative source of imagery active.
+
+![Open Maps map attributes](http://tomputtemans.com/waze-scripts/images/LayerAttributes.png)
+
+In the sidebar you can add, reorder and remove maps, change how transparent a map should be, decide which map layers should be loaded and query the map or a specific layer to retrieve more information from the map service (if available).
+
+![Open Maps layer drawer](http://tomputtemans.com/waze-scripts/images/LayerChooser.png)
 
-- AGIV: cadastre and satellite imagery (Flanders, Belgium)
-- PICC (Wallonia, Belgium)
-- Irisnet (Brussels, Belgium)
-- BAG (The Netherlands)
-- Weggegevens (The Netherlands)
-- Luchtfoto 2014 (The Netherlands)
-- BGT (The Netherlands)
+It is also possible to adjust the visibility of these maps within the usual layer drawer. These changes are considered to be temporary and will not be preserved over sessions.
+
+![Open Maps overview](http://tomputtemans.com/waze-scripts/images/Overview.png)
 
 ## Installation instructions
 
@@ -29,14 +35,6 @@ After installing a userscript, you will be able to find it working on the site(s
 
 GreaseMonkey and TamperMonkey will occasionally check for new versions of these scripts. You will get a notification when a new version has been found and installed.
 
-## How to use
-
-![Open Maps layers](https://tomputtemans.com/waze-scripts/images/OM-3.png)
-
-The script adds a tab with a selection list that will contain any maps that are available for the current view of the map. With the slider you can determine how strongly the selected map obscures the Waze satellite imagery.
-
-![Open Maps opacity slider](https://tomputtemans.com/waze-scripts/images/OM-4.jpg)
-
 ## Feedback and suggestions
 
-Any issues found can be reported at the [GitHub project page](https://github.com/Glodenox/wme-om/issues). A forum thread will be made later when more maps are added. If more maps are to be proposed, they need to be open data. This means that they can be used for commercial use as well without any license. Usually data sources provided by the government meet this requirement, but the license must be checked to be absolutely sure.
+Any issues found can be reported at the [GitHub project page](https://github.com/Glodenox/wme-om/issues). A forum thread will be made later when more maps are added. If you want to propose a map to be added, please talk to one of your country champs. All proposed maps need to be open data. This means that they can be used for commercial use as well without any license. Often data sources provided by the government meet this requirement, but the license must be vetted carefully to be absolutely sure.

map-checklist.txt

@@ -0,0 +1,26 @@
+Template: 
+{
+	id: ,
+	url: '',
+	crs: '',
+	bbox: new OL.Bounds(0, 0, 0, 0}, // minx: 0, miny: 0, maxx: 0, maxy: 0
+	format: 'image/png',
+	title: '',
+	abstract: '',
+	attribution: '',
+	capabilities: ['GetCapabilities', 'GetMap', 'GetFeatureInfo'],
+	default_layers: [ ],
+	layers: {
+		'': {
+			bbox: new OL.Bounds(0, 0, 0, 0), // optional
+			queryable: true,
+			title: '',
+			abstract: '' // optional
+		}
+	}
+}
+
+1. Retrieve country code from https://countrycode.org/ and compose a new ID with it: country code + ##
+2. Clean up URL (HTTPS? Removed arguments?)
+3. Calculate BBOX: (new OL.Bounds(0, 0, 0, 0)).transform(new OL.Projection('EPSG:'), Waze.map.getProjection())
+4. Layers: put all layer groups as first in the array, followed by other layers