diff --git a/src/ol/format/featureformat.js b/src/ol/format/featureformat.js index 67f8ed20da..419f3376e8 100644 --- a/src/ol/format/featureformat.js +++ b/src/ol/format/featureformat.js @@ -25,11 +25,6 @@ ol.format.Feature = function() { */ this.defaultDataProjection = null; - /** - * @protected - * @type {boolean} - */ - this.rightHandedPolygons = false; }; @@ -59,14 +54,6 @@ ol.format.Feature.prototype.getReadOptions = function(source, opt_options) { }; -/** - * @return {boolean} - */ -ol.format.Feature.prototype.getRightHandedPolygons = function() { - return this.rightHandedPolygons; -}; - - /** * Sets the `defaultDataProjection` on the options, if no `dataProjection` * is set. diff --git a/src/ol/format/mvtformat.js b/src/ol/format/mvtformat.js index 10c3c0e0b7..f625c0ed2b 100644 --- a/src/ol/format/mvtformat.js +++ b/src/ol/format/mvtformat.js @@ -74,8 +74,6 @@ ol.format.MVT = function(opt_options) { */ this.layers_ = options.layers ? options.layers : null; - this.rightHandedPolygons = true; - }; goog.inherits(ol.format.MVT, ol.format.Feature); diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index a31a8c9203..e8ed38e661 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -1180,12 +1180,6 @@ ol.render.canvas.PolygonReplay = function(tolerance, maxExtent, resolution) { miterLimit: undefined }; - /** - * @private - * @type {boolean} - */ - this.rightHanded_ = false; - }; goog.inherits(ol.render.canvas.PolygonReplay, ol.render.canvas.Replay); @@ -1318,9 +1312,7 @@ ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry = state.miterLimit, state.lineDash]); } var ends = polygonGeometry.getEnds(); - var flatCoordinates = this.rightHanded_ ? - polygonGeometry.getFlatCoordinates() : - polygonGeometry.getOrientedFlatCoordinates(); + var flatCoordinates = polygonGeometry.getOrientedFlatCoordinates(); var stride = polygonGeometry.getStride(); this.drawFlatCoordinatess_(flatCoordinates, 0, ends, stride); this.endGeometry(polygonGeometry, feature); @@ -1405,16 +1397,6 @@ ol.render.canvas.PolygonReplay.prototype.getBufferedMaxExtent = function() { }; -/** - * @param {boolean} rightHanded Whether polygons are assumed to follow - * the right-hand rule. - */ -ol.render.canvas.PolygonReplay.prototype.setRightHanded = - function(rightHanded) { - this.rightHanded_ = rightHanded; -}; - - /** * @inheritDoc */ @@ -1833,13 +1815,10 @@ ol.render.canvas.TextReplay.prototype.setTextStyle = function(textStyle) { * @param {ol.Extent} maxExtent Max extent. * @param {number} resolution Resolution. * @param {number=} opt_renderBuffer Optional rendering buffer. - * @param {boolean=} opt_rightHandedPolygons Assume that polygons follow the - * right-hand rule. * @struct */ ol.render.canvas.ReplayGroup = function( - tolerance, maxExtent, resolution, opt_renderBuffer, - opt_rightHandedPolygons) { + tolerance, maxExtent, resolution, opt_renderBuffer) { /** * @private @@ -1884,13 +1863,6 @@ ol.render.canvas.ReplayGroup = function( */ this.hitDetectionTransform_ = goog.vec.Mat4.createNumber(); - /** - * @private - * @type {boolean} - */ - this.rightHandedPolygons_ = opt_rightHandedPolygons ? - opt_rightHandedPolygons : false; - }; @@ -1979,10 +1951,6 @@ ol.render.canvas.ReplayGroup.prototype.getReplay = ' constructor missing from ol.render.canvas.BATCH_CONSTRUCTORS_'); replay = new Constructor(this.tolerance_, this.maxExtent_, this.resolution_); - if (replayType == ol.render.ReplayType.POLYGON) { - goog.asserts.assertInstanceof(replay, ol.render.canvas.PolygonReplay); - replay.setRightHanded(this.rightHandedPolygons_); - } replays[replayType] = replay; } return replay; diff --git a/src/ol/render/renderfeature.js b/src/ol/render/renderfeature.js index 17ead76116..00ba0eb451 100644 --- a/src/ol/render/renderfeature.js +++ b/src/ol/render/renderfeature.js @@ -15,7 +15,8 @@ goog.require('ol.geom.GeometryType'); * * @constructor * @param {ol.geom.GeometryType} type Geometry type. - * @param {Array.} flatCoordinates Flat coordinates. + * @param {Array.} flatCoordinates Flat coordinates. These always need + * to be right-handed for polygons. * @param {Array.|Array.>} ends Ends or Endss. * @param {Object.} properties Properties. */ diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js index 03d9bbe8c7..820ebd4ce7 100644 --- a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js @@ -191,8 +191,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup = function(tile, var tileResolution = pixelSpace ? source.getTilePixelRatio() : resolution; replayState.dirty = false; var replayGroup = new ol.render.canvas.ReplayGroup(0, extent, - tileResolution, layer.getRenderBuffer(), - tile.getFormat().getRightHandedPolygons()); + tileResolution, layer.getRenderBuffer()); var squaredTolerance = ol.renderer.vector.getSquaredTolerance( tileResolution, pixelRatio);