vis-core 0.29.5 → 0.29.7

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.29.5";
+declare const _default: "0.29.7";
 export default _default;

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

@@ -3,20 +3,21 @@ import leadObjs from "./objects";
 import { BaseObject, Lead } from 'gl-draw';
 import { MeshLineMaterial } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
-import Countries from './objects/countries';
+import PlaneMap from '../map/objects/PlaneMap';
 interface EarthOptions extends BaseOptions {
     mapDepth?: number;
     otherMapDepth?: number;
     radius?: number;
     copyChinaPlane?: boolean;
+    mergeSide?: boolean;
     style?: 'chinaPlate' | 'countryPlate' | 'base';
 }
 export default class extends Base {
     static VisName: string;
     leadObjs: {
         Earth: typeof import("./objects/earth").default;
-        Countries: typeof Countries;
         SphereShadow: typeof import("./objects/SphereShadow").default;
+        Countries: typeof PlaneMap;
         Plane: typeof import("../all/objects/Plane").default;
         CrossPlane: typeof import("../all/objects/CrossPlane").default;
         PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
@@ -50,8 +51,8 @@ export default class extends Base {
     lead: Lead<typeof leadObjs>;
     options: Required<EarthOptions>;
     extendsOptions: Record<string, any>;
-    map: Countries;
-    get mapArea(): import("gl-draw/dist/objects").ConicPolygon[];
+    map: PlaneMap;
+    get mapArea(): import("gl-draw/dist/objects").ExtrudePolygon[];
     setOptions(options: EarthOptions): void;
     handleSetting(key: string, value: any): Promise<any>;
     show(): void;
@@ -70,7 +71,7 @@ export default class extends Base {
     addAreaPlaneByProperty(key: string, value: any, options: {
         area: ConstructorParameters<typeof THREE.MeshBasicMaterial>[0];
         line: ConstructorParameters<typeof MeshLineMaterial>[0];
-    }): Promise<Countries | undefined>;
+    }): Promise<PlaneMap | undefined>;
     getRadius(): number;
     checkBehindEarth(objArr: () => BaseObject[], cb: (obj: BaseObject[], res: boolean[]) => any): void;
 }

package/dist/vis/earth/objects/index.d.ts

@@ -1,11 +1,11 @@
 import { Lead } from 'gl-draw';
+import PlaneMap from '../../map/objects/PlaneMap';
 import Earth from './earth';
-import Countries from './countries';
 import SphereShadow from './SphereShadow';
 declare const objs: {
     Earth: typeof Earth;
-    Countries: typeof Countries;
     SphereShadow: typeof SphereShadow;
+    Countries: typeof PlaneMap;
     Plane: typeof import("../../all/objects/Plane").default;
     CrossPlane: typeof import("../../all/objects/CrossPlane").default;
     PlaneShadow: typeof import("../../all/objects/PlaneShadow").default;

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

@@ -2,11 +2,11 @@ import type { FeatureCollection, GeoJsonProperties, MultiPolygon, Polygon, Posit
 import { BaseObject } from 'gl-draw';
 import { ExtrudePolygon, Group, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
-type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
+export type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 interface Options {
     areaGroup?: boolean;
     geojson: GeoJSON;
-    projection: {
+    projection?: {
         center: [number, number];
         scale: number;
         rotate?: [number, number];
@@ -14,11 +14,15 @@ interface Options {
     };
     extrudeLineGeojson?: GeoJSON;
     hasSide?: boolean;
+    hasTop?: boolean;
     mergeSide?: boolean;
+    hasLine?: boolean;
+    start?: number;
     depth?: number;
     lineOffset?: number;
     bbox?: number[];
     topSegments?: number;
+    conic?: boolean;
     materialOptions: {
         topMat: THREE.Material;
         sideMat?: THREE.Material;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.29.5",
+  "version": "0.29.7",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",
@@ -56,7 +56,6 @@
     "vue": "^3.5.11",
     "vue-bundler": "^0.4.10",
     "vue-router": "^4.4.5",
-    "vue3-colorpicker": "^2.3.0",
     "primeicons": "^7.0.0"
   },
   "dependencies": {
@@ -67,7 +66,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.2.5",
-    "gl-draw": "0.16.1",
+    "gl-draw": "0.16.2",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },

package/dist/vis/earth/objects/countries/index.d.ts

@@ -1,30 +0,0 @@
-import type { FeatureCollection, MultiPolygon, Polygon } from 'geojson';
-import { BaseObject } from 'gl-draw';
-import { ConicPolygon, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
-import * as THREE from 'three';
-export type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
-interface Options {
-    geojson: GeoJSON;
-    areaGroup?: boolean;
-    mats: {
-        borderMat?: THREE.Material;
-        topMat?: THREE.Material;
-        outLine?: MeshLineMaterial;
-    };
-    start?: number;
-    depth?: number;
-    lineOffset?: number;
-    bbox?: number[];
-    hasTop?: boolean;
-    hasSide?: boolean;
-    hasLine?: boolean;
-    lineDuration?: number;
-}
-export default class extends BaseObject {
-    options: Required<Omit<Options, 'bbox'>> & Pick<Options, 'bbox'>;
-    areaArr: ConicPolygon[];
-    lineArr: Line[];
-    constructor(options: Options);
-    create(): Promise<void>;
-}
-export {};