@mapless/core 1.0.23 → 1.0.24

package/dist/index.js

@@ -11208,33 +11208,36 @@ const lightFog = {
         0
     ]
 };
-const lite = ()=>({
+const lite = (urlCount = 1, rasterOpacity)=>({
         version: 8,
         sprite: `${maplessPreset.mapboxAssets}/style/sprite`,
         glyphs: `${maplessPreset.mapboxAssets}/glyphs/mapbox/{fontstack}/{range}.pbf`,
         projection: {
             name: 'globe'
         },
-        sources: {
-            lite_world: {
-                type: 'raster',
-                tiles: [
-                    `${maplessPreset.geoServer}/{MAP_ID}/{z}/{x}/{y}`
-                ],
-                tileSize: 256,
-                volatile: true
-            }
-        },
-        layers: [
-            {
-                id: 'lite_world_layer',
+        sources: Object.fromEntries(Array.from({
+            length: urlCount
+        }, (_, i)=>[
+                `lite_world_${i + 1}`,
+                {
+                    type: 'raster',
+                    tiles: [
+                        `${maplessPreset.geoServer}/{MAP_ID}/{z}/{x}/{y}`
+                    ],
+                    tileSize: 256,
+                    volatile: true
+                }
+            ])),
+        layers: Array.from({
+            length: urlCount
+        }, (_, i)=>({
+                id: `lite_world_layer_${i + 1}`,
                 type: 'raster',
-                source: 'lite_world',
+                source: `lite_world_${i + 1}`,
                 paint: {
-                    'raster-opacity': 1
+                    'raster-opacity': rasterOpacity?.[i] ?? 1
                 }
-            }
-        ]
+            }))
     });
 const buildTileUrl = (url)=>{
     if (url.startsWith('http://') || url.startsWith('https://')) if (url.includes('/{z}/{x}/{y}')) return url;
@@ -11264,10 +11267,18 @@ const transformMapCenter = (center, fromCoord, toCoord)=>{
     });
 };
 const sourcesMap = ()=>maplessPreset.MAP_THEME_SOURCES?.reduce((prev, item)=>{
-        const copy = adjustMapConfigByCoord(lite(), item.coord);
-        copy.sources.lite_world.tiles = [
-            buildTileUrl(item.url)
+        const urls = Array.isArray(item.url) ? item.url : [
+            item.url
         ];
+        const opacities = null != item.rasterOpacity ? Array.isArray(item.rasterOpacity) ? item.rasterOpacity : [
+            item.rasterOpacity
+        ] : [];
+        const copy = adjustMapConfigByCoord(lite(urls.length, opacities), item.coord);
+        urls.forEach((url, i)=>{
+            copy.sources[`lite_world_${i + 1}`].tiles = [
+                buildTileUrl(url)
+            ];
+        });
         if (!maplessPreset.globe) copy.projection = {
             name: 'mercator'
         };

package/dist/types/Mapless/preset/types.d.ts

@@ -1,23 +1,27 @@
 import type { CoordSystem } from '../coord';
 export interface MapSourceConfig {
     name: string;
-    url: string /**
+    url: string | string[] /**
      * 地图数据源URL配置
      *
      * 支持两种格式:
      * 1. 相对路径格式:如 "/783085212" 表示使用默认地图服务的基础路径
      *    - 示例:"/783085212" 表示街道地图
-     *    - 示例:"/783085212" 表示卫星地图
      *    - 实际URL会根据配置中的geoServer地址自动拼接
      *
      * 2. 完整URL格式:如 "https://example.com/tiles/{z}/{x}/{y}.png"
      *    - 支持标准的WMTS/TMS瓦片服务格式
      *    - 必须包含 {z}/{x}/{y} 占位符用于动态替换瓦片坐标
      *    - 示例:"https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/{z}/{x}/{y}"
+     *
+     * 3. URL数组格式:如 ["/783085212", "/788865972"]
+     *    - 每个URL对应一个独立的栅格源(lite_world_1, lite_world_2, ...)
+     *    - 图层顺序由URL数组中的顺序决定
+     *    - 适用于需要叠加多个瓦片图层的场景
      *
         "sources": [
           {
-            "name": "这个栅格图名称有点长",
+            "name": "街道图",
             "url": "/788865972",
             "theme4": "dark"
           },
@@ -30,13 +34,25 @@ export interface MapSourceConfig {
             "name": "卫星图(FULL)",
             "url": "http://192.168.3.203:5000/api/v2/MapService/783085212",
             "theme4": "light"
+          },
+          {
+            "name": "叠加图层",
+            "url": ["/788865972", "/783085212"],
+            "theme4": "light"
+          },
+          {
+            "name": "带透明度叠加",
+            "url": ["/788865972", "/783085212"],
+            "rasterOpacity": [1, 0.5],
+            "theme4": "light"
           }
         ]
      * 注意:当启用精简地图模式(lite)时,此配置不会生效
-     * @see ThemeSources.tsx 第36行:copy.sources.lite_world.tiles = [] 会清空瓦片数据源
+     * @see themeSources.ts sourcesMap函数会为每个URL设置tiles
      */;
     coord?: CoordSystem;
     theme4?: 'light' | 'dark' | string;
+    rasterOpacity?: number | number[];
 }
 export type MaplessPresetType = {
     name: string;

package/dist/types/Mapless/preset/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/Mapless/preset/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCT,CAAC;IACJ,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;CACpC;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAEhB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK;QACjC,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAClC,CAAC;IAEF,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3E,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,iBAAiB,EAAE,WAAW,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,iBAAiB,EAAE,eAAe,EAAE,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;CACd,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/Mapless/preset/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgDpB,CAAC;IACJ,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAEhB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK;QACjC,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAClC,CAAC;IAEF,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3E,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,iBAAiB,EAAE,WAAW,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,iBAAiB,EAAE,eAAe,EAAE,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;CACd,CAAC"}

package/dist/types/Mapless/theme/lite.d.ts

@@ -14,7 +14,7 @@ export declare const lightFog: {
     'horizon-blend': (string | number | (string | number)[])[];
     'star-intensity': (string | number | (string | number)[])[];
 };
-export declare const lite: () => {
+export declare const lite: (urlCount?: number, rasterOpacity?: number[]) => {
     version: number;
     sprite: string;
     glyphs: string;
@@ -22,7 +22,7 @@ export declare const lite: () => {
         name: string;
     };
     sources: {
-        lite_world: {
+        [k: string]: {
             type: string;
             tiles: string[];
             tileSize: number;

package/dist/types/Mapless/theme/lite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lite.d.ts","sourceRoot":"","sources":["../../../../src/Mapless/theme/lite.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,OAAO;;;;;;;CAenB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;;CA+BpB,CAAC;AAEF,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;CAkCf,CAAC"}
+{"version":3,"file":"lite.d.ts","sourceRoot":"","sources":["../../../../src/Mapless/theme/lite.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,OAAO;;;;;;;CAenB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;;CA+BpB,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,WAAU,MAAU,EAAE,gBAAgB,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;CA0BjE,CAAC"}

package/dist/types/Mapless/themeSources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themeSources.d.ts","sourceRoot":"","sources":["../../../src/Mapless/themeSources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,SAAS,CAAC;AAEhE,OAAO,EAAW,IAAI,IAAI,OAAO,EAAY,MAAM,cAAc,CAAC;AAElE;;;GAGG;AAEH,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,GAAG;IAClD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,KAAG,MAgB1C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GACjC,WAAW,QAAQ,EACnB,QAAQ,WAAW,KAClB,QA6BF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,WAAW,WAAW,EACtB,SAAS,WAAW,KACnB,CAAC,MAAM,EAAE,MAAM,CASjB,CAAC;AAEF,eAAO,MAAM,UAAU,gCAsCtB,CAAC;AAEF,eAAO,MAAM,UAAU;;;aAOtB,CAAC;AAEF,eAAO,MAAM,WAAW;;;aAOvB,CAAC;AAEF,eAAO,MAAM,aAAa;;;aAKzB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,YAAY,MAAM,KAAG,WAGzD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAAO,MAAM,CAAC,MAAM,EAAE,WAAW,CAQrE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,aAAa,WAAW,KAAG,MAAM,EAIxE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iCAAiC,GAC5C,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,YAAY,MAAM,EAClB,UAAU,MAAM,KACf,CAAC,MAAM,EAAE,MAAM,CAKjB,CAAC"}
+{"version":3,"file":"themeSources.d.ts","sourceRoot":"","sources":["../../../src/Mapless/themeSources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,SAAS,CAAC;AAEhE,OAAO,EAAW,IAAI,IAAI,OAAO,EAAY,MAAM,cAAc,CAAC;AAElE;;;GAGG;AAEH,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,GAAG;IAClD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,KAAG,MAgB1C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GACjC,WAAW,QAAQ,EACnB,QAAQ,WAAW,KAClB,QA6BF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,WAAW,WAAW,EACtB,SAAS,WAAW,KACnB,CAAC,MAAM,EAAE,MAAM,CASjB,CAAC;AAEF,eAAO,MAAM,UAAU,gCAgDtB,CAAC;AAEF,eAAO,MAAM,UAAU;;;aAOtB,CAAC;AAEF,eAAO,MAAM,WAAW;;;aAOvB,CAAC;AAEF,eAAO,MAAM,aAAa;;;aAKzB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,YAAY,MAAM,KAAG,WAGzD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAAO,MAAM,CAAC,MAAM,EAAE,WAAW,CAQrE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,aAAa,WAAW,KAAG,MAAM,EAIxE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iCAAiC,GAC5C,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,YAAY,MAAM,EAClB,UAAU,MAAM,KACf,CAAC,MAAM,EAAE,MAAM,CAKjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapless/core",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "type": "module",
   "description": "Mapbox wrapper library without React dependencies",
   "source": "src/index.ts",