ol 7.0.0-dev.1659170210070 → 7.0.0-dev.1659205470107

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 (54) hide show
  1. package/View.d.ts.map +1 -1
  2. package/View.js +1 -2
  3. package/control/ScaleLine.d.ts.map +1 -1
  4. package/control/ScaleLine.js +3 -5
  5. package/format/Feature.d.ts.map +1 -1
  6. package/format/Feature.js +1 -2
  7. package/format/MVT.d.ts.map +1 -1
  8. package/format/MVT.js +1 -2
  9. package/geom/Geometry.d.ts.map +1 -1
  10. package/geom/Geometry.js +1 -2
  11. package/interaction/MouseWheelZoom.d.ts +4 -5
  12. package/interaction/MouseWheelZoom.d.ts.map +1 -1
  13. package/interaction/MouseWheelZoom.js +3 -7
  14. package/interaction.d.ts +1 -0
  15. package/interaction.d.ts.map +1 -1
  16. package/interaction.js +1 -0
  17. package/layer/BaseVector.d.ts +9 -4
  18. package/layer/BaseVector.d.ts.map +1 -1
  19. package/layer/BaseVector.js +45 -5
  20. package/layer/MapboxVector.d.ts +2 -2
  21. package/layer/MapboxVector.d.ts.map +1 -1
  22. package/layer/MapboxVector.js +1 -1
  23. package/layer/VectorTile.d.ts +9 -5
  24. package/layer/VectorTile.d.ts.map +1 -1
  25. package/layer/VectorTile.js +10 -16
  26. package/package.json +1 -1
  27. package/proj/Projection.d.ts +7 -7
  28. package/proj/Projection.d.ts.map +1 -1
  29. package/proj/Projection.js +5 -5
  30. package/proj/Units.d.ts +34 -15
  31. package/proj/Units.d.ts.map +1 -1
  32. package/proj/Units.js +25 -55
  33. package/proj/epsg3857.d.ts.map +1 -1
  34. package/proj/epsg3857.js +1 -2
  35. package/proj/epsg4326.d.ts.map +1 -1
  36. package/proj/epsg4326.js +1 -2
  37. package/proj/proj4.d.ts.map +1 -1
  38. package/proj/proj4.js +1 -2
  39. package/proj.d.ts +2 -2
  40. package/proj.d.ts.map +1 -1
  41. package/proj.js +4 -4
  42. package/renderer/canvas/VectorTileLayer.d.ts.map +1 -1
  43. package/renderer/canvas/VectorTileLayer.js +4 -5
  44. package/source/Raster.d.ts +9 -1
  45. package/source/Raster.d.ts.map +1 -1
  46. package/source/Raster.js +3 -9
  47. package/style/flat.d.ts +597 -0
  48. package/style/flat.d.ts.map +1 -0
  49. package/style/flat.js +341 -0
  50. package/tilegrid.d.ts.map +1 -1
  51. package/tilegrid.js +1 -2
  52. package/layer/VectorTileRenderType.d.ts +0 -7
  53. package/layer/VectorTileRenderType.d.ts.map +0 -1
  54. package/layer/VectorTileRenderType.js +0 -34
