Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses

Conflicts:
	perllib/FixMyStreet/DB/Result/Comment.pm
	perllib/FixMyStreet/DB/Result/User.pm
	web/css/core.css

1 files changed, 2 insertions, 4 deletions

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 22492e400..83e535f1c 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -1,7 +1,5 @@
 YAHOO.util.Event.onContentReady('map', function() {
 
-    fixmystreet.ZOOM_OFFSET = 13;
-
     var perm = new OpenLayers.Control.Permalink();
     set_map_config(perm);
 
@@ -11,9 +9,9 @@ YAHOO.util.Event.onContentReady('map', function() {
     });
 
     fixmystreet.layer_options = OpenLayers.Util.extend({
-        zoomOffset: fixmystreet.ZOOM_OFFSET,
+        zoomOffset: fixmystreet.zoomOffset,
         transitionEffect: 'resize',
-        numZoomLevels: 5
+        numZoomLevels: fixmystreet.numZoomLevels
     }, fixmystreet.layer_options);
     var layer = new fixmystreet.map_type("", fixmystreet.layer_options);
     fixmystreet.map.addLayer(layer);