Add fix to dashboard map zoom error. #424

config/routes/rider.yaml

@@ -61,3 +61,8 @@ rider_ajax_avialable:
     path: /riders/{id}/available
     controller: App\Controller\RiderController::ajaxAvailable
     methods: [GET]
+
+rider_ajax_rider_name:
+    path: /riders/rider_name
+    controller: App\Controller\RiderController::ajaxRiderName
+    methods: [GET]

public/assets/js/dashboard_map.js

@@ -163,7 +163,6 @@ class DashboardMap {
         );
 
         var marker_label = id + ' - ' + name;
-        console.log(marker_label);
 
         markers[id].bindTooltip(marker_label,
             {
@@ -231,7 +230,7 @@ class DashboardMap {
         );
     }
 
-    putRiderAvailableMarker(id, name, lat, lng) {
+    putRiderAvailableMarker(id, lat, lng, name) {
         this.putMarkerWithLabel(
             id,
             name,
@@ -244,7 +243,7 @@ class DashboardMap {
         );
     }
 
-    putRiderActiveJOMarker(id, name, lat, lng) {
+    putRiderActiveJOMarker(id, lat, lng, name) {
         this.putMarkerWithLabel(
             id,
             name,
@@ -306,9 +305,9 @@ class DashboardMap {
                 var name = data.name;
 
                 if (data.has_jo)
-                    my.putRiderActiveJOMarker(id, name, lat, lng);
+                    my.putRiderActiveJOMarker(id, lat, lng, name);
                 else
-                    my.putRiderAvailableMarker(id, name, lat, lng);
+                    my.putRiderAvailableMarker(id, lat, lng, name);
             });
 
             // console.log(rider_markers);

public/assets/js/map_mqtt.js

@@ -79,6 +79,15 @@ class MapEventHandler {
 
     handleRider(chan_split, payload) {
         // console.log("rider message");
+        // get rider name using chan_split[1] which is rider id
+        var rider_id = chan_split[1];
+        $.ajax({
+            method: "GET",
+            url: "{{ url('rider_ajax_rider_name') }}",
+            data: {id: rider_id}
+        }).done(function(response) {
+            var name = response.rider_name;
+            console.log('rider_name ' + name);
             switch (chan_split[2]) {
                 case "availability":
                     console.log("got availability for rider " + chan_split[1] + " - " + payload);
@@ -105,12 +114,12 @@ class MapEventHandler {
                                     case 'available':
                                         console.log('putting available marker ' + chan_split[1] + ' ' + lat + ':' + lng);
                                         dashmap.switchRiderStatus(chan_split[1], 'available');
-                                    dashmap.putRiderAvailableMarker(chan_split[1], lat, lng);
+                                        dashmap.putRiderAvailableMarker(chan_split[1], lat, lng, name);
                                         break;
                                     case 'unavailable':
                                         console.log('putting active jo marker ' + chan_split[1] + ' ' + lat + ':' + lng);
                                         dashmap.switchRiderStatus(chan_split[1], 'jo');
-                                    dashmap.putRiderActiveJOMarker(chan_split[1], lat, lng);
+                                        dashmap.putRiderActiveJOMarker(chan_split[1], lat, lng, name);
                                         break;
                                 }
                             });
@@ -142,7 +151,7 @@ class MapEventHandler {
                     // TODO: cache rider availability (available vs active jo) status and check before displaying icon
                     // NOTE: we really should fix our terms since available can mean many things
                     if (display_marker) {
-                    this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng);
+                        this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng, name);
                     }
                     break;
                 case "status":
@@ -161,6 +170,7 @@ class MapEventHandler {
                     }
                     break;
             }
+        });
     }
 
     handleJobOrder(chan_split, payload) {

src/Controller/RiderController.php

@@ -615,4 +615,18 @@ class RiderController extends Controller
         );
         return $response;
     }
+
+    public function ajaxRiderName(EntityManagerInterface $em, Request $req)
+    {
+        $rider_id = $req->query->get('id');
+
+        $rider = $em->getRepository(Rider::class)->find($rider_id);
+        $rider_name = '';
+        if ($rider != null)
+            $rider_name = $rider->getFullName();
+
+        return $this->json([
+            'rider_name' => $rider_name,
+        ]);
+    }
 }