Changeset 8593
- Timestamp:
- 02/10/12 10:26:53 (8 years ago)
- Location:
- mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaObservation.js
r8590 r8593 268 268 function geogExtent(extents) { 269 269 try { 270 var box_extents = [extents[0].westBoundLongitude .value,extents[0].southBoundLatitude.value,extents[0].eastBoundLongitude.value,extents[0].northBoundLatitude.value]270 var box_extents = [extents[0].westBoundLongitude,extents[0].southBoundLatitude,extents[0].eastBoundLongitude,extents[0].northBoundLatitude] 271 271 } 272 272 … … 327 327 328 328 if (coObs != '' && old_coObs != ''){ 329 330 if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1){ 329 var isChrome = /(chrome)[ \/]([\w.]+)/i.test(navigator.userAgent); 330 331 if (isChrome){ 331 332 console.log(coObs) 332 333 console.log(old_coObs) … … 377 378 // uncomment to implement - removed at present due to issue with openlayers. 378 379 try { 379 cedaol.drawMap( geogExtent(coObs.geographicExtent),'map',ids);380 cedaol.drawMap(coObs.geographicExtent,'map',ids); 380 381 } 381 382 catch(err){ -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaol.js
r8590 r8593 10 10 11 11 // This returned object becomes the defined value of this module 12 return { 13 drawMap_: function(extents, map_id,ids){ 14 var map; 15 if (ids['ceda_title'].code != 'Data from Mars Analysis Correction Data Assimilation (MACDA)'){ 16 map = new Map(map_id, { 17 baseLayerName : 'OSGeo WMS', 18 baseLayerType : dojox.geo.openlayers.BaseLayerType.WMS, 19 baseLayerUrl : "http://vmap0.tiles.osgeo.org/wms/vmap0", 20 baseLayerOptions: {layers: 'basic'} 21 }); 22 } 23 else { 24 map = new Map(map_id, { 25 baseLayerName : 'Mars Basemap', 26 baseLayerType : dojox.geo.openlayers.BaseLayerType.WMS, 27 baseLayerUrl : "http://cedawms.badc.rl.ac.uk/marsbasemap?", 28 baseLayerOptions: {layers: 'mars'} 29 }); 30 } 31 32 if (extents[0]){ 33 if (extents.length == 4){ 34 35 if (Math.abs(extents[0].westBoundLongitude.value - extents[0].eastBoundLongitude.value) > 1.0 && Math.abs(extents[0].northBoundLatitude.value - extents[0].southBoundLatitude.value) > 1.0 ){ 36 map.fitTo({ 37 //{ bounds : [ulx, uly, lrx, lry] } 38 position : [ extents[0].westBoundLongitude.value, 39 extents[0].southBoundLatitude.value, 40 extents[0].eastBoundLongitude.value, 41 extents[0].northBoundLatitude.value ] 42 }); 43 } 44 else{ 45 // create a GfxLayer 46 var layer = new GfxLayer(); 47 // create a Point geometry at New York location 48 var p = new Point({x:extents[0].westBoundLongitude.value, 49 y:extents[0].southBoundLatitude.value}); 50 // create a GeometryFeature 51 var f = new GeometryFeature(p); 52 f.setStroke("blue") 53 f.setFill({ 54 color : [255, 100, 0] 55 }) 56 57 map.fitTo({ 58 //{ bounds : [ulx, uly, lrx, lry] } 59 position : [ extents[0].westBoundLongitude.value, 60 extents[0].southBoundLatitude.value] 61 }); 62 } 63 64 } 65 } else { 66 //in cases where no geographicExtent is given put in global box 67 ext = [-180.0,-90.0,180.0,90.0] 68 map.fitTo({ 69 //{ bounds : [ulx, uly, lrx, lry] } 70 position : [ ext[0],ext[1],ext[2],ext[3] ] 71 }); 72 } 73 74 var proj = new OpenLayers.Projection("EPSG:4326"); 75 var point = new OpenLayers.LonLat(ext[0], ext[1]); 76 point.transform(proj, map.getProjectionObject()); 77 map.setCenter(point,3); 78 map.setCenter(new OpenLayers.LonLat(ext[0], ext[1]), 5); 79 map.zoomToMaxExtent(); 80 }, 12 return { 81 13 drawMap: function(extents, map_id,ids){ 82 14 map = new OpenLayers.Map(map_id); … … 106 38 107 39 if (extents[0]){ 108 if (extents[0].__class__ == 'EX_GeographicBoundingBox'){ 109 110 if (Math.abs(extents[0].westBoundLongitude.value - extents[0].eastBoundLongitude.value) > 1.0 && Math.abs(extents[0].northBoundLatitude.value - extents[0].southBoundLatitude.value) > 1.0 ){ 111 var box_extents = [[extents[0].westBoundLongitude.value,extents[0].southBoundLatitude.value,extents[0].eastBoundLongitude.value,extents[0].northBoundLatitude.value]] 40 if (extents[0]._clazz == 'EX_GeographicBoundingBox'){ 41 if (Math.abs(extents[0].westBoundLongitude - extents[0].eastBoundLongitude) > 1.0 && Math.abs(extents[0].northBoundLatitude - extents[0].southBoundLatitude) > 1.0 ){ 42 var box_extents = [[extents[0].westBoundLongitude,extents[0].southBoundLatitude,extents[0].eastBoundLongitude,extents[0].northBoundLatitude]] 112 43 for (var i = 0; i < box_extents.length; i++) { 113 44 ext = box_extents[i]; … … 122 53 } 123 54 else{ 124 var box_extents = [[extents[0].westBoundLongitude .value,extents[0].southBoundLatitude.value,extents[0].eastBoundLongitude.value,extents[0].northBoundLatitude.value]]55 var box_extents = [[extents[0].westBoundLongitude,extents[0].southBoundLatitude,extents[0].eastBoundLongitude,extents[0].northBoundLatitude]] 125 56 ext = box_extents[0]; 126 57
Note: See TracChangeset
for help on using the changeset viewer.