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/geom/Polygon.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Polygon.js","sourceRoot":"","sources":["../src/geom/Polygon.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"Polygon.js","sourceRoot":"","sources":["../src/geom/Polygon.js"],"names":[],"mappings":"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"}
|
package/geom/SimpleGeometry.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @param {import("./
|
|
2
|
+
* @param {import("./Geometry.js").GeometryLayout} layout Layout.
|
|
3
3
|
* @return {number} Stride.
|
|
4
4
|
*/
|
|
5
|
-
export function getStrideForLayout(layout:
|
|
5
|
+
export function getStrideForLayout(layout: import("./Geometry.js").GeometryLayout): number;
|
|
6
6
|
/**
|
|
7
7
|
* @param {SimpleGeometry} simpleGeometry Simple geometry.
|
|
8
8
|
* @param {import("../transform.js").Transform} transform Transform.
|
|
@@ -22,9 +22,9 @@ export default SimpleGeometry;
|
|
|
22
22
|
declare class SimpleGeometry extends Geometry {
|
|
23
23
|
/**
|
|
24
24
|
* @protected
|
|
25
|
-
* @type {import("./
|
|
25
|
+
* @type {import("./Geometry.js").GeometryLayout}
|
|
26
26
|
*/
|
|
27
|
-
protected layout:
|
|
27
|
+
protected layout: import("./Geometry.js").GeometryLayout;
|
|
28
28
|
/**
|
|
29
29
|
* @protected
|
|
30
30
|
* @type {number}
|
|
@@ -57,11 +57,11 @@ declare class SimpleGeometry extends Geometry {
|
|
|
57
57
|
*/
|
|
58
58
|
getLastCoordinate(): import("../coordinate.js").Coordinate;
|
|
59
59
|
/**
|
|
60
|
-
* Return the {@link
|
|
61
|
-
* @return {import("./
|
|
60
|
+
* Return the {@link import("./Geometry.js").GeometryLayout layout} of the geometry.
|
|
61
|
+
* @return {import("./Geometry.js").GeometryLayout} Layout.
|
|
62
62
|
* @api
|
|
63
63
|
*/
|
|
64
|
-
getLayout():
|
|
64
|
+
getLayout(): import("./Geometry.js").GeometryLayout;
|
|
65
65
|
/**
|
|
66
66
|
* Create a simplified version of this geometry using the Douglas Peucker algorithm.
|
|
67
67
|
* @param {number} squaredTolerance Squared tolerance.
|
|
@@ -79,23 +79,23 @@ declare class SimpleGeometry extends Geometry {
|
|
|
79
79
|
*/
|
|
80
80
|
getStride(): number;
|
|
81
81
|
/**
|
|
82
|
-
* @param {import("./
|
|
82
|
+
* @param {import("./Geometry.js").GeometryLayout} layout Layout.
|
|
83
83
|
* @param {Array<number>} flatCoordinates Flat coordinates.
|
|
84
84
|
*/
|
|
85
|
-
setFlatCoordinates(layout:
|
|
85
|
+
setFlatCoordinates(layout: import("./Geometry.js").GeometryLayout, flatCoordinates: Array<number>): void;
|
|
86
86
|
/**
|
|
87
87
|
* @abstract
|
|
88
88
|
* @param {!Array<*>} coordinates Coordinates.
|
|
89
|
-
* @param {import("./
|
|
89
|
+
* @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
|
|
90
90
|
*/
|
|
91
|
-
setCoordinates(coordinates: Array<any>, opt_layout?:
|
|
91
|
+
setCoordinates(coordinates: Array<any>, opt_layout?: import("./Geometry.js").GeometryLayout | undefined): void;
|
|
92
92
|
/**
|
|
93
|
-
* @param {import("./
|
|
93
|
+
* @param {import("./Geometry.js").GeometryLayout|undefined} layout Layout.
|
|
94
94
|
* @param {Array<*>} coordinates Coordinates.
|
|
95
95
|
* @param {number} nesting Nesting.
|
|
96
96
|
* @protected
|
|
97
97
|
*/
|
|
98
|
-
protected setLayout(layout:
|
|
98
|
+
protected setLayout(layout: import("./Geometry.js").GeometryLayout | undefined, coordinates: Array<any>, nesting: number): void;
|
|
99
99
|
}
|
|
100
100
|
import Geometry from "./Geometry.js";
|
|
101
101
|
//# sourceMappingURL=SimpleGeometry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleGeometry.d.ts","sourceRoot":"","sources":["../src/geom/SimpleGeometry.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SimpleGeometry.d.ts","sourceRoot":"","sources":["../src/geom/SimpleGeometry.js"],"names":[],"mappings":"AA0TA;;;GAGG;AACH,2CAHW,OAAO,eAAe,EAAE,cAAc,GACrC,MAAM,CAYjB;AAED;;;;;GAKG;AACH,gDALW,cAAc,aACd,OAAO,iBAAiB,EAAE,SAAS,oCAElC,MAAM,MAAM,CAAC,CAiBxB;;AAvVD;;;;;;;GAOG;AACH;IAII;;;OAGG;IACH,kBAFU,OAAO,eAAe,EAAE,cAAc,CAE9B;IAElB;;;OAGG;IACH,kBAFU,MAAM,CAED;IAEf;;;OAGG;IACH,2BAFU,MAAM,MAAM,CAAC,CAEI;IAkB7B;;;OAGG;IACH,kBAFY,UAAQ,GAAG,IAAI,CAI1B;IAED;;;;OAIG;IACH,sBAHY,OAAO,kBAAkB,EAAE,UAAU,CAKhD;IAED;;OAEG;IACH,sBAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,qBAHY,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;OAIG;IACH,aAHY,OAAO,eAAe,EAAE,cAAc,CAKjD;IAED;;;;OAIG;IACH,wCAHW,MAAM,GACL,cAAc,CAgCzB;IAED;;;;OAIG;IACH,0DAJW,MAAM,GACL,cAAc,CAKzB;IAED;;OAEG;IACH,aAFY,MAAM,CAIjB;IAED;;;OAGG;IACH,2BAHW,OAAO,eAAe,EAAE,cAAc,mBACtC,MAAM,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,4BAHY,UAAQ,yEAKnB;IAED;;;;;OAKG;IACH,4BALW,OAAO,eAAe,EAAE,cAAc,GAAC,SAAS,eAChD,UAAQ,WACR,MAAM,QAuBhB;CAoGF"}
|
package/geom/SimpleGeometry.js
CHANGED
|
@@ -17,7 +17,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
17
17
|
* @module ol/geom/SimpleGeometry
|
|
18
18
|
*/
|
|
19
19
|
import Geometry from './Geometry.js';
|
|
20
|
-
import GeometryLayout from './GeometryLayout.js';
|
|
21
20
|
import { abstract } from '../util.js';
|
|
22
21
|
import { createOrUpdateFromFlatCoordinates, getCenter } from '../extent.js';
|
|
23
22
|
import { rotate, scale, transform2D, translate } from './flat/transform.js';
|
|
@@ -35,9 +34,9 @@ var SimpleGeometry = /** @class */ (function (_super) {
|
|
|
35
34
|
var _this = _super.call(this) || this;
|
|
36
35
|
/**
|
|
37
36
|
* @protected
|
|
38
|
-
* @type {import("./
|
|
37
|
+
* @type {import("./Geometry.js").GeometryLayout}
|
|
39
38
|
*/
|
|
40
|
-
_this.layout =
|
|
39
|
+
_this.layout = 'XY';
|
|
41
40
|
/**
|
|
42
41
|
* @protected
|
|
43
42
|
* @type {number}
|
|
@@ -88,8 +87,8 @@ var SimpleGeometry = /** @class */ (function (_super) {
|
|
|
88
87
|
return this.flatCoordinates.slice(this.flatCoordinates.length - this.stride);
|
|
89
88
|
};
|
|
90
89
|
/**
|
|
91
|
-
* Return the {@link
|
|
92
|
-
* @return {import("./
|
|
90
|
+
* Return the {@link import("./Geometry.js").GeometryLayout layout} of the geometry.
|
|
91
|
+
* @return {import("./Geometry.js").GeometryLayout} Layout.
|
|
93
92
|
* @api
|
|
94
93
|
*/
|
|
95
94
|
SimpleGeometry.prototype.getLayout = function () {
|
|
@@ -143,7 +142,7 @@ var SimpleGeometry = /** @class */ (function (_super) {
|
|
|
143
142
|
return this.stride;
|
|
144
143
|
};
|
|
145
144
|
/**
|
|
146
|
-
* @param {import("./
|
|
145
|
+
* @param {import("./Geometry.js").GeometryLayout} layout Layout.
|
|
147
146
|
* @param {Array<number>} flatCoordinates Flat coordinates.
|
|
148
147
|
*/
|
|
149
148
|
SimpleGeometry.prototype.setFlatCoordinates = function (layout, flatCoordinates) {
|
|
@@ -154,13 +153,13 @@ var SimpleGeometry = /** @class */ (function (_super) {
|
|
|
154
153
|
/**
|
|
155
154
|
* @abstract
|
|
156
155
|
* @param {!Array<*>} coordinates Coordinates.
|
|
157
|
-
* @param {import("./
|
|
156
|
+
* @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
|
|
158
157
|
*/
|
|
159
158
|
SimpleGeometry.prototype.setCoordinates = function (coordinates, opt_layout) {
|
|
160
159
|
abstract();
|
|
161
160
|
};
|
|
162
161
|
/**
|
|
163
|
-
* @param {import("./
|
|
162
|
+
* @param {import("./Geometry.js").GeometryLayout|undefined} layout Layout.
|
|
164
163
|
* @param {Array<*>} coordinates Coordinates.
|
|
165
164
|
* @param {number} nesting Nesting.
|
|
166
165
|
* @protected
|
|
@@ -174,7 +173,7 @@ var SimpleGeometry = /** @class */ (function (_super) {
|
|
|
174
173
|
else {
|
|
175
174
|
for (var i = 0; i < nesting; ++i) {
|
|
176
175
|
if (coordinates.length === 0) {
|
|
177
|
-
this.layout =
|
|
176
|
+
this.layout = 'XY';
|
|
178
177
|
this.stride = 2;
|
|
179
178
|
return;
|
|
180
179
|
}
|
|
@@ -262,34 +261,34 @@ var SimpleGeometry = /** @class */ (function (_super) {
|
|
|
262
261
|
}(Geometry));
|
|
263
262
|
/**
|
|
264
263
|
* @param {number} stride Stride.
|
|
265
|
-
* @return {import("./
|
|
264
|
+
* @return {import("./Geometry.js").GeometryLayout} layout Layout.
|
|
266
265
|
*/
|
|
267
266
|
function getLayoutForStride(stride) {
|
|
268
267
|
var layout;
|
|
269
268
|
if (stride == 2) {
|
|
270
|
-
layout =
|
|
269
|
+
layout = 'XY';
|
|
271
270
|
}
|
|
272
271
|
else if (stride == 3) {
|
|
273
|
-
layout =
|
|
272
|
+
layout = 'XYZ';
|
|
274
273
|
}
|
|
275
274
|
else if (stride == 4) {
|
|
276
|
-
layout =
|
|
275
|
+
layout = 'XYZM';
|
|
277
276
|
}
|
|
278
|
-
return /** @type {import("./
|
|
277
|
+
return /** @type {import("./Geometry.js").GeometryLayout} */ (layout);
|
|
279
278
|
}
|
|
280
279
|
/**
|
|
281
|
-
* @param {import("./
|
|
280
|
+
* @param {import("./Geometry.js").GeometryLayout} layout Layout.
|
|
282
281
|
* @return {number} Stride.
|
|
283
282
|
*/
|
|
284
283
|
export function getStrideForLayout(layout) {
|
|
285
284
|
var stride;
|
|
286
|
-
if (layout ==
|
|
285
|
+
if (layout == 'XY') {
|
|
287
286
|
stride = 2;
|
|
288
287
|
}
|
|
289
|
-
else if (layout ==
|
|
288
|
+
else if (layout == 'XYZ' || layout == 'XYM') {
|
|
290
289
|
stride = 3;
|
|
291
290
|
}
|
|
292
|
-
else if (layout ==
|
|
291
|
+
else if (layout == 'XYZM') {
|
|
293
292
|
stride = 4;
|
|
294
293
|
}
|
|
295
294
|
return /** @type {number} */ (stride);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleGeometry.js","sourceRoot":"","sources":["../src/geom/SimpleGeometry.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"SimpleGeometry.js","sourceRoot":"","sources":["../src/geom/SimpleGeometry.js"],"names":[],"mappings":"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"}
|
package/interaction/Draw.d.ts
CHANGED
|
@@ -140,12 +140,7 @@ export type Options = {
|
|
|
140
140
|
* Layout of the
|
|
141
141
|
* feature geometries created by the draw interaction.
|
|
142
142
|
*/
|
|
143
|
-
geometryLayout?:
|
|
144
|
-
XY: string;
|
|
145
|
-
XYZ: string;
|
|
146
|
-
XYM: string;
|
|
147
|
-
XYZM: string;
|
|
148
|
-
} | undefined;
|
|
143
|
+
geometryLayout?: import("../geom/Geometry.js").GeometryLayout | undefined;
|
|
149
144
|
};
|
|
150
145
|
/**
|
|
151
146
|
* Coordinate type when drawing points.
|
|
@@ -170,6 +165,11 @@ export type SketchCoordType = number[] | LineCoordType | PolyCoordType;
|
|
|
170
165
|
* a second argument.
|
|
171
166
|
*/
|
|
172
167
|
export type GeometryFunction = (arg0: SketchCoordType, arg1: import("../geom/SimpleGeometry.js").default, arg2: import("../proj/Projection.js").default) => import("../geom/SimpleGeometry.js").default;
|
|
168
|
+
/**
|
|
169
|
+
* Draw mode. This collapses multi-part geometry types with their single-part
|
|
170
|
+
* cousins.
|
|
171
|
+
*/
|
|
172
|
+
export type Mode = 'Point' | 'LineString' | 'Polygon' | 'Circle';
|
|
173
173
|
/**
|
|
174
174
|
* *
|
|
175
175
|
*/
|
|
@@ -306,7 +306,7 @@ declare class Draw extends PointerInteraction {
|
|
|
306
306
|
private finishCondition_;
|
|
307
307
|
/**
|
|
308
308
|
* @private
|
|
309
|
-
* @type {import("../geom/
|
|
309
|
+
* @type {import("../geom/Geometry.js").GeometryLayout}
|
|
310
310
|
*/
|
|
311
311
|
private geometryLayout_;
|
|
312
312
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Draw.d.ts","sourceRoot":"","sources":["../src/interaction/Draw.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Draw.d.ts","sourceRoot":"","sources":["../src/interaction/Draw.js"],"names":[],"mappings":"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"}
|
package/interaction/Draw.js
CHANGED
|
@@ -20,7 +20,6 @@ import Circle from '../geom/Circle.js';
|
|
|
20
20
|
import Event from '../events/Event.js';
|
|
21
21
|
import EventType from '../events/EventType.js';
|
|
22
22
|
import Feature from '../Feature.js';
|
|
23
|
-
import GeometryLayout from '../geom/GeometryLayout.js';
|
|
24
23
|
import InteractionProperty from './Property.js';
|
|
25
24
|
import LineString from '../geom/LineString.js';
|
|
26
25
|
import MapBrowserEvent from '../MapBrowserEvent.js';
|
|
@@ -91,7 +90,7 @@ import { squaredDistance as squaredCoordinateDistance } from '../coordinate.js';
|
|
|
91
90
|
* Shift key activates freehand drawing.
|
|
92
91
|
* @property {boolean} [wrapX=false] Wrap the world horizontally on the sketch
|
|
93
92
|
* overlay.
|
|
94
|
-
* @property {GeometryLayout} [geometryLayout='XY'] Layout of the
|
|
93
|
+
* @property {import("../geom/Geometry.js").GeometryLayout} [geometryLayout='XY'] Layout of the
|
|
95
94
|
* feature geometries created by the draw interaction.
|
|
96
95
|
*/
|
|
97
96
|
/**
|
|
@@ -120,16 +119,10 @@ import { squaredDistance as squaredCoordinateDistance } from '../coordinate.js';
|
|
|
120
119
|
* import("../geom/SimpleGeometry.js").default} GeometryFunction
|
|
121
120
|
*/
|
|
122
121
|
/**
|
|
122
|
+
* @typedef {'Point' | 'LineString' | 'Polygon' | 'Circle'} Mode
|
|
123
123
|
* Draw mode. This collapses multi-part geometry types with their single-part
|
|
124
124
|
* cousins.
|
|
125
|
-
* @enum {string}
|
|
126
125
|
*/
|
|
127
|
-
var Mode = {
|
|
128
|
-
POINT: 'Point',
|
|
129
|
-
LINE_STRING: 'LineString',
|
|
130
|
-
POLYGON: 'Polygon',
|
|
131
|
-
CIRCLE: 'Circle',
|
|
132
|
-
};
|
|
133
126
|
/**
|
|
134
127
|
* @enum {string}
|
|
135
128
|
*/
|
|
@@ -294,7 +287,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
294
287
|
*/
|
|
295
288
|
_this.minPoints_ = options.minPoints
|
|
296
289
|
? options.minPoints
|
|
297
|
-
: _this.mode_ ===
|
|
290
|
+
: _this.mode_ === 'Polygon'
|
|
298
291
|
? 3
|
|
299
292
|
: 2;
|
|
300
293
|
/**
|
|
@@ -304,7 +297,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
304
297
|
* @private
|
|
305
298
|
*/
|
|
306
299
|
_this.maxPoints_ =
|
|
307
|
-
_this.mode_ ===
|
|
300
|
+
_this.mode_ === 'Circle'
|
|
308
301
|
? 2
|
|
309
302
|
: options.maxPoints
|
|
310
303
|
? options.maxPoints
|
|
@@ -319,15 +312,15 @@ var Draw = /** @class */ (function (_super) {
|
|
|
319
312
|
: TRUE;
|
|
320
313
|
/**
|
|
321
314
|
* @private
|
|
322
|
-
* @type {import("../geom/
|
|
315
|
+
* @type {import("../geom/Geometry.js").GeometryLayout}
|
|
323
316
|
*/
|
|
324
317
|
_this.geometryLayout_ = options.geometryLayout
|
|
325
318
|
? options.geometryLayout
|
|
326
|
-
:
|
|
319
|
+
: 'XY';
|
|
327
320
|
var geometryFunction = options.geometryFunction;
|
|
328
321
|
if (!geometryFunction) {
|
|
329
322
|
var mode_1 = _this.mode_;
|
|
330
|
-
if (mode_1 ===
|
|
323
|
+
if (mode_1 === 'Circle') {
|
|
331
324
|
/**
|
|
332
325
|
* @param {!LineCoordType} coordinates The coordinates.
|
|
333
326
|
* @param {import("../geom/SimpleGeometry.js").default|undefined} geometry Optional geometry.
|
|
@@ -350,13 +343,13 @@ var Draw = /** @class */ (function (_super) {
|
|
|
350
343
|
}
|
|
351
344
|
else {
|
|
352
345
|
var Constructor_1;
|
|
353
|
-
if (mode_1 ===
|
|
346
|
+
if (mode_1 === 'Point') {
|
|
354
347
|
Constructor_1 = Point;
|
|
355
348
|
}
|
|
356
|
-
else if (mode_1 ===
|
|
349
|
+
else if (mode_1 === 'LineString') {
|
|
357
350
|
Constructor_1 = LineString;
|
|
358
351
|
}
|
|
359
|
-
else if (mode_1 ===
|
|
352
|
+
else if (mode_1 === 'Polygon') {
|
|
360
353
|
Constructor_1 = Polygon;
|
|
361
354
|
}
|
|
362
355
|
/**
|
|
@@ -367,7 +360,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
367
360
|
*/
|
|
368
361
|
geometryFunction = function (coordinates, geometry, projection) {
|
|
369
362
|
if (geometry) {
|
|
370
|
-
if (mode_1 ===
|
|
363
|
+
if (mode_1 === 'Polygon') {
|
|
371
364
|
if (coordinates[0].length) {
|
|
372
365
|
// Add a closing coordinate to match the first
|
|
373
366
|
geometry.setCoordinates([coordinates[0].concat([coordinates[0][0]])], this.geometryLayout_);
|
|
@@ -514,8 +507,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
514
507
|
// Avoid context menu for long taps when drawing on mobile
|
|
515
508
|
event.originalEvent.preventDefault();
|
|
516
509
|
}
|
|
517
|
-
this.freehand_ =
|
|
518
|
-
this.mode_ !== Mode.POINT && this.freehandCondition_(event);
|
|
510
|
+
this.freehand_ = this.mode_ !== 'Point' && this.freehandCondition_(event);
|
|
519
511
|
var move = event.type === MapBrowserEventType.POINTERMOVE;
|
|
520
512
|
var pass = true;
|
|
521
513
|
if (!this.freehand_ &&
|
|
@@ -614,7 +606,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
614
606
|
this.finishDrawing();
|
|
615
607
|
}
|
|
616
608
|
else if (!this.freehand_ &&
|
|
617
|
-
(!startingToDraw || this.mode_ ===
|
|
609
|
+
(!startingToDraw || this.mode_ === 'Point')) {
|
|
618
610
|
if (this.atFinish_(event.pixel)) {
|
|
619
611
|
if (this.finishCondition_(event)) {
|
|
620
612
|
this.finishDrawing();
|
|
@@ -676,16 +668,16 @@ var Draw = /** @class */ (function (_super) {
|
|
|
676
668
|
var potentiallyDone = false;
|
|
677
669
|
var potentiallyFinishCoordinates = [this.finishCoordinate_];
|
|
678
670
|
var mode = this.mode_;
|
|
679
|
-
if (mode ===
|
|
671
|
+
if (mode === 'Point') {
|
|
680
672
|
at = true;
|
|
681
673
|
}
|
|
682
|
-
else if (mode ===
|
|
674
|
+
else if (mode === 'Circle') {
|
|
683
675
|
at = this.sketchCoords_.length === 2;
|
|
684
676
|
}
|
|
685
|
-
else if (mode ===
|
|
677
|
+
else if (mode === 'LineString') {
|
|
686
678
|
potentiallyDone = this.sketchCoords_.length > this.minPoints_;
|
|
687
679
|
}
|
|
688
|
-
else if (mode ===
|
|
680
|
+
else if (mode === 'Polygon') {
|
|
689
681
|
var sketchCoords = /** @type {PolyCoordType} */ (this.sketchCoords_);
|
|
690
682
|
potentiallyDone = sketchCoords[0].length > this.minPoints_;
|
|
691
683
|
potentiallyFinishCoordinates = [
|
|
@@ -756,10 +748,10 @@ var Draw = /** @class */ (function (_super) {
|
|
|
756
748
|
start.push(0);
|
|
757
749
|
}
|
|
758
750
|
this.finishCoordinate_ = start;
|
|
759
|
-
if (this.mode_ ===
|
|
751
|
+
if (this.mode_ === 'Point') {
|
|
760
752
|
this.sketchCoords_ = start.slice();
|
|
761
753
|
}
|
|
762
|
-
else if (this.mode_ ===
|
|
754
|
+
else if (this.mode_ === 'Polygon') {
|
|
763
755
|
this.sketchCoords_ = [[start.slice(), start.slice()]];
|
|
764
756
|
this.sketchLineCoords_ = this.sketchCoords_[0];
|
|
765
757
|
}
|
|
@@ -792,10 +784,10 @@ var Draw = /** @class */ (function (_super) {
|
|
|
792
784
|
while (coordinate.length < stride) {
|
|
793
785
|
coordinate.push(0);
|
|
794
786
|
}
|
|
795
|
-
if (this.mode_ ===
|
|
787
|
+
if (this.mode_ === 'Point') {
|
|
796
788
|
last = this.sketchCoords_;
|
|
797
789
|
}
|
|
798
|
-
else if (this.mode_ ===
|
|
790
|
+
else if (this.mode_ === 'Polygon') {
|
|
799
791
|
coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
|
|
800
792
|
last = coordinates[coordinates.length - 1];
|
|
801
793
|
if (this.atFinish_(map.getPixelFromCoordinate(coordinate))) {
|
|
@@ -815,7 +807,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
815
807
|
var sketchPointGeom = this.sketchPoint_.getGeometry();
|
|
816
808
|
sketchPointGeom.setCoordinates(coordinate);
|
|
817
809
|
}
|
|
818
|
-
if (geometry.getType() === 'Polygon' && this.mode_ !==
|
|
810
|
+
if (geometry.getType() === 'Polygon' && this.mode_ !== 'Polygon') {
|
|
819
811
|
this.createOrUpdateCustomSketchLine_(/** @type {Polygon} */ (geometry));
|
|
820
812
|
}
|
|
821
813
|
else if (this.sketchLineCoords_) {
|
|
@@ -835,7 +827,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
835
827
|
var done;
|
|
836
828
|
var coordinates;
|
|
837
829
|
var mode = this.mode_;
|
|
838
|
-
if (mode ===
|
|
830
|
+
if (mode === 'LineString' || mode === 'Circle') {
|
|
839
831
|
this.finishCoordinate_ = coordinate.slice();
|
|
840
832
|
coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
|
|
841
833
|
if (coordinates.length >= this.maxPoints_) {
|
|
@@ -849,7 +841,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
849
841
|
coordinates.push(coordinate.slice());
|
|
850
842
|
this.geometryFunction_(coordinates, geometry, projection);
|
|
851
843
|
}
|
|
852
|
-
else if (mode ===
|
|
844
|
+
else if (mode === 'Polygon') {
|
|
853
845
|
coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
|
|
854
846
|
if (coordinates.length >= this.maxPoints_) {
|
|
855
847
|
if (this.freehand_) {
|
|
@@ -884,7 +876,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
884
876
|
var projection = this.getMap().getView().getProjection();
|
|
885
877
|
var coordinates;
|
|
886
878
|
var mode = this.mode_;
|
|
887
|
-
if (mode ===
|
|
879
|
+
if (mode === 'LineString' || mode === 'Circle') {
|
|
888
880
|
coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
|
|
889
881
|
coordinates.splice(-2, 1);
|
|
890
882
|
if (coordinates.length >= 2) {
|
|
@@ -898,7 +890,7 @@ var Draw = /** @class */ (function (_super) {
|
|
|
898
890
|
this.createOrUpdateCustomSketchLine_(/** @type {Polygon} */ (geometry));
|
|
899
891
|
}
|
|
900
892
|
}
|
|
901
|
-
else if (mode ===
|
|
893
|
+
else if (mode === 'Polygon') {
|
|
902
894
|
coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
|
|
903
895
|
coordinates.splice(-2, 1);
|
|
904
896
|
var sketchLineGeom = this.sketchLine_.getGeometry();
|
|
@@ -929,12 +921,12 @@ var Draw = /** @class */ (function (_super) {
|
|
|
929
921
|
var coordinates = this.sketchCoords_;
|
|
930
922
|
var geometry = sketchFeature.getGeometry();
|
|
931
923
|
var projection = this.getMap().getView().getProjection();
|
|
932
|
-
if (this.mode_ ===
|
|
924
|
+
if (this.mode_ === 'LineString') {
|
|
933
925
|
// remove the redundant last point
|
|
934
926
|
coordinates.pop();
|
|
935
927
|
this.geometryFunction_(coordinates, geometry, projection);
|
|
936
928
|
}
|
|
937
|
-
else if (this.mode_ ===
|
|
929
|
+
else if (this.mode_ === 'Polygon') {
|
|
938
930
|
// remove the redundant last point in ring
|
|
939
931
|
/** @type {PolyCoordType} */ (coordinates)[0].pop();
|
|
940
932
|
this.geometryFunction_(coordinates, geometry, projection);
|
|
@@ -1001,10 +993,10 @@ var Draw = /** @class */ (function (_super) {
|
|
|
1001
993
|
}
|
|
1002
994
|
/** @type {LineCoordType} */
|
|
1003
995
|
var sketchCoords;
|
|
1004
|
-
if (mode ===
|
|
996
|
+
if (mode === 'LineString' || mode === 'Circle') {
|
|
1005
997
|
sketchCoords = /** @type {LineCoordType} */ (this.sketchCoords_);
|
|
1006
998
|
}
|
|
1007
|
-
else if (mode ===
|
|
999
|
+
else if (mode === 'Polygon') {
|
|
1008
1000
|
sketchCoords =
|
|
1009
1001
|
this.sketchCoords_ && this.sketchCoords_.length
|
|
1010
1002
|
? /** @type {PolyCoordType} */ (this.sketchCoords_)[0]
|
|
@@ -1178,15 +1170,15 @@ function getMode(type) {
|
|
|
1178
1170
|
switch (type) {
|
|
1179
1171
|
case 'Point':
|
|
1180
1172
|
case 'MultiPoint':
|
|
1181
|
-
return
|
|
1173
|
+
return 'Point';
|
|
1182
1174
|
case 'LineString':
|
|
1183
1175
|
case 'MultiLineString':
|
|
1184
|
-
return
|
|
1176
|
+
return 'LineString';
|
|
1185
1177
|
case 'Polygon':
|
|
1186
1178
|
case 'MultiPolygon':
|
|
1187
|
-
return
|
|
1179
|
+
return 'Polygon';
|
|
1188
1180
|
case 'Circle':
|
|
1189
|
-
return
|
|
1181
|
+
return 'Circle';
|
|
1190
1182
|
default:
|
|
1191
1183
|
throw new Error('Invalid type: ' + type);
|
|
1192
1184
|
}
|