aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-01-19 19:06:02 +0000
committerMatthew Somerville <matthew@mysociety.org>2015-01-19 19:06:02 +0000
commitd0f9ff5cc7b177e38755189b59267b1648a15ca6 (patch)
tree635d1eca4452256726bcb2a116646c8f7385c8b2 /web
parent429c0268c2eadfe81c65966c5a81a215ab4cea51 (diff)
parentec470c609e438892c28c69ba07cf81ea17c74f17 (diff)
Merge branch 'google-maps-satellite-view'
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/sass/_layout.scss4
-rw-r--r--web/js/map-google-ol.js14
2 files changed, 16 insertions, 2 deletions
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 607734c41..d1cfb6be7 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -631,8 +631,8 @@ body.twothirdswidthpage {
display:block;
cursor: pointer;
position:absolute;
- left:-1em;
- width:1em;
+ left: -0.97em; /* 1em leaves a tiny gap, font issue */
+ width: 1em;
height:100%;
background:#000 url($image-sprite) right -4119px no-repeat;
@include border-radius(0.25em 0 0 0.25em);
diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js
index 953765068..5d128a7bd 100644
--- a/web/js/map-google-ol.js
+++ b/web/js/map-google-ol.js
@@ -1,3 +1,13 @@
+$(function(){
+ $('#map_layer_toggle').toggle(function(){
+ $(this).text(translation_strings.map_map);
+ fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
+ }, function(){
+ $(this).text(translation_strings.map_satellite);
+ fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
+ });
+});
+
function set_map_config(perm) {
var permalink_id;
if ($('#map_permalink').length) {
@@ -15,5 +25,9 @@ function set_map_config(perm) {
fixmystreet.map_options = {
zoomDuration: 10
};
+ fixmystreet.layer_options = [
+ {},
+ { type: google.maps.MapTypeId.HYBRID }
+ ];
}