ol 6.10.0 → 6.10.1-dev.1640988064340

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.
@@ -457,11 +457,10 @@ var ScaleLine = /** @class */ (function (_super) {
457
457
  * @return {number} The appropriate scale.
458
458
  */
459
459
  ScaleLine.prototype.getScaleForResolution = function () {
460
- var resolution = getPointResolution(this.viewState_.projection, this.viewState_.resolution, this.viewState_.center);
460
+ var resolution = getPointResolution(this.viewState_.projection, this.viewState_.resolution, this.viewState_.center, ProjUnits.METERS);
461
461
  var dpi = this.dpi_ || DEFAULT_DPI;
462
- var mpu = this.viewState_.projection.getMetersPerUnit();
463
462
  var inchesPerMeter = 1000 / 25.4;
464
- return parseFloat(resolution.toString()) * mpu * inchesPerMeter * dpi;
463
+ return parseFloat(resolution.toString()) * inchesPerMeter * dpi;
465
464
  };
466
465
  /**
467
466
  * Update the scale line element.
@@ -1 +1 @@
1
- {"version":3,"file":"ScaleLine.js","sourceRoot":"","sources":["../src/control/ScaleLine.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ScaleLine.js","sourceRoot":"","sources":["../src/control/ScaleLine.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "6.10.0",
3
+ "version": "6.10.1-dev.1640988064340",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
@@ -10,6 +10,14 @@ export type Options = {
10
10
  * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
11
11
  */
12
12
  loader?: (arg0: number, arg1: number, arg2: number) => Uint8ClampedArray | Uint8Array | Float32Array | DataView | Promise<Uint8ClampedArray | Uint8Array | Float32Array | DataView>;
13
+ /**
14
+ * Attributions.
15
+ */
16
+ attributions?: string | string[] | ((arg0: import("../PluggableMap.js").FrameState) => string | string[]);
17
+ /**
18
+ * Attributions are collapsible.
19
+ */
20
+ attributionsCollapsible?: boolean;
13
21
  /**
14
22
  * Optional max zoom level. Not used if `tileGrid` is provided.
15
23
  */
@@ -73,6 +81,8 @@ export type Options = {
73
81
  * @typedef {Object} Options
74
82
  * @property {Loader} [loader] Data loader. Called with z, x, and y tile coordinates.
75
83
  * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
84
+ * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
85
+ * @property {boolean} [attributionsCollapsible=true] Attributions are collapsible.
76
86
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.
77
87
  * @property {number} [minZoom=0] Optional min zoom level. Not used if `tileGrid` is provided.
78
88
  * @property {number|import("../size.js").Size} [tileSize=[256, 256]] The pixel width and height of the tiles.
@@ -1 +1 @@
1
- {"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,8BA4CC;IAjBC;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAmD/B;;;OAGG;IACH,qEAoBC;IAvEC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAG1E;;;OAGG;IACH,8MAEC;IAED;;;;;;;;OAQG;IACH,4HAsBC;CA2BF"}
1
+ {"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,8BA8CC;IAjBC;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAmD/B;;;OAGG;IACH,qEAoBC;IAvEC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAG1E;;;OAGG;IACH,8MAEC;IAED;;;;;;;;OAQG;IACH,4HAsBC;CA2BF"}
@@ -35,6 +35,8 @@ import { toPromise } from '../functions.js';
35
35
  * @typedef {Object} Options
36
36
  * @property {Loader} [loader] Data loader. Called with z, x, and y tile coordinates.
37
37
  * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
38
+ * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
39
+ * @property {boolean} [attributionsCollapsible=true] Attributions are collapsible.
38
40
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.
39
41
  * @property {number} [minZoom=0] Optional min zoom level. Not used if `tileGrid` is provided.
40
42
  * @property {number|import("../size.js").Size} [tileSize=[256, 256]] The pixel width and height of the tiles.
@@ -77,6 +79,8 @@ var DataTileSource = /** @class */ (function (_super) {
77
79
  }
78
80
  _this = _super.call(this, {
79
81
  cacheSize: 0.1,
82
+ attributions: options.attributions,
83
+ attributionsCollapsible: options.attributionsCollapsible,
80
84
  projection: projection,
81
85
  tileGrid: tileGrid,
82
86
  opaque: options.opaque,
@@ -1 +1 @@
1
- {"version":3,"file":"DataTile.js","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataTile.js","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":"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"}
@@ -484,12 +484,12 @@ class ScaleLine extends Control {
484
484
  const resolution = getPointResolution(
485
485
  this.viewState_.projection,
486
486
  this.viewState_.resolution,
487
- this.viewState_.center
487
+ this.viewState_.center,
488
+ ProjUnits.METERS
488
489
  );
489
490
  const dpi = this.dpi_ || DEFAULT_DPI;
490
- const mpu = this.viewState_.projection.getMetersPerUnit();
491
491
  const inchesPerMeter = 1000 / 25.4;
492
- return parseFloat(resolution.toString()) * mpu * inchesPerMeter * dpi;
492
+ return parseFloat(resolution.toString()) * inchesPerMeter * dpi;
493
493
  }
494
494
 
495
495
  /**
@@ -22,6 +22,8 @@ import {toPromise} from '../functions.js';
22
22
  * @typedef {Object} Options
23
23
  * @property {Loader} [loader] Data loader. Called with z, x, and y tile coordinates.
24
24
  * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
25
+ * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
26
+ * @property {boolean} [attributionsCollapsible=true] Attributions are collapsible.
25
27
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.
26
28
  * @property {number} [minZoom=0] Optional min zoom level. Not used if `tileGrid` is provided.
27
29
  * @property {number|import("../size.js").Size} [tileSize=[256, 256]] The pixel width and height of the tiles.
@@ -66,6 +68,8 @@ class DataTileSource extends TileSource {
66
68
 
67
69
  super({
68
70
  cacheSize: 0.1, // don't cache on the source
71
+ attributions: options.attributions,
72
+ attributionsCollapsible: options.attributionsCollapsible,
69
73
  projection: projection,
70
74
  tileGrid: tileGrid,
71
75
  opaque: options.opaque,
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.10.0';
34
+ export var VERSION = '6.10.1-dev.1640988064340';
35
35
  //# sourceMappingURL=util.js.map