feat: 用 react-map-gl + MapLibre 替换 react-simple-maps 实现 2D 地图
- 替换 react-simple-maps/d3-geo/topojson-client 为 react-map-gl + maplibre-gl - 使用 CARTO dark-matter 免费暗色瓦片,自带国家/城市名标注 - 基于 locale 动态切换地图标注语言(name:zh / name_en) - MapLibre 原生 heatmap + circle 双层渲染替代 SVG 热力图 - 提取 MapPopup 组件,配合 react-map-gl Popup 实现点击弹窗 - continent page 改为 dynamic import (ssr: false) - dev 模式去掉 Turbopack 以兼容 maplibre-gl - 删除 heatmap-layer.tsx 和 react-simple-maps 类型声明
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { gte, and, isNotNull, sql } from "drizzle-orm";
|
||||
import { and, isNotNull, sql } from "drizzle-orm";
|
||||
import { db } from "@/lib/db";
|
||||
import { claws } from "@/lib/db/schema";
|
||||
import { getCacheHeatmap, setCacheHeatmap } from "@/lib/redis";
|
||||
@@ -13,18 +13,19 @@ export async function GET() {
|
||||
|
||||
const fiveMinutesAgo = new Date(Date.now() - 5 * 60 * 1000);
|
||||
|
||||
const activeClaws = await db
|
||||
// Query all claws with coordinates, grouped by location
|
||||
const locationRows = await db
|
||||
.select({
|
||||
city: claws.city,
|
||||
country: claws.country,
|
||||
latitude: claws.latitude,
|
||||
longitude: claws.longitude,
|
||||
count: sql<number>`count(*)`,
|
||||
onlineCount: sql<number>`sum(case when ${claws.lastHeartbeat} >= ${fiveMinutesAgo} then 1 else 0 end)`,
|
||||
})
|
||||
.from(claws)
|
||||
.where(
|
||||
and(
|
||||
gte(claws.lastHeartbeat, fiveMinutesAgo),
|
||||
isNotNull(claws.latitude),
|
||||
isNotNull(claws.longitude)
|
||||
)
|
||||
@@ -36,14 +37,49 @@ export async function GET() {
|
||||
claws.longitude
|
||||
);
|
||||
|
||||
const points = activeClaws.map((row) => ({
|
||||
lat: Number(row.latitude),
|
||||
lng: Number(row.longitude),
|
||||
weight: row.count,
|
||||
clawCount: row.count,
|
||||
city: row.city,
|
||||
country: row.country,
|
||||
}));
|
||||
// Fetch individual claw details for all claws with coordinates
|
||||
const clawDetails = await db
|
||||
.select({
|
||||
id: claws.id,
|
||||
name: claws.name,
|
||||
city: claws.city,
|
||||
country: claws.country,
|
||||
latitude: claws.latitude,
|
||||
longitude: claws.longitude,
|
||||
lastHeartbeat: claws.lastHeartbeat,
|
||||
})
|
||||
.from(claws)
|
||||
.where(
|
||||
and(
|
||||
isNotNull(claws.latitude),
|
||||
isNotNull(claws.longitude)
|
||||
)
|
||||
);
|
||||
|
||||
// Group claw details by location key
|
||||
const clawsByLocation = new Map<string, Array<{ id: string; name: string; isOnline: boolean }>>();
|
||||
for (const claw of clawDetails) {
|
||||
const key = `${claw.latitude}:${claw.longitude}`;
|
||||
const isOnline = claw.lastHeartbeat ? claw.lastHeartbeat >= fiveMinutesAgo : false;
|
||||
const list = clawsByLocation.get(key) ?? [];
|
||||
list.push({ id: claw.id, name: claw.name, isOnline });
|
||||
clawsByLocation.set(key, list);
|
||||
}
|
||||
|
||||
const points = locationRows.map((row) => {
|
||||
const key = `${row.latitude}:${row.longitude}`;
|
||||
const clawList = (clawsByLocation.get(key) ?? []).slice(0, 20);
|
||||
return {
|
||||
lat: Number(row.latitude),
|
||||
lng: Number(row.longitude),
|
||||
weight: row.count,
|
||||
clawCount: row.count,
|
||||
onlineCount: Number(row.onlineCount ?? 0),
|
||||
city: row.city,
|
||||
country: row.country,
|
||||
claws: clawList,
|
||||
};
|
||||
});
|
||||
|
||||
const lastUpdated = new Date().toISOString();
|
||||
const responseData = { points, lastUpdated };
|
||||
|
||||
Reference in New Issue
Block a user