package/View.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"View.d.ts","sourceRoot":"","sources":["View.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"View.d.ts","sourceRoot":"","sources":["View.js"],"names":[],"mappings":"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"}
package/View.js CHANGED
@@ -2,7 +2,6 @@
2
2
  * @module ol/View
3
3
  */
4
4
  import BaseObject from './Object.js';
5
- import Units from './proj/Units.js';
6
5
  import ViewHint from './ViewHint.js';
7
6
  import ViewProperty from './ViewProperty.js';
8
7
  import {DEFAULT_TILE_SIZE} from './tilegrid/common.js';
@@ -2008,7 +2007,7 @@ export function createResolutionConstraint(options) {
2008
2007
  // calculate the default min and max resolution
2009
2008
  const size = !projExtent
2010
2009
  ? // use an extent that can fit the whole world if need be
2011
- (360 * METERS_PER_UNIT[Units.DEGREES]) / projection.getMetersPerUnit()
2010
+ (360 * METERS_PER_UNIT.degrees) / projection.getMetersPerUnit()
2012
2011
  : Math.max(getWidth(projExtent), getHeight(projExtent));
2013
2012
 
2014
2013
  const defaultMaxResolution =
@@ -1 +1 @@
1
- {"version":3,"file":"ScaleLine.d.ts","sourceRoot":"","sources":["ScaleLine.js"],"names":[],"mappings":";;;;oBAea,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI;;;;2CAkBrD,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,GAC1E,cAAoB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC9D,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GAC9G,cAAc,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;qBAUR,OAAO,gBAAgB,EAAE,OAAO,KAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAU/C,MAAM,GAAC,SAAS;;AA1B9B;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,+CAwGC;IAxFC;;OAEG;IACH,IAFU,qBAAqB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEtD;IAEP;;OAEG;IACH,MAFU,qBAAqB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEpD;IAET;;OAEG;IACH,IAFU,qBAAqB,IAAI,CAAC,CAE7B;IAEP;;;OAGG;IACH,sBAAkD;IAMlD;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,kBAAuE;IAEvE;;;OAGG;IACH,kBAAiC;IAEjC;;;OAGG;IACH,yBAA6B;IAE7B;;;OAGG;IACH,uBAA+B;IAE/B;;;OAGG;IACH,sBAAuB;IAMvB;;;OAGG;IACH,kBAAqC;IAErC;;;OAGG;IACH,uBAAwC;IAExC;;;OAGG;IACH,sBAA0C;IAE1C;;;OAGG;IACH,aAAoC;IAGtC;;;;;;OAMG;IACH,YALY,KAAK,CAOhB;IAED;;OAEG;IACH,4BAEC;IAED;;;;;OAKG;IACH,gBAJW,KAAK,QAMf;IAED;;;;OAIG;IACH,YAHW,MAAM,GAAC,SAAS,QAK1B;IAED;;OAEG;IACH,uBAsIC;IAED;;;;;;OAMG;IACH,uBA+DC;IAED;;;;;OAKG;IACH,uBAJW,MAAM,KACN,MAAM,GACL,MAAM,CAejB;IAED;;;;;;;;OAQG;IACH,kBAPW,MAAM,SACN,MAAM,UACN,OAAO,SACP,MAAM,UACN,MAAM,GACL,MAAM,CA4BjB;IAED;;;OAGG;IACH,yBAFY,MAAM,CAYjB;CAgBF"}
1
+ {"version":3,"file":"ScaleLine.d.ts","sourceRoot":"","sources":["ScaleLine.js"],"names":[],"mappings":";;;;oBAca,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI;;;;2CAkBrD,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,GAC1E,cAAoB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC9D,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GAC9G,cAAc,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;qBAUR,OAAO,gBAAgB,EAAE,OAAO,KAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAU/C,MAAM,GAAC,SAAS;;AA1B9B;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,+CAwGC;IAxFC;;OAEG;IACH,IAFU,qBAAqB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEtD;IAEP;;OAEG;IACH,MAFU,qBAAqB,OAAO,WAAW,EAAE,SAAS,CAAC,CAEpD;IAET;;OAEG;IACH,IAFU,qBAAqB,IAAI,CAAC,CAE7B;IAEP;;;OAGG;IACH,sBAAkD;IAMlD;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,kBAAuE;IAEvE;;;OAGG;IACH,kBAAiC;IAEjC;;;OAGG;IACH,yBAA6B;IAE7B;;;OAGG;IACH,uBAA+B;IAE/B;;;OAGG;IACH,sBAAuB;IAMvB;;;OAGG;IACH,kBAAqC;IAErC;;;OAGG;IACH,uBAAwC;IAExC;;;OAGG;IACH,sBAA0C;IAE1C;;;OAGG;IACH,aAAoC;IAGtC;;;;;;OAMG;IACH,YALY,KAAK,CAOhB;IAED;;OAEG;IACH,4BAEC;IAED;;;;;OAKG;IACH,gBAJW,KAAK,QAMf;IAED;;;;OAIG;IACH,YAHW,MAAM,GAAC,SAAS,QAK1B;IAED;;OAEG;IACH,uBAqIC;IAED;;;;;;OAMG;IACH,uBA+DC;IAED;;;;;OAKG;IACH,uBAJW,MAAM,KACN,MAAM,GACL,MAAM,CAejB;IAED;;;;;;;;OAQG;IACH,kBAPW,MAAM,SACN,MAAM,UACN,OAAO,SACP,MAAM,UACN,MAAM,GACL,MAAM,CA4BjB;IAED;;;OAGG;IACH,yBAFY,MAAM,CAYjB;CAgBF"}
@@ -2,7 +2,6 @@
2
2
  * @module ol/control/ScaleLine
3
3
  */
4
4
  import Control from './Control.js';
5
- import ProjUnits from '../proj/Units.js';
6
5
  import {CLASS_UNSELECTABLE} from '../css.js';
7
6
  import {METERS_PER_UNIT, getPointResolution} from '../proj.js';
8
7
  import {assert} from '../asserts.js';
@@ -237,8 +236,7 @@ class ScaleLine extends Control {
237
236
  const center = viewState.center;
238
237
  const projection = viewState.projection;
239
238
  const units = this.getUnits();
240
- const pointResolutionUnits =
241
- units == 'degrees' ? ProjUnits.DEGREES : ProjUnits.METERS;
239
+ const pointResolutionUnits = units == 'degrees' ? 'degrees' : 'm';
242
240
  let pointResolution = getPointResolution(
243
241
  projection,
244
242
  viewState.resolution,
@@ -257,7 +255,7 @@ class ScaleLine extends Control {
257
255
  let nominalCount = minWidth * pointResolution;
258
256
  let suffix = '';
259
257
  if (units == 'degrees') {
260
- const metersPerDegree = METERS_PER_UNIT[ProjUnits.DEGREES];
258
+ const metersPerDegree = METERS_PER_UNIT.degrees;
261
259
  nominalCount *= metersPerDegree;
262
260
  if (nominalCount < metersPerDegree / 60) {
263
261
  suffix = '\u2033'; // seconds
@@ -498,7 +496,7 @@ class ScaleLine extends Control {
498
496
  this.viewState_.projection,
499
497
  this.viewState_.resolution,
500
498
  this.viewState_.center,
501
- ProjUnits.METERS
499
+ 'm'
502
500
  );
503
501
  const dpi = this.dpi_ || DEFAULT_DPI;
504
502
  const inchesPerMeter = 1000 / 25.4;
@@ -1 +1 @@
1
- {"version":3,"file":"Feature.d.ts","sourceRoot":"","sources":["Feature.js"],"names":[],"mappings":"AAuOA;;;;;GAKG;AACH,uDALW,OAAO,qBAAqB,EAAE,OAAO,SACrC,OAAO,yDAEN,OAAO,qBAAqB,EAAE,OAAO,CAiDhD;AAED;;;;GAIG;AACH,mDAJW,OAAO,cAAc,EAAE,MAAM,0CAE5B,OAAO,cAAc,EAAE,MAAM,CAmBxC;;;;;;;;;;qBAvSa,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;wBASnC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;qBAOnC,OAAO,YAAY,EAAE,cAAc;;;;;;wBAInC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;mBAoBpC,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK;AA1CpD;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;GAEG;AAEH;;;;;;;;;;;GAWG;AACH;IAEI;;;OAGG;IACH,0BAFU,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAE5B;IAE/B;;;OAGG;IACH,oCAFU,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAElB;IAEzC;;;OAGG;IACH,qBAFU,MAAM,MAAM,CAAC,CAEQ;IAGjC;;;;;;OAMG;IACH,iCALW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,WAAW,GAAC,SAAS,CAuBhC;IAED;;;;;;;;OAQG;IACH,gCANW,YAAY,GAAC,WAAW,GAAC,SAAS,GAGjC,YAAY,GAAC,WAAW,GAAC,SAAS,CAW7C;IAED;;;OAGG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;OAOG;IACH,oBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,OAAO,eAAe,EAAE,WAAW,CAI9C;IAED;;;;;;;OAOG;IACH,qBAJW,QAAQ,GAAC,OAAO,GAAC,WAAW,SAAQ,MAAM,0CAEzC,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAIrD;IAED;;;;;;;OAOG;IACH,qBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAED;;;;;;OAMG;IACH,uBAHW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAI5D;IAED;;;;;;;OAOG;IACH,sBAJW,OAAO,eAAe,EAAE,OAAO,2CAE9B,MAAM,GAAC,WAAW,CAI7B;IAED;;;;;;;OAOG;IACH,wBAJW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,2CAErC,MAAM,GAAC,WAAW,CAI7B;IAED;;;;;;;OAOG;IACH,wBAJW,OAAO,qBAAqB,EAAE,OAAO,2CAEpC,MAAM,GAAC,WAAW,CAI7B;CACF"}
1
+ {"version":3,"file":"Feature.d.ts","sourceRoot":"","sources":["Feature.js"],"names":[],"mappings":"AAsOA;;;;;GAKG;AACH,uDALW,OAAO,qBAAqB,EAAE,OAAO,SACrC,OAAO,yDAEN,OAAO,qBAAqB,EAAE,OAAO,CAiDhD;AAED;;;;GAIG;AACH,mDAJW,OAAO,cAAc,EAAE,MAAM,0CAE5B,OAAO,cAAc,EAAE,MAAM,CAmBxC;;;;;;;;;;qBAvSa,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;wBASnC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;qBAOnC,OAAO,YAAY,EAAE,cAAc;;;;;;wBAInC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;mBAoBpC,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK;AA1CpD;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;GAEG;AAEH;;;;;;;;;;;GAWG;AACH;IAEI;;;OAGG;IACH,0BAFU,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAE5B;IAE/B;;;OAGG;IACH,oCAFU,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAElB;IAEzC;;;OAGG;IACH,qBAFU,MAAM,MAAM,CAAC,CAEQ;IAGjC;;;;;;OAMG;IACH,iCALW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,WAAW,GAAC,SAAS,CAuBhC;IAED;;;;;;;;OAQG;IACH,gCANW,YAAY,GAAC,WAAW,GAAC,SAAS,GAGjC,YAAY,GAAC,WAAW,GAAC,SAAS,CAW7C;IAED;;;OAGG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;OAOG;IACH,oBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,OAAO,eAAe,EAAE,WAAW,CAI9C;IAED;;;;;;;OAOG;IACH,qBAJW,QAAQ,GAAC,OAAO,GAAC,WAAW,SAAQ,MAAM,0CAEzC,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAIrD;IAED;;;;;;;OAOG;IACH,qBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,0CAE7B,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAED;;;;;;OAMG;IACH,uBAHW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAI5D;IAED;;;;;;;OAOG;IACH,sBAJW,OAAO,eAAe,EAAE,OAAO,2CAE9B,MAAM,GAAC,WAAW,CAI7B;IAED;;;;;;;OAOG;IACH,wBAJW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,2CAErC,MAAM,GAAC,WAAW,CAI7B;IAED;;;;;;;OAOG;IACH,wBAJW,OAAO,qBAAqB,EAAE,OAAO,2CAEpC,MAAM,GAAC,WAAW,CAI7B;CACF"}
package/format/Feature.js CHANGED
@@ -1,7 +1,6 @@
1
1
  /**
2
2
  * @module ol/format/Feature
3
3
  */
4
- import Units from '../proj/Units.js';
5
4
  import {abstract} from '../util.js';
6
5
  import {
7
6
  equivalent as equivalentProjection,
@@ -103,7 +102,7 @@ class FeatureFormat {
103
102
  if (
104
103
  opt_options.extent &&
105
104
  dataProjection &&
106
- dataProjection.getUnits() === Units.TILE_PIXELS
105
+ dataProjection.getUnits() === 'tile-pixels'
107
106
  ) {
108
107
  dataProjection = getProjection(dataProjection);
109
108
  dataProjection.setWorldExtent(opt_options.extent);
@@ -1 +1 @@
1
- {"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,+CAiDC;IA5CC;;OAEG;IACH,gBAFU,UAAU,CAKlB;IAEF;;;OAGG;IACH,sBAEiB;IAEjB;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAsEC;IASD;;;;;;;OAOG;IACH,qBALW,WAAW,iEAEV,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAkCrD;IAED;;;;;;OAMG;IACH,uBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;OAIG;IACH,kBAHW,MAAM,MAAM,CAAC,QAKvB;CACF"}
1
+ {"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,+CAiDC;IA5CC;;OAEG;IACH,gBAFU,UAAU,CAKlB;IAEF;;;OAGG;IACH,sBAEiB;IAEjB;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAsEC;IASD;;;;;;;OAOG;IACH,qBALW,WAAW,iEAEV,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAkCrD;IAED;;;;;;OAMG;IACH,uBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;OAIG;IACH,kBAHW,MAAM,MAAM,CAAC,QAKvB;CACF"}
package/format/MVT.js CHANGED
@@ -13,7 +13,6 @@ import Point from '../geom/Point.js';
13
13
  import Polygon from '../geom/Polygon.js';
14
14
  import Projection from '../proj/Projection.js';
15
15
  import RenderFeature from '../render/Feature.js';
16
- import Units from '../proj/Units.js';
17
16
  import {assert} from '../asserts.js';
18
17
  import {get} from '../proj.js';
19
18
  import {inflateEnds} from '../geom/flat/orient.js';
@@ -52,7 +51,7 @@ class MVT extends FeatureFormat {
52
51
  */
53
52
  this.dataProjection = new Projection({
54
53
  code: '',
55
- units: Units.TILE_PIXELS,
54
+ units: 'tile-pixels',
56
55
  });
57
56
 
58
57
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"Geometry.d.ts","sourceRoot":"","sources":["Geometry.js"],"names":[],"mappings":";;;;;6BAqBa,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM;;;;;;mBAM7B,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ;AAWpJ;;;;;;;;;;;GAWG;AACH;IACE,cA+CC;IA5CC;;;OAGG;IACH,gBAA4B;IAE5B;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,oDAFU,MAAM,CAEiC;IAEjD;;;OAGG;IACH,sCAFU,MAAM,CAEmB;IAEnC;;;;;;;OAOG;IACH,qDAWE;IAGJ;;;;;;OAMG;IACH,sCAJW,MAAM,uEAEL,QAAQ,CAQnB;IAED;;;;OAIG;IACH,SAFa,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,kBANW,MAAM,KACN,MAAM,gBACN,OAAO,kBAAkB,EAAE,UAAU,sBACrC,MAAM,GACL,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAJW,MAAM,KACN,MAAM,GACL,OAAO,CAKlB;IAED;;;;;;;OAOG;IACH,uBALW,OAAO,kBAAkB,EAAE,UAAU,yEAEpC,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;;;OAMG;IACH,iCAJW,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,CAKlB;IAED;;;;;OAKG;IACH,gCAJW,OAAO,cAAc,EAAE,MAAM,GAE5B,OAAO,cAAc,EAAE,MAAM,CAIxC;IAED;;;;;OAKG;IACH,mEAHY,OAAO,cAAc,EAAE,MAAM,CAYxC;IAED;;;;;;;OAOG;IACH,cAJW,MAAM,UACN,OAAO,kBAAkB,EAAE,UAAU,QAK/C;IAED;;;;;;;;;OASG;IACH,UANW,MAAM,qGAQhB;IAED;;;;;;;;OAQG;IACH,oBAJW,MAAM,GACL,QAAQ,CAKnB;IAED;;;;;;;OAOG;IACH,wCAHW,MAAM,GACL,QAAQ,CAInB;IAED;;;;OAIG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;;OAQG;IACH,4BAHW,OAAO,YAAY,EAAE,iBAAiB,QAKhD;IAED;;;;;OAKG;IACH,yBAHW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,CAIlB;IAED;;;;;;;OAOG;IACH,kBAJW,MAAM,UACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,kBARW,OAAO,YAAY,EAAE,cAAc,eAEnC,OAAO,YAAY,EAAE,cAAc,GAElC,QAAQ,CAwCnB;CACF"}
1
+ {"version":3,"file":"Geometry.d.ts","sourceRoot":"","sources":["Geometry.js"],"names":[],"mappings":";;;;;6BAoBa,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM;;;;;;mBAM7B,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ;AAWpJ;;;;;;;;;;;GAWG;AACH;IACE,cA+CC;IA5CC;;;OAGG;IACH,gBAA4B;IAE5B;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,oDAFU,MAAM,CAEiC;IAEjD;;;OAGG;IACH,sCAFU,MAAM,CAEmB;IAEnC;;;;;;;OAOG;IACH,qDAWE;IAGJ;;;;;;OAMG;IACH,sCAJW,MAAM,uEAEL,QAAQ,CAQnB;IAED;;;;OAIG;IACH,SAFa,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,kBANW,MAAM,KACN,MAAM,gBACN,OAAO,kBAAkB,EAAE,UAAU,sBACrC,MAAM,GACL,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAJW,MAAM,KACN,MAAM,GACL,OAAO,CAKlB;IAED;;;;;;;OAOG;IACH,uBALW,OAAO,kBAAkB,EAAE,UAAU,yEAEpC,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;;;OAMG;IACH,iCAJW,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,CAKlB;IAED;;;;;OAKG;IACH,gCAJW,OAAO,cAAc,EAAE,MAAM,GAE5B,OAAO,cAAc,EAAE,MAAM,CAIxC;IAED;;;;;OAKG;IACH,mEAHY,OAAO,cAAc,EAAE,MAAM,CAYxC;IAED;;;;;;;OAOG;IACH,cAJW,MAAM,UACN,OAAO,kBAAkB,EAAE,UAAU,QAK/C;IAED;;;;;;;;;OASG;IACH,UANW,MAAM,qGAQhB;IAED;;;;;;;;OAQG;IACH,oBAJW,MAAM,GACL,QAAQ,CAKnB;IAED;;;;;;;OAOG;IACH,wCAHW,MAAM,GACL,QAAQ,CAInB;IAED;;;;OAIG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;;OAQG;IACH,4BAHW,OAAO,YAAY,EAAE,iBAAiB,QAKhD;IAED;;;;;OAKG;IACH,yBAHW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,CAIlB;IAED;;;;;;;OAOG;IACH,kBAJW,MAAM,UACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,kBARW,OAAO,YAAY,EAAE,cAAc,eAEnC,OAAO,YAAY,EAAE,cAAc,GAElC,QAAQ,CAwCnB;CACF"}
package/geom/Geometry.js CHANGED
@@ -2,7 +2,6 @@
2
2
  * @module ol/geom/Geometry
3
3
  */
4
4
  import BaseObject from '../Object.js';
5
- import Units from '../proj/Units.js';
6
5
  import {abstract} from '../util.js';
7
6
  import {
8
7
  compose as composeTransform,
@@ -310,7 +309,7 @@ class Geometry extends BaseObject {
310
309
  /** @type {import("../proj/Projection.js").default} */
311
310
  const sourceProj = getProjection(source);
312
311
  const transformFn =
313
- sourceProj.getUnits() == Units.TILE_PIXELS
312
+ sourceProj.getUnits() == 'tile-pixels'
314
313
  ? function (inCoordinates, outCoordinates, stride) {
315
314
  const pixelExtent = sourceProj.getExtent();
316
315
  const projectedExtent = sourceProj.getWorldExtent();
@@ -1,9 +1,5 @@
1
- export type Mode = string;
2
- export namespace Mode {
3
- const TRACKPAD: string;
4
- const WHEEL: string;
5
- }
6
1
  export default MouseWheelZoom;
2
+ export type Mode = 'trackpad' | 'wheel';
7
3
  export type Options = {
8
4
  /**
9
5
  * A function that
@@ -42,6 +38,9 @@ export type Options = {
42
38
  */
43
39
  constrainResolution?: boolean | undefined;
44
40
  };
41
+ /**
42
+ * @typedef {'trackpad' | 'wheel'} Mode
43
+ */
45
44
  /**
46
45
  * @typedef {Object} Options
47
46
  * @property {import("../events/condition.js").Condition} [condition] A function that
@@ -1 +1 @@
1
- {"version":3,"file":"MouseWheelZoom.d.ts","sourceRoot":"","sources":["MouseWheelZoom.js"],"names":[],"mappings":"mBAUU,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOhB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,+CAyGC;IAlGC;;;OAGG;IACH,oBAAoB;IAEpB;;;OAGG;IACH,mBAAmB;IAEnB;;;OAGG;IACH,kBAAsE;IAEtE;;;OAGG;IACH,kBAAwE;IAExE;;;OAGG;IACH,iBAAoE;IAEpE;;;OAGG;IACH,mBAC4D;IAE5D;;;OAGG;IACH,6BAGW;IAIX;;;OAGG;IACH,mBAEa;IAEb;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,mBAAe;IAEf;;;OAGG;IACH,cAAsB;IAEtB;;;;OAIG;IACH,mBAFU,MAAM,CAEY;IAE5B;;OAEG;IACH,4BAAuB;IAEvB;;;;OAIG;IACH,sBAAwB;IAG1B;;OAEG;IACH,wBAYC;IA2FD;;;OAGG;IACH,yBAsBC;IAED;;;;;OAKG;IACH,0BAJW,OAAO,QASjB;CACF"}
1
+ {"version":3,"file":"MouseWheelZoom.d.ts","sourceRoot":"","sources":["MouseWheelZoom.js"],"names":[],"mappings":";mBAUa,UAAU,GAAG,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AADjC;;GAEG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,+CAyGC;IAlGC;;;OAGG;IACH,oBAAoB;IAEpB;;;OAGG;IACH,mBAAmB;IAEnB;;;OAGG;IACH,kBAAsE;IAEtE;;;OAGG;IACH,kBAAwE;IAExE;;;OAGG;IACH,iBAAoE;IAEpE;;;OAGG;IACH,mBAC4D;IAE5D;;;OAGG;IACH,6BAGW;IAIX;;;OAGG;IACH,mBAEa;IAEb;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,mBAAe;IAEf;;;OAGG;IACH,cAAsB;IAEtB;;;;OAIG;IACH,mBAFU,MAAM,CAEY;IAE5B;;OAEG;IACH,4BAAuB;IAEvB;;;;OAIG;IACH,sBAAwB;IAG1B;;OAEG;IACH,wBAYC;IA2FD;;;OAGG;IACH,yBAsBC;IAED;;;;;OAKG;IACH,0BAJW,OAAO,QASjB;CACF"}
@@ -8,12 +8,8 @@ import {all, always, focusWithTabindex} from '../events/condition.js';
8
8
  import {clamp} from '../math.js';
9
9
 
10
10
  /**
11
- * @enum {string}
11
+ * @typedef {'trackpad' | 'wheel'} Mode
12
12
  */
13
- export const Mode = {
14
- TRACKPAD: 'trackpad',
15
- WHEEL: 'wheel',
16
- };
17
13
 
18
14
  /**
19
15
  * @typedef {Object} Options
@@ -218,12 +214,12 @@ class MouseWheelZoom extends Interaction {
218
214
  }
219
215
 
220
216
  if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) {
221
- this.mode_ = Math.abs(delta) < 4 ? Mode.TRACKPAD : Mode.WHEEL;
217
+ this.mode_ = Math.abs(delta) < 4 ? 'trackpad' : 'wheel';
222
218
  }
223
219
 
224
220
  const view = map.getView();
225
221
  if (
226
- this.mode_ === Mode.TRACKPAD &&
222
+ this.mode_ === 'trackpad' &&
227
223
  !(view.getConstrainResolution() || this.constrainResolution_)
228
224
  ) {
229
225
  if (this.trackpadTimeoutId_) {
package/interaction.d.ts CHANGED
@@ -57,6 +57,7 @@ export { default as Extent } from "./interaction/Extent.js";
57
57
  export { default as Interaction } from "./interaction/Interaction.js";
58
58
  export { default as KeyboardPan } from "./interaction/KeyboardPan.js";
59
59
  export { default as KeyboardZoom } from "./interaction/KeyboardZoom.js";
60
+ export { default as Link } from "./interaction/Link.js";
60
61
  export { default as Modify } from "./interaction/Modify.js";
61
62
  export { default as MouseWheelZoom } from "./interaction/MouseWheelZoom.js";
62
63
  export { default as PinchRotate } from "./interaction/PinchRotate.js";
@@ -1 +1 @@
1
- {"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["interaction.js"],"names":[],"mappings":"AAoCA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qEALY,OAAO,iBAAiB,EAAE,OAAO,CAAC,OAAO,8BAA8B,EAAE,OAAO,CAAC,CAyF5F"}
1
+ {"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["interaction.js"],"names":[],"mappings":"AAqCA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qEALY,OAAO,iBAAiB,EAAE,OAAO,CAAC,OAAO,8BAA8B,EAAE,OAAO,CAAC,CAyF5F"}
package/interaction.js CHANGED
@@ -25,6 +25,7 @@ export {default as Extent} from './interaction/Extent.js';
25
25
  export {default as Interaction} from './interaction/Interaction.js';
26
26
  export {default as KeyboardPan} from './interaction/KeyboardPan.js';
27
27
  export {default as KeyboardZoom} from './interaction/KeyboardZoom.js';
28
+ export {default as Link} from './interaction/Link.js';
28
29
  export {default as Modify} from './interaction/Modify.js';
29
30
  export {default as MouseWheelZoom} from './interaction/MouseWheelZoom.js';
30
31
  export {default as PinchRotate} from './interaction/PinchRotate.js';
@@ -85,7 +85,7 @@ export type Options<VectorSourceType extends import("../source/Vector.js").defau
85
85
  * features that have their own style will be rendered. See {@link module :ol/style/Style~Style} for the default style
86
86
  * which will be used if this is not set.
87
87
  */
88
- style?: import("../style/Style.js").StyleLike | null | undefined;
88
+ style?: import("../style/Style.js").StyleLike | import("../style/flat.js").FlatStyleLike | null | undefined;
89
89
  /**
90
90
  * Background color for the layer. If not specified, no background
91
91
  * will be rendered.
@@ -211,11 +211,16 @@ declare class BaseVectorLayer<VectorSourceType extends import("../source/Vector.
211
211
  * an array of styles. If set to `null`, the layer has no style (a `null` style),
212
212
  * so only features that have their own styles will be rendered in the layer. Call
213
213
  * `setStyle()` without arguments to reset to the default style. See
214
- * {@link module:ol/style/Style~Style} for information on the default style.
215
- * @param {import("../style/Style.js").StyleLike|null} [opt_style] Layer style.
214
+ * [the ol/style/Style module]{@link module:ol/style/Style~Style} for information on the default style.
215
+ *
216
+ * If your layer has a static style, you can use "flat" style object literals instead of
217
+ * using the `Style` and symbolizer constructors (`Fill`, `Stroke`, etc.). See the documentation
218
+ * for the [flat style types]{@link module:ol/style/flat~FlatStyle} to see what properties are supported.
219
+ *
220
+ * @param {import("../style/Style.js").StyleLike|import("../style/flat.js").FlatStyleLike|null} [opt_style] Layer style.
216
221
  * @api
217
222
  */
218
- setStyle(opt_style?: import("../style/Style.js").StyleLike | null | undefined): void;
223
+ setStyle(opt_style?: import("../style/Style.js").StyleLike | import("../style/flat.js").FlatStyleLike | null | undefined): void;
219
224
  }
220
225
  import Layer from "./Layer.js";
221
226
  //# sourceMappingURL=BaseVector.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BaseVector.d.ts","sourceRoot":"","sources":["BaseVector.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyEA;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,iEA0DC;IA/CC;;;OAGG;IACH,mBAC6D;IAE7D;;;OAGG;IACH,sBACiE;IAEjE;;;;OAIG;IACH,eAAkB;IAElB;;;;OAIG;IACH,uBAA+B;IAI/B;;;OAGG;IACH,8BAGW;IAEX;;;OAGG;IACH,gCAGW;IAGb;;OAEG;IACH,gBAFY,OAAO,CAIlB;IAoBD;;OAEG;IACH,mBAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;;OAGG;IACH,yBAHqB,OAAO,eAAe,EAAE,OAAO,QAAE,OAAO,eAAe,EAAE,OAAO,KAAG,MAAM,GAAC,IAAI,GAAC,SAAS,CAO5G;IAED;;;;;OAKG;IACH,YAHY,OAAO,mBAAmB,EAAE,SAAS,GAAC,IAAI,GAAC,SAAS,CAK/D;IAED;;;;OAIG;IACH,oBAHY,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAK9D;IAED;;;OAGG;IACH,2BAHY,OAAO,CAKlB;IAED;;;OAGG;IACH,6BAHY,OAAO,CAKlB;IAED;;;OAGG;IACH,4BAFW,OAAO,oBAAoB,EAAE,UAAU,QAOjD;IAED;;;OAGG;IACH,4BAHW,OAAO,cAAc,EAAE,aAAa,GAAC,IAAI,GAAC,SAAS,QAK7D;IAED;;;;;;;;;OASG;IACH,qFAKC;CACF"}
1
+ {"version":3,"file":"BaseVector.d.ts","sourceRoot":"","sources":["BaseVector.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0EA;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,iEA0DC;IA/CC;;;OAGG;IACH,mBAC6D;IAE7D;;;OAGG;IACH,sBACiE;IAEjE;;;;OAIG;IACH,eAAkB;IAElB;;;;OAIG;IACH,uBAA+B;IAI/B;;;OAGG;IACH,8BAGW;IAEX;;;OAGG;IACH,gCAGW;IAGb;;OAEG;IACH,gBAFY,OAAO,CAIlB;IAoBD;;OAEG;IACH,mBAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;;OAGG;IACH,yBAHqB,OAAO,eAAe,EAAE,OAAO,QAAE,OAAO,eAAe,EAAE,OAAO,KAAG,MAAM,GAAC,IAAI,GAAC,SAAS,CAO5G;IAED;;;;;OAKG;IACH,YAHY,OAAO,mBAAmB,EAAE,SAAS,GAAC,IAAI,GAAC,SAAS,CAK/D;IAED;;;;OAIG;IACH,oBAHY,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAK9D;IAED;;;OAGG;IACH,2BAHY,OAAO,CAKlB;IAED;;;OAGG;IACH,6BAHY,OAAO,CAKlB;IAED;;;OAGG;IACH,4BAFW,OAAO,oBAAoB,EAAE,UAAU,QAOjD;IAED;;;OAGG;IACH,4BAHW,OAAO,cAAc,EAAE,aAAa,GAAC,IAAI,GAAC,SAAS,QAK7D;IAED;;;;;;;;;;;;;;OAcG;IACH,gIAuCC;CACF"}
@@ -3,10 +3,11 @@
3
3
  */
4
4
  import Layer from './Layer.js';
5
5
  import RBush from 'rbush';
6
- import {
6
+ import Style, {
7
7
  createDefaultStyle,
8
8
  toFunction as toStyleFunction,
9
9
  } from '../style/Style.js';
10
+ import {toStyle} from '../style/flat.js';
10
11
 
11
12
  /**
12
13
  * @template {import("../source/Vector.js").default|import("../source/VectorTile.js").default} VectorSourceType
@@ -49,7 +50,7 @@ import {
49
50
  * the fill and stroke styles of all of those layers regardless of z-index. To opt out of this
50
51
  * behavior and place declutterd features with their own layer configure the layer with a `className`
51
52
  * other than `ol-layer`.
52
- * @property {import("../style/Style.js").StyleLike|null} [style] Layer style. When set to `null`, only
53
+ * @property {import("../style/Style.js").StyleLike|import("../style/flat.js").FlatStyleLike|null} [style] Layer style. When set to `null`, only
53
54
  * features that have their own style will be rendered. See {@link module:ol/style/Style~Style} for the default style
54
55
  * which will be used if this is not set.
55
56
  * @property {import("./Base.js").BackgroundColor} [background] Background color for the layer. If not specified, no background
@@ -249,12 +250,51 @@ class BaseVectorLayer extends Layer {
249
250
  * an array of styles. If set to `null`, the layer has no style (a `null` style),
250
251
  * so only features that have their own styles will be rendered in the layer. Call
251
252
  * `setStyle()` without arguments to reset to the default style. See
252
- * {@link module:ol/style/Style~Style} for information on the default style.
253
- * @param {import("../style/Style.js").StyleLike|null} [opt_style] Layer style.
253
+ * [the ol/style/Style module]{@link module:ol/style/Style~Style} for information on the default style.
254
+ *
255
+ * If your layer has a static style, you can use "flat" style object literals instead of
256
+ * using the `Style` and symbolizer constructors (`Fill`, `Stroke`, etc.). See the documentation
257
+ * for the [flat style types]{@link module:ol/style/flat~FlatStyle} to see what properties are supported.
258
+ *
259
+ * @param {import("../style/Style.js").StyleLike|import("../style/flat.js").FlatStyleLike|null} [opt_style] Layer style.
254
260
  * @api
255
261
  */
256
262
  setStyle(opt_style) {
257
- this.style_ = opt_style !== undefined ? opt_style : createDefaultStyle;
263
+ /**
264
+ * @type {import("../style/Style.js").StyleLike|null}
265
+ */
266
+ let style;
267
+
268
+ if (opt_style === undefined) {
269
+ style = createDefaultStyle;
270
+ } else if (opt_style === null) {
271
+ style = null;
272
+ } else if (typeof opt_style === 'function') {
273
+ style = opt_style;
274
+ } else if (opt_style instanceof Style) {
275
+ style = opt_style;
276
+ } else if (Array.isArray(opt_style)) {
277
+ const len = opt_style.length;
278
+
279
+ /**
280
+ * @type {Array<Style>}
281
+ */
282
+ const styles = new Array(len);
283
+
284
+ for (let i = 0; i < len; ++i) {
285
+ const s = opt_style[i];
286
+ if (s instanceof Style) {
287
+ styles[i] = s;
288
+ } else {
289
+ styles[i] = toStyle(s);
290
+ }
291
+ }
292
+ style = styles;
293
+ } else {
294
+ style = toStyle(opt_style);
295
+ }
296
+
297
+ this.style_ = style;
258
298
  this.styleFunction_ =
259
299
  opt_style === null ? undefined : toStyleFunction(this.style_);
260
300
  this.changed();
@@ -113,7 +113,7 @@ export type Options = {
113
113
  * tile layers with only a few rendered features (e.g. for highlighting a subset of features of
114
114
  * another layer with the same source).
115
115
  */
116
- renderMode?: any | string;
116
+ renderMode?: import("../layer/VectorTile.js").VectorTileRenderType | undefined;
117
117
  /**
118
118
  * Sets the layer as overlay on a map. The map will not manage
119
119
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
@@ -204,7 +204,7 @@ export type Options = {
204
204
  * Recommended value: Vector tiles are usually generated with a buffer, so this value should match
205
205
  * the largest possible buffer of the used tiles. It should be at least the size of the largest
206
206
  * point symbol or line width.
207
- * @property {import("./VectorTileRenderType.js").default|string} [renderMode='hybrid'] Render mode for vector tiles:
207
+ * @property {import("./VectorTile.js").VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
208
208
  * * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
209
209
  * animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
210
210
  * rotated views.
@@ -1 +1 @@
1
- {"version":3,"file":"MapboxVector.d.ts","sourceRoot":"","sources":["MapboxVector.js"],"names":[],"mappings":";;;;;;;cA8Bc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqDN,MAA4C,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAvDhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;IACE;;;OAGG;IACH,qBAHW,OAAO,EAqDjB;IAnBG,gCAAsC;CAoB3C"}
1
+ {"version":3,"file":"MapboxVector.d.ts","sourceRoot":"","sources":["MapboxVector.js"],"names":[],"mappings":";;;;;;;cA8Bc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAFpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;IACE;;;OAGG;IACH,qBAHW,OAAO,EAqDjB;IAnBG,gCAAsC;CAoB3C"}
@@ -81,7 +81,7 @@ class ErrorEvent extends BaseEvent {
81
81
  * Recommended value: Vector tiles are usually generated with a buffer, so this value should match
82
82
  * the largest possible buffer of the used tiles. It should be at least the size of the largest
83
83
  * point symbol or line width.
84
- * @property {import("./VectorTileRenderType.js").default|string} [renderMode='hybrid'] Render mode for vector tiles:
84
+ * @property {import("./VectorTile.js").VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
85
85
  * * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
86
86
  * animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
87
87
  * rotated views.
@@ -3,6 +3,7 @@ export default VectorTileLayer;
3
3
  * *
4
4
  */
5
5
  export type VectorTileLayerOnSignature<Return> = import("../Observable").OnSignature<import("../Observable").EventTypes, import("../events/Event.js").default, Return> & import("../Observable").OnSignature<import("./Base").BaseLayerObjectEventTypes | 'change:source' | 'change:preload' | 'change:useInterimTilesOnError', import("../Object").ObjectEvent, Return> & import("../Observable").OnSignature<import("../render/EventType").LayerRenderEventTypes, import("../render/Event").default, Return> & import("../Observable").CombinedOnSignature<import("../Observable").EventTypes | import("./Base").BaseLayerObjectEventTypes | 'change:source' | 'change:preload' | 'change:useInterimTilesOnError' | import("../render/EventType").LayerRenderEventTypes, Return>;
6
+ export type VectorTileRenderType = 'hybrid' | 'vector';
6
7
  export type Options = {
7
8
  /**
8
9
  * A CSS class name to set to the layer element.
@@ -71,7 +72,7 @@ export type Options = {
71
72
  * tile layers with only a few rendered features (e.g. for highlighting a subset of features of
72
73
  * another layer with the same source).
73
74
  */
74
- renderMode?: any | string;
75
+ renderMode?: VectorTileRenderType | undefined;
75
76
  /**
76
77
  * Source.
77
78
  */
@@ -144,6 +145,9 @@ export type Options = {
144
145
  * import("../Observable").CombinedOnSignature<import("../Observable").EventTypes|import("./Base").BaseLayerObjectEventTypes|
145
146
  * 'change:source'|'change:preload'|'change:useInterimTilesOnError'|import("../render/EventType").LayerRenderEventTypes, Return>} VectorTileLayerOnSignature
146
147
  */
148
+ /**
149
+ * @typedef {'hybrid' | 'vector'} VectorTileRenderType
150
+ */
147
151
  /**
148
152
  * @typedef {Object} Options
149
153
  * @property {string} [className='ol-layer'] A CSS class name to set to the layer element.
@@ -171,7 +175,7 @@ export type Options = {
171
175
  * Recommended value: Vector tiles are usually generated with a buffer, so this value should match
172
176
  * the largest possible buffer of the used tiles. It should be at least the size of the largest
173
177
  * point symbol or line width.
174
- * @property {import("./VectorTileRenderType.js").default|string} [renderMode='hybrid'] Render mode for vector tiles:
178
+ * @property {VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
175
179
  * * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
176
180
  * animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
177
181
  * rotated views.
@@ -239,13 +243,13 @@ declare class VectorTileLayer extends BaseVectorLayer<import("../source/VectorTi
239
243
  un: VectorTileLayerOnSignature<void>;
240
244
  /**
241
245
  * @private
242
- * @type {import("./VectorTileRenderType.js").default}
246
+ * @type {VectorTileRenderType}
243
247
  */
244
248
  private renderMode_;
245
249
  /**
246
- * @return {import("./VectorTileRenderType.js").default} The render mode.
250
+ * @return {VectorTileRenderType} The render mode.
247
251
  */
248
- getRenderMode(): any;
252
+ getRenderMode(): VectorTileRenderType;
249
253
  /**
250
254
  * Return the level as number to which we will preload tiles up to.
251
255
  * @return {number} The level to preload tiles up to.
@@ -1 +1 @@
1
- {"version":3,"file":"VectorTile.d.ts","sourceRoot":"","sources":["VectorTile.js"],"names":[],"mappings":";;;;iDAWa,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,eAAqB,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAChH,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,eAAqB,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8BtH,MAA4C,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AArChE;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,+CAmEC;IAtDC;;OAEG;IACH,IAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE5D;IAEP;;OAEG;IACH,MAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAET;;OAEG;IACH,IAFU,2BAA2B,IAAI,CAAC,CAEnC;IAeP;;;OAGG;IACH,oBAA6B;IA8C/B;;OAEG;IACH,qBAEC;IAED;;;;;OAKG;IACH,cAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,6BAJY,OAAO,CAQlB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,kDAJW,OAAO,QAMjB;CACF"}
1
+ {"version":3,"file":"VectorTile.d.ts","sourceRoot":"","sources":["VectorTile.js"],"names":[],"mappings":";;;;iDAUa,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,eAAqB,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAChH,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,eAAqB,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;mCAIvH,QAAQ,GAAG,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXhC;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,+CA0DC;IA7CC;;OAEG;IACH,IAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE5D;IAEP;;OAEG;IACH,MAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAET;;OAEG;IACH,IAFU,2BAA2B,IAAI,CAAC,CAEnC;IAMP;;;OAGG;IACH,oBAA6B;IA8C/B;;OAEG;IACH,iBAFY,oBAAoB,CAI/B;IAED;;;;;OAKG;IACH,cAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,6BAJY,OAAO,CAQlB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,kDAJW,OAAO,QAMjB;CACF"}
@@ -4,7 +4,6 @@
4
4
  import BaseVectorLayer from './BaseVector.js';
5
5
  import CanvasVectorTileLayerRenderer from '../renderer/canvas/VectorTileLayer.js';
6
6
  import TileProperty from './TileProperty.js';
7
- import VectorTileRenderType from './VectorTileRenderType.js';
8
7
  import {assert} from '../asserts.js';
9
8
 
10
9
  /***
@@ -17,6 +16,10 @@ import {assert} from '../asserts.js';
17
16
  * 'change:source'|'change:preload'|'change:useInterimTilesOnError'|import("../render/EventType").LayerRenderEventTypes, Return>} VectorTileLayerOnSignature
18
17
  */
19
18
 
19
+ /**
20
+ * @typedef {'hybrid' | 'vector'} VectorTileRenderType
21
+ */
22
+
20
23
  /**
21
24
  * @typedef {Object} Options
22
25
  * @property {string} [className='ol-layer'] A CSS class name to set to the layer element.
@@ -44,7 +47,7 @@ import {assert} from '../asserts.js';
44
47
  * Recommended value: Vector tiles are usually generated with a buffer, so this value should match
45
48
  * the largest possible buffer of the used tiles. It should be at least the size of the largest
46
49
  * point symbol or line width.
47
- * @property {import("./VectorTileRenderType.js").default|string} [renderMode='hybrid'] Render mode for vector tiles:
50
+ * @property {VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
48
51
  * * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
49
52
  * animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
50
53
  * rotated views.
@@ -126,22 +129,13 @@ class VectorTileLayer extends BaseVectorLayer {
126
129
  */
127
130
  this.un;
128
131
 
129
- if (options.renderMode === VectorTileRenderType.IMAGE) {
130
- //FIXME deprecated - remove this check in v7.
131
- //eslint-disable-next-line
132
- console.warn('renderMode: "image" is deprecated. Option ignored.')
133
- options.renderMode = undefined;
134
- }
135
- const renderMode = options.renderMode || VectorTileRenderType.HYBRID;
136
- assert(
137
- renderMode == VectorTileRenderType.HYBRID ||
138
- renderMode == VectorTileRenderType.VECTOR,
139
- 28
140
- ); // `renderMode` must be `'hybrid'` or `'vector'`.
132
+ const renderMode = options.renderMode || 'hybrid';
133
+ // `renderMode` must be `'hybrid'` or `'vector'`.
134
+ assert(renderMode == 'hybrid' || renderMode == 'vector', 28);
141
135
 
142
136
  /**
143
137
  * @private
144
- * @type {import("./VectorTileRenderType.js").default}
138
+ * @type {VectorTileRenderType}
145
139
  */
146
140
  this.renderMode_ = renderMode;
147
141
 
@@ -190,7 +184,7 @@ class VectorTileLayer extends BaseVectorLayer {
190
184
  }
191
185
 
192
186
  /**
193
- * @return {import("./VectorTileRenderType.js").default} The render mode.
187
+ * @return {VectorTileRenderType} The render mode.
194
188
  */
195
189
  getRenderMode() {
196
190
  return this.renderMode_;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "7.0.0-dev.1659170210070",
3
+ "version": "7.0.0-dev.1659205470107",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
@@ -8,7 +8,7 @@ export type Options = {
8
8
  * Units. Required unless a
9
9
  * proj4 projection is defined for `code`.
10
10
  */
11
- units?: string | undefined;
11
+ units?: import("./Units.js").Units | undefined;
12
12
  /**
13
13
  * The validity extent for the SRS.
14
14
  */
@@ -23,7 +23,7 @@ export type Options = {
23
23
  global?: boolean | undefined;
24
24
  /**
25
25
  * The meters per unit for the SRS.
26
- * If not provided, the `units` are used to get the meters per unit from the {@link module :ol/proj/Units~METERS_PER_UNIT}lookup table.
26
+ * If not provided, the `units` are used to get the meters per unit from the {@link METERS_PER_UNIT }lookup table.
27
27
  */
28
28
  metersPerUnit?: number | undefined;
29
29
  /**
@@ -41,13 +41,13 @@ export type Options = {
41
41
  /**
42
42
  * @typedef {Object} Options
43
43
  * @property {string} code The SRS identifier code, e.g. `EPSG:4326`.
44
- * @property {import("./Units.js").default|string} [units] Units. Required unless a
44
+ * @property {import("./Units.js").Units} [units] Units. Required unless a
45
45
  * proj4 projection is defined for `code`.
46
46
  * @property {import("../extent.js").Extent} [extent] The validity extent for the SRS.
47
47
  * @property {string} [axisOrientation='enu'] The axis orientation as specified in Proj4.
48
48
  * @property {boolean} [global=false] Whether the projection is valid for the whole globe.
49
49
  * @property {number} [metersPerUnit] The meters per unit for the SRS.
50
- * If not provided, the `units` are used to get the meters per unit from the {@link module:ol/proj/Units~METERS_PER_UNIT}
50
+ * If not provided, the `units` are used to get the meters per unit from the {@link METERS_PER_UNIT}
51
51
  * lookup table.
52
52
  * @property {import("../extent.js").Extent} [worldExtent] The world extent for the SRS.
53
53
  * @property {function(number, import("../coordinate.js").Coordinate):number} [getPointResolution]
@@ -98,7 +98,7 @@ declare class Projection {
98
98
  * `this.extent_` and `this.worldExtent_` must be configured properly for each
99
99
  * tile.
100
100
  * @private
101
- * @type {import("./Units.js").default}
101
+ * @type {import("./Units.js").Units}
102
102
  */
103
103
  private units_;
104
104
  /**
@@ -165,10 +165,10 @@ declare class Projection {
165
165
  getExtent(): import("../extent.js").Extent;
166
166
  /**
167
167
  * Get the units of this projection.
168
- * @return {import("./Units.js").default} Units.
168
+ * @return {import("./Units.js").Units} Units.
169
169
  * @api
170
170
  */
171
- getUnits(): import("./Units.js").default;
171
+ getUnits(): import("./Units.js").Units;
172
172
  /**
173
173
  * Get the amount of meters per unit of this projection. If the projection is
174
174
  * not configured with `metersPerUnit` or a units identifier, the return is
@@ -1 +1 @@
1
- {"version":3,"file":"Projection.d.ts","sourceRoot":"","sources":["Projection.js"],"names":[],"mappings":";;;;;UAOc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAUG,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM;;AAZ5E;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAyEjB;IAtEC;;;OAGG;IACH,cAAyB;IAEzB;;;;;;OAMG;IACH,eAAyE;IAEzE;;;;;;OAMG;IACH,gBAAmE;IAEnE;;;;;;OAMG;IACH,qBACgE;IAEhE;;;OAGG;IACH,yBACyE;IAEzE;;;OAGG;IACH,gBAAoE;IAEpE;;;OAGG;IACH,kBAAiD;IAEjD;;;OAGG;IACH,gCAAyD;IAEzD;;;OAGG;IACH,yBAA4B;IAE5B;;;OAGG;IACH,uBAA2C;IAG7C;;OAEG;IACH,YAFY,OAAO,CAIlB;IAED;;;;OAIG;IACH,WAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;OAIG;IACH,YAHY,OAAO,YAAY,EAAE,OAAO,CAKvC;IAED;;;;;;OAMG;IACH,oBAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;OAIG;IACH,kBAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;;;;;;;OAUG;IACH,sBAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,YAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,kBAHW,OAAO,QAMjB;IAED;;OAEG;IACH,sBAFY,OAAO,yBAAyB,EAAE,OAAO,CAIpD;IAED;;OAEG;IACH,6BAFW,OAAO,yBAAyB,EAAE,OAAO,QAInD;IAED;;;;OAIG;IACH,kBAHW,OAAO,cAAc,EAAE,MAAM,QAMvC;IAED;;;;;OAKG;IACH,4BAJW,OAAO,cAAc,EAAE,MAAM,QAMvC;IAED;;;;;OAKG;IACH,mCAHoB,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM,QAKxE;IAED;;;;OAIG;IACH,iCAHqB,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM,GAAC,SAAS,CAKnF;CACF"}
1
+ {"version":3,"file":"Projection.d.ts","sourceRoot":"","sources":["Projection.js"],"names":[],"mappings":";;;;;UAOc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAUG,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM;;AAZ5E;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAyEjB;IAtEC;;;OAGG;IACH,cAAyB;IAEzB;;;;;;OAMG;IACH,eAAuE;IAEvE;;;;;;OAMG;IACH,gBAAmE;IAEnE;;;;;;OAMG;IACH,qBACgE;IAEhE;;;OAGG;IACH,yBACyE;IAEzE;;;OAGG;IACH,gBAAoE;IAEpE;;;OAGG;IACH,kBAAiD;IAEjD;;;OAGG;IACH,gCAAyD;IAEzD;;;OAGG;IACH,yBAA4B;IAE5B;;;OAGG;IACH,uBAA2C;IAG7C;;OAEG;IACH,YAFY,OAAO,CAIlB;IAED;;;;OAIG;IACH,WAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;OAIG;IACH,YAHY,OAAO,YAAY,EAAE,KAAK,CAKrC;IAED;;;;;;OAMG;IACH,oBAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;OAIG;IACH,kBAHY,OAAO,cAAc,EAAE,MAAM,CAKxC;IAED;;;;;;;;;;OAUG;IACH,sBAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,YAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,kBAHW,OAAO,QAMjB;IAED;;OAEG;IACH,sBAFY,OAAO,yBAAyB,EAAE,OAAO,CAIpD;IAED;;OAEG;IACH,6BAFW,OAAO,yBAAyB,EAAE,OAAO,QAInD;IAED;;;;OAIG;IACH,kBAHW,OAAO,cAAc,EAAE,MAAM,QAMvC;IAED;;;;;OAKG;IACH,4BAJW,OAAO,cAAc,EAAE,MAAM,QAMvC;IAED;;;;;OAKG;IACH,mCAHoB,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM,QAKxE;IAED;;;;OAIG;IACH,iCAHqB,MAAM,QAAE,OAAO,kBAAkB,EAAE,UAAU,KAAE,MAAM,GAAC,SAAS,CAKnF;CACF"}