put google layers in parenthesis

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

diff --git a/underlays/osm/ikiwiki/osm.js b/underlays/osm/ikiwiki/osm.js
index 388d625f15039aea6734bb782910b8e6b6612135..8b2170706f91741dc4985aee96c7545e8cf3244a 100644 (file)
--- a/underlays/osm/ikiwiki/osm.js
+++ b/underlays/osm/ikiwiki/osm.js
@@ -34,14 +34,49 @@ function mapsetup(divname, options) {
                        new OpenLayers.Control.Permalink(permalink)
                ],
                displayProjection: new OpenLayers.Projection("EPSG:4326"),
-               numZoomLevels: 18
+               maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
+               projection: "EPSG:900913",
+               units: "m",
+               maxResolution: 156543.0339,
+               numZoomLevels: 19
        });
 
-       if (options.mapurl) {
-               var newLayer = new OpenLayers.Layer.OSM("Local Tiles", options.mapurl, {numZoomLevels: 19, isBaseLayer: true});
-               map.addLayer(newLayer);
-       } else {
-               map.addLayer(new OpenLayers.Layer.OSM());
+       for (x in options.layers_order) {
+               layer = options.layers_order[x];
+               console.log("setting up layer: " + layer + " with argument : " + options.layers[layer]);
+               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") {
+                                       gtype = G_SATELLITE_MAP;
+                               } else if (options.layers[layer] == "Hybrid") {
+                                       gtype = G_HYBRID_MAP // the normal map overlaying the satellite photographs
+                               } else if (options.layers[layer] == "Physical") {
+                                       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] + ")",
+                                       {type: gtype,
+                                        'sphericalMercator': true,
+                                        'maxExtent': new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
+                                        projection: new OpenLayers.Projection("EPSG:3857")}
+                               );
+                               map.addLayer(googleLayer);
+                       } 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)"));
+                       }
+               }
        }
 
        if (options.format == 'CSV') {