new back

Author: Senopiece

frontend/src/lib/services/PlacesRestApi.ts

@@ -24,18 +24,7 @@ export class PlacesRestApi implements Places {
 				places_limit: placesLimit
 			}
 		});
-
-		const data = response.data;
-
-		// augment
-		console.log(data.places);
-		data.places = data.places.map((p) => {
-			p.Lat += 56.3327 + Math.random() * 0.02 - 0.01;
-			p.Lon += 44.0012 + Math.random() * 0.02 - 0.01;
-			return p;
-		});
-
-		return data;
+		return response.data;
 	}
 
 	async searchImage(areasId: number[], imageFile: File, placesLimit: number = 5) {
@@ -49,18 +38,7 @@ export class PlacesRestApi implements Places {
 				areas_id: areasId
 			}
 		});
-
-		const data = response.data;
-
-		// augment
-		console.log(data.places);
-		data.places = data.places.map((p) => {
-			p.Lat += 56.3327 + Math.random() * 0.02 - 0.01;
-			p.Lon += 44.0012 + Math.random() * 0.02 - 0.01;
-			return p;
-		});
-
-		return data;
+		return response.data;
 	}
 
 	async getPlaceInfo(xid: string) {

frontend/src/lib/structs/Places.ts

@@ -8,14 +8,20 @@ export interface CategoryPrediction {
 	probability: number;
 }
 
+export interface LatLon {
+	Lat: number;
+	Lon: number;
+}
+
 export interface ImageQueryResponse {
+	optimal_route: LatLon[] | null;
 	places: PlacePrediction[];
 	categories: CategoryPrediction[];
 }
 
 export interface PlaceInfo {
 	category: string;
-	images: number[];
+	images: string[];
 }
 
 export interface PlacePrediction {
@@ -28,5 +34,6 @@ export interface PlacePrediction {
 }
 
 export interface TextQueryResponse {
+	optimal_route: LatLon[] | null;
 	places: PlacePrediction[];
 }

frontend/src/routes/searchResults/+page.svelte

@@ -25,15 +25,18 @@
 					'Map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
 			}).addTo(map);
 
-			const waypoints = searchResults.res.places.map((place) => L.latLng(place.Lat, place.Lon));
-			L.Routing.control({
-				waypoints: waypoints,
-				routeWhileDragging: true,
-				addWaypoints: false,
-				createMarker: function () {
-					return null;
-				} // Prevent automatic marker creation
-			}).addTo(map);
+			let optimal_route = searchResults.res.optimal_route;
+			if (optimal_route !== null) {
+				const waypoints = optimal_route.map((ll) => L.latLng(ll.Lat, ll.Lon));
+				L.Routing.control({
+					waypoints: waypoints,
+					routeWhileDragging: true,
+					addWaypoints: false,
+					createMarker: function () {
+						return null;
+					} // Prevent automatic marker creation
+				}).addTo(map);
+			}
 
 			// Add markers and tooltips for each place
 			searchResults.res.places.forEach((place) => {