Merge pull request #8934 from fgravin/renderingtest

Port layer tiles rendering tests

rendering/cases/layer-tile-2layers-extentclip/main.js

@@ -0,0 +1,47 @@
+import Map from '../../../src/ol/CompositeMap.js';
+import View from '../../../src/ol/View.js';
+import TileLayer from '../../../src/ol/layer/Tile.js';
+import {fromLonLat} from '../../../src/ol/proj';
+import XYZ from '../../../src/ol/source/XYZ';
+import {getSize} from '../../../src/ol/extent';
+
+const center = fromLonLat([8.6, 50.1]);
+
+const map = new Map({
+  target: 'map',
+  view: new View({
+    center: center,
+    zoom: 3
+  })
+});
+
+const layerExtent = centerExtent();
+
+map.addLayer(
+  new TileLayer({
+    source: new XYZ({
+      url: '/data/tiles/satellite/{z}/{x}/{y}.jpg'
+    }),
+    extent: layerExtent
+  }),
+);
+
+map.addLayer(
+  new TileLayer({
+    source: new XYZ({
+      url: '/data/tiles/stamen-labels/{z}/{x}/{y}.png'
+    }),
+    extent: layerExtent
+  })
+);
+
+render();
+
+function centerExtent() {
+  const c = map.getView().calculateExtent([256, 256]);
+  const qw = getSize(c)[0] / 4;
+  const qh = getSize(c)[1] / 4;
+  return [c[0] + qw, c[1] + qh, c[2] - qw, c[3] - qh];
+}
+
+

rendering/cases/layer-tile-simple/main.js

@@ -0,0 +1,25 @@
+import Map from '../../../src/ol/CompositeMap.js';
+import View from '../../../src/ol/View.js';
+import TileLayer from '../../../src/ol/layer/Tile.js';
+import {fromLonLat} from '../../../src/ol/proj';
+import XYZ from '../../../src/ol/source/XYZ';
+
+const center = fromLonLat([8.6, 50.1]);
+
+new Map({
+  layers: [
+    new TileLayer({
+      source: new XYZ({
+        url: '/data/tiles/satellite/{z}/{x}/{y}.jpg',
+        transition: 0
+      })
+    })
+  ],
+  target: 'map',
+  view: new View({
+    center: center,
+    zoom: 3
+  })
+});
+
+render();

rendering/cases/layer-tile-transition/main.js

@@ -0,0 +1,24 @@
+import Map from '../../../src/ol/CompositeMap.js';
+import View from '../../../src/ol/View.js';
+import TileLayer from '../../../src/ol/layer/Tile.js';
+import {fromLonLat} from '../../../src/ol/proj';
+import XYZ from '../../../src/ol/source/XYZ';
+
+const center = fromLonLat([8.6, 50.1]);
+
+new Map({
+  layers: [
+    new TileLayer({
+      source: new XYZ({
+        url: '/data/tiles/satellite/{z}/{x}/{y}.jpg'
+      })
+    })
+  ],
+  target: 'map',
+  view: new View({
+    center: center,
+    zoom: 3
+  })
+});
+
+render();

rendering/cases/layer-vectortile-rotate-vector/main.js

@@ -0,0 +1,53 @@
+import Map from '../../../src/ol/Map.js';
+import View from '../../../src/ol/View.js';
+import VectorTileSource from '../../../src/ol/source/VectorTile';
+import MVT from '../../../src/ol/format/MVT';
+import {createXYZ} from '../../../src/ol/tilegrid';
+import VectorTileLayer from '../../../src/ol/layer/VectorTile';
+import VectorSource from '../../../src/ol/source/Vector';
+import Feature from '../../../src/ol/Feature';
+import Point from '../../../src/ol/geom/Point';
+import VectorLayer from '../../../src/ol/layer/Vector';
+import Style from '../../../src/ol/style/Style';
+import CircleStyle from '../../../src/ol/style/Circle';
+import Fill from '../../../src/ol/style/Fill';
+
+const vectorSource = new VectorSource({
+  features: [
+    new Feature(new Point([1825727.7316762917, 6143091.089223046]))
+  ]
+});
+const layer = new VectorLayer({
+  zIndex: 1,
+  source: vectorSource,
+  style: new Style({
+    image: new CircleStyle({
+      radius: 10,
+      fill: new Fill({
+        color: 'red'
+      })
+    })
+  })
+});
+
+new Map({
+  layers: [
+    layer,
+    new VectorTileLayer({
+      source: new VectorTileSource({
+        format: new MVT(),
+        tileGrid: createXYZ(),
+        url: '/data/tiles/mvt/{z}-{x}-{y}.vector.pbf',
+        transition: 0
+      })
+    })
+  ],
+  target: 'map',
+  view: new View({
+    center: [1825927.7316762917, 6143091.089223046],
+    zoom: 14,
+    rotation: Math.PI / 4
+  })
+});
+
+render({message: 'Vector tile layer rotates with vector layer on top'});

rendering/cases/layer-vectortile-rotate/main.js

@@ -0,0 +1,27 @@
+import Map from '../../../src/ol/Map.js';
+import View from '../../../src/ol/View.js';
+import VectorTileSource from '../../../src/ol/source/VectorTile';
+import MVT from '../../../src/ol/format/MVT';
+import {createXYZ} from '../../../src/ol/tilegrid';
+import VectorTileLayer from '../../../src/ol/layer/VectorTile';
+
+const map = new Map({
+  layers: [
+    new VectorTileLayer({
+      source: new VectorTileSource({
+        format: new MVT(),
+        tileGrid: createXYZ(),
+        url: '/data/tiles/mvt/{z}-{x}-{y}.vector.pbf',
+        transition: 0
+      })
+    })
+  ],
+  target: 'map',
+  view: new View({
+    center: [1825927.7316762917, 6143091.089223046],
+    zoom: 14
+  })
+});
+
+map.getView().setRotation(Math.PI / 4);
+render({message: 'Vector tile layer rotates'});

