ordering-ui-react-native 0.12.76 → 0.12.80

package/themes/original/src/components/MessageListing/styles.tsx

@@ -0,0 +1,16 @@
+import styled from 'styled-components/native'
+
+export const MessageListingWrapper = styled.View`
+  position: relative;
+`
+
+export const MessageContainer = styled.View`
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin: 0;
+  width: 100%;
+  height: 100%;
+`
+
+

package/themes/original/src/components/Messages/index.tsx

@@ -7,13 +7,12 @@ import { USER_TYPE } from '../../config/constants'
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
 import { OIcon, OIconButton, OText, OButton } from '../shared'
 import { TouchableOpacity, ActivityIndicator, StyleSheet, View, Platform, Keyboard } from 'react-native'
-import { Header, TitleHeader, Wrapper, QuickMessageContainer } from './styles'
+import { Header, TitleHeader, Wrapper, QuickMessageContainer, ProfileMessageHeader } from './styles'
 import { MessagesParams } from '../../types'
 import { useWindowDimensions } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 const MessagesUI = (props: MessagesParams) => {
-
 	const {
 		type,
 		order,
@@ -27,6 +26,7 @@ const MessagesUI = (props: MessagesParams) => {
 		setImage,
 		readMessages,
 		onClose,
+		isMeesageListing
 	} = props
 
 	const [{ user }] = useSession()
@@ -37,22 +37,22 @@ const MessagesUI = (props: MessagesParams) => {
 	const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])
 	const [isKeyboardShow, setIsKeyboardShow] = useState(false)
 	const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
-  const chatDisabled = previousStatus.includes(order?.status)
+	const chatDisabled = previousStatus.includes(order?.status)
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();
 
 	const theme = useTheme();
 
 	const quickMessageList = [
-    { key: 'customer_message_1', text: t('CUSTOMER_MESSAGE_1', 'Lorem ipsum 1') },
-    { key: 'customer_message_2', text: t('CUSTOMER_MESSAGE_2', 'Lorem ipsum 2') },
-    { key: 'customer_message_3', text: t('CUSTOMER_MESSAGE_3', 'Lorem ipsum 3') },
-    { key: 'customer_message_4', text: t('CUSTOMER_MESSAGE_4', 'Lorem ipsum 4') }
-  ]
+		{ key: 'customer_message_1', text: t('CUSTOMER_MESSAGE_1', 'Lorem ipsum 1') },
+		{ key: 'customer_message_2', text: t('CUSTOMER_MESSAGE_2', 'Lorem ipsum 2') },
+		{ key: 'customer_message_3', text: t('CUSTOMER_MESSAGE_3', 'Lorem ipsum 3') },
+		{ key: 'customer_message_4', text: t('CUSTOMER_MESSAGE_4', 'Lorem ipsum 4') }
+	]
 
