Fix kartaview

zbycz · Oct 20, 2024 · 7b4b117 · 7b4b117
1 parent caf35ad
commit 7b4b117
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/services/fetch.ts b/src/services/fetch.ts
@@ -18,7 +18,7 @@ interface FetchOpts extends RequestInit {
   nocache?: boolean;
 }
 
-export const fetchText = async (url, opts: FetchOpts = {}) => {
+export const fetchText = async (url: string, opts: FetchOpts = {}) => {
   const key = getKey(url, opts);
   const item = getCache(key);
   if (item) return item;

diff --git a/src/services/images/getImageFromCenter.ts b/src/services/images/getImageFromCenter.ts
@@ -12,7 +12,7 @@ const subtractAngle = (a: number, b: number): number =>
 type ImageProvider<T> = {
   getImages: (pos: Position) => Promise<T[]>;
   getImageCoords: (img: T) => Position;
-  getImageAngle: (img: T) => number;
+  getImageAngle: (img: T) => number | undefined;
   isPano: (img: T) => boolean;
   getImageUrl: (img: T) => string;
   getImageDate: (img: T) => Date;
@@ -44,13 +44,14 @@ export const getImageFromCenterFactory =
 
     const photos = apiImages.map((pic) => {
       const photoCoords = getImageCoords(pic);
+      const angle = getImageAngle(pic);
       return {
         ...pic,
         angleFromPhotoToPoi: getBearing(photoCoords, poiCoords),
-        deviationFromStraightSight: subtractAngle(
-          getBearing(photoCoords, poiCoords),
-          getImageAngle(pic),
-        ),
+        deviationFromStraightSight:
+          angle === undefined
+            ? Infinity
+            : subtractAngle(getBearing(photoCoords, poiCoords), angle),
       };
     });
 

diff --git a/src/services/images/getkartaViewImage.ts b/src/services/images/getkartaViewImage.ts
@@ -27,7 +27,7 @@ type KartaViewImage = {
   match_lng: string;
   way_id: string;
   shot_date: string;
-  heading: string;
+  heading: string | null;
   headers: any;
   gps_accuracy: any;
   projection: string;
@@ -43,8 +43,9 @@ export const getKartaViewImage = getImageFromCenterFactory('KartaView', {
       top: poiCoords[1] + 0.0004,
     };
 
-    const apiImages = await fetchJson<KartaViewResponse>(
-      `${KARTAVIEW_BASE}/1.0/list/nearby-photos/`,
+    const apiResponse = await fetchJson<KartaViewResponse>(
+      // bbox in url to prevent nextjs caching
+      `${KARTAVIEW_BASE}/1.0/list/nearby-photos/?bbox=${bbox.left},${bbox.top}`,
       {
         method: 'POST',
         body: new URLSearchParams({
@@ -55,12 +56,15 @@ export const getKartaViewImage = getImageFromCenterFactory('KartaView', {
         }),
       },
     );
-    return apiImages.currentPageItems;
+    return apiResponse.currentPageItems;
   },
   getImageCoords: ({ lng, lat }) => [parseInt(lng), parseInt(lat)],
-  getImageAngle: ({ heading }) => parseInt(heading),
+  getImageAngle: ({ heading }) => (heading ? parseInt(heading) : undefined),
   isPano: () => false,
-  getImageUrl: ({ name }) => `${KARTAVIEW_BASE}/${name}`,
+  getImageUrl: ({ lth_name }) => {
+    const [storage, uri] = lth_name.split(/\/(.*)/);
+    return `https://${storage}.openstreetcam.org/${uri}`;
+  },
   getImageDate: ({ timestamp }) => new Date(parseInt(timestamp) * 1000),
   getImageLink: ({ id }) => id,
   getImageLinkUrl: ({ sequence_id, sequence_index }) =>