Changeset 6673
- Timestamp:
- 03/28/08 20:38:47 (5 months ago)
- Files:
-
- trunk/openlayers/examples/wmc.html (modified) (1 diff)
- trunk/openlayers/examples/wms.html (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Ajax.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Renderer/Elements.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Tween.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Util.js (modified) (1 diff)
- trunk/openlayers/tests/Control/test_ScaleLine.html (modified) (3 diffs)
- trunk/openlayers/tests/Format/test_GeoRSS.html (modified) (1 diff)
- trunk/openlayers/tests/Layer/test_WFS.html (modified) (1 diff)
- trunk/openlayers/tests/Rule/test_FeatureId.html (modified) (1 diff)
- trunk/openlayers/tests/Rule/test_Logical.html (modified) (1 diff)
- trunk/openlayers/tests/manual/tween.html (modified) (3 diffs)
- trunk/openlayers/tests/test_Rule.html (modified) (1 diff)
- trunk/openlayers/theme/default/style.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/examples/wmc.html
r6534 r6673 125 125 </head> 126 126 <body onload="init()"> 127 127 <h1 id="title">WMC Example</h1> 128 128 129 <div id="tags">130 </div>131 <pid="shortdesc">132 133 </p>134 <div id="map"></div>129 <d v id="tags"> 130 </ iv> 131 <p id="shortdesc"> 132 Shows parsing of Web Map Context documents. 133 </ > 134 <d v id="map"></div> 135 135 <button onclick="writeWMC();">write</button> 136 136 <button onclick="readWMC();">read as new map</button> 137 137 <button onclick="readWMC(true);">read and merge</button> 138 138 <textarea id="wmc">paste WMC doc here</textarea> 139 <div id="docs">139 <d v id="docs"> 140 140 This is an example of parsing WMC documents. <br /> 141 141 The format class has a layerOptions property, which can be used 142 142 to control the default options of the layer when it is created 143 143 by the parser. 144 </div>144 </ iv> 145 145 </body> 146 146 </html> trunk/openlayers/examples/wms.html
r6145 r6673 28 28 </head> 29 29 <body onload="init()"> 30 30 <h1 id="title">WMS Example</h1> 31 31 32 33 34 35 36 32 <div id="tags"> 33 </div> 34 <p id="shortdesc"> 35 Shows the basic use of openlayers using a WMS layer 36 </p> 37 37 38 38 <div id="map"></div> 39 39 40 41 42 43 40 <div id="docs"> 41 This is an example of how to add an WMS layer to the OpenLayers window. The images are tiled in this instance if you wanted to not use a tiled WMS 42 please use this example and pass the option singleTile as true. 43 </div> 44 44 </body> 45 45 </html> trunk/openlayers/lib/OpenLayers/Ajax.js
r6428 r6673 430 430 getStatus: function() { 431 431 try { 432 432 return this.transport.status || 0; 433 433 } catch (e) { 434 434 return 0; trunk/openlayers/lib/OpenLayers/Renderer/Elements.js
r6513 r6673 148 148 149 149 // append the node to root (but only if it's new) 150 151 152 150 if (node.parentNode != this.root) { 151 this.root.appendChild(node); 152 } 153 153 this.postDraw(node); 154 154 } else { trunk/openlayers/lib/OpenLayers/Tween.js
r6415 r6673 312 312 easeInOut: function(t, b, c, d) { 313 313 if ((t/=d/2) < 1) return c/2*t*t + b; 314 314 return -c/2 * ((--t)*(t-2) - 1) + b; 315 315 }, 316 316 trunk/openlayers/lib/OpenLayers/Util.js
r6555 r6673 918 918 OpenLayers.INCHES_PER_UNIT["in"]= OpenLayers.INCHES_PER_UNIT.inches; 919 919 OpenLayers.INCHES_PER_UNIT["degrees"] = OpenLayers.INCHES_PER_UNIT.dd; 920 OpenLayers.INCHES_PER_UNIT["nmi"] = 1852 * OpenLayers.INCHES_PER_UNIT.m; 920 OpenLayers.INCHES_PER_UNIT["nmi"] = 1852 * OpenLayers.INCHES_PER_UNIT.m; 921 921 922 922 /** trunk/openlayers/tests/Control/test_ScaleLine.html
r6580 r6673 44 44 t.ok(control instanceof OpenLayers.Control.ScaleLine, "new OpenLayers.Control returns object" ); 45 45 var map = new OpenLayers.Map('map'); 46 46 map.units = "mi"; 47 47 var layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); 48 48 map.addLayer(layer); … … 56 56 } 57 57 58 function test_calcMeters (t) { 59 t.plan(5); 58 function test_calcMeters (t) { 59 t.plan(5); 60 60 // this example is taken from the projected-map.html OpenLayers example 61 61 var lat = 900863; … … 79 79 } ); 80 80 81 map.addLayer(basemap); 81 map.addLayer(basemap); 82 82 map.setCenter(new OpenLayers.LonLat(lon, lat), zoom); 83 map.addControl(new OpenLayers.Control.LayerSwitcher()); 83 map.addControl(new OpenLayers.Control.LayerSwitcher()); 84 84 var control = new OpenLayers.Control.ScaleLine(); 85 85 t.ok( control instanceof OpenLayers.Control.ScaleLine, "new OpenLayers.Control returns object" ); trunk/openlayers/tests/Format/test_GeoRSS.html
r6131 r6673 81 81 ]; 82 82 var output= ['<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/562.atom</link><georss:polygon xmlns:georss="http://www.georss.org/georss">-5.9765625 -131.484375 -58.0078125 -112.5 -50.2734375 -32.34375 52.3828125 -114.609375 -35.5078125 -167.34375 -57.3046875 -146.953125 -34.1015625 -139.921875 -5.9765625 -131.484375</georss:polygon></item></rss>', 83 84 85 83 '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description><b>strokeColor</b>: 00ccff<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/796.atom</link><georss:point xmlns:georss="http://www.georss.org/georss">75.5859375 15.46875</georss:point></item></rss>', 84 '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 5</title><description><b>strokeColor</b>: red<br /><b>title</b>: Feature 5<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/794.atom</link><georss:line xmlns:georss="http://www.georss.org/georss">28.828125 32.6953125 49.921875 34.8046875 39.375 58.0078125 39.375 58.0078125 40.078125 58.0078125 41.484375 58.0078125 43.59375 58.0078125 45.703125 58.7109375 47.8125 58.7109375 49.21875 58.7109375 51.328125 59.4140625 52.03125 59.4140625 54.140625 60.8203125 56.25 61.5234375 56.25 62.2265625 57.65625 62.2265625 57.65625 62.9296875 58.359375 63.6328125 58.359375 65.0390625 58.359375 65.7421875 59.0625 66.4453125 59.0625 67.1484375 59.0625 68.5546875 59.765625 69.9609375 59.765625 72.0703125 59.765625 73.4765625 59.765625 76.2890625 59.765625 78.3984375 59.765625 79.8046875 59.765625 81.9140625 59.765625 83.3203125 59.0625 84.7265625 59.0625 86.8359375 58.359375 87.5390625 58.359375 88.2421875 56.953125 89.6484375 56.25 91.0546875 54.84375 93.8671875 52.03125 96.6796875 51.328125 98.7890625 50.625 100.1953125 49.21875 102.3046875 48.515625 103.7109375 47.8125 104.4140625 47.109375 105.8203125 46.40625 106.5234375 46.40625 107.9296875 45.703125 109.3359375 45 110.7421875 43.59375 112.8515625 43.59375 114.2578125 43.59375 114.9609375 42.890625 117.0703125 42.890625 117.7734375 42.1875 118.4765625 42.1875 119.1796875 42.1875 119.8828125</georss:line></item></rss>' 85 ]; 86 86 87 87 var shell_start_gml = '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:gml="http://www.opengis.net/gml" xmlns:georss="http://www.georss.org/georss"> <title>scribble</title><id>http://featureserver.org/featureserver.cgi/scribble?format=atom</id><author><name>FeatureServer</name></author>'; 88 89 90 91 92 93 94 95 96 97 98 88 var shell_end_gml = '</feed>'; 89 var input_gml = ['<entry><id>http://featureserver.org/featureserver.cgi/scribble/111.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/111.atom"/><title>Feature 2</title><content type="html"><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</content><georss:where><gml:Point><gml:pos>0 10</gml:pos></gml:Point></georss:where></entry>', 90 '<entry><id>http://featureserver.org/featureserver.cgi/scribble/111.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/111.atom"/><title>Feature 2</title><content type="html"><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</content><georss:where><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>110,-50 110,-10 155,-10 155,-50 110,-50</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></georss:where></entry>', 91 '<entry><id>http://featureserver.org/featureserver.cgi/scribble/111.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/111.atom"/><title>Feature 2</title><content type="html"><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</content><georss:where><gml:LineString><gml:coordinates>0,10 10,20</gml:coordinates></gml:LineString></georss:where></entry>', 92 '<entry><id>http://featureserver.org/featureserver.cgi/scribble/111.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/111.atom"/><title>Feature 2</title><content type="html"><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</content><georss:where><gml:Envelope><gml:lowerCorner>0 1</gml:lowerCorner><gml:upperCorner>20 21</gml:upperCorner></gml:Envelope></georss:where></entry>' 93 ]; 94 var output_gml = ['<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/111.atom</link><georss:point xmlns:georss="http://www.georss.org/georss">0 10</georss:point></item></rss>', 95 '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/111.atom</link><georss:polygon xmlns:georss="http://www.georss.org/georss">110 -50 110 -10 155 -10 155 -50 110 -50</georss:polygon></item></rss>', 96 '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/111.atom</link><georss:line xmlns:georss="http://www.georss.org/georss">0 10 10 20</georss:line></item></rss>', 97 '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description><b>strokeColor</b>: red<br /><b>title</b>: Feature 2<br /><b>author</b>: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/111.atom</link><georss:polygon xmlns:georss="http://www.georss.org/georss">0 1 0 21 20 21 20 1 0 1</georss:polygon></item></rss>' 98 ]; 99 99 100 100 </script> trunk/openlayers/tests/Layer/test_WFS.html
r6131 r6673 17 17 18 18 function test_Layer_WFS_destroy(t) { 19 20 21 22 23 24 19 t.plan(13); 20 21 var tVectorDestroy = OpenLayers.Layer.Vector.prototype.destroy; 22 OpenLayers.Layer.Vector.prototype.destroy = function() { 23 g_VectorDestroyed = true; 24 } 25 25 26 27 28 29 26 var tMarkersDestroy = OpenLayers.Layer.Markers.prototype.destroy; 27 OpenLayers.Layer.Markers.prototype.destroy = function() { 28 g_MarkersDestroyed = true; 29 } 30 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 g_MarkersDestroyed = null; 54 OpenLayers.Layer.WFS.prototype.destroy.apply(layer, []); 31 var layer = { 32 'vectorMode': true, 33 'tile': { 34 'destroy': function() { 35 t.ok(true, "wfs layer's tile is destroyed"); 36 } 37 }, 38 'ratio': {}, 39 'featureClass': {}, 40 'format': {}, 41 'formatObject': { 42 'destroy': function() { 43 t.ok(true, "wfs layer's format object is destroyed"); 44 } 45 }, 46 'formatOptions': {}, 47 'encodeBBOX': {}, 48 'extractAttributes': {} 49 }; 50 51 //this call should set off two tests (destroys for tile and format object) 52 g_VectorDestroyed = null; 53 g_MarkersDestroyed = null; 54 OpenLayers.Layer.WFS.prototype.destroy.apply(layer, []); 55 55 56 57 58 59 60 61 62 63 64 65 56 t.ok(g_VectorDestroyed && !g_MarkersDestroyed, "when vector mode is set to true, the default vector layer's destroy() method is called"); 57 t.eq(layer.vectorMode, null, "'vectorMode' property nullified"); 58 t.eq(layer.tile, null, "'tile' property nullified"); 59 t.eq(layer.ratio, null, "'ratio' property nullified"); 60 t.eq(layer.featureClass, null, "'featureClass' property nullified"); 61 t.eq(layer.format, null, "'format' property nullified"); 62 t.eq(layer.formatObject, null, "'formatObject' property nullified"); 63 t.eq(layer.formatOptions, null, "'formatOptions' property nullified"); 64 t.eq(layer.encodeBBOX, null, "'encodeBBOX' property nullified"); 65 t.eq(layer.extractAttributes, null, "'extractAttributes' property nullified"); 66 66 67 67 layer.vectorMode = false; 68 68 69 70 71 g_MarkersDestroyed = null; 72 OpenLayers.Layer.WFS.prototype.destroy.apply(layer, []); 73 74 75 76 69 //this call will *not* set off two tests (tile and format object are null) 70 g_VectorDestroyed = null; 71 g_MarkersDestroyed = null; 72 OpenLayers.Layer.WFS.prototype.destroy.apply(layer, []); 73 t.ok(!g_VectorDestroyed && g_MarkersDestroyed, "when vector mode is set to false, the default markers layer's destroy() method is called"); 74 75 OpenLayers.Layer.Vector.prototype.destroy = tVectorDestroy; 76 OpenLayers.Layer.Markers.prototype.destroy = tMarkersDestroy; 77 77 } 78 78 trunk/openlayers/tests/Rule/test_FeatureId.html
r6131 r6673 20 20 var rule = new OpenLayers.Rule.FeatureId(); 21 21 rule.destroy(); 22 22 t.eq(rule.symbolizer, null, "symbolizer hash nulled properly"); 23 23 } 24 24 trunk/openlayers/tests/Rule/test_Logical.html
r6131 r6673 20 20 var rule = new OpenLayers.Rule.Logical(); 21 21 rule.destroy(); 22 22 t.eq(rule.rules, null, "rules array nulled properly"); 23 23 } 24 24 trunk/openlayers/tests/manual/tween.html
r6415 r6673 1 1 <html xmlns="http://www.w3.org/1999/xhtml"> 2 2 <head> 3 3 <title>Tween Example</title> 4 4 <style type="text/css"> 5 5 #viewport { … … 61 61 <body onload="init()"> 62 62 <div id="title">Tween Example</div> 63 64 63 <div id="tags"></div> 64 <div id="shortdesc">Show transition effects</div> 65 65 <select name="transition" id="transition" onchange="changeTween()"> 66 66 <option value="Linear">Linear</option> … … 77 77 </div> 78 78 <div id="docs"> 79 79 This is an example of transition effects. 80 80 </div> 81 81 </body> trunk/openlayers/tests/test_Rule.html
r6131 r6673 20 20 var rule = new OpenLayers.Rule(); 21 21 rule.destroy(); 22 22 t.eq(rule.symbolizer, null, "symbolizer hash nulled properly"); 23 23 } 24 24 trunk/openlayers/theme/default/style.css
r6177 r6673 105 105 color:gray; 106 106 font-size:1.2em; 107 107 margin-right:6px; 108 108 font-family:sans-serif; 109 109 }
