diff --git a/tests/Layer/test_GeoRSS.html b/tests/Layer/test_GeoRSS.html
index ba96130965..345f2cd20f 100644
--- a/tests/Layer/test_GeoRSS.html
+++ b/tests/Layer/test_GeoRSS.html
@@ -140,25 +140,25 @@
});
}
- function test_04_Layer_GeoRSS_icon(t) {
- t.plan( 3 );
- layer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt);
+ function test_04_Layer_GeoRSS_icon(t) {
+ t.plan( 3 );
+ layer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt);
var the_icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png');
- var otherLayer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt,{icon:the_icon});
- var map = new OpenLayers.Map('map');
+ var otherLayer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt,{icon:the_icon});
+ var map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
map.addLayer(baseLayer);
map.addLayers([layer,otherLayer]);
map.setCenter(new OpenLayers.LonLat(0,0),0);
- var defaultIcon = OpenLayers.Marker.defaultIcon();
- t.delay_call( 1, function() {
- t.ok(layer.markers[0].icon, "The layer has a icon");
- t.eq(layer.markers[0].icon.url, defaultIcon.url, "The layer without icon has the default icon.");
- t.eq(otherLayer.markers[0].icon.url, the_icon.url,"The layer with an icon has that icon.");
- });
- }
+ var defaultIcon = OpenLayers.Marker.defaultIcon();
+ t.delay_call( 1, function() {
+ t.ok(layer.markers[0].icon, "The layer has a icon");
+ t.eq(layer.markers[0].icon.url, defaultIcon.url, "The layer without icon has the default icon.");
+ t.eq(otherLayer.markers[0].icon.url, the_icon.url,"The layer with an icon has that icon.");
+ });
+ }
function test_Layer_GeoRSS_loadend_Event(t) {
var browserCode = OpenLayers.Util.getBrowserName();
if (browserCode == "msie") {
diff --git a/tests/Layer/test_Grid.html b/tests/Layer/test_Grid.html
index c99231dd71..11acc54a95 100644
--- a/tests/Layer/test_Grid.html
+++ b/tests/Layer/test_Grid.html
@@ -515,10 +515,10 @@
}
function test_16_Layer_Grid_tileSizeIsInteger(t) {
- t.plan(1);
-
+ t.plan(1);
+
var map = new OpenLayers.Map('map');
- var layer = new OpenLayers.Layer.Grid(name, url, params, {
+ var layer = new OpenLayers.Layer.Grid(name, url, params, {
singleTile: true,
ratio: 1.5
});
diff --git a/tests/Layer/test_Text.html b/tests/Layer/test_Text.html
index 4538617333..3a1b8c3e4b 100644
--- a/tests/Layer/test_Text.html
+++ b/tests/Layer/test_Text.html
@@ -120,7 +120,7 @@
}
function test_Layer_Text_loadend_Event(t) {
t.plan(2);
- layer = new OpenLayers.Layer.Text('Test Layer', {location:datafile});
+ layer = new OpenLayers.Layer.Text('Test Layer', {location:datafile});
t.delay_call(2, function() {
layer.events.register('loadend', layer, function() {
t.ok(true, "Loadend event fired");
diff --git a/tests/Layer/test_Vector.html b/tests/Layer/test_Vector.html
index ec950dfdb2..3e1aab251d 100644
--- a/tests/Layer/test_Vector.html
+++ b/tests/Layer/test_Vector.html
@@ -165,9 +165,9 @@
var baseLayer = new OpenLayers.Layer.WMS("Base Layer",
"http://octo.metacarta.com/cgi-bin/mapserv",
{ map: '/mapdata/vmap_wms.map',
- layers: 'basic',
- format: 'image/png'});
-
+ layers: 'basic',
+ format: 'image/png'});
+
var layer = new OpenLayers.Layer.Vector("Test Layer");
var renderer = layer.renderer;
var map = new OpenLayers.Map('map');
@@ -181,25 +181,25 @@
map.zoomToMaxExtent();
var customStyle1 = new Object({
- externalGraphic: 'test.png',
- pointRadius: 10
+ externalGraphic: 'test.png',
+ pointRadius: 10
});
var customStyle2 = new Object({
- externalGraphic: 'test.png',
- graphicWidth: 12
+ externalGraphic: 'test.png',
+ graphicWidth: 12
});
var customStyle3 = new Object({
- externalGraphic: 'test.png',
- graphicHeight: 14
+ externalGraphic: 'test.png',
+ graphicHeight: 14
});
var customStyle4 = new Object({
- externalGraphic: 'test.png',
- graphicWidth: 24,
- graphicHeight: 16
+ externalGraphic: 'test.png',
+ graphicWidth: 24,
+ graphicHeight: 16
});
var customStyle5 = new Object({
externalGraphic: 'test.png',
- graphicWidth: 24,
+ graphicWidth: 24,
graphicOpacity: 1
});
var customStyle6 = new Object({
@@ -212,43 +212,43 @@
var root = renderer.root;
if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.SVG') {
- feature.style = customStyle1;
- layer.drawFeature(feature);
- t.eq(root.firstChild.getAttributeNS(null, 'width'),
- (2*customStyle1.pointRadius).toString(),
- "given a pointRadius, width equals 2*pointRadius");
- t.eq(root.firstChild.getAttributeNS(null, 'height'),
- (2*customStyle1.pointRadius).toString(),
- "given a pointRadius, height equals 2*pointRadius");
- feature.style = customStyle2;
- layer.drawFeature(feature);
- t.eq(root.firstChild.getAttributeNS(null, 'width'),
- root.firstChild.getAttributeNS(null, 'height'),
- "given a graphicWidth, width equals height");
- t.eq(root.firstChild.getAttributeNS(null, 'width'),
- customStyle2.graphicWidth.toString(),
- "width is set correctly");
- feature.style = customStyle3;
- layer.drawFeature(feature);
- t.eq(root.firstChild.getAttributeNS(null, 'height'),
- root.firstChild.getAttributeNS(null, 'width'),
- "given a graphicHeight, height equals width");
- t.eq(root.firstChild.getAttributeNS(null, 'height'),
- customStyle3.graphicHeight.toString(),
- "height is set correctly");
- feature.style = customStyle4;
- layer.drawFeature(feature);
- t.eq(root.firstChild.getAttributeNS(null, 'height'),
- customStyle4.graphicHeight.toString(),
- "given graphicHeight and graphicWidth, both are set: height");
- t.eq(root.firstChild.getAttributeNS(null, 'width'),
- customStyle4.graphicWidth.toString(),
- "given graphicHeight and graphicWidth, both are set: width");
+ feature.style = customStyle1;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.getAttributeNS(null, 'width'),
+ (2*customStyle1.pointRadius).toString(),
+ "given a pointRadius, width equals 2*pointRadius");
+ t.eq(root.firstChild.getAttributeNS(null, 'height'),
+ (2*customStyle1.pointRadius).toString(),
+ "given a pointRadius, height equals 2*pointRadius");
+ feature.style = customStyle2;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.getAttributeNS(null, 'width'),
+ root.firstChild.getAttributeNS(null, 'height'),
+ "given a graphicWidth, width equals height");
+ t.eq(root.firstChild.getAttributeNS(null, 'width'),
+ customStyle2.graphicWidth.toString(),
+ "width is set correctly");
+ feature.style = customStyle3;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.getAttributeNS(null, 'height'),
+ root.firstChild.getAttributeNS(null, 'width'),
+ "given a graphicHeight, height equals width");
+ t.eq(root.firstChild.getAttributeNS(null, 'height'),
+ customStyle3.graphicHeight.toString(),
+ "height is set correctly");
+ feature.style = customStyle4;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.getAttributeNS(null, 'height'),
+ customStyle4.graphicHeight.toString(),
+ "given graphicHeight and graphicWidth, both are set: height");
+ t.eq(root.firstChild.getAttributeNS(null, 'width'),
+ customStyle4.graphicWidth.toString(),
+ "given graphicHeight and graphicWidth, both are set: width");
feature.style = customStyle5;
layer.drawFeature(feature);
- t.eq(root.firstChild.getAttributeNS(null, 'style'),
- 'opacity: '+customStyle5.graphicOpacity.toString()+';',
- "graphicOpacity correctly set");
+ t.eq(root.firstChild.getAttributeNS(null, 'style'),
+ 'opacity: '+customStyle5.graphicOpacity.toString()+';',
+ "graphicOpacity correctly set");
feature.style = customStyle6;
layer.drawFeature(feature);
var x = geometryX / renderer.getResolution() + renderer.left;
@@ -268,46 +268,46 @@
"graphicYOffset correctly set");
}
if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.VML') {
- feature.style = customStyle1;
- layer.drawFeature(feature);
- t.eq(root.firstChild.style.width,
- (2*customStyle1.pointRadius).toString()+'px',
- "given a pointRadius, width equals 2*pointRadius");
- t.eq(root.firstChild.style.height,
- (2*customStyle1.pointRadius).toString()+'px',
- "given a pointRadius, height equals 2*pointRadius");
- feature.style = customStyle2;
- layer.drawFeature(feature);
- t.eq(root.firstChild.style.width,
- root.firstChild.style.height,
- "given a graphicWidth, width equals height");
- t.eq(root.firstChild.style.width,
- customStyle2.graphicWidth.toString()+'px',
- "width is set correctly");
- feature.style = customStyle3;
- layer.drawFeature(feature);
- t.eq(root.firstChild.style.height,
- root.firstChild.style.width,
- "given a graphicHeight, height equals width");
- t.eq(root.firstChild.style.height,
- customStyle3.graphicHeight.toString()+'px',
- "height is set correctly");
- feature.style = customStyle4;
- layer.drawFeature(feature);
- t.eq(root.firstChild.style.height,
- customStyle4.graphicHeight.toString()+'px',
- "given graphicHeight and graphicWidth, both are set: height");
- t.eq(root.firstChild.style.width,
- customStyle4.graphicWidth.toString()+'px',
- "given graphicHeight and graphicWidth, both are set: width");
+ feature.style = customStyle1;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.style.width,
+ (2*customStyle1.pointRadius).toString()+'px',
+ "given a pointRadius, width equals 2*pointRadius");
+ t.eq(root.firstChild.style.height,
+ (2*customStyle1.pointRadius).toString()+'px',
+ "given a pointRadius, height equals 2*pointRadius");
+ feature.style = customStyle2;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.style.width,
+ root.firstChild.style.height,
+ "given a graphicWidth, width equals height");
+ t.eq(root.firstChild.style.width,
+ customStyle2.graphicWidth.toString()+'px',
+ "width is set correctly");
+ feature.style = customStyle3;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.style.height,
+ root.firstChild.style.width,
+ "given a graphicHeight, height equals width");
+ t.eq(root.firstChild.style.height,
+ customStyle3.graphicHeight.toString()+'px',
+ "height is set correctly");
+ feature.style = customStyle4;
+ layer.drawFeature(feature);
+ t.eq(root.firstChild.style.height,
+ customStyle4.graphicHeight.toString()+'px',
+ "given graphicHeight and graphicWidth, both are set: height");
+ t.eq(root.firstChild.style.width,
+ customStyle4.graphicWidth.toString()+'px',
+ "given graphicHeight and graphicWidth, both are set: width");
feature.style = customStyle5;
layer.drawFeature(feature);
var fill = root.firstChild.getElementsByTagName("fill")[0];
if (fill == null) fill = root.firstChild.getElementsByTagName("v:fill");
var opacity = fill.getAttribute('opacity');
t.eq(opacity,
- customStyle5.graphicOpacity,
- "graphicOpacity correctly set");
+ customStyle5.graphicOpacity,
+ "graphicOpacity correctly set");
feature.style = customStyle6;
layer.drawFeature(feature);
var x = geometryX / renderer.getResolution();