vis-core 0.17.4 → 0.18.0

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.
Files changed (73) hide show
  1. package/dist/{command → editor/command}/AddObject.d.ts +1 -1
  2. package/dist/{command → editor/command}/AddVis.d.ts +1 -1
  3. package/dist/{command → editor/command}/Command.d.ts +1 -1
  4. package/dist/{command → editor/command}/CopyObject.d.ts +1 -1
  5. package/dist/{command → editor/command}/RemoveObject.d.ts +1 -1
  6. package/dist/{command → editor/command}/SetSetting.d.ts +1 -1
  7. package/dist/{history.d.ts → editor/history.d.ts} +1 -1
  8. package/dist/editor/index.d.ts +71 -0
  9. package/dist/{viewport.d.ts → editor/viewport.d.ts} +8 -8
  10. package/dist/index.d.ts +5 -80
  11. package/dist/index.js +212 -212
  12. package/dist/index.module.js +21499 -21500
  13. package/dist/version.d.ts +1 -1
  14. package/dist/vis/all/objects/Model.d.ts +11 -0
  15. package/dist/vis/all/objects/index.d.ts +2 -0
  16. package/dist/vis/base/event.d.ts +11 -0
  17. package/dist/vis/{Base.d.ts → base/index.d.ts} +48 -34
  18. package/dist/vis/city/config.d.ts +0 -1
  19. package/dist/vis/city/index.d.ts +5 -5
  20. package/dist/vis/city/objects/index.d.ts +1 -0
  21. package/dist/vis/earth/index.d.ts +6 -8
  22. package/dist/vis/earth/objects/index.d.ts +3 -0
  23. package/dist/vis/earth/styles/chinaPlate.d.ts +2 -0
  24. package/dist/vis/earth/styles/countryPlate.d.ts +2 -0
  25. package/dist/vis/earth/styles/index.d.ts +2 -0
  26. package/dist/vis/earth2/index.d.ts +5 -6
  27. package/dist/vis/earth2/objects/index.d.ts +1 -0
  28. package/dist/vis/index.d.ts +2 -2
  29. package/dist/vis/map/index.d.ts +8 -7
  30. package/dist/vis/map/objects/index.d.ts +1 -0
  31. package/dist/vis/map/styles/base.d.ts +2 -0
  32. package/dist/vis/map/styles/china.d.ts +2 -0
  33. package/dist/vis/map/styles/index.d.ts +4 -0
  34. package/dist/vis/map/styles/world.d.ts +2 -0
  35. package/dist/vis/map/styles/worldPacificCentre.d.ts +2 -0
  36. package/dist/vis/map2/city.d.ts +1 -0
  37. package/dist/vis/map2/index.d.ts +1 -2
  38. package/dist/vis/map2/map.d.ts +6 -4
  39. package/dist/vis/map2/objects/index.d.ts +1 -0
  40. package/dist/vis/map2/styles/base.d.ts +2 -0
  41. package/dist/vis/map2/styles/city350000.d.ts +2 -0
  42. package/dist/vis/map2/styles/cityOnMap.d.ts +2 -0
  43. package/dist/vis/map2/styles/index.d.ts +4 -0
  44. package/dist/vis/map2/styles/map350000.d.ts +2 -0
  45. package/package.json +2 -2
  46. package/dist/vis/earth/utils/animation.d.ts +0 -1
  47. package/dist/vis/earth/utils/index.d.ts +0 -2
  48. package/dist/vis/earth3/config.d.ts +0 -7
  49. package/dist/vis/earth3/index.d.ts +0 -41
  50. package/dist/vis/earth3/objects/index.d.ts +0 -38
  51. package/dist/vis/earth3/utils/animation.d.ts +0 -1
  52. package/dist/vis/earth3/utils/index.d.ts +0 -2
  53. package/dist/vis/map/mapWorld.d.ts +0 -2
  54. package/dist/vis/map2/city350000.d.ts +0 -2
  55. package/dist/vis/map2/map350000.d.ts +0 -2
  56. package/dist/vis/map2/mapOnCity.d.ts +0 -2
  57. /package/dist/{command → editor/command}/Commands.d.ts +0 -0
  58. /package/dist/{command → editor/command}/SetColor.d.ts +0 -0
  59. /package/dist/{command → editor/command}/SetMaterial.d.ts +0 -0
  60. /package/dist/{command → editor/command}/SetMaterialColor.d.ts +0 -0
  61. /package/dist/{command → editor/command}/SetMaterialMap.d.ts +0 -0
  62. /package/dist/{command → editor/command}/SetMaterialMapVector.d.ts +0 -0
  63. /package/dist/{command → editor/command}/SetMaterialRange.d.ts +0 -0
  64. /package/dist/{command → editor/command}/SetMaterialValue.d.ts +0 -0
  65. /package/dist/{command → editor/command}/SetMaterialVector.d.ts +0 -0
  66. /package/dist/{command → editor/command}/SetPosition.d.ts +0 -0
  67. /package/dist/{command → editor/command}/SetRotation.d.ts +0 -0
  68. /package/dist/{command → editor/command}/SetScale.d.ts +0 -0
  69. /package/dist/{command → editor/command}/SetSceenMap.d.ts +0 -0
  70. /package/dist/{command → editor/command}/SetTarget.d.ts +0 -0
  71. /package/dist/{command → editor/command}/SetValue.d.ts +0 -0
  72. /package/dist/{helper.d.ts → editor/helper.d.ts} +0 -0
  73. /package/dist/vis/{earth3 → earth}/objects/SphereShadow.d.ts +0 -0
