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

Merge branch 'master' of github.com:openlayers/ol3 into vector

Browse Source 
Conflicts:
	src/ol/renderer/canvas/canvasrenderer.js
	test/ol.html
This commit is contained in:
ahocevar
2013-02-05 17:28:36 +01:00
parent dafa48da2e f735a597fe
commit 089b7013c2
77 changed files with 259 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/ol.html
+1 -30
View File
@@ -37,7 +37,7 @@
// Create the script tag which includes the derived variables from above
var script = '<sc' + 'ript type="text/javascript" '
+ 'src="http://' + plovrHost + '/compile?id=ol-all&mode=RAW">'
+ 'src="http://' + plovrHost + '/compile?id=test&mode=RAW">'
+ '</scr' + 'ipt>';
// this function will fix the links of the result to also include
@@ -69,35 +69,6 @@
</script>
<!-- include spec files here... -->
<script type="text/javascript" src="spec/ol/array.test.js"></script>
<script type="text/javascript" src="spec/ol/collection.test.js"></script>
<script type="text/javascript" src="spec/ol/color.test.js"></script>
<script type="text/javascript" src="spec/ol/extent.test.js"></script>
<script type="text/javascript" src="spec/ol/map.test.js"></script>
<script type="text/javascript" src="spec/ol/object.test.js"></script>
<script type="text/javascript" src="spec/ol/projection.test.js"></script>
<script type="text/javascript" src="spec/ol/rectangle.test.js"></script>
<script type="text/javascript" src="spec/ol/resolutionconstraint.test.js"></script>
<script type="text/javascript" src="spec/ol/view2d.test.js"></script>
<script type="text/javascript" src="spec/ol/io/geojson.test.js"></script>
<script type="text/javascript" src="spec/ol/filter/geometryfilter.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/multipoint.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/multilinestring.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/multipolygon.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/linearring.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/linestring.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/point.test.js"></script>
<script type="text/javascript" src="spec/ol/geom/polygon.test.js"></script>
<script type="text/javascript" src="spec/ol/layer/layer.test.js"></script>
<script type="text/javascript" src="spec/ol/source/xyz.test.js"></script>
<script type="text/javascript" src="spec/ol/tilecoord.test.js"></script>
<script type="text/javascript" src="spec/ol/tilegrid.test.js"></script>
<script type="text/javascript" src="spec/ol/tilequeue.test.js"></script>
<script type="text/javascript" src="spec/ol/tilerange.test.js"></script>
<script type="text/javascript" src="spec/ol/tileurlfunction.test.js"></script>
<script type="text/javascript" src="spec/ol/control/control.test.js"></script>
<script type="text/javascript">
(function() {
test/spec/ol/array.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.array');
describe('ol.array', function() {
describe('binaryFindNearest', function() {
test/spec/ol/collection.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.Collection');
describe('ol.collection', function() {
var collection;
test/spec/ol/color.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.Color');
describe('ol.Color', function() {
describe('constructor', function() {
test/spec/ol/control/control.test.js
+5 -3
View File
@@ -1,6 +1,4 @@
goog.require('goog.dom');
goog.require('ol.Map');
goog.require('ol.control.Control');
goog.provide('ol.test.control.Control');
describe('ol.control.Control', function() {
var map, control;
@@ -25,3 +23,7 @@ describe('ol.control.Control', function() {
});
});
});
goog.require('goog.dom');
goog.require('ol.Map');
goog.require('ol.control.Control');
test/spec/ol/extent.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.Extent');
describe('ol.Extent', function() {
describe('contains', function() {
test/spec/ol/layer/layer.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.layer.Layer');
describe('ol.layer.Layer', function() {
describe('constructor (defaults)', function() {
test/spec/ol/map.test.js
+12 -9
View File
@@ -1,12 +1,5 @@
goog.require('goog.async.AnimationDelay');
goog.require('goog.dom');
goog.require('ol.Collection');
goog.require('ol.Coordinate');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.source.XYZ');
goog.provide('ol.test.Map');
goog.provide('ol.test.RendererHints');
describe('ol.RendererHints', function() {
@@ -241,3 +234,13 @@ describe('ol.Map', function() {
});
});
goog.require('goog.async.AnimationDelay');
goog.require('goog.dom');
goog.require('ol.Collection');
goog.require('ol.Coordinate');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.source.XYZ');
test/spec/ol/object.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.Object');
describe('ol.Object', function() {
var o;
test/spec/ol/projection.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.Projection');
describe('ol.Projection', function() {
describe('projection equivalence', function() {
test/spec/ol/rectangle.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.Rectangle');
describe('ol.Rectangle', function() {
describe('getCenter', function() {
test/spec/ol/resolutionconstraint.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.ResolutionConstraint');
describe('ol.ResolutionConstraint', function() {
describe('SnapToResolution', function() {
test/spec/ol/source/xyz.test.js
+6 -2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.source.XYZ');
describe('ol.source.XYZ', function() {
describe('getTileCoordUrl', function() {
@@ -47,7 +49,8 @@ describe('ol.source.XYZ', function() {
describe('wrap x', function() {
it('returns the expected URL', function() {
tileUrl = xyzTileSource.getTileCoordUrl(new ol.TileCoord(6, -31, -23));
var tileUrl = xyzTileSource.getTileCoordUrl(
new ol.TileCoord(6, -31, -23));
expect(tileUrl).toEqual('6/33/22');
tileUrl = xyzTileSource.getTileCoordUrl(new ol.TileCoord(6, 33, -23));
@@ -60,7 +63,8 @@ describe('ol.source.XYZ', function() {
describe('crop y', function() {
it('returns the expected URL', function() {
tileUrl = xyzTileSource.getTileCoordUrl(new ol.TileCoord(6, 33, -87));
var tileUrl = xyzTileSource.getTileCoordUrl(
new ol.TileCoord(6, 33, -87));
expect(tileUrl).toBeUndefined();
tileUrl = xyzTileSource.getTileCoordUrl(new ol.TileCoord(6, 33, -23));
test/spec/ol/tilecoord.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.TileCoord');
describe('ol.TileCoord', function() {
describe('create', function() {
test/spec/ol/tilegrid.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.TileGrid');
describe('ol.tilegrid.TileGrid', function() {
var extent;
var resolutions;
test/spec/ol/tilequeue.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.TileQueue');
describe('ol.TileQueue', function() {
// is the tile queue's array a heap?
test/spec/ol/tilerange.test.js
+2
View File
@@ -1,3 +1,5 @@
goog.provide('ol.test.TileRange');
describe('ol.TileRange', function() {
describe('contains', function() {
test/spec/ol/tileurlfunction.test.js
+3 -3
View File
@@ -1,5 +1,4 @@
goog.require('ol.TileUrlFunction');
goog.require('ol.tilegrid.XYZ');
goog.provide('ol.test.TileUrlFunction');
describe('ol.TileUrlFunction', function() {
@@ -51,7 +50,7 @@ describe('ol.TileUrlFunction', function() {
describe('createFromTileUrlFunctions', function() {
it('creates expected URL', function() {
tileUrl = ol.TileUrlFunction.createFromTileUrlFunctions([
var tileUrl = ol.TileUrlFunction.createFromTileUrlFunctions([
ol.TileUrlFunction.createFromTemplate('a'),
ol.TileUrlFunction.createFromTemplate('b')
]);
@@ -83,3 +82,4 @@ describe('ol.TileUrlFunction', function() {
goog.require('ol.TileCoord');
goog.require('ol.TileUrlFunction');
goog.require('ol.tilegrid.XYZ');
test/spec/ol/view2d.test.js
+3 -1
View File
@@ -1,4 +1,4 @@
goog.require('ol.View2D');
goog.provide('ol.test.View2D');
describe('ol.View2D', function() {
describe('create constraints', function() {
@@ -51,3 +51,5 @@ describe('ol.View2D', function() {
});
});
});
goog.require('ol.View2D');
test/test.json
+16
View File
@@ -0,0 +1,16 @@
{
"id": "test",
"inherits": "../base.json",
"inputs": [
"test/requireall.js"
],
"paths": [
"src",
"test"
]
}