diff options
| author | Matthew Somerville <matthew@dracos.co.uk> | 2011-03-25 15:25:06 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@dracos.co.uk> | 2011-03-25 15:25:06 +0000 |
| commit | f931e2f7146ee271807315a9830c71afc8ad6eb5 (patch) | |
| tree | 042b0fd56636fdefde655b2e5d62d210a3d4776f /web/js/map-OpenStreetMap.js | |
| parent | 71c4b7a598c6b0b441eef63b1e1e016bd45e9991 (diff) | |
| parent | 8db1506fb88902e70350d15ba9484180c9d9b3bb (diff) | |
Merge branch 'master' into reportemptyhomes
Conflicts:
web/css/cobrands/emptyhomes/emptyhomes.css
Diffstat (limited to 'web/js/map-OpenStreetMap.js')
| -rw-r--r-- | web/js/map-OpenStreetMap.js | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 04237e075..9d226f6a7 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -1,27 +1,13 @@ -YAHOO.util.Event.onContentReady('map', function() { - var map = new OpenLayers.Map("map", { - controls: [ - new OpenLayers.Control.ArgParser(), - //new OpenLayers.Control.LayerSwitcher(), - new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoom() - ], - displayProjection: new OpenLayers.Projection("EPSG:4326") - }); - var streetview = new fixmystreet.map_type("", { - zoomOffset: 14, - numZoomLevels: 4 - }); - map.addLayer(streetview); - - var centre = new OpenLayers.LonLat( fixmystreet.easting, fixmystreet.northing ); - centre.transform( - new OpenLayers.Projection("EPSG:27700"), - map.getProjectionObject() - ); - map.setCenter(centre, 2); -}); - +function set_map_config(perm) { + fixmystreet.controls = [ + new OpenLayers.Control.ArgParser(), + //new OpenLayers.Control.LayerSwitcher(), + new OpenLayers.Control.Navigation(), + perm, + new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), + new OpenLayers.Control.PanZoomFMS() + ]; +} // http://www.openstreetmap.org/openlayers/OpenStreetMap.js (added maxResolution) |