vis-core 0.29.13 → 0.30.0-beta.10

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.29.13";
+declare const _default: "0.30.0-beta.10";
 export default _default;

package/dist/vis/all/objects/Arc/index.d.ts

@@ -1,7 +1,8 @@
-import Pencil, { BaseObject } from 'gl-draw';
-import { Group, Line } from 'gl-draw/dist/objects';
+import type Pencil from 'gl-draw';
+import { BaseObject } from 'gl-draw';
+import type { Line } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
-import Tube from '../Tube';
+import type Tube from '../Tube';
 interface Options {
     from: number[];
     to: number[];
@@ -15,7 +16,6 @@ interface Options {
 export default class extends BaseObject {
     options: Options;
     line: Line;
-    helperMesh?: Group[];
     helperMeshPosition?: THREE.Vector3[];
     constructor(options: Options);
     static getInitOptions(pencil: Pencil, options: Options): {

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

@@ -1,8 +1,8 @@
 import leadObjs from "../all/objects";
-import Arc from "../all/objects/Arc";
-import Pencil, { BaseObject, Lead } from 'gl-draw';
+import type Arc from "../all/objects/Arc";
+import Pencil, { type BaseObject, type Lead } from 'gl-draw';
 import type { PickFunctionsItem } from 'gl-draw/dist/core/Lead/Pick';
-import { Line, Node } from 'gl-draw/dist/objects';
+import type { Line, Node } from 'gl-draw/dist/objects';
 import { Wk } from 'gl-draw/dist/plugins';
 import * as THREE from 'three';
 import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
@@ -12,7 +12,6 @@ export interface BaseOptions {
     container: HTMLElement;
     assetsPrefix?: string;
     css2DContainer?: HTMLElement;
-    workerOnce?: boolean;
     pencil?: any;
     pencil2?: any;
     pencilConfig?: Record<string, any>;
@@ -66,7 +65,6 @@ export default class Base extends Camera {
     mList: Pencil['mList'];
     get loader(): import("gl-draw/dist/core/Loader/Loader").default;
     get worker(): Wk;
-    workerOnce: boolean;
     tier0: boolean;
     pmremGenerator: THREE.PMREMGenerator | null;
     re: RoomEnvironment | null;
@@ -106,14 +104,17 @@ export default class Base extends Camera {
     show(): void;
     showAction(): void;
     hide(): void;
+    addGroup(): Promise<import("gl-draw/dist/objects").Group>;
     addCSS2D(dom: HTMLElement, options?: {
         display?: string;
         onTop?: number;
+        target?: BaseObject;
     }): Promise<Node>;
     addCSS3D(dom: HTMLElement, options?: {
         display?: string;
         onTop?: number;
         type?: '3d' | '3dSprite';
+        target?: BaseObject;
     }): Promise<Node>;
     getRoomEnvMap(): THREE.Texture<unknown>;
     handlePick(objArr: PickFunctionsItem['objArr'], type: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): void;

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

@@ -1,11 +1,11 @@
-import Base, { BaseOptions } from "../base";
+import Base, { type BaseOptions } from "../base";
 import leadObjs from "./objects";
-import { BaseObject, Lead } from 'gl-draw';
-import { Group } from 'gl-draw/dist/objects';
+import { type BaseObject, type Lead } from 'gl-draw';
+import { type Group } from 'gl-draw/dist/objects';
 import { getProjection } from 'gl-draw/dist/utils';
 import * as THREE from 'three';
-import Building from './objects/building';
-import Road from './objects/road';
+import type Building from './objects/building';
+import type Road from './objects/road';
 interface CityOptions extends BaseOptions {
     adcode: number;
     jsonName: string;
@@ -18,14 +18,9 @@ interface CityOptions extends BaseOptions {
     };
     plane?: boolean;
     grey?: boolean;
-    greyFull?: boolean;
-    clip?: {
-        features: any[];
-    };
-    clipOutShow?: boolean;
-    planeOut?: boolean;
     showBuilding?: boolean;
     buildingSideGradient?: boolean;
+    buildingHasSide?: boolean;
     showRoad?: boolean;
     showGrassland?: boolean;
     showRiver?: boolean;
@@ -76,10 +71,9 @@ export default class extends Base {
     projection: ReturnType<typeof getProjection>;
     options: CityOptions;
     group: Group;
+    outAreaGroup: Group;
     building: Building;
     road: Road;
-    innerAreaGroup: Group;
-    outAreaGroup: Group;
     setOptions(options: CityOptions): void;
     multiplyScalar: number;
     loaderAdd(): void;
@@ -91,18 +85,14 @@ export default class extends Base {
     getInvert(vector3: THREE.Vector3): any;
     fitTo(obj: BaseObject, enableTransition?: boolean): Promise<void>;
     initVis(): Promise<void>;
-    fitToTarget(adcode: number, lnglat?: [number, number]): Promise<void>;
     drawBuilding(options?: {
         json?: {
             features: any[];
         };
         meters?: number;
-        clip?: {
-            features: any[];
-        };
         grey?: boolean;
         sideGradient?: boolean;
-        group?: Group;
+        hasSide?: boolean;
     }): Promise<Building | undefined>;
     drawArea(options?: {
         json?: {
@@ -110,11 +100,7 @@ export default class extends Base {
         };
         type?: 'river' | 'grassland';
         oArr?: number[];
-        clip?: {
-            features: any[];
-        };
         grey?: boolean;
-        group?: Group;
     }): Promise<import("./objects/area").default | undefined>;
     drawRoad(options?: {
         json?: {
@@ -122,11 +108,7 @@ export default class extends Base {
         };
         meters?: number;
         z?: number;
-        clip?: {
-            features: any[];
-        };
         grey?: boolean;
-        group?: Group;
     }): Promise<Road | undefined>;
     getWorldPosition(longitude: number, latitude: number): {
         x: any;

package/dist/vis/city/objects/area/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseObject } from 'gl-draw';
-import { ExtrudePolygon } from 'gl-draw/dist/objects';
-import * as THREE from 'three';
+import type { ExtrudePolygon } from 'gl-draw/dist/objects';
+import type * as THREE from 'three';
 interface Options {
     json: {
         features: any[];
@@ -13,16 +13,11 @@ interface Options {
     type: string;
     cacheKey?: string;
     oArr?: number[];
-    clip?: {
-        features: any[];
-    };
 }
 export default class extends BaseObject {
     options: Options;
     area: ExtrudePolygon[];
     constructor(options: Options);
-    outJson: Map<any, any>;
     create(): Promise<void>;
-    dispose(): void;
 }
 export {};

package/dist/vis/city/objects/building/index.d.ts

@@ -1,5 +1,4 @@
 import { BaseObject } from 'gl-draw';
-import { ExtrudePolygon } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
 interface Options {
     json: {
@@ -12,23 +11,18 @@ interface Options {
     cacheKey?: string;
     material?: THREE.Material | THREE.Material[];
     meters?: number;
+    hasSide?: boolean;
     sideGradient?: boolean;
     grey?: boolean;
-    clip?: {
-        features: any[];
-    };
 }
 export default class extends BaseObject {
     options: Options;
     constructor(options: Options);
-    building: Record<string, ExtrudePolygon[]>;
-    outJson: Map<any, any>;
     create(): Promise<void>;
     worldPositionZ: {
         value: number;
     };
     sideGradient(color?: string, maxGradientHeight?: number): void;
     update(): void;
-    dispose(): void;
 }
 export {};

package/dist/vis/city/objects/road/index.d.ts

@@ -1,5 +1,5 @@
 import { BaseObject } from 'gl-draw';
-import { Line } from 'gl-draw/dist/objects';
+import type { Line } from 'gl-draw/dist/objects';
 interface Options {
     json: {
         features: any[];
@@ -11,14 +11,10 @@ interface Options {
     cacheKey?: string;
     meters?: number;
     grey?: boolean;
-    clip?: {
-        features: any[];
-    };
 }
 export default class extends BaseObject {
     options: Options;
     constructor(options: Options);
-    outJson: Map<any, any>;
     linePrimary: Line[];
     lineSecondary: Line[];
     create(): Promise<void>;

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

@@ -1,9 +1,9 @@
-import Base, { BaseOptions } from "../base";
+import Base, { type BaseOptions } from "../base";
 import leadObjs from "./objects";
-import { BaseObject, Lead } from 'gl-draw';
+import type { BaseObject, Lead } from 'gl-draw';
 import { MeshLineMaterial } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
-import PlaneMap from '../map/objects/PlaneMap';
+import type PlaneMap from '../map/objects/PlaneMap';
 interface EarthOptions extends BaseOptions {
     mapDepth?: number;
     otherMapDepth?: number;
@@ -74,5 +74,13 @@ export default class extends Base {
     }): Promise<PlaneMap | undefined>;
     getRadius(): number;
     checkBehindEarth(objArr: () => BaseObject[], cb: (obj: BaseObject[], res: boolean[]) => any): void;
+    /**
+     * 设置物体在球面上的位置和旋转，使其垂直于球面
+     * @param object - 要设置的物体
+     * @param location - 经纬度 [经度, 纬度]
+     * @param height - 距离球面的高度，默认为0
+     * @param upAxis - 物体的up轴方向，默认为Y轴 [0, 1, 0]
+     */
+    setObjectOnSphere(baseObject: BaseObject, location: [number, number], height?: number, upAxis?: [number, number, number]): void;
 }
 export {};

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

@@ -1,11 +1,11 @@
 import { findAdcodeInfo } from "../all/json";
-import Base, { BaseOptions } from "../base";
+import Base, { type BaseOptions } from "../base";
 import leadObjs from "./objects";
-import ContinentsBg from "./objects/ContinentsBg";
-import PlaneMap from "./objects/PlaneMap";
+import type ContinentsBg from "./objects/ContinentsBg";
+import type PlaneMap from "./objects/PlaneMap";
 import type { FeatureCollection, MultiPolygon, Polygon } from 'geojson';
-import { BaseObject, Lead } from 'gl-draw';
-import { ExtrudePolygon, Group, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
+import { type BaseObject, type Lead } from 'gl-draw';
+import { type ExtrudePolygon, type Group, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
 import { getProjection } from 'gl-draw/dist/utils';
 import * as THREE from 'three';
 import City from './city';
@@ -54,10 +54,9 @@ export interface MapOptions extends BaseOptions {
     bottomPlaneWater?: boolean;
 }
 interface MapCityOptions extends MapOptions {
-    clipOutShow?: boolean;
     jsonNameObj?: Record<number, string>;
     cacheCity?: boolean;
-    greyFull?: boolean;
+    nearbyCities?: boolean | 'full';
     showBuilding?: boolean;
     buildingSideGradient?: boolean;
     showRoad?: boolean;
@@ -171,10 +170,7 @@ export default class extends Base {
     initSettingsObj: Record<string, any>;
     handleSetting(key: string, value: any): Promise<any>;
     init(): Promise<void>;
-    initCityVis(adcode: number, options?: {
-        clip?: boolean;
-        grey?: boolean;
-    }): Promise<City>;
+    initCityVis(adcode: number, grey?: boolean): Promise<City>;
     initCityOnMap(adcode: number): Promise<void>;
     initVisBg(): Promise<void>;
     initVis(adcode: number): Promise<void>;
@@ -223,6 +219,14 @@ export default class extends Base {
     eraseLabels(): void;
     geAdcodePosition(adcode: number): [number, number, number] | undefined;
     getLocationPosition(location: [number, number]): [number, number, number];
+    /**
+     * 设置物体在平面地图上的位置
+     * @param object - 要设置的物体
+     * @param location - 经纬度 [经度, 纬度]
+     * @param height - 距离地图平面的高度，默认为0
+     */
+    setObjectOnMap(object: BaseObject, location: [number, number], height?: number): void;
+    setObjectOnMapAreaByProperty(object: BaseObject, key: string, value: any, height?: number): void;
     getAdcodeScreenPosition(adcode: number): {
         x: number;
         y: number;

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

@@ -1,6 +1,6 @@
 import type { FeatureCollection, GeoJsonProperties, MultiPolygon, Polygon, Position } from 'geojson';
 import { BaseObject } from 'gl-draw';
-import { ExtrudePolygon, Group, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
+import type { ExtrudePolygon, Group, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
 export type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 interface Options {

package/dist/vis/map/styles/map2/cityOnMap.d.ts

@@ -1,2 +1,2 @@
-import Map from '../../index';
+import type Map from '../../index';
 export declare const cityOnMap: (map: Map) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.29.13",
+  "version": "0.30.0-beta.10",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",
@@ -9,9 +9,7 @@
     "preview": "bundler-preview",
     "version": "node ./scripts/generate-version",
     "gzip": "node ./scripts/gzip",
-    "start:3dSite": "npm run version &&  VITE_SITE_3D=true  bundler-dev",
-    "build:3dSite": "npm run version && VITE_SITE_3D=true bundler",
-    "pub": "npm publish"
+    "pub": "npm publish --tag beta"
   },
   "main": "dist/index.js",
   "module": "dist/index.module.js",
@@ -48,9 +46,9 @@
     "jszip": "^3.10.1",
     "pinia": "^2.2.4",
     "primeicons": "^7.0.0",
-    "primevue": "^4.3.9",
+    "primevue": "^4.4.1",
     "tailwind-config-bundler": "^0.4.6",
-    "three": "^0.181.0",
+    "three": "^0.182.0",
     "vite-plugin-javascript-obfuscator": "^3.1.0",
     "vite-plugin-markdown": "^2.2.0",
     "vite-plugin-static-copy": "^2.2.0",
@@ -61,12 +59,12 @@
   "dependencies": {
     "@turf/turf": "^6.5.0",
     "@types/crypto-js": "^4.2.2",
-    "@types/three": "^0.181.0",
+    "@types/three": "^0.182.0",
     "crypto-js": "^4.2.0",
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.2.5",
-    "gl-draw": "0.16.8",
+    "gl-draw": "0.17.0-beta.15",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },

package/dist/utils/clipGeojson.d.ts

@@ -1,5 +0,0 @@
-export declare function clipGeojson(clipping_geojson: any, input_geojson: any): {
-    type: string;
-    features: any[];
-};
-export declare const getBoxMultiPoly: (json: any) => import("@turf/turf").Feature<import("@turf/turf").Polygon, import("@turf/turf").Properties>[];

package/dist/utils/fasterUnion.d.ts

@@ -1,3 +0,0 @@
-import { union } from '@turf/turf';
-declare const _default: (allGeometries: Parameters<typeof union>[0][]) => import("@turf/turf").Polygon | import("@turf/turf").MultiPolygon | import("@turf/turf").Feature<import("@turf/turf").Polygon | import("@turf/turf").MultiPolygon, import("@turf/turf").Properties> | null;
-export default _default;