Fix: license info in 'nearby images' now works for mapillary, add bbox search for panoramax

src/Logic/ImageProviders/LicenseInfo.ts

@@ -8,7 +8,7 @@ export class LicenseInfo {
     copyrighted?: boolean = false
     credit?: string = ""
     description?: string = ""
-    informationLocation?: URL = undefined
+    informationLocation?: URL | string = undefined
     date?: Date
     views?: number
 }

src/Logic/ImageProviders/Mapillary.ts

@@ -192,7 +192,12 @@ export class Mapillary extends ImageProvider {
         license.license = "CC BY-SA 4.0"
         // license.license = "Creative Commons Attribution-ShareAlike 4.0 International License";
         license.attributionRequired = true
-        license.date = new Date(response["captured_at"])
+        const date = response["captured_at"]
+        try {
+            license.date = new Date(date)
+        } catch (e) {
+            console.warn("Could not parse captured_at date from mapillary image. The date is:", date)
+        }
         return license
     }
 

src/Logic/Web/NearbyImagesSearch.ts

@@ -9,6 +9,7 @@ import { Utils } from "../../Utils"
 import { Point } from "geojson"
 import { Imgur } from "../ImageProviders/Imgur"
 import { ImageData, Panoramax, PanoramaxXYZ } from "panoramax-js/dist"
+import { Mapillary } from "../ImageProviders/Mapillary"
 
 interface ImageFetcher {
     /**
@@ -222,6 +223,11 @@ class ImagesFromPanoramaxFetcher implements ImageFetcher {
         const promises: Promise<ImageData[]>[] = []
         const maxRadius = this._radius
         let prevRadius = 0
+
+        const nearby = this._panoramax.search({
+            bbox: new BBox([[lon, lat]]).pad(0.001).toLngLatFlat()
+        })
+        promises.push(nearby) // We do a nearby search with bbox, see https://source.mapcomplete.org/MapComplete/MapComplete/issues/2384
         for (const radiusSetting of radiusSettings) {
             const promise = this._panoramax.search({
                 place: [lon, lat],
@@ -265,7 +271,7 @@ class MapillaryFetcher implements ImageFetcher {
     async fetchImages(lat: number, lon: number): Promise<P4CPicture[]> {
         const boundingBox = new BBox([[lon, lat]]).padAbsolute(0.003)
         let url =
-            "https://graph.mapillary.com/images?fields=geometry,computed_geometry,creator,id,thumb_256_url,thumb_original_url,compass_angle&bbox=" +
+            "https://graph.mapillary.com/images?fields=geometry,computed_geometry,creator,id,captured_at,thumb_256_url,thumb_original_url,compass_angle&bbox=" +
             [
                 boundingBox.getWest(),
                 boundingBox.getSouth(),
@@ -293,13 +299,14 @@ class MapillaryFetcher implements ImageFetcher {
         const response = await Utils.downloadJson<{
             data: {
                 id: string
-                creator: string
+                creator: { username: string }
                 geometry: Point
                 computed_geometry: Point
                 is_pano: boolean
                 thumb_256_url: string
                 thumb_original_url: string
                 compass_angle: number
+                captured_at: number
             }[]
         }>(url)
         const pics: P4CPicture[] = []
@@ -308,6 +315,7 @@ class MapillaryFetcher implements ImageFetcher {
             if (img.thumb_original_url === undefined) {
                 continue
             }
+            const [lon, lat] = img.computed_geometry.coordinates
             pics.push({
                 pictureUrl: img.thumb_original_url,
                 provider: "Mapillary",
@@ -319,6 +327,12 @@ class MapillaryFetcher implements ImageFetcher {
                 details: {
                     isSpherical: this._panoramas === "only",
                 },
+
+                detailsUrl: Mapillary.singleton.visitUrl(img, { lon, lat }),
+                date: img.captured_at,
+                license: "CC-BY-SA",
+                author: img.creator.username,
+                direction: img.compass_angle
             })
         }
         return pics
@@ -367,7 +381,6 @@ export class CombinedFetcher {
     ): Promise<void> {
         try {
             const pics = await source.fetchImages(lat, lon)
-            console.log(source.name, "==>>", pics)
             state.data[source.name] = "done"
             state.ping()