From 1f057dc7eb3f6520c03eacc9757e86aefc3d37fc Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 18 Jan 2013 16:29:09 +0000
Subject: Allow hide/show pins in German to work.

---
 web/js/map-OpenLayers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/js/map-OpenLayers.js')

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index b76a7b166..ccf0f71b0 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -201,7 +201,8 @@ function fixmystreet_onload() {
         var showhide = [
             'Show pins', 'Hide pins',
             'Dangos pinnau', 'Cuddio pinnau',
-            "Vis nåler", "Gjem nåler"
+            "Vis nåler", "Gjem nåler",
+            "Zeige Stecknadeln", "Stecknadeln ausblenden"
         ];
         for (var i=0; i<showhide.length; i+=2) {
             if (this.innerHTML == showhide[i]) {
-- 
cgit v1.2.3


From 55150a623a4cff21398b47bd788ebd258f8a8ece Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 18 Jan 2013 18:10:28 +0000
Subject: Add ability for multiple base map layers, add Zurich Stadtplan.

---
 web/js/map-OpenLayers.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'web/js/map-OpenLayers.js')

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index ccf0f71b0..cd77beefb 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -268,19 +268,24 @@ $(function(){
     }
 
     // Set it up our way
-    fixmystreet.layer_options = OpenLayers.Util.extend({
-        zoomOffset: fixmystreet.zoomOffset,
-        transitionEffect: 'resize',
-        numZoomLevels: fixmystreet.numZoomLevels
-    }, fixmystreet.layer_options);
 
     var layer;
-    if (fixmystreet.layer_options.matrixIds) {
-        layer = new fixmystreet.map_type(fixmystreet.layer_options);
-    } else {
-        layer = new fixmystreet.map_type("", fixmystreet.layer_options);
+    if (!fixmystreet.layer_options.length) {
+        fixmystreet.layer_options = [ fixmystreet.layer_options ];
+    }
+    for (var i=0; i<fixmystreet.layer_options.length; i++) {
+        fixmystreet.layer_options[i] = OpenLayers.Util.extend({
+            zoomOffset: fixmystreet.zoomOffset,
+            transitionEffect: 'resize',
+            numZoomLevels: fixmystreet.numZoomLevels
+        }, fixmystreet.layer_options[i]);
+        if (fixmystreet.layer_options[i].matrixIds) {
+            layer = new fixmystreet.map_type(fixmystreet.layer_options[i]);
+        } else {
+            layer = new fixmystreet.map_type("", fixmystreet.layer_options);
+        }
+        fixmystreet.map.addLayer(layer);
     }
-    fixmystreet.map.addLayer(layer);
 
     if (!fixmystreet.map.getCenter()) {
         var centre = new OpenLayers.LonLat( fixmystreet.longitude, fixmystreet.latitude );
-- 
cgit v1.2.3