vis-core 0.24.6 → 0.24.8

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.24.6";
+declare const _default: "0.24.8";
 export default _default;

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

@@ -12,6 +12,7 @@ export interface BaseOptions {
     container: HTMLElement;
     assetsPrefix?: string;
     css2DContainer?: HTMLElement;
+    pencil?: any;
     pencilConfig?: Record<string, any>;
     disableInitShow?: boolean;
     editor?: boolean;
@@ -27,7 +28,7 @@ export default class Base extends Event {
     leftTruck: boolean;
     options: BaseOptions;
     pencilConfig: Record<string, any>;
-    showState: boolean | 'ing';
+    showState: boolean;
     settings: Record<string, any>;
     delLoadArr?: string[];
     extendsOptions: Record<string, any>;
@@ -63,8 +64,8 @@ export default class Base extends Event {
         Model: typeof import("../all/objects/Model").default;
     }>;
     mList: MaterialList;
-    loader: Loader;
-    worker: Wk;
+    get loader(): Loader;
+    get worker(): Wk;
     workerOnce: boolean;
     pmremGenerator: THREE.PMREMGenerator | null;
     re: RoomEnvironment | null;
@@ -91,9 +92,11 @@ export default class Base extends Event {
     initVis(...args: any): Promise<void>;
     init(...args: any[]): Promise<void>;
     initPencil(): Promise<void>;
+    private sceneActive;
+    setSceneActive(): void;
     initSceneUserData(): void;
     initBaseObjectUserData(baseObject: BaseObject): void;
-    initPencilPlugin(): void;
+    initPencilPlugin(pencil: Pencil): void;
     addCSS3DRenderer(): void;
     initSettingsObj?: Record<string, any>;
     set verticalDragToForward(value: boolean);
@@ -104,6 +107,7 @@ export default class Base extends Event {
     setSaveCamera(type: string): void;
     useSaveCamera(type: string, enableTransition?: boolean): Promise<boolean>;
     show(): void;
+    showAction(): void;
     hide(): void;
     addCSS2D(dom: HTMLElement, options?: {
         display?: string;

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

@@ -34,6 +34,7 @@ export interface MapOptions extends BaseOptions {
     drillDownSecondLevelMats?: boolean;
     drillDownThirdLevelMats?: boolean;
     showDistrict?: boolean;
+    showDistrictStreetView?: boolean;
     showLabel?: boolean | 'lite';
     lineWidth?: number;
     lineOffset?: number;
@@ -146,7 +147,7 @@ export default class extends Base {
         topSegments?: number;
     }): Promise<Group | undefined>;
     caId: string | number | undefined;
-    show(): Promise<void>;
+    showAction(): Promise<void>;
     private handlePickTest;
     hide(): Promise<void>;
     shadowMapLight?: BaseObject;
@@ -157,10 +158,12 @@ export default class extends Base {
     getDepth(adcode: number, futureBox: number[]): number;
     getReferenceScale(bboxa: number[], bboxb: number[]): number;
     getAdcodeShowLevel(adcode: number): string | undefined;
-    handleClick(e: MouseEvent): void;
-    beforeClickArea(adcodes: number[]): boolean;
-    clickArea({ adcodes, duration, }: {
-        adcodes: number[];
+    handleClick(area?: ExtrudePolygon): void;
+    beforeShowMap(adcodes: number[]): boolean;
+    getAdcodes(adcode: number): number[];
+    showMap({ adcode, adcodes: prevAdcodes, duration, }: {
+        adcode?: number;
+        adcodes?: number[];
         duration?: number;
     }): Promise<void>;
     drawLabels(): Promise<void>;

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

@@ -70,7 +70,6 @@ export default class PlaneMap extends BaseObject {
         coords: Position[][];
         properties: GeoJsonProperties;
     }[];
-    pickArea(e: MouseEvent): import("gl-draw/dist/core/BaseObject").IBaseObject | undefined;
     update(delta: number, elapsed: number): void;
     findGroup(adcode: string | number, fix?: boolean): Group | undefined;
     setAreaMaterial(key: string, material: THREE.Material[] | THREE.Material): void;

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

@@ -1,13 +1,10 @@
 import City from "../city";
 export default class extends City {
     drawController: {
-        PlaneMap: typeof import("../map/objects/PlaneMap").default;
-        ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
-        Mountain: typeof import("../map/objects/Mountain").default;
-        CityPlane: typeof import("../city/objects/plane").default;
         Building: typeof import("../city/objects/building").default;
-        Area: typeof import("../city/objects/area").default;
         Road: typeof import("../city/objects/road").default;
+        Area: typeof import("../city/objects/area").default;
+        CityPlane: typeof import("../city/objects/plane").default;
         Target: typeof import("../city/objects/target").default;
         Plane: typeof import("../all/objects/Plane").default;
         CrossPlane: typeof import("../all/objects/CrossPlane").default;
@@ -37,7 +34,10 @@ export default class extends City {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof import("../all/objects/Arc").default;
         Model: typeof import("../all/objects/Model").default;
+        PlaneMap: typeof import("../map/objects/PlaneMap").default;
+        ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
+        Mountain: typeof import("../map/objects/Mountain").default;
     };
     multiplyScalar: number;
-    fixNearFar(n?: number): void;
+    fixNearFar(n?: number, f?: number): void;
 }

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

@@ -1,8 +1,8 @@
 import Map, { Map2Options } from "./map";
 import City from './city';
 import { makePromiseCreator } from 'esus-lite';
+import { ExtrudePolygon } from 'gl-draw/dist/objects';
 interface MapCityOptions extends Map2Options {
-    initCity?: boolean;
     clipOutShow?: boolean;
     cityBboxMap?: Record<number, [number, number, number, number]>;
     jsonNameObj?: Record<number, string>;
@@ -27,7 +27,6 @@ interface showCityOption {
 }
 export default class extends Map {
     static VisName: string;
-    workerOnce: boolean;
     cityVisObj: Record<string, {
         city?: City;
         state: ReturnType<typeof makePromiseCreator>;
@@ -38,8 +37,7 @@ export default class extends Map {
     options: Required<MapCityOptions>;
     setOptions(options: MapCityOptions): void;
     init(): Promise<void>;
-    handleClick(e: MouseEvent): void;
-    preInitCityVis(): Promise<void>;
+    handleClick(area?: ExtrudePolygon): void;
     initCityVis(adcode: number, options?: {
         clip?: boolean;
         grey?: boolean;
@@ -47,7 +45,10 @@ export default class extends Map {
     initCityOnMap(adcode: number): Promise<void>;
     showCity(adcode: number, lnglat?: [number, number]): Promise<void>;
     showCity(option: showCityOption): Promise<void>;
-    showMap(adcode?: number[]): Promise<void>;
+    showMap({ adcode }: {
+        adcode?: number;
+        duration?: number;
+    }): Promise<void>;
     dispose(): void;
 }
 export {};

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

@@ -7,13 +7,10 @@ export default class extends Map {
     options: Required<Map2Options>;
     setOptions(options: Map2Options): void;
     drawController: DrawController<{
-        PlaneMap: typeof import("../map/objects/PlaneMap").default;
-        ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
-        Mountain: typeof import("../map/objects/Mountain").default;
-        CityPlane: typeof import("../city/objects/plane").default;
         Building: typeof import("../city/objects/building").default;
-        Area: typeof import("../city/objects/area").default;
         Road: typeof import("../city/objects/road").default;
+        Area: typeof import("../city/objects/area").default;
+        CityPlane: typeof import("../city/objects/plane").default;
         Target: typeof import("../city/objects/target").default;
         Plane: typeof import("../all/objects/Plane").default;
         CrossPlane: typeof import("../all/objects/CrossPlane").default;
@@ -43,6 +40,9 @@ export default class extends Map {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof import("../all/objects/Arc").default;
         Model: typeof import("../all/objects/Model").default;
+        PlaneMap: typeof import("../map/objects/PlaneMap").default;
+        ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
+        Mountain: typeof import("../map/objects/Mountain").default;
     }>;
     initSettingsObj: {
         label: boolean;

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

@@ -1,20 +1,9 @@
-import PlaneMap from "../../map/objects/PlaneMap";
-import Mountain from "../../map/objects/Mountain";
-import ContinentsBg from "../../map/objects/ContinentsBg";
-import CityPlane from "../../city/objects/plane";
-import Building from "../../city/objects/building";
-import Area from "../../city/objects/area";
-import Road from "../../city/objects/road";
-import Target from "../../city/objects/target";
 declare const objs: {
-    PlaneMap: typeof PlaneMap;
-    ContinentsBg: typeof ContinentsBg;
-    Mountain: typeof Mountain;
-    CityPlane: typeof CityPlane;
-    Building: typeof Building;
-    Area: typeof Area;
-    Road: typeof Road;
-    Target: typeof Target;
+    Building: typeof import("../../city/objects/building").default;
+    Road: typeof import("../../city/objects/road").default;
+    Area: typeof import("../../city/objects/area").default;
+    CityPlane: typeof import("../../city/objects/plane").default;
+    Target: typeof import("../../city/objects/target").default;
     Plane: typeof import("../../all/objects/Plane").default;
     CrossPlane: typeof import("../../all/objects/CrossPlane").default;
     PlaneShadow: typeof import("../../all/objects/PlaneShadow").default;
@@ -43,5 +32,8 @@ declare const objs: {
     Point: typeof import("../../all/objects/Point").default;
     Arc: typeof import("../../all/objects/Arc").default;
     Model: typeof import("../../all/objects/Model").default;
+    PlaneMap: typeof import("../../map/objects/PlaneMap").default;
+    ContinentsBg: typeof import("../../map/objects/ContinentsBg").default;
+    Mountain: typeof import("../../map/objects/Mountain").default;
 };
 export default objs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.24.6",
+  "version": "0.24.8",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",
@@ -68,7 +68,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.1.30",
-    "gl-draw": "0.12.11",
+    "gl-draw": "0.12.18",
     "jsrsasign": "^11.1.0",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21"