ol 9.2.5-dev.1720289636611 → 9.2.5-dev.1720352536811

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 (107) hide show
  1. package/Map.d.ts +2 -1
  2. package/Map.d.ts.map +1 -1
  3. package/Map.js +1 -0
  4. package/MapBrowserEvent.d.ts +4 -2
  5. package/MapBrowserEvent.d.ts.map +1 -1
  6. package/MapBrowserEvent.js +2 -0
  7. package/MapBrowserEventHandler.d.ts +4 -1
  8. package/MapBrowserEventHandler.d.ts.map +1 -1
  9. package/MapBrowserEventHandler.js +3 -0
  10. package/Tile.d.ts +4 -4
  11. package/Tile.d.ts.map +1 -1
  12. package/Tile.js +2 -0
  13. package/control/OverviewMap.d.ts.map +1 -1
  14. package/control/OverviewMap.js +7 -5
  15. package/control/Rotate.d.ts +4 -1
  16. package/control/Rotate.d.ts.map +1 -1
  17. package/control/Rotate.js +3 -0
  18. package/dist/ol.js +2 -2
  19. package/dist/ol.js.map +1 -1
  20. package/geom/GeometryCollection.d.ts +2 -1
  21. package/geom/GeometryCollection.d.ts.map +1 -1
  22. package/geom/GeometryCollection.js +1 -0
  23. package/interaction/DragPan.d.ts +4 -2
  24. package/interaction/DragPan.d.ts.map +1 -1
  25. package/interaction/DragPan.js +2 -0
  26. package/interaction/Link.d.ts.map +1 -1
  27. package/interaction/Link.js +3 -0
  28. package/interaction/Modify.d.ts +4 -2
  29. package/interaction/Modify.d.ts.map +1 -1
  30. package/interaction/Modify.js +2 -0
  31. package/layer/Graticule.d.ts +2 -1
  32. package/layer/Graticule.d.ts.map +1 -1
  33. package/layer/Graticule.js +1 -0
  34. package/layer/Heatmap.d.ts +4 -1
  35. package/layer/Heatmap.d.ts.map +1 -1
  36. package/layer/Heatmap.js +12 -7
  37. package/ol.css +4 -0
  38. package/package.json +1 -1
  39. package/render/Feature.d.ts +4 -2
  40. package/render/Feature.d.ts.map +1 -1
  41. package/render/Feature.js +2 -0
  42. package/render/canvas/ExecutorGroup.d.ts +2 -3
  43. package/render/canvas/ExecutorGroup.d.ts.map +1 -1
  44. package/render/canvas/ExecutorGroup.js +1 -0
  45. package/render/canvas/TextBuilder.d.ts +2 -1
  46. package/render/canvas/TextBuilder.d.ts.map +1 -1
  47. package/render/canvas/TextBuilder.js +1 -0
  48. package/render/canvas/ZIndexContext.d.ts +2 -1
  49. package/render/canvas/ZIndexContext.d.ts.map +1 -1
  50. package/render/canvas/ZIndexContext.js +1 -0
  51. package/render/webgl/MixedGeometryBatch.d.ts +4 -1
  52. package/render/webgl/MixedGeometryBatch.d.ts.map +1 -1
  53. package/render/webgl/MixedGeometryBatch.js +4 -0
  54. package/render/webgl/VectorStyleRenderer.d.ts +52 -26
  55. package/render/webgl/VectorStyleRenderer.d.ts.map +1 -1
  56. package/render/webgl/VectorStyleRenderer.js +39 -0
  57. package/renderer/Composite.d.ts +2 -1
  58. package/renderer/Composite.d.ts.map +1 -1
  59. package/renderer/Composite.js +1 -0
  60. package/renderer/Layer.d.ts +2 -2
  61. package/renderer/Layer.d.ts.map +1 -1
  62. package/renderer/Layer.js +1 -1
  63. package/renderer/canvas/ImageLayer.d.ts +1 -1
  64. package/renderer/canvas/ImageLayer.d.ts.map +1 -1
  65. package/renderer/canvas/ImageLayer.js +9 -9
  66. package/renderer/canvas/VectorImageLayer.js +3 -3
  67. package/renderer/canvas/VectorLayer.d.ts +4 -2
  68. package/renderer/canvas/VectorLayer.d.ts.map +1 -1
  69. package/renderer/canvas/VectorLayer.js +2 -0
  70. package/renderer/webgl/PointsLayer.d.ts +20 -6
  71. package/renderer/webgl/PointsLayer.d.ts.map +1 -1
  72. package/renderer/webgl/PointsLayer.js +15 -1
  73. package/renderer/webgl/VectorLayer.d.ts +20 -5
  74. package/renderer/webgl/VectorLayer.d.ts.map +1 -1
  75. package/renderer/webgl/VectorLayer.js +15 -0
  76. package/renderer/webgl/VectorTileLayer.d.ts +10 -3
  77. package/renderer/webgl/VectorTileLayer.d.ts.map +1 -1
  78. package/renderer/webgl/VectorTileLayer.js +7 -0
  79. package/source/DataTile.d.ts.map +1 -1
  80. package/source/DataTile.js +3 -0
  81. package/source/GeoTIFF.d.ts +2 -1
  82. package/source/GeoTIFF.d.ts.map +1 -1
  83. package/source/GeoTIFF.js +1 -0
  84. package/source/Google.d.ts +2 -1
  85. package/source/Google.d.ts.map +1 -1
  86. package/source/Google.js +1 -0
  87. package/source/Raster.d.ts +35 -15
  88. package/source/Raster.d.ts.map +1 -1
  89. package/source/Raster.js +66 -46
  90. package/source/Zoomify.d.ts +2 -1
  91. package/source/Zoomify.d.ts.map +1 -1
  92. package/source/Zoomify.js +1 -0
  93. package/style/Circle.js +1 -1
  94. package/style/Icon.d.ts.map +1 -1
  95. package/style/Icon.js +5 -0
  96. package/style/RegularShape.d.ts +5 -2
  97. package/style/RegularShape.d.ts.map +1 -1
  98. package/style/RegularShape.js +8 -5
  99. package/util.js +1 -1
  100. package/webgl/BaseTileRepresentation.d.ts +2 -2
  101. package/webgl/BaseTileRepresentation.d.ts.map +1 -1
  102. package/webgl/BaseTileRepresentation.js +6 -2
  103. package/webgl/PostProcessingPass.d.ts +48 -12
  104. package/webgl/PostProcessingPass.d.ts.map +1 -1
  105. package/webgl/PostProcessingPass.js +42 -6
  106. package/webgl/TileGeometry.js +1 -1
  107. package/webgl/TileTexture.js +8 -8
