Merge pull request #9351 from ahocevar/default-styles

More efficient default styles

src/ol/render/canvas.js

@@ -85,9 +85,9 @@ export const defaultFont = '10px sans-serif';
 
 /**
  * @const
- * @type {import("../color.js").Color}
+ * @type {import("../colorlike.js").ColorLike}
  */
-export const defaultFillStyle = [0, 0, 0, 1];
+export const defaultFillStyle = '#000';
 
 
 /**
@@ -127,9 +127,9 @@ export const defaultMiterLimit = 10;
 
 /**
  * @const
- * @type {import("../color.js").Color}
+ * @type {import("../colorlike.js").ColorLike}
  */
-export const defaultStrokeStyle = [0, 0, 0, 1];
+export const defaultStrokeStyle = '#000';
 
 
 /**

src/ol/render/canvas/PolygonBuilder.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/render/canvas/PolygonBuilder
  */
-import {asString} from '../../color.js';
 import {snap} from '../../geom/flat/simplify.js';
 import {defaultFillStyle} from '../canvas.js';
 import CanvasInstruction, {
@@ -77,7 +76,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     if (state.fillStyle !== undefined) {
       this.hitDetectionInstructions.push([
         CanvasInstruction.SET_FILL_STYLE,
-        asString(defaultFillStyle)
+        defaultFillStyle
       ]);
     }
     if (state.strokeStyle !== undefined) {
@@ -121,7 +120,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     if (state.fillStyle !== undefined) {
       this.hitDetectionInstructions.push([
         CanvasInstruction.SET_FILL_STYLE,
-        asString(defaultFillStyle)
+        defaultFillStyle
       ]);
     }
     if (state.strokeStyle !== undefined) {
@@ -153,7 +152,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     if (state.fillStyle !== undefined) {
       this.hitDetectionInstructions.push([
         CanvasInstruction.SET_FILL_STYLE,
-        asString(defaultFillStyle)
+        defaultFillStyle
       ]);
     }
     if (state.strokeStyle !== undefined) {

src/ol/style/RegularShape.js

@@ -2,7 +2,6 @@
  * @module ol/style/RegularShape
  */
 
-import {asString} from '../color.js';
 import {asColorLike} from '../colorlike.js';
 import {createCanvasContext2D} from '../dom.js';
 import ImageState from '../ImageState.js';
@@ -482,7 +481,7 @@ class RegularShape extends ImageStyle {
       }
     }
 
-    context.fillStyle = asString(defaultFillStyle);
+    context.fillStyle = defaultFillStyle;
     context.fill();
     if (this.stroke_) {
       context.strokeStyle = renderOptions.strokeStyle;