ol 6.12.1-dev.1643381905554 → 6.12.1-dev.1643547277963

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 (20) hide show
  1. package/format/MVT.d.ts.map +1 -1
  2. package/format/MVT.js +11 -28
  3. package/format/MVT.js.map +1 -1
  4. package/format/OSMXML.d.ts.map +1 -1
  5. package/format/OSMXML.js +6 -2
  6. package/format/OSMXML.js.map +1 -1
  7. package/geom/flat/orient.d.ts +8 -0
  8. package/geom/flat/orient.d.ts.map +1 -1
  9. package/geom/flat/orient.js +28 -0
  10. package/geom/flat/orient.js.map +1 -1
  11. package/package.json +1 -1
  12. package/render/Feature.d.ts +26 -0
  13. package/render/Feature.d.ts.map +1 -1
  14. package/render/Feature.js +59 -0
  15. package/render/Feature.js.map +1 -1
  16. package/src/format/MVT.js +11 -26
  17. package/src/format/OSMXML.js +6 -2
  18. package/src/geom/flat/orient.js +28 -0
  19. package/src/render/Feature.js +77 -0
  20. package/util.js +1 -1
package/format/MVT.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["../src/format/MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA;;;;;;;;;;;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,uBAuFC;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":["../src/format/MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA;;;;;;;;;;;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,uBAwEC;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
@@ -33,7 +33,7 @@ import RenderFeature from '../render/Feature.js';
33
33
  import Units from '../proj/Units.js';
34
34
  import { assert } from '../asserts.js';
35
35
  import { get } from '../proj.js';
36
- import { linearRingIsClockwise } from '../geom/flat/orient.js';
36
+ import { inflateEnds } from '../geom/flat/orient.js';
37
37
  /**
38
38
  * @typedef {Object} Options
39
39
  * @property {import("../Feature.js").FeatureClass} [featureClass] Class for features returned by
@@ -178,8 +178,8 @@ var MVT = /** @class */ (function (_super) {
178
178
  delete values[this.idProperty_];
179
179
  }
180
180
  values[this.layerName_] = rawFeature.layer.name;
181
- var flatCoordinates = [];
182
- var ends = [];
181
+ var flatCoordinates = /** @type {Array<number>} */ ([]);
182
+ var ends = /** @type {Array<number>} */ ([]);
183
183
  this.readRawGeometry_(pbf, rawFeature, flatCoordinates, ends);
184
184
  var geometryType = getGeometryType(type, ends.length);
185
185
  if (this.featureClass_ === RenderFeature) {
@@ -189,30 +189,11 @@ var MVT = /** @class */ (function (_super) {
189
189
  else {
190
190
  var geom = void 0;
191
191
  if (geometryType == GeometryType.POLYGON) {
192
- var endss = [];
193
- var offset = 0;
194
- var prevEndIndex = 0;
195
- for (var i = 0, ii = ends.length; i < ii; ++i) {
196
- var end = ends[i];
197
- // classifies an array of rings into polygons with outer rings and holes
198
- if (!linearRingIsClockwise(flatCoordinates, offset, end, 2)) {
199
- endss.push(ends.slice(prevEndIndex, i + 1));
200
- }
201
- else {
202
- if (endss.length === 0) {
203
- continue;
204
- }
205
- endss[endss.length - 1].push(ends[prevEndIndex]);
206
- }
207
- prevEndIndex = i + 1;
208
- offset = end;
209
- }
210
- if (endss.length > 1) {
211
- geom = new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss);
212
- }
213
- else {
214
- geom = new Polygon(flatCoordinates, GeometryLayout.XY, ends);
215
- }
192
+ var endss = inflateEnds(flatCoordinates, ends);
193
+ geom =
194
+ endss.length > 1
195
+ ? new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss)
196
+ : new Polygon(flatCoordinates, GeometryLayout.XY, ends);
216
197
  }
217
198
  else {
218
199
  geom =
@@ -235,7 +216,9 @@ var MVT = /** @class */ (function (_super) {
235
216
  }
236
217
  var geometry = transformGeometryWithOptions(geom, false, options);
237
218
  feature.setGeometry(geometry);
238
- feature.setId(id);
219
+ if (id !== undefined) {
220
+ feature.setId(id);
221
+ }
239
222
  feature.setProperties(values, true);
240
223
  }
241
224
  return feature;
package/format/MVT.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MVT.js","sourceRoot":"","sources":["../src/format/MVT.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MVT.js","sourceRoot":"","sources":["../src/format/MVT.js"],"names":[],"mappings":"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"}
package/format/OSMXML.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OSMXML.d.ts","sourceRoot":"","sources":["../src/format/OSMXML.js"],"names":[],"mappings":";AA0CA;;;;;;GAMG;AACH;IAII;;OAEG;IACH,gBAFU,OAAO,uBAAuB,EAAE,OAAO,CAED;CAoDnD"}
1
+ {"version":3,"file":"OSMXML.d.ts","sourceRoot":"","sources":["../src/format/OSMXML.js"],"names":[],"mappings":";AA0CA;;;;;;GAMG;AACH;IAII;;OAEG;IACH,gBAFU,OAAO,uBAAuB,EAAE,OAAO,CAED;CAsDnD"}
package/format/OSMXML.js CHANGED
@@ -103,7 +103,9 @@ var OSMXML = /** @class */ (function (_super) {
103
103
  }
104
104
  transformGeometryWithOptions(geometry, false, options);
105
105
  var feature = new Feature(geometry);
106
- feature.setId(values.id);
106
+ if (values.id !== undefined) {
107
+ feature.setId(values.id);
108
+ }
107
109
  feature.setProperties(values.tags, true);
108
110
  state.features.push(feature);
109
111
  }
@@ -144,7 +146,9 @@ function readNode(node, objectStack) {
144
146
  var geometry = new Point(coordinates);
145
147
  transformGeometryWithOptions(geometry, false, options);
146
148
  var feature = new Feature(geometry);
147
- feature.setId(id);
149
+ if (id !== undefined) {
150
+ feature.setId(id);
151
+ }
148
152
  feature.setProperties(values.tags, true);
149
153
  state.features.push(feature);
150
154
  }
package/format/OSMXML.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OSMXML.js","sourceRoot":"","sources":["../src/format/OSMXML.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OSMXML.js","sourceRoot":"","sources":["../src/format/OSMXML.js"],"names":[],"mappings":"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"}
package/geom/flat/orient.d.ts CHANGED
@@ -65,4 +65,12 @@ export function orientLinearRings(flatCoordinates: Array<number>, offset: number
65
65
  * @return {number} End.
66
66
  */
67
67
  export function orientLinearRingsArray(flatCoordinates: Array<number>, offset: number, endss: Array<Array<number>>, stride: number, opt_right?: boolean | undefined): number;
68
+ /**
69
+ * Return a two-dimensional endss
70
+ * @param {Array<number>} flatCoordinates Flat coordinates
71
+ * @param {Array<number>} ends Linear ring end indexes
72
+ * @return {Array<Array<number>>} Two dimensional endss array that can
73
+ * be used to contruct a MultiPolygon
74
+ */
75
+ export function inflateEnds(flatCoordinates: Array<number>, ends: Array<number>): Array<Array<number>>;
68
76
  //# sourceMappingURL=orient.d.ts.map
package/geom/flat/orient.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"orient.d.ts","sourceRoot":"","sources":["../../src/geom/flat/orient.js"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,uDANW,MAAM,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,GACL,OAAO,CAgBlB;AAED;;;;;;;;;;;;GAYG;AACH,wDARW,MAAM,MAAM,CAAC,UACb,MAAM,QACN,MAAM,MAAM,CAAC,UACb,MAAM,oCAGL,OAAO,CA8BlB;AAED;;;;;;;;;;;;GAYG;AACH,yDARW,MAAM,MAAM,CAAC,UACb,MAAM,SACN,MAAM,MAAM,MAAM,CAAC,CAAC,UACpB,MAAM,oCAGL,OAAO,CAqBlB;AAED;;;;;;;;;;;;GAYG;AACH,mDAPW,MAAM,MAAM,CAAC,UACb,MAAM,QACN,MAAM,MAAM,CAAC,UACb,MAAM,oCAEL,MAAM,CA4BjB;AAED;;;;;;;;;;;;GAYG;AACH,wDAPW,MAAM,MAAM,CAAC,UACb,MAAM,SACN,MAAM,MAAM,MAAM,CAAC,CAAC,UACpB,MAAM,oCAEL,MAAM,CAmBjB"}
1
+ {"version":3,"file":"orient.d.ts","sourceRoot":"","sources":["../../src/geom/flat/orient.js"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,uDANW,MAAM,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,GACL,OAAO,CAgBlB;AAED;;;;;;;;;;;;GAYG;AACH,wDARW,MAAM,MAAM,CAAC,UACb,MAAM,QACN,MAAM,MAAM,CAAC,UACb,MAAM,oCAGL,OAAO,CA8BlB;AAED;;;;;;;;;;;;GAYG;AACH,yDARW,MAAM,MAAM,CAAC,UACb,MAAM,SACN,MAAM,MAAM,MAAM,CAAC,CAAC,UACpB,MAAM,oCAGL,OAAO,CAqBlB;AAED;;;;;;;;;;;;GAYG;AACH,mDAPW,MAAM,MAAM,CAAC,UACb,MAAM,QACN,MAAM,MAAM,CAAC,UACb,MAAM,oCAEL,MAAM,CA4BjB;AAED;;;;;;;;;;;;GAYG;AACH,wDAPW,MAAM,MAAM,CAAC,UACb,MAAM,SACN,MAAM,MAAM,MAAM,CAAC,CAAC,UACpB,MAAM,oCAEL,MAAM,CAmBjB;AAED;;;;;;GAMG;AACH,6CALW,MAAM,MAAM,CAAC,QACb,MAAM,MAAM,CAAC,GACZ,MAAM,MAAM,MAAM,CAAC,CAAC,CAsB/B"}
package/geom/flat/orient.js CHANGED
@@ -131,4 +131,32 @@ export function orientLinearRingsArray(flatCoordinates, offset, endss, stride, o
131
131
  }
132
132
  return offset;
133
133
  }
134
+ /**
135
+ * Return a two-dimensional endss
136
+ * @param {Array<number>} flatCoordinates Flat coordinates
137
+ * @param {Array<number>} ends Linear ring end indexes
138
+ * @return {Array<Array<number>>} Two dimensional endss array that can
139
+ * be used to contruct a MultiPolygon
140
+ */
141
+ export function inflateEnds(flatCoordinates, ends) {
142
+ var endss = [];
143
+ var offset = 0;
144
+ var prevEndIndex = 0;
145
+ for (var i = 0, ii = ends.length; i < ii; ++i) {
146
+ var end = ends[i];
147
+ // classifies an array of rings into polygons with outer rings and holes
148
+ if (!linearRingIsClockwise(flatCoordinates, offset, end, 2)) {
149
+ endss.push(ends.slice(prevEndIndex, i + 1));
150
+ }
151
+ else {
152
+ if (endss.length === 0) {
153
+ continue;
154
+ }
155
+ endss[endss.length - 1].push(ends[prevEndIndex]);
156
+ }
157
+ prevEndIndex = i + 1;
158
+ offset = end;
159
+ }
160
+ return endss;
161
+ }
134
162
  //# sourceMappingURL=orient.js.map
package/geom/flat/orient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"orient.js","sourceRoot":"","sources":["../../src/geom/flat/orient.js"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAC,WAAW,IAAI,kBAAkB,EAAC,MAAM,cAAc,CAAC;AAE/D;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IACxE,+DAA+D;IAC/D,uEAAuE;IACvE,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,EAAE,GAAG,eAAe,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;IACvC,IAAI,EAAE,GAAG,eAAe,CAAC,GAAG,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,OAAO,MAAM,GAAG,GAAG,EAAE,MAAM,IAAI,MAAM,EAAE;QACrC,IAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACnC,IAAM,EAAE,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,IAAI,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9B,EAAE,GAAG,EAAE,CAAC;QACR,EAAE,GAAG,EAAE,CAAC;KACT;IACD,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CACpC,eAAe,EACf,MAAM,EACN,IAAI,EACJ,MAAM,EACN,SAAS;IAET,IAAM,KAAK,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE;QAC7C,IAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAM,WAAW,GAAG,qBAAqB,CACvC,eAAe,EACf,MAAM,EACN,GAAG,EACH,MAAM,CACP,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,EAAE;gBACtD,OAAO,KAAK,CAAC;aACd;SACF;aAAM;YACL,IAAI,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,WAAW,CAAC,EAAE;gBACtD,OAAO,KAAK,CAAC;aACd;SACF;QACD,MAAM,GAAG,GAAG,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,uBAAuB,CACrC,eAAe,EACf,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS;IAET,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE;QAC9C,IAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IACE,CAAC,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EACzE;YACA,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAChC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,iBAAiB,CAC/B,eAAe,EACf,MAAM,EACN,IAAI,EACJ,MAAM,EACN,SAAS;IAET,IAAM,KAAK,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE;QAC7C,IAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAM,WAAW,GAAG,qBAAqB,CACvC,eAAe,EACf,MAAM,EACN,GAAG,EACH,MAAM,CACP,CAAC;QACF,IAAM,OAAO,GACX,CAAC,KAAK,CAAC;YACL,CAAC,CAAC,CAAC,KAAK,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC;YACpD,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC;QACzD,IAAI,OAAO,EAAE;YACX,kBAAkB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;SAC1D;QACD,MAAM,GAAG,GAAG,CAAC;KACd;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CACpC,eAAe,EACf,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS;IAET,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE;QAC9C,MAAM,GAAG,iBAAiB,CACxB,eAAe,EACf,MAAM,EACN,KAAK,CAAC,CAAC,CAAC,EACR,MAAM,EACN,SAAS,CACV,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"orient.js","sourceRoot":"","sources":["../../src/geom/flat/orient.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "6.12.1-dev.1643381905554",
3
+ "version": "6.12.1-dev.1643547277963",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
package/render/Feature.d.ts CHANGED
@@ -1,3 +1,22 @@
1
+ /**
2
+ * Create a geometry from an `ol/render/Feature`
3
+ * @param {RenderFeature} renderFeature
4
+ * Render Feature
5
+ * @return {Point|MultiPoint|LineString|MultiLineString|Polygon|MultiPolygon}
6
+ * New geometry instance.
7
+ * @api
8
+ */
9
+ export function toGeometry(renderFeature: RenderFeature): Point | MultiPoint | LineString | MultiLineString | Polygon | MultiPolygon;
10
+ /**
11
+ * Create an `ol/Feature` from an `ol/render/Feature`
12
+ * @param {RenderFeature} renderFeature RenderFeature
13
+ * @param {string} [opt_geometryName='geometry'] Geometry name to use
14
+ * when creating the Feature.
15
+ * @return {Feature} Newly constructed `ol/Feature` with properties,
16
+ * geometry, and id copied over.
17
+ * @api
18
+ */
19
+ export function toFeature(renderFeature: RenderFeature, opt_geometryName?: string | undefined): Feature;
1
20
  export default RenderFeature;
2
21
  /**
3
22
  * Lightweight, read-only, {@link module:ol/Feature~Feature} and {@link module:ol/geom/Geometry~Geometry} like
@@ -158,4 +177,11 @@ declare class RenderFeature {
158
177
  */
159
178
  getFlatCoordinates: () => Array<number>;
160
179
  }
180
+ import { Point } from "../geom.js";
181
+ import { MultiPoint } from "../geom.js";
182
+ import { LineString } from "../geom.js";
183
+ import { MultiLineString } from "../geom.js";
184
+ import { Polygon } from "../geom.js";
185
+ import { MultiPolygon } from "../geom.js";
186
+ import Feature from "../Feature.js";
161
187
  //# sourceMappingURL=Feature.d.ts.map
package/render/Feature.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Feature.d.ts","sourceRoot":"","sources":["../src/render/Feature.js"],"names":[],"mappings":";AA6BA;;;;GAIG;AACH;IACE;;;;;;;OAOG;IACH,wCANW,MAAM,MAAM,CAAC,QAEb,MAAM,MAAM,CAAC,GAAC,MAAM,MAAM,MAAM,CAAC,CAAC;YAC3B,MAAM;WACb,MAAM,GAAC,MAAM,GAAC,SAAS,EAuDjC;IApDC;;OAEG;IACH,eAFU,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAE3C;IAElB;;;OAGG;IACH,gBAAY;IAEZ;;;OAGG;IACH,YAAa;IAEb;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,yBAAuC;IAEvC;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,oBAA6B;IAG/B;;;;;OAKG;IACH,SAJW,MAAM,OAMhB;IAED;;;;OAIG;IACH,aAHY,OAAO,cAAc,EAAE,MAAM,CAgBxC;IAED;;OAEG;IACH,wBAFY,MAAM,MAAM,CAAC,CAexB;IAED;;OAEG;IACH,yBAFY,MAAM,MAAM,CAAC,CAmBxB;IAED;;OAEG;IACH,mBAFY,MAAM,MAAM,CAAC,CAaxB;IAED;;OAEG;IACH,oBAFY,MAAM,MAAM,CAAC,CAgBxB;IAED;;;;;OAKG;IACH,SAHY,MAAM,GAAC,MAAM,GAAC,SAAS,CAKlC;IAED;;OAEG;IACH,8BAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;;OAKG;IACH,eAHY,aAAa,CAKxB;IAED;;;OAGG;IACH,wCAHW,MAAM,GACL,aAAa,CAIxB;IAED;;;;;;OAMG;IACH,sCAJW,MAAM,uEAEL,aAAa,CAIxB;IAED;;;;OAIG;IACH;YAHmB,MAAM;MAKxB;IAED;;OAEG;IACH,aAFY,MAAM,CAIjB;IAED;;OAEG;IACH,oBAFY,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAI9D;IAED;;;;OAIG;IACH,eAEC;IAED;;;;OAIG;IACH,sBAFW,OAAO,YAAY,EAAE,cAAc,QA2B7C;IACD;;OAEG;IACH,WAFY,MAAM,MAAM,CAAC,GAAC,MAAM,MAAM,MAAM,CAAC,CAAC,CAI7C;IAGH,gBAPc,MAAM,MAAM,CAAC,GAAC,MAAM,MAAM,MAAM,CAAC,CAAC,CAOhB;IAEhC;;OAEG;IACH,0BA/Gc,MAAM,MAAM,CAAC,CA+Ge;CAPzC"}
1
+ {"version":3,"file":"Feature.d.ts","sourceRoot":"","sources":["../src/render/Feature.js"],"names":[],"mappings":"AAmVA;;;;;;;GAOG;AACH,0CANW,aAAa,GAEZ,KAAK,GAAC,UAAU,GAAC,UAAU,GAAC,eAAe,GAAC,OAAO,GAAC,YAAY,CAmC3E;AAED;;;;;;;;GAQG;AACH,yCAPW,aAAa,0CAGZ,OAAO,CAkBlB;;AA3WD;;;;GAIG;AACH;IACE;;;;;;;OAOG;IACH,wCANW,MAAM,MAAM,CAAC,QAEb,MAAM,MAAM,CAAC,GAAC,MAAM,MAAM,MAAM,CAAC,CAAC;YAC3B,MAAM;WACb,MAAM,GAAC,MAAM,GAAC,SAAS,EAuDjC;IApDC;;OAEG;IACH,eAFU,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAE3C;IAElB;;;OAGG;IACH,gBAAY;IAEZ;;;OAGG;IACH,YAAa;IAEb;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,yBAAuC;IAEvC;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,oBAA6B;IAG/B;;;;;OAKG;IACH,SAJW,MAAM,OAMhB;IAED;;;;OAIG;IACH,aAHY,OAAO,cAAc,EAAE,MAAM,CAgBxC;IAED;;OAEG;IACH,wBAFY,MAAM,MAAM,CAAC,CAexB;IAED;;OAEG;IACH,yBAFY,MAAM,MAAM,CAAC,CAmBxB;IAED;;OAEG;IACH,mBAFY,MAAM,MAAM,CAAC,CAaxB;IAED;;OAEG;IACH,oBAFY,MAAM,MAAM,CAAC,CAgBxB;IAED;;;;;OAKG;IACH,SAHY,MAAM,GAAC,MAAM,GAAC,SAAS,CAKlC;IAED;;OAEG;IACH,8BAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;;OAKG;IACH,eAHY,aAAa,CAKxB;IAED;;;OAGG;IACH,wCAHW,MAAM,GACL,aAAa,CAIxB;IAED;;;;;;OAMG;IACH,sCAJW,MAAM,uEAEL,aAAa,CAIxB;IAED;;;;OAIG;IACH;YAHmB,MAAM;MAKxB;IAED;;OAEG;IACH,aAFY,MAAM,CAIjB;IAED;;OAEG;IACH,oBAFY,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAI9D;IAED;;;;OAIG;IACH,eAEC;IAED;;;;OAIG;IACH,sBAFW,OAAO,YAAY,EAAE,cAAc,QA2B7C;IACD;;OAEG;IACH,WAFY,MAAM,MAAM,CAAC,GAAC,MAAM,MAAM,MAAM,CAAC,CAAC,CAI7C;IAGH,gBAPc,MAAM,MAAM,CAAC,GAAC,MAAM,MAAM,MAAM,CAAC,CAAC,CAOhB;IAEhC;;OAEG;IACH,0BA/Gc,MAAM,MAAM,CAAC,CA+Ge;CAPzC"}
package/render/Feature.js CHANGED
@@ -1,12 +1,16 @@
1
1
  /**
2
2
  * @module ol/render/Feature
3
3
  */
4
+ import Feature from '../Feature.js';
5
+ import GeometryLayout from '../geom/GeometryLayout.js';
4
6
  import GeometryType from '../geom/GeometryType.js';
7
+ import { LineString, MultiLineString, MultiPoint, MultiPolygon, Point, Polygon, } from '../geom.js';
5
8
  import { compose as composeTransform, create as createTransform, } from '../transform.js';
6
9
  import { createOrUpdateFromCoordinate, createOrUpdateFromFlatCoordinates, getCenter, getHeight, } from '../extent.js';
7
10
  import { extend } from '../array.js';
8
11
  import { getInteriorPointOfArray, getInteriorPointsOfMultiArray, } from '../geom/flat/interiorpoint.js';
9
12
  import { get as getProjection } from '../proj.js';
13
+ import { inflateEnds } from '../geom/flat/orient.js';
10
14
  import { interpolatePoint } from '../geom/flat/interpolate.js';
11
15
  import { linearRingss as linearRingssCenter } from '../geom/flat/center.js';
12
16
  import { transform2D } from '../geom/flat/transform.js';
@@ -245,5 +249,60 @@ RenderFeature.prototype.getEndss = RenderFeature.prototype.getEnds;
245
249
  */
246
250
  RenderFeature.prototype.getFlatCoordinates =
247
251
  RenderFeature.prototype.getOrientedFlatCoordinates;
252
+ /**
253
+ * Create a geometry from an `ol/render/Feature`
254
+ * @param {RenderFeature} renderFeature
255
+ * Render Feature
256
+ * @return {Point|MultiPoint|LineString|MultiLineString|Polygon|MultiPolygon}
257
+ * New geometry instance.
258
+ * @api
259
+ */
260
+ export function toGeometry(renderFeature) {
261
+ var geometryType = renderFeature.getType();
262
+ switch (geometryType) {
263
+ case GeometryType.POINT:
264
+ return new Point(renderFeature.getFlatCoordinates());
265
+ case GeometryType.MULTI_POINT:
266
+ return new MultiPoint(renderFeature.getFlatCoordinates(), GeometryLayout.XY);
267
+ case GeometryType.LINE_STRING:
268
+ return new LineString(renderFeature.getFlatCoordinates(), GeometryLayout.XY);
269
+ case GeometryType.MULTI_LINE_STRING:
270
+ return new MultiLineString(renderFeature.getFlatCoordinates(), GeometryLayout.XY,
271
+ /** @type {Array<number>} */ (renderFeature.getEnds()));
272
+ case GeometryType.POLYGON:
273
+ var flatCoordinates = renderFeature.getFlatCoordinates();
274
+ var ends = /** @type {Array<number>} */ (renderFeature.getEnds());
275
+ var endss = inflateEnds(flatCoordinates, ends);
276
+ return endss.length > 1
277
+ ? new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss)
278
+ : new Polygon(flatCoordinates, GeometryLayout.XY, ends);
279
+ default:
280
+ throw new Error('Invalid geometry type:' + geometryType);
281
+ }
282
+ }
283
+ /**
284
+ * Create an `ol/Feature` from an `ol/render/Feature`
285
+ * @param {RenderFeature} renderFeature RenderFeature
286
+ * @param {string} [opt_geometryName='geometry'] Geometry name to use
287
+ * when creating the Feature.
288
+ * @return {Feature} Newly constructed `ol/Feature` with properties,
289
+ * geometry, and id copied over.
290
+ * @api
291
+ */
292
+ export function toFeature(renderFeature, opt_geometryName) {
293
+ var id = renderFeature.getId();
294
+ var geometry = toGeometry(renderFeature);
295
+ var properties = renderFeature.getProperties();
296
+ var feature = new Feature();
297
+ if (opt_geometryName !== undefined) {
298
+ feature.setGeometryName(opt_geometryName);
299
+ }
300
+ feature.setGeometry(geometry);
301
+ if (id !== undefined) {
302
+ feature.setId(id);
303
+ }
304
+ feature.setProperties(properties, true);
305
+ return feature;
306
+ }
248
307
  export default RenderFeature;
249
308
  //# sourceMappingURL=Feature.js.map
package/render/Feature.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Feature.js","sourceRoot":"","sources":["../src/render/Feature.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Feature.js","sourceRoot":"","sources":["../src/render/Feature.js"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,YAAY,MAAM,yBAAyB,CAAC;AACnD,OAAO,EACL,UAAU,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,GACR,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,OAAO,IAAI,gBAAgB,EAC3B,MAAM,IAAI,eAAe,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,EACjC,SAAS,EACT,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EACL,uBAAuB,EACvB,6BAA6B,GAC9B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,GAAG,IAAI,aAAa,EAAC,MAAM,YAAY,CAAC;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAC,YAAY,IAAI,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAEtD;;GAEG;AACH,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;AAEvC;;;;GAIG;AACH;IACE;;;;;;;OAOG;IACH,uBAAY,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;QACrD;;WAEG;QACH,IAAI,CAAC,aAAa,CAAC;QAEnB;;;WAGG;QACH,IAAI,CAAC,OAAO,CAAC;QAEb;;;WAGG;QACH,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QAEd;;;WAGG;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB;;;WAGG;QACH,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAExC;;;WAGG;QACH,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAEhC;;;WAGG;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAE3B;;;WAGG;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB;;;WAGG;QACH,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACH,2BAAG,GAAH,UAAI,GAAG;QACL,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,iCAAS,GAAT;QACE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO;gBACV,IAAI,CAAC,KAAK,KAAK,YAAY,CAAC,KAAK;oBAC/B,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,gBAAgB,CAAC;oBACrD,CAAC,CAAC,iCAAiC,CAC/B,IAAI,CAAC,gBAAgB,EACrB,CAAC,EACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAC5B,CAAC,CACF,CAAC;SACT;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,4CAAoB,GAApB;QACE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC7B,IAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,mBAAmB,GAAG,uBAAuB,CAChD,IAAI,CAAC,gBAAgB,EACrB,CAAC;YACD,4BAA4B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EACzC,CAAC,EACD,UAAU,EACV,CAAC,CACF,CAAC;SACH;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,6CAAqB,GAArB;QACE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC7B,IAAM,WAAW,GAAG,kBAAkB,CACpC,IAAI,CAAC,gBAAgB,EACrB,CAAC;YACD,mCAAmC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAChD,CAAC,CACF,CAAC;YACF,IAAI,CAAC,mBAAmB,GAAG,6BAA6B,CACtD,IAAI,CAAC,gBAAgB,EACrB,CAAC;YACD,mCAAmC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAChD,CAAC,EACD,WAAW,CACZ,CAAC;SACH;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,uCAAe,GAAf;QACE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,gBAAgB,CACpC,IAAI,CAAC,gBAAgB,EACrB,CAAC,EACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAC5B,CAAC,EACD,GAAG,CACJ,CAAC;SACH;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,wCAAgB,GAAhB;QACE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;YACzB,IAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC;YAC9C,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,IAAM,IAAI,GAAG,4BAA4B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE;gBAC7C,IAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAM,QAAQ,GAAG,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBACxE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;gBACtC,MAAM,GAAG,GAAG,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,6BAAK,GAAL;QACE,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,kDAA0B,GAA1B;QACE,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,mCAAW,GAAX;QACE,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,6CAAqB,GAArB,UAAsB,gBAAgB;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,2CAAmB,GAAnB,UAAoB,gBAAgB,EAAE,aAAa;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,qCAAa,GAAb;QACE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,iCAAS,GAAT;QACE,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;OAEG;IACH,wCAAgB,GAAhB;QACE,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,+BAAO,GAAP;QACE,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACH,iCAAS,GAAT,UAAU,UAAU;QAClB,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QACvC,IAAM,WAAW,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;QAC3C,IAAM,eAAe,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;QACpD,IAAI,WAAW,IAAI,eAAe,EAAE;YAClC,IAAM,KAAK,GAAG,SAAS,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;YAClE,gBAAgB,CACd,YAAY,EACZ,eAAe,CAAC,CAAC,CAAC,EAClB,eAAe,CAAC,CAAC,CAAC,EAClB,KAAK,EACL,CAAC,KAAK,EACN,CAAC,EACD,CAAC,EACD,CAAC,CACF,CAAC;YACF,WAAW,CACT,IAAI,CAAC,gBAAgB,EACrB,CAAC,EACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAC5B,CAAC,EACD,YAAY,EACZ,IAAI,CAAC,gBAAgB,CACtB,CAAC;SACH;IACH,CAAC;IACD;;OAEG;IACH,+BAAO,GAAP;QACE,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACH,oBAAC;AAAD,CAAC,AA5RD,IA4RC;AAED,aAAa,CAAC,SAAS,CAAC,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC;AAEnE;;GAEG;AACH,aAAa,CAAC,SAAS,CAAC,kBAAkB;IACxC,aAAa,CAAC,SAAS,CAAC,0BAA0B,CAAC;AAErD;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,aAAa;IACtC,IAAM,YAAY,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;IAC7C,QAAQ,YAAY,EAAE;QACpB,KAAK,YAAY,CAAC,KAAK;YACrB,OAAO,IAAI,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACvD,KAAK,YAAY,CAAC,WAAW;YAC3B,OAAO,IAAI,UAAU,CACnB,aAAa,CAAC,kBAAkB,EAAE,EAClC,cAAc,CAAC,EAAE,CAClB,CAAC;QACJ,KAAK,YAAY,CAAC,WAAW;YAC3B,OAAO,IAAI,UAAU,CACnB,aAAa,CAAC,kBAAkB,EAAE,EAClC,cAAc,CAAC,EAAE,CAClB,CAAC;QACJ,KAAK,YAAY,CAAC,iBAAiB;YACjC,OAAO,IAAI,eAAe,CACxB,aAAa,CAAC,kBAAkB,EAAE,EAClC,cAAc,CAAC,EAAE;YACjB,4BAA4B,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CACvD,CAAC;QACJ,KAAK,YAAY,CAAC,OAAO;YACvB,IAAM,eAAe,GAAG,aAAa,CAAC,kBAAkB,EAAE,CAAC;YAC3D,IAAM,IAAI,GAAG,4BAA4B,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAM,KAAK,GAAG,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YACjD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC;gBACrB,CAAC,CAAC,IAAI,YAAY,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC;gBAC7D,CAAC,CAAC,IAAI,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5D;YACE,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,YAAY,CAAC,CAAC;KAC5D;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CAAC,aAAa,EAAE,gBAAgB;IACvD,IAAM,EAAE,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC;IACjC,IAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;IACjD,IAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;KAC3C;IACD,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,IAAI,EAAE,KAAK,SAAS,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACnB;IACD,OAAO,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,eAAe,aAAa,CAAC"}
package/src/format/MVT.js CHANGED
@@ -19,7 +19,7 @@ import RenderFeature from '../render/Feature.js';
19
19
  import Units from '../proj/Units.js';
20
20
  import {assert} from '../asserts.js';
21
21
  import {get} from '../proj.js';
22
- import {linearRingIsClockwise} from '../geom/flat/orient.js';
22
+ import {inflateEnds} from '../geom/flat/orient.js';
23
23
 
24
24
  /**
25
25
  * @typedef {Object} Options
@@ -185,8 +185,8 @@ class MVT extends FeatureFormat {
185
185
 
186
186
  values[this.layerName_] = rawFeature.layer.name;
187
187
 
188
- const flatCoordinates = [];
189
- const ends = [];
188
+ const flatCoordinates = /** @type {Array<number>} */ ([]);
189
+ const ends = /** @type {Array<number>} */ ([]);
190
190
  this.readRawGeometry_(pbf, rawFeature, flatCoordinates, ends);
191
191
 
192
192
  const geometryType = getGeometryType(type, ends.length);
@@ -203,28 +203,11 @@ class MVT extends FeatureFormat {
203
203
  } else {
204
204
  let geom;
205
205
  if (geometryType == GeometryType.POLYGON) {
206
- const endss = [];
207
- let offset = 0;
208
- let prevEndIndex = 0;
209
- for (let i = 0, ii = ends.length; i < ii; ++i) {
210
- const end = ends[i];
211
- // classifies an array of rings into polygons with outer rings and holes
212
- if (!linearRingIsClockwise(flatCoordinates, offset, end, 2)) {
213
- endss.push(ends.slice(prevEndIndex, i + 1));
214
- } else {
215
- if (endss.length === 0) {
216
- continue;
217
- }
218
- endss[endss.length - 1].push(ends[prevEndIndex]);
219
- }
220
- prevEndIndex = i + 1;
221
- offset = end;
222
- }
223
- if (endss.length > 1) {
224
- geom = new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss);
225
- } else {
226
- geom = new Polygon(flatCoordinates, GeometryLayout.XY, ends);
227
- }
206
+ const endss = inflateEnds(flatCoordinates, ends);
207
+ geom =
208
+ endss.length > 1
209
+ ? new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss)
210
+ : new Polygon(flatCoordinates, GeometryLayout.XY, ends);
228
211
  } else {
229
212
  geom =
230
213
  geometryType === GeometryType.POINT
@@ -248,7 +231,9 @@ class MVT extends FeatureFormat {
248
231
  }
249
232
  const geometry = transformGeometryWithOptions(geom, false, options);
250
233
  feature.setGeometry(geometry);
251
- feature.setId(id);
234
+ if (id !== undefined) {
235
+ feature.setId(id);
236
+ }
252
237
  feature.setProperties(values, true);
253
238
  }
254
239
 
package/src/format/OSMXML.js CHANGED
@@ -96,7 +96,9 @@ class OSMXML extends XMLFeature {
96
96
  }
97
97
  transformGeometryWithOptions(geometry, false, options);
98
98
  const feature = new Feature(geometry);
99
- feature.setId(values.id);
99
+ if (values.id !== undefined) {
100
+ feature.setId(values.id);
101
+ }
100
102
  feature.setProperties(values.tags, true);
101
103
  state.features.push(feature);
102
104
  }
@@ -146,7 +148,9 @@ function readNode(node, objectStack) {
146
148
  const geometry = new Point(coordinates);
147
149
  transformGeometryWithOptions(geometry, false, options);
148
150
  const feature = new Feature(geometry);
149
- feature.setId(id);
151
+ if (id !== undefined) {
152
+ feature.setId(id);
153
+ }
150
154
  feature.setProperties(values.tags, true);
151
155
  state.features.push(feature);
152
156
  }
package/src/geom/flat/orient.js CHANGED
@@ -178,3 +178,31 @@ export function orientLinearRingsArray(
178
178
  }
179
179
  return offset;
180
180
  }
181
+
182
+ /**
183
+ * Return a two-dimensional endss
184
+ * @param {Array<number>} flatCoordinates Flat coordinates
185
+ * @param {Array<number>} ends Linear ring end indexes
186
+ * @return {Array<Array<number>>} Two dimensional endss array that can
187
+ * be used to contruct a MultiPolygon
188
+ */
189
+ export function inflateEnds(flatCoordinates, ends) {
190
+ const endss = [];
191
+ let offset = 0;
192
+ let prevEndIndex = 0;
193
+ for (let i = 0, ii = ends.length; i < ii; ++i) {
194
+ const end = ends[i];
195
+ // classifies an array of rings into polygons with outer rings and holes
196
+ if (!linearRingIsClockwise(flatCoordinates, offset, end, 2)) {
197
+ endss.push(ends.slice(prevEndIndex, i + 1));
198
+ } else {
199
+ if (endss.length === 0) {
200
+ continue;
201
+ }
202
+ endss[endss.length - 1].push(ends[prevEndIndex]);
203
+ }
204
+ prevEndIndex = i + 1;
205
+ offset = end;
206
+ }
207
+ return endss;
208
+ }
package/src/render/Feature.js CHANGED
@@ -1,7 +1,17 @@
1
1
  /**
2
2
  * @module ol/render/Feature
3
3
  */
4
+ import Feature from '../Feature.js';
5
+ import GeometryLayout from '../geom/GeometryLayout.js';
4
6
  import GeometryType from '../geom/GeometryType.js';
7
+ import {
8
+ LineString,
9
+ MultiLineString,
10
+ MultiPoint,
11
+ MultiPolygon,
12
+ Point,
13
+ Polygon,
14
+ } from '../geom.js';
5
15
  import {
6
16
  compose as composeTransform,
7
17
  create as createTransform,
@@ -18,6 +28,7 @@ import {
18
28
  getInteriorPointsOfMultiArray,
19
29
  } from '../geom/flat/interiorpoint.js';
20
30
  import {get as getProjection} from '../proj.js';
31
+ import {inflateEnds} from '../geom/flat/orient.js';
21
32
  import {interpolatePoint} from '../geom/flat/interpolate.js';
22
33
  import {linearRingss as linearRingssCenter} from '../geom/flat/center.js';
23
34
  import {transform2D} from '../geom/flat/transform.js';
@@ -326,4 +337,70 @@ RenderFeature.prototype.getEndss = RenderFeature.prototype.getEnds;
326
337
  RenderFeature.prototype.getFlatCoordinates =
327
338
  RenderFeature.prototype.getOrientedFlatCoordinates;
328
339
 
340
+ /**
341
+ * Create a geometry from an `ol/render/Feature`
342
+ * @param {RenderFeature} renderFeature
343
+ * Render Feature
344
+ * @return {Point|MultiPoint|LineString|MultiLineString|Polygon|MultiPolygon}
345
+ * New geometry instance.
346
+ * @api
347
+ */
348
+ export function toGeometry(renderFeature) {
349
+ const geometryType = renderFeature.getType();
350
+ switch (geometryType) {
351
+ case GeometryType.POINT:
352
+ return new Point(renderFeature.getFlatCoordinates());
353
+ case GeometryType.MULTI_POINT:
354
+ return new MultiPoint(
355
+ renderFeature.getFlatCoordinates(),
356
+ GeometryLayout.XY
357
+ );
358
+ case GeometryType.LINE_STRING:
359
+ return new LineString(
360
+ renderFeature.getFlatCoordinates(),
361
+ GeometryLayout.XY
362
+ );
363
+ case GeometryType.MULTI_LINE_STRING:
364
+ return new MultiLineString(
365
+ renderFeature.getFlatCoordinates(),
366
+ GeometryLayout.XY,
367
+ /** @type {Array<number>} */ (renderFeature.getEnds())
368
+ );
369
+ case GeometryType.POLYGON:
370
+ const flatCoordinates = renderFeature.getFlatCoordinates();
371
+ const ends = /** @type {Array<number>} */ (renderFeature.getEnds());
372
+ const endss = inflateEnds(flatCoordinates, ends);
373
+ return endss.length > 1
374
+ ? new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss)
375
+ : new Polygon(flatCoordinates, GeometryLayout.XY, ends);
376
+ default:
377
+ throw new Error('Invalid geometry type:' + geometryType);
378
+ }
379
+ }
380
+
381
+ /**
382
+ * Create an `ol/Feature` from an `ol/render/Feature`
383
+ * @param {RenderFeature} renderFeature RenderFeature
384
+ * @param {string} [opt_geometryName='geometry'] Geometry name to use
385
+ * when creating the Feature.
386
+ * @return {Feature} Newly constructed `ol/Feature` with properties,
387
+ * geometry, and id copied over.
388
+ * @api
389
+ */
390
+ export function toFeature(renderFeature, opt_geometryName) {
391
+ const id = renderFeature.getId();
392
+ const geometry = toGeometry(renderFeature);
393
+ const properties = renderFeature.getProperties();
394
+ const feature = new Feature();
395
+ if (opt_geometryName !== undefined) {
396
+ feature.setGeometryName(opt_geometryName);
397
+ }
398
+ feature.setGeometry(geometry);
399
+ if (id !== undefined) {
400
+ feature.setId(id);
401
+ }
402
+ feature.setProperties(properties, true);
403
+ return feature;
404
+ }
405
+
329
406
  export default RenderFeature;
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.12.1-dev.1643381905554';
34
+ export var VERSION = '6.12.1-dev.1643547277963';
35
35
  //# sourceMappingURL=util.js.map