Merge branch 'master' into oxfordshire-usability-recommendations

1 files changed, 2 insertions, 29 deletions

diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js
index 03c5e7843..b81438a88 100644
--- a/web/js/map-streetview.js
+++ b/web/js/map-streetview.js
@@ -12,30 +12,6 @@ function set_map_config(perm) {
 // http://os.openstreetmap.org/openlayers/OS.js (added one line)
 
 /**
- * Namespace: Util.OS
- */
-OpenLayers.Util.OS = {};
-
-/**
- * Constant: MISSING_TILE_URL
- * {String} URL of image to display for missing tiles
- */
-OpenLayers.Util.OS.MISSING_TILE_URL = "http://openstreetmap.org/openlayers/img/404.png";
-
-/**
- * Property: originalOnImageLoadError
- * {Function} Original onImageLoadError function.
- */
-OpenLayers.Util.OS.originalOnImageLoadError = OpenLayers.Util.onImageLoadError;
-
-/**
- * Function: onImageLoadError
- */
-OpenLayers.Util.onImageLoadError = function() {
-    OpenLayers.Util.OS.originalOnImageLoadError();
-};
-
-/**
  * @requires OpenLayers/Layer/XYZ.js
  *
  * Class: OpenLayers.Layer.StreetView
@@ -44,8 +20,6 @@ OpenLayers.Util.onImageLoadError = function() {
  *  - <OpenLayers.Layer.XYZ>
  */
 OpenLayers.Layer.StreetView = OpenLayers.Class(OpenLayers.Layer.XYZ, {
-    attribution: 'Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.',
-
     /**
      * Constructor: OpenLayers.Layer.StreetView
      *
@@ -62,11 +36,10 @@ 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),
+            maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
             numZoomLevels: 19,
-            transitionEffect: "resize",
             sphericalMercator: true,
-            attribution: "Contains Ordnance Survey data © Crown copyright and database right 2010"
+            attribution: "Contains Ordnance Survey data © Crown copyright and database right 2012"
         }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments);