修复导览与讲解位置预览逻辑

src/repositories/GuideRepository.ts

@@ -36,12 +36,15 @@ import {
   toGuideMapDiagnostics,
   toLocationPreviewFromPoi,
   toMuseumFloorFromSgs,
+  toMuseumHallPoisFromSgs,
   toMuseumPoiFromSgs,
   toRouteReadinessFromSgsDiagnostics
 } from '@/data/adapters/sgsSdkGuideAdapter'
 
 const searchableCategories = new Set([
   'touring_poi',
+  'exhibition_hall',
+  'exhibition_hall_entrance',
   'basic_service_facility',
   'transport_circulation',
   'accessibility_special_service',
@@ -50,6 +53,7 @@ const searchableCategories = new Set([
 
 const toSearchText = (poi: MuseumPoi) => [
   poi.name,
+  poi.hallName,
   poi.floorId,
   poi.floorLabel,
   poi.primaryCategory.label,
@@ -71,7 +75,11 @@ const toLocationPreview = (poi: MuseumPoi): GuideLocationPreview => ({
   floorLabel: poi.floorLabel,
   primaryCategoryZh: poi.primaryCategory.label,
   positionGltf: poi.positionGltf,
-  sourceObjectName: poi.sourceObjectName
+  sourceObjectName: poi.sourceObjectName,
+  kind: poi.kind,
+  hallId: poi.hallId,
+  hallName: poi.hallName,
+  entrances: poi.entrances
 })
 
 const isSearchableIndoorPoi = (poi: MuseumPoi) => (
@@ -79,6 +87,15 @@ const isSearchableIndoorPoi = (poi: MuseumPoi) => (
   && isPoiOnIndoorNavigableFloor(poi)
 )
 
+const dedupePoisById = (pois: MuseumPoi[]) => {
+  const seen = new Set<string>()
+  return pois.filter((poi) => {
+    if (!poi.id || seen.has(poi.id)) return false
+    seen.add(poi.id)
+    return true
+  })
+}
+
 export interface GuideRepository {
   getAssetBaseUrl(): string
   getFloors(): Promise<MuseumFloor[]>
@@ -245,16 +262,38 @@ export class SgsSdkGuideRepository implements GuideRepository {
     const indoorFloors = manifest.floors.filter(isIndoorNavigableFloor)
     const indoorFloorIds = new Set(indoorFloors.map((floor) => String(floor.floorId)))
     this.floorAliases = buildSgsFloorAliases(indoorFloors)
-    const poiGroups = await Promise.all(
-      indoorFloors.map((floor) => this.provider.getFloorPois(String(floor.floorId)))
+    const floorDataGroups = await Promise.all(
+      indoorFloors.map(async (floor) => {
+        const floorId = String(floor.floorId)
+        const [pois, spaces, navigablePlaces] = await Promise.all([
+          this.provider.getFloorPois(floorId).catch(() => []),
+          this.provider.getFloorSpaces(floorId).catch(() => []),
+          this.provider.getNavigablePlaces(floorId).catch(() => [])
+        ])
+
+        return {
+          floorId,
+          pois,
+          hallPois: toMuseumHallPoisFromSgs(spaces, navigablePlaces, manifest.floors, floorId)
+        }
+      })
     )
 
-    this.poiCache = poiGroups
-      .flat()
+    const ordinaryPois = floorDataGroups
+      .flatMap((group) => group.pois)
       .map((poi) => toMuseumPoiFromSgs(poi, manifest.floors))
       .filter((poi) => poi.id && poi.name)
       .filter((poi) => indoorFloorIds.has(String(poi.floorId)) || isPoiOnIndoorNavigableFloor(poi))
 
+    const hallPois = floorDataGroups
+      .flatMap((group) => group.hallPois)
+      .filter((poi) => indoorFloorIds.has(String(poi.floorId)) || isPoiOnIndoorNavigableFloor(poi))
+
+    this.poiCache = dedupePoisById([
+      ...hallPois,
+      ...ordinaryPois
+    ])
+
     return this.poiCache
   }