Skip to content

Commit 694b72f

Browse files
committed
Website updates
1 parent 53189ae commit 694b72f

File tree

14 files changed

+81
-57
lines changed

14 files changed

+81
-57
lines changed

dist/en/main/examples/common.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/examples/common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/examples/offscreen-canvas.worker.worker.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/examples/offscreen-canvas.worker.worker.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/dist/ol.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/dist/ol.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/render/canvas/Builder.d.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,18 @@ declare class CanvasBuilder extends VectorContext {
122122
* Reverse the hit detection instructions.
123123
*/
124124
reverseHitDetectionInstructions(): void;
125+
/**
126+
* @param {import("../../style/Fill.js").default} fillStyle Fill style.
127+
* @param {import('../canvas.js').FillStrokeState} [state] State.
128+
* @return {import('../canvas.js').FillStrokeState} State.
129+
*/
130+
fillStyleToState(fillStyle: import("../../style/Fill.js").default, state?: import("../canvas.js").FillStrokeState): import("../canvas.js").FillStrokeState;
131+
/**
132+
* @param {import("../../style/Stroke.js").default} strokeStyle Stroke style.
133+
* @param {import("../canvas.js").FillStrokeState} state State.
134+
* @return {import("../canvas.js").FillStrokeState} State.
135+
*/
136+
strokeStyleToState(strokeStyle: import("../../style/Stroke.js").default, state?: import("../canvas.js").FillStrokeState): import("../canvas.js").FillStrokeState;
125137
/**
126138
* @param {import("../canvas.js").FillStrokeState} state State.
127139
* @return {Array<*>} Fill instruction.

dist/en/main/ol/render/canvas/Builder.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/render/canvas/Builder.js

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,13 @@ class CanvasBuilder extends VectorContext {
487487

488488
/**
489489
* @param {import("../../style/Fill.js").default} fillStyle Fill style.
490-
* @param {import("../../style/Stroke.js").default} strokeStyle Stroke style.
491-
* @override
490+
* @param {import('../canvas.js').FillStrokeState} [state] State.
491+
* @return {import('../canvas.js').FillStrokeState} State.
492492
*/
493-
setFillStrokeStyle(fillStyle, strokeStyle) {
494-
const state = this.state;
493+
fillStyleToState(
494+
fillStyle,
495+
state = /** @type {import('../canvas.js').FillStrokeState} */ ({}),
496+
) {
495497
if (fillStyle) {
496498
const fillStyleColor = fillStyle.getColor();
497499
state.fillPatternScale =
@@ -506,6 +508,18 @@ class CanvasBuilder extends VectorContext {
506508
} else {
507509
state.fillStyle = undefined;
508510
}
511+
return state;
512+
}
513+
514+
/**
515+
* @param {import("../../style/Stroke.js").default} strokeStyle Stroke style.
516+
* @param {import("../canvas.js").FillStrokeState} state State.
517+
* @return {import("../canvas.js").FillStrokeState} State.
518+
*/
519+
strokeStyleToState(
520+
strokeStyle,
521+
state = /** @type {import('../canvas.js').FillStrokeState} */ ({}),
522+
) {
509523
if (strokeStyle) {
510524
const strokeStyleColor = strokeStyle.getColor();
511525
state.strokeStyle = asColorLike(
@@ -550,6 +564,18 @@ class CanvasBuilder extends VectorContext {
550564
state.lineWidth = undefined;
551565
state.miterLimit = undefined;
552566
}
567+
return state;
568+
}
569+
570+
/**
571+
* @param {import("../../style/Fill.js").default} fillStyle Fill style.
572+
* @param {import("../../style/Stroke.js").default} strokeStyle Stroke style.
573+
* @override
574+
*/
575+
setFillStrokeStyle(fillStyle, strokeStyle) {
576+
const state = this.state;
577+
this.fillStyleToState(fillStyle, state);
578+
this.strokeStyleToState(strokeStyle, state);
553579
}
554580

555581
/**
@@ -586,7 +612,7 @@ class CanvasBuilder extends VectorContext {
586612
state.lineCap,
587613
state.lineJoin,
588614
state.miterLimit,
589-
this.applyPixelRatio(state.lineDash),
615+
state.lineDash ? this.applyPixelRatio(state.lineDash) : null,
590616
state.lineDashOffset * this.pixelRatio,
591617
];
592618
}

dist/en/main/ol/render/canvas/Executor.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)