package/dist/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- declare const _default: "0.17.4";
1
+ declare const _default: "0.18.0";
2
2
  export default _default;
@@ -0,0 +1,11 @@
1
+ import { BaseObject } from 'gl-draw';
2
+ interface Options {
3
+ src: string;
4
+ }
5
+ export default class extends BaseObject {
6
+ options: Options;
7
+ constructor(options: Options);
8
+ create(): Promise<void>;
9
+ render(): void;
10
+ }
11
+ export {};
@@ -5,6 +5,7 @@ import Point from './Point';
5
5
  import Arc from './Arc';
6
6
  import CrossPlane from './CrossPlane';
7
7
  import PlaneShadow from './PlaneShadow';
8
+ import Model from './Model';
8
9
  import Box from './Box';
9
10
  import Capsule from './Capsule';
10
11
  import Circle from './Circle';
@@ -70,6 +71,7 @@ declare const objs: {
70
71
  Light: typeof Light;
71
72
  Point: typeof Point;
72
73
  Arc: typeof Arc;
74
+ Model: typeof Model;
73
75
  };
74
76
  export default objs;
75
77
  export type d = DrawController<typeof objs>;
@@ -0,0 +1,11 @@
1
+ import { EventEmitter } from 'events';
2
+ export default class Event {
3
+ event: EventEmitter;
4
+ private eventHandlers;
5
+ on: (eventName: string | symbol, listener: (...args: any[]) => void) => EventEmitter;
6
+ emit: (eventName: string | symbol, ...args: any[]) => boolean;
7
+ addListener(node: HTMLElement, event: string, handler: (e: MouseEvent) => void, capture?: boolean): void;
8
+ removeListener(targetNode: HTMLElement | '', event: string): void;
9
+ removeAllListeners(): void;
10
+ dispose(): void;
11
+ }
@@ -1,52 +1,62 @@
1
- import { EventEmitter } from 'events';
2
1
  import Pencil, { BaseObject } from 'gl-draw';
3
- import MaterialList from "./all/MaterialList";
2
+ import MaterialList from "../all/MaterialList";
4
3
  import { Wk, Loader, Draw as DrawController } from 'gl-draw/dist/plugins';
5
4
  import { Node } from 'gl-draw/dist/objects';
6
5
  import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
7
6
  import * as THREE from 'three';
8
7
  import { Timer } from 'esus-lite';
