diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
| commit | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (patch) | |
| tree | 3e928fa68c3edb90c0666ec52ad8c9982f9dab77 /web/js | |
| parent | 8deb709fa2d44bcbaba54734f7f4f4385980d8df (diff) | |
| parent | 62ffebc89cc66d32a828ea1de8c850c3e950faa1 (diff) | |
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
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 6 | ||||
| -rw-r--r-- | web/js/map-bing-ol.js | 1 |
2 files changed, 2 insertions, 5 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); diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 00c3a487f..c3c3b994e 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,5 +1,4 @@ function set_map_config(perm) { - fixmystreet.ZOOM_OFFSET = 13; fixmystreet.controls = [ new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Navigation(), |