Added OpenStreetMap Search

This commit is contained in:
knom committed 2024-12-18 09:46:34 +00:00
1 parent 7639de9e45
commit 5ea7e1f344
4 files changed
+228 -13

No files matched your search

@@ -13,6 +13,7 @@ import React, { useState } from "react";
import TagMissingLocationSearchAndAdd from "./TagMissingLocationSearchAndAdd";
import TagMissingLocationSearchLatLong from "./TagMissingLocationSearchLatLong";
import { MapPinCheck } from "lucide-react";
import TagMissingLocationOSMSearchAndAdd from "./TagMissingLocationOSMSearchAndAdd";
interface ITagMissingLocationDialogProps {
onSubmit: (place: IPlace) => Promise<any>;
@@ -23,6 +24,11 @@ export default function TagMissingLocationDialog({
const [open, setOpen] = useState(false);
const [mapPosition,setMapPosition] = useState<IPlace>({
latitude: 48.0,
longitude: 16.0,
name: "home1"
});
return (
<Dialog open={open} onOpenChange={setOpen}>
@@ -38,18 +44,21 @@ export default function TagMissingLocationDialog({
</DialogHeader>
<Tabs defaultValue="search" className="border rounded-lg">
<TabsList className="flex justify-between">
<TabsTrigger value="search">Search and Pick</TabsTrigger>
<TabsTrigger value="latlong">
<TabsTrigger value="search">Immich Search</TabsTrigger>
<TabsTrigger value="searchOsm">OSM Search</TabsTrigger>
<TabsTrigger value="latlong">
Latitude and Longitude
</TabsTrigger>
<TabsTrigger value="google">Google Maps</TabsTrigger>
</TabsList>
<TabsContent value="search">
<TagMissingLocationSearchAndAdd onSubmit={onSubmit} onOpenChange={setOpen} />
</TabsContent>
<TabsContent value="searchOsm">
<TagMissingLocationOSMSearchAndAdd onSubmit={onSubmit} onOpenChange={setOpen} location={mapPosition} onLocationChange={setMapPosition} />
</TabsContent>
<TabsContent value="latlong">
<TagMissingLocationSearchLatLong onSubmit={onSubmit} onOpenChange={setOpen} />
<TagMissingLocationSearchLatLong onSubmit={onSubmit} onOpenChange={setOpen} location={mapPosition} onLocationChange={setMapPosition} />
</TabsContent>
<TabsContent value="google">
<div className="py-10 flex flex-col gap-6 items-center">
@@ -0,0 +1,188 @@
import ErrorBlock from "@/components/shared/ErrorBlock";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import Loader from "@/components/ui/loader";
import { useToast } from "@/components/ui/use-toast";
import { cn } from "@/lib/utils";
import { IPlace } from "@/types/common";
import axios from "axios";
import { Check } from "lucide-react";
import React, { useRef, useState } from "react";
interface ITagMissingLocationSearchAndAddProps {
onSubmit: (place: IPlace) => Promise<any>;
onOpenChange: (open: boolean) => void;
location: IPlace;
onLocationChange: (place: IPlace) => void;
}
export default function TagMissingLocationOSMSearchAndAdd(
{
onSubmit,
onOpenChange,
location,
onLocationChange
}: ITagMissingLocationSearchAndAddProps
) {
const { toast } = useToast();
const [searchedPlaces, setSearchedPlaces] = useState<IPlace[] | null>(null);
const searchTimer = useRef<NodeJS.Timeout>();
const [loading, setLoading] = useState(false);
const [submitting, setSubmitting] = useState(false);
const [selectedPlace, setSelectedPlace] = useState<IPlace | null>(null);
const searchPlaces = async (value: string) => {
try {
const response = await axios.get("https://nominatim.openstreetmap.org/search", {
params: {
q: value,
format: "json", // Response in JSON format
addressdetails: 1, // Include address details
limit: 1, // Limit the results to 1
},
});
if (response.data.length > 0) {
const data = (response.data) as Array<any>;
const places = data.map((result): IPlace => ({
name: result.display_name as string, // Full address or place name
latitude: parseFloat(result.lat),
longitude: parseFloat(result.lon),
}));
return places;
} else {
console.log("No results found for the location.");
return null;
}
} catch (error) {
console.error("Error fetching coordinates:", error);
return null;
}
}
const handleSearch = (value: string) => {
if (searchTimer.current) {
clearTimeout(searchTimer.current);
}
searchTimer.current = setTimeout(() => {
if (!value || !value.trim().length) {
setSearchedPlaces(null);
return;
}
setSelectedPlace(null);
setSearchedPlaces([]);
setLoading(true);
if (!value) {
setSearchedPlaces([]);
setLoading(false);
return;
}
return searchPlaces(value)
.then(setSearchedPlaces)
.finally(() => {
setLoading(false);
});
}, 500);
};
const handleSelect = (place: IPlace) => {
if (selectedPlace && selectedPlace.name === place.name) {
setSelectedPlace(null);
} else {
setSelectedPlace(place);
debugger;
onLocationChange(place);
}
};
const handleSubmit = () => {
if (!selectedPlace) {
return;
}
setSubmitting(true);
onSubmit(selectedPlace)
.then(() => {
toast({
title: "Location updated",
description: "Location updated successfully",
});
})
.then(() => {
onOpenChange(false);
setSelectedPlace(null);
})
.catch(() => {
toast({
title: "Error",
description: "Error updating location",
});
})
.finally(() => {
setSubmitting(false);
});
};
return (
<div className="flex flex-col gap-4 py-4 px-2">
<div className="flex flex-col gap-2">
<Label>Search Location</Label>
<Input
placeholder="Search location"
onChange={(e) => {
handleSearch(e.target.value);
}}
/>
</div>
<div>
{loading && <Loader />}
{!loading && searchedPlaces && searchedPlaces.length === 0 && (
<ErrorBlock description="No results found" />
)}
{!loading && searchedPlaces && searchedPlaces.length > 0 && (
<div className="flex flex-col gap-2 max-h-[400px] overflow-y-auto">
{searchedPlaces.map((place) => (
<div
key={place.name}
onClick={() => handleSelect(place)}
className={cn(
"hover:bg-zinc-900 flex justify-between items-center px-2 py-1 rounded-lg cursor-pointer",
{
"bg-zinc-900":
selectedPlace && selectedPlace.name === place.name,
}
)}
>
<div>
<p>{place.name}</p>
<span className="text-xs text-gray-600">
{place.latitude}, {place.longitude}
</span>
</div>
{selectedPlace && selectedPlace.name === place.name && (
<Check className="text-green-500" />
)}
</div>
))}
</div>
)}
</div>
<div className="self-end">
<Button
variant="outline"
onClick={handleSubmit}
disabled={!selectedPlace || submitting}
>
Add New Location
</Button>
</div>
</div>
)
}
@@ -1,3 +1,4 @@
import ErrorBlock from "@/components/shared/ErrorBlock";
import { Button } from "@/components/ui/button";
@@ -8,25 +9,30 @@ import { useToast } from "@/components/ui/use-toast";
import { searchPlaces } from "@/handlers/api/common.handler";
import { cn } from "@/lib/utils";
import { IPlace } from "@/types/common";
import clsx from "clsx";
import { Check } from "lucide-react";
import React, { useMemo, useRef, useState } from "react";
interface TagMissingLocationSearchLatLongProps {
onSubmit: (place: IPlace) => Promise<any>;
onOpenChange: (open: boolean) => void;
location: IPlace;
onLocationChange: (place: IPlace) => void;
}
export default function TagMissingLocationSearchLatLong(
{
onSubmit,
onOpenChange
onOpenChange,
location,
onLocationChange
}: TagMissingLocationSearchLatLongProps
) {
const { toast } = useToast();
const [formData, setFormData] = useState<IPlace>({
latitude: 0,
longitude: 0,
name: "",
latitude: location.latitude,
longitude: location.longitude,
name: location.name,
});
const [submitting, setSubmitting] = useState(false);
@@ -41,7 +47,8 @@ export default function TagMissingLocationSearchLatLong(
}, [formData]);
const handleChange = (key: string, value: string) => {
if (value.includes(",")) {
// if somebody pastes a combination of "lat, long"
if (key === "latitude" && value.includes(",")) {
const latLong = value.split(",");
if (latLong.length === 2) {
setFormData({
@@ -51,7 +58,6 @@ export default function TagMissingLocationSearchLatLong(
});
}
} else {
setFormData({
...formData,
[key]: value,
@@ -92,6 +98,16 @@ export default function TagMissingLocationSearchLatLong(
};
const handleBlur = () => {
const place :IPlace = {
name: formData.name,
latitude: parseFloat(formData.latitude as unknown as string),
longitude: parseFloat(formData.longitude as unknown as string)
};
onLocationChange(place);
}
return (
<div className="flex flex-col gap-4 py-4 px-2">
<div className="flex items-start gap-2">
@@ -103,6 +119,7 @@ export default function TagMissingLocationSearchLatLong(
onChange={(e) => {
handleChange("latitude", e.target.value);
}}
onBlur={(e) => handleBlur()}
/>
</div>
<div className="flex flex-col gap-2">
@@ -115,10 +132,11 @@ export default function TagMissingLocationSearchLatLong(
onChange={(e) => {
handleChange("longitude", e.target.value);
}}
onBlur={(e) => handleBlur()}
/>
</div>
</div>
<div className="self-end">
<Button
variant="outline"
+1 -1
View File
@@ -36,7 +36,7 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-6xl translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
className
)}
{...props}