diff options
-rw-r--r-- | perllib/FixMyStreet/Map/OSM.pm | 8 | ||||
-rw-r--r-- | web/js/map-bing-ol.js | 2 | ||||
-rw-r--r-- | web/js/map-streetview.js | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index d8abc9dd6..74af0e9f3 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -13,7 +13,7 @@ use Math::Trig; use mySociety::Gaze; use Utils; -use constant ZOOM_LEVELS => 5; +use constant ZOOM_LEVELS => 6; use constant MIN_ZOOM_LEVEL => 13; sub map_type { @@ -55,15 +55,15 @@ sub display_map { my $numZoomLevels = ZOOM_LEVELS; my $zoomOffset = MIN_ZOOM_LEVEL; if ($params{any_zoom}) { - $numZoomLevels = 18; + $numZoomLevels = 19; $zoomOffset = 0; } # Adjust zoom level dependent upon population density my $dist = $c->stash->{distance} || mySociety::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude}, 200_000 ); - my $default_zoom = $c->cobrand->default_map_zoom() ? $c->cobrand->default_map_zoom() : $numZoomLevels - 3; - $default_zoom = $numZoomLevels - 2 if $dist < 10; + my $default_zoom = $c->cobrand->default_map_zoom() ? $c->cobrand->default_map_zoom() : $numZoomLevels - 4; + $default_zoom = $numZoomLevels - 3 if $dist < 10; # Map centre may be overridden in the query string $params{latitude} = Utils::truncate_coordinate($c->req->params->{lat} + 0) diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 34ea255e8..f48f21c48 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -86,7 +86,7 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), - numZoomLevels: 18, + numZoomLevels: 19, transitionEffect: "resize", sphericalMercator: true, buffer: 0 diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index b1ba3664d..03c5e7843 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.js @@ -63,7 +63,7 @@ OpenLayers.Layer.StreetView = OpenLayers.Class(OpenLayers.Layer.XYZ, { options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), - numZoomLevels: 18, + numZoomLevels: 19, transitionEffect: "resize", sphericalMercator: true, attribution: "Contains Ordnance Survey data © Crown copyright and database right 2010" |