Minor tweak to address stuff

visiks-vs · Aug 6, 2021 · 54f9e61 · 54f9e61
1 parent a9b793b
commit 54f9e61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/bot/logic/geo_api.php b/core/bot/logic/geo_api.php
@@ -170,7 +170,11 @@ function get_address($lat, $lon)
             if(isset($data['address']['city_district']) && !empty($data['address']['city_district'])) {
                 $location['district'] = $data['address']['city_district'];
             }elseif(isset($data['address']['city']) && !empty($data['address']['city'])) {
-                $location['district'] = $data['address']['city'];
+                if(isset($data['address']['town']) && $data['address']['town'] != $data['address']['city']) {
+                    $location['district'] = $data['address']['town'] . ', ' . $data['address']['city'];
+                } else {
+                    $location['district'] = $data['address']['city'];
+                }
             }elseif(isset($data['address']['town']) && !empty($data['address']['town'])) {
                 $location['district'] = $data['address']['town'];
             }elseif(isset($data['address']['village']) && !empty($data['address']['village'])) {

diff --git a/logic/mapslink.php b/logic/mapslink.php
@@ -21,7 +21,7 @@ function mapslink($gym, $gym_address = '0'){
   switch ($gym_address) {
     case '1':
       //using gym address as maps link
-      $gym['address'] = 'https://www.google.com/maps?daddr=' . $gym['lat'] . ',' . $gym['lon'];
+      $gym['address'] = 'https://maps.google.com/?daddr=' . $gym['lat'] . ',' . $gym['lon'];
       break;
     case '0':
       // do nothing -> getting default address from gym/raid