-  const handleClickQuickMessage = (text: string) => {
-    setMessage && setMessage(`${message}${text}`)
-  }
+	const handleClickQuickMessage = (text: string) => {
+		setMessage && setMessage(`${message}${text}`)
+	}
 
 	const onChangeMessage = (val: string) => {
 		setMessage && setMessage(val)
@@ -239,37 +239,37 @@ const MessagesUI = (props: MessagesParams) => {
 	}
 
 	const renderAccessory = () => {
-    return (
-      <QuickMessageContainer
-        style={{
-          marginLeft: 10,
-          marginBottom: 10
-        }}
-        contentContainerStyle={{
-          alignItems: 'center',
-        }}
-        horizontal
-        showsHorizontalScrollIndicator={false}
-      >
-        {quickMessageList.map((quickMessage, i) => (
-          <OButton
-            key={i}
-            text={quickMessage.text}
-            bgColor='#E9ECEF'
-            borderColor='#E9ECEF'
-            imgRightSrc={null}
-            textStyle={{
-              fontSize: 11,
-              lineHeight: 16,
-              color: '#414954'
-            }}
-            style={{ ...styles.editButton }}
-            onClick={() => handleClickQuickMessage(quickMessage.text)}
-          />
-        ))}
-      </QuickMessageContainer>
-    )
-  }
+		return (
+			<QuickMessageContainer
+				style={{
+					marginLeft: 10,
+					marginBottom: 10
+				}}
+				contentContainerStyle={{
+					alignItems: 'center',
+				}}
+				horizontal
+				showsHorizontalScrollIndicator={false}
+			>
+				{quickMessageList.map((quickMessage, i) => (
+					<OButton
+						key={i}
+						text={quickMessage.text}
+						bgColor='#E9ECEF'
+						borderColor='#E9ECEF'
+						imgRightSrc={null}
+						textStyle={{
+							fontSize: 11,
+							lineHeight: 16,
+							color: '#414954'
+						}}
+						style={{ ...styles.editButton }}
+						onClick={() => handleClickQuickMessage(quickMessage.text)}
+					/>
+				))}
+			</QuickMessageContainer>
+		)
+	}
 
 	const renderInputToolbar = (props: typeof InputToolbarProps) => (
 		<InputToolbar
@@ -285,20 +285,20 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const renderComposer = (props: typeof ComposerProps) => (
 		chatDisabled ? (
-      <View
-        style={{
-          width: '100%',
-          flexDirection: 'column',
-          alignItems: 'center'
-        }}
-      >
-        <MaterialCommunityIcon
-          name='close-octagon-outline'
-          size={24}
-        />
-        <OText size={14}>{t('NOT_SEND_MESSAGES', 'You can\'t send messages because the order has ended')}</OText>
-      </View>
-    ) : (
+			<View
+				style={{
+					width: '100%',
+					flexDirection: 'column',
+					alignItems: 'center'
+				}}
+			>
+				<MaterialCommunityIcon
+					name='close-octagon-outline'
+					size={24}
+				/>
+				<OText size={14}>{t('NOT_SEND_MESSAGES', 'You can\'t send messages because the order has ended')}</OText>
+			</View>
+		) : (
 			<View style={{
 				flexDirection: 'row', width: '80%', alignItems: 'center', backgroundColor: theme.colors.backgroundGray100,
 				borderRadius: 7.6,
@@ -387,7 +387,7 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const getViewHeight = () => {
 		if (Platform.OS === 'android') {
-			return height - top - bottom - (isKeyboardShow ? 270 : 24);
+			return height - top - bottom - (isKeyboardShow ? 300 : 24);
 		} else {
 			return height - top - bottom - 10;
 		}
@@ -396,21 +396,53 @@ const MessagesUI = (props: MessagesParams) => {
 	return (
 		<View style={{ height: getViewHeight(), width: '100%', paddingTop: 12, backgroundColor: 'white' }}>
 			<Wrapper>
-				<Header>
-					<OIconButton icon={theme.images.general.arrow_left} style={{ paddingStart: 10, borderColor: theme.colors.clear }} onClick={onClose} />
-					<View style={{ marginRight: 10, shadowColor: theme.colors.black, shadowOpacity: 0.1, shadowOffset: { width: 0, height: 1 }, shadowRadius: 2 }}>
-						<OIcon
-							url={type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo}
-							width={32}
-							height={32}
-							style={{ borderRadius: 7.6 }}
-						/>
-					</View>
-					<TitleHeader>
-						<OText size={14} lineHeight={21} weight={'600'}>{type === USER_TYPE.DRIVER ? order?.driver?.name : order?.business?.name}</OText>
-						<OText size={12} color={theme.colors.textSecondary}>{type === USER_TYPE.DRIVER ? t('DRIVER', 'Driver') : t('BUSINESS', 'Business')}</OText>
-					</TitleHeader>
-				</Header>
+				{!isMeesageListing ? (
+					<Header>
+						<OIconButton icon={theme.images.general.arrow_left} style={{ paddingStart: 10, borderColor: theme.colors.clear }} onClick={onClose} />
+						<View style={{ marginRight: 10, shadowColor: theme.colors.black, shadowOpacity: 0.1, shadowOffset: { width: 0, height: 1 }, shadowRadius: 2 }}>
+							<OIcon
+								url={type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo}
+								width={32}
+								height={32}
+								style={{ borderRadius: 7.6 }}
+							/>
+						</View>
+						<TitleHeader>
+							<OText size={14} lineHeight={21} weight={'600'}>{type === USER_TYPE.DRIVER ? order?.driver?.name : order?.business?.name}</OText>
+							<OText size={12} color={theme.colors.textSecondary}>{type === USER_TYPE.DRIVER ? t('DRIVER', 'Driver') : t('BUSINESS', 'Business')}</OText>
+						</TitleHeader>
+					</Header>
+				) : (
+					<ProfileMessageHeader>
+						<View style={{ ...styles.headerTitle }}>
+							<TouchableOpacity
+								style={styles.headerItem}
+								onPress={onClose}>
+								<OIcon src={theme.images.general.arrow_left} width={16} />
+							</TouchableOpacity>
+							<OText size={18}>{t('ORDER', theme?.defaultLanguages?.ORDER || 'Order')} #{order?.id}</OText>
+						</View>
+						<View>
+							{order.business && (
+								<OIcon
+									url={order?.business?.logo}
+									width={32}
+									height={32}
+									style={{ borderRadius: 7.6 }}
+								/>
+							)}
+
+							{order?.driver && (
+								<OIcon
+									url={order?.driver?.photo}
+									width={32}
+									height={32}
+									style={{ borderRadius: 7.6 }}
+								/>
+							)}
+						</View>
+					</ProfileMessageHeader>
+				)}
 				<GiftedChat
 					messages={formattedMessages}
 					user={{
@@ -460,15 +492,25 @@ const styles = StyleSheet.create({
 		justifyContent: 'center',
 		marginHorizontal: 4
 	},
-  editButton : {
-    borderRadius: 50,
-    backgroundColor: '#E9ECEF',
-    marginRight: 10,
-    height: 24,
-    borderWidth: 1,
-    paddingLeft: 0,
-    paddingRight: 0
-  }
+	editButton: {
+		borderRadius: 50,
+		backgroundColor: '#E9ECEF',
+		marginRight: 10,
+		height: 24,
+		borderWidth: 1,
+		paddingLeft: 0,
+		paddingRight: 0
+	},
+	headerTitle: {
+		flexDirection: 'row',
+		alignItems: 'center'
+	},
+	headerItem: {
+		overflow: 'hidden',
+		width: 35,
+		marginVertical: 18,
+	}
+
 })
 
 export const Messages = (props: MessagesParams) => {

package/themes/original/src/components/Messages/styles.tsx

@@ -17,3 +17,11 @@ export const Header = styled.View`
 export const TitleHeader = styled.View``
 
 export const QuickMessageContainer = styled.ScrollView``
+
+export const ProfileMessageHeader = styled.View`
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 0px;
+  padding-horizontal: 20px;
+`

package/themes/original/src/components/UserProfile/index.tsx

@@ -13,6 +13,7 @@ import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native';
 import { ProfileParams } from '../../types';
 import { LogoutButton } from '../LogoutButton'
 import { LanguageSelector } from '../LanguageSelector'
+import MessageCircle from 'react-native-vector-icons/AntDesign'
 
 import {
 	OIcon,
@@ -78,6 +79,11 @@ const ProfileListUI = (props: ProfileParams) => {
 		pagePadding: {
 			paddingLeft: 40,
 			paddingRight: 40
+		},
+		messageIconStyle: {
+			fontSize: 18,
+			fontWeight: 'bold',
+            marginEnd: 14
 		}
 	});
 
@@ -150,6 +156,10 @@ const ProfileListUI = (props: ProfileParams) => {
 						<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_SAVED_PLACES', 'My saved places')}</OText>
 					</ListItem>
+					<ListItem onPress={() => onRedirect('Messages', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
+					</ListItem>
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>

package/themes/original/src/utils/index.tsx

@@ -177,4 +177,22 @@ export const getTypesText = (value: number) => {
  */
  export const convertToRadian = (value: number) => {
   return value * Math.PI / 180
+}
+
+/**
+ * Function to distance between two locations
+ * @param lat1 Lat for first location
+ * @param lon1 Lon for first location
+ * @param lat2 Lat for second location
+ * @param lon2 Lon for second location
+ */
+export const getDistance = (lat1: any, lon1: any, lat2: any, lon2: any) => {
+  const R = 6371 // km
+  const dLat = convertToRadian(lat2 - lat1)
+  const dLon = convertToRadian(lon2 - lon1)
+  const curLat1 = convertToRadian(lat1)
+  const curLat2 = convertToRadian(lat2)
+  const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(curLat1) * Math.cos(curLat2)
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+  return R * c
 }

package/themes/single-business/src/components/BusinessesListing/index.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
+import Geolocation from '@react-native-community/geolocation'
 import {
   View,
   StyleSheet,
@@ -28,6 +29,7 @@ import {
   TopHeader,
   DropOptionButton,
   WrapSearchBar,
+  FarAwayMessage
 } from './styles';
 
 import { SearchBar } from '../SearchBar';
@@ -41,6 +43,8 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { BusinessFeaturedController } from '../BusinessFeaturedController';
 import { getTypesText } from '../../utils';
 import NavBar from '../NavBar';
+import { getDistance } from '../../utils'
+import Ionicons from 'react-native-vector-icons/Ionicons'
 
 const PIXELS_TO_SCROLL = 1000;
 
@@ -97,6 +101,15 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
       height: 260,
       paddingHorizontal: 40
     },
+    iconStyle: {
+			fontSize: 18,
+			color: theme.colors.warning5,
+			marginRight: 8
+		},
+		farAwayMsg: {
+			paddingVertical: 6,
+			paddingHorizontal: 20
+		}
   });
 
 
@@ -109,6 +122,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
   const { top } = useSafeAreaInsets();
 
   const [featuredBusiness, setFeaturedBusinesses] = useState(Array);
+	const [isFarAway, setIsFarAway] = useState(false)
 
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || [];
 
@@ -135,6 +149,19 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
     }
   }, [businessesList.businesses]);
 
+  useEffect(() => {
+		Geolocation.getCurrentPosition((pos) => {
+      const crd = pos.coords
+      const distance = getDistance(crd.latitude, crd.longitude, orderState?.options?.address?.location?.lat, orderState?.options?.address?.location?.lng)
+      if (distance > 20) setIsFarAway(true)
+			else setIsFarAway(false)
+    }, (err) => {
+      console.log(`ERROR(${err.code}): ${err.message}`)
+    }, {
+      enableHighAccuracy: true, timeout: 15000, maximumAge: 10000
+    })
+  }, [orderState?.options?.address?.location])
+
   return (
     <ScrollView
       style={styles.container}
@@ -171,6 +198,12 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
             {orderState?.options?.address?.address}
           </OText>
         </AddressInput>
+        {isFarAway && (
+					<FarAwayMessage style={styles.farAwayMsg}>
+						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
+					</FarAwayMessage>
+				)}
         <OrderControlContainer>
           <View style={styles.wrapperOrderOptions}>
             <DropOptionButton

package/themes/single-business/src/components/BusinessesListing/styles.tsx

@@ -95,3 +95,12 @@ export const WrapSearchBar = styled.View`
   background-color: ${(props: any) => props.theme.colors.white};
   flex: 1;
 `
+
+export const FarAwayMessage = styled.View`
+  flex-direction: row;
+  align-items: center;
+	background-color: ${(props: any) => props.theme.colors.warning1};
+  border-radius: 7.6px;
+  border: 1px solid ${(props: any) => props.theme.colors.warning5};
+  width: 100%;
+`

package/themes/single-business/src/utils/index.tsx

@@ -251,3 +251,30 @@ export const getTextOrderStatus = (s: string, t: any) => {
   const objectStatus = orderStatus.find((o) => o.key === status)
   return objectStatus && objectStatus
 }
+
+/**
+ * Function to transform degree to radian
+ * @param {number} value for transform
+ *
+ */
+ export const convertToRadian = (value: number) => {
+  return value * Math.PI / 180
+}
+
+/**
+ * Function to distance between two locations
+ * @param lat1 Lat for first location
+ * @param lon1 Lon for first location
+ * @param lat2 Lat for second location
+ * @param lon2 Lon for second location
+ */
+ export const getDistance = (lat1: any, lon1: any, lat2: any, lon2: any) => {
+  const R = 6371 // km
+  const dLat = convertToRadian(lat2 - lat1)
+  const dLon = convertToRadian(lon2 - lon1)
+  const curLat1 = convertToRadian(lat1)
+  const curLat2 = convertToRadian(lat2)
+  const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(curLat1) * Math.cos(curLat2)
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+  return R * c
+}

package/themes/uber-eats/src/components/BusinessesListing/index.tsx

@@ -1,7 +1,10 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { View, StyleSheet, ScrollView, Platform, PanResponder, I18nManager } from 'react-native'
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
+import Geolocation from '@react-native-community/geolocation'
+import Ionicons from 'react-native-vector-icons/Ionicons'
+
 import {
   BusinessList as BusinessesListingController,
   useLanguage,
@@ -13,7 +16,7 @@ import {
   useToast
 } from 'ordering-components/native'
 
-import { BusinessListContainer, Divider, Search, OrderControlContainer, AddressInput, WrapMomentOption } from './styles'
+import { BusinessListContainer, Divider, Search, OrderControlContainer, AddressInput, WrapMomentOption, FarAwayMessage } from './styles'
 
 import NavBar from '../NavBar'
 import { SearchBar } from '../SearchBar'
@@ -27,6 +30,7 @@ import { OrderTypeSelector } from '../OrderTypeSelector'
 import { MomentOption } from '../MomentOption'
 import { HighestRatedBusinesses } from '../HighestRatedBusinesses'
 import { useTheme } from 'styled-components/native'
+import { getDistance } from '../../utils'
 
 const PIXELS_TO_SCROLL = 1200
 
@@ -61,7 +65,16 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
       borderColor: theme.colors.backgroundGray,
       borderWidth: 1,
       borderRadius: 10,
-    }
+    },
+    iconStyle: {
+			fontSize: 18,
+			color: theme.colors.warning5,
+			marginRight: 8
+		},
+		farAwayMsg: {
+			paddingVertical: 6,
+			paddingHorizontal: 20
+		}
   })
 
   const [, t] = useLanguage()
@@ -73,6 +86,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 
   const [openMomentOption, setOpenMomentOption] = useState(false)
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
+  const [isFarAway, setIsFarAway] = useState(false)
 
   const handleScroll = ({ nativeEvent }: any) => {
     const y = nativeEvent.contentOffset.y
@@ -85,6 +99,19 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
     }
   }
 
+  useEffect(() => {
+		Geolocation.getCurrentPosition((pos) => {
+      const crd = pos.coords
+      const distance = getDistance(crd.latitude, crd.longitude, orderState?.options?.address?.location?.lat, orderState?.options?.address?.location?.lng)
+      if (distance > 20) setIsFarAway(true)
+			else setIsFarAway(false)
+    }, (err) => {
+      console.log(`ERROR(${err.code}): ${err.message}`)
+    }, {
+      enableHighAccuracy: true, timeout: 15000, maximumAge: 10000
+    })
+  }, [orderState?.options?.address?.location])
+
   return (
     <BusinessListContainer>
       {!auth && (
@@ -114,6 +141,12 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
             style={{ marginRight: 10 }}
           />
         </AddressInput>
+        {isFarAway && (
+					<FarAwayMessage style={styles.farAwayMsg}>
+						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
+					</FarAwayMessage>
+				)}
         <View style={styles.wrapperOrderOptions}>
           <OrderTypeSelector configTypes={configTypes} />
           <WrapMomentOption

package/themes/uber-eats/src/components/BusinessesListing/styles.tsx

@@ -52,3 +52,11 @@ export const WrapMomentOption = styled.TouchableOpacity`
   margin-horizontal: 10px;
   max-width: 240px;
 `
+
+export const FarAwayMessage = styled.View`
+  flex-direction: row;
+  align-items: center;
+	background-color: ${(props: any) => props.theme.colors.warning1};
+  border-radius: 7.6px;
+  border: 1px solid ${(props: any) => props.theme.colors.warning5};
+`

package/themes/uber-eats/src/utils/index.tsx

@@ -162,3 +162,30 @@ export const transformCountryCode = (countryCode : number) => {
     return parser(value)
   }
 }
+
+/**
+ * Function to transform degree to radian
+ * @param {number} value for transform
+ *
+ */
+ export const convertToRadian = (value: number) => {
+  return value * Math.PI / 180
+}
+
+/**
+ * Function to distance between two locations
+ * @param lat1 Lat for first location
+ * @param lon1 Lon for first location
+ * @param lat2 Lat for second location
+ * @param lon2 Lon for second location
+ */
+ export const getDistance = (lat1: any, lon1: any, lat2: any, lon2: any) => {
+  const R = 6371 // km
+  const dLat = convertToRadian(lat2 - lat1)
+  const dLon = convertToRadian(lon2 - lon1)
+  const curLat1 = convertToRadian(lat1)
+  const curLat2 = convertToRadian(lat2)
+  const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(curLat1) * Math.cos(curLat2)
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+  return R * c
+}