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

Merge branch 'master' into osm

Browse Source 
Conflicts:
	notes/2.12.md
This commit is contained in:
Éric Lemoine
2012-01-17 09:10:27 +01:00
parent e160628086 0aaa5265b4
commit 8f57e34376
17 changed files with 256 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Format/CSWGetRecords/v2_0_2.html
+4 -1
View File
@@ -41,7 +41,7 @@
function test_read(t) {
t.plan(16);
t.plan(17);
var obj = format.read(csw_response);
@@ -65,6 +65,9 @@
t.eq(testRecord.type, "BriefRecord", "check value for record.type");
t.eq(testRecord.title, [{value:"Sample title"}], "check value for record.title");
// test empty subject
t.eq(testRecord.subject, [], "Empty subject tags are ignored");
//test bbox
t.eq(testRecord.BoundingBox.length, 2, "object contains 2 BoundingBoxes");
var bbox = testRecord.BoundingBox[0];
tests/Format/CSWGetRecords/v2_0_2.js
+2
View File
@@ -21,6 +21,8 @@ var csw_response =
'<csw:BriefRecord xmlns:geonet="http://www.fao.org/geonetwork" xmlns:ows="http://www.opengis.net/ows" xmlns:dc="http://purl.org/dc/elements/1.1/">' +
'<dc:identifier>895ac38b-7aef-4a21-b593-b35a6fc7bba9</dc:identifier>' +
'<dc:title>Sample title</dc:title>' +
'<dc:subject />' +
'<dc:subject />' +
'<ows:BoundingBox crs="::Lambert Azimuthal Projection">' +
'<ows:LowerCorner>156 -3</ows:LowerCorner>' +
'<ows:UpperCorner>37 83</ows:UpperCorner>' +
tests/Geometry/LinearRing.html
+104
View File
@@ -250,6 +250,110 @@
"resize correctly adjusts y of component 4");
}
function test_containsPoint(t) {
/**
* The ring:
* edge 3
* (5, 10) __________ (15, 10)
* / /
* edge 4 / / edge 2
* / /
* (0, 0) /_________/ (10, 0)
* edge 1
*/
var components = [
new OpenLayers.Geometry.Point(0, 0),
new OpenLayers.Geometry.Point(10, 0),
new OpenLayers.Geometry.Point(15, 10),
new OpenLayers.Geometry.Point(5, 10)
];
var ring = new OpenLayers.Geometry.LinearRing(components);
function p(x, y) {
return new OpenLayers.Geometry.Point(x, y);
}
// contains: 1 (touches), true (within), false (outside)
var cases = [{
point: p(5, 5), contains: true
}, {
point: p(20, 20), contains: false
}, {
point: p(15, 15), contains: false
}, {
point: p(0, 0), contains: 1 // lower left corner
}, {
point: p(10, 0), contains: 1 // lower right corner
}, {
point: p(15, 10), contains: 1 // upper right corner
}, {
point: p(5, 10), contains: 1 // upper left corner
}, {
point: p(5, 0), contains: 1 // on edge 1
}, {
point: p(5, -0.1), contains: false // below edge 1
}, {
point: p(5, 0.1), contains: true // above edge 1
}, {
point: p(12.5, 5), contains: 1 // on edge 2
}, {
point: p(12.4, 5), contains: true // left of edge 2
}, {
point: p(12.6, 5), contains: false // right of edge 2
}, {
point: p(10, 10), contains: 1 // on edge 3
}, {
point: p(10, 9.9), contains: true // below edge 3
}, {
point: p(10, 10.1), contains: false // above edge 3
}, {
point: p(2.5, 5), contains: 1 // on edge 4
}, {
point: p(2.4, 5), contains: false // left of edge 4
}, {
point: p(2.6, 5), contains: true // right of edge 4
}];
var len = cases.length;
t.plan(len);
var c;
for (var i=0; i<len; ++i) {
c = cases[i];
t.eq(ring.containsPoint(c.point), c.contains, "case " + i + ": " + c.point);
}
}
function test_containsPoint_precision(t) {
/**
* The test for linear ring containment was sensitive to failure when
* looking for ray crossings on nearly vertical edges. With a loss
* of precision in calculating the x-coordinate for the crossing,
* the method would erronously determine that the x-coordinate was
* not within the (very narrow) x-range of the nearly vertical edge.
*
* The test below creates a polygon whose first vertical edge is
* nearly horizontal. The test point lies "far" outside the polygon
* and we expect the containsPoint method to return false.
*/
t.plan(1);
var components = [
new OpenLayers.Geometry.Point(10000020.000001, 1000000),
new OpenLayers.Geometry.Point(10000020.000002, 1000010), // nearly vertical
new OpenLayers.Geometry.Point(10000030, 1000010),
new OpenLayers.Geometry.Point(10000030, 1000000)
];
var ring = new OpenLayers.Geometry.LinearRing(components);
var point = new OpenLayers.Geometry.Point(10000000, 1000001);
t.eq(ring.containsPoint(point), false, "false for point outside polygon with nearly vertical edge");
}
</script>
</head>
tests/Layer.html
+66 -3
View File
@@ -672,19 +672,82 @@
// test that the moveend event was triggered
t.ok(log.event, "an event was logged");
t.eq(log.event.type, "moveend", "moveend was triggered");
t.eq(log.event.zoomChanged, true, "event says zoomChanged true - poor name");
t.eq(log.event.zoomChanged, false, "event says zoomChanged false");
layer.moveTo = function(bounds, zoomChanged, dragging) {
var extent = layer.map.getExtent();
t.ok(bounds.equals(extent),
"redraw calls moveTo with the map extent");
t.ok(zoomChanged,
"redraw calls moveTo with zoomChanged true");
t.ok(!zoomChanged,
"redraw calls moveTo with zoomChanged false");
t.ok(!dragging,
"redraw calls moveTo with dragging false");
}
layer.redraw();
}
// This function includes integration tests to verify that the
// layer's moveTo function is called with the expected value
// for zoomChanged
function test_moveTo_zoomChanged(t) {
t.plan(6);
var log = {};
var map = new OpenLayers.Map('map');
var l1 = new OpenLayers.Layer('l1', {isBaseLayer: true});
l1.moveTo = function(bounds, zoomChanged, dragging) {
log.moveTo = {zoomChanged: zoomChanged};
OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
};
map.addLayer(l1);
map.zoomToMaxExtent();
log = {};
l1.redraw();
t.eq(log.moveTo.zoomChanged, false,
"[a] redraw calls moveTo with zoomChanged false");
log = {};
l1.resolution = null;
l1.redraw();
t.eq(log.moveTo.zoomChanged, true,
"[b] redraw calls moveTo with zoomChanged true");
l1.setVisibility(false);
log = {};
l1.setVisibility(true);
t.eq(log.moveTo.zoomChanged, false,
"[c] redraw calls moveTo with zoomChanged false");
l1.setVisibility(false);
map.zoomIn();
log = {};
l1.setVisibility(true);
t.eq(log.moveTo.zoomChanged, true,
"[d] redraw calls moveTo with zoomChanged true");
l1.moveTo = OpenLayers.Layer.prototype.moveTo;
var l2 = new OpenLayers.Layer('l2');
l2.moveTo = function(bounds, zoomChanged, dragging) {
log.moveTo = {zoomChanged: zoomChanged};
OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
};
log = {};
map.addLayer(l2);
t.eq(log.moveTo.zoomChanged, true,
"[e] redraw calls moveTo with zoomChanged true");
map.removeLayer(l2);
log = {};
map.addLayer(l2);
t.eq(log.moveTo.zoomChanged, true,
"[f] redraw calls moveTo with zoomChanged true");
map.destroy();
}
function test_layer_setIsBaseLayer(t) {
t.plan(2);
tests/Layer/HTTPRequest.html
+4 -2
View File
@@ -65,7 +65,7 @@
}
function test_Layer_HTTPRequest_mergeNewParams (t) {
t.plan( 8 );
t.plan( 9 );
var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.HTTPRequest(name, url, params, options);
@@ -97,7 +97,9 @@
layer.redraw = function() {
t.ok(true, "layer.mergeNewParams calls layer.redraw");
}
t.ok(layer.resolution === null, "layer.mergeNewParams sets resolution to null");
};
layer.resolution = 'fake';
layer.mergeNewParams();
}
tests/Popup.html
+7 -6
View File
@@ -191,13 +191,14 @@
//closeOnMove
var checkMapEvent = function(map, popup) {
var startListeners = map.events.listeners['movestart'];
for(var i=0; i < startListeners.length; i++) {
var listener = startListeners[i];
if ((listener.obj == popup) && (listener.func == popup.hide)) {
return true;
if (startListeners) {
for (var i = 0; i < startListeners.length; i++) {
var listener = startListeners[i];
if ((listener.obj == popup) && (listener.func == popup.hide)) {
return true;
}
}
}
}
return false;
};
var registered = checkMapEvent(map1, popup);
tests/Tile/Image.html
+32
View File
@@ -342,6 +342,38 @@
t.ok(tile.imgDiv == null, "image reference removed from tile");
map.destroy();
}
// test for https://github.com/openlayers/openlayers/pull/36
// (more an integration test than a unit test)
function test_olImageLoadError(t) {
t.plan(2);
var map = new OpenLayers.Map('map');
var layer = new OpenLayers.Layer.WMS("invalid", "", {layers: 'basic'});
map.addLayer(layer);
var size = new OpenLayers.Size(5, 6);
var position = new OpenLayers.Pixel(20, 30);
var bounds = new OpenLayers.Bounds(1, 2, 3, 4);
var tile = new OpenLayers.Tile.Image(layer, position, bounds, null, size);
tile.draw();
t.delay_call(0.1, function() {
// check initial state
t.ok(OpenLayers.Element.hasClass(tile.imgDiv, 'olImageLoadError'),
'tile image has the olImageLoadError class (init state)');
layer.setVisibility(false);
layer.setVisibility(true);
t.ok(OpenLayers.Element.hasClass(tile.imgDiv, 'olImageLoadError'),
'tile image still has the olImageLoadError class');
map.destroy();
});
}
</script>
</head>