ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changing all tabs to spaces, per CodingStandards.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@139 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2006-05-18 12:42:38 +00:00
parent 147a45feff
commit 6ab326f67d
8 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Util.js
View File

@@ -442,7 +442,7 @@ Array.prototype.remove = function(rem) {
for(var i=0; i<this.length; i++) {
if(this[i]==rem) {
this.splice(i,1);
//break;more than once??
//break;more than once??
}
}
return this;

36
lib/Rico/Color.js
View File

@@ -136,15 +136,15 @@ Rico.Color.createColorFromBackground = function(elem) {
Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
var red = 0;
var green = 0;
var blue = 0;
var green = 0;
var blue = 0;
if (saturation == 0) {
red = parseInt(brightness * 255.0 + 0.5);
green = red;
blue = red;
}
else {
green = red;
blue = red;
}
else {
var h = (hue - Math.floor(hue)) * 6.0;
var f = h - Math.floor(h);
var p = brightness * (1.0 - saturation);
@@ -182,8 +182,8 @@ Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
green = (p * 255.0 + 0.5);
blue = (q * 255.0 + 0.5);
break;
}
}
}
}
return { r : parseInt(red), g : parseInt(green) , b : parseInt(blue) };
}
@@ -212,19 +212,19 @@ Rico.Color.RGBtoHSB = function(r, g, b) {
hue = 0;
else {
var redc = (cmax - r)/(cmax - cmin);
var greenc = (cmax - g)/(cmax - cmin);
var bluec = (cmax - b)/(cmax - cmin);
var greenc = (cmax - g)/(cmax - cmin);
var bluec = (cmax - b)/(cmax - cmin);
if (r == cmax)
hue = bluec - greenc;
else if (g == cmax)
hue = 2.0 + redc - bluec;
if (r == cmax)
hue = bluec - greenc;
else if (g == cmax)
hue = 2.0 + redc - bluec;
else
hue = 4.0 + greenc - redc;
hue = 4.0 + greenc - redc;
hue = hue / 6.0;
if (hue < 0)
hue = hue + 1.0;
hue = hue / 6.0;
if (hue < 0)
hue = hue + 1.0;
}
return { h : hue, s : saturation, b : brightness };

8
tests/test_Control.html
View File

@@ -4,10 +4,10 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_constructor (t) {
t.plan( 1 );
control = new OpenLayers.Control();
t.ok( control instanceof OpenLayers.Control, "new OpenLayers.Control returns object" );
t.plan( 1 );
control = new OpenLayers.Control();
t.ok( control instanceof OpenLayers.Control, "new OpenLayers.Control returns object" );
}
// -->
</script>

8
tests/test_Events.html
View File

@@ -4,10 +4,10 @@
<script type="text/javascript"><!--
var map;
function test_01_Events_constructor (t) {
t.plan( 18 );
t.plan( 18 );
var obj = {result: 0}, eventTypes = ["doThingA", "doThingB", "doThingC"];
events = new OpenLayers.Events(obj, $('map'), eventTypes);
t.ok( events instanceof OpenLayers.Events, "new OpenLayers.Control returns object" );
events = new OpenLayers.Events(obj, $('map'), eventTypes);
t.ok( events instanceof OpenLayers.Events, "new OpenLayers.Control returns object" );
t.ok( events.div instanceof HTMLDivElement, "events.div isa HTMLDivElement" );
t.ok( events.object === obj, "events.object is the object we passed" );
@@ -35,7 +35,7 @@
}
function test_02_Events_nullEventTypes (t) {
t.plan(1);
events = new OpenLayers.Events(null, $('map'), null);
events = new OpenLayers.Events(null, $('map'), null);
t.ok( events.listeners, "Creation of Events with null Event Types is okay" );
}
// -->

18
tests/test_Layer.html
View File

@@ -5,18 +5,18 @@
var layer;
function test_01_Layer_constructor (t) {
t.plan( 2 );
layer = new OpenLayers.Layer('Test Layer');
t.ok( layer instanceof OpenLayers.Layer, "new OpenLayers.Layer returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
t.plan( 2 );
layer = new OpenLayers.Layer('Test Layer');
t.ok( layer instanceof OpenLayers.Layer, "new OpenLayers.Layer returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
}
function test_99_Layer_destroy (t) {
t.plan( 1 );
layer = new OpenLayers.Layer('Test Layer');
layer.destroy();
t.eq( layer.map, null, "layer.map is null after destroy" );
t.plan( 1 );
layer = new OpenLayers.Layer('Test Layer');
layer.destroy();
t.eq( layer.map, null, "layer.map is null after destroy" );
}
// -->
</script>

28
tests/test_Layer_Marker.html
View File

@@ -5,27 +5,27 @@
var layer;
function test_01_Layer_Marker_constructor (t) {
t.plan( 2 );
layer = new OpenLayers.Layer.Marker('Test Layer');
t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
t.plan( 2 );
layer = new OpenLayers.Layer.Marker('Test Layer');
t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
}
function test_02_Layer_Marker_addlayer (t) {
t.plan( 3 );
layer = new OpenLayers.Layer.Marker('Test Layer');
t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
t.plan( 3 );
layer = new OpenLayers.Layer.Marker('Test Layer');
t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(), new OpenLayers.Size()));
t.eq( layer.markers.length, 1, "addLayer adds marker to layer." );
}
function test_99_Layer_Marker_destroy (t) {
t.plan( 1 );
layer = new OpenLayers.Layer.Marker('Test Layer');
layer.destroy();
t.eq( layer.map, null, "layer.map is null after destroy" );
t.plan( 1 );
layer = new OpenLayers.Layer.Marker('Test Layer');
layer.destroy();
t.eq( layer.map, null, "layer.map is null after destroy" );
}
// -->
</script>

32
tests/test_Layer_WMS.html
View File

@@ -5,20 +5,20 @@
var layer;
function test_01_Layer_WMS_constructor (t) {
t.plan( 6 );
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/png'});
t.ok( layer instanceof OpenLayers.Layer.WMS, "new OpenLayers.Layer.WMS returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
t.eq( layer.url, "http://octo.metacarta.com/cgi-bin/mapserv", "layer.url is correct" );
t.eq( layer.params.map, "/mapdata/vmap_wms.map", "layer.params.map is correct" );
t.eq( layer.params.format, "image/png", "layer.params.format is correctly overridden" );
t.eq( layer.params.exceptions, "application/vnd.ogc.se_inimage",
"other default layer.params are set correctly" );
t.plan( 6 );
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/png'});
t.ok( layer instanceof OpenLayers.Layer.WMS, "new OpenLayers.Layer.WMS returns object" );
t.eq( layer.name, "Test Layer", "layer.name is correct" );
t.eq( layer.url, "http://octo.metacarta.com/cgi-bin/mapserv", "layer.url is correct" );
t.eq( layer.params.map, "/mapdata/vmap_wms.map", "layer.params.map is correct" );
t.eq( layer.params.format, "image/png", "layer.params.format is correctly overridden" );
t.eq( layer.params.exceptions, "application/vnd.ogc.se_inimage",
"other default layer.params are set correctly" );
}
function test_02_Layer_WMS_addtile (t) {
t.plan( 6 );
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
t.eq( tile.img.src, "http://octo.metacarta.com/cgi-bin/mapserv?bbox=1,2,3,4&width=256&height=256&map=/mapdata/vmap_wms.map&layers=basic&format=image/jpeg&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:4326&styles=&exceptions=application/vnd.ogc.se_inimage", "image src is created correctly via addtile" );
@@ -32,7 +32,7 @@
function test_03_Layer_WMS_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map($('map'));
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
t.eq( layer.grid.length, 4, "Grid rows is correct." );
@@ -41,10 +41,10 @@
}
function test_99_Layer_WMS_destroy (t) {
t.plan( 1 );
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
layer.destroy();
t.eq( layer.map, null, "layer.map is null after destroy" );
t.plan( 1 );
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
layer.destroy();
t.eq( layer.map, null, "layer.map is null after destroy" );
}
// -->
</script>

4
tests/test_Util.html
View File

@@ -4,8 +4,8 @@
<script type="text/javascript"><!--
var map;
function test_01_Util_getImagesLocation (t) {
t.plan( 1 );
t.ok( OpenLayers.Util.getImagesLocation(), "../img/",
t.plan( 1 );
t.ok( OpenLayers.Util.getImagesLocation(), "../img/",
"getImagesLocation()" );
}
// -->