@summeruse/ol 0.3.2 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @summeruse/ol
 
+## 0.3.3
+
+### Patch Changes
+
+- a224dda: refactor(style): 优化样式创建逻辑以支持直接传入样式对象
+- 2085d50: refactor(utils/layer): 优化矢量图层创建函数，支持直接传入 style 和 source
+
 ## 0.3.2
 
 ### Patch Changes

package/dist/index.js

@@ -261,13 +261,13 @@ function createTextStyle(r) {
 	});
 }
 function createStyle(r) {
-	let { fillOptions: l, strokeOptions: u, iconOptions: d, circleOptions: f, textOptions: p,...m } = r, h = l ? new Fill(l) : void 0, g = u ? new Stroke(u) : void 0, _ = d ? new Icon(d) : void 0, v = f ? createCircleStyle(f) : void 0, y = p ? createTextStyle(p) : void 0;
+	let { fillOptions: l, strokeOptions: u, iconOptions: d, circleOptions: f, textOptions: p, stroke: m, image: h, fill: g, text: _,...v } = r, y = g || (l ? new Fill(l) : void 0), b = m || (u ? new Stroke(u) : void 0), x = h || (d ? new Icon(d) : f ? createCircleStyle(f) : void 0), S = _ || (p ? createTextStyle(p) : void 0);
 	return new Style({
-		...m,
-		fill: h,
-		stroke: g,
-		image: _ || v,
-		text: y
+		...v,
+		fill: y,
+		stroke: b,
+		image: x,
+		text: S
 	});
 }
 function createPoint(r) {
@@ -388,23 +388,23 @@ function createVectorSource(r) {
 	return new VectorSource({ ...r });
 }
 function createVectorLayer(r) {
-	let { styleOptions: l, sourceOptions: u,...d } = r || {}, f = l ? createStyle(l) : void 0, p = createVectorSource(u);
+	let { styleOptions: l, sourceOptions: u, style: d, source: f,...p } = r || {}, m = d || (l ? createStyle(l) : void 0), h = f || createVectorSource(u);
 	return {
-		source: p,
+		source: h,
 		layer: new VectorLayer({
-			source: p,
-			...d,
-			style: f || d.style
+			...p,
+			source: h,
+			style: m
 		})
 	};
 }
 function createWebGLVectorLayer(r) {
-	let { style: l, sourceOptions: u,...d } = r, f = createVectorSource(u);
+	let { style: l, source: u, sourceOptions: d,...f } = r, p = u || createVectorSource(d);
 	return {
-		source: f,
+		source: p,
 		layer: new WebGLVectorLayer({
-			source: f,
-			...d,
+			...f,
+			source: p,
 			style: l
 		})
 	};

package/es/utils/layer/index.mjs

@@ -6,64 +6,64 @@ import { Tile } from "ol/layer";
 import WebGLVectorLayer from "ol/layer/WebGLVector";
 import { BingMaps, OSM, XYZ } from "ol/source";
 function createTianDiTuUrl(e) {
-	let { type: d = "img", projection: f = WebMercatorProjection, key: p } = e, m = e.url || "https://t{0-4}.tianditu.gov.cn", h = `&tk=${p}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;
-	return `${m}/${d}_${f === "EPSG:4326" ? "c" : f === "EPSG:3857" ? "w" : "c"}/wmts?LAYER=${d}${h}`;
+	let { type: l = "img", projection: u = WebMercatorProjection, key: d } = e, f = e.url || "https://t{0-4}.tianditu.gov.cn", p = `&tk=${d}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;
+	return `${f}/${l}_${u === "EPSG:4326" ? "c" : u === "EPSG:3857" ? "w" : "c"}/wmts?LAYER=${l}${p}`;
 }
 function createTianDiTuLayer(e) {
-	let { layerOptions: u, sourceOptions: d,...f } = e;
+	let { layerOptions: c, sourceOptions: l,...u } = e;
 	return new Tile({
 		source: new XYZ({
-			url: createTianDiTuUrl(f),
-			projection: f.projection,
+			url: createTianDiTuUrl(u),
+			projection: u.projection,
 			crossOrigin: "Anonymous",
-			...d
+			...l
 		}),
-		...u
+		...c
 	});
 }
-function createBingLayer({ name: e, key: u, layerOptions: d, sourceOptions: f }) {
+function createBingLayer({ name: e, key: c, layerOptions: l, sourceOptions: u }) {
 	return new Tile({
 		source: new BingMaps({
-			key: u,
+			key: c,
 			imagerySet: e,
 			placeholderTiles: !1,
-			...f
+			...u
 		}),
-		...d
+		...l
 	});
 }
 function createOpenStreetMapLayer(e) {
-	let { layerOptions: u, sourceOptions: d } = e || {};
+	let { layerOptions: c, sourceOptions: l } = e || {};
 	return new Tile({
 		source: new OSM({
 			crossOrigin: "Anonymous",
-			...d
+			...l
 		}),
-		...u
+		...c
 	});
 }
 function createVectorSource(e) {
 	return new VectorSource({ ...e });
 }
 function createVectorLayer(e) {
-	let { styleOptions: u, sourceOptions: p,...m } = e || {}, h = u ? createStyle(u) : void 0, g = createVectorSource(p);
+	let { styleOptions: c, sourceOptions: d, style: f, source: p,...m } = e || {}, h = f || (c ? createStyle(c) : void 0), g = p || createVectorSource(d);
 	return {
 		source: g,
 		layer: new VectorLayer({
-			source: g,
 			...m,
-			style: h || m.style
+			source: g,
+			style: h
 		})
 	};
 }
 function createWebGLVectorLayer(e) {
-	let { style: u, sourceOptions: d,...f } = e, p = createVectorSource(d);
+	let { style: c, source: l, sourceOptions: u,...d } = e, f = l || createVectorSource(u);
 	return {
-		source: p,
+		source: f,
 		layer: new WebGLVectorLayer({
-			source: p,
-			...f,
-			style: u
+			...d,
+			source: f,
+			style: c
 		})
 	};
 }

package/es/utils/style/index.mjs

@@ -18,13 +18,13 @@ function createTextStyle(e) {
 	});
 }
 function createStyle(e) {
-	let { fillOptions: a, strokeOptions: c, iconOptions: l, circleOptions: u, textOptions: d,...f } = e, p = a ? new Fill(a) : void 0, m = c ? new Stroke(c) : void 0, h = l ? new Icon(l) : void 0, g = u ? createCircleStyle(u) : void 0, _ = d ? createTextStyle(d) : void 0;
+	let { fillOptions: a, strokeOptions: c, iconOptions: l, circleOptions: u, textOptions: d, stroke: f, image: p, fill: m, text: h,...g } = e, _ = m || (a ? new Fill(a) : void 0), v = f || (c ? new Stroke(c) : void 0), y = p || (l ? new Icon(l) : u ? createCircleStyle(u) : void 0), b = h || (d ? createTextStyle(d) : void 0);
 	return new Style({
-		...f,
-		fill: p,
-		stroke: m,
-		image: h || g,
-		text: _
+		...g,
+		fill: _,
+		stroke: v,
+		image: y,
+		text: b
 	});
 }
 export { createCircleStyle, createStyle, createTextStyle };

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/layer/WebGLVector`);o=e.__toESM(o);let s=require(`ol/source`);s=e.__toESM(s);function c(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 l(e){let{layerOptions:t,sourceOptions:n,...r}=e;return new a.Tile({source:new s.XYZ({url:c(r),projection:r.projection,crossOrigin:`Anonymous`,...n}),...t})}function u({name:e,key:t,layerOptions:n,sourceOptions:r}){return new a.Tile({source:new s.BingMaps({key:t,imagerySet:e,placeholderTiles:!1,...r}),...n})}function d(e){let{layerOptions:t,sourceOptions:n}=e||{};return new a.Tile({source:new s.OSM({crossOrigin:`Anonymous`,...n}),...t})}function f(e){return new i.default({...e})}function p(e){let{styleOptions:t,sourceOptions:i,...a}=e||{},o=t?n.createStyle(t):void 0,s=f(i);return{source:s,layer:new r.default({source:s,...a,style:o||a.style})}}function m(e){let{style:t,sourceOptions:n,...r}=e,i=f(n);return{source:i,layer:new o.default({source:i,...r,style:t})}}exports.createBingLayer=u,exports.createOpenStreetMapLayer=d,exports.createTianDiTuLayer=l,exports.createTianDiTuUrl=c,exports.createVectorLayer=p,exports.createVectorSource=f,exports.createWebGLVectorLayer=m;
+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/layer/WebGLVector`);o=e.__toESM(o);let s=require(`ol/source`);s=e.__toESM(s);function c(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 l(e){let{layerOptions:t,sourceOptions:n,...r}=e;return new a.Tile({source:new s.XYZ({url:c(r),projection:r.projection,crossOrigin:`Anonymous`,...n}),...t})}function u({name:e,key:t,layerOptions:n,sourceOptions:r}){return new a.Tile({source:new s.BingMaps({key:t,imagerySet:e,placeholderTiles:!1,...r}),...n})}function d(e){let{layerOptions:t,sourceOptions:n}=e||{};return new a.Tile({source:new s.OSM({crossOrigin:`Anonymous`,...n}),...t})}function f(e){return new i.default({...e})}function p(e){let{styleOptions:t,sourceOptions:i,style:a,source:o,...s}=e||{},c=a||(t?n.createStyle(t):void 0),l=o||f(i);return{source:l,layer:new r.default({...s,source:l,style:c})}}function m(e){let{style:t,source:n,sourceOptions:r,...i}=e,a=n||f(r);return{source:a,layer:new o.default({...i,source:a,style:t})}}exports.createBingLayer=u,exports.createOpenStreetMapLayer=d,exports.createTianDiTuLayer=l,exports.createTianDiTuUrl=c,exports.createVectorLayer=p,exports.createVectorSource=f,exports.createWebGLVectorLayer=m;

package/lib/utils/style/index.js

@@ -1 +1 @@
-const e=require(`../../_virtual/rolldown_runtime.js`);let t=require(`ol/style`);t=e.__toESM(t);function n(e){let{fillOptions:n,strokeOptions:r,...i}=e;return new t.Circle({...i,fill:n?new t.Fill(n):void 0,stroke:r?new t.Stroke(r):void 0})}function r(e){let{fillOptions:n,strokeOptions:r,backgroundFillOptions:i,backgroundStrokeOptions:a,...o}=e;return new t.Text({...o,fill:n?new t.Fill(n):void 0,stroke:r?new t.Stroke(r):void 0,backgroundFill:i?new t.Fill(i):void 0,backgroundStroke:a?new t.Stroke(a):void 0})}function i(e){let{fillOptions:i,strokeOptions:a,iconOptions:o,circleOptions:s,textOptions:c,...l}=e,u=i?new t.Fill(i):void 0,d=a?new t.Stroke(a):void 0,f=o?new t.Icon(o):void 0,p=s?n(s):void 0,m=c?r(c):void 0;return new t.Style({...l,fill:u,stroke:d,image:f||p,text:m})}exports.createCircleStyle=n,exports.createStyle=i,exports.createTextStyle=r;
+const e=require(`../../_virtual/rolldown_runtime.js`);let t=require(`ol/style`);t=e.__toESM(t);function n(e){let{fillOptions:n,strokeOptions:r,...i}=e;return new t.Circle({...i,fill:n?new t.Fill(n):void 0,stroke:r?new t.Stroke(r):void 0})}function r(e){let{fillOptions:n,strokeOptions:r,backgroundFillOptions:i,backgroundStrokeOptions:a,...o}=e;return new t.Text({...o,fill:n?new t.Fill(n):void 0,stroke:r?new t.Stroke(r):void 0,backgroundFill:i?new t.Fill(i):void 0,backgroundStroke:a?new t.Stroke(a):void 0})}function i(e){let{fillOptions:i,strokeOptions:a,iconOptions:o,circleOptions:s,textOptions:c,stroke:l,image:u,fill:d,text:f,...p}=e,m=d||(i?new t.Fill(i):void 0),h=l||(a?new t.Stroke(a):void 0),g=u||(o?new t.Icon(o):s?n(s):void 0),_=f||(c?r(c):void 0);return new t.Style({...p,fill:m,stroke:h,image:g,text:_})}exports.createCircleStyle=n,exports.createStyle=i,exports.createTextStyle=r;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@summeruse/ol",
   "type": "module",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "",
   "author": "finalsummer",
   "license": "ISC",