From 505f6630f5e23deed003abc42e49a7fe8015e815 Mon Sep 17 00:00:00 2001
From: Nezumi2711 <73208452+Nezumi2711@users.noreply.github.com>
Date: Wed, 22 Jun 2022 09:17:14 +0700
Subject: [PATCH] Fix direction google map

---
 FoodifyServer/app/src/main/AndroidManifest.xml              | 2 +-
 .../com/waterbase/foodifyServer/Remote/IGeoCoordinates.java | 5 +++--
 .../java/com/waterbase/foodifyServer/TrackingOrder.java     | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/FoodifyServer/app/src/main/AndroidManifest.xml b/FoodifyServer/app/src/main/AndroidManifest.xml
index 882285b..a36fc99 100644
--- a/FoodifyServer/app/src/main/AndroidManifest.xml
+++ b/FoodifyServer/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyApaoTIiQj-faYEkJuSlJoTHTZFC4L8CbM" />
+            android:value="AIzaSyCqmoLlawoQzmwjZI2_Yo_V33An_nNZADs" />
 
         <activity
             android:name=".TrackingOrder"
diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/IGeoCoordinates.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/IGeoCoordinates.java
index 1ca1401..db47e1f 100644
--- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/IGeoCoordinates.java
+++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/IGeoCoordinates.java
@@ -6,8 +6,9 @@ import retrofit2.http.Query;
 
 public interface IGeoCoordinates {
     @GET("maps/api/geocode/json")
-    Call<String> getGeoCode(@Query("address") String address);
+    Call<String> getGeoCode(@Query("address") String address, @Query("key") String key);
 
     @GET("maps/api/directions/json")
-    Call<String> getDirections(@Query("origin") String origin, @Query("destination") String destination);
+    Call<String> getDirections(@Query("origin") String origin, @Query("destination") String destination,
+                               @Query("key") String key);
 }
diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/TrackingOrder.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/TrackingOrder.java
index ad78c40..e33ed87 100644
--- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/TrackingOrder.java
+++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/TrackingOrder.java
@@ -68,6 +68,8 @@ public class TrackingOrder extends FragmentActivity implements OnMapReadyCallbac
     private static int FATEST_INTERVAL = 5000;
     private static int DISPLACEMENT = 10;
 
+    private static String MAP_API = "AIzaSyCqmoLlawoQzmwjZI2_Yo_V33An_nNZADs";
+
     private IGeoCoordinates mService;
 
     @Override
@@ -127,7 +129,7 @@ public class TrackingOrder extends FragmentActivity implements OnMapReadyCallbac
     }
 
     private void drawRoute(LatLng yourLocation, String address) {
-        mService.getGeoCode(address).enqueue(new Callback<String>() {
+        mService.getGeoCode(address, MAP_API).enqueue(new Callback<String>() {
             @Override
             public void onResponse(Call<String> call, Response<String> response) {
                 try {
@@ -157,7 +159,7 @@ public class TrackingOrder extends FragmentActivity implements OnMapReadyCallbac
 
                     //draw route
                     mService.getDirections(yourLocation.latitude + ", " + yourLocation.longitude,
-                            orderLocation.latitude + ", " + orderLocation.longitude)
+                            orderLocation.latitude + ", " + orderLocation.longitude, MAP_API)
                             .enqueue(new Callback<String>() {
                                 @Override
                                 public void onResponse(Call<String> call, Response<String> response) {