Fixes one of the inconsistencies seen in #9395 Add hit detection for no fill and transparent fill Based on the example used in #9395 The tests expect consistency between Polygon and Circle geometries but currently expect the inconsistent behaviour seen when using CircleStyle
212 lines
7.1 KiB
JavaScript
212 lines
7.1 KiB
JavaScript
/**
|
|
* @module ol/render/canvas/PolygonBuilder
|
|
*/
|
|
import {snap} from '../../geom/flat/simplify.js';
|
|
import {defaultFillStyle} from '../canvas.js';
|
|
import CanvasInstruction, {
|
|
fillInstruction, strokeInstruction, beginPathInstruction, closePathInstruction
|
|
} from './Instruction.js';
|
|
import CanvasBuilder from './Builder.js';
|
|
|
|
|
|
class CanvasPolygonBuilder extends CanvasBuilder {
|
|
/**
|
|
* @param {number} tolerance Tolerance.
|
|
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
|
* @param {number} resolution Resolution.
|
|
* @param {number} pixelRatio Pixel ratio.
|
|
*/
|
|
constructor(tolerance, maxExtent, resolution, pixelRatio) {
|
|
super(tolerance, maxExtent, resolution, pixelRatio);
|
|
}
|
|
|
|
/**
|
|
* @param {Array<number>} flatCoordinates Flat coordinates.
|
|
* @param {number} offset Offset.
|
|
* @param {Array<number>} ends Ends.
|
|
* @param {number} stride Stride.
|
|
* @private
|
|
* @return {number} End.
|
|
*/
|
|
drawFlatCoordinatess_(flatCoordinates, offset, ends, stride) {
|
|
const state = this.state;
|
|
const fill = state.fillStyle !== undefined;
|
|
const stroke = state.strokeStyle !== undefined;
|
|
const numEnds = ends.length;
|
|
this.instructions.push(beginPathInstruction);
|
|
this.hitDetectionInstructions.push(beginPathInstruction);
|
|
for (let i = 0; i < numEnds; ++i) {
|
|
const end = ends[i];
|
|
const myBegin = this.coordinates.length;
|
|
const myEnd = this.appendFlatCoordinates(flatCoordinates, offset, end, stride, true, !stroke);
|
|
const moveToLineToInstruction = [CanvasInstruction.MOVE_TO_LINE_TO, myBegin, myEnd];
|
|
this.instructions.push(moveToLineToInstruction);
|
|
this.hitDetectionInstructions.push(moveToLineToInstruction);
|
|
if (stroke) {
|
|
// Performance optimization: only call closePath() when we have a stroke.
|
|
// Otherwise the ring is closed already (see appendFlatCoordinates above).
|
|
this.instructions.push(closePathInstruction);
|
|
this.hitDetectionInstructions.push(closePathInstruction);
|
|
}
|
|
offset = end;
|
|
}
|
|
if (fill) {
|
|
this.instructions.push(fillInstruction);
|
|
this.hitDetectionInstructions.push(fillInstruction);
|
|
}
|
|
if (stroke) {
|
|
this.instructions.push(strokeInstruction);
|
|
this.hitDetectionInstructions.push(strokeInstruction);
|
|
}
|
|
return offset;
|
|
}
|
|
|
|
/**
|
|
* @inheritDoc
|
|
*/
|
|
drawCircle(circleGeometry, feature) {
|
|
const state = this.state;
|
|
const fillStyle = state.fillStyle;
|
|
const strokeStyle = state.strokeStyle;
|
|
if (fillStyle === undefined && strokeStyle === undefined) {
|
|
return;
|
|
}
|
|
this.setFillStrokeStyles_();
|
|
this.beginGeometry(feature);
|
|
if (state.fillStyle !== undefined) {
|
|
this.hitDetectionInstructions.push([
|
|
CanvasInstruction.SET_FILL_STYLE,
|
|
defaultFillStyle
|
|
]);
|
|
}
|
|
if (state.strokeStyle !== undefined) {
|
|
this.hitDetectionInstructions.push([
|
|
CanvasInstruction.SET_STROKE_STYLE,
|
|
state.strokeStyle, state.lineWidth, state.lineCap, state.lineJoin,
|
|
state.miterLimit, state.lineDash, state.lineDashOffset
|
|
]);
|
|
}
|
|
const flatCoordinates = circleGeometry.getFlatCoordinates();
|
|
const stride = circleGeometry.getStride();
|
|
const myBegin = this.coordinates.length;
|
|
this.appendFlatCoordinates(
|
|
flatCoordinates, 0, flatCoordinates.length, stride, false, false);
|
|
const circleInstruction = [CanvasInstruction.CIRCLE, myBegin];
|
|
this.instructions.push(beginPathInstruction, circleInstruction);
|
|
this.hitDetectionInstructions.push(beginPathInstruction, circleInstruction);
|
|
if (state.fillStyle !== undefined) {
|
|
this.instructions.push(fillInstruction);
|
|
this.hitDetectionInstructions.push(fillInstruction);
|
|
}
|
|
if (state.strokeStyle !== undefined) {
|
|
this.instructions.push(strokeInstruction);
|
|
this.hitDetectionInstructions.push(strokeInstruction);
|
|
}
|
|
this.endGeometry(feature);
|
|
}
|
|
|
|
/**
|
|
* @inheritDoc
|
|
*/
|
|
drawPolygon(polygonGeometry, feature) {
|
|
const state = this.state;
|
|
const fillStyle = state.fillStyle;
|
|
const strokeStyle = state.strokeStyle;
|
|
if (fillStyle === undefined && strokeStyle === undefined) {
|
|
return;
|
|
}
|
|
this.setFillStrokeStyles_();
|
|
this.beginGeometry(feature);
|
|
if (state.fillStyle !== undefined) {
|
|
this.hitDetectionInstructions.push([
|
|
CanvasInstruction.SET_FILL_STYLE,
|
|
defaultFillStyle
|
|
]);
|
|
}
|
|
if (state.strokeStyle !== undefined) {
|
|
this.hitDetectionInstructions.push([
|
|
CanvasInstruction.SET_STROKE_STYLE,
|
|
state.strokeStyle, state.lineWidth, state.lineCap, state.lineJoin,
|
|
state.miterLimit, state.lineDash, state.lineDashOffset
|
|
]);
|
|
}
|
|
const ends = polygonGeometry.getEnds();
|
|
const flatCoordinates = polygonGeometry.getOrientedFlatCoordinates();
|
|
const stride = polygonGeometry.getStride();
|
|
this.drawFlatCoordinatess_(flatCoordinates, 0, ends, stride);
|
|
this.endGeometry(feature);
|
|
}
|
|
|
|
/**
|
|
* @inheritDoc
|
|
*/
|
|
drawMultiPolygon(multiPolygonGeometry, feature) {
|
|
const state = this.state;
|
|
const fillStyle = state.fillStyle;
|
|
const strokeStyle = state.strokeStyle;
|
|
if (fillStyle === undefined && strokeStyle === undefined) {
|
|
return;
|
|
}
|
|
this.setFillStrokeStyles_();
|
|
this.beginGeometry(feature);
|
|
if (state.fillStyle !== undefined) {
|
|
this.hitDetectionInstructions.push([
|
|
CanvasInstruction.SET_FILL_STYLE,
|
|
defaultFillStyle
|
|
]);
|
|
}
|
|
if (state.strokeStyle !== undefined) {
|
|
this.hitDetectionInstructions.push([
|
|
CanvasInstruction.SET_STROKE_STYLE,
|
|
state.strokeStyle, state.lineWidth, state.lineCap, state.lineJoin,
|
|
state.miterLimit, state.lineDash, state.lineDashOffset
|
|
]);
|
|
}
|
|
const endss = multiPolygonGeometry.getEndss();
|
|
const flatCoordinates = multiPolygonGeometry.getOrientedFlatCoordinates();
|
|
const stride = multiPolygonGeometry.getStride();
|
|
let offset = 0;
|
|
for (let i = 0, ii = endss.length; i < ii; ++i) {
|
|
offset = this.drawFlatCoordinatess_(flatCoordinates, offset, endss[i], stride);
|
|
}
|
|
this.endGeometry(feature);
|
|
}
|
|
|
|
/**
|
|
* @inheritDoc
|
|
*/
|
|
finish() {
|
|
this.reverseHitDetectionInstructions();
|
|
this.state = null;
|
|
// We want to preserve topology when drawing polygons. Polygons are
|
|
// simplified using quantization and point elimination. However, we might
|
|
// have received a mix of quantized and non-quantized geometries, so ensure
|
|
// that all are quantized by quantizing all coordinates in the batch.
|
|
const tolerance = this.tolerance;
|
|
if (tolerance !== 0) {
|
|
const coordinates = this.coordinates;
|
|
for (let i = 0, ii = coordinates.length; i < ii; ++i) {
|
|
coordinates[i] = snap(coordinates[i], tolerance);
|
|
}
|
|
}
|
|
return super.finish();
|
|
}
|
|
|
|
/**
|
|
* @private
|
|
*/
|
|
setFillStrokeStyles_() {
|
|
const state = this.state;
|
|
const fillStyle = state.fillStyle;
|
|
if (fillStyle !== undefined) {
|
|
this.updateFillStyle(state, this.createFill);
|
|
}
|
|
if (state.strokeStyle !== undefined) {
|
|
this.updateStrokeStyle(state, this.applyStroke);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
export default CanvasPolygonBuilder;
|