@summeruse/ol 0.2.0-alpha.1 → 0.2.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @summeruse/ol
 
+## 0.2.0-alpha.2
+
+### Patch Changes
+
+- 3317ecf: feat(utils): 添加角度和旋转格式化函数
+- ba32d77: refactor(utils/layer): 重构地图图层工具函数，优化类型定义和参数结构
+
 ## 0.2.0-alpha.1
 
 ### Patch Changes

package/dist/index.js

@@ -198,6 +198,12 @@ function kmToNauticalMiles(e) {
 function nauticalMilesToKm(e) {
 	return e * ONE_NM / 1e3;
 }
+function formatRotation(e) {
+	return e < 0 ? formatRotation(e + 2 * Math.PI) : e > 2 * Math.PI ? formatRotation(e - 2 * Math.PI) : e;
+}
+function formatAngle(e) {
+	return e < 0 ? formatAngle(e + 360) : e >= 360 ? formatAngle(e - 360) : e;
+}
 function createCircleStyle(e) {
 	let { fillOptions: b, strokeOptions: x,...S } = e;
 	return new Circle$1({
@@ -303,38 +309,41 @@ function createMultiPolygonFeature(e, b) {
 		geometry: x
 	});
 }
-function getTianDiTuUrl(e) {
+function createTianDiTuUrl(e) {
 	let { type: b = "img", projection: x = WebMercatorProjection, key: S } = e, C = e.url || "https://t{0-4}.tianditu.gov.cn", w = `&tk=${S}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;
 	return `${C}/${b}_${x === "EPSG:4326" ? "c" : x === "EPSG:3857" ? "w" : "c"}/wmts?LAYER=${b}${w}`;
 }
-function getTianDiTuLayer(e) {
-	let { zIndex: b, projection: x, className: S } = e;
+function createTianDiTuLayer(e) {
+	let { layerOptions: b, sourceOptions: x,...S } = e;
 	return new Tile({
-		className: S,
 		source: new XYZ({
-			url: getTianDiTuUrl(e),
-			projection: x,
-			crossOrigin: "Anonymous"
+			url: createTianDiTuUrl(S),
+			projection: S.projection,
+			crossOrigin: "Anonymous",
+			...x
 		}),
-		zIndex: b
+		...b
 	});
 }
-function getBingLayer({ name: e, zIndex: b, key: x, className: S }) {
+function createBingLayer({ name: e, key: b, layerOptions: x, sourceOptions: S }) {
 	return new Tile({
-		className: S,
 		source: new BingMaps({
-			key: x,
+			key: b,
 			imagerySet: e,
-			placeholderTiles: !1
+			placeholderTiles: !1,
+			...S
 		}),
-		zIndex: b
+		...x
 	});
 }
-function getOSMLayer(e) {
+function createOpenStreetMapLayer(e) {
+	let { layerOptions: b, sourceOptions: x } = e || {};
 	return new Tile({
-		className: e?.className,
-		source: new OSM({ crossOrigin: "Anonymous" }),
-		zIndex: e?.zIndex
+		source: new OSM({
+			crossOrigin: "Anonymous",
+			...x
+		}),
+		...b
 	});
 }
 function createVectorLayer(e) {
@@ -687,4 +696,4 @@ function useSwitchBaseLayer(e) {
 		});
 	}, { immediate: !0 }), { visibleLayerName: b };
 }
-export { EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, WGS84Projection, WebMercatorProjection, createCircle, createCircleFeature, createCircleStyle, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl, kmToNauticalMiles, mercatorExtentToWgs84, mercatorToWgs84, nauticalMilesToKm, olMapInjectionKey, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer, wgs84ExtentToMercator, wgs84ToMercator };
+export { EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, WGS84Projection, WebMercatorProjection, createBingLayer, createCircle, createCircleFeature, createCircleStyle, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createOpenStreetMapLayer, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer, formatAngle, formatRotation, kmToNauticalMiles, mercatorExtentToWgs84, mercatorToWgs84, nauticalMilesToKm, olMapInjectionKey, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer, wgs84ExtentToMercator, wgs84ToMercator };

package/es/index.mjs

@@ -4,10 +4,10 @@ import "./components/index.mjs";
 import { useContextmenu } from "./composables/useContextmenu/index.mjs";
 import { ONE_NM } from "./constants/distance.mjs";
 import { EPSG_3857, EPSG_4326, WGS84Projection, WebMercatorProjection } from "./constants/projection.mjs";
-import { kmToNauticalMiles, nauticalMilesToKm } from "./utils/distance/index.mjs";
+import { formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm } from "./utils/distance/index.mjs";
 import { createCircleStyle, createStyle, createTextStyle } from "./utils/style/index.mjs";
 import { createCircle, createCircleFeature, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature } from "./utils/feature/index.mjs";
-import { createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl } from "./utils/layer/index.mjs";
+import { createBingLayer, createOpenStreetMapLayer, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer } from "./utils/layer/index.mjs";
 import { EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, mercatorExtentToWgs84, mercatorToWgs84, wgs84ExtentToMercator, wgs84ToMercator } from "./utils/projection/index.mjs";
 import "./utils/index.mjs";
 import { useDrawLineString } from "./composables/useDrawLineString/index.mjs";
@@ -16,4 +16,4 @@ import { useGraticule } from "./composables/useGraticule/index.mjs";
 import { usePointermove } from "./composables/usePointermove/index.mjs";
 import { useSwitchBaseLayer } from "./composables/useSwitchBaseLayer/index.mjs";
 import "./composables/index.mjs";
-export { EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, WGS84Projection, WebMercatorProjection, createCircle, createCircleFeature, createCircleStyle, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl, kmToNauticalMiles, mercatorExtentToWgs84, mercatorToWgs84, nauticalMilesToKm, olMapInjectionKey, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer, wgs84ExtentToMercator, wgs84ToMercator };
+export { EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, WGS84Projection, WebMercatorProjection, createBingLayer, createCircle, createCircleFeature, createCircleStyle, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createOpenStreetMapLayer, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer, formatAngle, formatRotation, kmToNauticalMiles, mercatorExtentToWgs84, mercatorToWgs84, nauticalMilesToKm, olMapInjectionKey, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer, wgs84ExtentToMercator, wgs84ToMercator };

package/es/utils/distance/index.d.ts

@@ -2,3 +2,7 @@
 export declare function kmToNauticalMiles(km: number): number;
 /** 海里转公里 */
 export declare function nauticalMilesToKm(nauticalMiles: number): number;
+/** 格式化Rotation */
+export declare function formatRotation(rotation: number): number;
+/** 格式化角度 */
+export declare function formatAngle(angle: number): number;

package/es/utils/distance/index.mjs

@@ -1,8 +1,14 @@
 import { ONE_NM } from "../../constants/distance.mjs";
-function kmToNauticalMiles(n) {
-	return n * 1e3 / ONE_NM;
+function kmToNauticalMiles(i) {
+	return i * 1e3 / ONE_NM;
 }
-function nauticalMilesToKm(n) {
-	return n * ONE_NM / 1e3;
+function nauticalMilesToKm(i) {
+	return i * ONE_NM / 1e3;
 }
-export { kmToNauticalMiles, nauticalMilesToKm };
+function formatRotation(e) {
+	return e < 0 ? formatRotation(e + 2 * Math.PI) : e > 2 * Math.PI ? formatRotation(e - 2 * Math.PI) : e;
+}
+function formatAngle(e) {
+	return e < 0 ? formatAngle(e + 360) : e >= 360 ? formatAngle(e - 360) : e;
+}
+export { formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm };

package/es/utils/index.mjs

@@ -1,5 +1,5 @@
-import { kmToNauticalMiles, nauticalMilesToKm } from "./distance/index.mjs";
+import { formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm } from "./distance/index.mjs";
 import { createCircleStyle, createStyle, createTextStyle } from "./style/index.mjs";
 import { createCircle, createCircleFeature, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature } from "./feature/index.mjs";
-import { createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl } from "./layer/index.mjs";
+import { createBingLayer, createOpenStreetMapLayer, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer } from "./layer/index.mjs";
 import { EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, mercatorExtentToWgs84, mercatorToWgs84, wgs84ExtentToMercator, wgs84ToMercator } from "./projection/index.mjs";

package/es/utils/layer/index.d.ts

@@ -1,36 +1,40 @@
+import { StyleOptions } from '../style';
 import { Feature } from 'ol';
 import { Geometry } from 'ol/geom';
 import { ProjectionLike } from 'ol/proj';
-import { StyleOptions } from '../style';
 import { Tile as TileLayer } from 'ol/layer';
 import { default as VectorLayer } from 'ol/layer/Vector';
 import { BingMaps, OSM, XYZ } from 'ol/source';
 import { default as VectorSource } from 'ol/source/Vector';
 export type T_MAP_TYPE = 'vec' | 'cva' | 'img' | 'cia' | 'ter' | 'cta' | 'ibo';
-export declare function getTianDiTuUrl(data: {
-    url?: string;
-    type: T_MAP_TYPE;
-    projection: ProjectionLike;
-    key: string;
-}): string;
-export declare function getTianDiTuLayer(data: {
+export interface CreateTianDiTuUrlOptions {
     url?: string;
-    projection: ProjectionLike;
-    zIndex?: number;
     key: string;
     type: T_MAP_TYPE;
-    className?: string;
-}): TileLayer<XYZ>;
-export declare function getBingLayer({ name, zIndex, key, className, }: {
+    projection?: ProjectionLike;
+}
+export declare function createTianDiTuUrl(data: CreateTianDiTuUrlOptions): string;
+export type TileLayerOptions = Partial<ConstructorParameters<typeof TileLayer>[0]>;
+export type XYZ_SourceOptions = Partial<ConstructorParameters<typeof XYZ>[0]>;
+export type CreateTianDiTuLayerOptions = CreateTianDiTuUrlOptions & {
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: XYZ_SourceOptions;
+};
+export declare function createTianDiTuLayer(data: CreateTianDiTuLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
+export type BingMapsSourceOptions = Partial<ConstructorParameters<typeof BingMaps>[0]>;
+export interface CreateBingLayerOptions {
     name: string;
-    zIndex?: number;
     key: string;
-    className?: string;
-}): TileLayer<BingMaps>;
-export declare function getOSMLayer(data?: {
-    zIndex?: number;
-    className?: string;
-}): TileLayer<OSM>;
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: BingMapsSourceOptions;
+}
+export declare function createBingLayer({ name, key, layerOptions, sourceOptions, }: CreateBingLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
+export type OpenStreetMapSourceOptions = Partial<ConstructorParameters<typeof OSM>[0]>;
+export interface CreateOpenStreetMapLayerOptions {
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: BingMapsSourceOptions;
+}
+export declare function createOpenStreetMapLayer(data?: CreateOpenStreetMapLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
 export type _VectorLayerOptions = ConstructorParameters<typeof VectorLayer>[0];
 export type VectorLayerOptions = _VectorLayerOptions & {
     styleOptions?: StyleOptions;

package/es/utils/layer/index.mjs

@@ -4,38 +4,41 @@ import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import { Tile } from "ol/layer";
 import { BingMaps, OSM, XYZ } from "ol/source";
-function getTianDiTuUrl(e) {
+function createTianDiTuUrl(e) {
 	let { type: c = "img", projection: l = WebMercatorProjection, key: u } = e, d = e.url || "https://t{0-4}.tianditu.gov.cn", f = `&tk=${u}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;
 	return `${d}/${c}_${l === "EPSG:4326" ? "c" : l === "EPSG:3857" ? "w" : "c"}/wmts?LAYER=${c}${f}`;
 }
-function getTianDiTuLayer(e) {
-	let { zIndex: s, projection: c, className: l } = e;
+function createTianDiTuLayer(e) {
+	let { layerOptions: s, sourceOptions: c,...l } = e;
 	return new Tile({
-		className: l,
 		source: new XYZ({
-			url: getTianDiTuUrl(e),
-			projection: c,
-			crossOrigin: "Anonymous"
+			url: createTianDiTuUrl(l),
+			projection: l.projection,
+			crossOrigin: "Anonymous",
+			...c
 		}),
-		zIndex: s
+		...s
 	});
 }
-function getBingLayer({ name: e, zIndex: s, key: c, className: l }) {
+function createBingLayer({ name: e, key: s, layerOptions: c, sourceOptions: l }) {
 	return new Tile({
-		className: l,
 		source: new BingMaps({
-			key: c,
+			key: s,
 			imagerySet: e,
-			placeholderTiles: !1
+			placeholderTiles: !1,
+			...l
 		}),
-		zIndex: s
+		...c
 	});
 }
-function getOSMLayer(e) {
+function createOpenStreetMapLayer(e) {
+	let { layerOptions: s, sourceOptions: c } = e || {};
 	return new Tile({
-		className: e?.className,
-		source: new OSM({ crossOrigin: "Anonymous" }),
-		zIndex: e?.zIndex
+		source: new OSM({
+			crossOrigin: "Anonymous",
+			...c
+		}),
+		...s
 	});
 }
 function createVectorLayer(e) {
@@ -49,4 +52,4 @@ function createVectorLayer(e) {
 		})
 	};
 }
-export { createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl };
+export { createBingLayer, createOpenStreetMapLayer, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer };

package/lib/index.js

@@ -1 +1 @@
-const e=require(`./components/ol-map/props.js`),t=require(`./components/ol-map/index.js`);require(`./components/index.js`);const n=require(`./composables/useContextmenu/index.js`),r=require(`./constants/distance.js`),i=require(`./constants/projection.js`),a=require(`./utils/distance/index.js`),o=require(`./utils/style/index.js`),s=require(`./utils/feature/index.js`),c=require(`./utils/layer/index.js`),l=require(`./utils/projection/index.js`);require(`./utils/index.js`);const u=require(`./composables/useDrawLineString/index.js`),d=require(`./composables/useDrawPolygon/index.js`),f=require(`./composables/useGraticule/index.js`),p=require(`./composables/usePointermove/index.js`),m=require(`./composables/useSwitchBaseLayer/index.js`);require(`./composables/index.js`),exports.EPSG_3857=i.EPSG_3857,exports.EPSG_3857ExtentToEPSG_4326=l.EPSG_3857ExtentToEPSG_4326,exports.EPSG_3857ToEPSG_4326=l.EPSG_3857ToEPSG_4326,exports.EPSG_4326=i.EPSG_4326,exports.EPSG_4326ExtentToEPSG_3857=l.EPSG_4326ExtentToEPSG_3857,exports.EPSG_4326ToEPSG_3857=l.EPSG_4326ToEPSG_3857,exports.ONE_NM=r.ONE_NM,exports.OlMap=t.default,exports.WGS84Projection=i.WGS84Projection,exports.WebMercatorProjection=i.WebMercatorProjection,exports.createCircle=s.createCircle,exports.createCircleFeature=s.createCircleFeature,exports.createCircleStyle=o.createCircleStyle,exports.createFeature=s.createFeature,exports.createLineString=s.createLineString,exports.createLineStringFeature=s.createLineStringFeature,exports.createMultiLineString=s.createMultiLineString,exports.createMultiLineStringFeature=s.createMultiLineStringFeature,exports.createMultiPoint=s.createMultiPoint,exports.createMultiPointFeature=s.createMultiPointFeature,exports.createMultiPolygon=s.createMultiPolygon,exports.createMultiPolygonFeature=s.createMultiPolygonFeature,exports.createPoint=s.createPoint,exports.createPointFeature=s.createPointFeature,exports.createPolygon=s.createPolygon,exports.createPolygonFeature=s.createPolygonFeature,exports.createStyle=o.createStyle,exports.createTextStyle=o.createTextStyle,exports.createVectorLayer=c.createVectorLayer,exports.getBingLayer=c.getBingLayer,exports.getOSMLayer=c.getOSMLayer,exports.getTianDiTuLayer=c.getTianDiTuLayer,exports.getTianDiTuUrl=c.getTianDiTuUrl,exports.kmToNauticalMiles=a.kmToNauticalMiles,exports.mercatorExtentToWgs84=l.mercatorExtentToWgs84,exports.mercatorToWgs84=l.mercatorToWgs84,exports.nauticalMilesToKm=a.nauticalMilesToKm,exports.olMapInjectionKey=e.olMapInjectionKey,exports.useContextmenu=n.useContextmenu,exports.useDrawLineString=u.useDrawLineString,exports.useDrawPolygon=d.useDrawPolygon,exports.useGraticule=f.useGraticule,exports.useOlMap=e.useOlMap,exports.usePointermove=p.usePointermove,exports.useSwitchBaseLayer=m.useSwitchBaseLayer,exports.wgs84ExtentToMercator=l.wgs84ExtentToMercator,exports.wgs84ToMercator=l.wgs84ToMercator;
+const e=require(`./components/ol-map/props.js`),t=require(`./components/ol-map/index.js`);require(`./components/index.js`);const n=require(`./composables/useContextmenu/index.js`),r=require(`./constants/distance.js`),i=require(`./constants/projection.js`),a=require(`./utils/distance/index.js`),o=require(`./utils/style/index.js`),s=require(`./utils/feature/index.js`),c=require(`./utils/layer/index.js`),l=require(`./utils/projection/index.js`);require(`./utils/index.js`);const u=require(`./composables/useDrawLineString/index.js`),d=require(`./composables/useDrawPolygon/index.js`),f=require(`./composables/useGraticule/index.js`),p=require(`./composables/usePointermove/index.js`),m=require(`./composables/useSwitchBaseLayer/index.js`);require(`./composables/index.js`),exports.EPSG_3857=i.EPSG_3857,exports.EPSG_3857ExtentToEPSG_4326=l.EPSG_3857ExtentToEPSG_4326,exports.EPSG_3857ToEPSG_4326=l.EPSG_3857ToEPSG_4326,exports.EPSG_4326=i.EPSG_4326,exports.EPSG_4326ExtentToEPSG_3857=l.EPSG_4326ExtentToEPSG_3857,exports.EPSG_4326ToEPSG_3857=l.EPSG_4326ToEPSG_3857,exports.ONE_NM=r.ONE_NM,exports.OlMap=t.default,exports.WGS84Projection=i.WGS84Projection,exports.WebMercatorProjection=i.WebMercatorProjection,exports.createBingLayer=c.createBingLayer,exports.createCircle=s.createCircle,exports.createCircleFeature=s.createCircleFeature,exports.createCircleStyle=o.createCircleStyle,exports.createFeature=s.createFeature,exports.createLineString=s.createLineString,exports.createLineStringFeature=s.createLineStringFeature,exports.createMultiLineString=s.createMultiLineString,exports.createMultiLineStringFeature=s.createMultiLineStringFeature,exports.createMultiPoint=s.createMultiPoint,exports.createMultiPointFeature=s.createMultiPointFeature,exports.createMultiPolygon=s.createMultiPolygon,exports.createMultiPolygonFeature=s.createMultiPolygonFeature,exports.createOpenStreetMapLayer=c.createOpenStreetMapLayer,exports.createPoint=s.createPoint,exports.createPointFeature=s.createPointFeature,exports.createPolygon=s.createPolygon,exports.createPolygonFeature=s.createPolygonFeature,exports.createStyle=o.createStyle,exports.createTextStyle=o.createTextStyle,exports.createTianDiTuLayer=c.createTianDiTuLayer,exports.createTianDiTuUrl=c.createTianDiTuUrl,exports.createVectorLayer=c.createVectorLayer,exports.formatAngle=a.formatAngle,exports.formatRotation=a.formatRotation,exports.kmToNauticalMiles=a.kmToNauticalMiles,exports.mercatorExtentToWgs84=l.mercatorExtentToWgs84,exports.mercatorToWgs84=l.mercatorToWgs84,exports.nauticalMilesToKm=a.nauticalMilesToKm,exports.olMapInjectionKey=e.olMapInjectionKey,exports.useContextmenu=n.useContextmenu,exports.useDrawLineString=u.useDrawLineString,exports.useDrawPolygon=d.useDrawPolygon,exports.useGraticule=f.useGraticule,exports.useOlMap=e.useOlMap,exports.usePointermove=p.usePointermove,exports.useSwitchBaseLayer=m.useSwitchBaseLayer,exports.wgs84ExtentToMercator=l.wgs84ExtentToMercator,exports.wgs84ToMercator=l.wgs84ToMercator;

package/lib/utils/distance/index.d.ts

@@ -2,3 +2,7 @@
 export declare function kmToNauticalMiles(km: number): number;
 /** 海里转公里 */
 export declare function nauticalMilesToKm(nauticalMiles: number): number;
+/** 格式化Rotation */
+export declare function formatRotation(rotation: number): number;
+/** 格式化角度 */
+export declare function formatAngle(angle: number): number;

package/lib/utils/distance/index.js

@@ -1 +1 @@
-const e=require(`../../constants/distance.js`);function t(t){return t*1e3/e.ONE_NM}function n(t){return t*e.ONE_NM/1e3}exports.kmToNauticalMiles=t,exports.nauticalMilesToKm=n;
+const e=require(`../../constants/distance.js`);function t(t){return t*1e3/e.ONE_NM}function n(t){return t*e.ONE_NM/1e3}function r(e){return e<0?r(e+2*Math.PI):e>2*Math.PI?r(e-2*Math.PI):e}function i(e){return e<0?i(e+360):e>=360?i(e-360):e}exports.formatAngle=i,exports.formatRotation=r,exports.kmToNauticalMiles=t,exports.nauticalMilesToKm=n;

package/lib/utils/layer/index.d.ts

@@ -1,36 +1,40 @@
+import { StyleOptions } from '../style';
 import { Feature } from 'ol';
 import { Geometry } from 'ol/geom';
 import { ProjectionLike } from 'ol/proj';
-import { StyleOptions } from '../style';
 import { Tile as TileLayer } from 'ol/layer';
 import { default as VectorLayer } from 'ol/layer/Vector';
 import { BingMaps, OSM, XYZ } from 'ol/source';
 import { default as VectorSource } from 'ol/source/Vector';
 export type T_MAP_TYPE = 'vec' | 'cva' | 'img' | 'cia' | 'ter' | 'cta' | 'ibo';
-export declare function getTianDiTuUrl(data: {
-    url?: string;
-    type: T_MAP_TYPE;
-    projection: ProjectionLike;
-    key: string;
-}): string;
-export declare function getTianDiTuLayer(data: {
+export interface CreateTianDiTuUrlOptions {
     url?: string;
-    projection: ProjectionLike;
-    zIndex?: number;
     key: string;
     type: T_MAP_TYPE;
-    className?: string;
-}): TileLayer<XYZ>;
-export declare function getBingLayer({ name, zIndex, key, className, }: {
+    projection?: ProjectionLike;
+}
+export declare function createTianDiTuUrl(data: CreateTianDiTuUrlOptions): string;
+export type TileLayerOptions = Partial<ConstructorParameters<typeof TileLayer>[0]>;
+export type XYZ_SourceOptions = Partial<ConstructorParameters<typeof XYZ>[0]>;
+export type CreateTianDiTuLayerOptions = CreateTianDiTuUrlOptions & {
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: XYZ_SourceOptions;
+};
+export declare function createTianDiTuLayer(data: CreateTianDiTuLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
+export type BingMapsSourceOptions = Partial<ConstructorParameters<typeof BingMaps>[0]>;
+export interface CreateBingLayerOptions {
     name: string;
-    zIndex?: number;
     key: string;
-    className?: string;
-}): TileLayer<BingMaps>;
-export declare function getOSMLayer(data?: {
-    zIndex?: number;
-    className?: string;
-}): TileLayer<OSM>;
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: BingMapsSourceOptions;
+}
+export declare function createBingLayer({ name, key, layerOptions, sourceOptions, }: CreateBingLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
+export type OpenStreetMapSourceOptions = Partial<ConstructorParameters<typeof OSM>[0]>;
+export interface CreateOpenStreetMapLayerOptions {
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: BingMapsSourceOptions;
+}
+export declare function createOpenStreetMapLayer(data?: CreateOpenStreetMapLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
 export type _VectorLayerOptions = ConstructorParameters<typeof VectorLayer>[0];
 export type VectorLayerOptions = _VectorLayerOptions & {
     styleOptions?: StyleOptions;

package/lib/utils/layer/index.js

@@ -1 +1 @@
-const e=require(`../../_virtual/rolldown_runtime.js`),t=require(`../../constants/projection.js`),n=require(`../style/index.js`);let r=require(`ol/layer/Vector`);r=e.__toESM(r);let i=require(`ol/source/Vector`);i=e.__toESM(i);let a=require(`ol/layer`);a=e.__toESM(a);let o=require(`ol/source`);o=e.__toESM(o);function s(e){let{type:n=`img`,projection:r=t.WebMercatorProjection,key:i}=e,a=e.url||`https://t{0-4}.tianditu.gov.cn`,o=`&tk=${i}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;return`${a}/${n}_${r===`EPSG:4326`?`c`:r===`EPSG:3857`?`w`:`c`}/wmts?LAYER=${n}${o}`}function c(e){let{zIndex:t,projection:n,className:r}=e;return new a.Tile({className:r,source:new o.XYZ({url:s(e),projection:n,crossOrigin:`Anonymous`}),zIndex:t})}function l({name:e,zIndex:t,key:n,className:r}){return new a.Tile({className:r,source:new o.BingMaps({key:n,imagerySet:e,placeholderTiles:!1}),zIndex:t})}function u(e){return new a.Tile({className:e?.className,source:new o.OSM({crossOrigin:`Anonymous`}),zIndex:e?.zIndex})}function d(e){let{styleOptions:t,...a}=e||{},o=t?n.createStyle(t):void 0,s=new i.default;return{source:s,layer:new r.default({source:s,...a,style:o||a.style})}}exports.createVectorLayer=d,exports.getBingLayer=l,exports.getOSMLayer=u,exports.getTianDiTuLayer=c,exports.getTianDiTuUrl=s;
+const e=require(`../../_virtual/rolldown_runtime.js`),t=require(`../../constants/projection.js`),n=require(`../style/index.js`);let r=require(`ol/layer/Vector`);r=e.__toESM(r);let i=require(`ol/source/Vector`);i=e.__toESM(i);let a=require(`ol/layer`);a=e.__toESM(a);let o=require(`ol/source`);o=e.__toESM(o);function s(e){let{type:n=`img`,projection:r=t.WebMercatorProjection,key:i}=e,a=e.url||`https://t{0-4}.tianditu.gov.cn`,o=`&tk=${i}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;return`${a}/${n}_${r===`EPSG:4326`?`c`:r===`EPSG:3857`?`w`:`c`}/wmts?LAYER=${n}${o}`}function c(e){let{layerOptions:t,sourceOptions:n,...r}=e;return new a.Tile({source:new o.XYZ({url:s(r),projection:r.projection,crossOrigin:`Anonymous`,...n}),...t})}function l({name:e,key:t,layerOptions:n,sourceOptions:r}){return new a.Tile({source:new o.BingMaps({key:t,imagerySet:e,placeholderTiles:!1,...r}),...n})}function u(e){let{layerOptions:t,sourceOptions:n}=e||{};return new a.Tile({source:new o.OSM({crossOrigin:`Anonymous`,...n}),...t})}function d(e){let{styleOptions:t,...a}=e||{},o=t?n.createStyle(t):void 0,s=new i.default;return{source:s,layer:new r.default({source:s,...a,style:o||a.style})}}exports.createBingLayer=l,exports.createOpenStreetMapLayer=u,exports.createTianDiTuLayer=c,exports.createTianDiTuUrl=s,exports.createVectorLayer=d;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@summeruse/ol",
   "type": "module",
-  "version": "0.2.0-alpha.1",
+  "version": "0.2.0-alpha.2",
   "description": "",
   "author": "finalsummer",
   "license": "ISC",