vis-core 0.13.0 → 0.13.1

package/dist/index.module.js

@@ -41145,7 +41145,7 @@ function Bl(n) {
   const t = new qt();
   return t.color.setScalar(n), t;
 }
-const pX = "0.13.0", a1 = !1;
+const pX = "0.13.1", a1 = !1;
 class Na {
   constructor(t, e = {}) {
     D(this, "container");
@@ -41666,51 +41666,57 @@ class bX extends ye {
   }
   addPlane(e, i) {
     return Zt(this, null, function* () {
-      var d;
-      const { material: s } = i, l = this.geojson2Meta(e), a = this.pencil.getPlugin("worker"), o = this.pencil.getPlugin("draw"), c = (d = i.curvatureResolution) != null ? d : this.options.curvatureResolution;
-      return yield Promise.all(
-        l.map((h) => Zt(this, null, function* () {
-          const { coords: r, properties: u } = h, m = this.findGroup(this.getPropertiesKey(u)), b = yield a.geoGeometry(
-            c ? "conicPolygon" : "extrudePolygon",
-            {
-              mesaage: {
-                coordinatesArr: r,
-                projection: this.options.projection,
-                curvatureResolution: c,
-                depth: [0],
-                hasBottom: !1,
-                hasSide: !1,
-                useGroups: 0
-              }
-            }
-          ), G = yield o.draw(
-            this.options.curvatureResolution ? "ConicPolygon" : "ExtrudePolygon",
-            {
-              geometry: b,
-              material: s,
-              onTop: this.options.onTop
-            },
-            m
-          );
-          G.userData = Et({}, u), G.position.z = this.options.depth + 0.01;
-          const Z = yield a.geoGeometry("line", {
+      var G;
+      const { material: s } = i, l = this.geojson2Meta({
+        type: "FeatureCollection",
+        features: [e]
+      }), a = this.pencil.getPlugin("worker"), o = this.pencil.getPlugin("draw"), c = (G = i.curvatureResolution) != null ? G : this.options.curvatureResolution, { coords: d, properties: h } = l[0], r = this.findGroup(this.getPropertiesKey(h)), u = yield o.draw("Group", {
+        target: r
+      });
+      u.userData = Et({}, h);
+      const [m, b] = yield Promise.all([
+        a.geoGeometry(
+          c ? "conicPolygon" : "extrudePolygon",
+          {
             mesaage: {
-              coordinatesArr: r,
-              lineWidth: [1],
-              projection: this.options.projection
+              coordinatesArr: d,
+              projection: this.options.projection,
+              curvatureResolution: c,
+              depth: [0],
+              hasBottom: !1,
+              hasSide: !1,
+              useGroups: 0
             }
-          }), p = yield o.draw(
-            "Line",
-            {
-              geometry: Z,
-              material: i.lineMaterial,
-              onTop: this.options.onTop + 2
-            },
-            m
-          );
-          p.userData = Et({}, u), p.position.z = this.options.depth + 0.01;
-        }))
-      );
+          }
+        ),
+        a.geoGeometry("line", {
+          mesaage: {
+            coordinatesArr: d,
+            lineWidth: [1],
+            projection: this.options.projection
+          }
+        })
+      ]);
+      return yield Promise.all([
+        o.draw(
+          this.options.curvatureResolution ? "ConicPolygon" : "ExtrudePolygon",
+          {
+            geometry: m,
+            material: s,
+            onTop: this.options.onTop
+          },
+          u
+        ),
+        o.draw(
+          "Line",
+          {
+            geometry: b,
+            material: i.lineMaterial,
+            onTop: this.options.onTop + 2
+          },
+          u
+        )
+      ]), u.position.z = this.options.depth + 0.01, u;
     });
   }
   addLine(e, i) {
@@ -42117,6 +42123,10 @@ const jI = {
     var e;
     return (e = this.map) == null ? void 0 : e.areaArr;
   }
+  get mapLine() {
+    var e;
+    return (e = this.map) == null ? void 0 : e.lineArr;
+  }
   get adcodes() {
     return this.mapHistory.map((e) => e.mapInfo.adcode);
   }
@@ -42170,7 +42180,7 @@ const jI = {
       });
       const i = yield this.drawController.draw("Light", {
         type: "SpotLight",
-        color: "#c1e6dd",
+        color: this.options.worldPacificCentre ? "#82d9f2" : "#c1e6dd",
         intensity: 3,
         distance: 0,
         angle: this.options.continentsBg ? 1 : 0.5,
@@ -42287,30 +42297,28 @@ const jI = {
     var s;
     (s = this.map) == null || s.setColor(e, i);
   }
-  addAreaPlaneByProperty(e, i, s = {}) {
-    var o, c, d;
-    if (!this.map)
-      return;
-    const a = this.map.options.geojson.features.find(
-      (h) => h.properties && h.properties[e] === i
-    );
-    a && this.map.addPlane(
-      {
-        features: [a]
-      },
-      {
-        material: (o = s.material) != null ? o : new qt({
-          color: "red",
-          wireframe: !0
-        }),
-        lineMaterial: (c = s.lineMaterial) != null ? c : new Fe({
-          color: new rt("blue"),
-          sizeAttenuation: 0,
-          lineWidth: this.options.lineWidth
-        }),
-        curvatureResolution: (d = s.curvatureResolution) != null ? d : 0
-      }
-    );
+  addAreaPlaneByProperty(l, a) {
+    return Zt(this, arguments, function* (e, i, s = {}) {
+      var d, h, r;
+      if (!this.map)
+        return;
+      const c = this.map.options.geojson.features.find(
+        (u) => u.properties && u.properties[e] === i
+      );
+      if (c)
+        return yield this.map.addPlane(c, {
+          material: (d = s.material) != null ? d : new qt({
+            color: "red",
+            wireframe: !0
+          }),
+          lineMaterial: (h = s.lineMaterial) != null ? h : new Fe({
+            color: new rt("blue"),
+            sizeAttenuation: 0,
+            lineWidth: this.options.lineWidth
+          }),
+          curvatureResolution: (r = s.curvatureResolution) != null ? r : 0
+        });
+    });
   }
   show() {
     return Zt(this, null, function* () {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.13.0";
+declare const _default: "0.13.1";
 export default _default;

package/dist/vis/map/index.d.ts

@@ -79,6 +79,7 @@ export default class extends Base {
     get map(): PlaneMap | undefined;
     get mapInfo(): any;
     get mapArea(): import("gl-draw/dist/objects").ExtrudePolygon[] | undefined;
+    get mapLine(): import("gl-draw/dist/objects").Line[] | undefined;
     get adcodes(): any[];
     activePlaneMap: PlaneMap | null;
     isAnimating: boolean;
@@ -107,7 +108,7 @@ export default class extends Base {
         material?: THREE.Material;
         lineMaterial?: MeshLineMaterial;
         curvatureResolution?: number;
-    }): void;
+    }): Promise<Group | undefined>;
     show(): Promise<void>;
     hide(): Promise<void>;
     shadowMapLight?: BaseObject;

package/dist/vis/map/objects/PlaneMap.d.ts

@@ -1,7 +1,7 @@
 import { BaseObject } from 'gl-draw';
 import * as THREE from 'three';
 import { Line, ExtrudePolygon, MeshLineMaterial, Group } from 'gl-draw/dist/objects';
-import type { FeatureCollection, Polygon, MultiPolygon, Position } from 'geojson';
+import type { FeatureCollection, Polygon, MultiPolygon, Position, Feature, GeoJsonProperties } from 'geojson';
 type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 interface Options {
     areaGroup?: boolean;
@@ -50,11 +50,11 @@ export default class PlaneMap extends BaseObject {
         onTop?: number;
     }): Promise<ExtrudePolygon[]>;
     getPropertiesKey(properties: Record<string, any>): any;
-    addPlane(geojson: any, options: {
+    addPlane(geojson: Feature<Polygon | MultiPolygon, GeoJsonProperties>, options: {
         material: THREE.Material | THREE.Material[];
         lineMaterial: MeshLineMaterial;
         curvatureResolution?: number;
-    }): Promise<void[]>;
+    }): Promise<Group>;
     addLine(geojson: GeoJSON, options: {
         material?: MeshLineMaterial;
         onTop?: number;
@@ -62,7 +62,7 @@ export default class PlaneMap extends BaseObject {
     }): Promise<Line[]>;
     geojson2Meta(geojson: GeoJSON): {
         coords: Position[][];
-        properties: import("geojson").GeoJsonProperties;
+        properties: GeoJsonProperties;
     }[];
     pickArea(e: MouseEvent): import("gl-draw/dist/core/BaseObject").IBaseObject | undefined;
     update(delta: number, elapsed: number): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",