diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 11:31:32 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 12:45:22 +0100 |
| commit | c6a20311276f00befd27fe0ea7e606db4a13844d (patch) | |
| tree | a72eec3c6e1654dac232137ee367c4a622f70a48 /web/js | |
| parent | ca5761ae2542de544f48f6338d7d81f8711d3caf (diff) | |
Use our own StreetView tile server, add missing IE6 CSS for OpenLayers, don't set map parameter in JS.
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 6 | ||||
| -rw-r--r-- | web/js/map-bing-ol.js | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 821bbafc3..789d8f16e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -73,7 +73,7 @@ YAHOO.util.Event.onContentReady('map', function() { pin_layer_options.strategies = [ new OpenLayers.Strategy.BBOX() ]; pin_layer_options.protocol = new OpenLayers.Protocol.HTTP({ url: '/ajax', - params: fixmystreet.all_pins ? { all_pins: 1, map: 'FMS' } : { map: 'FMS' }, + params: fixmystreet.all_pins ? { all_pins: 1 } : { }, format: new OpenLayers.Format.FixMyStreet() }); } @@ -151,12 +151,12 @@ YAHOO.util.Event.addListener('all_pins_link', 'click', function(e) { for (var i=0; i<texts.length; i+=3) { if (this.innerHTML == texts[i+1]) { this.innerHTML = texts[i+2]; - fixmystreet.markers.protocol.options.params = { all_pins: 1, map: 'FMS' }; + fixmystreet.markers.protocol.options.params = { all_pins: 1 }; fixmystreet.markers.refresh( { force: true } ); lang = texts[i]; } else if (this.innerHTML == texts[i+2]) { this.innerHTML = texts[i+1]; - fixmystreet.markers.protocol.options.params = { map: 'FMS' }; + fixmystreet.markers.protocol.options.params = { }; fixmystreet.markers.refresh( { force: true } ); lang = texts[i]; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 75bce80d3..406524883 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -56,9 +56,10 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { if (z >= 16) { var url = [ - "http://a.os.openstreetmap.org/sv/${z}/${x}/${y}.png", - "http://b.os.openstreetmap.org/sv/${z}/${x}/${y}.png", - "http://c.os.openstreetmap.org/sv/${z}/${x}/${y}.png" + "http://tilma.mysociety.org/sv/${z}/${x}/${y}.png", + "http://a.tilma.mysociety.org/sv/${z}/${x}/${y}.png", + "http://b.tilma.mysociety.org/sv/${z}/${x}/${y}.png", + "http://c.tilma.mysociety.org/sv/${z}/${x}/${y}.png" ]; } else { var url = [ |