aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/base/maps/google.html5
-rw-r--r--templates/web/base/maps/openlayers.html5
-rw-r--r--templates/web/bristol/maps/openlayers.html5
-rw-r--r--templates/web/seesomething/index.html6
4 files changed, 12 insertions, 9 deletions
diff --git a/templates/web/base/maps/google.html b/templates/web/base/maps/google.html
index 741edec40..0db6af7bf 100644
--- a/templates/web/base/maps/google.html
+++ b/templates/web/base/maps/google.html
@@ -14,7 +14,8 @@
[% map_html = BLOCK %]
<script type="text/javascript">
-var fixmystreet = {
+var fixmystreet = fixmystreet || {};
+$.extend(fixmystreet, {
'page': '[% page %]',
'area': [ [% map.area.join(',') %] ],
'all_pins': '[% all_pins %]',
@@ -27,7 +28,7 @@ var fixmystreet = {
'zoom': [% map.zoom %],
[%- END %]
'pins': [% INCLUDE maps/pins_js.html %]
-}
+});
</script>
<div id="map_box">
[% pre_map %]
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 1e7ae5ce8..c00e28586 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -6,7 +6,8 @@
<input type="hidden" name="zoom" value="[% map.zoom %]">
<script type="text/javascript">
-var fixmystreet = {
+var fixmystreet = fixmystreet || {};
+$.extend(fixmystreet, {
'page': '[% page %]',
'area': [ [% map.area.join(',') %] ],
'all_pins': '[% all_pins %]',
@@ -26,7 +27,7 @@ var fixmystreet = {
'key': '[% c.config.BING_MAPS_API_KEY %]',
[%- END %]
'pins': [% INCLUDE maps/pins_js.html %]
-}
+});
</script>
<div id="map_box" aria-hidden="true">
[% pre_map %]
diff --git a/templates/web/bristol/maps/openlayers.html b/templates/web/bristol/maps/openlayers.html
index 4b178e21a..70e06f99f 100644
--- a/templates/web/bristol/maps/openlayers.html
+++ b/templates/web/bristol/maps/openlayers.html
@@ -6,7 +6,8 @@
<input type="hidden" name="zoom" value="[% map.zoom %]">
<script type="text/javascript">
-var fixmystreet = {
+var fixmystreet = fixmystreet || {};
+$.extend(fixmystreet, {
'page': '[% page %]',
'area': [ [% map.area.join(',') %] ],
'all_pins': '[% all_pins %]',
@@ -36,7 +37,7 @@ var fixmystreet = {
'origin_x': [% map.origin_x %],
'origin_y': [% map.origin_y %]
}
-}
+});
</script>
<div id="map_box" aria-hidden="true">
[% pre_map %]
diff --git a/templates/web/seesomething/index.html b/templates/web/seesomething/index.html
index cccd15709..dfd982e85 100644
--- a/templates/web/seesomething/index.html
+++ b/templates/web/seesomething/index.html
@@ -5,7 +5,8 @@
<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
<script type="text/javascript">
-var fixmystreet = {
+var fixmystreet = fixmystreet || {};
+$.extend(fixmystreet, {
'page': '',
'latitude': 52.505241,
'longitude': -1.815285,
@@ -13,8 +14,7 @@ var fixmystreet = {
'numZoomLevels': 5,
'zoomOffset': 13,
'map_type': ""
-
-}
+});
</script>
<div id="map_box">
<div id="map"></div>