ol 10.0.1-dev.1722633680463 → 10.0.1-dev.1722678562646
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/color.d.ts +14 -8
- package/color.d.ts.map +1 -1
- package/color.js +10 -0
- package/dist/ol.d.ts +2 -0
- package/dist/ol.d.ts.map +1 -1
- package/dist/ol.js +1 -1
- package/dist/ol.js.map +1 -1
- package/package.json +1 -1
- package/render/canvas/style.d.ts.map +1 -1
- package/render/canvas/style.js +3 -2
- package/style/flat.d.ts +10 -10
- package/style/flat.js +5 -5
- package/util.js +1 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["style.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["style.js"],"names":[],"mappings":"AAiEA;;;;;;;GAOG;AACH,4CAHW,KAAK,CAAC,OAAO,qBAAqB,EAAE,IAAI,CAAC,GACxC,OAAO,sBAAsB,EAAE,aAAa,CAwBvD;AAED;;;;;;;GAOG;AACH,sDAHW,KAAK,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,GAC7C,OAAO,sBAAsB,EAAE,aAAa,CA0CvD;AAED;;GAEG;AAEH;;;;GAIG;AAEH;;;;GAIG;AACH,oCAJW,KAAK,CAAC,OAAO,qBAAqB,EAAE,IAAI,CAAC,WACzC,cAAc,GACb,gBAAgB,CA6D3B;AAED;;GAEG;AAEH;;;;;GAKG;AACH,sCALW,SAAS,WACT,cAAc,GACb,cAAc,CAgEzB;wBApQY,OAAO,qBAAqB,EAAE,SAAS;gCAIvC,OAAO,0BAA0B,EAAE,iBAAiB;6BAIpD,OAAO,0BAA0B,EAAE,cAAc;6BAIjD,OAAO,0BAA0B,EAAE,cAAc;gCAIjD,OAAO,mBAAmB,EAAE,iBAAiB;kCAI7C,OAAO,mBAAmB,EAAE,mBAAmB;+BA8F/C,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,KAAK,CAAC,KAAK,CAAC;;;;;YAKvC,mBAAmB;;;;YACnB,KAAK,CAAC,cAAc,CAAC;;6BAsEtB,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,KAAK,GAAC,IAAI;4BAyEtC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,IAAI,GAAC,IAAI;8BAyCrC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,MAAM,GAAC,IAAI;4BA2GvC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,IAAI;6BAgOhC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,OAAO,sBAAsB,EAAE,OAAO;kBAppB7D,sBAAsB;iBAJvB,qBAAqB;mBAGnB,uBAAuB;iBAEzB,qBAAqB"}
|
package/render/canvas/style.js
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
computeGeometryType,
|
|
19
19
|
newParsingContext,
|
|
20
20
|
} from '../../expr/expression.js';
|
|
21
|
+
import {NO_COLOR} from '../../color.js';
|
|
21
22
|
import {buildExpression, newEvaluationContext} from '../../expr/cpu.js';
|
|
22
23
|
import {isEmpty} from '../../obj.js';
|
|
23
24
|
import {toSize} from '../../size.js';
|
|
@@ -326,7 +327,7 @@ function buildFill(flatStyle, prefix, context) {
|
|
|
326
327
|
const fill = new Fill();
|
|
327
328
|
return function (context) {
|
|
328
329
|
const color = evaluateColor(context);
|
|
329
|
-
if (color ===
|
|
330
|
+
if (color === NO_COLOR) {
|
|
330
331
|
return null;
|
|
331
332
|
}
|
|
332
333
|
fill.setColor(color);
|
|
@@ -395,7 +396,7 @@ function buildStroke(flatStyle, prefix, context) {
|
|
|
395
396
|
return function (context) {
|
|
396
397
|
if (evaluateColor) {
|
|
397
398
|
const color = evaluateColor(context);
|
|
398
|
-
if (color ===
|
|
399
|
+
if (color === NO_COLOR) {
|
|
399
400
|
return null;
|
|
400
401
|
}
|
|
401
402
|
stroke.setColor(color);
|
package/style/flat.d.ts
CHANGED
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
* Fill style properties applied to polygon features.
|
|
90
90
|
*
|
|
91
91
|
* @typedef {Object} FlatFill
|
|
92
|
-
* @property {ColorExpression} [fill-color] The fill color.
|
|
92
|
+
* @property {ColorExpression} [fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
93
93
|
* @property {StringExpression} [fill-pattern-src] Fill pattern image URL.
|
|
94
94
|
* @property {SizeExpression} [fill-pattern-size] Fill pattern image size in pixels.
|
|
95
95
|
* Can be used together with `fill-pattern-offset` to define the sub-rectangle to use
|
|
@@ -139,8 +139,8 @@
|
|
|
139
139
|
* `'hanging'`, `'ideographic'`.
|
|
140
140
|
* @property {NumberArrayExpression} [text-padding=[0, 0, 0, 0]] Padding in pixels around the text for decluttering and background. The order of
|
|
141
141
|
* values in the array is `[top, right, bottom, left]`.
|
|
142
|
-
* @property {ColorExpression} [text-fill-color] The fill color.
|
|
143
|
-
* @property {ColorExpression} [text-background-fill-color] The fill color.
|
|
142
|
+
* @property {ColorExpression} [text-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
143
|
+
* @property {ColorExpression} [text-background-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
144
144
|
* @property {ColorExpression} [text-stroke-color] The stroke color.
|
|
145
145
|
* @property {StringExpression} [text-stroke-line-cap='round'] Line cap style: `butt`, `round`, or `square`.
|
|
146
146
|
* @property {StringExpression} [text-stroke-line-join='round'] Line join style: `bevel`, `round`, or `miter`.
|
|
@@ -202,7 +202,7 @@
|
|
|
202
202
|
* @typedef {Object} FlatShape
|
|
203
203
|
* @property {number} [shape-points] Number of points for stars and regular polygons. In case of a polygon, the number of points
|
|
204
204
|
* is the number of sides.
|
|
205
|
-
* @property {ColorExpression} [shape-fill-color] The fill color.
|
|
205
|
+
* @property {ColorExpression} [shape-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
206
206
|
* @property {ColorExpression} [shape-stroke-color] The stroke color.
|
|
207
207
|
* @property {NumberExpression} [shape-stroke-width] Stroke pixel width.
|
|
208
208
|
* @property {StringExpression} [shape-stroke-line-cap='round'] Line cap style: `butt`, `round`, or `square`.
|
|
@@ -226,7 +226,7 @@
|
|
|
226
226
|
*
|
|
227
227
|
* @typedef {Object} FlatCircle
|
|
228
228
|
* @property {number} [circle-radius] Circle radius.
|
|
229
|
-
* @property {ColorExpression} [circle-fill-color] The fill color.
|
|
229
|
+
* @property {ColorExpression} [circle-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
230
230
|
* @property {ColorExpression} [circle-stroke-color] The stroke color.
|
|
231
231
|
* @property {NumberExpression} [circle-stroke-width] Stroke pixel width.
|
|
232
232
|
* @property {StringExpression} [circle-stroke-line-cap='round'] Line cap style: `butt`, `round`, or `square`.
|
|
@@ -299,7 +299,7 @@ export type FlatStyleLike = FlatStyle | Array<FlatStyle> | Array<Rule>;
|
|
|
299
299
|
*/
|
|
300
300
|
export type FlatFill = {
|
|
301
301
|
/**
|
|
302
|
-
* The fill color.
|
|
302
|
+
* The fill color. `'none'` means no fill and no hit detection.
|
|
303
303
|
*/
|
|
304
304
|
"fill-color"?: ColorExpression | undefined;
|
|
305
305
|
/**
|
|
@@ -430,11 +430,11 @@ export type FlatText = {
|
|
|
430
430
|
*/
|
|
431
431
|
"text-padding"?: NumberArrayExpression | undefined;
|
|
432
432
|
/**
|
|
433
|
-
* The fill color.
|
|
433
|
+
* The fill color. `'none'` means no fill and no hit detection.
|
|
434
434
|
*/
|
|
435
435
|
"text-fill-color"?: ColorExpression | undefined;
|
|
436
436
|
/**
|
|
437
|
-
* The fill color.
|
|
437
|
+
* The fill color. `'none'` means no fill and no hit detection.
|
|
438
438
|
*/
|
|
439
439
|
"text-background-fill-color"?: ColorExpression | undefined;
|
|
440
440
|
/**
|
|
@@ -607,7 +607,7 @@ export type FlatShape = {
|
|
|
607
607
|
*/
|
|
608
608
|
"shape-points"?: number | undefined;
|
|
609
609
|
/**
|
|
610
|
-
* The fill color.
|
|
610
|
+
* The fill color. `'none'` means no fill and no hit detection.
|
|
611
611
|
*/
|
|
612
612
|
"shape-fill-color"?: ColorExpression | undefined;
|
|
613
613
|
/**
|
|
@@ -685,7 +685,7 @@ export type FlatCircle = {
|
|
|
685
685
|
*/
|
|
686
686
|
"circle-radius"?: number | undefined;
|
|
687
687
|
/**
|
|
688
|
-
* The fill color.
|
|
688
|
+
* The fill color. `'none'` means no fill and no hit detection.
|
|
689
689
|
*/
|
|
690
690
|
"circle-fill-color"?: ColorExpression | undefined;
|
|
691
691
|
/**
|
package/style/flat.js
CHANGED
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
* Fill style properties applied to polygon features.
|
|
100
100
|
*
|
|
101
101
|
* @typedef {Object} FlatFill
|
|
102
|
-
* @property {ColorExpression} [fill-color] The fill color.
|
|
102
|
+
* @property {ColorExpression} [fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
103
103
|
* @property {StringExpression} [fill-pattern-src] Fill pattern image URL.
|
|
104
104
|
* @property {SizeExpression} [fill-pattern-size] Fill pattern image size in pixels.
|
|
105
105
|
* Can be used together with `fill-pattern-offset` to define the sub-rectangle to use
|
|
@@ -151,8 +151,8 @@
|
|
|
151
151
|
* `'hanging'`, `'ideographic'`.
|
|
152
152
|
* @property {NumberArrayExpression} [text-padding=[0, 0, 0, 0]] Padding in pixels around the text for decluttering and background. The order of
|
|
153
153
|
* values in the array is `[top, right, bottom, left]`.
|
|
154
|
-
* @property {ColorExpression} [text-fill-color] The fill color.
|
|
155
|
-
* @property {ColorExpression} [text-background-fill-color] The fill color.
|
|
154
|
+
* @property {ColorExpression} [text-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
155
|
+
* @property {ColorExpression} [text-background-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
156
156
|
* @property {ColorExpression} [text-stroke-color] The stroke color.
|
|
157
157
|
* @property {StringExpression} [text-stroke-line-cap='round'] Line cap style: `butt`, `round`, or `square`.
|
|
158
158
|
* @property {StringExpression} [text-stroke-line-join='round'] Line join style: `bevel`, `round`, or `miter`.
|
|
@@ -216,7 +216,7 @@
|
|
|
216
216
|
* @typedef {Object} FlatShape
|
|
217
217
|
* @property {number} [shape-points] Number of points for stars and regular polygons. In case of a polygon, the number of points
|
|
218
218
|
* is the number of sides.
|
|
219
|
-
* @property {ColorExpression} [shape-fill-color] The fill color.
|
|
219
|
+
* @property {ColorExpression} [shape-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
220
220
|
* @property {ColorExpression} [shape-stroke-color] The stroke color.
|
|
221
221
|
* @property {NumberExpression} [shape-stroke-width] Stroke pixel width.
|
|
222
222
|
* @property {StringExpression} [shape-stroke-line-cap='round'] Line cap style: `butt`, `round`, or `square`.
|
|
@@ -241,7 +241,7 @@
|
|
|
241
241
|
*
|
|
242
242
|
* @typedef {Object} FlatCircle
|
|
243
243
|
* @property {number} [circle-radius] Circle radius.
|
|
244
|
-
* @property {ColorExpression} [circle-fill-color] The fill color.
|
|
244
|
+
* @property {ColorExpression} [circle-fill-color] The fill color. `'none'` means no fill and no hit detection.
|
|
245
245
|
* @property {ColorExpression} [circle-stroke-color] The stroke color.
|
|
246
246
|
* @property {NumberExpression} [circle-stroke-width] Stroke pixel width.
|
|
247
247
|
* @property {StringExpression} [circle-stroke-line-cap='round'] Line cap style: `butt`, `round`, or `square`.
|
package/util.js
CHANGED