Driver side (was a stub): - In-app driver onboarding: a driver-role user creates their own linked drivers profile (driver/profile+api GET/POST/PATCH). - Driver dashboard: online/offline toggle, today's earnings, incoming request cards (accept/decline), active ride panel (start/complete trip). Polls /driver/rides every 4s while online. - Location heartbeat (use-driver-location): watchPositionAsync pings /driver/location every ~5s; restarts the watch on app foreground so a backgrounded driver doesn't go permanently stale and miss requests. Dispatch (auto-match nearest, Uber-style): - Ride state machine: requested -> accepted -> en_route -> completed/cancelled with a nullable driver_id until matched (lib/dispatch.matchNextDriver). - matchNextDriver locks the ride (SELECT FOR UPDATE), expires 15s-stale offers, picks the nearest eligible driver of the matching service by haversine, offers one at a time. Called from ride/create, ride/[id] GET (lazy match on the rider's poll), and ride/[id]/respond (on decline). - ride/create is now a request endpoint (driver_id NULL, status=requested, service); drops the pre-match driver_id payment reconciliation. - ride/[id] GET returns status/service/nullable driver; PATCH handles rider cancel + driver en_route/completed. ride/list backs the history tabs. Rider flow (best experience): - confirm-ride is now a request screen: single trip fare + nearest-driver ETA + cash/card + Request Ride -> live status. Periodically polls online drivers of the selected service and disables Request when none are online (prevents the "stuck searching forever" state). - book-ride is the live ride-status screen (searching -> accepted -> en_route -> completed/cancelled + Cancel), polling every 3s. - lib/request-ride unifies the Areeba card flow + cash path. - Map reads /driver/nearby (real positions, service-filtered); lib/map adds calculateTripFare + service-aware fares. POI suggestions: - lib/places (Google Nearby Search) + nearby-suggestions chips for mall/hospital/pharmacy/restaurant on the home screen. Service categories now drive both matching and a per-service fare multiplier (car 1.0 / moto 0.7 / courier 0.85 / chauffeur 1.5). Map tiles: react-native-maps rendered blank on Android because no Google Maps key was set. Switched app.json -> app.config.js so android.config.googleMaps.apiKey is injected from EXPO_PUBLIC_GOOGLE_API_KEY at build time (keeps the key out of git). Requires a native rebuild (expo run:android) to take effect. Also includes the prior payment/auth hardening (server-authoritative payment_orders ledger with double-spend guards, peppered OTP, register TOCTOU fix, stats cents fix) that was left uncommitted. Co-Authored-By: Claude <noreply@anthropic.com>
86 lines
2.9 KiB
TypeScript
86 lines
2.9 KiB
TypeScript
// Google Places (New) Nearby Search — powers the "nearby mall / hospital /
|
|
// pharmacy / restaurant" destination chips on the home screen. Reuses the same
|
|
// API key and header pattern as the autocomplete in components/google-text-input.
|
|
|
|
import { haversine } from "@/lib/utils";
|
|
import type { NearbyPlace } from "@/types/type";
|
|
|
|
const googleApiKey = process.env.EXPO_PUBLIC_GOOGLE_API_KEY!;
|
|
|
|
// The four POI categories surfaced as quick destination chips. Each maps to a
|
|
// Google Places (New) `includedTypes` value.
|
|
export type PoiCategory = {
|
|
id: "mall" | "hospital" | "pharmacy" | "restaurant";
|
|
label: string;
|
|
/** MaterialCommunityIcons glyph name. */
|
|
icon: string;
|
|
googleType: string;
|
|
};
|
|
|
|
export const POI_CATEGORIES: PoiCategory[] = [
|
|
{ id: "mall", label: "Mall", icon: "shopping-mall", googleType: "shopping_mall" },
|
|
{ id: "hospital", label: "Hospital", icon: "hospital", googleType: "hospital" },
|
|
{ id: "pharmacy", label: "Pharmacy", icon: "pill", googleType: "pharmacy" },
|
|
{ id: "restaurant", label: "Restaurant", icon: "silverware-fork-knife", googleType: "restaurant" },
|
|
];
|
|
|
|
const DEFAULT_RADIUS_M = 4000;
|
|
|
|
// Searches for the nearest place of `googleType` around (latitude, longitude)
|
|
// and returns it as a NearbyPlace with its distance from the rider. Returns
|
|
// null when no place of that type is found nearby — the chip then shows an
|
|
// empty state rather than a broken one.
|
|
export const searchNearby = async (
|
|
googleType: string,
|
|
{
|
|
latitude,
|
|
longitude,
|
|
radiusM = DEFAULT_RADIUS_M,
|
|
}: { latitude: number; longitude: number; radiusM?: number },
|
|
): Promise<NearbyPlace | null> => {
|
|
try {
|
|
const res = await fetch(
|
|
"https://places.googleapis.com/v1/places:searchNearby",
|
|
{
|
|
method: "POST",
|
|
headers: {
|
|
"Content-Type": "application/json",
|
|
"X-Goog-Api-Key": googleApiKey,
|
|
"X-Goog-FieldMask":
|
|
"places.displayName,places.formattedAddress,places.location,places.id",
|
|
},
|
|
body: JSON.stringify({
|
|
includedTypes: [googleType],
|
|
languageCode: "en",
|
|
regionCode: "lb",
|
|
locationRestriction: {
|
|
circle: {
|
|
center: { latitude, longitude },
|
|
radius: radiusM,
|
|
},
|
|
},
|
|
}),
|
|
},
|
|
);
|
|
const data = await res.json();
|
|
const place = data.places?.[0];
|
|
if (!place) return null;
|
|
|
|
const lat = place.location?.latitude as number;
|
|
const lng = place.location?.longitude as number;
|
|
|
|
return {
|
|
name: (place.displayName?.text as string) ?? "Nearby place",
|
|
address: (place.formattedAddress as string) ?? "",
|
|
latitude: lat,
|
|
longitude: lng,
|
|
distanceMeters:
|
|
Number.isFinite(lat) && Number.isFinite(lng)
|
|
? haversine(latitude, longitude, lat, lng)
|
|
: undefined,
|
|
};
|
|
} catch (error) {
|
|
console.log("[PLACES_NEARBY]: ", error);
|
|
return null;
|
|
}
|
|
}; |