bruce-models 4.2.3 → 4.2.4

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.
@@ -99,5 +99,5 @@ __exportStar(require("./plugin/plugin"), exports);
99
99
  __exportStar(require("./environment"), exports);
100
100
  __exportStar(require("./data-source/data-source"), exports);
101
101
  // This is updated with the package.json version on build.
102
- exports.VERSION = "4.2.3";
102
+ exports.VERSION = "4.2.4";
103
103
  //# sourceMappingURL=bruce-models.js.map
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Bounds = void 0;
4
+ const entity_1 = require("../entity/entity");
4
5
  const geometry_1 = require("./geometry");
5
6
  var Bounds;
6
7
  (function (Bounds) {
@@ -19,22 +20,39 @@ var Bounds;
19
20
  minLongitude: null
20
21
  };
21
22
  const points = [];
22
- if (entity.location) {
23
- points.push(entity.location);
23
+ const location = entity_1.Entity.GetValue({
24
+ entity: entity,
25
+ path: ["location"]
26
+ });
27
+ if (location) {
28
+ points.push(location);
24
29
  }
25
- if (entity.geometry) {
26
- if (entity.geometry.Point) {
27
- points.push(...geometry_1.Geometry.ParsePoints(entity.geometry.Point));
30
+ const geometry = entity_1.Entity.GetValue({
31
+ entity: entity,
32
+ path: ["geometry"]
33
+ });
34
+ const processGeometry = (geometry, depth = 0) => {
35
+ if (!geometry || depth > 5) {
36
+ return;
28
37
  }
29
- if (entity.geometry.LineString) {
30
- points.push(...geometry_1.Geometry.ParsePoints(entity.geometry.LineString));
38
+ if (geometry.Point) {
39
+ points.push(...geometry_1.Geometry.ParsePoints(geometry.Point));
31
40
  }
32
- if (entity.geometry.Polygon) {
33
- for (const ring of entity.geometry.Polygon) {
41
+ if (geometry.LineString) {
42
+ points.push(...geometry_1.Geometry.ParsePoints(geometry.LineString));
43
+ }
44
+ if (geometry.Polygon) {
45
+ for (const ring of geometry.Polygon) {
34
46
  points.push(...geometry_1.Geometry.ParsePoints(ring.LinearRing));
35
47
  }
36
48
  }
37
- }
49
+ if (geometry.MultiGeometry) {
50
+ for (const multiGeometry of geometry.MultiGeometry) {
51
+ processGeometry(multiGeometry, depth + 1);
52
+ }
53
+ }
54
+ };
55
+ processGeometry(geometry);
38
56
  for (const point of points) {
39
57
  if (bounds.maxLatitude == null || point.latitude > bounds.maxLatitude) {
40
58
  bounds.maxLatitude = point.latitude;
@@ -1 +1 @@
1
- {"version":3,"file":"bounds.js","sourceRoot":"","sources":["../../../src/common/bounds.ts"],"names":[],"mappings":";;;AAEA,yCAAsC;AAEtC,IAAiB,MAAM,CAkFtB;AAlFD,WAAiB,MAAM;IA6BnB;;;;OAIG;IACH,SAAgB,UAAU,CAAC,MAAsB;QAC7C,MAAM,MAAM,GAAY;YACpB,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;SACrB,CAAC;QACF,MAAM,MAAM,GAAmB,EAAE,CAAC;QAClC,IAAI,MAAM,CAAC,QAAQ,EAAE;YACjB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SAChC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE;YACjB,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE;gBACvB,MAAM,CAAC,IAAI,CAAC,GAAG,mBAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;aAC/D;YACD,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,mBAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;aACpE;YACD,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;gBACzB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;oBACxC,MAAM,CAAC,IAAI,CAAC,GAAG,mBAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;iBACzD;aACJ;SACJ;QACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAE;gBACnE,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC;aACvC;YACD,IAAI,MAAM,CAAC,YAAY,IAAI,IAAI,IAAI,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE;gBACtE,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC;aACzC;YACD,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAE;gBACnE,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC;aACvC;YACD,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAE;gBACnE,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC;aACvC;YACD,IAAI,MAAM,CAAC,YAAY,IAAI,IAAI,IAAI,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE;gBACtE,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC;aACzC;YACD,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAE;gBACnE,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC;aACvC;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IA/Ce,iBAAU,aA+CzB,CAAA;AACL,CAAC,EAlFgB,MAAM,GAAN,cAAM,KAAN,cAAM,QAkFtB"}
1
+ {"version":3,"file":"bounds.js","sourceRoot":"","sources":["../../../src/common/bounds.ts"],"names":[],"mappings":"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"}
@@ -81,4 +81,4 @@ export * from "./internal/uploader";
81
81
  export * from "./plugin/plugin";
82
82
  export * from "./environment";
83
83
  export * from "./data-source/data-source";
84
- export declare const VERSION = "4.2.3";
84
+ export declare const VERSION = "4.2.4";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bruce-models",
3
- "version": "4.2.3",
3
+ "version": "4.2.4",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "main": "dist/bruce-models.umd.js",