Remove vector mode for vector tile rendering

doc/errors/index.md

@@ -111,7 +111,7 @@ Features for `updates` must have an id set by the feature reader or `ol.Feature#
 
 ### 28
 
-`renderMode` must be `'image'`, `'hybrid'` or `'vector'`.
+`renderMode` must be `'image'` or `'hybrid'`.
 
 ### 29
 

src/ol/layer/VectorTile.js

@@ -94,9 +94,8 @@ class VectorTileLayer extends BaseVectorLayer {
     let renderMode = options.renderMode || VectorTileRenderType.HYBRID;
     assert(renderMode == undefined ||
        renderMode == VectorTileRenderType.IMAGE ||
-       renderMode == VectorTileRenderType.HYBRID ||
-       renderMode == VectorTileRenderType.VECTOR,
-    28); // `renderMode` must be `'image'`, `'hybrid'` or `'vector'`
+       renderMode == VectorTileRenderType.HYBRID,
+    28); // `renderMode` must be `'image'` or `'hybrid'`
 
     if (options.declutter && renderMode == VectorTileRenderType.IMAGE) {
       renderMode = VectorTileRenderType.HYBRID;

src/ol/layer/VectorTileRenderType.js

@@ -17,6 +17,5 @@
  */
 export default {
   IMAGE: 'image',
-  HYBRID: 'hybrid',
-  VECTOR: 'vector'
+  HYBRID: 'hybrid'
 };

src/ol/renderer/canvas/VectorTileLayer.js

@@ -58,9 +58,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
    * @param {import("../../layer/VectorTile.js").default} layer VectorTile layer.
    */
   constructor(layer) {
-
-    const renderMode = layer.getRenderMode();
-    super(layer, renderMode === VectorTileRenderType.VECTOR);
+    super(layer);
 
     /**
      * Declutter tree.
@@ -86,9 +84,8 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
      */
     this.tmpTransform_ = createTransform();
 
-    // Use lower resolution for pure vector rendering. Closest resolution otherwise.
-    this.zDirection = renderMode === VectorTileRenderType.VECTOR ? 1 : 0;
-
+    // Use closest resolution.
+    this.zDirection = 0;
 
     listen(labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
 

test/spec/ol/renderer/canvas/vectortilelayer.test.js

@@ -97,31 +97,6 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
       expect(renderer.zDirection).to.be(0);
     });
 
-    it('uses lower resolution for pure vector rendering', function() {
-      const testLayer = new VectorTileLayer({
-        renderMode: VectorTileRenderType.VECTOR,
-        source: source,
-        style: layerStyle
-      });
-      const renderer = new CanvasVectorTileLayerRenderer(testLayer);
-      expect(renderer.zDirection).to.be(1);
-    });
-
-    it('does not render images for pure vector rendering', function() {
-      const testLayer = new VectorTileLayer({
-        renderMode: VectorTileRenderType.VECTOR,
-        source: source,
-        style: layerStyle
-      });
-      map.removeLayer(layer);
-      map.addLayer(testLayer);
-      const spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
-        'renderTileImage_');
-      map.renderSync();
-      expect(spy.callCount).to.be(0);
-      spy.restore();
-    });
-
     it('does not render replays for pure image rendering', function() {
       const testLayer = new VectorTileLayer({
         renderMode: VectorTileRenderType.IMAGE,