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-google.js b/phonegap/www/js/map-google.js
new file mode 100644
index 000000000..7da21ba09
--- /dev/null
+++ b/phonegap/www/js/map-google.js
@@ -0,0 +1,22 @@
+$(function(){
+    var centre = new google.maps.LatLng( fixmystreet.latitude, fixmystreet.longitude );
+    var map = new google.maps.Map(document.getElementById("map"), {
+        mapTypeId: google.maps.MapTypeId.ROADMAP,
+        center: centre,
+        zoom: 16,
+        disableDefaultUI: true,
+        navigationControl: true,
+        navigationControlOptions: {
+            style: google.maps.NavigationControlStyle.SMALL
+        },
+        mapTypeControl: true,
+        mapTypeControlOptions: {
+            style: google.maps.MapTypeControlStyle.DROPDOWN_MENU
+        }
+    });
+
+    google.maps.event.addListener(map, "zoom_changed", function() {
+        if (map.getZoom() < 13) { map.setZoom(13); }
+        if (map.getZoom() > 17) { map.setZoom(17); }
+    });
+});