Module: data provider lat/lng might return null if it has not ever ne…

…ed set on a display (#2558) xibosignage/xibo#3428
xibosignage · Jun 10, 2024 · eb40d5d · eb40d5d
1 parent 5f8f8b7
commit eb40d5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/Connector/OpenWeatherMapConnector.php b/lib/Connector/OpenWeatherMapConnector.php
@@ -151,8 +151,8 @@ private function getWeatherData(DataProviderInterface $dataProvider)
         }
 
         // Build the URL
-        $url = '?lat=' . $providedLat
-            . '&lon=' . $providedLon
+        $url = '?lat=' . ($providedLat ?? '')
+            . '&lon=' . ($providedLon ?? '')
             . '&units=' . $units
             . '&lang=' . $dataProvider->getProperty('lang', 'en')
             . '&appid=[API_KEY]';

diff --git a/lib/Widget/Provider/DataProvider.php b/lib/Widget/Provider/DataProvider.php
@@ -162,15 +162,15 @@ public function getDisplayId(): int
     /**
      * @inheritDoc
      */
-    public function getDisplayLatitude(): float
+    public function getDisplayLatitude(): ?float
     {
         return $this->latitude;
     }
 
     /**
      * @inheritDoc
      */
-    public function getDisplayLongitude(): float
+    public function getDisplayLongitude(): ?float
     {
         return $this->longitude;
     }

diff --git a/lib/Widget/Provider/DataProviderInterface.php b/lib/Widget/Provider/DataProviderInterface.php
@@ -61,15 +61,15 @@ public function getDisplayId(): int;
 
     /**
      * Get the latitude for this display
-     * @return float
+     * @return float|null
      */
-    public function getDisplayLatitude(): float;
+    public function getDisplayLatitude(): ?float;
 
     /**
      * Get the longitude for this display
-     * @return float
+     * @return float|null
      */
-    public function getDisplayLongitude(): float;
+    public function getDisplayLongitude(): ?float;
 
     /**
      * Get the preview flag