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

1 files changed, 3 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index c0c2a8504..9c9a1ac8e 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -6,14 +6,14 @@
 # Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
-package FixMyStreet::Map;
+package FixMyStreet::Map::OSM::StreetView;
 
 use strict;
 use mySociety::Web qw(ent);
 
 sub header_js {
     return '
-<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
+<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-streetview.js"></script>
 ';
@@ -27,7 +27,7 @@ sub header_js {
 # PINS is array of pins to show, location and colour
 # PRE/POST are HTML to show above/below map
 sub display_map {
-    my ($q, %params) = @_;
+    my ($self, $q, %params) = @_;
     $params{pre} ||= '';
     $params{post} ||= '';
 
@@ -61,17 +61,4 @@ EOF
     return $out;
 }
 
-sub display_map_end {
-    my ($type) = @_;
-    my $out = '</div>';
-    $out .= '</form>' if ($type);
-    return $out;
-}
-
-sub display_pin {
-}
-
-sub map_pins {
-}
-
 1;