use OpenStreetMap tiles if not in UK

Adds a config option for isUK and if not set then loads the
openstreetmap map rather than the UKs bing/OSM hybrid that uses
our own tile server.

This fixes the issue of people outside the UK getting a grey map.

3 files changed, 19 insertions, 3 deletions

diff --git a/src/index.html b/src/index.html
index 9146da0..08b3a4f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -47,7 +47,16 @@
 
         <script type="text/javascript" src="js/OpenLayers.fixmystreet.js"></script>
         <script type="text/javascript" src="js/map-OpenLayers.js"></script>
-        <script type="text/javascript" src="js/map-bing-ol.js"></script>
+        <script type="text/javascript">
+            var scriptElement = document.createElement("script");
+            scriptElement.type = "text/javascript";
+            if ( CONFIG.isUK ) {
+                scriptElement.src = "js/map-bing-ol.js";
+            } else {
+                scriptElement.src = "js/map-OpenStreetMap.js";
+            }
+            $('head').prepend(scriptElement);
+        </script>
 
         <script type="text/javascript" src="js/locate.js"></script>
         <script type="text/javascript" src="js/strings.js"></script>
diff --git a/src/js/config.js-example b/src/js/config.js-example
index f5648a9..2cad6b6 100644
--- a/src/js/config.js-example
+++ b/src/js/config.js-example
@@ -18,5 +18,9 @@ var CONFIG = {
     ACCURACY: 100,
 
     // how long, in milliseconds, before photo uploads timeout. Defaults to 120000 ( 2 minutes )
-    UPLOAD_TIMEOUT: 120000
+    UPLOAD_TIMEOUT: 120000,
+
+    // leave this at 0 otherwise it will use the fixmystreet tile set
+    // which only covers the UK
+    isUK: 0
 };
diff --git a/src/js/map-OpenStreetMap.js b/src/js/map-OpenStreetMap.js
index 7467653..122989d 100644
--- a/src/js/map-OpenStreetMap.js
+++ b/src/js/map-OpenStreetMap.js
@@ -3,11 +3,14 @@ function set_map_config(perm) {
     if ($('#map_permalink').length) {
         permalink_id = 'map_permalink';
     }
+    fixmystreet.nav_control = new OpenLayers.Control.Navigation({});
     fixmystreet.controls = [
+        new OpenLayers.Control.Attribution(),
         new OpenLayers.Control.ArgParser(),
-        //new OpenLayers.Control.Navigation(),
+        fixmystreet.nav_control,
         new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
     ];
+    fixmystreet.map_type = OpenLayers.Layer.OSM.Mapnik;
 }
 
 // http://www.openstreetmap.org/openlayers/OpenStreetMap.js (added maxResolution)