Merge pull request #76 from fleetbase/hotfix/distance-matrix-definition

hotfix: `DistanceMatrix` definition
fleetbase · Feb 15, 2024 · b9d0b40 · b9d0b40
2 parents 2703d5c + 53caa42
commit b9d0b40
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.10",
+    "version": "0.4.11",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.10",
+    "version": "0.4.11",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.10",
+    "version": "0.4.11",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

diff --git a/server/src/Support/DistanceMatrix.php b/server/src/Support/DistanceMatrix.php
@@ -17,9 +17,9 @@
 class DistanceMatrix
 {
     public ?float $distance;
-    public ?int $time;
+    public ?float $time;
 
-    public function __construct(?float $distance, ?int $time)
+    public function __construct(?float $distance, ?float $time)
     {
         $this->distance = $distance;
         $this->time     = $time;

diff --git a/server/src/Support/Utils.php b/server/src/Support/Utils.php
@@ -783,8 +783,8 @@ function ($destination) {
             ]
         )->json();
 
-        $distance = data_get($response, 'rows.0.elements.0.distance.value');
-        $time     = data_get($response, 'rows.0.elements.0.duration.value');
+        $distance = (float) data_get($response, 'rows.0.elements.0.distance.value', 0);
+        $time     = (float) data_get($response, 'rows.0.elements.0.duration.value', 0);
 
         $result = static::createObject(
             [
@@ -812,7 +812,7 @@ public static function calculateDrivingDistanceAndTime($origin, $destination): D
         $destination = static::getPointFromMixed($destination);
 
         $distance = Utils::vincentyGreatCircleDistance($origin, $destination);
-        $time     = round($distance / 100) * self::DRIVING_TIME_MULTIPLIER;
+        $time     = (float) round($distance / 100) * self::DRIVING_TIME_MULTIPLIER;
 
         return new DistanceMatrix($distance, $time);
     }