aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/Map/OSM.pm2
-rw-r--r--perllib/FixMyStreet/Map/OSM/MapQuest.pm4
-rw-r--r--perllib/FixMyStreet/Map/OSM/StreetView.pm1
-rw-r--r--templates/web/base/maps/mapquest-attribution.html1
-rw-r--r--templates/web/base/maps/openlayers.html2
-rw-r--r--templates/web/base/maps/osm.html1
-rw-r--r--templates/web/bromley/front/pre-steps.html5
-rw-r--r--templates/web/fixmystreet.com/front/javascript.html15
-rw-r--r--templates/web/fixmystreet/front/javascript.html15
-rw-r--r--templates/web/fixmystreet/index.html26
-rw-r--r--templates/web/zerotb/index.html2
-rw-r--r--web/js/map-OpenStreetMap.js1
-rw-r--r--web/js/map-streetview.js4
-rw-r--r--web/js/map-wmts-zurich.js1
14 files changed, 46 insertions, 34 deletions
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index df2d16b82..df4b292a8 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -39,7 +39,7 @@ sub base_tile_url {
}
sub copyright {
- return _('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>');
+ _('&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors');
}
# display_map C PARAMS
diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
index 2c3cbaf00..4fc8ba57d 100644
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
@@ -33,4 +33,8 @@ sub base_tile_url {
return 'mqcdn.com/tiles/1.0.0/map/';
}
+sub copyright {
+ 'Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a>'
+}
+
1;
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index c70dd93aa..87c335dd6 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -22,6 +22,7 @@ sub base_tile_url {
}
sub copyright {
+ 'Contains OS data &copy; Crown copyright and database right 2013';
}
1;
diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index d76e20817..804710ad1 100644
--- a/templates/web/base/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
@@ -10,5 +10,4 @@
[% map_html = BLOCK %]
[% INCLUDE maps/openlayers.html %]
-<div class="olControlAttribution" style="position: absolute;">Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a></div>
[% END %]
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index d01e98138..48eb896e8 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -49,7 +49,7 @@ var fixmystreet = {
[% INCLUDE compass %]
</noscript></div>
[% IF map.copyright %]
- <p id="copyright">[% map.copyright %]</p>
+ <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div>
[% END %]
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index 3e1e1aec8..0b2db1a53 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -10,5 +10,4 @@
[% map_html = BLOCK %]
[% INCLUDE maps/openlayers.html %]
-<div class="olControlAttribution" style="position: absolute;">&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors</div>
[% END %]
diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-steps.html
new file mode 100644
index 000000000..a5523c862
--- /dev/null
+++ b/templates/web/bromley/front/pre-steps.html
@@ -0,0 +1,5 @@
+<p>This is primarily for reporting physical problems that can be fixed
+like graffiti, cleansing issues or road defects. To report other
+kinds of problems like missed bins use our
+<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
+</p>
diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html
new file mode 100644
index 000000000..0ccaa0870
--- /dev/null
+++ b/templates/web/fixmystreet.com/front/javascript.html
@@ -0,0 +1,15 @@
+<script>
+yepnope.addPrefix( 'preload', function ( resource ) {
+ resource.noexec = true;
+ return resource;
+});
+Modernizr.load({
+ load: [
+ "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
+ "preload![% version('/js/map-OpenLayers.js') %]",
+ "preload![% version('/js/map-bing-ol.js') %]",
+ "preload![% version('/js/map-fms.js') %]",
+ "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
+ ]
+});
+</script>
diff --git a/templates/web/fixmystreet/front/javascript.html b/templates/web/fixmystreet/front/javascript.html
new file mode 100644
index 000000000..13aa5216c
--- /dev/null
+++ b/templates/web/fixmystreet/front/javascript.html
@@ -0,0 +1,15 @@
+[%# Assume using OpenStreetMap maps %]
+<script>
+yepnope.addPrefix( 'preload', function ( resource ) {
+ resource.noexec = true;
+ return resource;
+});
+Modernizr.load({
+ load: [
+ "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
+ "preload![% version('/js/map-OpenLayers.js') %]",
+ "preload![% version('/js/map-OpenStreetMap.js') %]",
+ "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
+ ]
+});
+</script>
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index f92518022..0441b3efb 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -1,20 +1,4 @@
-[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %]
-[% map_js = BLOCK %]
-<script>
-yepnope.addPrefix( 'preload', function ( resource ) {
- resource.noexec = true;
- return resource;
-});
-Modernizr.load({
- load: [
- "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
- "preload![% version('/js/map-OpenLayers.js') %]",
- "preload![% version('/js/map-bing-ol.js') %]",
- "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
- ]
-});
-</script>
-[% END %]
+[% map_js = PROCESS 'front/javascript.html' %]
[% pre_container_extra = PROCESS 'around/postcode_form.html' %]
[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
@@ -23,13 +7,7 @@ Modernizr.load({
<p class="form-error">[% error %]</p>
[% END %]
-[% IF c.cobrand.moniker == 'bromley' %]
-<p>This is primarily for reporting physical problems that can be fixed
-like graffiti, cleansing issues or road defects. To report other
-kinds of problems like missed bins use our
-<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
-</p>
-[% END %]
+[% TRY %][% PROCESS 'front/pre-steps.html' %][% CATCH file %][% END %]
<div class="tablewrapper">
<div id="front-howto">
diff --git a/templates/web/zerotb/index.html b/templates/web/zerotb/index.html
index 754dcbabc..4d0d6555c 100644
--- a/templates/web/zerotb/index.html
+++ b/templates/web/zerotb/index.html
@@ -9,7 +9,7 @@ Modernizr.load({
load: [
"preload![% version('/js/OpenLayers.fixmystreet.js') %]",
"preload![% version('/js/map-OpenLayers.js') %]",
- "preload![% version('/js/map-bing-ol.js') %]",
+ "preload![% version('/js/map-OpenStreetMap.js') %]",
"preload![% version('/js/jquery.ba-hashchange.min.js') %]"
]
});
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 7ef222da7..5dcf3cab3 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -8,7 +8,6 @@ function set_map_config(perm) {
//new OpenLayers.Control.LayerSwitcher(),
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.PermalinkFMS(permalink_id),
- new OpenLayers.Control.PermalinkFMSz('osm_link', 'https://www.openstreetmap.org/'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
}
diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js
index b81438a88..58d856781 100644
--- a/web/js/map-streetview.js
+++ b/web/js/map-streetview.js
@@ -1,7 +1,6 @@
function set_map_config(perm) {
fixmystreet.controls = [
new OpenLayers.Control.ArgParser(),
- //new OpenLayers.Control.LayerSwitcher(),
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.Permalink(),
new OpenLayers.Control.PanZoomFMS()
@@ -38,8 +37,7 @@ OpenLayers.Layer.StreetView = OpenLayers.Class(OpenLayers.Layer.XYZ, {
/* Below line added to OSM's file in order to allow minimum zoom level */
maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
numZoomLevels: 19,
- sphericalMercator: true,
- attribution: "Contains Ordnance Survey data © Crown copyright and database right 2012"
+ sphericalMercator: true
}, options);
var newArguments = [name, url, options];
OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments);
diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js
index cfff686e6..54b932168 100644
--- a/web/js/map-wmts-zurich.js
+++ b/web/js/map-wmts-zurich.js
@@ -63,7 +63,6 @@ $(function(){
fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts);
fixmystreet.controls = [
- new OpenLayers.Control.Attribution(),
new OpenLayers.Control.ArgParser(),
fixmystreet.nav_control
];
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 20:09:30 +0000