ol 7.0.0-dev.1658257118421 → 7.0.0-dev.1658343947608
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/control/ScaleLine.d.ts +9 -17
- package/control/ScaleLine.d.ts.map +1 -1
- package/control/ScaleLine.js +12 -20
- package/control/ScaleLine.js.map +1 -1
- package/format/EsriJSON.d.ts.map +1 -1
- package/format/EsriJSON.js +16 -16
- package/format/EsriJSON.js.map +1 -1
- package/format/GML3.d.ts.map +1 -1
- package/format/GML3.js +2 -3
- package/format/GML3.js.map +1 -1
- package/format/GMLBase.d.ts.map +1 -1
- package/format/GMLBase.js +4 -5
- package/format/GMLBase.js.map +1 -1
- package/format/GPX.d.ts.map +1 -1
- package/format/GPX.js +9 -9
- package/format/GPX.js.map +1 -1
- package/format/IGC.d.ts +6 -2
- package/format/IGC.d.ts.map +1 -1
- package/format/IGC.js +7 -15
- package/format/IGC.js.map +1 -1
- package/format/KML.d.ts +3 -3
- package/format/KML.d.ts.map +1 -1
- package/format/KML.js +29 -30
- package/format/KML.js.map +1 -1
- package/format/MVT.d.ts.map +1 -1
- package/format/MVT.js +6 -7
- package/format/MVT.js.map +1 -1
- package/format/OSMXML.d.ts.map +1 -1
- package/format/OSMXML.js +2 -3
- package/format/OSMXML.js.map +1 -1
- package/format/Polyline.d.ts +3 -8
- package/format/Polyline.d.ts.map +1 -1
- package/format/Polyline.js +3 -4
- package/format/Polyline.js.map +1 -1
- package/format/WKB.d.ts +3 -3
- package/format/WKB.d.ts.map +1 -1
- package/format/WKB.js +48 -21
- package/format/WKB.js.map +1 -1
- package/format/WKT.d.ts.map +1 -1
- package/format/WKT.js +12 -12
- package/format/WKT.js.map +1 -1
- package/geom/Circle.d.ts +4 -4
- package/geom/Circle.d.ts.map +1 -1
- package/geom/Circle.js +2 -2
- package/geom/Geometry.d.ts +5 -0
- package/geom/Geometry.d.ts.map +1 -1
- package/geom/Geometry.js +5 -0
- package/geom/Geometry.js.map +1 -1
- package/geom/LineString.d.ts +4 -4
- package/geom/LineString.d.ts.map +1 -1
- package/geom/LineString.js +4 -6
- package/geom/LineString.js.map +1 -1
- package/geom/LinearRing.d.ts +4 -4
- package/geom/LinearRing.d.ts.map +1 -1
- package/geom/LinearRing.js +3 -4
- package/geom/LinearRing.js.map +1 -1
- package/geom/MultiLineString.d.ts +4 -9
- package/geom/MultiLineString.d.ts.map +1 -1
- package/geom/MultiLineString.js +4 -6
- package/geom/MultiLineString.js.map +1 -1
- package/geom/MultiPoint.d.ts +4 -4
- package/geom/MultiPoint.d.ts.map +1 -1
- package/geom/MultiPoint.js +2 -2
- package/geom/MultiPolygon.d.ts +4 -4
- package/geom/MultiPolygon.d.ts.map +1 -1
- package/geom/MultiPolygon.js +4 -5
- package/geom/MultiPolygon.js.map +1 -1
- package/geom/Point.d.ts +2 -2
- package/geom/Point.d.ts.map +1 -1
- package/geom/Point.js +2 -2
- package/geom/Polygon.d.ts +4 -4
- package/geom/Polygon.d.ts.map +1 -1
- package/geom/Polygon.js +6 -11
- package/geom/Polygon.js.map +1 -1
- package/geom/SimpleGeometry.d.ts +13 -13
- package/geom/SimpleGeometry.d.ts.map +1 -1
- package/geom/SimpleGeometry.js +17 -18
- package/geom/SimpleGeometry.js.map +1 -1
- package/interaction/Draw.d.ts +7 -7
- package/interaction/Draw.d.ts.map +1 -1
- package/interaction/Draw.js +34 -42
- package/interaction/Draw.js.map +1 -1
- package/layer/Graticule.d.ts.map +1 -1
- package/layer/Graticule.js +4 -5
- package/layer/Graticule.js.map +1 -1
- package/package.json +1 -1
- package/render/Feature.d.ts.map +1 -1
- package/render/Feature.js +5 -6
- package/render/Feature.js.map +1 -1
- package/render/canvas/TextBuilder.d.ts.map +1 -1
- package/render/canvas/TextBuilder.js +1 -2
- package/render/canvas/TextBuilder.js.map +1 -1
- package/render/canvas/hitdetect.d.ts.map +1 -1
- package/render/canvas/hitdetect.js +2 -3
- package/render/canvas/hitdetect.js.map +1 -1
- package/render/canvas.d.ts +2 -11
- package/render/canvas.d.ts.map +1 -1
- package/render/canvas.js +1 -14
- package/render/canvas.js.map +1 -1
- package/source/Zoomify.d.ts +6 -2
- package/source/Zoomify.d.ts.map +1 -1
- package/source/Zoomify.js +5 -9
- package/source/Zoomify.js.map +1 -1
- package/src/control/ScaleLine.js +12 -20
- package/src/format/EsriJSON.js +16 -19
- package/src/format/GML3.js +2 -3
- package/src/format/GMLBase.js +4 -5
- package/src/format/GPX.js +9 -9
- package/src/format/IGC.js +7 -16
- package/src/format/KML.js +29 -30
- package/src/format/MVT.js +6 -7
- package/src/format/OSMXML.js +2 -3
- package/src/format/Polyline.js +3 -4
- package/src/format/WKB.js +55 -21
- package/src/format/WKT.js +12 -12
- package/src/geom/Circle.js +2 -2
- package/src/geom/Geometry.js +6 -0
- package/src/geom/LineString.js +4 -8
- package/src/geom/LinearRing.js +3 -4
- package/src/geom/MultiLineString.js +4 -10
- package/src/geom/MultiPoint.js +2 -2
- package/src/geom/MultiPolygon.js +4 -12
- package/src/geom/Point.js +2 -2
- package/src/geom/Polygon.js +6 -15
- package/src/geom/SimpleGeometry.js +17 -18
- package/src/interaction/Draw.js +34 -42
- package/src/layer/Graticule.js +4 -5
- package/src/render/Feature.js +5 -12
- package/src/render/canvas/TextBuilder.js +1 -2
- package/src/render/canvas/hitdetect.js +2 -3
- package/src/render/canvas.js +1 -15
- package/src/source/Zoomify.js +5 -9
- package/src/style/Icon.js +36 -36
- package/src/style/Text.js +13 -6
- package/style/Icon.d.ts +28 -12
- package/style/Icon.d.ts.map +1 -1
- package/style/Icon.js +34 -36
- package/style/Icon.js.map +1 -1
- package/style/Text.d.ts +14 -7
- package/style/Text.d.ts.map +1 -1
- package/style/Text.js +12 -6
- package/style/Text.js.map +1 -1
- package/util.js +1 -1
- package/geom/GeometryLayout.d.ts +0 -8
- package/geom/GeometryLayout.d.ts.map +0 -1
- package/geom/GeometryLayout.js +0 -16
- package/geom/GeometryLayout.js.map +0 -1
- package/src/geom/GeometryLayout.js +0 -16
- package/src/style/IconAnchorUnits.js +0 -20
- package/src/style/IconOrigin.js +0 -30
- package/src/style/TextPlacement.js +0 -15
- package/style/IconAnchorUnits.d.ts +0 -6
- package/style/IconAnchorUnits.d.ts.map +0 -1
- package/style/IconAnchorUnits.js +0 -20
- package/style/IconAnchorUnits.js.map +0 -1
- package/style/IconOrigin.d.ts +0 -8
- package/style/IconOrigin.d.ts.map +0 -1
- package/style/IconOrigin.js +0 -30
- package/style/IconOrigin.js.map +0 -1
- package/style/TextPlacement.d.ts +0 -6
- package/style/TextPlacement.d.ts.map +0 -1
- package/style/TextPlacement.js +0 -15
- package/style/TextPlacement.js.map +0 -1
package/render/canvas.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/render/canvas
|
|
3
3
|
*/
|
|
4
4
|
import BaseObject from '../Object.js';
|
|
5
|
-
import EventTarget from '../events/Target.js';
|
|
6
5
|
import { WORKER_OFFSCREEN_CANVAS } from '../has.js';
|
|
7
6
|
import { clear } from '../obj.js';
|
|
8
7
|
import { createCanvasContext2D } from '../dom.js';
|
|
@@ -56,7 +55,7 @@ import { getFontParameters } from '../css.js';
|
|
|
56
55
|
* @property {string} [textAlign] TextAlign.
|
|
57
56
|
* @property {string} [justify] Justify.
|
|
58
57
|
* @property {string} textBaseline TextBaseline.
|
|
59
|
-
* @property {
|
|
58
|
+
* @property {import('../style/Text.js').TextPlacement} [placement] Placement.
|
|
60
59
|
* @property {number} [maxAngle] MaxAngle.
|
|
61
60
|
* @property {boolean} [overflow] Overflow.
|
|
62
61
|
* @property {import("../style/Fill.js").default} [backgroundFill] BackgroundFill.
|
|
@@ -140,18 +139,6 @@ export var defaultLineWidth = 1;
|
|
|
140
139
|
* @type {BaseObject}
|
|
141
140
|
*/
|
|
142
141
|
export var checkedFonts = new BaseObject();
|
|
143
|
-
/**
|
|
144
|
-
* The label cache for text rendering. To change the default cache size of 2048
|
|
145
|
-
* entries, use {@link module:ol/structs/LRUCache~LRUCache#setSize cache.setSize()}.
|
|
146
|
-
* Deprecated - there is no label cache any more.
|
|
147
|
-
* @type {?}
|
|
148
|
-
* @api
|
|
149
|
-
* @deprecated
|
|
150
|
-
*/
|
|
151
|
-
export var labelCache = new EventTarget();
|
|
152
|
-
labelCache.setSize = function () {
|
|
153
|
-
console.warn('labelCache is deprecated.'); //eslint-disable-line
|
|
154
|
-
};
|
|
155
142
|
/**
|
|
156
143
|
* @type {CanvasRenderingContext2D}
|
|
157
144
|
*/
|
package/render/canvas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas.js","sourceRoot":"","sources":["../src/render/canvas.js"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"canvas.js","sourceRoot":"","sources":["../src/render/canvas.js"],"names":[],"mappings":"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"}
|
package/source/Zoomify.d.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @typedef {'default' | 'truncated'} TierSizeCalculation
|
|
3
|
+
*/
|
|
1
4
|
export class CustomTile extends ImageTile {
|
|
2
5
|
/**
|
|
3
6
|
* @param {import("../size.js").Size} tileSize Full tile size.
|
|
@@ -20,6 +23,7 @@ export class CustomTile extends ImageTile {
|
|
|
20
23
|
tileSize_: import("../size.js").Size;
|
|
21
24
|
}
|
|
22
25
|
export default Zoomify;
|
|
26
|
+
export type TierSizeCalculation = 'default' | 'truncated';
|
|
23
27
|
export type Options = {
|
|
24
28
|
/**
|
|
25
29
|
* Attributions.
|
|
@@ -74,7 +78,7 @@ export type Options = {
|
|
|
74
78
|
/**
|
|
75
79
|
* Tier size calculation method: `default` or `truncated`.
|
|
76
80
|
*/
|
|
77
|
-
tierSizeCalculation?:
|
|
81
|
+
tierSizeCalculation?: TierSizeCalculation | undefined;
|
|
78
82
|
/**
|
|
79
83
|
* Size.
|
|
80
84
|
*/
|
|
@@ -128,7 +132,7 @@ import ImageTile from "../ImageTile.js";
|
|
|
128
132
|
* `http://my.zoomify.info?FIF=IMAGE.TIF&JTL={z},{tileIndex}`.
|
|
129
133
|
* A `{?-?}` template pattern, for example `subdomain{a-f}.domain.com`, may be
|
|
130
134
|
* used instead of defining each one separately in the `urls` option.
|
|
131
|
-
* @property {
|
|
135
|
+
* @property {TierSizeCalculation} [tierSizeCalculation] Tier size calculation method: `default` or `truncated`.
|
|
132
136
|
* @property {import("../size.js").Size} size Size.
|
|
133
137
|
* @property {import("../extent.js").Extent} [extent] Extent for the TileGrid that is created.
|
|
134
138
|
* Default sets the TileGrid in the
|
package/source/Zoomify.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zoomify.d.ts","sourceRoot":"","sources":["../src/source/Zoomify.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Zoomify.d.ts","sourceRoot":"","sources":["../src/source/Zoomify.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;IACE;;;;;;;;OAQG;IACH,sBARW,OAAO,YAAY,EAAE,IAAI,aACzB,OAAO,iBAAiB,EAAE,SAAS,mBAEnC,MAAM,eACL,MAAM,2BACP,OAAO,YAAY,EAAE,YAAY,0DAwB3C;IAVC;;;OAGG;IACH,sBAAyB;IAEzB;;OAEG;IACH,WAFU,OAAO,YAAY,EAAE,IAAI,CAEV;CA2B5B;;kCA5DY,SAAS,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwEtB,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;SAInC,MAAM;;;;;;;;UAYN,OAAO,YAAY,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;AA1BvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,yBAFW,OAAO,EA6KjB;CACF"}
|
package/source/Zoomify.js
CHANGED
|
@@ -27,12 +27,8 @@ import { createFromTileUrlFunctions, expandUrl } from '../tileurlfunction.js';
|
|
|
27
27
|
import { getCenter } from '../extent.js';
|
|
28
28
|
import { toSize } from '../size.js';
|
|
29
29
|
/**
|
|
30
|
-
* @
|
|
30
|
+
* @typedef {'default' | 'truncated'} TierSizeCalculation
|
|
31
31
|
*/
|
|
32
|
-
var TierSizeCalculation = {
|
|
33
|
-
DEFAULT: 'default',
|
|
34
|
-
TRUNCATED: 'truncated',
|
|
35
|
-
};
|
|
36
32
|
var CustomTile = /** @class */ (function (_super) {
|
|
37
33
|
__extends(CustomTile, _super);
|
|
38
34
|
/**
|
|
@@ -111,7 +107,7 @@ export { CustomTile };
|
|
|
111
107
|
* `http://my.zoomify.info?FIF=IMAGE.TIF&JTL={z},{tileIndex}`.
|
|
112
108
|
* A `{?-?}` template pattern, for example `subdomain{a-f}.domain.com`, may be
|
|
113
109
|
* used instead of defining each one separately in the `urls` option.
|
|
114
|
-
* @property {
|
|
110
|
+
* @property {TierSizeCalculation} [tierSizeCalculation] Tier size calculation method: `default` or `truncated`.
|
|
115
111
|
* @property {import("../size.js").Size} size Size.
|
|
116
112
|
* @property {import("../extent.js").Extent} [extent] Extent for the TileGrid that is created.
|
|
117
113
|
* Default sets the TileGrid in the
|
|
@@ -146,7 +142,7 @@ var Zoomify = /** @class */ (function (_super) {
|
|
|
146
142
|
var size = options.size;
|
|
147
143
|
var tierSizeCalculation = options.tierSizeCalculation !== undefined
|
|
148
144
|
? options.tierSizeCalculation
|
|
149
|
-
:
|
|
145
|
+
: 'default';
|
|
150
146
|
var tilePixelRatio = options.tilePixelRatio || 1;
|
|
151
147
|
var imageWidth = size[0];
|
|
152
148
|
var imageHeight = size[1];
|
|
@@ -154,7 +150,7 @@ var Zoomify = /** @class */ (function (_super) {
|
|
|
154
150
|
var tileSize = options.tileSize || DEFAULT_TILE_SIZE;
|
|
155
151
|
var tileSizeForTierSizeCalculation = tileSize * tilePixelRatio;
|
|
156
152
|
switch (tierSizeCalculation) {
|
|
157
|
-
case
|
|
153
|
+
case 'default':
|
|
158
154
|
while (imageWidth > tileSizeForTierSizeCalculation ||
|
|
159
155
|
imageHeight > tileSizeForTierSizeCalculation) {
|
|
160
156
|
tierSizeInTiles.push([
|
|
@@ -164,7 +160,7 @@ var Zoomify = /** @class */ (function (_super) {
|
|
|
164
160
|
tileSizeForTierSizeCalculation += tileSizeForTierSizeCalculation;
|
|
165
161
|
}
|
|
166
162
|
break;
|
|
167
|
-
case
|
|
163
|
+
case 'truncated':
|
|
168
164
|
var width = imageWidth;
|
|
169
165
|
var height = imageHeight;
|
|
170
166
|
while (width > tileSizeForTierSizeCalculation ||
|
package/source/Zoomify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zoomify.js","sourceRoot":"","sources":["../src/source/Zoomify.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAExD,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,qBAAqB,EAAC,MAAM,WAAW,CAAC;AAChD,OAAO,EAAC,0BAA0B,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAElC;;GAEG;
|
|
1
|
+
{"version":3,"file":"Zoomify.js","sourceRoot":"","sources":["../src/source/Zoomify.js"],"names":[],"mappings":"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"}
|
package/src/control/ScaleLine.js
CHANGED
|
@@ -13,17 +13,9 @@ import {assert} from '../asserts.js';
|
|
|
13
13
|
const UNITS_PROP = 'units';
|
|
14
14
|
|
|
15
15
|
/**
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
* @enum {string}
|
|
16
|
+
* @typedef {'degrees' | 'imperial' | 'nautical' | 'metric' | 'us'} Units
|
|
17
|
+
* Units for the scale line.
|
|
19
18
|
*/
|
|
20
|
-
export const Units = {
|
|
21
|
-
DEGREES: 'degrees',
|
|
22
|
-
IMPERIAL: 'imperial',
|
|
23
|
-
NAUTICAL: 'nautical',
|
|
24
|
-
METRIC: 'metric',
|
|
25
|
-
US: 'us',
|
|
26
|
-
};
|
|
27
19
|
|
|
28
20
|
/**
|
|
29
21
|
* @const
|
|
@@ -57,7 +49,7 @@ const DEFAULT_DPI = 25.4 / 0.28;
|
|
|
57
49
|
* should be re-rendered. This is called in a `requestAnimationFrame` callback.
|
|
58
50
|
* @property {HTMLElement|string} [target] Specify a target if you want the control
|
|
59
51
|
* to be rendered outside of the map's viewport.
|
|
60
|
-
* @property {
|
|
52
|
+
* @property {Units} [units='metric'] Units.
|
|
61
53
|
* @property {boolean} [bar=false] Render scalebars instead of a line.
|
|
62
54
|
* @property {number} [steps=4] Number of steps the scalebar should use. Use even numbers
|
|
63
55
|
* for best results. Only applies when `bar` is `true`.
|
|
@@ -164,7 +156,7 @@ class ScaleLine extends Control {
|
|
|
164
156
|
|
|
165
157
|
this.addChangeListener(UNITS_PROP, this.handleUnitsChanged_);
|
|
166
158
|
|
|
167
|
-
this.setUnits(options.units ||
|
|
159
|
+
this.setUnits(options.units || 'metric');
|
|
168
160
|
|
|
169
161
|
/**
|
|
170
162
|
* @private
|
|
@@ -193,7 +185,7 @@ class ScaleLine extends Control {
|
|
|
193
185
|
|
|
194
186
|
/**
|
|
195
187
|
* Return the units to use in the scale line.
|
|
196
|
-
* @return {
|
|
188
|
+
* @return {Units} The units
|
|
197
189
|
* to use in the scale line.
|
|
198
190
|
* @observable
|
|
199
191
|
* @api
|
|
@@ -211,7 +203,7 @@ class ScaleLine extends Control {
|
|
|
211
203
|
|
|
212
204
|
/**
|
|
213
205
|
* Set the units to use in the scale line.
|
|
214
|
-
* @param {
|
|
206
|
+
* @param {Units} units The units to use in the scale line.
|
|
215
207
|
* @observable
|
|
216
208
|
* @api
|
|
217
209
|
*/
|
|
@@ -246,7 +238,7 @@ class ScaleLine extends Control {
|
|
|
246
238
|
const projection = viewState.projection;
|
|
247
239
|
const units = this.getUnits();
|
|
248
240
|
const pointResolutionUnits =
|
|
249
|
-
units ==
|
|
241
|
+
units == 'degrees' ? ProjUnits.DEGREES : ProjUnits.METERS;
|
|
250
242
|
let pointResolution = getPointResolution(
|
|
251
243
|
projection,
|
|
252
244
|
viewState.resolution,
|
|
@@ -264,7 +256,7 @@ class ScaleLine extends Control {
|
|
|
264
256
|
|
|
265
257
|
let nominalCount = minWidth * pointResolution;
|
|
266
258
|
let suffix = '';
|
|
267
|
-
if (units ==
|
|
259
|
+
if (units == 'degrees') {
|
|
268
260
|
const metersPerDegree = METERS_PER_UNIT[ProjUnits.DEGREES];
|
|
269
261
|
nominalCount *= metersPerDegree;
|
|
270
262
|
if (nominalCount < metersPerDegree / 60) {
|
|
@@ -276,7 +268,7 @@ class ScaleLine extends Control {
|
|
|
276
268
|
} else {
|
|
277
269
|
suffix = '\u00b0'; // degrees
|
|
278
270
|
}
|
|
279
|
-
} else if (units ==
|
|
271
|
+
} else if (units == 'imperial') {
|
|
280
272
|
if (nominalCount < 0.9144) {
|
|
281
273
|
suffix = 'in';
|
|
282
274
|
pointResolution /= 0.0254;
|
|
@@ -287,10 +279,10 @@ class ScaleLine extends Control {
|
|
|
287
279
|
suffix = 'mi';
|
|
288
280
|
pointResolution /= 1609.344;
|
|
289
281
|
}
|
|
290
|
-
} else if (units ==
|
|
282
|
+
} else if (units == 'nautical') {
|
|
291
283
|
pointResolution /= 1852;
|
|
292
284
|
suffix = 'NM';
|
|
293
|
-
} else if (units ==
|
|
285
|
+
} else if (units == 'metric') {
|
|
294
286
|
if (nominalCount < 0.001) {
|
|
295
287
|
suffix = 'μm';
|
|
296
288
|
pointResolution *= 1000000;
|
|
@@ -303,7 +295,7 @@ class ScaleLine extends Control {
|
|
|
303
295
|
suffix = 'km';
|
|
304
296
|
pointResolution /= 1000;
|
|
305
297
|
}
|
|
306
|
-
} else if (units ==
|
|
298
|
+
} else if (units == 'us') {
|
|
307
299
|
if (nominalCount < 0.9144) {
|
|
308
300
|
suffix = 'in';
|
|
309
301
|
pointResolution *= 39.37;
|
package/src/format/EsriJSON.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/format/EsriJSON
|
|
3
3
|
*/
|
|
4
4
|
import Feature from '../Feature.js';
|
|
5
|
-
import GeometryLayout from '../geom/GeometryLayout.js';
|
|
6
5
|
import JSONFeature from './JSONFeature.js';
|
|
7
6
|
import LineString from '../geom/LineString.js';
|
|
8
7
|
import LinearRing from '../geom/LinearRing.js';
|
|
@@ -295,7 +294,7 @@ function readGeometry(object, opt_options) {
|
|
|
295
294
|
* array. It is used for checking for holes.
|
|
296
295
|
* Logic inspired by: https://github.com/Esri/terraformer-arcgis-parser
|
|
297
296
|
* @param {Array<!Array<!Array<number>>>} rings Rings.
|
|
298
|
-
* @param {import("../geom/
|
|
297
|
+
* @param {import("../geom/Geometry.js").GeometryLayout} layout Geometry layout.
|
|
299
298
|
* @return {Array<!Array<!Array<!Array<number>>>>} Transformed rings.
|
|
300
299
|
*/
|
|
301
300
|
function convertRings(rings, layout) {
|
|
@@ -352,14 +351,11 @@ function convertRings(rings, layout) {
|
|
|
352
351
|
function readPointGeometry(object) {
|
|
353
352
|
let point;
|
|
354
353
|
if (object.m !== undefined && object.z !== undefined) {
|
|
355
|
-
point = new Point(
|
|
356
|
-
[object.x, object.y, object.z, object.m],
|
|
357
|
-
GeometryLayout.XYZM
|
|
358
|
-
);
|
|
354
|
+
point = new Point([object.x, object.y, object.z, object.m], 'XYZM');
|
|
359
355
|
} else if (object.z !== undefined) {
|
|
360
|
-
point = new Point([object.x, object.y, object.z],
|
|
356
|
+
point = new Point([object.x, object.y, object.z], 'XYZ');
|
|
361
357
|
} else if (object.m !== undefined) {
|
|
362
|
-
point = new Point([object.x, object.y, object.m],
|
|
358
|
+
point = new Point([object.x, object.y, object.m], 'XYM');
|
|
363
359
|
} else {
|
|
364
360
|
point = new Point([object.x, object.y]);
|
|
365
361
|
}
|
|
@@ -386,16 +382,17 @@ function readMultiLineStringGeometry(object) {
|
|
|
386
382
|
|
|
387
383
|
/**
|
|
388
384
|
* @param {EsriJSONHasZM} object Object.
|
|
389
|
-
* @return {import("../geom/
|
|
385
|
+
* @return {import("../geom/Geometry.js").GeometryLayout} The geometry layout to use.
|
|
390
386
|
*/
|
|
391
387
|
function getGeometryLayout(object) {
|
|
392
|
-
|
|
388
|
+
/** @type {import("../geom/Geometry.js").GeometryLayout} */
|
|
389
|
+
let layout = 'XY';
|
|
393
390
|
if (object.hasZ === true && object.hasM === true) {
|
|
394
|
-
layout =
|
|
391
|
+
layout = 'XYZM';
|
|
395
392
|
} else if (object.hasZ === true) {
|
|
396
|
-
layout =
|
|
393
|
+
layout = 'XYZ';
|
|
397
394
|
} else if (object.hasM === true) {
|
|
398
|
-
layout =
|
|
395
|
+
layout = 'XYM';
|
|
399
396
|
}
|
|
400
397
|
return layout;
|
|
401
398
|
}
|
|
@@ -437,26 +434,26 @@ function writePointGeometry(geometry, opt_options) {
|
|
|
437
434
|
/** @type {EsriJSONPoint} */
|
|
438
435
|
let esriJSON;
|
|
439
436
|
const layout = geometry.getLayout();
|
|
440
|
-
if (layout ===
|
|
437
|
+
if (layout === 'XYZ') {
|
|
441
438
|
esriJSON = {
|
|
442
439
|
x: coordinates[0],
|
|
443
440
|
y: coordinates[1],
|
|
444
441
|
z: coordinates[2],
|
|
445
442
|
};
|
|
446
|
-
} else if (layout ===
|
|
443
|
+
} else if (layout === 'XYM') {
|
|
447
444
|
esriJSON = {
|
|
448
445
|
x: coordinates[0],
|
|
449
446
|
y: coordinates[1],
|
|
450
447
|
m: coordinates[2],
|
|
451
448
|
};
|
|
452
|
-
} else if (layout ===
|
|
449
|
+
} else if (layout === 'XYZM') {
|
|
453
450
|
esriJSON = {
|
|
454
451
|
x: coordinates[0],
|
|
455
452
|
y: coordinates[1],
|
|
456
453
|
z: coordinates[2],
|
|
457
454
|
m: coordinates[3],
|
|
458
455
|
};
|
|
459
|
-
} else if (layout ===
|
|
456
|
+
} else if (layout === 'XY') {
|
|
460
457
|
esriJSON = {
|
|
461
458
|
x: coordinates[0],
|
|
462
459
|
y: coordinates[1],
|
|
@@ -474,8 +471,8 @@ function writePointGeometry(geometry, opt_options) {
|
|
|
474
471
|
function getHasZM(geometry) {
|
|
475
472
|
const layout = geometry.getLayout();
|
|
476
473
|
return {
|
|
477
|
-
hasZ: layout ===
|
|
478
|
-
hasM: layout ===
|
|
474
|
+
hasZ: layout === 'XYZ' || layout === 'XYZM',
|
|
475
|
+
hasM: layout === 'XYM' || layout === 'XYZM',
|
|
479
476
|
};
|
|
480
477
|
}
|
|
481
478
|
|
package/src/format/GML3.js
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import GML2 from './GML2.js';
|
|
5
5
|
import GMLBase, {GMLNS} from './GMLBase.js';
|
|
6
|
-
import GeometryLayout from '../geom/GeometryLayout.js';
|
|
7
6
|
import LineString from '../geom/LineString.js';
|
|
8
7
|
import MultiLineString from '../geom/MultiLineString.js';
|
|
9
8
|
import MultiPolygon from '../geom/MultiPolygon.js';
|
|
@@ -308,7 +307,7 @@ class GML3 extends GMLBase {
|
|
|
308
307
|
extend(flatCoordinates, flatLinearRings[i]);
|
|
309
308
|
ends.push(flatCoordinates.length);
|
|
310
309
|
}
|
|
311
|
-
return new Polygon(flatCoordinates,
|
|
310
|
+
return new Polygon(flatCoordinates, 'XYZ', ends);
|
|
312
311
|
} else {
|
|
313
312
|
return undefined;
|
|
314
313
|
}
|
|
@@ -329,7 +328,7 @@ class GML3 extends GMLBase {
|
|
|
329
328
|
this
|
|
330
329
|
);
|
|
331
330
|
if (flatCoordinates) {
|
|
332
|
-
const lineString = new LineString(flatCoordinates,
|
|
331
|
+
const lineString = new LineString(flatCoordinates, 'XYZ');
|
|
333
332
|
return lineString;
|
|
334
333
|
} else {
|
|
335
334
|
return undefined;
|
package/src/format/GMLBase.js
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
// of GEOMETRY_PARSERS_ and methods using GEOMETRY_PARSERS_ do not expect
|
|
6
6
|
// envelopes/extents, only geometries!
|
|
7
7
|
import Feature from '../Feature.js';
|
|
8
|
-
import GeometryLayout from '../geom/GeometryLayout.js';
|
|
9
8
|
import LineString from '../geom/LineString.js';
|
|
10
9
|
import LinearRing from '../geom/LinearRing.js';
|
|
11
10
|
import MultiLineString from '../geom/MultiLineString.js';
|
|
@@ -370,7 +369,7 @@ class GMLBase extends XMLFeature {
|
|
|
370
369
|
readPoint(node, objectStack) {
|
|
371
370
|
const flatCoordinates = this.readFlatCoordinatesFromNode(node, objectStack);
|
|
372
371
|
if (flatCoordinates) {
|
|
373
|
-
return new Point(flatCoordinates,
|
|
372
|
+
return new Point(flatCoordinates, 'XYZ');
|
|
374
373
|
}
|
|
375
374
|
}
|
|
376
375
|
|
|
@@ -465,7 +464,7 @@ class GMLBase extends XMLFeature {
|
|
|
465
464
|
readLineString(node, objectStack) {
|
|
466
465
|
const flatCoordinates = this.readFlatCoordinatesFromNode(node, objectStack);
|
|
467
466
|
if (flatCoordinates) {
|
|
468
|
-
const lineString = new LineString(flatCoordinates,
|
|
467
|
+
const lineString = new LineString(flatCoordinates, 'XYZ');
|
|
469
468
|
return lineString;
|
|
470
469
|
} else {
|
|
471
470
|
return undefined;
|
|
@@ -500,7 +499,7 @@ class GMLBase extends XMLFeature {
|
|
|
500
499
|
readLinearRing(node, objectStack) {
|
|
501
500
|
const flatCoordinates = this.readFlatCoordinatesFromNode(node, objectStack);
|
|
502
501
|
if (flatCoordinates) {
|
|
503
|
-
return new LinearRing(flatCoordinates,
|
|
502
|
+
return new LinearRing(flatCoordinates, 'XYZ');
|
|
504
503
|
}
|
|
505
504
|
}
|
|
506
505
|
|
|
@@ -526,7 +525,7 @@ class GMLBase extends XMLFeature {
|
|
|
526
525
|
extend(flatCoordinates, flatLinearRings[i]);
|
|
527
526
|
ends.push(flatCoordinates.length);
|
|
528
527
|
}
|
|
529
|
-
return new Polygon(flatCoordinates,
|
|
528
|
+
return new Polygon(flatCoordinates, 'XYZ', ends);
|
|
530
529
|
} else {
|
|
531
530
|
return undefined;
|
|
532
531
|
}
|
package/src/format/GPX.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* @module ol/format/GPX
|
|
3
3
|
*/
|
|
4
4
|
import Feature from '../Feature.js';
|
|
5
|
-
import GeometryLayout from '../geom/GeometryLayout.js';
|
|
6
5
|
import LineString from '../geom/LineString.js';
|
|
7
6
|
import MultiLineString from '../geom/MultiLineString.js';
|
|
8
7
|
import Point from '../geom/Point.js';
|
|
@@ -557,19 +556,20 @@ function appendCoordinate(flatCoordinates, layoutOptions, node, values) {
|
|
|
557
556
|
* @param {LayoutOptions} layoutOptions Layout options.
|
|
558
557
|
* @param {Array<number>} flatCoordinates Flat coordinates.
|
|
559
558
|
* @param {Array<number>} [ends] Ends.
|
|
560
|
-
* @return {import("../geom/
|
|
559
|
+
* @return {import("../geom/Geometry.js").GeometryLayout} Layout.
|
|
561
560
|
*/
|
|
562
561
|
function applyLayoutOptions(layoutOptions, flatCoordinates, ends) {
|
|
563
|
-
|
|
562
|
+
/** @type {import("../geom/Geometry.js").GeometryLayout} */
|
|
563
|
+
let layout = 'XY';
|
|
564
564
|
let stride = 2;
|
|
565
565
|
if (layoutOptions.hasZ && layoutOptions.hasM) {
|
|
566
|
-
layout =
|
|
566
|
+
layout = 'XYZM';
|
|
567
567
|
stride = 4;
|
|
568
568
|
} else if (layoutOptions.hasZ) {
|
|
569
|
-
layout =
|
|
569
|
+
layout = 'XYZ';
|
|
570
570
|
stride = 3;
|
|
571
571
|
} else if (layoutOptions.hasM) {
|
|
572
|
-
layout =
|
|
572
|
+
layout = 'XYM';
|
|
573
573
|
stride = 3;
|
|
574
574
|
}
|
|
575
575
|
if (stride !== 4) {
|
|
@@ -800,17 +800,17 @@ function writeWptType(node, coordinate, objectStack) {
|
|
|
800
800
|
node.setAttributeNS(null, 'lon', String(coordinate[0]));
|
|
801
801
|
const geometryLayout = context['geometryLayout'];
|
|
802
802
|
switch (geometryLayout) {
|
|
803
|
-
case
|
|
803
|
+
case 'XYZM':
|
|
804
804
|
if (coordinate[3] !== 0) {
|
|
805
805
|
properties['time'] = coordinate[3];
|
|
806
806
|
}
|
|
807
807
|
// fall through
|
|
808
|
-
case
|
|
808
|
+
case 'XYZ':
|
|
809
809
|
if (coordinate[2] !== 0) {
|
|
810
810
|
properties['ele'] = coordinate[2];
|
|
811
811
|
}
|
|
812
812
|
break;
|
|
813
|
-
case
|
|
813
|
+
case 'XYM':
|
|
814
814
|
if (coordinate[2] !== 0) {
|
|
815
815
|
properties['time'] = coordinate[2];
|
|
816
816
|
}
|
package/src/format/IGC.js
CHANGED
|
@@ -2,21 +2,15 @@
|
|
|
2
2
|
* @module ol/format/IGC
|
|
3
3
|
*/
|
|
4
4
|
import Feature from '../Feature.js';
|
|
5
|
-
import GeometryLayout from '../geom/GeometryLayout.js';
|
|
6
5
|
import LineString from '../geom/LineString.js';
|
|
7
6
|
import TextFeature from './TextFeature.js';
|
|
8
7
|
import {get as getProjection} from '../proj.js';
|
|
9
8
|
import {transformGeometryWithOptions} from './Feature.js';
|
|
10
9
|
|
|
11
10
|
/**
|
|
11
|
+
* @typedef {'barometric' | 'gps' | 'none'} IGCZ
|
|
12
12
|
* IGC altitude/z. One of 'barometric', 'gps', 'none'.
|
|
13
|
-
* @enum {string}
|
|
14
13
|
*/
|
|
15
|
-
const IGCZ = {
|
|
16
|
-
BAROMETRIC: 'barometric',
|
|
17
|
-
GPS: 'gps',
|
|
18
|
-
NONE: 'none',
|
|
19
|
-
};
|
|
20
14
|
|
|
21
15
|
/**
|
|
22
16
|
* @const
|
|
@@ -47,7 +41,7 @@ const NEWLINE_RE = /\r\n|\r|\n/;
|
|
|
47
41
|
|
|
48
42
|
/**
|
|
49
43
|
* @typedef {Object} Options
|
|
50
|
-
* @property {IGCZ
|
|
44
|
+
* @property {IGCZ} [altitudeMode='none'] Altitude mode. Possible
|
|
51
45
|
* values are `'barometric'`, `'gps'`, and `'none'`.
|
|
52
46
|
*/
|
|
53
47
|
|
|
@@ -79,9 +73,7 @@ class IGC extends TextFeature {
|
|
|
79
73
|
* @private
|
|
80
74
|
* @type {IGCZ}
|
|
81
75
|
*/
|
|
82
|
-
this.altitudeMode_ = options.altitudeMode
|
|
83
|
-
? options.altitudeMode
|
|
84
|
-
: IGCZ.NONE;
|
|
76
|
+
this.altitudeMode_ = options.altitudeMode ? options.altitudeMode : 'none';
|
|
85
77
|
}
|
|
86
78
|
|
|
87
79
|
/**
|
|
@@ -119,11 +111,11 @@ class IGC extends TextFeature {
|
|
|
119
111
|
x = -x;
|
|
120
112
|
}
|
|
121
113
|
flatCoordinates.push(x, y);
|
|
122
|
-
if (altitudeMode !=
|
|
114
|
+
if (altitudeMode != 'none') {
|
|
123
115
|
let z;
|
|
124
|
-
if (altitudeMode ==
|
|
116
|
+
if (altitudeMode == 'gps') {
|
|
125
117
|
z = parseInt(m[11], 10);
|
|
126
|
-
} else if (altitudeMode ==
|
|
118
|
+
} else if (altitudeMode == 'barometric') {
|
|
127
119
|
z = parseInt(m[12], 10);
|
|
128
120
|
} else {
|
|
129
121
|
z = 0;
|
|
@@ -155,8 +147,7 @@ class IGC extends TextFeature {
|
|
|
155
147
|
if (flatCoordinates.length === 0) {
|
|
156
148
|
return null;
|
|
157
149
|
}
|
|
158
|
-
const layout =
|
|
159
|
-
altitudeMode == IGCZ.NONE ? GeometryLayout.XYM : GeometryLayout.XYZM;
|
|
150
|
+
const layout = altitudeMode == 'none' ? 'XYM' : 'XYZM';
|
|
160
151
|
const lineString = new LineString(flatCoordinates, layout);
|
|
161
152
|
const feature = new Feature(
|
|
162
153
|
transformGeometryWithOptions(lineString, false, opt_options)
|