Doormile/Doormilexpress_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates on the google change

Browse Source
This commit is contained in:
dharaneesh-r
2026-07-04 16:57:39 +05:30
parent cc901b4875
commit 89cf46ffb4
6 changed files with 102 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/pages/nearle/orders/createorder1.js
View File

@@ -34,6 +34,7 @@ import {
FormControlLabel
} from '@mui/material';
import CloseIcon from '@mui/icons-material/Close';
import { calculateDrivingDistance, calculateTotalCharge } from '../../../utils/distance';
import { Empty } from 'antd';
import { FaPhoneAlt } from 'react-icons/fa';
import { GiDoorHandle } from 'react-icons/gi';
@@ -619,66 +620,25 @@ const Createorder1 = () => {
};
const calculateDistance = async (pickup, drop) => {
const service = new google.maps.DistanceMatrixService();
const getDistanceMatrix = (origins, destinations, travelMode, unitSystem) => {
return new Promise((resolve, reject) => {
service.getDistanceMatrix(
{
origins: [new google.maps.LatLng(origins.latitude, origins.longitude)],
destinations: [new google.maps.LatLng(destinations.latitude, destinations.longitude)],
travelMode: travelMode,
unitSystem: unitSystem
},
(response, status) => {
if (status === 'OK') {
resolve(response);
} else {
reject(new Error(`Error calculating distance: ${status}`));
}
}
);
});
};
try {
// Use await to wait for the promise to resolve
const response = await getDistanceMatrix(pickup, drop, 'DRIVING', google.maps.UnitSystem.METRIC);
const roundedDistance = await calculateDrivingDistance(pickup, drop);
console.log('calculated distance in km:', roundedDistance);
setDistance(roundedDistance);
// Handle the response
const results = response.rows[0].elements;
for (let i = 0; i < results.length; i++) {
const element = results[i];
const distance = element.distance.value;
console.log('distance in m ', distance);
const distanceInKm = (distance / 1000).toFixed(2);
console.log('distance in km ', distanceInKm);
const roundedDistance = Math.round(distanceInKm);
console.log('roundedDistance', roundedDistance);
setDistance(roundedDistance);
if (roundedDistance < minKm) {
setTotalCharge(basePrice);
} else {
console.log('minKm', minKm);
console.log('pricePerKm', pricePerKm);
console.log('basePrice', basePrice);
const total = (roundedDistance - minKm) * pricePerKm + basePrice;
console.log('total', total);
setTotalCharge(total);
}
const total = calculateTotalCharge(roundedDistance, basePrice, pricePerKm, minKm);
console.log('total charge:', total);
setTotalCharge(total);
setShowDistance(true);
if (roundedDistance > appLocaRadius) {
setShowDistance(true);
if (roundedDistance > appLocaRadius) {
setShowDistance(true);
setOpen4(true);
}
// Extract the numerical value of the duration
const durationMatch = element.duration.text.match(/([\d.]+)/);
const duration = durationMatch ? parseInt(durationMatch[0]) : null;
// Display only the numerical values
console.log(`Distance: ${roundedDistance}, Duration: ${duration}`);
setOpen4(true);
}
// ⏱️ Approximate duration
const avgSpeed = 40; // km/h (adjust if needed)
const duration = Math.round((roundedDistance / avgSpeed) * 60); // minutes
console.log(`Distance: ${roundedDistance}, Duration: ${duration}`);
} catch (error) {
console.error('Error calculating distance:', error);
}

62
src/pages/nearle/orders/miltiUploadBackup.js
View File

@@ -17,6 +17,7 @@ dayjs.extend(utc);
import { enqueueSnackbar } from 'notistack';
import { useNavigate } from 'react-router';
import Papa from 'papaparse';
import { calculateDrivingDistance, calculateTotalCharge } from '../../../utils/distance';
import * as XLSX from 'xlsx';
import {
@@ -375,37 +376,6 @@ const MultipleOrders = () => {
// 🔹 Main distance calculation function
const calculateDistance = async (customer) => {
const service = new google.maps.DistanceMatrixService();
// Helper: safely get distance matrix
const getDistanceMatrix = (origins, destinations) => {
return new Promise((resolve, reject) => {
// 2;
try {
if (!origins || !destinations) {
return reject(new Error('Origin or destination data missing.'));
}
service.getDistanceMatrix(
{
origins: [new google.maps.LatLng(origins.latitude, origins.longitude)],
destinations: [new google.maps.LatLng(destinations.latitude, destinations.longitude)],
travelMode: 'DRIVING',
unitSystem: google.maps.UnitSystem.METRIC
},
(response, status) => {
if (status === 'OK') {
resolve(response);
} else {
reject(new Error(`Google API error: ${status}`));
}
}
);
} catch (err) {
reject(new Error(`Unexpected error inside DistanceMatrixService: ${err.message}`));
}
});
};
try {
// --- Input validation ---
if (!customer || typeof customer !== 'object') {
@@ -416,38 +386,18 @@ const MultipleOrders = () => {
throw new Error('Origin (pickCust) data missing or invalid.');
}
// --- Call Google Maps API ---
const response = await getDistanceMatrix(pickCust, customer);
// --- Validate response structure ---
if (!response.rows?.[0]?.elements?.[0] || !response.rows[0].elements[0].distance?.value) {
throw new Error('Malformed Distance Matrix response: missing distance value.');
}
// --- Compute distance ---
const distanceInMeters = response.rows[0].elements[0].distance.value;
const distanceInKilometers = distanceInMeters / 1000;
const roundedDistance = Math.round(distanceInKilometers);
const roundedDistance = await calculateDrivingDistance(pickCust, customer);
// --- Calculate total charge ---
let totalcharge;
if (roundedDistance < minKm) {
totalcharge = basePrice;
} else {
totalcharge = (roundedDistance - minKm) * pricePerKm + basePrice;
}
const totalcharge = calculateTotalCharge(roundedDistance, basePrice, pricePerKm, minKm);
return { roundedDistance, totalcharge };
} catch (error) {
// --- Categorized smart error handling ---
console.log('on calculateDistance', error.message);
if (error.message.includes('Google API')) {
console.log('🚨 Google Maps API Error:', error.message);
OpenToast('Invalid file format, upload valid file', 'error', 5000);
} else if (error.message.includes('Invalid coordinates')) {
console.log('📍 Invalid coordinate format:', error.message, 3000);
OpenToast('Invalid coordinate format. Check location data.', 'warning'), 3000;
} else if (error.message.includes('Malformed Distance Matrix')) {
console.log('⚠️ Unexpected Google response structure:', error.message);
OpenToast('Google Distance Matrix returned invalid data.', 'error', 3000);
if (error.message.includes('Invalid coordinates') || error.message.includes('Invalid coordinate')) {
console.log('📍 Invalid coordinate format:', error.message);
OpenToast('Invalid coordinate format. Check location data.', 'warning', 3000);
} else if (error.message.includes('Origin') || error.message.includes('customer')) {
console.log('❌ Missing or invalid input data:', error.message);
OpenToast('Missing or invalid input data for distance calculation.', 'warning', 3000);

61
src/pages/nearle/orders/multiOrderBackup.js
View File

@@ -16,6 +16,7 @@ var utc = require('dayjs/plugin/utc');
dayjs.extend(utc);
import { enqueueSnackbar } from 'notistack';
import { useNavigate } from 'react-router';
import { calculateDrivingDistance, calculateTotalCharge } from '../../../utils/distance';
import { GoogleMap, LoadScript, Marker } from '@react-google-maps/api';
import {
@@ -236,67 +237,13 @@ const MultipleOrders = () => {
// ========================================================= || calculateDistance || =========================================================
const calculateDistance = async (customer) => {
console.log('Distance calculation starts');
const service = new google.maps.DistanceMatrixService();
// Helper function to get the distance matrix
const getDistanceMatrix = async (origins, destinations) => {
console.log('origins', origins);
console.log('destinations', destinations);
return new Promise((resolve, reject) => {
console.log('calculation starts');
service.getDistanceMatrix(
{
origins: [new google.maps.LatLng(origins.latitude, origins.longitude)],
destinations: [new google.maps.LatLng(destinations.latitude, destinations.longitude)],
travelMode: 'DRIVING',
unitSystem: google.maps.UnitSystem.METRIC // Distances in metric units (km)
},
(response, status) => {
console.log('cal response', response);
console.log('cal status', status);
if (status === 'OK') {
console.log('calcualtion resolved');
resolve(response);
} else {
console.log('calcualtion rejected');
reject(new Error(`Error calculating distance: ${status}`));
}
}
);
});
};
try {
// Call getDistanceMatrix and wait for the response
const response = await getDistanceMatrix(pickCust, customer);
// Extract distance from the first result
const distanceInMeters = response.rows[0].elements[0].distance.value;
// Convert distance from meters to kilometers
const distanceInKilometers = distanceInMeters / 1000;
// Round the distance to the nearest integer
const roundedDistance = Math.round(distanceInKilometers);
let totalcharge;
if (roundedDistance < minKm) {
console.log('minKm', minKm);
console.log('pricePerKm', pricePerKm);
console.log('basePrice', basePrice);
totalcharge = basePrice;
} else {
console.log('minKm', minKm);
console.log('pricePerKm', pricePerKm);
console.log('basePrice', basePrice);
totalcharge = (roundedDistance - minKm) * pricePerKm + basePrice;
console.log('totalcharge', totalcharge);
}
// Return the rounded distance
const roundedDistance = await calculateDrivingDistance(pickCust, customer);
const totalcharge = calculateTotalCharge(roundedDistance, basePrice, pricePerKm, minKm);
return { roundedDistance, totalcharge };
} catch (error) {
console.error('Error calculating distance:', error);
throw error; // Rethrow the error to be handled by the caller
throw error;
}
};

44
src/pages/nearle/orders/multipleOrders.js
View File

@@ -7,6 +7,7 @@ import { useNavigate } from 'react-router';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import { enqueueSnackbar } from 'notistack';
import { calculateDrivingDistance, calculateTotalCharge } from '../../../utils/distance';
import {
FormControl,
@@ -238,46 +239,21 @@ const MultipleOrders = () => {
}, [dropCust]);
// ============================== distance (Google) ==============================
// ============================== distance (OSRM/Haversine) ==============================
const calculateDistance = async (customer) => {
if (typeof window === 'undefined' || !window.google?.maps?.DistanceMatrixService) {
throw new Error('Google Maps not loaded');
}
const service = new window.google.maps.DistanceMatrixService();
const getDistanceMatrix = (origins, destinations) =>
new Promise((resolve, reject) => {
try {
if (!origins || !destinations) return reject(new Error('Origin or destination data missing.'));
service.getDistanceMatrix(
{
origins: [new window.google.maps.LatLng(origins.latitude, origins.longitude)],
destinations: [new window.google.maps.LatLng(destinations.latitude, destinations.longitude)],
travelMode: 'DRIVING',
unitSystem: window.google.maps.UnitSystem.METRIC
},
(response, status) => {
if (status === 'OK') resolve(response);
else reject(new Error(`Google API error: ${status}`));
}
);
} catch (err) {
reject(new Error(`Unexpected error inside DistanceMatrixService: ${err.message}`));
}
});
try {
if (!customer || typeof customer !== 'object') throw new Error('Invalid customer data.');
if (!pickCust || typeof pickCust !== 'object') throw new Error('Origin (pickCust) data missing or invalid.');
const response = await getDistanceMatrix(pickCust, customer);
const distVal = response?.rows?.[0]?.elements?.[0]?.distance?.value;
if (distVal == null) throw new Error('Malformed Distance Matrix response: missing distance value.');
const km = distVal / 1000;
const roundedDistance = Math.round(km);
const totalcharge = roundedDistance < minKm ? basePrice : (roundedDistance - minKm) * pricePerKm + basePrice;
const roundedDistance = await calculateDrivingDistance(pickCust, customer);
const totalcharge = calculateTotalCharge(roundedDistance, basePrice, pricePerKm, minKm);
return { roundedDistance, totalcharge };
} catch (error) {
if (error.message.includes('Google API')) OpenToast('Invalid coordinates or Google API error.', 'error', 3000);
else if (error.message.includes('Malformed')) OpenToast('Google Distance Matrix returned invalid data.', 'error', 3000);
else OpenToast('Unexpected error during distance calculation.', 'error', 3000);
if (error.message.includes('Origin') || error.message.includes('customer') || error.message.includes('coordinates')) {
OpenToast('Missing or invalid input data for distance calculation.', 'warning', 3000);
} else {
OpenToast('Unexpected error during distance calculation.', 'error', 3000);
}
throw error;
}
};