jgis 1.0.3 → 1.0.5

package/README.md

@@ -15,7 +15,7 @@
     *   按需引入 `jgis/2d` 或 `jgis/3d`。
     *   使用 2D 功能时绝不会打包 Cesium 代码，保持体积轻量。
 *   **🚀 函数式编程 (Functional)**：
-    *   摒弃复杂的类继承，使用 Hooks 风格（如 `useSelect`, `useMap`）。
+    *   摒弃复杂的类继承，使用 Hooks 风格（如 `createSelect`, `useMap`）。
     *   支持**隐式上下文**：初始化地图后，功能函数自动绑定当前地图实例，无需重复传参。
 *   **⚡️ 全能拾取器 (Universal Picker)**：
     *   **Hybrid Select**：一套 API 同时支持本地 Vector 图层和远程 WMS 服务（自动解析 GetFeatureInfo）。
@@ -23,7 +23,11 @@
 *   **🎨 灵活的样式系统**：
     *   支持根据图层、属性动态渲染高亮样式，完全控制权交给用户。
 *   **🗺️ 二三维API风格一致**：
-    *   二三维API风格一致，方便会一种框架的开发者快速理解和上手开发。
+    *   二三维API风格一致，方便会一种框架的开发者快速理解和上手开发另一种框架。
+*   **🗺️ 完全兼容openlayers/cesium**：
+    *   导出`instance`地图实例，可自己操作原生API。
+    *   如果有特殊需求，完全可以自己用原生实现，没有任何违和感。
+
 
 ---
 
