Skip to content

Commit e941f64

Browse files
VirgilClyneVirgilClyne
committed
feat: Roads 版本选项
Update GEOResourceManifest.mjs Update boxjs.settings.json
1 parent a1f643a commit e941f64

File tree

5 files changed

+39
-10
lines changed

5 files changed

+39
-10
lines changed

‎arguments-builder.config.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,19 @@ export default defineConfig({
116116
],
117117
type: "string",
118118
},
119+
{
120+
defaultValue: "AUTO",
121+
description: "此选项影响卫星视图下的道路图像与四处看看可用路段。",
122+
key: "TileSet.Roads",
123+
name: "[瓦片数据集] 道路图像与四处看看",
124+
options: [
125+
{ key: "AUTO", label: "🇺🇳自动（随[动态配置]版本自动选择）" },
126+
//{ key: "HYBRID", label: "混合" },
127+
{ key: "CN", label: "🇨🇳中国（🇨🇳:卫星视图道路正确 | 🇺🇳:无四处看看）" },
128+
{ key: "XX", label: "Apple（🇨🇳:卫星视图道路偏移 | 🇺🇳:有四处看看）" },
129+
],
130+
type: "string",
131+
},
119132
{
120133
defaultValue: "HYBRID",
121134
description: "此选项影响所列位图、影像与模型数据。",

‎src/class/GEOResourceManifest.mjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,14 +428,14 @@ export default class GEOResourceManifest {
428428
Console.debug(`SPR tile: ${JSON.stringify(tile, null, 2)}`);
429429
break;
430430
case "VECTOR_SPR_ROADS": // 66 (卫星图下的道路网格和四处看看可用性)
431-
Console.info(`Munin style: ${tile?.style}`);
432-
switch (settings.TileSet.Munin) {
431+
Console.info(`Roads style: ${tile?.style}`);
432+
switch (settings.TileSet.Roads) {
433433
case "CN":
434434
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
435435
break;
436-
case "HYBRID":
437-
case "XX":
438436
default:
437+
case "XX":
438+
case "HYBRID":
439439
switch (typeof tile.dataSet) {
440440
case "undefined":
441441
tile =
@@ -456,8 +456,8 @@ export default class GEOResourceManifest {
456456
}
457457
break;
458458
}
459-
Console.info(`Munin baseURL: ${tile?.baseURL}`);
460-
Console.debug(`Munin tile: ${JSON.stringify(tile, null, 2)}`);
459+
Console.info(`Roads baseURL: ${tile?.baseURL}`);
460+
Console.debug(`Roads tile: ${JSON.stringify(tile, null, 2)}`);
461461
break;
462462
case "VECTOR_SPR_STANDARD": // 67 (影响 1-6 级视图下的行政区域名称与资料显示版本)
463463
Console.info(`Earth style: ${tile?.style}`);

‎src/function/database.mjs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ export default {
1717
},
1818
TileSet: {
1919
Earth: "AUTO",
20+
Flyover: "HYBRID",
2021
Map: "CN",
22+
Munin: "HYBRID",
23+
POI: "CN",
24+
Roads: "AUTO",
2125
Satellite: "HYBRID",
2226
Traffic: "CN",
23-
POI: "CN",
24-
Flyover: "HYBRID",
25-
Munin: "HYBRID",
2627
},
2728
GeoManifest: {
2829
Dynamic: {

‎src/types.d.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,21 @@ export interface Settings {
107107
* @defaultValue "AUTO"
108108
*/
109109
Earth?: 'AUTO' | 'AutoNavi' | 'Apple';
110+
/**
111+
* [瓦片数据集] 道路图像与四处看看
112+
*
113+
* 此选项影响卫星视图下的道路图像与四处看看可用路段。
114+
*
115+
* @remarks
116+
*
117+
* Possible values:
118+
* - `'AUTO'` - 🇺🇳自动（随[动态配置]版本自动选择）
119+
* - `'CN'` - 🇨🇳中国（🇨🇳:卫星视图道路正确 | 🇺🇳:无四处看看）
120+
* - `'XX'` - Apple（🇨🇳:卫星视图道路偏移 | 🇺🇳:有四处看看）
121+
*
122+
* @defaultValue "AUTO"
123+
*/
124+
Roads?: 'AUTO' | 'CN' | 'XX';
110125
/**
111126
* [瓦片数据集] 卫星图像
112127
*

‎template/boxjs.settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"id":"@iRingo.Maps.Settings.GeoManifest.Dynamic.Config.CountryCode","name":"[动态配置] 资源清单的国家或地区代码","type":"selects","val":"CN","items":[{"key":"AUTO","label":"🇺🇳自动（跟随用户当前所在地区）"},{"key":"CN","label":"🇨🇳中国大陆"},{"key":"HK","label":"🇭🇰中国香港"},{"key":"TW","label":"🇹🇼中国台湾"},{"key":"SG","label":"🇸🇬新加坡"},{"key":"US","label":"🇺🇸美国"},{"key":"JP","label":"🇯🇵日本"},{"key":"AU","label":"🇦🇺澳大利亚"},{"key":"GB","label":"🇬🇧英国"},{"key":"KR","label":"🇰🇷韩国"},{"key":"CA","label":"🇨🇦加拿大"},{"key":"IE","label":"🇮🇪爱尔兰"}],"desc":"此选项影响“地图”整体配置内容，包括以下的地图功能与服务。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.Dispatcher","name":"[URL信息集] 调度器","type":"selects","val":"AutoNavi","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🇨🇳:互动百科/大众点评/携程 | 🇺🇳:维基百科/Yelp/Booking）"},{"key":"Apple","label":"Apple（维基百科/Yelp/Booking）"}],"desc":"地点数据接口，此选项影响公共指南，兴趣点(POI)与位置信息等功能。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.Directions","name":"[URL信息集] 导航与ETA","type":"selects","val":"AutoNavi","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🇨🇳:高德地图 | 🇺🇳:TomTom）"},{"key":"Apple","label":"Apple（🇨🇳:🈚️ | 🇺🇳:TomTom）"}],"desc":"导航与ETA服务接口，此选项影响导航与ETA(到达时间)等功能。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.RAP","name":"[URL信息集] 评分和照片","type":"selects","val":"Apple","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🇨🇳:🈶️但未开放 | 🇺🇳:🈚️）"},{"key":"Apple","label":"Apple（🇨🇳:🈚️ | 🇺🇳:🈶️）"}],"desc":"评分和照片服务接口，此选项影响评分和照片服务以及照片使用。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.LocationShift","name":"[URL信息集] 定位漂移","type":"selects","val":"AUTO","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🈚️坐标，使用🇨🇳GCJ-02坐标）"},{"key":"Apple","label":"Apple（🈶️坐标，使用🇺🇳WGS-84坐标）"}],"desc":"定位漂移修正服务接口，控制定位漂移和🧭指南针与📍坐标的经纬度。"},{"id":"@iRingo.Maps.Settings.TileSet.Earth","name":"[瓦片数据集] 地球图像","type":"selects","val":"AUTO","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德版（主要显示国家与国界）"},{"key":"Apple","label":"Apple（主要显示城市与地貌）"}],"desc":"此选项影响地球视图下行政区划、地貌等信息的显示。"},{"id":"@iRingo.Maps.Settings.TileSet.Satellite","name":"[瓦片数据集] 卫星图像","type":"selects","val":"HYBRID","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"HYBRID","label":"混合（🇨🇳:2D较新 | 🇺🇳:主要城市3D）"},{"key":"CN","label":"🇨🇳中国四维（🇨🇳:2D较新 | 🇺🇳:🈚️）"},{"key":"XX","label":"🇺🇳DigitalGlobe（🇨🇳:2D较旧 | 🇺🇳:2D+主要城市3D）"}],"desc":"此选项影响所列位图、影像与模型数据。"},{"id":"@iRingo.Maps.Settings.LogLevel","name":"[调试] 日志等级","type":"selects","val":"WARN","items":[{"key":"OFF","label":"关闭"},{"key":"ERROR","label":"❌ 错误"},{"key":"WARN","label":"⚠️ 警告"},{"key":"INFO","label":"ℹ️ 信息"},{"key":"DEBUG","label":"🅱️ 调试"},{"key":"ALL","label":"全部"}],"desc":"选择脚本日志的输出等级，低于所选等级的日志将全部输出。"}]
1+
[{"id":"@iRingo.Maps.Settings.GeoManifest.Dynamic.Config.CountryCode","name":"[动态配置] 资源清单的国家或地区代码","type":"selects","val":"CN","items":[{"key":"AUTO","label":"🇺🇳自动（跟随用户当前所在地区）"},{"key":"CN","label":"🇨🇳中国大陆"},{"key":"HK","label":"🇭🇰中国香港"},{"key":"TW","label":"🇹🇼中国台湾"},{"key":"SG","label":"🇸🇬新加坡"},{"key":"US","label":"🇺🇸美国"},{"key":"JP","label":"🇯🇵日本"},{"key":"AU","label":"🇦🇺澳大利亚"},{"key":"GB","label":"🇬🇧英国"},{"key":"KR","label":"🇰🇷韩国"},{"key":"CA","label":"🇨🇦加拿大"},{"key":"IE","label":"🇮🇪爱尔兰"}],"desc":"此选项影响“地图”整体配置内容，包括以下的地图功能与服务。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.Dispatcher","name":"[URL信息集] 调度器","type":"selects","val":"AutoNavi","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🇨🇳:互动百科/大众点评/携程 | 🇺🇳:维基百科/Yelp/Booking）"},{"key":"Apple","label":"Apple（维基百科/Yelp/Booking）"}],"desc":"地点数据接口，此选项影响公共指南，兴趣点(POI)与位置信息等功能。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.Directions","name":"[URL信息集] 导航与ETA","type":"selects","val":"AutoNavi","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🇨🇳:高德地图 | 🇺🇳:TomTom）"},{"key":"Apple","label":"Apple（🇨🇳:🈚️ | 🇺🇳:TomTom）"}],"desc":"导航与ETA服务接口，此选项影响导航与ETA(到达时间)等功能。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.RAP","name":"[URL信息集] 评分和照片","type":"selects","val":"Apple","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🇨🇳:🈶️但未开放 | 🇺🇳:🈚️）"},{"key":"Apple","label":"Apple（🇨🇳:🈚️ | 🇺🇳:🈶️）"}],"desc":"评分和照片服务接口，此选项影响评分和照片服务以及照片使用。"},{"id":"@iRingo.Maps.Settings.UrlInfoSet.LocationShift","name":"[URL信息集] 定位漂移","type":"selects","val":"AUTO","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德（🈚️坐标，使用🇨🇳GCJ-02坐标）"},{"key":"Apple","label":"Apple（🈶️坐标，使用🇺🇳WGS-84坐标）"}],"desc":"定位漂移修正服务接口，控制定位漂移和🧭指南针与📍坐标的经纬度。"},{"id":"@iRingo.Maps.Settings.TileSet.Earth","name":"[瓦片数据集] 地球图像","type":"selects","val":"AUTO","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"AutoNavi","label":"🧭高德版（主要显示国家与国界）"},{"key":"Apple","label":"Apple（主要显示城市与地貌）"}],"desc":"此选项影响地球视图下行政区划、地貌等信息的显示。"},{"id":"@iRingo.Maps.Settings.TileSet.Roads","name":"[瓦片数据集] 道路图像与四处看看","type":"selects","val":"AUTO","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"CN","label":"🇨🇳中国（🇨🇳:卫星视图道路正确 | 🇺🇳:无四处看看）"},{"key":"XX","label":"Apple（🇨🇳:卫星视图道路偏移 | 🇺🇳:有四处看看）"}],"desc":"此选项影响卫星视图下的道路图像与四处看看可用路段。"},{"id":"@iRingo.Maps.Settings.TileSet.Satellite","name":"[瓦片数据集] 卫星图像","type":"selects","val":"HYBRID","items":[{"key":"AUTO","label":"🇺🇳自动（随[动态配置]版本自动选择）"},{"key":"HYBRID","label":"混合（🇨🇳:2D较新 | 🇺🇳:主要城市3D）"},{"key":"CN","label":"🇨🇳中国四维（🇨🇳:2D较新 | 🇺🇳:🈚️）"},{"key":"XX","label":"🇺🇳DigitalGlobe（🇨🇳:2D较旧 | 🇺🇳:2D+主要城市3D）"}],"desc":"此选项影响所列位图、影像与模型数据。"},{"id":"@iRingo.Maps.Settings.LogLevel","name":"[调试] 日志等级","type":"selects","val":"WARN","items":[{"key":"OFF","label":"关闭"},{"key":"ERROR","label":"❌ 错误"},{"key":"WARN","label":"⚠️ 警告"},{"key":"INFO","label":"ℹ️ 信息"},{"key":"DEBUG","label":"🅱️ 调试"},{"key":"ALL","label":"全部"}],"desc":"选择脚本日志的输出等级，低于所选等级的日志将全部输出。"}]

0 commit comments

Comments
 (0)