c82e1d5a04
## Bug修复详情 ### 1. 致命错误：球面距离计算 (calculateDistance) - 问题：使用勾股定理计算经纬度距离，在球体表面完全错误 - 修复：改用Haversine公式计算球面大圆距离 - 影响：赤道1度=111km，极地1度=19km，原计算误差巨大 ### 2. 经度范围规范化 (vector3ToLatLon) - 问题：Math.atan2返回[-180°,180°]，转换后可能超出标准范围 - 修复：添加while循环规范化到[-180, 180]区间 - 影响：避免本初子午线附近返回360°的异常值 ### 3. 屏幕坐标转换支持非全屏 (screenToEarthCoords) - 问题：假设Canvas永远全屏，非全屏时点击偏移严重 - 修复：新增domElement参数，使用getBoundingClientRect()计算相对坐标 - 影响：嵌入式3D地球组件也能精准拾取 ### 4. 地球旋转时经纬度映射错误 - 问题：Raycaster返回世界坐标，未考虑地球自转 - 修复：使用earth.worldToLocal()转换到本地坐标空间 - 影响：地球旋转时经纬度显示正确跟随 ## 新增功能 - CelesTrak卫星数据采集器 - Space-Track卫星数据采集器 - 卫星可视化模块（500颗，实时SGP4轨道计算） - 海底光缆悬停显示info-card - 统一info-card组件 - 工具栏按钮（Stellarium风格） - 缩放控制（百分比显示） - Docker volume映射（代码热更新） ## 文件变更 - utils.js: 坐标转换核心逻辑修复 - satellites.js: 新增卫星可视化 - cables.js: 悬停交互支持 - main.js: 悬停/锁定逻辑 - controls.js: 工具栏UI - info-card.js: 统一卡片组件 - docker-compose.yml: volume映射 - restart.sh: 简化重启脚本
80 lines
2.6 KiB
Python
80 lines
2.6 KiB
Python
import os
|
|
import yaml
|
|
from functools import lru_cache
|
|
from typing import Optional
|
|
|
|
|
|
COLLECTOR_URL_KEYS = {
|
|
"arcgis_cables": "arcgis.cable_url",
|
|
"arcgis_landing_points": "arcgis.landing_point_url",
|
|
"arcgis_cable_landing_relation": "arcgis.cable_landing_relation_url",
|
|
"fao_landing_points": "fao.landing_point_url",
|
|
"telegeography_cables": "telegeography.cable_url",
|
|
"telegeography_landing": "telegeography.landing_point_url",
|
|
"huggingface_models": "huggingface.models_url",
|
|
"huggingface_datasets": "huggingface.datasets_url",
|
|
"huggingface_spaces": "huggingface.spaces_url",
|
|
"cloudflare_radar_device": "cloudflare.radar_device_url",
|
|
"cloudflare_radar_traffic": "cloudflare.radar_traffic_url",
|
|
"cloudflare_radar_top_locations": "cloudflare.radar_top_locations_url",
|
|
"peeringdb_ixp": "peeringdb.ixp_url",
|
|
"peeringdb_network": "peeringdb.network_url",
|
|
"peeringdb_facility": "peeringdb.facility_url",
|
|
"top500": "top500.url",
|
|
"epoch_ai_gpu": "epoch_ai.gpu_clusters_url",
|
|
"spacetrack_tle": "spacetrack.tle_query_url",
|
|
}
|
|
|
|
|
|
class DataSourcesConfig:
|
|
def __init__(self, config_path: str = None):
|
|
if config_path is None:
|
|
config_path = os.path.join(os.path.dirname(__file__), "data_sources.yaml")
|
|
|
|
self._yaml_config = {}
|
|
if os.path.exists(config_path):
|
|
with open(config_path, "r") as f:
|
|
self._yaml_config = yaml.safe_load(f) or {}
|
|
|
|
def get_yaml_url(self, collector_name: str) -> str:
|
|
key = COLLECTOR_URL_KEYS.get(collector_name, "")
|
|
if not key:
|
|
return ""
|
|
|
|
parts = key.split(".")
|
|
value = self._yaml_config
|
|
for part in parts:
|
|
if isinstance(value, dict):
|
|
value = value.get(part, "")
|
|
else:
|
|
return ""
|
|
return value if isinstance(value, str) else ""
|
|
|
|
async def get_url(self, collector_name: str, db) -> str:
|
|
yaml_url = self.get_yaml_url(collector_name)
|
|
|
|
if not db:
|
|
return yaml_url
|
|
|
|
try:
|
|
from sqlalchemy import select
|
|
from app.models.datasource_config import DataSourceConfig
|
|
|
|
query = select(DataSourceConfig).where(
|
|
DataSourceConfig.name == collector_name, DataSourceConfig.is_active == True
|
|
)
|
|
result = await db.execute(query)
|
|
db_config = result.scalar_one_or_none()
|
|
|
|
if db_config and db_config.endpoint:
|
|
return db_config.endpoint
|
|
except Exception:
|
|
pass
|
|
|
|
return yaml_url
|
|
|
|
|
|
@lru_cache()
|
|
def get_data_sources_config() -> DataSourcesConfig:
|
|
return DataSourcesConfig()
|