rendering/cases/layer-vectortile-simple/main.js

@@ -0,0 +1,26 @@
+import Map from '../../../src/ol/CompositeMap.js';
+import View from '../../../src/ol/View.js';
+import VectorTileSource from '../../../src/ol/source/VectorTile';
+import MVT from '../../../src/ol/format/MVT';
+import {createXYZ} from '../../../src/ol/tilegrid';
+import VectorTileLayer from '../../../src/ol/layer/VectorTile';
+
+new Map({
+  layers: [
+    new VectorTileLayer({
+      source: new VectorTileSource({
+        format: new MVT(),
+        tileGrid: createXYZ(),
+        url: '/data/tiles/mvt/{z}-{x}-{y}.vector.pbf',
+        transition: 0
+      })
+    })
+  ],
+  target: 'map',
+  view: new View({
+    center: [1825927.7316762917, 6143091.089223046],
+    zoom: 14
+  })
+});
+
+render({message: 'Vector tile layer renders'});

test/rendering/ol/layer/tile.test.js

@@ -73,49 +73,6 @@ describe('ol.rendering.layer.Tile', function() {
     });
   }
 
-  describe('with tile transition', function() {
-    it('renders correctly after the transition', function(done) {
-      createMap('canvas');
-      const source = new XYZ({
-        url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png'
-      });
-      waitForTiles('canvas', [source], {}, function() {
-        setTimeout(function() {
-          expectResemble(map, 'rendering/ol/layer/expected/osm-canvas.png',
-            IMAGE_TOLERANCE, done);
-        }, 500);
-      });
-    });
-  });
-
-  describe('single tile layer', function() {
-    let source;
-
-    beforeEach(function() {
-      source = new XYZ({
-        url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
-        transition: 0
-      });
-    });
-
-    it('tests the canvas renderer', function(done) {
-      createMap('canvas');
-      waitForTiles('canvas', [source], {}, function() {
-        expectResemble(map, 'rendering/ol/layer/expected/osm-canvas.png',
-          IMAGE_TOLERANCE, done);
-      });
-    });
-
-    where('WebGL').it('tests the WebGL renderer', function(done) {
-      assertWebGL();
-      createMap('webgl');
-      waitForTiles('webgl', [source], {}, function() {
-        expectResemble(map, 'rendering/ol/layer/expected/osm-webgl.png',
-          IMAGE_TOLERANCE, done);
-      });
-    });
-  });
-
   describe('two tile layers', function() {
     let source1, source2;
 
@@ -146,14 +103,6 @@ describe('ol.rendering.layer.Tile', function() {
       return [c[0] + qw, c[1] + qh, c[2] - qw, c[3] - qh];
     }
 
-    it('tests canvas layer extent clipping', function(done) {
-      createMap('canvas');
-      waitForTiles('canvas', [source1, source2], [{}, {extent: centerExtent(map)}], function() {
-        expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent.png',
-          IMAGE_TOLERANCE, done);
-      });
-    });
-
     it('tests canvas layer extent clipping with rotation', function(done) {
       createMap('canvas');
       map.getView().setRotation(Math.PI / 2);

test/rendering/ol/layer/vectortile.test.js

@@ -1,12 +1,8 @@
-import Feature from '../../../../src/ol/Feature.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
 import MVT from '../../../../src/ol/format/MVT.js';
-import Point from '../../../../src/ol/geom/Point.js';
-import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import VectorTileLayer from '../../../../src/ol/layer/VectorTile.js';
 import {assign} from '../../../../src/ol/obj.js';
-import VectorSource from '../../../../src/ol/source/Vector.js';
 import VectorTileSource from '../../../../src/ol/source/VectorTile.js';
 import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
@@ -76,49 +72,6 @@ describe('ol.rendering.layer.VectorTile', function() {
       });
     });
 
-    it('renders correctly with the canvas renderer', function(done) {
-      createMap();
-      waitForTiles(source, {}, function() {
-        expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas.png',
-          22, done);
-      });
-    });
-
-    it('renders rotated view correctly with the canvas renderer', function(done) {
-      createMap();
-      map.getView().setRotation(Math.PI / 4);
-      waitForTiles(source, {}, function() {
-        expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-rotated.png',
-          14, done);
-      });
-    });
-
-    it('renders rotated view correctly with vector layer on top', function(done) {
-      createMap();
-      const vectorSource = new VectorSource({
-        features: [
-          new Feature(new Point([1825727.7316762917, 6143091.089223046]))
-        ]
-      });
-      map.addLayer(new VectorLayer({
-        zIndex: 1,
-        source: vectorSource,
-        style: new Style({
-          image: new CircleStyle({
-            radius: 10,
-            fill: new Fill({
-              color: 'red'
-            })
-          })
-        })
-      }));
-      map.getView().setRotation(Math.PI / 4);
-      waitForTiles(source, {}, function() {
-        expectResemble(map, 'rendering/ol/layer/expected/vectortile-vector-rotated.png',
-          14, done);
-      });
-    });
-
     it('renders correctly with the canvas renderer (HiDPI)', function(done) {
       createMap(2);
       waitForTiles(source, {}, function() {