ol 6.9.1-dev.1636384514301 → 6.9.1-dev.1636724554692

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.
Files changed (7) hide show
  1. package/layer/WebGLTile.d.ts +7 -5
  2. package/layer/WebGLTile.d.ts.map +1 -1
  3. package/layer/WebGLTile.js +6 -2
  4. package/layer/WebGLTile.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/layer/WebGLTile.js +7 -3
  7. package/util.js +1 -1
package/layer/WebGLTile.d.ts CHANGED
@@ -4,13 +4,13 @@ export default WebGLTileLayer;
4
4
  */
5
5
  export type Style = {
6
6
  /**
7
- * Style variables. Each variable must hold a number. These
7
+ * Style variables. Each variable must hold a number or string. These
8
8
  * variables can be used in the `color`, `brightness`, `contrast`, `exposure`, `saturation` and `gamma`
9
9
  * {@link import("../style/expressions.js").ExpressionValue expressions}, using the `['var', 'varName']` operator.
10
10
  * To update style variables, use the {@link import("./WebGLTile.js").default#updateStyleVariables} method.
11
11
  */
12
12
  variables?: {
13
- [x: string]: number;
13
+ [x: string]: string | number;
14
14
  };
15
15
  /**
16
16
  * An expression applied to color values.
@@ -162,9 +162,11 @@ declare class WebGLTileLayer extends BaseTileLayer<import("../source/TileImage.j
162
162
  * @private
163
163
  */
164
164
  private cacheSize_;
165
- styleVariables_: {
166
- [x: string]: number;
167
- } | undefined;
165
+ /**
166
+ * @type {Object<string, (string|number)>}
167
+ * @private
168
+ */
169
+ private styleVariables_;
168
170
  /**
169
171
  * Update any variables used by the layer style and trigger a re-render.
170
172
  * @param {Object<string, number>} variables Variables to update.
package/layer/WebGLTile.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WebGLTile.d.ts","sourceRoot":"","sources":["../src/layer/WebGLTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyPA;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,kCAsBC;IAXC;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,mBAA2B;IAe3B;;kBAAkD;IAWpD;;;;OAIG;IACH;;aAGC;CACF"}
1
+ {"version":3,"file":"WebGLTile.d.ts","sourceRoot":"","sources":["../src/layer/WebGLTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyPA;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,kCA4BC;IAjBC;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,wBAAkD;IAwBpD;;;;OAIG;IACH;;aAGC;CACF"}
package/layer/WebGLTile.js CHANGED
@@ -24,7 +24,7 @@ import { assign } from '../obj.js';
24
24
  * @typedef {Object} Style
25
25
  * Translates tile data to rendered pixels.
26
26
  *
27
- * @property {Object<string, number>} [variables] Style variables. Each variable must hold a number. These
27
+ * @property {Object<string, (string|number)>} [variables] Style variables. Each variable must hold a number or string. These
28
28
  * variables can be used in the `color`, `brightness`, `contrast`, `exposure`, `saturation` and `gamma`
29
29
  * {@link import("../style/expressions.js").ExpressionValue expressions}, using the `['var', 'varName']` operator.
30
30
  * To update style variables, use the {@link import("./WebGLTile.js").default#updateStyleVariables} method.
@@ -196,6 +196,11 @@ var WebGLTileLayer = /** @class */ (function (_super) {
196
196
  * @private
197
197
  */
198
198
  _this.cacheSize_ = cacheSize;
199
+ /**
200
+ * @type {Object<string, (string|number)>}
201
+ * @private
202
+ */
203
+ _this.styleVariables_ = _this.style_.variables || {};
199
204
  return _this;
200
205
  }
201
206
  /**
@@ -206,7 +211,6 @@ var WebGLTileLayer = /** @class */ (function (_super) {
206
211
  WebGLTileLayer.prototype.createRenderer = function () {
207
212
  var source = this.getSource();
208
213
  var parsedStyle = parseStyle(this.style_, 'bandCount' in source ? source.bandCount : 4);
209
- this.styleVariables_ = this.style_.variables || {};
210
214
  return new WebGLTileLayerRenderer(this, {
211
215
  vertexShader: parsedStyle.vertexShader,
212
216
  fragmentShader: parsedStyle.fragmentShader,
package/layer/WebGLTile.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WebGLTile.js","sourceRoot":"","sources":["../src/layer/WebGLTile.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebGLTile.js","sourceRoot":"","sources":["../src/layer/WebGLTile.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "6.9.1-dev.1636384514301",
3
+ "version": "6.9.1-dev.1636724554692",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
package/src/layer/WebGLTile.js CHANGED
@@ -18,7 +18,7 @@ import {assign} from '../obj.js';
18
18
  * @typedef {Object} Style
19
19
  * Translates tile data to rendered pixels.
20
20
  *
21
- * @property {Object<string, number>} [variables] Style variables. Each variable must hold a number. These
21
+ * @property {Object<string, (string|number)>} [variables] Style variables. Each variable must hold a number or string. These
22
22
  * variables can be used in the `color`, `brightness`, `contrast`, `exposure`, `saturation` and `gamma`
23
23
  * {@link import("../style/expressions.js").ExpressionValue expressions}, using the `['var', 'varName']` operator.
24
24
  * To update style variables, use the {@link import("./WebGLTile.js").default#updateStyleVariables} method.
@@ -287,6 +287,12 @@ class WebGLTileLayer extends BaseTileLayer {
287
287
  * @private
288
288
  */
289
289
  this.cacheSize_ = cacheSize;
290
+
291
+ /**
292
+ * @type {Object<string, (string|number)>}
293
+ * @private
294
+ */
295
+ this.styleVariables_ = this.style_.variables || {};
290
296
  }
291
297
 
292
298
  /**
@@ -301,8 +307,6 @@ class WebGLTileLayer extends BaseTileLayer {
301
307
  'bandCount' in source ? source.bandCount : 4
302
308
  );
303
309
 
304
- this.styleVariables_ = this.style_.variables || {};
305
-
306
310
  return new WebGLTileLayerRenderer(this, {
307
311
  vertexShader: parsedStyle.vertexShader,
308
312
  fragmentShader: parsedStyle.fragmentShader,
package/util.js CHANGED
@@ -31,5 +31,5 @@ export function getUid(obj) {
31
31
  * OpenLayers version.
32
32
  * @type {string}
33
33
  */
34
- export var VERSION = '6.9.1-dev.1636384514301';
34
+ export var VERSION = '6.9.1-dev.1636724554692';
35
35
  //# sourceMappingURL=util.js.map