Merge branch 'master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 22 insertions, 0 deletions

diff --git a/phonegap/www/js/map-bing.js b/phonegap/www/js/map-bing.js
new file mode 100644
index 000000000..715a8efc9
--- /dev/null
+++ b/phonegap/www/js/map-bing.js
@@ -0,0 +1,22 @@
+$(function(){
+    var centre = new Microsoft.Maps.Location( fixmystreet.latitude, fixmystreet.longitude );
+    var map = new Microsoft.Maps.Map(document.getElementById("map"), {
+        credentials: fixmystreet.key,
+        mapTypeId: Microsoft.Maps.MapTypeId.ordnanceSurvey,
+        center: centre,
+        zoom: 15,
+        enableClickableLogo: false,
+        enableSearchLogo: false,
+        showCopyright: false,
+        showDashboard: true,
+        showLogo: false,
+        showScalebar: false
+    });
+        //minZoomLevel: 14,
+        //numZoomLevels: 4
+
+    Microsoft.Maps.Events.addHandler(map, "viewchangestart", function(e) {
+        /* Doesn't work */
+        if (map.getTargetZoom() < 12) { return false; }
+    });
+});