提交 f280f663 作者: 姚志忠

新增二区,二区东围栏判断

父级 92f88f9b
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
getPoiName, getPoiName,
getDistance, getDistance,
createGridIndex, createGridIndex,
nearDistrict2,
nearDistrict2East,
} from "./util"; } from "./util";
import md5 from "./libs/md5"; import md5 from "./libs/md5";
import sensors from "./sensorsdata.esm.js"; import sensors from "./sensorsdata.esm.js";
...@@ -438,6 +440,30 @@ App({ ...@@ -438,6 +440,30 @@ App({
isHighAccuracy: false, isHighAccuracy: false,
success: ({ latitude, longitude }) => { success: ({ latitude, longitude }) => {
console.log('定位成功', latitude, longitude); console.log('定位成功', latitude, longitude);
// 二区/二区东优先走围栏判断,最近点逻辑仅兜底
if (nearDistrict2East({ latitude, longitude })) {
const district2East = buildings.find((b) => b.name === "二区东");
if (district2East && this.currentBuilding.name !== district2East.name) {
this.currentBuilding = district2East;
console.log('initBuildingByLocation 切换到:', district2East.name);
this.updateSensorsMarketCode(district2East);
this.events.emit('building', district2East);
}
return;
}
if (nearDistrict2({ latitude, longitude })) {
const district2 = buildings.find((b) => b.name === "二区");
if (district2 && this.currentBuilding.name !== district2.name) {
this.currentBuilding = district2;
console.log('initBuildingByLocation 切换到:', district2.name);
this.updateSensorsMarketCode(district2);
this.events.emit('building', district2);
}
return;
}
let nearest = null; let nearest = null;
let minDist = Infinity; let minDist = Infinity;
buildings.forEach((building) => { buildings.forEach((building) => {
......
...@@ -653,6 +653,15 @@ export const checkAuth = async () => { ...@@ -653,6 +653,15 @@ export const checkAuth = async () => {
} }
return true; return true;
}; };
export const nearDistrict2 = ({ latitude, longitude }) => {
return (
latitude < 29.336838 &&
latitude > 29.333700 &&
longitude < 120.108350 &&
longitude > 120.105050
);
};
export const nearDistrict2East = ({ latitude, longitude }) => { export const nearDistrict2East = ({ latitude, longitude }) => {
return ( return (
latitude < 29.333647 && latitude < 29.333647 &&
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论