Changeset 139
- Timestamp:
- 05/18/06 08:42:38 (3 years ago)
- Files:
-
- trunk/openlayers/lib/OpenLayers/Util.js (modified) (1 diff)
- trunk/openlayers/lib/Rico/Color.js (modified) (3 diffs)
- trunk/openlayers/tests/test_Control.html (modified) (1 diff)
- trunk/openlayers/tests/test_Events.html (modified) (2 diffs)
- trunk/openlayers/tests/test_Layer.html (modified) (1 diff)
- trunk/openlayers/tests/test_Layer_Marker.html (modified) (2 diffs)
- trunk/openlayers/tests/test_Layer_WMS.html (modified) (3 diffs)
- trunk/openlayers/tests/test_Util.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/lib/OpenLayers/Util.js
r131 r139 443 443 if(this[i]==rem) { 444 444 this.splice(i,1); 445 445 //break;more than once?? 446 446 } 447 447 } trunk/openlayers/lib/Rico/Color.js
r70 r139 137 137 138 138 var red = 0; 139 140 139 var green = 0; 140 var blue = 0; 141 141 142 142 if (saturation == 0) { 143 143 red = parseInt(brightness * 255.0 + 0.5); 144 145 146 147 144 green = red; 145 blue = red; 146 } 147 else { 148 148 var h = (hue - Math.floor(hue)) * 6.0; 149 149 var f = h - Math.floor(h); … … 183 183 blue = (q * 255.0 + 0.5); 184 184 break; 185 186 185 } 186 } 187 187 188 188 return { r : parseInt(red), g : parseInt(green) , b : parseInt(blue) }; … … 213 213 else { 214 214 var redc = (cmax - r)/(cmax - cmin); 215 216 217 218 219 220 221 215 var greenc = (cmax - g)/(cmax - cmin); 216 var bluec = (cmax - b)/(cmax - cmin); 217 218 if (r == cmax) 219 hue = bluec - greenc; 220 else if (g == cmax) 221 hue = 2.0 + redc - bluec; 222 222 else 223 224 225 226 227 223 hue = 4.0 + greenc - redc; 224 225 hue = hue / 6.0; 226 if (hue < 0) 227 hue = hue + 1.0; 228 228 } 229 229 trunk/openlayers/tests/test_Control.html
r15 r139 5 5 var map; 6 6 function test_01_Control_constructor (t) { 7 8 9 10 7 t.plan( 1 ); 8 9 control = new OpenLayers.Control(); 10 t.ok( control instanceof OpenLayers.Control, "new OpenLayers.Control returns object" ); 11 11 } 12 12 // --> trunk/openlayers/tests/test_Events.html
r138 r139 5 5 var map; 6 6 function test_01_Events_constructor (t) { 7 7 t.plan( 18 ); 8 8 var obj = {result: 0}, eventTypes = ["doThingA", "doThingB", "doThingC"]; 9 10 9 events = new OpenLayers.Events(obj, $('map'), eventTypes); 10 t.ok( events instanceof OpenLayers.Events, "new OpenLayers.Control returns object" ); 11 11 t.ok( events.div instanceof HTMLDivElement, "events.div isa HTMLDivElement" ); 12 12 t.ok( events.object === obj, "events.object is the object we passed" ); … … 36 36 function test_02_Events_nullEventTypes (t) { 37 37 t.plan(1); 38 38 events = new OpenLayers.Events(null, $('map'), null); 39 39 t.ok( events.listeners, "Creation of Events with null Event Types is okay" ); 40 40 } trunk/openlayers/tests/test_Layer.html
r32 r139 6 6 7 7 function test_01_Layer_constructor (t) { 8 9 10 11 12 8 t.plan( 2 ); 9 10 layer = new OpenLayers.Layer('Test Layer'); 11 t.ok( layer instanceof OpenLayers.Layer, "new OpenLayers.Layer returns object" ); 12 t.eq( layer.name, "Test Layer", "layer.name is correct" ); 13 13 } 14 14 15 15 function test_99_Layer_destroy (t) { 16 t.plan( 1 ); 17 18 19 16 t.plan( 1 ); 17 layer = new OpenLayers.Layer('Test Layer'); 18 layer.destroy(); 19 t.eq( layer.map, null, "layer.map is null after destroy" ); 20 20 } 21 21 // --> trunk/openlayers/tests/test_Layer_Marker.html
r136 r139 6 6 7 7 function test_01_Layer_Marker_constructor (t) { 8 9 10 11 12 8 t.plan( 2 ); 9 10 layer = new OpenLayers.Layer.Marker('Test Layer'); 11 t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); 12 t.eq( layer.name, "Test Layer", "layer.name is correct" ); 13 13 } 14 14 function test_02_Layer_Marker_addlayer (t) { 15 16 17 18 19 15 t.plan( 3 ); 16 17 layer = new OpenLayers.Layer.Marker('Test Layer'); 18 t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); 19 t.eq( layer.name, "Test Layer", "layer.name is correct" ); 20 20 layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(), new OpenLayers.Size())); 21 21 t.eq( layer.markers.length, 1, "addLayer adds marker to layer." ); … … 23 23 24 24 function test_99_Layer_Marker_destroy (t) { 25 t.plan( 1 ); 26 27 28 25 t.plan( 1 ); 26 layer = new OpenLayers.Layer.Marker('Test Layer'); 27 layer.destroy(); 28 t.eq( layer.map, null, "layer.map is null after destroy" ); 29 29 } 30 30 // --> trunk/openlayers/tests/test_Layer_WMS.html
r119 r139 6 6 7 7 function test_01_Layer_WMS_constructor (t) { 8 9 10 11 12 13 14 15 16 17 "other default layer.params are set correctly" );8 t.plan( 6 ); 9 10 layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/png'}); 11 t.ok( layer instanceof OpenLayers.Layer.WMS, "new OpenLayers.Layer.WMS returns object" ); 12 t.eq( layer.name, "Test Layer", "layer.name is correct" ); 13 t.eq( layer.url, "http://octo.metacarta.com/cgi-bin/mapserv", "layer.url is correct" ); 14 t.eq( layer.params.map, "/mapdata/vmap_wms.map", "layer.params.map is correct" ); 15 t.eq( layer.params.format, "image/png", "layer.params.format is correctly overridden" ); 16 t.eq( layer.params.exceptions, "application/vnd.ogc.se_inimage", 17 "other default layer.params are set correctly" ); 18 18 } 19 19 function test_02_Layer_WMS_addtile (t) { 20 20 t.plan( 6 ); 21 21 layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); 22 22 var pixel = new OpenLayers.Pixel(5,6); 23 23 var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel); … … 33 33 t.plan( 2 ); 34 34 var map = new OpenLayers.Map($('map')); 35 35 layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); 36 36 map.addLayer(layer); 37 37 map.setCenter(new OpenLayers.LonLat(0,0),5); … … 42 42 43 43 function test_99_Layer_WMS_destroy (t) { 44 t.plan( 1 ); 45 46 47 44 t.plan( 1 ); 45 layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); 46 layer.destroy(); 47 t.eq( layer.map, null, "layer.map is null after destroy" ); 48 48 } 49 49 // --> trunk/openlayers/tests/test_Util.html
r116 r139 5 5 var map; 6 6 function test_01_Util_getImagesLocation (t) { 7 8 7 t.plan( 1 ); 8 t.ok( OpenLayers.Util.getImagesLocation(), "../img/", 9 9 "getImagesLocation()" ); 10 10 }
