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-tilma-ol.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-tilma-ol.js')
-rw-r--r-- | web/js/map-tilma-ol.js | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/web/js/map-tilma-ol.js b/web/js/map-tilma-ol.js index cfd196c1d..5230a5d2c 100644 --- a/web/js/map-tilma-ol.js +++ b/web/js/map-tilma-ol.js @@ -1,21 +1,19 @@ -YAHOO.util.Event.onContentReady('map', function() { - var map = new OpenLayers.Map("map", { - controls: [ - new OpenLayers.Control.ArgParser(), - new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanPanel() - ] - }); - var tilma = new OpenLayers.Layer.Tilma("Tilma", { +function set_map_config(perm) { + fixmystreet.controls = [ + new OpenLayers.Control.ArgParser(), + perm, + new OpenLayers.Control.Navigation(), + new OpenLayers.Control.PanPanel() + ]; + fixmystreet.map_type = OpenLayers.Layer.Tilma; + fixmystreet.layer_options = { maxResolution: fixmystreet.maxResolution, tileSize: new OpenLayers.Size(fixmystreet.tilewidth, fixmystreet.tileheight), - map_type: fixmystreet.tile_type - }); - map.addLayer(tilma); - - var centre = new OpenLayers.LonLat( fixmystreet.easting, fixmystreet.northing ); - map.setCenter(centre); -}); + map_type: fixmystreet.tile_type, + numZoomLevels: 1, + zoomOffset: 0 + }; +} OpenLayers.Layer.Tilma = OpenLayers.Class(OpenLayers.Layer.XYZ, { initialize: function(name, options) { @@ -23,8 +21,9 @@ OpenLayers.Layer.Tilma = OpenLayers.Class(OpenLayers.Layer.XYZ, { options = OpenLayers.Util.extend({ transitionEffect: "resize", numZoomLevels: 1, + projection: "EPSG:27700", units: "m", - maxExtent: new OpenLayers.Bounds(0, 0, 700000, 1300000), + maxExtent: new OpenLayers.Bounds(0, 0, 700000, 1300000) }, options); var newArguments = [name, url, options]; OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments); |