diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-04-04 12:24:03 +0100 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-04-04 12:24:03 +0100 |
| commit | 8fa7e52025478515203b39f3e7afafb829b60731 (patch) | |
| tree | 295fb14df87abc4577418cfd294931cc51f7c991 /web/js/map-streetview.js | |
| parent | 689e4c3bd7c7c1cb24ecad3b35a57947bfb7945b (diff) | |
| parent | e591ef105c5996e95f2e7738b324c25b3708f0be (diff) | |
Merge branch 'master' into migrate_to_catalyst
Conflicts:
.gitignore
commonlib
conf/packages
perllib/FixMyStreet/Map.pm
templates/website/cobrands/barnet/footer
web/confirm.cgi
web/css/core.css
web/import.cgi
web/index.cgi
Diffstat (limited to 'web/js/map-streetview.js')
| -rw-r--r-- | web/js/map-streetview.js | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index 088e5b6a2..cfd595b95 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.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 OpenLayers.Layer.StreetView("OS StreetView (1:10000)", { - 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.PanZoomFMS() + ]; + fixmystreet.map_type = OpenLayers.Layer.StreetView; +} // http://os.openstreetmap.org/openlayers/OS.js (added one line) |