fix bug

Author: yuiseki

.env.development

@@ -1,4 +1,4 @@
 VERCEL_ENV=development
-USE_OLLAMA=1
-OLLAMA_BASE_URL="http://ollama:11434"
-USE_POSTGRES=1
+#USE_OLLAMA=1
+#OLLAMA_BASE_URL="http://ollama:11434"
+#USE_POSTGRES=1

src/app/api/ai/surface/route.ts

@@ -24,6 +24,7 @@ export async function POST(request: Request) {
     console.error("Error parsing pastMessages:", error);
     chatHistoryLines = [];
   }
+  chatHistoryLines.push(query);
 
   console.log("");
   console.log("chatHistoryLines:");

src/app/page.tsx

@@ -8,7 +8,7 @@ import { DialogueElement } from "@/types/DialogueElement";
 import { nextPostJson, nextPostJsonWithCache } from "@/utils/nextPostJson";
 import { sleep } from "@/lib/sleep";
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { MapProvider, MapRef } from "react-map-gl/maplibre";
+import { MapProvider, MapRef, useMap } from "react-map-gl/maplibre";
 import { FeatureCollection } from "geojson";
 import { getOverpassResponseJsonWithCache } from "@/lib/osm/getOverpass";
 import osmtogeojson from "osmtogeojson";
@@ -29,6 +29,7 @@ import { useScrollToBottom } from "@/hooks/scrollToBottom";
 import { parseSurfaceResJson } from "@/utils/trident/parseSurfaceResJson";
 import { Ability } from "@/types/Ability";
 import { AccountButton } from "@/components/AccountButton";
+import * as turf from "@turf/turf";
 
 export default function Home() {
   // all state
@@ -41,6 +42,7 @@ export default function Home() {
 
   // maps ref and state
   const mapRef = useRef<MapRef | null>(null);
+  const { mainMap } = useMap();
   const [geoJsonWithStyleList, setGeoJsonWithStyleList] = useState<
     Array<{
       id: string;
@@ -258,6 +260,7 @@ export default function Home() {
 
     switch (ability) {
       case "overpass-api":
+        console.debug("ability: overpass-api");
         await invokeOverpassInner(surfaceResJson.history);
         break;
       case "apology":
@@ -288,7 +291,7 @@ export default function Home() {
   // fit bounds to all geojson in the geojsonWithStyleList
   useEffect(() => {
     setTimeout(() => {
-      if (!mapRef || !mapRef.current) return;
+      console.log("geoJsonWithStyleList", geoJsonWithStyleList);
       if (geoJsonWithStyleList.length === 0) return;
 
       try {
@@ -329,8 +332,20 @@ export default function Home() {
             };
           }
         }
-
-        fitBoundsToGeoJson(mapRef, everything, padding);
+        console.log("map", mainMap);
+        if (!mainMap || mainMap === undefined) return;
+
+        const [minLng, minLat, maxLng, maxLat] = turf.bbox(everything);
+        mainMap.fitBounds(
+          [
+            [minLng, minLat],
+            [maxLng, maxLat],
+          ],
+          {
+            padding: padding,
+            duration: 1000,
+          }
+        );
       } catch (error) {
         console.error(error);
         setResponding(false);
@@ -400,6 +415,9 @@ export default function Home() {
               latitude={0}
               zoom={1}
               style={mapStyleJsonUrl}
+              onMapLoad={() => {
+                console.log("Map loaded");
+              }}
             >
               {geoJsonWithStyleList &&
                 geoJsonWithStyleList.map((geojsonWithStyle) => {
@@ -439,6 +457,7 @@ export default function Home() {
                   </div>
                 );
               })}
+              {/*
               <LocationProvider locationInfo={{ location: location }}>
                 {dialogueList.length === 1 && inputText.length === 0 && (
                   <InputSuggest
@@ -461,6 +480,7 @@ export default function Home() {
                     />
                   )}
               </LocationProvider>
+               */}
               <div style={{ height: "1px" }} ref={dialogueEndRef} />
             </div>
             <TextInput

src/lib/maplibre/fitBoundsToGeoJson.ts

@@ -1,6 +1,7 @@
 import { MapRef, PaddingOptions } from "react-map-gl/maplibre";
 import * as turf from "@turf/turf";
 import { MutableRefObject } from "react";
+import { Map } from "react-map-gl/maplibre";
 
 export const fitBoundsToGeoJson = (
   mapRef: MutableRefObject<MapRef | null>,

src/utils/trident/getChatModel.ts

@@ -19,9 +19,13 @@ export const getChatModel = () => {
       configuration: {
         baseURL: process.env.CLOUDFLARE_AI_GATEWAY + "/openai",
       },
+      model: "gpt-4o",
       temperature: 0,
     });
   } else {
-    return new ChatOpenAI({ temperature: 0 });
+    return new ChatOpenAI({
+      model: "gpt-4o",
+      temperature: 0,
+    });
   }
 };

src/utils/trident/parseSurfaceResJson.ts

@@ -14,6 +14,8 @@ export const parseSurfaceResJson = (surfaceResJson: {
 
     if (line.includes("Ability")) {
       ability = line.split(": ")[1] as Ability;
+      // 空白除去
+      ability = ability.replace(/\s+/g, "");
     }
     if (line.includes("Reply")) {
       reply = line.split(": ")[1];