package/source/Raster.js CHANGED
@@ -218,11 +218,15 @@ export class Processor extends Disposable {
218
218
  constructor(config) {
219
219
  super();
220
220
 
221
- this._imageOps = !!config.imageOps;
221
+ /**
222
+ * @type {boolean}
223
+ * @private
224
+ */
225
+ this.imageOps_ = !!config.imageOps;
222
226
  let threads;
223
227
  if (config.threads === 0) {
224
228
  threads = 0;
225
- } else if (this._imageOps) {
229
+ } else if (this.imageOps_) {
226
230
  threads = 1;
227
231
  } else {
228
232
  threads = config.threads || 1;
@@ -234,36 +238,48 @@ export class Processor extends Disposable {
234
238
  const workers = new Array(threads);
235
239
  if (threads) {
236
240
  for (let i = 0; i < threads; ++i) {
237
- workers[i] = createWorker(config, this._onWorkerMessage.bind(this, i));
241
+ workers[i] = createWorker(config, this.onWorkerMessage_.bind(this, i));
238
242
  }
239
243
  } else {
240
244
  workers[0] = createFauxWorker(
241
245
  config,
242
- this._onWorkerMessage.bind(this, 0),
246
+ this.onWorkerMessage_.bind(this, 0),
243
247
  );
244
248
  }
245
- this._workers = workers;
249
+ /**
250
+ * @type {Array<Worker>}
251
+ * @private
252
+ */
253
+ this.workers_ = workers;
246
254
 
247
255
  /**
248
256
  * @type {Array<Job>}
249
257
  * @private
250
258
  */
251
- this._queue = [];
259
+ this.queue_ = [];
252
260
 
253
- this._maxQueueLength = config.queue || Infinity;
254
- this._running = 0;
261
+ /**
262
+ * @type {number}
263
+ * @private
264
+ */
265
+ this.maxQueueLength_ = config.queue || Infinity;
266
+ /**
267
+ * @type {number}
268
+ * @private
269
+ */
270
+ this.running_ = 0;
255
271
 
256
272
  /**
257
273
  * @type {Object<number, any>}
258
274
  * @private
259
275
  */
260
- this._dataLookup = {};
276
+ this.dataLookup_ = {};
261
277
 
262
278
  /**
263
- * @type {Job}
279
+ * @type {Job|null}
264
280
  * @private
265
281
  */
266
- this._job = null;
282
+ this.job_ = null;
267
283
  }
268
284
 
269
285
  /**
@@ -276,48 +292,48 @@ export class Processor extends Disposable {
276
292
  * generated by operations. The third is the user data object.
277
293
  */
278
294
  process(inputs, meta, callback) {
279
- this._enqueue({
295
+ this.enqueue_({
280
296
  inputs: inputs,
281
297
  meta: meta,
282
298
  callback: callback,
283
299
  });
284
- this._dispatch();
300
+ this.dispatch_();
285
301
  }
286
302
 
287
303
  /**
288
304
  * Add a job to the queue.
289
305
  * @param {Job} job The job.
290
306
  */
291
- _enqueue(job) {
292
- this._queue.push(job);
293
- while (this._queue.length > this._maxQueueLength) {
294
- this._queue.shift().callback(null, null);
307
+ enqueue_(job) {
308
+ this.queue_.push(job);
309
+ while (this.queue_.length > this.maxQueueLength_) {
310
+ this.queue_.shift().callback(null, null);
295
311
  }
296
312
  }
297
313
 
298
314
  /**
299
315
  * Dispatch a job.
300
316
  */
301
- _dispatch() {
302
- if (this._running || this._queue.length === 0) {
317
+ dispatch_() {
318
+ if (this.running_ || this.queue_.length === 0) {
303
319
  return;
304
320
  }
305
321
 
306
- const job = this._queue.shift();
307
- this._job = job;
322
+ const job = this.queue_.shift();
323
+ this.job_ = job;
308
324
  const width = job.inputs[0].width;
309
325
  const height = job.inputs[0].height;
310
326
  const buffers = job.inputs.map(function (input) {
311
327
  return input.data.buffer;
312
328
  });
313
- const threads = this._workers.length;
314
- this._running = threads;
329
+ const threads = this.workers_.length;
330
+ this.running_ = threads;
315
331
  if (threads === 1) {
316
- this._workers[0].postMessage(
332
+ this.workers_[0].postMessage(
317
333
  {
318
334
  buffers: buffers,
319
335
  meta: job.meta,
320
- imageOps: this._imageOps,
336
+ imageOps: this.imageOps_,
321
337
  width: width,
322
338
  height: height,
323
339
  },
@@ -334,11 +350,11 @@ export class Processor extends Disposable {
334
350
  for (let j = 0, jj = buffers.length; j < jj; ++j) {
335
351
  slices.push(buffers[j].slice(offset, offset + segmentLength));
336
352
  }
337
- this._workers[i].postMessage(
353
+ this.workers_[i].postMessage(
338
354
  {
339
355
  buffers: slices,
340
356
  meta: job.meta,
341
- imageOps: this._imageOps,
357
+ imageOps: this.imageOps_,
342
358
  width: width,
343
359
  height: height,
344
360
  },
@@ -352,14 +368,14 @@ export class Processor extends Disposable {
352
368
  * @param {number} index The worker index.
353
369
  * @param {MessageEvent} event The message event.
354
370
  */
355
- _onWorkerMessage(index, event) {
371
+ onWorkerMessage_(index, event) {
356
372
  if (this.disposed) {
357
373
  return;
358
374
  }
359
- this._dataLookup[index] = event.data;
360
- --this._running;
361
- if (this._running === 0) {
362
- this._resolveJob();
375
+ this.dataLookup_[index] = event.data;
376
+ --this.running_;
377
+ if (this.running_ === 0) {
378
+ this.resolveJob_();
363
379
  }
364
380
  }
365
381
 
@@ -367,43 +383,43 @@ export class Processor extends Disposable {
367
383
  * Resolve a job. If there are no more worker threads, the processor callback
368
384
  * will be called.
369
385
  */
370
- _resolveJob() {
371
- const job = this._job;
372
- const threads = this._workers.length;
386
+ resolveJob_() {
387
+ const job = this.job_;
388
+ const threads = this.workers_.length;
373
389
  let data, meta;
374
390
  if (threads === 1) {
375
- data = new Uint8ClampedArray(this._dataLookup[0]['buffer']);
376
- meta = this._dataLookup[0]['meta'];
391
+ data = new Uint8ClampedArray(this.dataLookup_[0]['buffer']);
392
+ meta = this.dataLookup_[0]['meta'];
377
393
  } else {
378
394
  const length = job.inputs[0].data.length;
379
395
  data = new Uint8ClampedArray(length);
380
396
  meta = new Array(threads);
381
397
  const segmentLength = 4 * Math.ceil(length / 4 / threads);
382
398
  for (let i = 0; i < threads; ++i) {
383
- const buffer = this._dataLookup[i]['buffer'];
399
+ const buffer = this.dataLookup_[i]['buffer'];
384
400
  const offset = i * segmentLength;
385
401
  data.set(new Uint8ClampedArray(buffer), offset);
386
- meta[i] = this._dataLookup[i]['meta'];
402
+ meta[i] = this.dataLookup_[i]['meta'];
387
403
  }
388
404
  }
389
- this._job = null;
390
- this._dataLookup = {};
405
+ this.job_ = null;
406
+ this.dataLookup_ = {};
391
407
  job.callback(
392
408
  null,
393
409
  newImageData(data, job.inputs[0].width, job.inputs[0].height),
394
410
  meta,
395
411
  );
396
- this._dispatch();
412
+ this.dispatch_();
397
413
  }
398
414
 
399
415
  /**
400
416
  * Terminate all workers associated with the processor.
401
417
  */
402
418
  disposeInternal() {
403
- for (let i = 0; i < this._workers.length; ++i) {
404
- this._workers[i].terminate();
419
+ for (let i = 0; i < this.workers_.length; ++i) {
420
+ this.workers_[i].terminate();
405
421
  }
406
- this._workers.length = 0;
422
+ this.workers_.length = 0;
407
423
  }
408
424
  }
409
425
 
@@ -592,7 +608,10 @@ class RasterSource extends ImageSource {
592
608
  this.layers_[i].addEventListener(EventType.CHANGE, changed);
593
609
  }
594
610
 
595
- /** @type {boolean} */
611
+ /**
612
+ * @private
613
+ * @type {boolean}
614
+ */
596
615
  this.useResolutions_ = options.resolutions !== null;
597
616
 
598
617
  /**
@@ -620,6 +639,7 @@ class RasterSource extends ImageSource {
620
639
  /**
621
640
  * The most recently rendered revision.
622
641
  * @type {number}
642
+ * @private
623
643
  */
624
644
  this.renderedRevision_;
625
645
 
@@ -18,9 +18,10 @@ export class CustomTile extends ImageTile {
18
18
  */
19
19
  private zoomifyImage_;
20
20
  /**
21
+ * @private
21
22
  * @type {import("../size.js").Size}
22
23
  */
23
- tileSize_: import("../size.js").Size;
24
+ private tileSize_;
24
25
  }
25
26
  export default Zoomify;
26
27
  export type TierSizeCalculation = "default" | "truncated";
@@ -1 +1 @@
1
- {"version":3,"file":"Zoomify.d.ts","sourceRoot":"","sources":["Zoomify.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;IACE;;;;;;;;OAQG;IACH,sBARW,OAAO,YAAY,EAAE,IAAI,aACzB,OAAO,iBAAiB,EAAE,SAAS,SACnC,GAAiC,OACjC,MAAM,eACL,MAAM,OAAA,oBACP,OAAO,YAAY,EAAE,YAAY,sDAwB3C;IAVC;;;OAGG;IACH,sBAAyB;IAEzB;;OAEG;IACH,WAFU,OAAO,YAAY,EAAE,IAAI,CAEV;CAyB5B;;kCA1DY,SAAS,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;iBAqEtB,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;SAInC,MAAM;;;;;;;;UAYN,OAAO,YAAY,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;sBAhGjB,iBAAiB;AAuEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4JjB;CACF;sBAjRqB,gBAAgB"}
1
+ {"version":3,"file":"Zoomify.d.ts","sourceRoot":"","sources":["Zoomify.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;IACE;;;;;;;;OAQG;IACH,sBARW,OAAO,YAAY,EAAE,IAAI,aACzB,OAAO,iBAAiB,EAAE,SAAS,SACnC,GAAiC,OACjC,MAAM,eACL,MAAM,OAAA,oBACP,OAAO,YAAY,EAAE,YAAY,sDAyB3C;IAXC;;;OAGG;IACH,sBAAyB;IAEzB;;;OAGG;IACH,kBAAyB;CAyB5B;;kCA3DY,SAAS,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;iBAsEtB,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;SAInC,MAAM;;;;;;;;UAYN,OAAO,YAAY,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;sBAjGjB,iBAAiB;AAwEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4JjB;CACF;sBAlRqB,gBAAgB"}
package/source/Zoomify.js CHANGED
@@ -45,6 +45,7 @@ export class CustomTile extends ImageTile {
45
45
  this.zoomifyImage_ = null;
46
46
 
47
47
  /**
48
+ * @private
48
49
  * @type {import("../size.js").Size}
49
50
  */
50
51
  this.tileSize_ = tileSize;
package/style/Circle.js CHANGED
@@ -74,7 +74,7 @@ class CircleStyle extends RegularShape {
74
74
  * @api
75
75
  */
76
76
  setRadius(radius) {
77
- this.radius_ = radius;
77
+ this.radius = radius;
78
78
  this.render();
79
79
  }
80
80
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Icon.d.ts","sourceRoot":"","sources":["Icon.js"],"names":[],"mappings":";;;;8BAYa,UAAU,GAAG,QAAQ;;;;yBAKrB,aAAa,GAAG,cAAc,GAAG,UAAU,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DtE;;;;GAIG;AACH;IACE;;OAEG;IACH,2CAmMC;IAjKC;;;OAGG;IACH,gBAAyE;IAEzE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,qBACgE;IA0ChE;;;OAGG;IACH,eAAyE;IAEzE;;;OAGG;IACH,mBAMC;IAED;;;OAGG;IACH,gBAAqE;IACrE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,cAA6D;IAevD,qCAA8B;IA4BtC;;;;OAIG;IACH,SAHY,IAAI,CAmCf;IA6DD;;;;;;OAMG;IACH,kBAHW,KAAK,CAAC,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,YAHY,OAAO,aAAa,EAAE,KAAK,CAKtC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAMzD;IA0BD;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAIzD;IAqCD;;;;OAIG;IACH,UAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,YAHY,MAAM,CAYjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAYjB;CAyCF;uBAljBsB,YAAY"}
1
+ {"version":3,"file":"Icon.d.ts","sourceRoot":"","sources":["Icon.js"],"names":[],"mappings":";;;;8BAYa,UAAU,GAAG,QAAQ;;;;yBAKrB,aAAa,GAAG,cAAc,GAAG,UAAU,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DtE;;;;GAIG;AACH;IACE;;OAEG;IACH,2CAwMC;IAtKC;;;OAGG;IACH,gBAAyE;IAEzE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,qBACgE;IA0ChE;;;OAGG;IACH,eAAyE;IAEzE;;;OAGG;IACH,mBAMC;IAED;;;OAGG;IACH,gBAAqE;IACrE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,cAA6D;IAoBvD,qCAA8B;IA4BtC;;;;OAIG;IACH,SAHY,IAAI,CAmCf;IA6DD;;;;;;OAMG;IACH,kBAHW,KAAK,CAAC,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,YAHY,OAAO,aAAa,EAAE,KAAK,CAKtC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAMzD;IA0BD;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAIzD;IAqCD;;;;OAIG;IACH,UAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,YAHY,MAAM,CAYjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAYjB;CAyCF;uBAvjBsB,YAAY"}
package/style/Icon.js CHANGED
@@ -239,6 +239,11 @@ class Icon extends ImageStyle {
239
239
  */
240
240
  this.size_ = options.size !== undefined ? options.size : null;
241
241
 
242
+ /**
243
+ * @private
244
+ */
245
+ this.initialOptions_;
246
+
242
247
  /**
243
248
  * Calculate the scale if width or height were given.
244
249
  */
@@ -155,7 +155,7 @@ declare class RegularShape extends ImageStyle {
155
155
  * @protected
156
156
  * @type {number}
157
157
  */
158
- protected radius_: number;
158
+ protected radius: number;
159
159
  /**
160
160
  * @private
161
161
  * @type {number|undefined}
@@ -181,7 +181,10 @@ declare class RegularShape extends ImageStyle {
181
181
  * @type {RenderOptions}
182
182
  */
183
183
  private renderOptions_;
184
- imageState_: number;
184
+ /**
185
+ * @private
186
+ */
187
+ private imageState_;
185
188
  /**
186
189
  * Clones the style.
187
190
  * @return {RegularShape} The cloned style.
@@ -1 +1 @@
1
- {"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAsBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAwFjB;IA1EC;;;OAGG;IACH,kBAAc;IAEd;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,mBAFU,MAAM,CAEa;IAE7B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB,oBAGuB;IAOzB;;;;OAIG;IACH,SAHY,YAAY,CAoBvB;IAoBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;OAEG;IACH,wBAFY,iBAAiB,CAS5B;IAED;;;;;OAKG;IACH,qBAJW,MAAM,GACL,iBAAiB,CAiB5B;IAkCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAiBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAMC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAKF;uBAhmBsB,YAAY"}
1
+ {"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAsBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2FjB;IA7EC;;;OAGG;IACH,kBAAc;IAEd;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,kBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB;;OAEG;IACH,oBAGuB;IAOzB;;;;OAIG;IACH,SAHY,YAAY,CAoBvB;IAoBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;OAEG;IACH,wBAFY,iBAAiB,CAS5B;IAED;;;;;OAKG;IACH,qBAJW,MAAM,GACL,iBAAiB,CAiB5B;IAkCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAiBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAMC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAKF;uBAnmBsB,YAAY"}
@@ -104,7 +104,7 @@ class RegularShape extends ImageStyle {
104
104
  * @protected
105
105
  * @type {number}
106
106
  */
107
- this.radius_ = options.radius;
107
+ this.radius = options.radius;
108
108
 
109
109
  /**
110
110
  * @private
@@ -136,6 +136,9 @@ class RegularShape extends ImageStyle {
136
136
  */
137
137
  this.renderOptions_;
138
138
 
139
+ /**
140
+ * @private
141
+ */
139
142
  this.imageState_ =
140
143
  this.fill_ && this.fill_.loading()
141
144
  ? ImageState.LOADING
@@ -297,7 +300,7 @@ class RegularShape extends ImageStyle {
297
300
  * @api
298
301
  */
299
302
  getRadius() {
300
- return this.radius_;
303
+ return this.radius;
301
304
  }
302
305
 
303
306
  /**
@@ -390,7 +393,7 @@ class RegularShape extends ImageStyle {
390
393
  // |α . .
391
394
  // / . .
392
395
  // ° center
393
- let r1 = this.radius_;
396
+ let r1 = this.radius;
394
397
  let r2 = this.radius2_ === undefined ? r1 : this.radius2_;
395
398
  if (r1 < r2) {
396
399
  const tmp = r1;
@@ -466,7 +469,7 @@ class RegularShape extends ImageStyle {
466
469
  }
467
470
 
468
471
  const add = this.calculateLineJoinSize_(lineJoin, strokeWidth, miterLimit);
469
- const maxRadius = Math.max(this.radius_, this.radius2_ || 0);
472
+ const maxRadius = Math.max(this.radius, this.radius2_ || 0);
470
473
  const size = Math.ceil(2 * maxRadius + add);
471
474
 
472
475
  return {
@@ -563,7 +566,7 @@ class RegularShape extends ImageStyle {
563
566
  */
564
567
  createPath_(context) {
565
568
  let points = this.points_;
566
- const radius = this.radius_;
569
+ const radius = this.radius;
567
570
  if (points === Infinity) {
568
571
  context.arc(0, 0, radius, 0, 2 * Math.PI);
569
572
  } else {
package/util.js CHANGED
@@ -33,4 +33,4 @@ export function getUid(obj) {
33
33
  * OpenLayers version.
34
34
  * @type {string}
35
35
  */
36
- export const VERSION = '9.2.5-dev.1720289636611';
36
+ export const VERSION = '9.2.5-dev.1720352536811';
@@ -49,12 +49,12 @@ declare class BaseTileRepresentation<TileType extends import("../Tile.js").defau
49
49
  * @type {number}
50
50
  * @protected
51
51
  */
52
- protected gutter_: number;
52
+ protected gutter: number;
53
53
  /**
54
54
  * @type {import("../webgl/Helper.js").default}
55
55
  * @protected
56
56
  */
57
- protected helper_: import("../webgl/Helper.js").default;
57
+ protected helper: import("../webgl/Helper.js").default;
58
58
  loaded: boolean;
59
59
  ready: boolean;
60
60
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"BaseTileRepresentation.d.ts","sourceRoot":"","sources":["BaseTileRepresentation.js"],"names":[],"mappings":";2BAWa,OAAO,YAAY,EAAE,OAAO;sCAIb,QAAQ,SAAtB,YAAa;;;;UAEb,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AATlD;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,qCAH4C,QAAQ,SAAvC,OAAQ,YAAY,EAAE,OAAQ;IAIzC;;OAEG;IACH,qBAFW,yBAAyB,CAAC,QAAQ,CAAC,EAyB7C;IApBC;;OAEG;IACH,MAFU,QAAQ,CAET;IAwDX,0BAKC;IA1DC;;;OAGG;IACH,mBAHU,MAAM,CAGkB;IAElC;;;OAGG;IACH,mBAHU,OAAO,oBAAoB,EAAE,OAAO,CAGjB;IAE7B,gBAAmB;IACnB,eAAkB;IAGpB;;OAEG;IACH,cAFW,QAAQ,QAqBlB;IAED;;;OAGG;IACH,6BAEC;IAED,iBAGC;CAYF;wBArGuB,qBAAqB"}
1
+ {"version":3,"file":"BaseTileRepresentation.d.ts","sourceRoot":"","sources":["BaseTileRepresentation.js"],"names":[],"mappings":";2BAWa,OAAO,YAAY,EAAE,OAAO;sCAIb,QAAQ,SAAtB,YAAa;;;;UAEb,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AATlD;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,qCAH4C,QAAQ,SAAvC,OAAQ,YAAY,EAAE,OAAQ;IAIzC;;OAEG;IACH,qBAFW,yBAAyB,CAAC,QAAQ,CAAC,EA6B7C;IAxBC;;OAEG;IACH,MAFU,QAAQ,CAET;IA4DX,0BAKC;IA1DC;;;OAGG;IACH,kBAHU,MAAM,CAGiB;IAEjC;;;OAGG;IACH,kBAHU,OAAO,oBAAoB,EAAE,OAAO,CAGlB;IAE5B,gBAAmB;IACnB,eAAkB;IAGpB;;OAEG;IACH,cAFW,QAAQ,QAqBlB;IAED;;;OAGG;IACH,6BAEC;IAED,iBAGC;CAYF;wBAzGuB,qBAAqB"}
@@ -38,19 +38,23 @@ class BaseTileRepresentation extends EventTarget {
38
38
  * @type {TileType}
39
39
  */
40
40
  this.tile;
41
+
42
+ /**
43
+ * @private
44
+ */
41
45
  this.handleTileChange_ = this.handleTileChange_.bind(this);
42
46
 
43
47
  /**
44
48
  * @type {number}
45
49
  * @protected
46
50
  */
47
- this.gutter_ = options.gutter || 0;
51
+ this.gutter = options.gutter || 0;
48
52
 
49
53
  /**
50
54
  * @type {import("../webgl/Helper.js").default}
51
55
  * @protected
52
56
  */
53
- this.helper_ = options.helper;
57
+ this.helper = options.helper;
54
58
 
55
59
  this.loaded = false;
56
60
  this.ready = false;
@@ -106,18 +106,54 @@ declare class WebGLPostProcessingPass {
106
106
  * @param {Options} options Options.
107
107
  */
108
108
  constructor(options: Options);
109
- gl_: WebGLRenderingContext;
110
- scaleRatio_: number;
111
- renderTargetTexture_: WebGLTexture | null;
112
- renderTargetTextureSize_: number[] | null;
113
- frameBuffer_: WebGLFramebuffer | null;
114
- depthBuffer_: WebGLRenderbuffer | null;
115
- renderTargetProgram_: WebGLProgram | null;
116
- renderTargetVerticesBuffer_: WebGLBuffer | null;
117
- renderTargetAttribLocation_: number;
118
- renderTargetUniformLocation_: WebGLUniformLocation | null;
119
- renderTargetOpacityLocation_: WebGLUniformLocation | null;
120
- renderTargetTextureLocation_: WebGLUniformLocation | null;
109
+ /**
110
+ * @private
111
+ */
112
+ private gl_;
113
+ /**
114
+ * @private
115
+ */
116
+ private scaleRatio_;
117
+ /**
118
+ * @private
119
+ */
120
+ private renderTargetTexture_;
121
+ /**
122
+ * @private
123
+ */
124
+ private renderTargetTextureSize_;
125
+ /**
126
+ * @private
127
+ */
128
+ private frameBuffer_;
129
+ /**
130
+ * @private
131
+ */
132
+ private depthBuffer_;
133
+ /**
134
+ * @private
135
+ */
136
+ private renderTargetProgram_;
137
+ /**
138
+ * @private
139
+ */
140
+ private renderTargetVerticesBuffer_;
141
+ /**
142
+ * @private
143
+ */
144
+ private renderTargetAttribLocation_;
145
+ /**
146
+ * @private
147
+ */
148
+ private renderTargetUniformLocation_;
149
+ /**
150
+ * @private
151
+ */
152
+ private renderTargetOpacityLocation_;
153
+ /**
154
+ * @private
155
+ */
156
+ private renderTargetTextureLocation_;
121
157
  /**
122
158
  * Holds info about custom uniforms used in the post processing pass
123
159
  * @type {Array<UniformInternalDescription>}
@@ -1 +1 @@
1
- {"version":3,"file":"PostProcessingPass.d.ts","sourceRoot":"","sources":["PostProcessingPass.js"],"names":[],"mappings":";;;;;kBAqCc,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;WAUrB,OAAO,UAAU,EAAE,YAAY;;;;cAC/B,oBAAoB;;;;;;AAblC;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAyEjB;IAtEC,2BAA+B;IAG/B,oBAA0C;IAE1C,0CAA8C;IAC9C,0CAAoC;IAEpC,sCAA0C;IAC1C,uCAA2C;IAgB3C,0CAA8C;IAM9C,gDAAoD;IASpD,oCAGC;IACD,0DAGC;IACD,0DAGC;IACD,0DAGC;IAED;;;;OAIG;IACH,kBAAmB;IAUrB;;;OAGG;IACH,SAFY,qBAAqB,CAIhC;IAED;;;;;OAKG;IACH,iBAFW,OAAO,WAAW,EAAE,UAAU,QAoExC;IAED;;;;;;OAMG;IACH,kBALW,OAAO,WAAW,EAAE,UAAU,uEAErB,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qCAC3D,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qBA6D9E;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;;;OAIG;IACH,sBAwEC;CACF"}
1
+ {"version":3,"file":"PostProcessingPass.d.ts","sourceRoot":"","sources":["PostProcessingPass.js"],"names":[],"mappings":";;;;;kBAqCc,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;WAUrB,OAAO,UAAU,EAAE,YAAY;;;;cAC/B,oBAAoB;;;;;;AAblC;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA6GjB;IA1GC;;OAEG;IACH,YAA+B;IAG/B;;OAEG;IACH,oBAA0C;IAE1C;;OAEG;IACH,6BAA8C;IAC9C;;OAEG;IACH,iCAAoC;IAEpC;;OAEG;IACH,qBAA0C;IAC1C;;OAEG;IACH,qBAA2C;IAgB3C;;OAEG;IACH,6BAA8C;IAM9C;;OAEG;IACH,oCAAoD;IASpD;;OAEG;IACH,oCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IAED;;;;OAIG;IACH,kBAAmB;IAUrB;;;OAGG;IACH,SAFY,qBAAqB,CAIhC;IAED;;;;;OAKG;IACH,iBAFW,OAAO,WAAW,EAAE,UAAU,QAoExC;IAED;;;;;;OAMG;IACH,kBALW,OAAO,WAAW,EAAE,UAAU,uEAErB,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qCAC3D,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qBA6D9E;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;;;OAIG;IACH,sBAwEC;CACF"}
@@ -6,13 +6,13 @@ import {getUid} from '../util.js';
6
6
 
7
7
  const DEFAULT_VERTEX_SHADER = `
8
8
  precision mediump float;
9
-
9
+
10
10
  attribute vec2 a_position;
11
11
  varying vec2 v_texCoord;
12
12
  varying vec2 v_screenCoord;
13
-
13
+
14
14
  uniform vec2 u_screenSize;
15
-
15
+
16
16
  void main() {
17
17
  v_texCoord = a_position * 0.5 + 0.5;
18
18
  v_screenCoord = v_texCoord * u_screenSize;
@@ -22,12 +22,12 @@ const DEFAULT_VERTEX_SHADER = `
22
22
 
23
23
  const DEFAULT_FRAGMENT_SHADER = `
24
24
  precision mediump float;
25
-
25
+
26
26
  uniform sampler2D u_image;
27
27
  uniform float u_opacity;
28
-
28
+
29
29
  varying vec2 v_texCoord;
30
-
30
+
31
31
  void main() {
32
32
  gl_FragColor = texture2D(u_image, v_texCoord) * u_opacity;
33
33
  }
@@ -103,15 +103,33 @@ class WebGLPostProcessingPass {
103
103
  * @param {Options} options Options.
104
104
  */
105
105
  constructor(options) {
106
+ /**
107
+ * @private
108
+ */
106
109
  this.gl_ = options.webGlContext;
107
110
  const gl = this.gl_;
108
111
 
112
+ /**
113
+ * @private
114
+ */
109
115
  this.scaleRatio_ = options.scaleRatio || 1;
110
116
 
117
+ /**
118
+ * @private
119
+ */
111
120
  this.renderTargetTexture_ = gl.createTexture();
121
+ /**
122
+ * @private
123
+ */
112
124
  this.renderTargetTextureSize_ = null;
113
125
 
126
+ /**
127
+ * @private
128
+ */
114
129
  this.frameBuffer_ = gl.createFramebuffer();
130
+ /**
131
+ * @private
132
+ */
115
133
  this.depthBuffer_ = gl.createRenderbuffer();
116
134
 
117
135
  // compile the program for the frame buffer
@@ -128,12 +146,18 @@ class WebGLPostProcessingPass {
128
146
  options.fragmentShader || DEFAULT_FRAGMENT_SHADER,
129
147
  );
130
148
  gl.compileShader(fragmentShader);
149
+ /**
150
+ * @private
151
+ */
131
152
  this.renderTargetProgram_ = gl.createProgram();
132
153
  gl.attachShader(this.renderTargetProgram_, vertexShader);
133
154
  gl.attachShader(this.renderTargetProgram_, fragmentShader);
134
155
  gl.linkProgram(this.renderTargetProgram_);
135
156
 
136
157
  // bind the vertices buffer for the frame buffer
158
+ /**
159
+ * @private
160
+ */
137
161
  this.renderTargetVerticesBuffer_ = gl.createBuffer();
138
162
  const verticesArray = [-1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, 1];
139
163
  gl.bindBuffer(gl.ARRAY_BUFFER, this.renderTargetVerticesBuffer_);
@@ -143,18 +167,30 @@ class WebGLPostProcessingPass {
143
167
  gl.STATIC_DRAW,
144
168
  );
145
169
 
170
+ /**
171
+ * @private
172
+ */
146
173
  this.renderTargetAttribLocation_ = gl.getAttribLocation(
147
174
  this.renderTargetProgram_,
148
175
  'a_position',
149
176
  );
177
+ /**
178
+ * @private
179
+ */
150
180
  this.renderTargetUniformLocation_ = gl.getUniformLocation(
151
181
  this.renderTargetProgram_,
152
182
  'u_screenSize',
153
183
  );
184
+ /**
185
+ * @private
186
+ */
154
187
  this.renderTargetOpacityLocation_ = gl.getUniformLocation(
155
188
  this.renderTargetProgram_,
156
189
  'u_opacity',
157
190
  );
191
+ /**
192
+ * @private
193
+ */
158
194
  this.renderTargetTextureLocation_ = gl.getUniformLocation(
159
195
  this.renderTargetProgram_,
160
196
  'u_image',
@@ -66,7 +66,7 @@ class TileGeometry extends BaseTileRepresentation {
66
66
  extent[0],
67
67
  extent[3],
68
68
  ]);
69
- this.helper_.flushBufferData(this.maskVertices);
69
+ this.helper.flushBufferData(this.maskVertices);
70
70
  }
71
71
 
72
72
  uploadTile() {