From 91ac9486a1fd2eeb65fc9c6d2fccc1b170cfc16f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@fury.ukcod.org.uk>
Date: Mon, 14 Feb 2011 15:40:34 +0000
Subject: Tweaks to OSM map module, fix for truncated co-ords.

---
 perllib/FixMyStreet/Map/OSM.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index ccbb3ca53..99904a328 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -15,13 +15,12 @@ sub header_js {
     return '
 <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
 # display_map Q PARAMS
 # PARAMS include:
-# EASTING, NORTHING for the centre point of the map
+# latitude, longitude for the centre point of the map
 # TYPE is 1 if the map is clickable, 2 if clickable and has a form upload,
 #     0 if not clickable
 # PINS is array of pins to show, location and colour
@@ -39,8 +38,8 @@ sub display_map {
     $out .= <<EOF;
 <script type="text/javascript">
 var fixmystreet = {
-    'easting': $params{easting},
-    'northing': $params{northing},
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
     'map_type': OpenLayers.Layer.OSM.Mapnik
 }
 </script>
-- 
cgit v1.2.3


From 7698b15bf64daee5f8b5a1080984dd1331615032 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@fury.ukcod.org.uk>
Date: Wed, 16 Feb 2011 20:34:30 +0000
Subject: Map clicking.

---
 perllib/FixMyStreet/Map/OSM.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 99904a328..cd69762b7 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -36,6 +36,8 @@ sub display_map {
     my $out = FixMyStreet::Map::header($q, $params{type});
     my $copyright = _('Map &copy; <a 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 = {
     'latitude': $params{latitude},
-- 
cgit v1.2.3


From 2699b760e4b08b1422ab8232af4081f75627588e Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@fury.ukcod.org.uk>
Date: Wed, 16 Feb 2011 23:02:03 +0000
Subject: First pin pass.

---
 perllib/FixMyStreet/Map/OSM.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index cd69762b7..0db09b928 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -30,8 +30,11 @@ sub display_map {
     $params{pre} ||= '';
     $params{post} ||= '';
 
+    my @pins;
     foreach my $pin (@{$params{pins}}) {
+        push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]' ]";
     }
+    my $pins = join(",\n", @pins);
 
     my $out = FixMyStreet::Map::header($q, $params{type});
     my $copyright = _('Map &copy; <a href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
@@ -42,6 +45,7 @@ sub display_map {
 var fixmystreet = {
     'latitude': $params{latitude},
     'longitude': $params{longitude},
+    'pins': [ $pins ],
     'map_type': OpenLayers.Layer.OSM.Mapnik
 }
 </script>
-- 
cgit v1.2.3


From 3033514eec2a30d43797c42eeb175fa9da9aeef1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@fury.ukcod.org.uk>
Date: Thu, 17 Feb 2011 01:02:46 +0000
Subject: Display pins.

---
 perllib/FixMyStreet/Map/OSM.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 0db09b928..820a4ce63 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -32,7 +32,8 @@ sub display_map {
 
     my @pins;
     foreach my $pin (@{$params{pins}}) {
-        push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]' ]";
+        $pin->[3] ||= '';
+        push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]', '$pin->[3]' ]";
     }
     my $pins = join(",\n", @pins);
 
-- 
cgit v1.2.3