@@ -60,7 +64,7 @@ import { useMap } from 'jgis/2d';
 
 onMounted(() => {
   // 初始化地图，会自动注册为全局激活实例
-  const { addMarker } = useMap('map-container', {
+  const { instance, addMarker, createLayer } = useMap('map-container', {
     center: [116.4, 39.9],
     zoom: 10
   });
@@ -85,14 +89,14 @@ onMounted(() => {
 JGIS 的核心优势在于**同时处理 Vector 和 WMS 图层**，并提供统一的样式回调。
 
 ```javascript
-const { useSelect } = useMap('map-container');
+const { createSelect, createHover } = useMap('map-container');
 
 // 假设你有两个图层：一个是本地 Vector，一个是 Geoserver WMS
 const vectorLayer = ...;
 const wmsLayer = ...;
 
 // 开启选择交互 (无需传入 map 实例)
-const select = useSelect({
+const select = createSelect({
   // 监听这些图层 (不传则监听所有)
   layers: [vectorLayer, wmsLayer],
   
@@ -107,7 +111,7 @@ const select = useSelect({
     
     // 根据业务逻辑返回不同样式
     if (layer === wmsLayer) {
-       return new Style({ 
+       return new Style({
          stroke: new Stroke({ color: 'red', width: 3 }),
          fill: new Fill({ color: 'rgba(255,0,0,0.1)' })
        });
@@ -129,6 +133,32 @@ select.onSelect((res) => {
   }
 });
 
+
+// 监听回调
+select.onSelect((res) => {
+  if (res && res.length > 0) {
+    // res 是一个数组，包含 feature, layer 和 properties
+    const item = res[0];
+    console.log('选中要素属性:', item.properties);
+    console.log('所属图层:', item.layer);
+  } else {
+    console.log('取消选中');
+  }
+});
+
+const { onHover } = createHover({
+  style: new Style({
+    stroke: new Stroke({ color: 'blue', width: 3 }),
+    fill: new Fill({ color: 'rgba(0,0,255,0.1)' })
+  })
+})
+
+onHover(data => {
+  console.log('鼠标悬浮获取的数据：', data);
+})
+
+
+
 // 页面销毁时可调用
 // select.destroy();
 ```
@@ -174,7 +204,7 @@ import { useMap } from 'jgis/3d';
 
 onMounted(() => {
   // 初始化地图，会自动注册为全局激活实例
-  const { flyTo, addMarker } = useMap('map-container', {
+  const { instance, flyTo, addMarker } = useMap('map-container', {
     center: [116.4, 39.9],
     zoom: 10
   });
@@ -186,7 +216,7 @@ onMounted(() => {
       { lon: 104.45343, lat: 30.83233 }
     ],
     {
-      style: (item) => new URL('./img.png', import.meta.url).href,
+      getImage: (item) => new URL('./img.png', import.meta.url).href,
       scale: 0.4,
       // color: Cesium.Color.YELLOW,
       disableDepthTestDistance: Number.POSITIVE_INFINITY,
@@ -205,10 +235,10 @@ onMounted(() => {
 
 ```javascript
 import { useMap } from 'jgis/3d';
-const { useSelect } = useMap('map-container');
-
+const { createSelect, createHover } = useMap('map-container');
 
-const { onSelect } = useSelect({
+// click事件
+const { onSelect } = createSelect({
   style: {
     color: Cesium.Color.YELLOW,
     scale: 0.5
@@ -216,7 +246,20 @@ const { onSelect } = useSelect({
 })
 
 onSelect((data) => {
-  console.log('获取的数据', data)
+  console.log('onSelect获取的数据', data)
+})
+
+
+// hover事件
+const { onHover } = createHover({
+  style: {
+    color: Cesium.Color.YELLOW,
+    scale: 0.5
+  }
+})
+
+onHover((data) => {
+  console.log('onHover获取的数据', data)
 })
 
 ```

package/dist/2d/index.js

@@ -1 +1 @@
-"use strict";var oe=Object.defineProperty,se=Object.defineProperties;var ae=Object.getOwnPropertyDescriptors;var V=Object.getOwnPropertySymbols;var ce=Object.prototype.hasOwnProperty,ie=Object.prototype.propertyIsEnumerable;var C=(e,t,r)=>t in e?oe(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,N=(e,t)=>{for(var r in t||(t={}))ce.call(t,r)&&C(e,r,t[r]);if(V)for(var r of V(t))ie.call(t,r)&&C(e,r,t[r]);return e},j=(e,t)=>se(e,ae(t));var I=(e,t,r)=>new Promise((o,n)=>{var s=i=>{try{c(r.next(i))}catch(l){n(l)}},a=i=>{try{c(r.throw(i))}catch(l){n(l)}},c=i=>i.done?o(i.value):Promise.resolve(i.value).then(s,a);c((r=r.apply(e,t)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const $=require("ol"),L=require("ol/layer"),w=require("ol/source"),A=require("ol/format"),le=require("ol/Overlay"),T=require("ol/geom"),ue=require("ol/Feature");require("ol/extent");const p=require("ol/style"),fe=require("ol/control"),ye=require("ol/events/condition.js"),ge=require("ol/interaction/Select");var g=63710088e-1,de={centimeters:g*100,centimetres:g*100,degrees:360/(2*Math.PI),feet:g*3.28084,inches:g*39.37,kilometers:g/1e3,kilometres:g/1e3,meters:g,metres:g,miles:g/1609.344,millimeters:g*1e3,millimetres:g*1e3,nauticalmiles:g/1852,radians:1,yards:g*1.0936};function D(e,t,r={}){const o={type:"Feature"};return(r.id===0||r.id)&&(o.id=r.id),r.bbox&&(o.bbox=r.bbox),o.properties=t||{},o.geometry=e,o}function B(e,t,r={}){if(!e)throw new Error("coordinates is required");if(!Array.isArray(e))throw new Error("coordinates must be an Array");if(e.length<2)throw new Error("coordinates must be at least 2 numbers long");if(!W(e[0])||!W(e[1]))throw new Error("coordinates must contain numbers");return D({type:"Point",coordinates:e},t,r)}function me(e,t,r={}){for(const n of e){if(n.length<4)throw new Error("Each LinearRing of a Polygon must have 4 or more Positions.");if(n[n.length-1].length!==n[0].length)throw new Error("First and last Position are not equivalent.");for(let s=0;s<n[n.length-1].length;s++)if(n[n.length-1][s]!==n[0][s])throw new Error("First and last Position are not equivalent.")}return D({type:"Polygon",coordinates:e},t,r)}function we(e,t="kilometers"){const r=de[t];if(!r)throw new Error(t+" units is invalid");return e/r}function G(e){return e%(2*Math.PI)*180/Math.PI}function z(e){return e%360*Math.PI/180}function W(e){return!isNaN(e)&&e!==null&&!Array.isArray(e)}function he(e){if(!e)throw new Error("coord is required");if(!Array.isArray(e)){if(e.type==="Feature"&&e.geometry!==null&&e.geometry.type==="Point")return[...e.geometry.coordinates];if(e.type==="Point")return[...e.coordinates]}if(Array.isArray(e)&&e.length>=2&&!Array.isArray(e[0])&&!Array.isArray(e[1]))return[...e];throw new Error("coord must be GeoJSON Point or an Array of numbers")}function be(e,t,r,o={}){const n=he(e),s=z(n[0]),a=z(n[1]),c=z(r),i=we(t,o.units),l=Math.asin(Math.sin(a)*Math.cos(i)+Math.cos(a)*Math.sin(i)*Math.cos(c)),d=s+Math.atan2(Math.sin(c)*Math.sin(i)*Math.cos(a),Math.cos(i)-Math.sin(a)*Math.sin(l)),P=G(d),u=G(l);return n[2]!==void 0?B([P,u,n[2]],o.properties):B([P,u],o.properties)}function Se(e,t,r={}){const o=r.steps||64,n=r.properties?r.properties:!Array.isArray(e)&&e.type==="Feature"&&e.properties?e.properties:{},s=[];for(let a=0;a<o;a++)s.push(be(e,t,a*-360/o,r).geometry.coordinates);return s.push(s[0]),me([s],n)}function k(e,t){return typeof e!="object"||e===null?null:e.lttd&&e.lgtd?[Number(e.lgtd),Number(e.lttd)]:e.jd&&e.wd?[Number(e.jd),Number(e.wd)]:e.latitude&&e.longitude?[Number(e.longitude),Number(e.latitude)]:e.lon&&e.lat?[Number(e.lon),Number(e.lat)]:null}function J(e,t){e.getLayers().getArray().forEach(o=>{o.get("name")==t&&("setSource"in o&&o.setSource(null),"dispose"in o&&o.dispose(),e.removeLayer(o))})}function U(e,t,r,o=!1){const n=o?r.style||r.getStyle(e,t):void 0,s=o?999:-1;n&&typeof n.setZIndex=="function"&&n.setZIndex(s),t.setStyle(n)}function Le(e,t,r){if(!t)return;const o=r.time||300;let n=Date.now(),s=!1,a=0;t.running=!0;function c(){if(!t.running)return;const i=Date.now();i-n>=o&&(s=!s,n=i,U(e,t,r,s),t.changed()),a=requestAnimationFrame(c)}c(),t.clearFlash=()=>{t.running=!1,cancelAnimationFrame(a),t.setStyle(void 0)}}function Fe(e,t,r){var a,c;if(!r)return;let o=k(r);const n=(c=(a=H(e,t))==null?void 0:a.getFeatures)==null?void 0:c.call(a);return n?n.find(function(i){const l=i.getGeometry();return l&&l instanceof T.Geometry&&typeof l.intersectsCoordinate=="function"?l.intersectsCoordinate(o):!1}):void 0}function Me(e,t,r){const o=[];let n;const s=r.type||"Point";t.forEach(c=>{switch(s){case"Point":n=Pe(c);break;case"LineString":n=ve(c);break;case"MultiLineString":n=Ee(c);break;case"MultiPolygon":n=Te(c);break;case"Polygon":n=Ie(c);break}if(!n)return;const i=new ue({geometry:n,data:c});i.set("layerName",e),o.push(i)});const a=new w.Vector;return o.length>0&&a.addFeatures(o),a}function xe(e,t){return t.cqlFilter&&(t.cqlFilter?t.CQL_FILTER+=` and ${t.cqlFilter}`:t.CQL_FILTER=t.cqlFilter),new w.TileWMS({url:t.url,params:{LAYERS:t.layers,CQL_FILTER:t.CQL_FILTER},serverType:"geoserver",crossOrigin:"anonymous"})}function H(e,t){const r=Z(e,t);return r==null?void 0:r.getSource()}function Pe(e){const t=k(e);if(t)return new T.Point(t)}function ve(e){return new T.LineString(e.coordinates)}function Ee(e){return new T.MultiLineString(e.coordinates)}function Te(e){return new T.MultiPolygon(e.coordinates)}function Ie(e){return new T.Polygon(e.coordinates)}function O(e,t){let r=null;return t.style?r=t.style:t.getStyle?r=(o,n)=>t.getStyle(e,o,n):r=Ae(),r}function Ae(){return(t,r)=>new p.Style({image:new p.Circle({radius:5,fill:new p.Fill({color:"red"})})})}function ke(e,t={}){const r=t.token||"dadcbbdb5206b626a29ca739686b3087",o=t.baseType||"img",n=t.noteType||"cia",s=new L.Tile({className:"tdt-base-layer",source:new w.XYZ({url:`http://t0.tianditu.com/DataServer?T=${o}_w&x={x}&y={y}&l={z}&tk=${r}`,maxZoom:t.maxZoom||18,minZoom:t.minZoom||2}),zIndex:t.zIndex||1});s.set("name","tdt-base-layer");const a=new L.Tile({className:"tdt-base-layer",source:new w.XYZ({url:`http://t0.tianditu.com/DataServer?T=${n}_w&x={x}&y={y}&l={z}&tk=${r}`,maxZoom:t.maxZoom||18,minZoom:t.minZoom||2}),zIndex:t.zIndex?t.zIndex+1:2});return a.set("name","tdt-baseNote-layer"),e.addLayer(s),e.addLayer(a),s}function Q(e,t,r,o){(!o||!o.type)&&(o=Object.assign({},r,o));const n=o.type||"Point";let s;switch(n){case"GeoJSON":s=Re(t,r,e,o);break;case"Wms":s=Ne(t,e,o);break;case"Point":case"LineString":case"MultiLineString":case"Polygon":case"MultiPolygon":s=je(t,r,e,o);break;case"Circle":s=pe(t,r,e,o);break;case"Overlay":s=ze(t,e,o);break}return s}function Oe(e,t){Array.isArray(t)?t.forEach(r=>{J(e,r)}):J(e,t)}function Re(e,t,r,o){console.log(typeof t,t);const n=new A.GeoJSON().readFeatures(t,{dataProjection:"EPSG:4326",featureProjection:"EPSG:4326"}),s=new w.Vector;s.addFeatures(n);const a=new L.Vector({source:s,style:O(e,o),zIndex:o.zIndex||10});return a.set("name",e),a.set("type","webgl"),r.addLayer(a),a}function Ne(e,t,r){const o=new L.Tile({opacity:r.opacity||1,source:xe(e,r),zIndex:r.zIndex||10});return o.set("name",e),t.addLayer(o),o}function je(e,t,r,o){if(!t||t.length===0)return null;const n=new L.Vector({source:Me(e,t,o),style:O(e,o),zIndex:o.zIndex||10});return n.set("name",e),n.set("type","webgl"),r.addLayer(n),n}function pe(e,t,r,o){const n=k(t),s=Se(n,o.radius,{steps:300,units:"meters"}),a=new A.GeoJSON().readFeature(s,{dataProjection:"EPSG:4326",featureProjection:"EPSG:4490"}),c=new w.Vector({wrapX:!1});c.addFeature(a);const i=new L.Vector({source:c,style:O(e,o),zIndex:o.zIndex?o.zIndex:10});return i.set("name",e),i.set("type","webgl"),r.addLayer(i),i}function ze(e,t,r){const o=document.createElement("div"),n=new le({element:o,stopEvent:!1,positioning:r.positioning||"bottom-center"});return n.set("name",e),n.set("type","webgl"),t.addOverlay(n),{overlayer:n,content:o}}function Ze(e,t,r){const o=new L.Vector({source:new w.Vector({wrapX:!1}),zIndex:r.zIndex?r.zIndex:10,style:O(t,r)});return o.set("name",t),o.set("type","webgl"),e.addLayer(o),o}function Z(e,t){return e.getAllLayers().find(n=>n.get("name")===t)}function qe(e,t,r){const o=Z(e,t);return o.setVisible(r),o}const E=new Map,x={},v={},_e=(e,t)=>{E.has(e)&&console.warn(`Map with target '${e}' already exists. Overwriting...`),E.set(e,t),x[e]&&(x[e].forEach(r=>r(t)),delete x[e]),v[e]&&(v[e].forEach(r=>r(t)),delete v[e])};function X(e){const t=E.get(e);return t?Promise.resolve(t):new Promise(r=>{v[e]=v[e]||[],v[e].push(r)})}const Ve=e=>{E.has(e)&&(E.delete(e),delete x[e])},Y=(e,t)=>{const r=E.get(e);if(r){t(r);return}x[e]||(x[e]=[]),x[e].push(t)};function Ce(e,t={}){if(!e&&!e.target)throw new Error("is not a valid element");arguments.length===1&&typeof e=="object"&&(t=e,e=t.target);const o=Object.assign({zoom:10,center:[104.064839,30.548857],minZoom:2,maxZoom:19,projection:"EPSG:4326"},t),n=new $.Map({target:e,layers:[],view:new $.View({projection:o.projection,center:o.center,zoom:o.zoom,minZoom:o.minZoom,maxZoom:o.maxZoom}),controls:fe.defaults({zoom:!1,rotate:!1,attribution:!1})});return n.targetId=e,n}function $e(e,t,r,o){Q(e,t,r,j(N({},o),{type:"Point"}))}function K(e,t,r){return new Promise((o,n)=>{e.getView().animate({center:t,duration:r.duration||1e3,zoom:r.zoom||te(e),rotation:r.rotation||0,easing:r.easing},o)})}function ee(e,t){const r=(t.extend[0]+t.extend[2])/2,o=(t.extend[1]+t.extend[3])/2;return K(e,[r,o],t)}function Be(e,t,r){const o=t.getGeometry().getExtent();return ee(e,j(N({},r),{extend:o}))}function Ge(e){return e.getView().getProjection()}function te(e){return e.getView().getZoom()}function We(e,t){e.getView().setZoom(t)}function Je(e,t){e.un("click",()=>{}),e.un("pointermove",()=>{}),Ve(t)}let M=null;function De(e,t={}){const r=new A.GeoJSON;M=new ge({condition:ye.click,multi:t.multi||!1,style:c=>{if(typeof t.getStyle=="function"){const i=c.get("layerName");return t.getStyle(i,c)}else return t.style},layers:t.layers?c=>t.layers.includes(c):void 0}),e.addInteraction(M);const o=M.getFeatures(),n=c=>I(null,null,function*(){const i=(t.layers||e.getLayers().getArray()).filter(h=>{const b=h.getSource();return h.getVisible()&&(b instanceof w.TileWMS||b instanceof w.ImageWMS)});if(i.length===0)return;const l=e.getView(),d=i.map(h=>I(null,null,function*(){const f=h.getSource().getFeatureInfoUrl(c.coordinate,l.getResolution(),l.getProjection(),{INFO_FORMAT:"application/json",FEATURE_COUNT:1});if(f)try{const S=yield(yield fetch(f)).json();if(S.features&&S.features.length>0){const m=r.readFeatures(S);return m.forEach(y=>{y.set("wms_layer_source",h),y.set("wms_event_source",c),y.set("layerName",h.get("name"))}),m}}catch(F){console.warn(F)}return[]})),u=(yield Promise.all(d)).flat();u.length>0&&(t.multi,o.extend(u),M.dispatchEvent({type:"select",selected:u,deselected:[],mapBrowserEvent:c}))});e.on("singleclick",n);const s=new Set;M.on("select",c=>{const i=o.getArray();if(i.length>0){const l=i.map(d=>({feature:d,properties:d.getProperties(),layer:d.get("wms_layer_source")||M.getLayer(d),event:d.get("wms_event_source")||c}));a(l)}else a(null)});const a=c=>s.forEach(i=>i(c));return{onSelect:c=>(s.add(c),()=>s.delete(c)),clear:()=>{s.clear(),o.clear()},destroy:()=>{e.removeInteraction(M),e.un("singleclick",n),s.clear()}}}function Ue(e,t={}){var P;const r=new A.GeoJSON,o=(P=t.debounceTime)!=null?P:200,n=new w.Vector,s=new L.Vector({source:n,map:e,style:t.style,zIndex:1e4,properties:{title:"JG_HOVER_LAYER"}});let a=null,c=null;const i=new Set,l=(u,h,b)=>{const f=u[0];if(a!==f)if(a=f,n.clear(),f?(n.addFeature(f),t.cursor!==!1&&(e.getTargetElement().style.cursor="pointer")):t.cursor!==!1&&(e.getTargetElement().style.cursor=""),f){const F={feature:f,layer:h,properties:f.getProperties(),coordinate:b};i.forEach(S=>S([F]))}else i.forEach(F=>F(null))},d=u=>{if(u.dragging)return;const h=u.pixel,b=u.coordinate;let f=!1;if(e.forEachFeatureAtPixel(h,(m,y)=>{f||y!==s&&(t.layers&&!t.layers.includes(y)||(f=!0,c&&clearTimeout(c),l([m],y,b)))}),f)return;a&&(a=null,n.clear(),e.getTargetElement().style.cursor="",i.forEach(m=>m(null))),c&&clearTimeout(c);const S=(t.layers||e.getLayers().getArray()).filter(m=>{const y=m.getSource();return m.getVisible()&&(y instanceof w.TileWMS||y instanceof w.ImageWMS)});S.length!==0&&(c=setTimeout(()=>I(null,null,function*(){const m=e.getView();for(const y of S){const q=y.getSource().getFeatureInfoUrl(b,m.getResolution(),m.getProjection(),{INFO_FORMAT:"application/json",FEATURE_COUNT:1});if(q)try{const R=yield(yield fetch(q)).json();if(R.features&&R.features.length>0){const _=r.readFeatures(R);_.forEach(ne=>ne.set("wms_layer_source",y)),l(_,y,b);return}}catch(re){}}}),o))};return e.on("pointermove",d),{onHover:u=>(i.add(u),()=>i.delete(u)),clear:()=>{n.clear(),a=null},destroy:()=>{e.un("pointermove",d),e.removeLayer(s),i.clear(),c&&clearTimeout(c)}}}const He=(e,t)=>{const r=Ce(e,t);ke(r,t.baseLayers);const o={targetId:e,instance:r,addMarker:(n,s,a)=>$e(r,n,s,a),createLayer:(n,s,a)=>Q(r,n,s,a),createBlankLayer:(n,s)=>Ze(r,n,s),visibleLayer:(n,s)=>qe(r,n,s),removeLayer:n=>Oe(r,n),getLonLat:n=>k(n),getLayerByName:n=>Z(r,n),getSourceByName:n=>H(r,n),useSelect:n=>De(r,n),useHover:n=>Ue(r,n),queryFeature:(n,s)=>Fe(r,n,s),lightFeature:(n,s,a,c)=>U(n,s,a,c),flashFeature:(n,s,a)=>Le(n,s,a),flyTo:(n,s)=>K(r,n,s),flyToByExtent:n=>ee(r,n),flyToByFeature:(n,s)=>Be(r,n,s),getProjection:()=>Ge(r),getZoom:()=>te(r),setZoom:n=>We(r,n),getMapContext:n=>X(n),onMapReady:(n,s)=>Y(n,s),destroyMap:()=>Je(r,e)};return _e(e,o),o};function Qe(e,t){Y(e,t)}function Xe(e){return X(e)}exports.getMapContext=Xe;exports.onMapReady=Qe;exports.useMap=He;
+"use strict";var oe=Object.defineProperty,se=Object.defineProperties;var ae=Object.getOwnPropertyDescriptors;var V=Object.getOwnPropertySymbols;var ce=Object.prototype.hasOwnProperty,ie=Object.prototype.propertyIsEnumerable;var C=(e,t,r)=>t in e?oe(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,N=(e,t)=>{for(var r in t||(t={}))ce.call(t,r)&&C(e,r,t[r]);if(V)for(var r of V(t))ie.call(t,r)&&C(e,r,t[r]);return e},j=(e,t)=>se(e,ae(t));var I=(e,t,r)=>new Promise((o,n)=>{var s=i=>{try{c(r.next(i))}catch(l){n(l)}},a=i=>{try{c(r.throw(i))}catch(l){n(l)}},c=i=>i.done?o(i.value):Promise.resolve(i.value).then(s,a);c((r=r.apply(e,t)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const $=require("ol"),L=require("ol/layer"),w=require("ol/source"),A=require("ol/format"),le=require("ol/Overlay"),T=require("ol/geom"),ue=require("ol/Feature");require("ol/extent");const p=require("ol/style"),fe=require("ol/control"),ye=require("ol/events/condition.js"),ge=require("ol/interaction/Select");var g=63710088e-1,de={centimeters:g*100,centimetres:g*100,degrees:360/(2*Math.PI),feet:g*3.28084,inches:g*39.37,kilometers:g/1e3,kilometres:g/1e3,meters:g,metres:g,miles:g/1609.344,millimeters:g*1e3,millimetres:g*1e3,nauticalmiles:g/1852,radians:1,yards:g*1.0936};function D(e,t,r={}){const o={type:"Feature"};return(r.id===0||r.id)&&(o.id=r.id),r.bbox&&(o.bbox=r.bbox),o.properties=t||{},o.geometry=e,o}function B(e,t,r={}){if(!e)throw new Error("coordinates is required");if(!Array.isArray(e))throw new Error("coordinates must be an Array");if(e.length<2)throw new Error("coordinates must be at least 2 numbers long");if(!W(e[0])||!W(e[1]))throw new Error("coordinates must contain numbers");return D({type:"Point",coordinates:e},t,r)}function me(e,t,r={}){for(const n of e){if(n.length<4)throw new Error("Each LinearRing of a Polygon must have 4 or more Positions.");if(n[n.length-1].length!==n[0].length)throw new Error("First and last Position are not equivalent.");for(let s=0;s<n[n.length-1].length;s++)if(n[n.length-1][s]!==n[0][s])throw new Error("First and last Position are not equivalent.")}return D({type:"Polygon",coordinates:e},t,r)}function we(e,t="kilometers"){const r=de[t];if(!r)throw new Error(t+" units is invalid");return e/r}function G(e){return e%(2*Math.PI)*180/Math.PI}function z(e){return e%360*Math.PI/180}function W(e){return!isNaN(e)&&e!==null&&!Array.isArray(e)}function he(e){if(!e)throw new Error("coord is required");if(!Array.isArray(e)){if(e.type==="Feature"&&e.geometry!==null&&e.geometry.type==="Point")return[...e.geometry.coordinates];if(e.type==="Point")return[...e.coordinates]}if(Array.isArray(e)&&e.length>=2&&!Array.isArray(e[0])&&!Array.isArray(e[1]))return[...e];throw new Error("coord must be GeoJSON Point or an Array of numbers")}function be(e,t,r,o={}){const n=he(e),s=z(n[0]),a=z(n[1]),c=z(r),i=we(t,o.units),l=Math.asin(Math.sin(a)*Math.cos(i)+Math.cos(a)*Math.sin(i)*Math.cos(c)),d=s+Math.atan2(Math.sin(c)*Math.sin(i)*Math.cos(a),Math.cos(i)-Math.sin(a)*Math.sin(l)),P=G(d),u=G(l);return n[2]!==void 0?B([P,u,n[2]],o.properties):B([P,u],o.properties)}function Se(e,t,r={}){const o=r.steps||64,n=r.properties?r.properties:!Array.isArray(e)&&e.type==="Feature"&&e.properties?e.properties:{},s=[];for(let a=0;a<o;a++)s.push(be(e,t,a*-360/o,r).geometry.coordinates);return s.push(s[0]),me([s],n)}function k(e,t){return typeof e!="object"||e===null?null:e.lttd&&e.lgtd?[Number(e.lgtd),Number(e.lttd)]:e.jd&&e.wd?[Number(e.jd),Number(e.wd)]:e.latitude&&e.longitude?[Number(e.longitude),Number(e.latitude)]:e.lon&&e.lat?[Number(e.lon),Number(e.lat)]:null}function J(e,t){e.getLayers().getArray().forEach(o=>{o.get("name")==t&&("setSource"in o&&o.setSource(null),"dispose"in o&&o.dispose(),e.removeLayer(o))})}function U(e,t,r,o=!1){const n=o?r.style||r.getStyle(e,t):void 0,s=o?999:-1;n&&typeof n.setZIndex=="function"&&n.setZIndex(s),t.setStyle(n)}function Le(e,t,r){if(!t)return;const o=r.time||300;let n=Date.now(),s=!1,a=0;t.running=!0;function c(){if(!t.running)return;const i=Date.now();i-n>=o&&(s=!s,n=i,U(e,t,r,s),t.changed()),a=requestAnimationFrame(c)}c(),t.clearFlash=()=>{t.running=!1,cancelAnimationFrame(a),t.setStyle(void 0)}}function Fe(e,t,r){var a,c;if(!r)return;let o=k(r);const n=(c=(a=H(e,t))==null?void 0:a.getFeatures)==null?void 0:c.call(a);return n?n.find(function(i){const l=i.getGeometry();return l&&l instanceof T.Geometry&&typeof l.intersectsCoordinate=="function"?l.intersectsCoordinate(o):!1}):void 0}function Me(e,t,r){const o=[];let n;const s=r.type||"Point";t.forEach(c=>{switch(s){case"Point":n=Pe(c);break;case"LineString":n=ve(c);break;case"MultiLineString":n=Ee(c);break;case"MultiPolygon":n=Te(c);break;case"Polygon":n=Ie(c);break}if(!n)return;const i=new ue({geometry:n,data:c});i.set("layerName",e),o.push(i)});const a=new w.Vector;return o.length>0&&a.addFeatures(o),a}function xe(e,t){return t.cqlFilter&&(t.cqlFilter?t.CQL_FILTER+=` and ${t.cqlFilter}`:t.CQL_FILTER=t.cqlFilter),new w.TileWMS({url:t.url,params:{LAYERS:t.layers,CQL_FILTER:t.CQL_FILTER},serverType:"geoserver",crossOrigin:"anonymous"})}function H(e,t){const r=Z(e,t);return r==null?void 0:r.getSource()}function Pe(e){const t=k(e);if(t)return new T.Point(t)}function ve(e){return new T.LineString(e.coordinates)}function Ee(e){return new T.MultiLineString(e.coordinates)}function Te(e){return new T.MultiPolygon(e.coordinates)}function Ie(e){return new T.Polygon(e.coordinates)}function O(e,t){let r=null;return t.style?r=t.style:t.getStyle?r=(o,n)=>t.getStyle(e,o,n):r=Ae(),r}function Ae(){return(t,r)=>new p.Style({image:new p.Circle({radius:5,fill:new p.Fill({color:"red"})})})}function ke(e,t={}){const r=t.token||"dadcbbdb5206b626a29ca739686b3087",o=t.baseType||"img",n=t.noteType||"cia",s=new L.Tile({className:"tdt-base-layer",source:new w.XYZ({url:`http://t0.tianditu.com/DataServer?T=${o}_w&x={x}&y={y}&l={z}&tk=${r}`,maxZoom:t.maxZoom||18,minZoom:t.minZoom||2}),zIndex:t.zIndex||1});s.set("name","tdt-base-layer");const a=new L.Tile({className:"tdt-base-layer",source:new w.XYZ({url:`http://t0.tianditu.com/DataServer?T=${n}_w&x={x}&y={y}&l={z}&tk=${r}`,maxZoom:t.maxZoom||18,minZoom:t.minZoom||2}),zIndex:t.zIndex?t.zIndex+1:2});return a.set("name","tdt-baseNote-layer"),e.addLayer(s),e.addLayer(a),s}function Q(e,t,r,o){(!o||!o.type)&&(o=Object.assign({},r,o));const n=o.type||"Point";let s;switch(n){case"GeoJSON":s=Re(t,r,e,o);break;case"Wms":s=Ne(t,e,o);break;case"Point":case"LineString":case"MultiLineString":case"Polygon":case"MultiPolygon":s=je(t,r,e,o);break;case"Circle":s=pe(t,r,e,o);break;case"Overlay":s=ze(t,e,o);break}return s}function Oe(e,t){Array.isArray(t)?t.forEach(r=>{J(e,r)}):J(e,t)}function Re(e,t,r,o){console.log(typeof t,t);const n=new A.GeoJSON().readFeatures(t,{dataProjection:"EPSG:4326",featureProjection:"EPSG:4326"}),s=new w.Vector;s.addFeatures(n);const a=new L.Vector({source:s,style:O(e,o),zIndex:o.zIndex||10});return a.set("name",e),a.set("type","webgl"),r.addLayer(a),a}function Ne(e,t,r){const o=new L.Tile({opacity:r.opacity||1,source:xe(e,r),zIndex:r.zIndex||10});return o.set("name",e),t.addLayer(o),o}function je(e,t,r,o){if(!t||t.length===0)return null;const n=new L.Vector({source:Me(e,t,o),style:O(e,o),zIndex:o.zIndex||10});return n.set("name",e),n.set("type","webgl"),r.addLayer(n),n}function pe(e,t,r,o){const n=k(t),s=Se(n,o.radius,{steps:300,units:"meters"}),a=new A.GeoJSON().readFeature(s,{dataProjection:"EPSG:4326",featureProjection:"EPSG:4490"}),c=new w.Vector({wrapX:!1});c.addFeature(a);const i=new L.Vector({source:c,style:O(e,o),zIndex:o.zIndex?o.zIndex:10});return i.set("name",e),i.set("type","webgl"),r.addLayer(i),i}function ze(e,t,r){const o=document.createElement("div"),n=new le({element:o,stopEvent:!1,positioning:r.positioning||"bottom-center"});return n.set("name",e),n.set("type","webgl"),t.addOverlay(n),{overlayer:n,content:o}}function Ze(e,t,r){const o=new L.Vector({source:new w.Vector({wrapX:!1}),zIndex:r.zIndex?r.zIndex:10,style:O(t,r)});return o.set("name",t),o.set("type","webgl"),e.addLayer(o),o}function Z(e,t){return e.getAllLayers().find(n=>n.get("name")===t)}function qe(e,t,r){const o=Z(e,t);return o.setVisible(r),o}const E=new Map,x={},v={},_e=(e,t)=>{E.has(e)&&console.warn(`Map with target '${e}' already exists. Overwriting...`),E.set(e,t),x[e]&&(x[e].forEach(r=>r(t)),delete x[e]),v[e]&&(v[e].forEach(r=>r(t)),delete v[e])};function X(e){const t=E.get(e);return t?Promise.resolve(t):new Promise(r=>{v[e]=v[e]||[],v[e].push(r)})}const Ve=e=>{E.has(e)&&(E.delete(e),delete x[e])},Y=(e,t)=>{const r=E.get(e);if(r){t(r);return}x[e]||(x[e]=[]),x[e].push(t)};function Ce(e,t={}){if(!e&&!e.target)throw new Error("is not a valid element");arguments.length===1&&typeof e=="object"&&(t=e,e=t.target);const o=Object.assign({zoom:10,center:[104.064839,30.548857],minZoom:2,maxZoom:19,projection:"EPSG:4326"},t),n=new $.Map({target:e,layers:[],view:new $.View({projection:o.projection,center:o.center,zoom:o.zoom,minZoom:o.minZoom,maxZoom:o.maxZoom}),controls:fe.defaults({zoom:!1,rotate:!1,attribution:!1})});return n.targetId=e,n}function $e(e,t,r,o){Q(e,t,r,j(N({},o),{type:"Point"}))}function K(e,t,r){return new Promise((o,n)=>{e.getView().animate({center:t,duration:r.duration||1e3,zoom:r.zoom||te(e),rotation:r.rotation||0,easing:r.easing},o)})}function ee(e,t){const r=(t.extend[0]+t.extend[2])/2,o=(t.extend[1]+t.extend[3])/2;return K(e,[r,o],t)}function Be(e,t,r){const o=t.getGeometry().getExtent();return ee(e,j(N({},r),{extend:o}))}function Ge(e){return e.getView().getProjection()}function te(e){return e.getView().getZoom()}function We(e,t){e.getView().setZoom(t)}function Je(e,t){e.un("click",()=>{}),e.un("pointermove",()=>{}),Ve(t)}let M=null;function De(e,t={}){const r=new A.GeoJSON;M=new ge({condition:ye.click,multi:t.multi||!1,style:c=>{if(typeof t.getStyle=="function"){const i=c.get("layerName");return t.getStyle(i,c)}else return t.style},layers:t.layers?c=>t.layers.includes(c):void 0}),e.addInteraction(M);const o=M.getFeatures(),n=c=>I(null,null,function*(){const i=(t.layers||e.getLayers().getArray()).filter(h=>{const b=h.getSource();return h.getVisible()&&(b instanceof w.TileWMS||b instanceof w.ImageWMS)});if(i.length===0)return;const l=e.getView(),d=i.map(h=>I(null,null,function*(){const f=h.getSource().getFeatureInfoUrl(c.coordinate,l.getResolution(),l.getProjection(),{INFO_FORMAT:"application/json",FEATURE_COUNT:1});if(f)try{const S=yield(yield fetch(f)).json();if(S.features&&S.features.length>0){const m=r.readFeatures(S);return m.forEach(y=>{y.set("wms_layer_source",h),y.set("wms_event_source",c),y.set("layerName",h.get("name"))}),m}}catch(F){console.warn(F)}return[]})),u=(yield Promise.all(d)).flat();u.length>0&&(t.multi,o.extend(u),M.dispatchEvent({type:"select",selected:u,deselected:[],mapBrowserEvent:c}))});e.on("singleclick",n);const s=new Set;M.on("select",c=>{const i=o.getArray();if(i.length>0){const l=i.map(d=>({feature:d,properties:d.getProperties(),layer:d.get("wms_layer_source")||M.getLayer(d),event:d.get("wms_event_source")||c}));a(l)}else a(null)});const a=c=>s.forEach(i=>i(c));return{onSelect:c=>(s.add(c),()=>s.delete(c)),clear:()=>{s.clear(),o.clear()},destroy:()=>{e.removeInteraction(M),e.un("singleclick",n),s.clear()}}}function Ue(e,t={}){var P;const r=new A.GeoJSON,o=(P=t.debounceTime)!=null?P:200,n=new w.Vector,s=new L.Vector({source:n,map:e,style:t.style,zIndex:1e4,properties:{title:"JG_HOVER_LAYER"}});let a=null,c=null;const i=new Set,l=(u,h,b)=>{const f=u[0];if(a!==f)if(a=f,n.clear(),f?(n.addFeature(f),t.cursor!==!1&&(e.getTargetElement().style.cursor="pointer")):t.cursor!==!1&&(e.getTargetElement().style.cursor=""),f){const F={feature:f,layer:h,properties:f.getProperties(),coordinate:b};i.forEach(S=>S([F]))}else i.forEach(F=>F(null))},d=u=>{if(u.dragging)return;const h=u.pixel,b=u.coordinate;let f=!1;if(e.forEachFeatureAtPixel(h,(m,y)=>{f||y!==s&&(t.layers&&!t.layers.includes(y)||(f=!0,c&&clearTimeout(c),l([m],y,b)))}),f)return;a&&(a=null,n.clear(),e.getTargetElement().style.cursor="",i.forEach(m=>m(null))),c&&clearTimeout(c);const S=(t.layers||e.getLayers().getArray()).filter(m=>{const y=m.getSource();return m.getVisible()&&(y instanceof w.TileWMS||y instanceof w.ImageWMS)});S.length!==0&&(c=setTimeout(()=>I(null,null,function*(){const m=e.getView();for(const y of S){const q=y.getSource().getFeatureInfoUrl(b,m.getResolution(),m.getProjection(),{INFO_FORMAT:"application/json",FEATURE_COUNT:1});if(q)try{const R=yield(yield fetch(q)).json();if(R.features&&R.features.length>0){const _=r.readFeatures(R);_.forEach(ne=>ne.set("wms_layer_source",y)),l(_,y,b);return}}catch(re){}}}),o))};return e.on("pointermove",d),{onHover:u=>(i.add(u),()=>i.delete(u)),clear:()=>{n.clear(),a=null},destroy:()=>{e.un("pointermove",d),e.removeLayer(s),i.clear(),c&&clearTimeout(c)}}}const He=(e,t)=>{const r=Ce(e,t);ke(r,t.baseLayers);const o={targetId:e,instance:r,addMarker:(n,s,a)=>$e(r,n,s,a),createLayer:(n,s,a)=>Q(r,n,s,a),createBlankLayer:(n,s)=>Ze(r,n,s),visibleLayer:(n,s)=>qe(r,n,s),removeLayer:n=>Oe(r,n),getLonLat:n=>k(n),getLayerByName:n=>Z(r,n),getSourceByName:n=>H(r,n),createSelect:n=>De(r,n),createHover:n=>Ue(r,n),queryFeature:(n,s)=>Fe(r,n,s),lightFeature:(n,s,a,c)=>U(n,s,a,c),flashFeature:(n,s,a)=>Le(n,s,a),flyTo:(n,s)=>K(r,n,s),flyToByExtent:n=>ee(r,n),flyToByFeature:(n,s)=>Be(r,n,s),getProjection:()=>Ge(r),getZoom:()=>te(r),setZoom:n=>We(r,n),getMapContext:n=>X(n),onMapReady:(n,s)=>Y(n,s),destroyMap:()=>Je(r,e)};return _e(e,o),o};function Qe(e,t){Y(e,t)}function Xe(e){return X(e)}exports.getMapContext=Xe;exports.onMapReady=Qe;exports.useMap=He;

package/dist/2d/index.mjs

@@ -1,29 +1,29 @@
-var se = Object.defineProperty, ae = Object.defineProperties;
+var ae = Object.defineProperty, se = Object.defineProperties;
 var ce = Object.getOwnPropertyDescriptors;
 var B = Object.getOwnPropertySymbols;
 var ie = Object.prototype.hasOwnProperty, le = Object.prototype.propertyIsEnumerable;
-var V = (e, t, r) => t in e ? se(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, R = (e, t) => {
+var V = (e, t, r) => t in e ? ae(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, R = (e, t) => {
   for (var r in t || (t = {}))
     ie.call(t, r) && V(e, r, t[r]);
   if (B)
     for (var r of B(t))
       le.call(t, r) && V(e, r, t[r]);
   return e;
-}, O = (e, t) => ae(e, ce(t));
+}, O = (e, t) => se(e, ce(t));
 var T = (e, t, r) => new Promise((o, n) => {
-  var s = (i) => {
+  var a = (i) => {
     try {
       c(r.next(i));
     } catch (l) {
       n(l);
     }
-  }, a = (i) => {
+  }, s = (i) => {
     try {
       c(r.throw(i));
     } catch (l) {
       n(l);
     }
-  }, c = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(s, a);
+  }, c = (i) => i.done ? o(i.value) : Promise.resolve(i.value).then(a, s);
   c((r = r.apply(e, t)).next());
 });
 import { Map as ue, View as fe } from "ol";
@@ -81,8 +81,8 @@ function Te(e, t, r = {}) {
       );
     if (n[n.length - 1].length !== n[0].length)
       throw new Error("First and last Position are not equivalent.");
-    for (let s = 0; s < n[n.length - 1].length; s++)
-      if (n[n.length - 1][s] !== n[0][s])
+    for (let a = 0; a < n[n.length - 1].length; a++)
+      if (n[n.length - 1][a] !== n[0][a])
         throw new Error("First and last Position are not equivalent.");
   }
   return H({
@@ -119,21 +119,21 @@ function pe(e) {
   throw new Error("coord must be GeoJSON Point or an Array of numbers");
 }
 function Ae(e, t, r, o = {}) {
-  const n = pe(e), s = z(n[0]), a = z(n[1]), c = z(r), i = Ie(t, o.units), l = Math.asin(
-    Math.sin(a) * Math.cos(i) + Math.cos(a) * Math.sin(i) * Math.cos(c)
-  ), m = s + Math.atan2(
-    Math.sin(c) * Math.sin(i) * Math.cos(a),
-    Math.cos(i) - Math.sin(a) * Math.sin(l)
+  const n = pe(e), a = z(n[0]), s = z(n[1]), c = z(r), i = Ie(t, o.units), l = Math.asin(
+    Math.sin(s) * Math.cos(i) + Math.cos(s) * Math.sin(i) * Math.cos(c)
+  ), m = a + Math.atan2(
+    Math.sin(c) * Math.sin(i) * Math.cos(s),
+    Math.cos(i) - Math.sin(s) * Math.sin(l)
   ), x = $(m), u = $(l);
   return n[2] !== void 0 ? q([x, u, n[2]], o.properties) : q([x, u], o.properties);
 }
 function ke(e, t, r = {}) {
-  const o = r.steps || 64, n = r.properties ? r.properties : !Array.isArray(e) && e.type === "Feature" && e.properties ? e.properties : {}, s = [];
-  for (let a = 0; a < o; a++)
-    s.push(
-      Ae(e, t, a * -360 / o, r).geometry.coordinates
+  const o = r.steps || 64, n = r.properties ? r.properties : !Array.isArray(e) && e.type === "Feature" && e.properties ? e.properties : {}, a = [];
+  for (let s = 0; s < o; s++)
+    a.push(
+      Ae(e, t, s * -360 / o, r).geometry.coordinates
     );
-  return s.push(s[0]), Te([s], n);
+  return a.push(a[0]), Te([a], n);
 }
 function p(e, t) {
   return typeof e != "object" || e === null ? null : e.lttd && e.lgtd ? [Number(e.lgtd), Number(e.lttd)] : e.jd && e.wd ? [Number(e.jd), Number(e.wd)] : e.latitude && e.longitude ? [Number(e.longitude), Number(e.latitude)] : e.lon && e.lat ? [Number(e.lon), Number(e.lat)] : null;
@@ -144,28 +144,28 @@ function U(e, t) {
   });
 }
 function J(e, t, r, o = !1) {
-  const n = o ? r.style || r.getStyle(e, t) : void 0, s = o ? 999 : -1;
-  n && typeof n.setZIndex == "function" && n.setZIndex(s), t.setStyle(n);
+  const n = o ? r.style || r.getStyle(e, t) : void 0, a = o ? 999 : -1;
+  n && typeof n.setZIndex == "function" && n.setZIndex(a), t.setStyle(n);
 }
 function Re(e, t, r) {
   if (!t) return;
   const o = r.time || 300;
-  let n = Date.now(), s = !1, a = 0;
+  let n = Date.now(), a = !1, s = 0;
   t.running = !0;
   function c() {
     if (!t.running) return;
     const i = Date.now();
-    i - n >= o && (s = !s, n = i, J(e, t, r, s), t.changed()), a = requestAnimationFrame(c);
+    i - n >= o && (a = !a, n = i, J(e, t, r, a), t.changed()), s = requestAnimationFrame(c);
   }
   c(), t.clearFlash = () => {
-    t.running = !1, cancelAnimationFrame(a), t.setStyle(void 0);
+    t.running = !1, cancelAnimationFrame(s), t.setStyle(void 0);
   };
 }
 function Oe(e, t, r) {
-  var a, c;
+  var s, c;
   if (!r) return;
   let o = p(r);
-  const n = (c = (a = Q(e, t)) == null ? void 0 : a.getFeatures) == null ? void 0 : c.call(a);
+  const n = (c = (s = Q(e, t)) == null ? void 0 : s.getFeatures) == null ? void 0 : c.call(s);
   return n ? n.find(function(i) {
     const l = i.getGeometry();
     return l && l instanceof ge && typeof l.intersectsCoordinate == "function" ? l.intersectsCoordinate(o) : !1;
@@ -174,9 +174,9 @@ function Oe(e, t, r) {
 function ze(e, t, r) {
   const o = [];
   let n;
-  const s = r.type || "Point";
+  const a = r.type || "Point";
   t.forEach((c) => {
-    switch (s) {
+    switch (a) {
       case "Point":
         n = Ne(c);
         break;
@@ -200,8 +200,8 @@ function ze(e, t, r) {
     });
     i.set("layerName", e), o.push(i);
   });
-  const a = new M();
-  return o.length > 0 && a.addFeatures(o), a;
+  const s = new M();
+  return o.length > 0 && s.addFeatures(o), s;
 }
 function je(e, t) {
   return t.cqlFilter && (t.cqlFilter ? t.CQL_FILTER += ` and ${t.cqlFilter}` : t.CQL_FILTER = t.cqlFilter), new N({
@@ -248,7 +248,7 @@ function Ve() {
   });
 }
 function Ge(e, t = {}) {
-  const r = t.token || "dadcbbdb5206b626a29ca739686b3087", o = t.baseType || "img", n = t.noteType || "cia", s = new j({
+  const r = t.token || "dadcbbdb5206b626a29ca739686b3087", o = t.baseType || "img", n = t.noteType || "cia", a = new j({
     className: "tdt-base-layer",
     source: new G({
       url: `http://t0.tianditu.com/DataServer?T=${o}_w&x={x}&y={y}&l={z}&tk=${r}`,
@@ -257,8 +257,8 @@ function Ge(e, t = {}) {
     }),
     zIndex: t.zIndex || 1
   });
-  s.set("name", "tdt-base-layer");
-  const a = new j({
+  a.set("name", "tdt-base-layer");
+  const s = new j({
     className: "tdt-base-layer",
     source: new G({
       url: `http://t0.tianditu.com/DataServer?T=${n}_w&x={x}&y={y}&l={z}&tk=${r}`,
@@ -267,34 +267,34 @@ function Ge(e, t = {}) {
     }),
     zIndex: t.zIndex ? t.zIndex + 1 : 2
   });
-  return a.set("name", "tdt-baseNote-layer"), e.addLayer(s), e.addLayer(a), s;
+  return s.set("name", "tdt-baseNote-layer"), e.addLayer(a), e.addLayer(s), a;
 }
 function X(e, t, r, o) {
   (!o || !o.type) && (o = Object.assign({}, r, o));
   const n = o.type || "Point";
-  let s;
+  let a;
   switch (n) {
     case "GeoJSON":
-      s = $e(t, r, e, o);
+      a = $e(t, r, e, o);
       break;
     case "Wms":
-      s = De(t, e, o);
+      a = De(t, e, o);
       break;
     case "Point":
     case "LineString":
     case "MultiLineString":
     case "Polygon":
     case "MultiPolygon":
-      s = Ue(t, r, e, o);
+      a = Ue(t, r, e, o);
       break;
     case "Circle":
-      s = We(t, r, e, o);
+      a = We(t, r, e, o);
       break;
     case "Overlay":
-      s = He(t, e, o);
+      a = He(t, e, o);
       break;
   }
-  return s;
+  return a;
 }
 function qe(e, t) {
   Array.isArray(t) ? t.forEach((r) => {
@@ -307,14 +307,14 @@ function $e(e, t, r, o) {
     dataProjection: "EPSG:4326",
     featureProjection: "EPSG:4326"
     // 或 'EPSG:3857'，看你的地图
-  }), s = new M();
-  s.addFeatures(n);
-  const a = new E({
-    source: s,
+  }), a = new M();
+  a.addFeatures(n);
+  const s = new E({
+    source: a,
     style: A(e, o),
     zIndex: o.zIndex || 10
   });
-  return a.set("name", e), a.set("type", "webgl"), r.addLayer(a), a;
+  return s.set("name", e), s.set("type", "webgl"), r.addLayer(s), s;
 }
 function De(e, t, r) {
   const o = new j({
@@ -334,11 +334,11 @@ function Ue(e, t, r, o) {
   return n.set("name", e), n.set("type", "webgl"), r.addLayer(n), n;
 }
 function We(e, t, r, o) {
-  const n = p(t), s = ke(n, o.radius, { steps: 300, units: "meters" }), a = new I().readFeature(s, {
+  const n = p(t), a = ke(n, o.radius, { steps: 300, units: "meters" }), s = new I().readFeature(a, {
     dataProjection: "EPSG:4326",
     featureProjection: "EPSG:4490"
   }), c = new M({ wrapX: !1 });
-  c.addFeature(a);
+  c.addFeature(s);
   const i = new E({
     source: c,
     style: A(e, o),
@@ -463,7 +463,7 @@ function ot(e, t) {
   }), Ye(t);
 }
 let F = null;
-function st(e, t = {}) {
+function at(e, t = {}) {
   const r = new I();
   F = new Ee({
     condition: ve,
@@ -513,7 +513,7 @@ function st(e, t = {}) {
     }));
   });
   e.on("singleclick", n);
-  const s = /* @__PURE__ */ new Set();
+  const a = /* @__PURE__ */ new Set();
   F.on("select", (c) => {
     const i = o.getArray();
     if (i.length > 0) {
@@ -524,24 +524,24 @@ function st(e, t = {}) {
         layer: m.get("wms_layer_source") || F.getLayer(m),
         event: m.get("wms_event_source") || c
       }));
-      a(l);
+      s(l);
     } else
-      a(null);
+      s(null);
   });
-  const a = (c) => s.forEach((i) => i(c));
+  const s = (c) => a.forEach((i) => i(c));
   return {
-    onSelect: (c) => (s.add(c), () => s.delete(c)),
+    onSelect: (c) => (a.add(c), () => a.delete(c)),
     clear: () => {
-      s.clear(), o.clear();
+      a.clear(), o.clear();
     },
     destroy: () => {
-      e.removeInteraction(F), e.un("singleclick", n), s.clear();
+      e.removeInteraction(F), e.un("singleclick", n), a.clear();
     }
   };
 }
-function at(e, t = {}) {
+function st(e, t = {}) {
   var x;
-  const r = new I(), o = (x = t.debounceTime) != null ? x : 200, n = new M(), s = new E({
+  const r = new I(), o = (x = t.debounceTime) != null ? x : 200, n = new M(), a = new E({
     source: n,
     map: e,
     style: t.style,
@@ -551,11 +551,11 @@ function at(e, t = {}) {
     properties: { title: "JG_HOVER_LAYER" }
     // 标记一下，防止自己拾取自己
   });
-  let a = null, c = null;
+  let s = null, c = null;
   const i = /* @__PURE__ */ new Set(), l = (u, w, h) => {
     const f = u[0];
-    if (a !== f)
-      if (a = f, n.clear(), f ? (n.addFeature(f), t.cursor !== !1 && (e.getTargetElement().style.cursor = "pointer")) : t.cursor !== !1 && (e.getTargetElement().style.cursor = ""), f) {
+    if (s !== f)
+      if (s = f, n.clear(), f ? (n.addFeature(f), t.cursor !== !1 && (e.getTargetElement().style.cursor = "pointer")) : t.cursor !== !1 && (e.getTargetElement().style.cursor = ""), f) {
         const L = {
           feature: f,
           layer: w,
@@ -570,9 +570,9 @@ function at(e, t = {}) {
     const w = u.pixel, h = u.coordinate;
     let f = !1;
     if (e.forEachFeatureAtPixel(w, (d, y) => {
-      f || y !== s && (t.layers && !t.layers.includes(y) || (f = !0, c && clearTimeout(c), l([d], y, h)));
+      f || y !== a && (t.layers && !t.layers.includes(y) || (f = !0, c && clearTimeout(c), l([d], y, h)));
     }), f) return;
-    a && (a = null, n.clear(), e.getTargetElement().style.cursor = "", i.forEach((d) => d(null))), c && clearTimeout(c);
+    s && (s = null, n.clear(), e.getTargetElement().style.cursor = "", i.forEach((d) => d(null))), c && clearTimeout(c);
     const b = (t.layers || e.getLayers().getArray()).filter((d) => {
       const y = d.getSource();
       return d.getVisible() && (y instanceof N || y instanceof W);
@@ -600,10 +600,10 @@ function at(e, t = {}) {
   return e.on("pointermove", m), {
     onHover: (u) => (i.add(u), () => i.delete(u)),
     clear: () => {
-      n.clear(), a = null;
+      n.clear(), s = null;
     },
     destroy: () => {
-      e.un("pointermove", m), e.removeLayer(s), i.clear(), c && clearTimeout(c);
+      e.un("pointermove", m), e.removeLayer(a), i.clear(), c && clearTimeout(c);
     }
   };
 }
@@ -614,27 +614,27 @@ const St = (e, t) => {
     targetId: e,
     instance: r,
     // 暴露原始实例以备不时之需
-    addMarker: (n, s, a) => et(r, n, s, a),
-    createLayer: (n, s, a) => X(r, n, s, a),
-    createBlankLayer: (n, s) => Je(r, n, s),
-    visibleLayer: (n, s) => Qe(r, n, s),
+    addMarker: (n, a, s) => et(r, n, a, s),
+    createLayer: (n, a, s) => X(r, n, a, s),
+    createBlankLayer: (n, a) => Je(r, n, a),
+    visibleLayer: (n, a) => Qe(r, n, a),
     removeLayer: (n) => qe(r, n),
     getLonLat: (n) => p(n),
     getLayerByName: (n) => Z(r, n),
     getSourceByName: (n) => Q(r, n),
-    useSelect: (n) => st(r, n),
-    useHover: (n) => at(r, n),
-    queryFeature: (n, s) => Oe(r, n, s),
-    lightFeature: (n, s, a, c) => J(n, s, a, c),
-    flashFeature: (n, s, a) => Re(n, s, a),
-    flyTo: (n, s) => ee(r, n, s),
+    createSelect: (n) => at(r, n),
+    createHover: (n) => st(r, n),
+    queryFeature: (n, a) => Oe(r, n, a),
+    lightFeature: (n, a, s, c) => J(n, a, s, c),
+    flashFeature: (n, a, s) => Re(n, a, s),
+    flyTo: (n, a) => ee(r, n, a),
     flyToByExtent: (n) => te(r, n),
-    flyToByFeature: (n, s) => tt(r, n, s),
+    flyToByFeature: (n, a) => tt(r, n, a),
     getProjection: () => rt(r),
     getZoom: () => re(r),
     setZoom: (n) => nt(r, n),
     getMapContext: (n) => Y(n),
-    onMapReady: (n, s) => K(n, s),
+    onMapReady: (n, a) => K(n, a),
     destroyMap: () => ot(r, e)
   };
   return Xe(e, o), o;

package/dist/2d/interaction.d.ts

@@ -27,7 +27,7 @@ export interface UseHoverResult {
     clear: () => void;
     destroy: () => void;
 }
-export declare function useSelect(map: Map, options?: SelectOptions): UseSelectResult;
+export declare function createSelect(map: Map, options?: SelectOptions): UseSelectResult;
 export interface HoverOptions {
     /** 监听图层 */
     layers?: Layer<any, any>[];
@@ -48,7 +48,7 @@ export interface HoverEvent {
     properties: any;
     coordinate: [number, number];
 }
-export declare function useHover(map: Map, options?: HoverOptions): {
+export declare function createHover(map: Map, options?: HoverOptions): {
     onHover: (cb: (res: HoverEvent[] | null) => void) => () => boolean;
     clear: () => void;
     destroy: () => void;

package/dist/2d/types.d.ts

@@ -76,8 +76,8 @@ export interface MapContext {
     lightFeature: (layerName: string, feature: FeatureLike, options: HighLightOptions, zoomFlag: boolean) => void;
     flashFeature: (layerName: string, feature: FeatureLike & customFeature, options: FlashOptions) => void;
     queryFeature: (layerName: string, properties: any) => FeatureLike;
-    useSelect: (options: SelectOptions) => UseSelectResult;
-    useHover: (options: HoverOptions) => UseHoverResult;
+    createSelect: (options: SelectOptions) => UseSelectResult;
+    createHover: (options: HoverOptions) => UseHoverResult;
     flyTo: (coordinate: [number, number], options: flyOptions) => Promise<boolean>;
     flyToByExtent: (options: flyOptions) => Promise<boolean>;
     flyToByFeature: (feature: Feature, options: flyOptions) => Promise<boolean>;

package/dist/3d/core.d.ts

@@ -1,4 +1,4 @@
-import { Coordinates, flyOptions } from './types';
+import { Coordinates, flyOptions, optionsMap } from './types';
 import * as Cesium from 'cesium';
 /**
  * 创建Viewer
@@ -14,7 +14,7 @@ export declare function createViewer(el: string, options?: any): Cesium.Viewer;
  * @param points 数据
  * @returns {void}
  */
-export declare function addMarker(viewer: Cesium.Viewer, layerName: string, points: any[], options: any): void;
+export declare function addMarker(viewer: Cesium.Viewer, layerName: string, points: any[], options: optionsMap['Point']): void;
 /**
  * 定位
  * @param map 地图实例