Fixes to other map types to work with lat/lon. Split OSM JavaScript into core OpenLayers bits and OSM config bit.

8 files changed, 74 insertions, 24 deletions

diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 8446a10fd..ef5397d01 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -9,7 +9,6 @@
 package FixMyStreet::Map;
 
 use strict;
-use mySociety::GeoUtil;
 use mySociety::Web qw(ent);
 
 sub header_js {
@@ -31,17 +30,23 @@ sub display_map {
     $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 ($lat, $lon) = mySociety::GeoUtil::national_grid_to_wgs84($params{easting}, $params{northing}, 'G');
     my $copyright = _('Map contains Ordnance Survey data © Crown copyright and database right 2010.');
     $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 = {
-    'lat': $lat,
-    'lon': $lon
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
+    'pins': [ $pins_js ]
 }
 </script>
 <div id="map_box">
diff --git a/perllib/FixMyStreet/Map/BingOL.pm b/perllib/FixMyStreet/Map/BingOL.pm
index 3939a710f..a14d4e112 100644
--- a/perllib/FixMyStreet/Map/BingOL.pm
+++ b/perllib/FixMyStreet/Map/BingOL.pm
@@ -1,9 +1,9 @@
 #!/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;
@@ -15,8 +15,8 @@ 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="/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>
 ';
 }
 
@@ -32,16 +32,23 @@ sub display_map {
     $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">
diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm
index 7a314efad..9fb0cb964 100644
--- a/perllib/FixMyStreet/Map/Google.pm
+++ b/perllib/FixMyStreet/Map/Google.pm
@@ -9,7 +9,6 @@
 package FixMyStreet::Map;
 
 use strict;
-use mySociety::GeoUtil;
 use mySociety::Web qw(ent);
 
 sub header_js {
@@ -31,17 +30,23 @@ sub display_map {
     $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 ($lat, $lon) = mySociety::GeoUtil::national_grid_to_wgs84($params{easting}, $params{northing}, 'G');
     my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
     $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 = {
-    'lat': $lat,
-    'lon': $lon
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
+    'pins': [ $pins_js ]
 }
 </script>
 <div id="map_box">
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 9c506b00a..2fe43b63d 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -16,6 +16,7 @@ use Utils;
 sub header_js {
     return '
 <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-OpenStreetMap.js"></script>
 ';
 }
diff --git a/perllib/FixMyStreet/Map/OSM/CycleMap.pm b/perllib/FixMyStreet/Map/OSM/CycleMap.pm
index 87884d459..0a6e216c8 100644
--- a/perllib/FixMyStreet/Map/OSM/CycleMap.pm
+++ b/perllib/FixMyStreet/Map/OSM/CycleMap.pm
@@ -14,8 +14,8 @@ 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="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
@@ -31,16 +31,23 @@ sub display_map {
     $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 &copy; <a id="osm_link" href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
     $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 ],
     'map_type': OpenLayers.Layer.OSM.CycleMap
 }
 </script>
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 08f677d25..c0c2a8504 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -14,8 +14,8 @@ 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="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-streetview.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
@@ -31,16 +31,23 @@ sub display_map {
     $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.');
     $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">
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
index b1fe0126d..8fbf9aa8d 100644
--- a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
@@ -19,7 +19,9 @@ use constant TILE_TYPE => '10k-full';
 sub header_js {
     return '
 <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
+<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-tilma-ol.js"></script>
+<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
@@ -35,8 +37,12 @@ sub display_map {
     $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 $tile_width = TILE_WIDTH;
@@ -44,12 +50,15 @@ sub display_map {
     my $sf = SCALE_FACTOR / TILE_WIDTH;
     my $copyright = _('&copy; Crown copyright. All rights reserved. Ministry of Justice 100037819&nbsp;2008.');
     $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 = {
     'tilewidth': $tile_width,
     'tileheight': $tile_width,
-    'easting': $params{easting},
-    'northing': $params{northing},
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
+    'pins': [ $pins_js ],
     'tile_type': '$tile_type',
     'maxResolution': $sf
 };
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
index 7ef372351..518e575ac 100644
--- a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
@@ -19,7 +19,9 @@ use constant TILE_TYPE => 'streetview';
 sub header_js {
     return '
 <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
+<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-tilma-ol.js"></script>
+<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
@@ -35,8 +37,12 @@ sub display_map {
     $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 $tile_width = TILE_WIDTH;
@@ -44,12 +50,15 @@ sub display_map {
     my $sf = SCALE_FACTOR / TILE_WIDTH;
     my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
     $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 = {
     'tilewidth': $tile_width,
     'tileheight': $tile_width,
-    'easting': $params{easting},
-    'northing': $params{northing},
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
+    'pins': [ $pins_js ],
     'tile_type': '$tile_type',
     'maxResolution': $sf
 };