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 9547ee29c3e1fdf1677a531226f41d1ee8d9472f..8b2170706f91741dc4985aee96c7545e8cf3244a 100644 (file)
--- a/underlays/osm/ikiwiki/osm.js
+++ b/underlays/osm/ikiwiki/osm.js
@@ -57,7 +57,7 @@ function mapsetup(divname, options) {
                                }
                                // this nightmare is possible through http://docs.openlayers.org/library/spherical_mercator.html
                                googleLayer = new OpenLayers.Layer.Google(
-                                       "Google " + options.layers[layer],
+                                       "Google (" + options.layers[layer] + ")",
                                        {type: gtype,
                                         'sphericalMercator': true,
                                         'maxExtent': new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
@@ -70,11 +70,11 @@ function mapsetup(divname, options) {
                } else { // OSM
                        if (options.layers[layer] != 1) {
                                l = options.layers[layer];
-                               fqdn = l.split("/")[2].split(".")
-                               text = fqdn[fqdn.length-2]
-                               map.addLayer(new OpenLayers.Layer.OSM("OpenStreetMap (" + text + ")", l));
+                               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("OpenStreetMap (Mapnik)"));
+                               map.addLayer(new OpenLayers.Layer.OSM(layer + " (Mapnik)"));
                        }
                }
        }