关于
diff --git a/src/interface/classes/EventManager.js b/src/interface/classes/EventManager.js
index baad6f9..39eb00e 100644
--- a/src/interface/classes/EventManager.js
+++ b/src/interface/classes/EventManager.js
@@ -1,4 +1,4 @@
-import { initializeElements, initializeCanvas, initializeEvents, initializeMap } from '../init.js';
+import { initializeElements, initializeCanvas, initializeEvents } from '../init.js';
import { TouchEventAdapter } from './TouchEventAdapter.js';
import { PickCele } from '../functions/PickCele.js';
import { PickPL } from '../functions/PickPL.js';
@@ -32,7 +32,6 @@ class EventManager {
initializeElements(this.interactPhoto);
initializeCanvas(this.interactPhoto);
initializeEvents(this);
- initializeMap(this.interactPhoto);
}.bind(this);
}
diff --git a/src/interface/classes/interact.js b/src/interface/classes/interact.js
index 3d01f8c..7a3ca7f 100644
--- a/src/interface/classes/interact.js
+++ b/src/interface/classes/interact.js
@@ -17,7 +17,6 @@ class InteractPhoto {
this.movable = false; // 是否可移动
this.text = null; // 文本
this.rect = null; // 矩形
- this.map = null; // 地图
this.date = null; // 日期
this.time = null; // 时间
this.timeZone = null; // 时区
@@ -57,6 +56,10 @@ class InteractPhoto {
this.buttonFunctioner = this.defaultbuttonFunctioner;
}
+ getCompletePLCount() {
+ return this.PLArray.array.filter((pl) => pl.points.length === 2).length;
+ }
+
// 刷新天体标记数量提示和天体识别按钮状态
updateCeleStatus() {
if (!this.celeStatus) return;
@@ -64,6 +67,7 @@ class InteractPhoto {
const count = this.CeleArray.num();
this.celeStatus.innerHTML = this.getCeleStatusText(count);
this.updateRecognizeButton(count);
+ this.updateCalculButton();
}
getCeleStatusText(count) {
@@ -79,6 +83,15 @@ class InteractPhoto {
}
}
+ updateCalculButton() {
+ const calculButton = document.getElementById('actionCalcul');
+ if (!calculButton) return;
+
+ const isDisabled = !this.movable || this.CeleArray.num() < 3 || this.getCompletePLCount() < 2;
+ calculButton.classList.toggle('is-disabled', isDisabled);
+ calculButton.setAttribute('aria-disabled', isDisabled ? 'true' : 'false');
+ }
+
// 获取当前日期时间时区的时间戳
getTimestamp() {
let timeZoneOffset = this.timeZone.value;
diff --git a/src/interface/elements/Baseclass.js b/src/interface/elements/Baseclass.js
index 3e45d16..cd2ef02 100644
--- a/src/interface/elements/Baseclass.js
+++ b/src/interface/elements/Baseclass.js
@@ -45,8 +45,10 @@ class ShapeObject {
}
setRealXY(x, y) {
- (this.x = x), (this.y = y);
- (this.point.left = x - 16.5), (this.point.top = y - 16.5);
+ this.x = x;
+ this.y = y;
+ this.point.left = x - 16.5;
+ this.point.top = y - 16.5;
this.onMove();
}
diff --git a/src/interface/elements/CelestialBody.js b/src/interface/elements/CelestialBody.js
index 5908ae8..bbc5737 100644
--- a/src/interface/elements/CelestialBody.js
+++ b/src/interface/elements/CelestialBody.js
@@ -187,7 +187,7 @@ class CeleArray extends markerArray {
coordY.dataset.rawValue = y;
if (!this.interactPhoto.movable) {
- this.interactPhoto.tips.innerHTML = '请先选择星空照片';
+ this.interactPhoto.tips.innerHTML = '请先拖拽星空照片到此处';
return;
}
diff --git a/src/interface/elements/PlumbLine.js b/src/interface/elements/PlumbLine.js
index b3d20a1..860488f 100644
--- a/src/interface/elements/PlumbLine.js
+++ b/src/interface/elements/PlumbLine.js
@@ -78,6 +78,7 @@ class PLArray extends markerArray {
let lineCoord = [lastPLLine.points[0].coordinate, lastPLLine.points[1].coordinate].flat();
lastPLLine.lineObject = new LineObject(lineCoord, this.interactPhoto.canvas, '#35dc96');
lastPLLine.addMoveLineEvent();
+ this.interactPhoto.updateCalculButton();
} else if (lastPLLine.points.length > 2) {
console.error('Too many points in a line.');
}
@@ -101,6 +102,7 @@ class PLArray extends markerArray {
this.array[i].points[j].id -= 2;
}
}
+ this.interactPhoto.updateCalculButton();
}
}
diff --git a/src/interface/functions/Calc.js b/src/interface/functions/Calc.js
index 911ae47..8679d66 100644
--- a/src/interface/functions/Calc.js
+++ b/src/interface/functions/Calc.js
@@ -7,6 +7,7 @@ class Calc extends DefaultbuttonFunctioner {
constructor(interactPhoto, celeCoord) {
super(interactPhoto);
this.celeCoord = celeCoord;
+ this.geojson = null;
}
onClick() {
@@ -14,6 +15,8 @@ class Calc extends DefaultbuttonFunctioner {
if (!this.interactPhoto.movable) return;
let isAutoCeleCoord = document.getElementById('check3').checked; // 是否自动计算天体坐标
+ if (!this.validateBeforeCalculate(isAutoCeleCoord)) return;
+
if (isAutoCeleCoord) {
// 先计算天体坐标
this.celeCoord.calc().then((code) => {
@@ -27,33 +30,61 @@ class Calc extends DefaultbuttonFunctioner {
}
}
+ validateBeforeCalculate(isAutoCeleCoord) {
+ let originalStars = getOriginalStars(this.interactPhoto);
+
+ if (originalStars.length < 3) {
+ this.interactPhoto.tips.innerHTML = `请至少选择三颗星`;
+ return false;
+ }
+ if (!this.checkStarPositions(originalStars)) {
+ this.interactPhoto.tips.innerHTML = `请完整填写星星像素坐标`;
+ return false;
+ }
+ if (this.interactPhoto.getCompletePLCount() < 2) {
+ this.interactPhoto.tips.innerHTML = `请至少选择两条完整铅垂线`;
+ return false;
+ }
+ if (isAutoCeleCoord) {
+ if (!this.checkStarNames(originalStars)) {
+ this.interactPhoto.tips.innerHTML = `请填写所有天体名称`;
+ return false;
+ }
+ return true;
+ }
+ if (!this.checkStars(originalStars)) {
+ this.interactPhoto.tips.innerHTML = `请完整填写星星数据`;
+ return false;
+ }
+ return true;
+ }
+
// 重置标注数据
clearData() {
document.getElementById('zenX').value = '';
document.getElementById('zenY').value = '';
+ this.hideGeojson();
}
// 计算地理位置
calc() {
// 读取数据
- let globalPLsPointsCoord = getGlobalPLPointsCoord(this.interactPhoto);
+ let globalPLsPointsCoord = getGlobalPLPointsCoord(this.interactPhoto).filter((line) => line.length === 2);
let originalStars = getOriginalStars(this.interactPhoto);
// 检查数据
- if (originalStars.length < 3) {
- this.interactPhoto.tips.innerHTML = `请至少选择三颗星`;
- return;
- } else if (!this.checkStars(originalStars)) {
+ if (!this.checkStars(originalStars)) {
this.interactPhoto.tips.innerHTML = `请完整填写星星数据`;
return;
} else if (globalPLsPointsCoord.length < 2) {
- this.interactPhoto.tips.innerHTML = `请至少选择两条铅垂线`;
+ this.interactPhoto.tips.innerHTML = `请至少选择两条完整铅垂线`;
return;
}
// 开始计算
this.interactPhoto.buttonFunctioner = this;
this.interactPhoto.tips.innerHTML = `计算中...`;
+ this.hideGeojson();
post(
`${BACKEND_API}/positioning`,
@@ -72,8 +103,10 @@ class Calc extends DefaultbuttonFunctioner {
this.addZenithtoTable(results['topPoint']);
this.showZ(results['z']);
this.showGeoEstimate(results['lon'], results['lat']);
+ this.showGeojson(results['geojson']);
this.interactPhoto.tips.innerHTML = '计算地理位置成功';
} else {
+ this.hideGeojson();
this.interactPhoto.tips.innerHTML = `计算地理位置失败：${detail}`;
}
});
@@ -84,15 +117,27 @@ class Calc extends DefaultbuttonFunctioner {
// 检查originalStars数组每个子项的数据是否完整
checkStars(originalStars) {
- let isComplete = true;
- originalStars.forEach((originalStar) => {
- Object.values(originalStar).forEach((data) => {
- if (!data) {
- isComplete = false;
- }
- });
- });
- return isComplete;
+ return (
+ this.checkStarNames(originalStars) &&
+ this.checkStarPositions(originalStars) &&
+ this.checkStarCoords(originalStars)
+ );
+ }
+
+ checkStarNames(originalStars) {
+ return originalStars.every((originalStar) => originalStar.name.trim() !== '');
+ }
+
+ checkStarPositions(originalStars) {
+ return originalStars.every(
+ (originalStar) => Number.isFinite(originalStar.x) && Number.isFinite(originalStar.y)
+ );
+ }
+
+ checkStarCoords(originalStars) {
+ return originalStars.every(
+ (originalStar) => Number.isFinite(originalStar.lon) && Number.isFinite(originalStar.lat)
+ );
}
// 添加天顶坐标到表格
@@ -113,50 +158,118 @@ class Calc extends DefaultbuttonFunctioner {
// 显示地理坐标
showGeoEstimate(geoLon, geoLat) {
- /*global BMapGL*/
// 转换单位
geoLon = (geoLon * 180) / Math.PI;
geoLat = (geoLat * 180) / Math.PI;
- // 在地图上显示位置
geoLon = this.wrapAngleInDeg(geoLon);
document.getElementById('outputLat').textContent = Math.round(geoLat * 10000) / 10000 + '°';
document.getElementById('outputLong').textContent = Math.round(geoLon * 10000) / 10000 + '°';
+ }
- let map = this.interactPhoto.map;
- // 清除之前的标记
- map.clearOverlays();
- // 逆地址解析
- let addressDiv = document.getElementById('address');
- addressDiv.innerText = '正在获取地理位置信息...';
- // 创建地理编码实例
- let myGeo = new BMapGL.Geocoder();
- // 根据坐标得到地址描述
- myGeo.getLocation(new BMapGL.Point(geoLon, geoLat), function (result) {
- if (result) {
- addressDiv.innerText = result.address;
- } else {
- addressDiv.innerText = '获取地理位置信息失败';
- }
- });
- // 添加新的标记
- let geoPoint = new BMapGL.Point(geoLon, geoLat);
- let newMarker = new BMapGL.Marker(geoPoint);
- map.addOverlay(newMarker);
- // 误差线
- let shift = 0.125; // TODO: 从界面读取误差值
- let polyline = new BMapGL.Polyline(
- [
- new BMapGL.Point(this.wrapAngleInDeg(geoLon - shift), geoLat),
- new BMapGL.Point(this.wrapAngleInDeg(geoLon + shift), geoLat),
- ],
- {
- strokeColor: 'red',
- strokeWeight: 2,
- strokeOpacity: 0.5,
- }
- );
- map.addOverlay(polyline);
- map.centerAndZoom(geoPoint, 10);
+ showGeojson(geojson) {
+ const geojsonPanel = document.getElementById('geojsonPanel');
+ const geojsonIoLink = document.getElementById('openGeojsonIo');
+ const openAmapButton = document.getElementById('openAmap');
+
+ if (!geojson) {
+ this.hideGeojson();
+ return;
+ }
+
+ this.geojson = geojson;
+ const geojsonText = JSON.stringify(geojson, null, 2);
+ geojsonPanel.hidden = false;
+ geojsonIoLink.href = `https://geojson.io/#data=data:application/json,${encodeURIComponent(geojsonText)}`;
+ openAmapButton.onclick = () => this.openAmap();
+ }
+
+ hideGeojson() {
+ const geojsonPanel = document.getElementById('geojsonPanel');
+ const geojsonIoLink = document.getElementById('openGeojsonIo');
+ const openAmapButton = document.getElementById('openAmap');
+
+ this.geojson = null;
+ if (geojsonPanel) geojsonPanel.hidden = true;
+ if (geojsonIoLink) geojsonIoLink.href = 'https://geojson.io/';
+ if (openAmapButton) openAmapButton.onclick = null;
+ }
+
+ openAmap() {
+ if (!this.geojson) return;
+
+ const mapWindow = window.open('', '_blank');
+ if (!mapWindow) {
+ this.interactPhoto.tips.innerHTML = '浏览器阻止了弹出窗口，请允许后重试';
+ return;
+ }
+
+ mapWindow.document.open();
+ mapWindow.document.write(this.buildAmapHtml(this.geojson));
+ mapWindow.document.close();
+ }
+
+ buildAmapHtml(geojson) {
+ const geojsonText = JSON.stringify(geojson).replace(/
+
+
+
+
+
+
GeoJSON 点位展示
+
+
+
+
+
+
+
+
+`;
}
/**
diff --git a/src/interface/functions/CeleCoord.js b/src/interface/functions/CeleCoord.js
index 0cff203..eeee803 100644
--- a/src/interface/functions/CeleCoord.js
+++ b/src/interface/functions/CeleCoord.js
@@ -27,7 +27,7 @@ class CeleCoord {
},
'json'
);
- if (results === null) {
+ if (results === null || detail !== 'success') {
this.interactPhoto.tips.innerHTML = `自动计算天体坐标失败：${detail}`;
return -1;
}
@@ -35,7 +35,7 @@ class CeleCoord {
this.interactPhoto.tips.innerHTML = `自动计算天体坐标成功`;
for (let i = 0; i < starNames.length; i++) {
let [ha, dec] = results['haDecs'][starNames[i]];
- if (isNaN(ha) || isNaN(dec)) {
+ if (!Number.isFinite(ha) || !Number.isFinite(dec)) {
this.interactPhoto.tips.innerHTML = `无法自动计算${starNames[i]}坐标，请检查天体名称是否正确`;
return -1;
} else {
diff --git a/src/interface/functions/CeleRecognition.js b/src/interface/functions/CeleRecognition.js
index 79fe9b9..8ae1164 100644
--- a/src/interface/functions/CeleRecognition.js
+++ b/src/interface/functions/CeleRecognition.js
@@ -1,5 +1,5 @@
import { DefaultbuttonFunctioner } from './Default.js';
-import { post, setHADE } from '../utils.js';
+import { setHADE } from '../utils.js';
import { BACKEND_API } from '../../config.js';
// 天体识别按钮功能类
@@ -8,6 +8,7 @@ class RecognizeStars extends DefaultbuttonFunctioner {
super(interactPhoto);
this.isRecognizing = false; // 是否正在自动识星
this.xy = null; // 所有天体的图上坐标
+ this.abortController = null; // 用于取消请求
}
onClick() {
@@ -16,6 +17,9 @@ class RecognizeStars extends DefaultbuttonFunctioner {
if (this.isRecognizing) {
// 自动识星可能比较耗时，可以让用户取消
+ if (this.abortController) {
+ this.abortController.abort();
+ }
this.clearData();
this.interactPhoto.resetbuttonFunctioner();
this.interactPhoto.tips.innerHTML = '已取消自动识星';
@@ -37,82 +41,87 @@ class RecognizeStars extends DefaultbuttonFunctioner {
clearData() {
this.isRecognizing = false;
this.xy = null;
+ this.abortController = null;
}
- // 提交数据
+ // 提交数据并建立SSE连接监听进度
async submitData() {
this.interactPhoto.tips.innerHTML = '正在申请任务排队（0/3）';
this.xy = this.getXY();
const subImages = await this.getSubImages(this.xy);
- const image_width = this.interactPhoto.img.width;
- const image_height = this.interactPhoto.img.height;
- const formData = {
- sub_images: subImages,
- xy: JSON.stringify(this.xy),
- image_width: image_width,
- image_height: image_height,
- scale_lower: document.getElementById('setScopeAngle1').value,
- scale_upper: document.getElementById('setScopeAngle2').value,
- };
- post(BACKEND_API + '/astrometry/submit', formData, 'form').then(([results, detail]) => {
- if (detail == 'success') {
- this.interactPhoto.tips.innerHTML = '正在求解天体坐标（1/3）';
- this.inquire(results['job_id']);
- } else {
- this.interactPhoto.tips.innerHTML = `提交数据失败：${detail}`;
- this.clearData(); // TODO：其他按钮功能类可能也需要清除状态
- this.interactPhoto.resetbuttonFunctioner();
+
+ const formData = new FormData();
+ subImages.forEach((blob) => formData.append('sub_images', blob, `sub.png`));
+ formData.append('xy', JSON.stringify(this.xy));
+ formData.append('image_width', this.interactPhoto.img.width);
+ formData.append('image_height', this.interactPhoto.img.height);
+ formData.append('scale_lower', document.getElementById('setScopeAngle1').value);
+ formData.append('scale_upper', document.getElementById('setScopeAngle2').value);
+ formData.append('timestamp', this.interactPhoto.getTimestamp());
+ formData.append('is_zh', true);
+
+ this.abortController = new AbortController();
+
+ try {
+ const response = await fetch(`${BACKEND_API}/astrometry/recognize-stream`, {
+ method: 'POST',
+ body: formData,
+ signal: this.abortController.signal,
+ });
+
+ if (!response.ok) {
+ throw new Error(`HTTP ${response.status}`);
}
- });
- }
- // 轮询Astrometry任务是否成功
- inquire(jobid) {
- fetch(`${BACKEND_API}/astrometry/jobidstatus/${jobid}`, {
- method: 'GET',
- })
- .then((response) => {
- return response.json();
- })
- .then((data) => {
- if (data['status'] === 'success') {
- this.interactPhoto.tips.innerHTML = '正在识别天体名称（2/3）';
- this.recognizeStars(jobid);
- } else if (data['status'] === 'failure') {
- this.interactPhoto.tips.innerHTML = '无法确定天体坐标';
- this.clearData();
- this.interactPhoto.resetbuttonFunctioner();
- } else {
- setTimeout(() => {
- this.inquire(jobid);
- }, 1000);
+ const reader = response.body.getReader();
+ const decoder = new TextDecoder('utf-8');
+ let buffer = '';
+
+ while (true) {
+ const { done, value } = await reader.read();
+ if (done) break;
+
+ buffer += decoder.decode(value, { stream: true });
+ let lines = buffer.split('\n');
+ // 保留最后不完整的一行
+ buffer = lines.pop();
+
+ for (let line of lines) {
+ if (line.trim() === '') continue;
+ if (line.startsWith('data: ')) {
+ const dataStr = line.substring(6);
+ try {
+ const data = JSON.parse(dataStr);
+ if (data.step === 'submitted') {
+ this.interactPhoto.tips.innerHTML = '正在求解天体坐标（1/3）';
+ } else if (data.step === 'solving') {
+ this.interactPhoto.tips.innerHTML = '正在识别天体名称（2/3）';
+ } else if (data.step === 'success') {
+ this.interactPhoto.tips.innerHTML = '识别成功（3/3）';
+ this.showStars(data);
+ this.clearData();
+ this.interactPhoto.resetbuttonFunctioner();
+ } else if (data.step === 'error') {
+ this.interactPhoto.tips.innerHTML = `识别失败：${data.detail}`;
+ this.clearData();
+ this.interactPhoto.resetbuttonFunctioner();
+ return; // 发生错误，结束处理
+ }
+ } catch (e) {
+ console.error('SSE Parsing error:', e, dataStr);
+ }
+ }
}
- })
- .catch((error) => {
- this.interactPhoto.tips.innerHTML = `查询任务状态失败：${error}`;
+ }
+ } catch (error) {
+ if (error.name === 'AbortError') {
+ console.log('自动识星请求已被取消');
+ } else {
+ this.interactPhoto.tips.innerHTML = `提交请求失败：${error.message}`;
this.clearData();
this.interactPhoto.resetbuttonFunctioner();
- });
- }
-
- // 识别星名
- recognizeStars(jobid) {
- const data = {
- job_id: jobid,
- xy: this.xy,
- timestamp: this.interactPhoto.getTimestamp(),
- is_zh: true,
- };
- post(BACKEND_API + '/astrometry/recognize', data, 'json').then(([results, detail]) => {
- if (detail == 'success') {
- this.interactPhoto.tips.innerHTML = '识别成功（3/3）';
- this.showStars(results);
- } else {
- this.interactPhoto.tips.innerHTML = `识别失败：${detail}`;
}
- this.clearData();
- this.interactPhoto.resetbuttonFunctioner();
- });
+ }
}
// 获取天体的图上坐标
diff --git a/src/interface/functions/ImageChange.js b/src/interface/functions/ImageChange.js
index 45f8174..f1eb55f 100644
--- a/src/interface/functions/ImageChange.js
+++ b/src/interface/functions/ImageChange.js
@@ -43,6 +43,7 @@ class ImageChange extends DefaultbuttonFunctioner {
this.interactPhoto.canvas.selection = true;
this.interactPhoto.canvas.defaultCursor = 'grab';
this.interactPhoto.canvas.remove(this.interactPhoto.text);
+ this.interactPhoto.updateCalculButton();
}
onClick(e) {
diff --git a/src/interface/functions/PickPL.js b/src/interface/functions/PickPL.js
index c81cc96..e4d6ff9 100644
--- a/src/interface/functions/PickPL.js
+++ b/src/interface/functions/PickPL.js
@@ -27,6 +27,7 @@ class PickPL extends DefaultbuttonFunctioner {
pl.remove();
}
this.interactPhoto.PLArray.array = [];
+ this.interactPhoto.updateCalculButton();
}
handleMouseUp(e) {
diff --git a/src/interface/init.js b/src/interface/init.js
index 3f9109b..74f2870 100644
--- a/src/interface/init.js
+++ b/src/interface/init.js
@@ -22,7 +22,7 @@ function initializeCanvas(interactPhoto) {
selection: false,
});
- interactPhoto.text = new IText('选择星空照片。', {
+ interactPhoto.text = new IText('拖拽星空照片到此处', {
fill: '#8a6119',
textAlign: 'center',
fontSize: 40,
@@ -75,9 +75,6 @@ function initializeEvents(eventManager) {
.getElementById('celePick')
.addEventListener('click', eventManager.pickCele.onClick.bind(eventManager.pickCele));
document.getElementById('vaniZen').addEventListener('click', eventManager.pickPL.onClick.bind(eventManager.pickPL));
- document
- .getElementById('srcFile')
- .addEventListener('change', (e) => eventManager.imageChange.onClick.call(eventManager.imageChange, e));
interactPhoto.container.addEventListener('dragover', (e) => {
e.preventDefault();
e.stopPropagation();
@@ -116,17 +113,4 @@ function initializeEvents(eventManager) {
interactPhoto.CeleArray.initializeTableRows();
}
-// 初始化地图
-function initializeMap(interactPhoto) {
- /*global BMapGL*/
- // 按住鼠标右键，修改倾斜角和角度
- let map = new BMapGL.Map('map'); // 创建Map实例
- map.centerAndZoom(new BMapGL.Point(110, 35), 4); // 初始化地图,设置中心点坐标和地图级别
- map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
- map.addControl(new BMapGL.ScaleControl()); // 添加比例尺控件
- map.addControl(new BMapGL.ZoomControl()); // 添加缩放控件
- map.addControl(new BMapGL.MapTypeControl()); //添加地图类型控件
- interactPhoto.map = map;
-}
-
-export { initializeElements, initializeCanvas, initializeEvents, initializeMap };
+export { initializeElements, initializeCanvas, initializeEvents };