9
- export default class Base {
8
+ import Event from "./event";
9
+ import Editor from "../../editor";
10
+ export interface BaseOptions {
11
+ container: HTMLElement;
12
+ assetsPrefix?: string;
13
+ css2DContainer?: HTMLElement;
14
+ pencilConfig?: Record<string, any>;
15
+ disableInitShow?: boolean;
16
+ editor?: boolean;
17
+ [key: string]: any;
18
+ }
19
+ export default class Base extends Event {
10
20
  static VisName: string;
11
21
  container: HTMLElement;
12
22
  playing: boolean;
13
23
  leftTruck: boolean;
14
- options: Record<string, any>;
24
+ options: BaseOptions;
15
25
  pencilConfig: Record<string, any>;
16
- event: EventEmitter;
17
26
  showState: boolean | 'ing';
18
27
  settings: Record<string, any>;
19
28
  delLoadArr?: string[];
20
29
  extendsOptions: Record<string, any>;
21
30
  pencil: Pencil;
22
31
  drawController: DrawController<{
23
- Plane: typeof import("./all/objects/Plane").default;
24
- CrossPlane: typeof import("./all/objects/CrossPlane").default;
25
- PlaneShadow: typeof import("./all/objects/PlaneShadow").default;
26
- Ring: typeof import("./all/objects/Ring").default;
27
- Sphere: typeof import("./all/objects/Sphere").default;
28
- Sprite: typeof import("./all/objects/Sprite").default;
29
- Tetrahedron: typeof import("./all/objects/Tetrahedron").default;
30
- Torus: typeof import("./all/objects/Torus").default;
31
- TorusKnot: typeof import("./all/objects/TorusKnot").default;
32
- Tube: typeof import("./all/objects/Tube").default;
33
- Box: typeof import("./all/objects/Box").default;
34
- Capsule: typeof import("./all/objects/Capsule").default;
35
- Circle: typeof import("./all/objects/Circle").default;
36
- Cylinder: typeof import("./all/objects/Cylinder").default;
37
- Dodecahedron: typeof import("./all/objects/Dodecahedron").default;
38
- Icosahedron: typeof import("./all/objects/Icosahedron").default;
39
- Lathe: typeof import("./all/objects/Lathe").default;
40
- Octahedron: typeof import("./all/objects/Octahedron").default;
32
+ Plane: typeof import("../all/objects/Plane").default;
33
+ CrossPlane: typeof import("../all/objects/CrossPlane").default;
34
+ PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
35
+ Ring: typeof import("../all/objects/Ring").default;
36
+ Sphere: typeof import("../all/objects/Sphere").default;
37
+ Sprite: typeof import("../all/objects/Sprite").default;
38
+ Tetrahedron: typeof import("../all/objects/Tetrahedron").default;
39
+ Torus: typeof import("../all/objects/Torus").default;
40
+ TorusKnot: typeof import("../all/objects/TorusKnot").default;
41
+ Tube: typeof import("../all/objects/Tube").default;
42
+ Box: typeof import("../all/objects/Box").default;
43
+ Capsule: typeof import("../all/objects/Capsule").default;
44
+ Circle: typeof import("../all/objects/Circle").default;
45
+ Cylinder: typeof import("../all/objects/Cylinder").default;
46
+ Dodecahedron: typeof import("../all/objects/Dodecahedron").default;
47
+ Icosahedron: typeof import("../all/objects/Icosahedron").default;
48
+ Lathe: typeof import("../all/objects/Lathe").default;
49
+ Octahedron: typeof import("../all/objects/Octahedron").default;
41
50
  Node: typeof Node;
42
51
  Image: typeof import("gl-draw/dist/objects").Image;
43
52
  Line: typeof import("gl-draw/dist/objects").Line;
44
53
  ExtrudePolygon: typeof import("gl-draw/dist/objects").ExtrudePolygon;
45
54
  ConicPolygon: typeof import("gl-draw/dist/objects").ConicPolygon;
46
55
  Group: typeof import("gl-draw/dist/objects").Group;
47
- Light: typeof import("./all/objects/Light").default;
48
- Point: typeof import("./all/objects/Point").default;
49
- Arc: typeof import("./all/objects/Arc").default;
56
+ Light: typeof import("../all/objects/Light").default;
57
+ Point: typeof import("../all/objects/Point").default;
58
+ Arc: typeof import("../all/objects/Arc").default;
59
+ Model: typeof import("../all/objects/Model").default;
50
60
  }>;
51
61
  mList: MaterialList;
52
62
  loader: Loader;
@@ -56,16 +66,21 @@ export default class Base {
56
66
  roomEnvMap?: THREE.Texture;
57
67
  visName: string;
58
68
  checkDprTimer: Timer;
59
- private eventHandlers;
60
- constructor(container: HTMLElement, options?: {});
61
- emit(eventName: string, ...args: any[]): void;
62
- on(eventName: string, listener: (...args: any[]) => void): void;
63
- addListener(node: HTMLElement, event: string, handler: (e: MouseEvent) => void, capture?: boolean): void;
64
- removeListener(targetNode: HTMLElement | '', event: string): void;
65
- removeAllListeners(): void;
69
+ editor?: Editor;
70
+ constructor(options: BaseOptions);
71
+ setOptions(options: Record<string, any>): void;
72
+ get fromJSON(): (jsonOrUrl: Record<string, any> | string, extendVisOptions?: (json: any) => any) => Promise<Record<string, any>>;
73
+ get baseObjectByUuid(): {
74
+ (uuid: `arc${string}`): import("../all/objects/Arc").default;
75
+ (uuid: string): BaseObject;
76
+ };
77
+ get getDataURL(): () => string;
66
78
  devicePixelRatio: number;
67
79
  getDevicePixelRatio(): number;
68
80
  setDevicePixelRatio(dpr: number): void;
81
+ loaderAdd(...args: any): void;
82
+ initMaterial(...args: any): Promise<void>;
83
+ initVis(...args: any): Promise<void>;
69
84
  init(...args: any[]): Promise<void>;
70
85
  initPencil(): Promise<void>;
71
86
  initSceneUserData(): void;
@@ -89,7 +104,6 @@ export default class Base {
89
104
  onTop?: number;
90
105
  type?: '3d' | '3dSprite';
91
106
  }): Promise<Node>;
92
- tween(obj: any): import("@tweenjs/tween.js").Tween<any>;
93
107
  lookAt(positionX: number, positionY: number, positionZ: number, targetX: number, targetY: number, targetZ: number, enableTransition?: boolean): void;
94
108
  unproject(e: MouseEvent, targetZ?: number): THREE.Vector3;
95
109
  getRoomEnvMap(): THREE.Texture;
@@ -19,4 +19,3 @@ export declare const PENCIL_CONFIG: {
19
19
  om: boolean;
20
20
  };
21
21
  };
22
- export declare const cacheVersion: string | undefined;
@@ -1,10 +1,10 @@
1
1
  import { BaseObject } from 'gl-draw';
2
- import Base from "../Base";
2
+ import Base, { BaseOptions } from "../base";
3
3
  import * as THREE from 'three';
4
4
  import { getProjection } from 'gl-draw/dist/utils';
5
5
  import { Group } from 'gl-draw/dist/objects';
6
6
  import { Draw as DrawController } from 'gl-draw/dist/plugins';
7
- interface CityOptions {
7
+ interface CityOptions extends BaseOptions {
8
8
  adcode: number;
9
9
  jsonName: string;
10
10
  cacheKey?: string;
@@ -23,7 +23,6 @@ interface CityOptions {
23
23
  };
24
24
  clipOutShow?: boolean;
25
25
  planeOut?: boolean;
26
- assetsPrefix?: string;
27
26
  showBuilding?: boolean;
28
27
  showRoad?: boolean;
29
28
  showGrassland?: boolean;
@@ -63,6 +62,7 @@ export default class extends Base {
63
62
  Light: typeof import("../all/objects/Light").default;
64
63
  Point: typeof import("../all/objects/Point").default;
65
64
  Arc: typeof import("../all/objects/Arc").default;
65
+ Model: typeof import("../all/objects/Model").default;
66
66
  }>;
67
67
  adcode: number;
68
68
  pcenter: [number, number];
@@ -72,7 +72,7 @@ export default class extends Base {
72
72
  group: Group;
73
73
  building: any;
74
74
  outAreaGroup: Group;
75
- constructor(container: HTMLElement, options?: CityOptions);
75
+ setOptions(options: CityOptions): void;
76
76
  multiplyScalar: number;
77
77
  loaderAdd(): void;
78
78
  loaderAddJson(jsonName: string): void;
@@ -80,7 +80,7 @@ export default class extends Base {
80
80
  init(): Promise<void>;
81
81
  getInvert(vector3: THREE.Vector3): any;
82
82
  fitTo(obj: BaseObject, enableTransition?: boolean): Promise<void>;
83
- initCity(): Promise<void>;
83
+ initVis(): Promise<void>;
84
84
  fitToTarget(adcode: number, lnglat?: [number, number]): Promise<void>;
85
85
  absoluteAngle(targetAngle: number, sourceAngle: number): number;
86
86
  lookAtTarget(pos: THREE.Vector3, distance: number, polarAngle: number, azimuthAngle?: number): Promise<void>;
@@ -36,6 +36,7 @@ declare const objs: {
36
36
  Light: typeof import("../../all/objects/Light").default;
37
37
  Point: typeof import("../../all/objects/Point").default;
38
38
  Arc: typeof import("../../all/objects/Arc").default;
39
+ Model: typeof import("../../all/objects/Model").default;
39
40
  };
40
41
  export default objs;
41
42
  export type d = DrawController<typeof objs>;
@@ -1,19 +1,20 @@
1
- import Base from "../Base";
1
+ import Base, { BaseOptions } from "../base";
2
2
  import * as THREE from 'three';
3
3
  import { Draw as DrawController } from 'gl-draw/dist/plugins';
4
4
  import { MeshLineMaterial } from 'gl-draw/dist/objects';
5
5
  import Countries from './objects/countries';
6
6
  import { BaseObject } from 'gl-draw';
7
- interface EarthOptions {
8
- assetsPrefix?: string;
7
+ interface EarthOptions extends BaseOptions {
9
8
  mapDepth?: number;
10
9
  radius?: number;
10
+ style?: 'chinaPlate' | 'countryPlate';
11
11
  }
12
12
  export default class extends Base {
13
13
  static VisName: string;
14
14
  drawController: DrawController<{
15
15
  Earth: typeof import("./objects/earth").default;
16
16
  Countries: typeof Countries;
17
+ SphereShadow: typeof import("./objects/SphereShadow").default;
17
18
  Plane: typeof import("../all/objects/Plane").default;
18
19
  CrossPlane: typeof import("../all/objects/CrossPlane").default;
19
20
  PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
@@ -41,18 +42,15 @@ export default class extends Base {
41
42
  Light: typeof import("../all/objects/Light").default;
42
43
  Point: typeof import("../all/objects/Point").default;
43
44
  Arc: typeof import("../all/objects/Arc").default;
45
+ Model: typeof import("../all/objects/Model").default;
44
46
  }>;
45
47
  leftTruck: boolean;
46
48
  options: Required<EarthOptions>;
47
49
  extendsOptions: Record<string, any>;
48
50
  map: Countries;
49
51
  get mapArea(): import("gl-draw/dist/objects").ConicPolygon[];
50
- constructor(container: HTMLElement, options?: EarthOptions);
52
+ setOptions(options: EarthOptions): void;
51
53
  handleSetting(key: string, value: any): Promise<any>;
52
- loaderAdd(): void;
53
- init(): Promise<void>;
54
- initMaterial(): Promise<void>;
55
- initEarth(): Promise<void>;
56
54
  initLight(): Promise<void>;
57
55
  getLocationPosition(location: [number, number], dr?: number): [number, number, number];
58
56
  setAreaColorByProperty(key: string, value: any, color: string, mix?: boolean): void;
@@ -1,9 +1,11 @@
1
1
  import { Draw as DrawController } from 'gl-draw/dist/plugins';
2
2
  import Earth from './earth';
3
3
  import Countries from './countries';
4
+ import SphereShadow from './SphereShadow';
4
5
  declare const objs: {
5
6
  Earth: typeof Earth;
6
7
  Countries: typeof Countries;
8
+ SphereShadow: typeof SphereShadow;
7
9
  Plane: typeof import("../../all/objects/Plane").default;
8
10
  CrossPlane: typeof import("../../all/objects/CrossPlane").default;
9
11
  PlaneShadow: typeof import("../../all/objects/PlaneShadow").default;
@@ -31,6 +33,7 @@ declare const objs: {
31
33
  Light: typeof import("../../all/objects/Light").default;
32
34
  Point: typeof import("../../all/objects/Point").default;
33
35
  Arc: typeof import("../../all/objects/Arc").default;
36
+ Model: typeof import("../../all/objects/Model").default;
34
37
  };
35
38
  export default objs;
36
39
  export type d = DrawController<typeof objs>;
@@ -0,0 +1,2 @@
1
+ import Vis from '../index';
2
+ export declare const chinaPlate: (vis: Vis) => void;
@@ -0,0 +1,2 @@
1
+ import Vis from '../index';
2
+ export declare const countryPlate: (vis: Vis) => void;
@@ -0,0 +1,2 @@
1
+ export * from './chinaPlate';
2
+ export * from './countryPlate';
@@ -1,7 +1,6 @@
1
- import Base from "../Base";
1
+ import Base, { BaseOptions } from "../base";
2
2
  import { Draw as DrawController } from 'gl-draw/dist/plugins';
3
- interface EarthOptions {
4
- assetsPrefix?: string;
3
+ interface EarthOptions extends BaseOptions {
5
4
  }
6
5
  export default class extends Base {
7
6
  static VisName: string;
@@ -37,12 +36,12 @@ export default class extends Base {
37
36
  Group: typeof import("gl-draw/dist/objects").Group;
38
37
  Light: typeof import("../all/objects/Light").default;
39
38
  Arc: typeof import("../all/objects/Arc").default;
39
+ Model: typeof import("../all/objects/Model").default;
40
40
  }>;
41
41
  options: Required<EarthOptions>;
42
- constructor(container: HTMLElement, options?: EarthOptions);
42
+ setOptions(options: EarthOptions): void;
43
43
  loaderAdd(): void;
44
- init(): Promise<void>;
45
- initEarth(): Promise<void>;
44
+ initVis(): Promise<void>;
46
45
  show(): void;
47
46
  autoRotateSpeed: number;
48
47
  initSettingsObj: {
@@ -34,6 +34,7 @@ declare const objs: {
34
34
  Group: typeof import("gl-draw/dist/objects").Group;
35
35
  Light: typeof import("../../all/objects/Light").default;
36
36
  Arc: typeof import("../../all/objects/Arc").default;
37
+ Model: typeof import("../../all/objects/Model").default;
37
38
  };
38
39
  export default objs;
39
40
  export type d = DrawController<typeof objs>;
@@ -1,6 +1,6 @@
1
+ export { default as Base } from './base';
1
2
  export { default as Map } from './map';
3
+ export { default as Map2 } from './map2';
2
4
  export { default as City } from './city';
3
5
  export { default as Earth } from './earth';
4
6
  export { default as Earth2 } from './earth2';
5
- export { default as Earth3 } from './earth3';
6
- export { default as Map2 } from './map2';
@@ -1,5 +1,5 @@
1
1
  import { BaseObject } from 'gl-draw';
2
- import Base from "../Base";
2
+ import Base, { BaseOptions } from "../base";
3
3
  import { getProjection } from 'gl-draw/dist/utils';
4
4
  import type { FeatureCollection, Polygon, MultiPolygon } from 'geojson';
5
5
  import { MeshLineMaterial, Group } from 'gl-draw/dist/objects';
@@ -9,7 +9,7 @@ import ContinentsBg from "./objects/ContinentsBg";
9
9
  import { Draw as DrawController } from 'gl-draw/dist/plugins';
10
10
  import { LevelArr } from 'geojson-cn';
11
11
  type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
12
- export interface MapOptions {
12
+ export interface MapOptions extends BaseOptions {
13
13
  adcode: number;
14
14
  center?: [number, number];
15
15
  parentBg?: boolean | number;
@@ -38,12 +38,12 @@ export interface MapOptions {
38
38
  equirectangular?: boolean;
39
39
  polarAngle?: number;
40
40
  azimuthAngle?: number;
41
- assetsPrefix?: string;
42
41
  curvatureResolution?: number;
43
42
  showOneLevel?: boolean;
44
43
  handleBackKeepCamvasState?: boolean;
45
44
  worldPacificCentre?: boolean;
46
45
  mapBoundary?: boolean;
46
+ style?: 'map2';
47
47
  }
48
48
  export default class extends Base {
49
49
  static VisName: string;
@@ -77,6 +77,7 @@ export default class extends Base {
77
77
  Light: typeof import("../all/objects/Light").default;
78
78
  Point: typeof import("../all/objects/Point").default;
79
79
  Arc: typeof import("../all/objects/Arc").default;
80
+ Model: typeof import("../all/objects/Model").default;
80
81
  }>;
81
82
  options: Required<MapOptions>;
82
83
  mapHistory: {
@@ -115,7 +116,7 @@ export default class extends Base {
115
116
  pscale: number;
116
117
  meters: number;
117
118
  extendsOptions: Record<string, any>;
118
- constructor(container: HTMLElement, options?: MapOptions);
119
+ setOptions(options: MapOptions): void;
119
120
  initSettingsObj: {
120
121
  label: boolean;
121
122
  labelLite: boolean;
@@ -123,9 +124,9 @@ export default class extends Base {
123
124
  };
124
125
  handleSetting(key: string, value: any): Promise<any>;
125
126
  init(): Promise<void>;
126
- initMap(adcode: number): Promise<void>;
127
- loaderAdd(adcode: number): void;
128
- initMaterial(adcode: number): Promise<void>;
127
+ initVis(adcode: number): Promise<void>;
128
+ loaderAddBg(): void;
129
+ initMaterialBg(): Promise<void>;
129
130
  setAreaMixColor(adcode: number, color: string): void;
130
131
  setAreaColorByProperty(key: string, value: any, color: string, mix?: boolean): void;
131
132
  addAreaPlaneByProperty(key: string, value: any, options?: {
@@ -31,6 +31,7 @@ declare const objs: {
31
31
  Light: typeof import("../../all/objects/Light").default;
32
32
  Point: typeof import("../../all/objects/Point").default;
33
33
  Arc: typeof import("../../all/objects/Arc").default;
34
+ Model: typeof import("../../all/objects/Model").default;
34
35
  };
35
36
  export default objs;
36
37
  export type d = DrawController<typeof objs>;
@@ -0,0 +1,2 @@
1
+ import Map from '../index';
2
+ export declare const base: (map: Map) => void;
@@ -0,0 +1,2 @@
1
+ import Map from '../index';
2
+ export declare const china: (map: Map) => void;
@@ -0,0 +1,4 @@
1
+ export * from './world';
2
+ export * from './worldPacificCentre';
3
+ export * from './china';
4
+ export * from './base';
@@ -0,0 +1,2 @@
1
+ import Map from '../index';
2
+ export declare const world: (map: Map) => void;
@@ -0,0 +1,2 @@
1
+ import Map from '../index';
2
+ export declare const worldPacificCentre: (map: Map) => void;
@@ -34,6 +34,7 @@ export default class extends City {
34
34
  Light: typeof import("../all/objects/Light").default;
35
35
  Point: typeof import("../all/objects/Point").default;
36
36
  Arc: typeof import("../all/objects/Arc").default;
37
+ Model: typeof import("../all/objects/Model").default;
37
38
  };
38
39
  multiplyScalar: number;
39
40
  fixNearFar(n?: number): void;
@@ -3,7 +3,6 @@ import City from './city';
3
3
  import { makePromiseCreator } from 'esus-lite';
4
4
  interface MapCityOptions extends Map2Options {
5
5
  initCity?: boolean;
6
- cityOnMap?: boolean;
7
6
  clipOutShow?: boolean;
8
7
  cityBboxMap?: Record<number, [number, number, number, number]>;
9
8
  jsonNameObj?: Record<number, string>;
@@ -32,7 +31,7 @@ export default class extends Map {
32
31
  get cityTarget(): import("../city/objects/target").default | undefined;
33
32
  showGroup?: 'city' | 'map';
34
33
  options: Required<MapCityOptions>;
35
- constructor(container: HTMLElement, options: MapCityOptions);
34
+ setOptions(options: MapCityOptions): void;
36
35
  init(): Promise<void>;
37
36
  preInitCityVis(): Promise<void>;
38
37
  initCityVis(adcode: number, options?: {
@@ -6,10 +6,11 @@ export interface Map2Options extends MapOptions {
6
6
  bottomPlane?: boolean;
7
7
  bottomPlaneWater?: boolean;
8
8
  clickHandleDrillDown?: boolean;
9
+ cityOnMap?: boolean;
9
10
  }
10
11
  export default class extends Map {
11
12
  options: Required<Map2Options>;
12
- constructor(container: HTMLElement, options: Map2Options);
13
+ setOptions(options: Map2Options): void;
13
14
  drawController: DrawController<{
14
15
  PlaneMap: typeof import("../map/objects/PlaneMap").default;
15
16
  ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
@@ -44,15 +45,16 @@ export default class extends Map {
44
45
  Light: typeof import("../all/objects/Light").default;
45
46
  Point: typeof import("../all/objects/Point").default;
46
47
  Arc: typeof import("../all/objects/Arc").default;
48
+ Model: typeof import("../all/objects/Model").default;
47
49
  }>;
48
50
  initSettingsObj: {
49
51
  label: boolean;
50
52
  labelLite: boolean;
51
53
  shadowMap: boolean;
52
54
  };
53
- loaderAdd(): void;
54
- initMaterial(): Promise<void>;
55
- initMap(adcode: number): Promise<void>;
55
+ loaderAddBg(): void;
56
+ initMaterialBg(): Promise<void>;
57
+ initVis(adcode: number): Promise<void>;
56
58
  drawPlaneMap({ geojson, extrudeLineGeojson, bbox, depth, adcode, }: {
57
59
  geojson: GeoJSON;
58
60
  extrudeLineGeojson?: GeoJSON;
@@ -39,5 +39,6 @@ declare const objs: {
39
39
  Light: typeof import("../../all/objects/Light").default;
40
40
  Point: typeof import("../../all/objects/Point").default;
41
41
  Arc: typeof import("../../all/objects/Arc").default;
42
+ Model: typeof import("../../all/objects/Model").default;
42
43
  };
43
44
  export default objs;
@@ -0,0 +1,2 @@
1
+ import Map from '../map';
2
+ export declare const base: (map: Map) => void;
@@ -0,0 +1,2 @@
1
+ import City from '../city';
2
+ export declare const city350000: (city: City) => void;
@@ -0,0 +1,2 @@
1
+ import Map from '../map';
2
+ export declare const cityOnMap: (map: Map) => void;
@@ -0,0 +1,4 @@
1
+ export * from './base';
2
+ export * from './cityOnMap';
3
+ export * from './map350000';
4
+ export * from './city350000';
@@ -0,0 +1,2 @@
1
+ import Map from '../map';
2
+ export declare const map350000: (map: Map) => void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vis-core",
3
- "version": "0.17.4",
3
+ "version": "0.18.0",
4
4
  "scripts": {
5
5
  "start": "npm run version && PORT=5173 bundler-dev",
6
6
  "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",
@@ -63,7 +63,7 @@
63
63
  "events": "^3.3.0",
64
64
  "geojson-cn": "^0.1.25",
65
65
  "lodash-es": "^4.17.21",
66
- "gl-draw": "0.9.40"
66
+ "gl-draw": "0.9.44"
67
67
  },
68
68
  "prettier": "prettier-config-bundler"
69
69
  }
@@ -1 +0,0 @@
1
- export declare const animation: (source: Record<string, any>, target: Record<string, any>, duration?: number, easing?: (amount: number) => number) => Promise<unknown>;
@@ -1,2 +0,0 @@
1
- export declare const fileLoader: (url: string) => Promise<any>;
2
- export declare const animation: (source: any, target: any, duration?: number, onUpdate?: (...args: any[]) => void, onComplete?: () => void, ease?: (amount: number) => number) => Promise<void>;
@@ -1,7 +0,0 @@
1
- export declare const IS_DEV: boolean;
2
- export declare const PENCIL_CONFIG: {
3
- camera: {
4
- near: number;
5
- far: number;
6
- };
7
- };
@@ -1,41 +0,0 @@
1
- import Earth from "../earth";
2
- import { Draw as DrawController } from 'gl-draw/dist/plugins';
3
- export default class extends Earth {
4
- static VisName: string;
5
- drawController: DrawController<{
6
- Earth: typeof import("../earth/objects/earth").default;
7
- Countries: typeof import("../earth/objects/countries").default;
8
- SphereShadow: typeof import("./objects/SphereShadow").default;
9
- Plane: typeof import("../all/objects/Plane").default;
10
- CrossPlane: typeof import("../all/objects/CrossPlane").default;
11
- PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
12
- Ring: typeof import("../all/objects/Ring").default;
13
- Sphere: typeof import("../all/objects/Sphere").default;
14
- Sprite: typeof import("../all/objects/Sprite").default;
15
- Tetrahedron: typeof import("../all/objects/Tetrahedron").default;
16
- Torus: typeof import("../all/objects/Torus").default;
17
- TorusKnot: typeof import("../all/objects/TorusKnot").default;
18
- Tube: typeof import("../all/objects/Tube").default;
19
- Box: typeof import("../all/objects/Box").default;
20
- Capsule: typeof import("../all/objects/Capsule").default;
21
- Circle: typeof import("../all/objects/Circle").default;
22
- Cylinder: typeof import("../all/objects/Cylinder").default;
23
- Dodecahedron: typeof import("../all/objects/Dodecahedron").default;
24
- Icosahedron: typeof import("../all/objects/Icosahedron").default;
25
- Lathe: typeof import("../all/objects/Lathe").default;
26
- Octahedron: typeof import("../all/objects/Octahedron").default;
27
- Node: typeof import("gl-draw/dist/objects").Node;
28
- Image: typeof import("gl-draw/dist/objects").Image;
29
- Line: typeof import("gl-draw/dist/objects").Line;
30
- ExtrudePolygon: typeof import("gl-draw/dist/objects").ExtrudePolygon;
31
- ConicPolygon: typeof import("gl-draw/dist/objects").ConicPolygon;
32
- Group: typeof import("gl-draw/dist/objects").Group;
33
- Light: typeof import("../all/objects/Light").default;
34
- Point: typeof import("../all/objects/Point").default;
35
- Arc: typeof import("../all/objects/Arc").default;
36
- }>;
37
- loaderAdd(): void;
38
- initMaterial(): Promise<void>;
39
- initEarth(): Promise<void>;
40
- getLocationPosition(location: [number, number], dr?: number): [number, number, number];
41
- }