, this function will be bound to the load event.
- */
-OpenLayers.Util.onImageLoad = function() {
- // The complex check here is to solve issues described in #480.
- // Every time a map view changes, it increments the 'viewRequestID'
- // property. As the requests for the images for the new map view are sent
- // out, they are tagged with this unique viewRequestID.
- //
- // If an image has no viewRequestID property set, we display it regardless,
- // but if it does have a viewRequestID property, we check that it matches
- // the viewRequestID set on the map.
- //
- // If the viewRequestID on the map has changed, that means that the user
- // has changed the map view since this specific request was sent out, and
- // therefore this tile does not need to be displayed (so we do not execute
- // this code that turns its display on).
- //
- if (!this.viewRequestID ||
- (this.map && this.viewRequestID == this.map.viewRequestID)) {
- this.style.display = "";
- }
- OpenLayers.Element.removeClass(this, "olImageLoadError");
-};
-
/**
* Property: IMAGE_RELOAD_ATTEMPTS
* {Integer} How many times should we try to reload an image before giving up?
@@ -355,38 +327,6 @@ OpenLayers.Util.onImageLoad = function() {
*/
OpenLayers.IMAGE_RELOAD_ATTEMPTS = 0;
-/**
- * Function: onImageLoadError
- */
-OpenLayers.Util.onImageLoadError = function() {
- this._attempts = (this._attempts) ? (this._attempts + 1) : 1;
- if (this._attempts <= OpenLayers.IMAGE_RELOAD_ATTEMPTS) {
- var urls = this.urls;
- if (urls && OpenLayers.Util.isArray(urls) && urls.length > 1){
- var src = this.src.toString();
- var current_url, k;
- for (k = 0; current_url = urls[k]; k++){
- if(src.indexOf(current_url) != -1){
- break;
- }
- }
- var guess = Math.floor(urls.length * Math.random());
- var new_url = urls[guess];
- k = 0;
- while(new_url == current_url && k++ < 4){
- guess = Math.floor(urls.length * Math.random());
- new_url = urls[guess];
- }
- this.src = src.replace(current_url, new_url);
- } else {
- this.src = this.src;
- }
- } else {
- OpenLayers.Element.addClass(this, "olImageLoadError");
- }
- this.style.display = "";
-};
-
/**
* Property: alphaHackNeeded
* {Boolean} true if the png alpha hack is necessary and possible, false otherwise.
@@ -497,17 +437,9 @@ OpenLayers.Util.createAlphaImageDiv = function(id, px, sz, imgURL,
var div = OpenLayers.Util.createDiv();
var img = OpenLayers.Util.createImage(null, null, null, null, null, null,
- null, false);
+ null, delayDisplay);
div.appendChild(img);
- if (delayDisplay) {
- img.style.display = "none";
- OpenLayers.Event.observe(img, "load",
- OpenLayers.Function.bind(OpenLayers.Util.onImageLoad, div));
- OpenLayers.Event.observe(img, "error",
- OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError, div));
- }
-
OpenLayers.Util.modifyAlphaImageDiv(div, id, px, sz, imgURL, position,
border, sizing, opacity);
diff --git a/tests/BaseTypes/Bounds.html b/tests/BaseTypes/Bounds.html
index f5620af87b..1c607f339a 100644
--- a/tests/BaseTypes/Bounds.html
+++ b/tests/BaseTypes/Bounds.html
@@ -594,7 +594,7 @@
}
function test_Bounds_add(t) {
- t.plan( 8 );
+ t.plan( 6 );
origBounds = new OpenLayers.Bounds(1,2,3,4);
testBounds = origBounds.clone();
@@ -606,19 +606,19 @@
t.ok( bounds.equals(b), "bounds is set correctly");
//null values
- OpenLayers.Lang.setCode('en');
- var desiredMsg = "You must pass both x and y values to the add function.";
- OpenLayers.Console.error = function(msg) {
- t.eq(msg, desiredMsg, "error correctly reported");
+ try {
+ bounds = testBounds.add(null, 50);
+ } catch(e) {
+ t.ok("exception thrown when passing null value to add()");
}
-
- bounds = testBounds.add(null, 50);
t.ok( testBounds.equals(origBounds), "testBounds is not modified by erroneous add operation (null x)");
- t.ok(bounds == null, "returns null on erroneous add operation (null x)");
- bounds = testBounds.add(5, null);
+ try {
+ bounds = testBounds.add(5, null);
+ } catch(e) {
+ t.ok("exception thrown when passing null value to add()");
+ }
t.ok( testBounds.equals(origBounds), "testBounds is not modified by erroneous add operation (null y)");
- t.ok(bounds == null, "returns null on erroneous add operation (null y)");
}
function test_Bounds_scale(t) {
diff --git a/tests/BaseTypes/LonLat.html b/tests/BaseTypes/LonLat.html
index 009eafec91..3135a41ae3 100644
--- a/tests/BaseTypes/LonLat.html
+++ b/tests/BaseTypes/LonLat.html
@@ -52,7 +52,7 @@
}
function test_LonLat_add(t) {
- t.plan(10);
+ t.plan(8);
origLL = new OpenLayers.LonLat(10,100);
lonlatA = origLL.clone();
@@ -64,19 +64,19 @@
t.ok( addpx.equals(ll), "addpx is set correctly");
//null values
- OpenLayers.Lang.setCode('en');
- var desiredMsg = "You must pass both lon and lat values to the add function.";
- OpenLayers.Console.error = function(msg) {
- t.eq(msg, desiredMsg, "error correctly reported");
+ try {
+ addpx = lonlatA.add(null, 50);
+ } catch(e) {
+ t.ok("exception thrown when passing null value to add()");
}
-
- addpx = lonlatA.add(null, 50);
t.ok( lonlatA.equals(origLL), "lonlatA is not modified by erroneous add operation (null lon)");
- t.ok(addpx == null, "returns null on erroneous add operation (null lon)");
- addpx = lonlatA.add(5, null);
+ try {
+ addpx = lonlatA.add(5, null);
+ } catch(e) {
+ t.ok("exception thrown when passing null value to add()");
+ }
t.ok( lonlatA.equals(origLL), "lonlatA is not modified by erroneous add operation (null lat)");
- t.ok(addpx == null, "returns null on erroneous add operation (null lat)");
// string values
addpx = origLL.clone().add("5", "50");
diff --git a/tests/BaseTypes/Pixel.html b/tests/BaseTypes/Pixel.html
index 1a8bf47303..8f9f5c9897 100644
--- a/tests/BaseTypes/Pixel.html
+++ b/tests/BaseTypes/Pixel.html
@@ -72,7 +72,7 @@
}
function test_Pixel_add(t) {
- t.plan( 8 );
+ t.plan( 6 );
var origPX = new OpenLayers.Pixel(5,6);
var oldPixel = origPX.clone();
@@ -85,19 +85,19 @@
t.ok( pixel.equals(px), "returned pixel is correct");
//null values
- OpenLayers.Lang.setCode('en');
- var desiredMsg = "You must pass both x and y values to the add function.";
- OpenLayers.Console.error = function(msg) {
- t.eq(msg, desiredMsg, "error correctly reported");
+ try {
+ pixel = oldPixel.add(null, 50);
+ } catch(e) {
+ t.ok("exception thrown when passing null value to add()");
}
-
- pixel = oldPixel.add(null, 50);
t.ok( oldPixel.equals(origPX), "oldPixel is not modified by erroneous add operation (null x)");
- t.ok(pixel == null, "returns null on erroneous add operation (null x)");
- addpx = oldPixel.add(5, null);
+ try {
+ addpx = oldPixel.add(5, null);
+ } catch(e) {
+ t.ok("exception thrown when passing null value to add()");
+ }
t.ok( oldPixel.equals(origPX), "oldPixel is not modified by erroneous add operation (null y)");
- t.ok(pixel == null, "returns null on erroneous add operation (null y)");
}
function test_Pixel_offset(t) {
diff --git a/tests/Control/DrawFeature.html b/tests/Control/DrawFeature.html
index bcaca1c5e4..ef0be5ab64 100644
--- a/tests/Control/DrawFeature.html
+++ b/tests/Control/DrawFeature.html
@@ -37,6 +37,33 @@
t.ok(!control.handler.multi, "handlerOptions.multi respected");
}
+
+ function test_rendererOptions(t) {
+ t.plan(2);
+
+ var map = new OpenLayers.Map("map");
+ var renderers = ["Canvas", "VML"];
+
+ var layer = new OpenLayers.Layer.Vector(null, {
+ renderers: renderers,
+ rendererOptions: {zIndexing: true},
+ isBaseLayer: true
+ });
+ map.addLayer(layer);
+
+ var control = new OpenLayers.Control.DrawFeature(
+ layer, OpenLayers.Handler.Polygon, {autoActivate: true}
+ );
+ map.addControl(control);
+
+ var sketchLayer = control.handler.layer;
+
+ t.eq(sketchLayer.renderers, renderers, "Preferred renderers");
+ t.eq(sketchLayer.rendererOptions.zIndexing, true, "renderer options");
+
+ map.destroy();
+
+ }
function test_drawFeature(t) {
t.plan(3);
diff --git a/tests/Format/WFST/v1.html b/tests/Format/WFST/v1.html
index 04142b60e0..6cfb1caa9e 100644
--- a/tests/Format/WFST/v1.html
+++ b/tests/Format/WFST/v1.html
@@ -133,6 +133,28 @@
t.xml_eq(got, expected, snippet + " request without geometry created correctly");
}
}
+
+ function test_setFilterProperty(t) {
+ t.plan(2);
+ var format = new OpenLayers.Format.WFST({
+ geometryName: "foo"
+ });
+ var filter = new OpenLayers.Filter.Logical({
+ type: OpenLayers.Filter.Logical.AND,
+ filters: [new OpenLayers.Filter.Spatial({
+ type: OpenLayers.Filter.Spatial.BBOX,
+ value: new OpenLayers.Bounds(1,2,3,4)
+ }), new OpenLayers.Filter.Spatial({
+ type: OpenLayers.Filter.Spatial.DWITHIN,
+ property: "bar",
+ value: new OpenLayers.Geometry.Point(1,2),
+ distance: 10
+ })]
+ });
+ format.setFilterProperty(filter);
+ t.eq(filter.filters[0].property, "foo", "property set if not set on filter");
+ t.eq(filter.filters[1].property, "bar", "property not set if set on filter");
+ }
function test_update_null_geometry(t) {
var format = new OpenLayers.Format.WFST({
diff --git a/tests/Map.html b/tests/Map.html
index 39da1928e9..770daec2d6 100644
--- a/tests/Map.html
+++ b/tests/Map.html
@@ -692,9 +692,12 @@
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}
);
- map.addLayers([layer,layer]);
-
- t.eq( map.layers.length, 1, "Map does not allow double adding of layers." );
+ map.addLayers([layer]);
+ try {
+ map.addLayers([layer]);
+ } catch(e) {
+ t.ok(true, "Map does not allow double adding of layers." );
+ }
map.destroy();
}
diff --git a/tests/Marker.html b/tests/Marker.html
index 77abc31285..fa9b598a43 100644
--- a/tests/Marker.html
+++ b/tests/Marker.html
@@ -94,8 +94,8 @@
var marker = new OpenLayers.Marker(ll);
mlayer.addMarker(marker);
- t.ok(marker.icon.imageDiv.firstChild.src.contains("img/marker.png"), "Marker.png is default URL");
-
+ t.ok(OpenLayers.String.contains(marker.icon.imageDiv.firstChild.src, "img/marker.png"), "Marker.png is default URL");
+
marker.setUrl("http://example.com/broken.png");
t.eq(marker.icon.imageDiv.firstChild.src, "http://example.com/broken.png", "image source changes correctly.");
diff --git a/tests/Style.html b/tests/Style.html
index 2c3a18b176..0b8b33b467 100644
--- a/tests/Style.html
+++ b/tests/Style.html
@@ -176,9 +176,9 @@
// c) test that label in returned symbolizer is a string even if property value is a number
var symbolizer = style.createSymbolizer(
- new OpenLayers.Feature.Vector(null, {foo: "bar", labelValue: 10})
+ new OpenLayers.Feature.Vector(null, {foo: "bar", labelValue: 0})
);
- t.eq(symbolizer.label, "10", "c) feature property cast to string when used as symbolizer label");
+ t.eq(symbolizer.label, "0", "c) feature property cast to string when used as symbolizer label");
}
diff --git a/tests/Util.html b/tests/Util.html
index f70cbb9ddf..d6dcc93def 100644
--- a/tests/Util.html
+++ b/tests/Util.html
@@ -254,21 +254,6 @@
}
- function test_Util_imageLoadError(t) {
- t.plan(2);
-
- var img = OpenLayers.Util.createImage(null, null, null, null, null, null, null, false);
-
- // mock up image load failure
- img._attempts = OpenLayers.IMAGE_RELOAD_ATTEMPTS + 1;
- OpenLayers.Util.onImageLoadError.call(img);
- t.ok(OpenLayers.Element.hasClass(img, 'olImageLoadError'), 'broken image has class olImageLoadError');
-
- // mock up image load success
- OpenLayers.Util.onImageLoad.call(img);
- t.ok(!OpenLayers.Element.hasClass(img, 'olImageLoadError'), 'good image does not have class olImageLoadError');
- }
-
function test_Util_applyDefaults(t) {
t.plan(12);
diff --git a/tests/manual/dateline-sketch.html b/tests/manual/dateline-sketch.html
index 62d4391324..f2e4a0a859 100644
--- a/tests/manual/dateline-sketch.html
+++ b/tests/manual/dateline-sketch.html
@@ -13,8 +13,6 @@
}
-
-
+
+
+
+ OpenLayers overlays crossing the dateline test
+
+
+ The overlay has an extent smaller than the world extent. The base layer
+ is configured with wrapDateLine set to true. New Zealand and a part of
+ Australia should always be visible on the map.
+
+
+
+