Merge branch 'master' into migrate_to_catalyst

Conflicts:
	.gitignore
	commonlib
	conf/packages
	perllib/FixMyStreet/Map.pm
	templates/website/cobrands/barnet/footer
	web/confirm.cgi
	web/css/core.css
	web/import.cgi
	web/index.cgi

1 files changed, 16 insertions, 22 deletions

diff --git a/perllib/FixMyStreet/Map/BingOL.pm b/perllib/FixMyStreet/Map/BingOL.pm
index 3939a710f..4e93243a9 100644
--- a/perllib/FixMyStreet/Map/BingOL.pm
+++ b/perllib/FixMyStreet/Map/BingOL.pm
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 #
-# FixMyStreet:Map::Bing
-# Bing maps on FixMyStreet.
+# FixMyStreet:Map::BingOL
+# Bing maps on FixMyStreet, using OpenLayers.
 #
-# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
+# Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
-package FixMyStreet::Map;
+package FixMyStreet::Map::BingOL;
 
 use strict;
 use mySociety::Web qw(ent);
@@ -14,9 +14,9 @@ use mySociety::Web qw(ent);
 sub header_js {
     return '
 <!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<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-bing-ol.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
@@ -28,20 +28,27 @@ 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} ||= '';
 
+    my @pins;
     foreach my $pin (@{$params{pins}}) {
+        $pin->[3] ||= '';
+        push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]', '$pin->[3]' ]";
     }
+    my $pins_js = join(",\n", @pins);
 
     my $out = FixMyStreet::Map::header($q, $params{type});
     my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010. Microsoft');
     $out .= <<EOF;
+<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
+<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
 <script type="text/javascript">
 var fixmystreet = {
-    'easting': $params{easting},
-    'northing': $params{northing}
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
+    'pins': [ $pins_js ]
 }
 </script>
 <div id="map_box">
@@ -55,17 +62,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;