jgis 1.0.5 → 1.0.6

package/README.md

@@ -64,7 +64,7 @@ import { useMap } from 'jgis/2d';
 
 onMounted(() => {
   // 初始化地图，会自动注册为全局激活实例
-  const { instance, addMarker, createLayer } = useMap('map-container', {
+  const { getInstance, addMarker, createLayer } = useMap('map-container', {
     center: [116.4, 39.9],
     zoom: 10
   });
@@ -164,12 +164,12 @@ onHover(data => {
 ```
 
 
-### 3. 异步调用
+### 3. 异步获取
 
 如果创建地图的`useMap`在一个文件，而选择交互在另一个文件，可以使用异步调用。在文件中使用`onMapReady`和`getMapContext`方法来获取地图方法，而不需要传递跟地图相关的任何参数，但是必须指定地图容器的 id。例如：
 
 ```js
-import { onMapReady, getMapContext } from 'jgis/2d';
+import { onMapReady, getMapContext, getMapContextAsync } from 'jgis/2d';
 
 // 'map-container' 是地图容器的 id
 onMapReady('map-container', ({ createLayer, flyTo }) => {
@@ -177,10 +177,31 @@ onMapReady('map-container', ({ createLayer, flyTo }) => {
 })
 
 
-getMapContext('map-container').then(({ createLayer, flyTo }) => {
+getMapContextAsync('map-container').then(({ createLayer, flyTo }) => {
   
 })
 
+
+const { createLayer, flyTo，getZoom } = getMapContext('map-container');
+
+
+```
+**注意：**⚠️ 所有通过 `getMapContext` 获取的 API 都是异步的。
+
+- 当你需要返回值或严格的执行顺序时，请使用 await
+- 当你只是触发行为时，可以直接调用
+
+例如：
+
+```js
+import { onMapReady, getMapContext, getMapContextAsync } from 'jgis/2d';
+
+
+const { createLayer, flyTo, getZoom } = getMapContext('map-container');
+
+const zoom = await getZoom();
+await createLayer({ ... });
+
 ```
 
 
@@ -266,12 +287,12 @@ onHover((data) => {
 
 
 
-### 3. 异步调用
+### 3. 异步获取
 
-如果创建地图的`useMap`在一个文件，而选择交互在另一个文件，可以使用异步调用。在文件中使用`onMapReady`和`getMapContext`方法来获取地图方法，而不需要传递跟地图相关的任何参数，但是必须指定地图容器的 id。例如：
+如果创建地图的`useMap`在一个文件，而选择交互在另一个文件，可以使用异步调用。在文件中使用`onMapReady`和`getMapContext`方法来获取地图方法，而不需要传递跟地图相关的任何参数，但是必须指定地图容器的 id。可以在单文件中使用，例如：
 
 ```js
-import { onMapReady, getMapContext } from 'jgis/3d';
+import { onMapReady, getMapContext, getMapContextAsync } from 'jgis/3d';
 
 // 'map-container' 是地图容器的 id
 onMapReady('map-container', ({ createLayer, flyTo }) => {
@@ -279,10 +300,32 @@ onMapReady('map-container', ({ createLayer, flyTo }) => {
 })
 
 
-getMapContext('map-container').then(({ createLayer, flyTo }) => {
+getMapContextAsync('map-container').then(({ createLayer, flyTo }) => {
   
 })
 
+
+const { createLayer, flyTo，getZoom } = getMapContext('map-container');
+
+
+```
+
+**注意：**⚠️ 所有通过 `getMapContext` 获取的 API 都是异步的。
+
+- 当你需要返回值或严格的执行顺序时，请使用 await
+- 当你只是触发行为时，可以直接调用
+
+例如：
+
+```js
+import { onMapReady, getMapContext, getMapContextAsync } from 'jgis/3d';
+
+
+const { createLayer, flyTo, getLayerByName } = getMapContext('map-container');
+
+const zoom = await getLayerByName('layer-name');
+await createLayer({ ... });
+
 ```
 
 

package/dist/3d/index.js

@@ -1 +1 @@
-"use strict";var C=Object.defineProperty,L=Object.defineProperties;var I=Object.getOwnPropertyDescriptors;var v=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable;var b=(t,r,e)=>r in t?C(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,m=(t,r)=>{for(var e in r||(r={}))k.call(r,e)&&b(t,e,r[e]);if(v)for(var e of v(r))O.call(r,e)&&b(t,e,r[e]);return t},p=(t,r)=>L(t,I(r));Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const x=require("cesium"),P=require("../index.js");function _(t){const r=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const e in t)if(e!=="default"){const a=Object.getOwnPropertyDescriptor(t,e);Object.defineProperty(r,e,a.get?a:{enumerable:!0,get:()=>t[e]})}}return r.default=t,Object.freeze(r)}const c=_(x);function B(t,r){const e={baseType:"img",noteType:"cia",token:"dadcbbdb5206b626a29ca739686b3087"},{baseType:a,noteType:n,token:i}=Object.assign(e,r),o="https://t{s}.tianditu.gov.cn",s=["0","1","2","3","4","5","6","7"],l=new c.UrlTemplateImageryProvider({url:`${o}/DataServer?T=${a}_w&x={x}&y={y}&l={z}&tk=${i}`,subdomains:s,tilingScheme:new c.WebMercatorTilingScheme});let u=t.imageryLayers.addImageryProvider(l);u.gamma=1;const f=new c.UrlTemplateImageryProvider({url:`${o}/DataServer?T=ibo_w&x={x}&y={y}&l={z}&tk=${i}`,subdomains:s,tilingScheme:new c.WebMercatorTilingScheme});t.imageryLayers.addImageryProvider(f);const T=new c.UrlTemplateImageryProvider({url:`${o}/DataServer?T=${n}_w&x={x}&y={y}&l={z}&tk=${i}`,subdomains:s,tilingScheme:new c.WebMercatorTilingScheme});t.imageryLayers.addImageryProvider(T)}function E(t,r){B(t,r)}function S(t,r,e,a){(!a||!a.type)&&(a=Object.assign({},e,a));const n=a.type||"Point";let i;switch(n){case"Point":i=D(t,r,e,a);break;case"MultiLineString":case"LineString":i=R(t,r,e,a);break;case"Wms":e=e||a,i=H(t,r,e);break}return i}function D(t,r,e,a){const n=t.scene.primitives.add(new c.BillboardCollection);return n._layerName=r,e.forEach((i,o)=>{const s={scale:1,verticalOrigin:c.VerticalOrigin.BOTTOM,show:!0,disableDepthTestDistance:Number.POSITIVE_INFINITY,scaleByDistance:new c.NearFarScalar(1,1,1e5,.2)},l={position:c.Cartesian3.fromDegrees(...P.getLonLat(i),1),image:a.image||a.getImage(i),id:i.id||`point_${o}`},u=n.add(m(m(m({},s),a),l));u._originStyle=p(m(m(m({},s),a),l),{color:c.Color.WHITE}),u.properties=i}),t.scene.requestRender(),n}function R(t,r,e,a){if(e.length<2)return;const n=j(e,a),i=new c.GroundPolylinePrimitive({geometryInstances:n,appearance:new c.PolylineColorAppearance({translucent:!0}),interleave:!0,allowPicking:!0,asynchronous:!1});return i._layerName=r,t.scene.groundPrimitives.add(i),i}function j(t,r){const e=[],a=t.map(o=>c.Cartesian3.fromDegrees(...P.getLonLat(o),0)),n=new c.GroundPolylineGeometry({positions:a,width:r.width||4,granularity:r.granularity||2e3}),i=new c.GeometryInstance({id:"pipeLine",geometry:n,attributes:{color:c.ColorGeometryInstanceAttribute.fromColor(c.Color.fromCssColorString(r.color))}});return e.push(i),e}function H(t,r,e){const a=new c.WebMapServiceImageryProvider({url:e.url,layers:e.layers,parameters:{service:"WMS",version:"1.1.1",request:"GetMap",transparent:!0,format:"image/png"}});a._layerName=r;const n=t.imageryLayers.addImageryProvider(a);return n.alpha=e.alpha||.5,n.brightness=e.brightness||1,n.contrast=e.contrast||1,n.gamma=e.gamma||0,n}function N(t,r){const e=t.scene.primitives.add(new c.BillboardCollection);return e._layerName=r,e}function h(t,r){const e=t.scene.primitives,a=e.length;for(let n=0;n<a;n++){const i=e.get(n);if(i._layerName===r)return i}return null}function $(t,r){const e=h(t,r);e?t.scene.primitives.remove(e):console.warn("Layer not found:",r)}function q(t,r,e){const a=h(t,r);a?a.show=e:console.warn("Primitive not found:",r)}const g=new Map,d={},y={},W=(t,r)=>{g.has(t)&&console.warn(`Map with target '${t}' already exists. Overwriting...`),g.set(t,r),d[t]&&(d[t].forEach(e=>e(r)),delete d[t]),y[t]&&(y[t].forEach(e=>e(r)),delete y[t])};function w(t){const r=g.get(t);return r?Promise.resolve(r):new Promise(e=>{y[t]=y[t]||[],y[t].push(e)})}const V=t=>{g.has(t)&&(g.delete(t),delete d[t])},M=(t,r)=>{const e=g.get(t);if(e){r(e);return}d[t]||(d[t]=[]),d[t].push(r)};function G(t,r={}){const e=new c.Viewer(t,{requestRenderMode:!0,maximumRenderTimeChange:1/0,selectionIndicator:!1,animation:!1,timeline:!1,geocoder:!1,homeButton:!1,baseLayerPicker:!1,sceneModePicker:!1,navigationHelpButton:!1,infoBox:!1,fullscreenButton:!1,shouldAnimate:!0,contextOptions:{webgl:{preserveDrawingBuffer:!0,alpha:!0}}});let a;return c.defined(r.terrainUrl)?c.CesiumTerrainProvider.fromUrl(r.terrainUrl,{requestVertexNormals:!0,requestWaterMask:!0}).then(n=>{a=n,e.terrainProvider=a}):a=new c.EllipsoidTerrainProvider,e.terrainProvider=a,e._cesiumWidget._creditContainer.style.display="none",e.scene.globe.baseColor=new c.Color(0,0,0,0),e.scene.screenSpaceCameraController.minimumZoomDistance=r.minZoom||1,e.scene.screenSpaceCameraController.maximumZoomDistance=r.maxZoom||1e7,e.resolutionScale=window.devicePixelRatio>2?2:window.devicePixelRatio,e}function U(t,r,e,a){S(t,r,e,p(m({},a),{type:"Point"}))}function A(t,r,e){return new Promise((a,n)=>{t.camera.flyTo({destination:c.Cartesian3.fromDegrees(...r),duration:e.duration||1.2,orientation:{heading:e.heading||0,pitch:e.pitch||-Math.PI/2,roll:e.roll||0},easingFunction:e.easing||c.EasingFunction.LINEAR_NONE,maximumHeight:e.maxHeight||1e6,complete:()=>{a(!0)},cancel:()=>{a(!1)}})})}function F(t,r=1){return t.camera.flyHome(r)}function z(t,r,e){return new Promise((a,n)=>{t.camera.flyToBoundingSphere(r,{duration:e.duration||1e3,offset:new c.HeadingPitchRange(e.heading||0,e.pitch||-Math.PI/4,e.roll||0),easingFunction:e.easing,maximumHeight:e.maxHeight||1e6,complete:()=>{a(!0)},cancel:()=>{a(!1)}})})}function Z(t,r,e){t.camera.setView({destination:c.Cartesian3.fromDegrees(...r),orientation:{heading:e.heading||0,pitch:e.pitch||-Math.PI/2,roll:e.roll||0}})}function K(t,r){t.destroy(),V(r)}function Y(t,r=500){let e=0;return function(...a){const n=Date.now();n-e>=r&&(e=n,t.apply(this,a))}}function J(t,r){const e=new Set,a=new c.ScreenSpaceEventHandler(t.scene.canvas);let n=null;a.setInputAction(o=>{const s=t.scene.pick(o.position);if(n&&(Object.assign(n,n._originStyle),n=null,t.scene.requestRender()),c.defined(s)&&s.primitive instanceof c.Billboard){const l=s.primitive,u={primitive:l,properties:l.properties,event:o,pick:s};n=l,i(u),Object.assign(l,r.style||r.getStyle(l)),t.scene.requestRender()}},c.ScreenSpaceEventType.LEFT_CLICK);const i=o=>e.forEach(s=>s(o));return{onSelect:o=>(e.add(o),()=>e.delete(o)),clear(){e.clear()},destroy(){e.clear()}}}function Q(t,r){const e=new Set,a=s=>e.forEach(l=>l(s)),n=new c.ScreenSpaceEventHandler(t.scene.canvas);let i=null;const o=Y(a,r.delay||500);return n.setInputAction(s=>{const l=t.scene.pick(s.endPosition);if(i&&(Object.assign(i,i._originStyle),i=null,t.scene.requestRender()),c.defined(l)&&l.primitive instanceof c.Billboard){const u=l.primitive,f={primitive:u,properties:u.properties,event:s,pick:l};o(f),i=u,Object.assign(u,r.style||r.getStyle(u)),t.scene.requestRender()}},c.ScreenSpaceEventType.MOUSE_MOVE),{onHover:s=>(e.add(s),()=>e.delete(s)),clear:()=>{e.clear()},destroy:()=>{e.clear()}}}function X(t,r){const e=G(t,r);E(e,r);const a={targetId:t,instance:e,addMarker:(n,i,o)=>U(e,n,i,o),createLayer:(n,i,o)=>S(e,n,i,o),removeLayer:n=>$(e,n),visibleLayer:(n,i)=>q(e,n,i),getLayerByName:n=>h(e,n),createBlankLayer:n=>N(e,n),createSelect:n=>J(e,n),createHover:n=>Q(e,n),flyTo:(n,i)=>A(e,n,i),flyHome:n=>F(e,n),flyToBoundingSphere:(n,i)=>z(e,n,i),setView:(n,i)=>Z(e,n,i),getMapContext:n=>w(n),onMapReady:(n,i)=>M(n,i),destroyMap:n=>K(e,n)};return W(t,a),a}function ee(t,r){M(t,r)}function te(t){return w(t)}exports.getMapContext=te;exports.onMapReady=ee;exports.useMap=X;
+"use strict";var C=Object.defineProperty,L=Object.defineProperties;var I=Object.getOwnPropertyDescriptors;var v=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable;var b=(t,r,e)=>r in t?C(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,m=(t,r)=>{for(var e in r||(r={}))k.call(r,e)&&b(t,e,r[e]);if(v)for(var e of v(r))O.call(r,e)&&b(t,e,r[e]);return t},p=(t,r)=>L(t,I(r));Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const x=require("cesium"),S=require("../index.js");function _(t){const r=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const e in t)if(e!=="default"){const a=Object.getOwnPropertyDescriptor(t,e);Object.defineProperty(r,e,a.get?a:{enumerable:!0,get:()=>t[e]})}}return r.default=t,Object.freeze(r)}const c=_(x);function B(t,r){const e={baseType:"img",noteType:"cia",token:"dadcbbdb5206b626a29ca739686b3087"},{baseType:a,noteType:n,token:i}=Object.assign(e,r),o="https://t{s}.tianditu.gov.cn",s=["0","1","2","3","4","5","6","7"],l=new c.UrlTemplateImageryProvider({url:`${o}/DataServer?T=${a}_w&x={x}&y={y}&l={z}&tk=${i}`,subdomains:s,tilingScheme:new c.WebMercatorTilingScheme});let u=t.imageryLayers.addImageryProvider(l);u.gamma=1;const f=new c.UrlTemplateImageryProvider({url:`${o}/DataServer?T=ibo_w&x={x}&y={y}&l={z}&tk=${i}`,subdomains:s,tilingScheme:new c.WebMercatorTilingScheme});t.imageryLayers.addImageryProvider(f);const T=new c.UrlTemplateImageryProvider({url:`${o}/DataServer?T=${n}_w&x={x}&y={y}&l={z}&tk=${i}`,subdomains:s,tilingScheme:new c.WebMercatorTilingScheme});t.imageryLayers.addImageryProvider(T)}function E(t,r){B(t,r)}function P(t,r,e,a){(!a||!a.type)&&(a=Object.assign({},e,a));const n=a.type||"Point";let i;switch(n){case"Point":i=D(t,r,e,a);break;case"MultiLineString":case"LineString":i=R(t,r,e,a);break;case"Wms":e=e||a,i=H(t,r,e);break}return i}function D(t,r,e,a){const n=t.scene.primitives.add(new c.BillboardCollection);return n._layerName=r,e.forEach((i,o)=>{const s={scale:1,verticalOrigin:c.VerticalOrigin.BOTTOM,show:!0,disableDepthTestDistance:Number.POSITIVE_INFINITY,scaleByDistance:new c.NearFarScalar(1,1,1e5,.2)},l={position:c.Cartesian3.fromDegrees(...S.getLonLat(i),1),image:a.image||a.getImage(i),id:i.id||`point_${o}`},u=n.add(m(m(m({},s),a),l));u._originStyle=p(m(m(m({},s),a),l),{color:c.Color.WHITE}),u.properties=i}),t.scene.requestRender(),n}function R(t,r,e,a){if(e.length<2)return;const n=j(e,a),i=new c.GroundPolylinePrimitive({geometryInstances:n,appearance:new c.PolylineColorAppearance({translucent:!0}),interleave:!0,allowPicking:!0,asynchronous:!1});return i._layerName=r,t.scene.groundPrimitives.add(i),i}function j(t,r){const e=[],a=t.map(o=>c.Cartesian3.fromDegrees(...S.getLonLat(o),0)),n=new c.GroundPolylineGeometry({positions:a,width:r.width||4,granularity:r.granularity||2e3}),i=new c.GeometryInstance({id:"pipeLine",geometry:n,attributes:{color:c.ColorGeometryInstanceAttribute.fromColor(c.Color.fromCssColorString(r.color))}});return e.push(i),e}function H(t,r,e){const a=new c.WebMapServiceImageryProvider({url:e.url,layers:e.layers,parameters:{service:"WMS",version:"1.1.1",request:"GetMap",transparent:!0,format:"image/png"}});a._layerName=r;const n=t.imageryLayers.addImageryProvider(a);return n.alpha=e.alpha||.5,n.brightness=e.brightness||1,n.contrast=e.contrast||1,n.gamma=e.gamma||1,n}function N(t,r){const e=t.scene.primitives.add(new c.BillboardCollection);return e._layerName=r,e}function h(t,r){const e=t.scene.primitives,a=e.length;for(let n=0;n<a;n++){const i=e.get(n);if(i._layerName===r)return i}return null}function $(t,r){const e=h(t,r);e?t.scene.primitives.remove(e):console.warn("Layer not found:",r)}function q(t,r,e){const a=h(t,r);a?a.show=e:console.warn("Primitive not found:",r)}const g=new Map,d={},y={},W=(t,r)=>{g.has(t)&&console.warn(`Map with target '${t}' already exists. Overwriting...`),g.set(t,r),d[t]&&(d[t].forEach(e=>e(r)),delete d[t]),y[t]&&(y[t].forEach(e=>e(r)),delete y[t])};function w(t){const r=g.get(t);return r?Promise.resolve(r):new Promise(e=>{y[t]=y[t]||[],y[t].push(e)})}const V=t=>{g.has(t)&&(g.delete(t),delete d[t])},M=(t,r)=>{const e=g.get(t);if(e){r(e);return}d[t]||(d[t]=[]),d[t].push(r)};function G(t,r={}){const e=new c.Viewer(t,{requestRenderMode:!0,maximumRenderTimeChange:1/0,selectionIndicator:!1,animation:!1,timeline:!1,geocoder:!1,homeButton:!1,baseLayerPicker:!1,sceneModePicker:!1,navigationHelpButton:!1,infoBox:!1,fullscreenButton:!1,shouldAnimate:!0,contextOptions:{webgl:{preserveDrawingBuffer:!0,alpha:!0}}});let a;return c.defined(r.terrainUrl)?c.CesiumTerrainProvider.fromUrl(r.terrainUrl,{requestVertexNormals:!0,requestWaterMask:!0}).then(n=>{a=n,e.terrainProvider=a}):a=new c.EllipsoidTerrainProvider,e.terrainProvider=a,e._cesiumWidget._creditContainer.style.display="none",e.scene.globe.baseColor=new c.Color(0,0,0,0),e.scene.screenSpaceCameraController.minimumZoomDistance=r.minZoom||1,e.scene.screenSpaceCameraController.maximumZoomDistance=r.maxZoom||1e7,e.resolutionScale=window.devicePixelRatio>2?2:window.devicePixelRatio,e}function U(t,r,e,a){P(t,r,e,p(m({},a),{type:"Point"}))}function A(t,r,e){return new Promise((a,n)=>{t.camera.flyTo({destination:c.Cartesian3.fromDegrees(...r),duration:e.duration||1.2,orientation:{heading:e.heading||0,pitch:e.pitch||-Math.PI/2,roll:e.roll||0},easingFunction:e.easing||c.EasingFunction.LINEAR_NONE,maximumHeight:e.maxHeight||1e6,complete:()=>{a(!0)},cancel:()=>{a(!1)}})})}function F(t,r=1){return t.camera.flyHome(r)}function z(t,r,e){return new Promise((a,n)=>{t.camera.flyToBoundingSphere(r,{duration:e.duration||1e3,offset:new c.HeadingPitchRange(e.heading||0,e.pitch||-Math.PI/4,e.roll||0),easingFunction:e.easing,maximumHeight:e.maxHeight||1e6,complete:()=>{a(!0)},cancel:()=>{a(!1)}})})}function Z(t,r,e){t.camera.setView({destination:c.Cartesian3.fromDegrees(...r),orientation:{heading:e.heading||0,pitch:e.pitch||-Math.PI/2,roll:e.roll||0}})}function K(t,r){t.destroy(),V(r)}function Y(t,r=500){let e=0;return function(...a){const n=Date.now();n-e>=r&&(e=n,t.apply(this,a))}}function J(t,r){const e=new Set,a=new c.ScreenSpaceEventHandler(t.scene.canvas);let n=null;a.setInputAction(o=>{const s=t.scene.pick(o.position);if(n&&(Object.assign(n,n._originStyle),n.isSelected=!1,n=null,t.scene.requestRender()),c.defined(s)&&s.primitive instanceof c.Billboard){const l=s.primitive;l.isSelected=!0;const u={primitive:l,properties:l.properties,event:o,pick:s};n=l,i(u),Object.assign(l,r.style||r.getStyle(l)),t.scene.requestRender()}},c.ScreenSpaceEventType.LEFT_CLICK);const i=o=>e.forEach(s=>s(o));return{onSelect:o=>(e.add(o),()=>e.delete(o)),clear(){e.clear()},destroy(){e.clear()}}}function Q(t,r){const e=new Set,a=s=>e.forEach(l=>l(s)),n=new c.ScreenSpaceEventHandler(t.scene.canvas);let i=null;const o=Y(a,r.delay||500);return n.setInputAction(s=>{const l=t.scene.pick(s.endPosition);if(i&&!i.isSelected&&(Object.assign(i,i._originStyle),i=null,t.scene.requestRender()),c.defined(l)&&l.primitive instanceof c.Billboard){const u=l.primitive,f={primitive:u,properties:u.properties,event:s,pick:l};o(f),i=u,u.isSelected||(Object.assign(u,r.style||r.getStyle(u)),t.scene.requestRender())}},c.ScreenSpaceEventType.MOUSE_MOVE),{onHover:s=>(e.add(s),()=>e.delete(s)),clear:()=>{e.clear()},destroy:()=>{e.clear()}}}function X(t,r){const e=G(t,r);E(e,r);const a={targetId:t,instance:e,addMarker:(n,i,o)=>U(e,n,i,o),createLayer:(n,i,o)=>P(e,n,i,o),removeLayer:n=>$(e,n),visibleLayer:(n,i)=>q(e,n,i),getLayerByName:n=>h(e,n),createBlankLayer:n=>N(e,n),createSelect:n=>J(e,n),createHover:n=>Q(e,n),flyTo:(n,i)=>A(e,n,i),flyHome:n=>F(e,n),flyToBoundingSphere:(n,i)=>z(e,n,i),setView:(n,i)=>Z(e,n,i),getMapContext:n=>w(n),onMapReady:(n,i)=>M(n,i),destroyMap:n=>K(e,n)};return W(t,a),a}function ee(t,r){M(t,r)}function te(t){return w(t)}exports.getMapContext=te;exports.onMapReady=ee;exports.useMap=X;

package/dist/3d/index.mjs

@@ -11,7 +11,7 @@ var P = (r, t, e) => t in r ? C(r, t, { enumerable: !0, configurable: !0, writab
   return r;
 }, p = (r, t) => I(r, L(t));
 import * as c from "cesium";
-import { getLonLat as b } from "../index.mjs";
+import { getLonLat as S } from "../index.mjs";
 function O(r, t) {
   const e = {
     baseType: "img",
@@ -41,7 +41,7 @@ function O(r, t) {
 function B(r, t) {
   O(r, t);
 }
-function w(r, t, e, a) {
+function b(r, t, e, a) {
   (!a || !a.type) && (a = Object.assign({}, e, a));
   const n = a.type || "Point";
   let i;
@@ -73,7 +73,7 @@ function _(r, t, e, a) {
       scaleByDistance: new c.NearFarScalar(1, 1, 1e5, 0.2)
       // 根据相机距离缩放
     }, l = {
-      position: c.Cartesian3.fromDegrees(...b(i), 1),
+      position: c.Cartesian3.fromDegrees(...S(i), 1),
       image: a.image || a.getImage(i),
       id: i.id || `point_${o}`
     }, u = n.add(m(m(m({}, s), a), l));
@@ -94,7 +94,7 @@ function E(r, t, e, a) {
   return i._layerName = t, r.scene.groundPrimitives.add(i), i;
 }
 function D(r, t) {
-  const e = [], a = r.map((o) => c.Cartesian3.fromDegrees(...b(o), 0)), n = new c.GroundPolylineGeometry({
+  const e = [], a = r.map((o) => c.Cartesian3.fromDegrees(...S(o), 0)), n = new c.GroundPolylineGeometry({
     positions: a,
     width: t.width || 4,
     granularity: t.granularity || 2e3
@@ -121,7 +121,7 @@ function H(r, t, e) {
   });
   a._layerName = t;
   const n = r.imageryLayers.addImageryProvider(a);
-  return n.alpha = e.alpha || 0.5, n.brightness = e.brightness || 1, n.contrast = e.contrast || 1, n.gamma = e.gamma || 0, n;
+  return n.alpha = e.alpha || 0.5, n.brightness = e.brightness || 1, n.contrast = e.contrast || 1, n.gamma = e.gamma || 1, n;
 }
 function R(r, t) {
   const e = r.scene.primitives.add(new c.BillboardCollection());
@@ -147,7 +147,7 @@ function N(r, t, e) {
 const g = /* @__PURE__ */ new Map(), d = {}, y = {}, j = (r, t) => {
   g.has(r) && console.warn(`Map with target '${r}' already exists. Overwriting...`), g.set(r, t), d[r] && (d[r].forEach((e) => e(t)), delete d[r]), y[r] && (y[r].forEach((e) => e(t)), delete y[r]);
 };
-function S(r) {
+function w(r) {
   const t = g.get(r);
   return t ? Promise.resolve(t) : new Promise((e) => {
     y[r] = y[r] || [], y[r].push(e);
@@ -207,7 +207,7 @@ function q(r, t = {}) {
   }) : a = new c.EllipsoidTerrainProvider(), e.terrainProvider = a, e._cesiumWidget._creditContainer.style.display = "none", e.scene.globe.baseColor = new c.Color(0, 0, 0, 0), e.scene.screenSpaceCameraController.minimumZoomDistance = t.minZoom || 1, e.scene.screenSpaceCameraController.maximumZoomDistance = t.maxZoom || 1e7, e.resolutionScale = window.devicePixelRatio > 2 ? 2 : window.devicePixelRatio, e;
 }
 function V(r, t, e, a) {
-  w(r, t, e, p(m({}, a), { type: "Point" }));
+  b(r, t, e, p(m({}, a), { type: "Point" }));
 }
 function G(r, t, e) {
   return new Promise((a, n) => {
@@ -280,8 +280,10 @@ function K(r, t) {
   let n = null;
   a.setInputAction((o) => {
     const s = r.scene.pick(o.position);
-    if (n && (Object.assign(n, n._originStyle), n = null, r.scene.requestRender()), c.defined(s) && s.primitive instanceof c.Billboard) {
-      const l = s.primitive, u = {
+    if (n && (Object.assign(n, n._originStyle), n.isSelected = !1, n = null, r.scene.requestRender()), c.defined(s) && s.primitive instanceof c.Billboard) {
+      const l = s.primitive;
+      l.isSelected = !0;
+      const u = {
         primitive: l,
         properties: l.properties,
         event: o,
@@ -307,14 +309,14 @@ function Y(r, t) {
   const o = z(a, t.delay || 500);
   return n.setInputAction((s) => {
     const l = r.scene.pick(s.endPosition);
-    if (i && (Object.assign(i, i._originStyle), i = null, r.scene.requestRender()), c.defined(l) && l.primitive instanceof c.Billboard) {
+    if (i && !i.isSelected && (Object.assign(i, i._originStyle), i = null, r.scene.requestRender()), c.defined(l) && l.primitive instanceof c.Billboard) {
       const u = l.primitive, f = {
         primitive: u,
         properties: u.properties,
         event: s,
         pick: l
       };
-      o(f), i = u, Object.assign(u, t.style || t.getStyle(u)), r.scene.requestRender();
+      o(f), i = u, u.isSelected || (Object.assign(u, t.style || t.getStyle(u)), r.scene.requestRender());
     }
   }, c.ScreenSpaceEventType.MOUSE_MOVE), {
     onHover: (s) => (e.add(s), () => e.delete(s)),
@@ -333,7 +335,7 @@ function X(r, t) {
     targetId: r,
     instance: e,
     addMarker: (n, i, o) => V(e, n, i, o),
-    createLayer: (n, i, o) => w(e, n, i, o),
+    createLayer: (n, i, o) => b(e, n, i, o),
     removeLayer: (n) => $(e, n),
     visibleLayer: (n, i) => N(e, n, i),
     getLayerByName: (n) => h(e, n),
@@ -344,7 +346,7 @@ function X(r, t) {
     flyHome: (n) => U(e, n),
     flyToBoundingSphere: (n, i) => A(e, n, i),
     setView: (n, i) => F(e, n, i),
-    getMapContext: (n) => S(n),
+    getMapContext: (n) => w(n),
     onMapReady: (n, i) => T(n, i),
     destroyMap: (n) => Z(e, n)
   };
@@ -354,7 +356,7 @@ function ee(r, t) {
   T(r, t);
 }
 function re(r) {
-  return S(r);
+  return w(r);
 }
 export {
   re as getMapContext,

package/dist/3d/layer.d.ts

@@ -14,7 +14,7 @@ export declare function createBaseLayer(viewer: Cesium.Viewer, options: any): vo
  * @param options 配置项
  * @returns 图层
  */
-export declare function createLayer<K extends keyof optionsMap>(viewer: Cesium.Viewer, layerName: string, data: any, options: optionsMap[K] & {
+export declare function createLayer<K extends keyof optionsMap>(viewer: Cesium.Viewer, layerName: string, data: any, options?: optionsMap[K] & {
     type?: K;
 }): any;
 /**

package/dist/3d/types.d.ts

@@ -48,7 +48,7 @@ export type Coordinates = [number, number, number];
 export interface MapContext {
     targetId: string;
     instance: Cesium.Viewer;
-    addMarker: (layerName: string, data: any, options?: optionsMap['Point']) => void;
+    addMarker: (layerName: string, data: any, options: optionsMap['Point']) => void;
     createLayer: <K extends keyof optionsMap>(layerName: string, data: any, options?: optionsMap[K] & {
         type?: K;
     }) => Cesium.Primitive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jgis",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "快速创建二维、三维工具库",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",