3.20161229.1~bpo8+1

[git.ikiwiki.info.git] / underlays / osm / ikiwiki / osm.js

diff --git a/underlays/osm/ikiwiki/osm.js b/underlays/osm/ikiwiki/osm.js
index 8b2170706f91741dc4985aee96c7545e8cf3244a..37e588f7b5bba4c1125052f82c358359a3459705 100644 (file)
--- a/underlays/osm/ikiwiki/osm.js
+++ b/underlays/osm/ikiwiki/osm.js
@@ -41,23 +41,22 @@ function mapsetup(divname, options) {
                numZoomLevels: 19
        });
 
                numZoomLevels: 19
        });
 

-       for (x in options.layers_order) {
-               layer = options.layers_order[x];
-               console.log("setting up layer: " + layer + " with argument : " + options.layers[layer]);
+       for (x in options.layers) {
+               layer = options.layers[x];
+               console.log("setting up layer: " + layer);

                if (layer.indexOf("Google") >= 0) {
                        if (options.google_apikey && options.google_apikey != 'null') {
                                var gtype = G_NORMAL_MAP;
                if (layer.indexOf("Google") >= 0) {
                        if (options.google_apikey && options.google_apikey != 'null') {
                                var gtype = G_NORMAL_MAP;

-                               var gtext = "";
-                               if (options.layers[layer] == "Satellite") {
+                               if (layer.indexOf("Satellite") >= 0) {

                                        gtype = G_SATELLITE_MAP;
                                        gtype = G_SATELLITE_MAP;

-                               } else if (options.layers[layer] == "Hybrid") {
+                               } else if (layer.indexOf("Hybrid") >= 0) {

                                        gtype = G_HYBRID_MAP // the normal map overlaying the satellite photographs
                                        gtype = G_HYBRID_MAP // the normal map overlaying the satellite photographs

-                               } else if (options.layers[layer] == "Physical") {
+                               } else if (layer.indexOf("Physical") >= 0) {

                                        gtype = G_PHYSICAL_MAP // terrain information
                                }
                                // this nightmare is possible through http://docs.openlayers.org/library/spherical_mercator.html
                                googleLayer = new OpenLayers.Layer.Google(
                                        gtype = G_PHYSICAL_MAP // terrain information
                                }
                                // this nightmare is possible through http://docs.openlayers.org/library/spherical_mercator.html
                                googleLayer = new OpenLayers.Layer.Google(

-                                       "Google (" + options.layers[layer] + ")",
+                                       layer,

                                        {type: gtype,
                                         'sphericalMercator': true,
                                         'maxExtent': new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
                                        {type: gtype,
                                         'sphericalMercator': true,
                                         'maxExtent': new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),


@@ -67,15 +66,11 @@ function mapsetup(divname, options) {
                        } else {
                                console.log("no API key defined for Google layer, skipping");
                        }
                        } else {
                                console.log("no API key defined for Google layer, skipping");
                        }

-               } else { // OSM
-                       if (options.layers[layer] != 1) {
-                               l = options.layers[layer];
-                               fqdn = l.split("/")[2].split(".");
-                               text = fqdn[fqdn.length-2] + "." + fqdn[fqdn.length-1];
-                               map.addLayer(new OpenLayers.Layer.OSM(layer + " (" + text + ")", l));
-                       } else {
-                               map.addLayer(new OpenLayers.Layer.OSM(layer + " (Mapnik)"));
-                       }
+               } else if (layer == 'OSM') { // OSM default layer
+                       map.addLayer(new OpenLayers.Layer.OSM("OSM (Mapnik)"));
+               } else { // assumed to be a URL
+                       text = layer.match(/([^.\/]*\.[^.\/]*(\/[^\$]*)?)\/.*$/i) // take the first two parts of the FQDN and everything before the first $
+                       map.addLayer(new OpenLayers.Layer.OSM("OSM (" + text[1]  + ")", layer));

                }
        }
 
                }
        }
 


@@ -141,7 +136,7 @@ function mapsetup(divname, options) {
 
        if (options.fullscreen) {
                map.addControl(new OpenLayers.Control.PanZoomBar());
 
        if (options.fullscreen) {
                map.addControl(new OpenLayers.Control.PanZoomBar());

-               map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false}));
+               map.addControl(new OpenLayers.Control.LayerSwitcher());

                map.addControl(new OpenLayers.Control.MousePosition());
                map.addControl(new OpenLayers.Control.KeyboardDefaults());
        } else {
                map.addControl(new OpenLayers.Control.MousePosition());
                map.addControl(new OpenLayers.Control.KeyboardDefaults());
        } else {