From 4af1e3d75ae247fd7d6a9910087fc36e1a9659f5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 20 May 2011 19:45:05 +0100
Subject: Move some of map_start to templates.

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

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 9c9a1ac8e..5cc1ed5ba 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -29,7 +29,6 @@ sub header_js {
 sub display_map {
     my ($self, $q, %params) = @_;
     $params{pre} ||= '';
-    $params{post} ||= '';
 
     my @pins;
     foreach my $pin (@{$params{pins}}) {
@@ -54,9 +53,6 @@ var fixmystreet = {
     $params{pre}
     <div id="map"></div>
     <p id="copyright">$copyright</p>
-    $params{post}
-</div>
-<div id="side">
 EOF
     return $out;
 }
-- 
cgit v1.2.3


From 8111b9db1356cd10d1610b4ae1e99ea8054aad46 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 24 May 2011 11:25:31 +0100
Subject: Put form header in templates, not code.

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

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 5cc1ed5ba..2024a83fc 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -37,7 +37,7 @@ sub display_map {
     }
     my $pins_js = join(",\n", @pins);
 
-    my $out = FixMyStreet::Map::header($q, $params{type});
+    my $out = '';
     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}">
-- 
cgit v1.2.3


From 388a9b16d9dfa25b4854c8a3685dc3c764c391a5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 24 May 2011 13:05:51 +0100
Subject: Move lat/lon to templates and use shortened forms.

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

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 2024a83fc..9849c1ed5 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -40,8 +40,6 @@ sub display_map {
     my $out = '';
     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 = {
     'latitude': $params{latitude},
-- 
cgit v1.2.3


From 04f96c0a5558f53456b25ae4e7cffad41a7664cb Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 25 May 2011 10:27:52 +0100
Subject: Template original Tilma map and some more text, updates on
 questionnaire page, bring in click pin fix from pre-london branch, other map
 types will be broken.

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

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 9849c1ed5..e9b86547e 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -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 ($self, $q, %params) = @_;
+    my ($self, $c, $q, %params) = @_;
     $params{pre} ||= '';
 
     my @pins;
-- 
cgit v1.2.3


From 1e39c5b6d4c1200d89292b3715513a7260bd9743 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 25 May 2011 12:52:27 +0100
Subject: Remove old CGI Q from Map calls.

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

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index e9b86547e..9512e2013 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -19,15 +19,13 @@ sub header_js {
 ';
 }
 
-# display_map Q PARAMS
+# display_map C PARAMS
 # PARAMS include:
-# EASTING, NORTHING 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
+# latitude, longitude for the centre point of the map
+# TYPE is 1 if the map is clickable, 0 otherwise.
 # PINS is array of pins to show, location and colour
-# PRE/POST are HTML to show above/below map
 sub display_map {
-    my ($self, $c, $q, %params) = @_;
+    my ($self, $c, %params) = @_;
     $params{pre} ||= '';
 
     my @pins;
-- 
cgit v1.2.3


From fe35ddba0fab0ebc413300dff0f1f323aec40e9a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 25 May 2011 14:28:40 +0100
Subject: Make tile URL a parameter so it can be different, bring OSM's
 StreetView under the same code.

---
 perllib/FixMyStreet/Map/OSM/StreetView.pm | 40 +++++++------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 9512e2013..ba7134c1e 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -7,9 +7,9 @@
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 package FixMyStreet::Map::OSM::StreetView;
+use base 'FixMyStreet::Map::OSM';
 
 use strict;
-use mySociety::Web qw(ent);
 
 sub header_js {
     return '
@@ -19,38 +19,16 @@ sub header_js {
 ';
 }
 
-# display_map C PARAMS
-# PARAMS include:
-# latitude, longitude for the centre point of the map
-# TYPE is 1 if the map is clickable, 0 otherwise.
-# PINS is array of pins to show, location and colour
-sub display_map {
-    my ($self, $c, %params) = @_;
-    $params{pre} ||= '';
-
-    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);
+sub map_type {
+    return '""';
+}
 
-    my $out = '';
-    my $copyright = _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
-    $out .= <<EOF;
-<script type="text/javascript">
-var fixmystreet = {
-    'latitude': $params{latitude},
-    'longitude': $params{longitude},
-    'pins': [ $pins_js ]
+sub base_tile_url {
+    return 'os.openstreetmap.org/sv';
 }
-</script>
-<div id="map_box">
-    $params{pre}
-    <div id="map"></div>
-    <p id="copyright">$copyright</p>
-EOF
-    return $out;
+
+sub copyright {
+    return _('Map contains Ordnance Survey data &copy; Crown copyright and database right 2010.');
 }
 
 1;
-- 
cgit v1.2.3


From a04abdebaf280cbfbad65fabb2c64d88f9e3d72c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 26 May 2011 11:57:21 +0100
Subject: Get header JS <script> out of code and into templates.

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

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

diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index ba7134c1e..141c2e328 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -11,18 +11,14 @@ use base 'FixMyStreet::Map::OSM';
 
 use strict;
 
-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-streetview.js"></script>
-';
-}
-
 sub map_type {
     return '""';
 }
 
+sub map_template {
+    return 'osm-streetview';
+}
+
 sub base_tile_url {
     return 'os.openstreetmap.org/sv';
 }
-- 
cgit v1.2.3