Module: data provider: make sure there is always a lat/lon (#2559)

* Module: make sure there is always a lat/lon in the data provider xibosignage/xibo#3428
xibosignage · Jun 10, 2024 · 6e9f12e · 6e9f12e
1 parent eb40d5d
commit 6e9f12e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 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/XTR/WidgetSyncTask.php b/lib/XTR/WidgetSyncTask.php
@@ -194,14 +194,11 @@ private function cache(
         $dataProvider->setMediaFactory($this->mediaFactory);
 
         // Set our provider up for the display
-        if ($display !== null) {
-            $dataProvider->setDisplayProperties($display->latitude, $display->longitude, $display->displayId);
-        } else {
-            $dataProvider->setDisplayProperties(
-                $this->getConfig()->getSetting('DEFAULT_LAT'),
-                $this->getConfig()->getSetting('DEFAULT_LONG')
-            );
-        }
+        $dataProvider->setDisplayProperties(
+            $display?->latitude ?: $this->getConfig()->getSetting('DEFAULT_LAT'),
+            $display?->longitude ?: $this->getConfig()->getSetting('DEFAULT_LONG'),
+            $display?->displayId ?? 0
+        );
 
         $widgetDataProviderCache = $this->moduleFactory->createWidgetDataProviderCache();
 

diff --git a/lib/Xmds/Soap.php b/lib/Xmds/Soap.php
@@ -928,8 +928,8 @@ protected function doRequiredFiles(
                                     //  this region?
                                     $dataProvider = $dataModule->createDataProvider($widget);
                                     $dataProvider->setDisplayProperties(
-                                        $this->display->latitude,
-                                        $this->display->longitude,
+                                        $this->display->latitude ?: $this->getConfig()->getSetting('DEFAULT_LAT'),
+                                        $this->display->longitude ?: $this->getConfig()->getSetting('DEFAULT_LONG'),
                                         $this->display->displayId
                                     );
 
@@ -2375,8 +2375,8 @@ protected function doGetResource(
                         // We only ever return cache.
                         $dataProvider = $dataModule->createDataProvider($widget);
                         $dataProvider->setDisplayProperties(
-                            $this->display->latitude,
-                            $this->display->longitude,
+                            $this->display->latitude ?: $this->getConfig()->getSetting('DEFAULT_LAT'),
+                            $this->display->longitude ?: $this->getConfig()->getSetting('DEFAULT_LONG'),
                             $this->display->displayId
                         );
 

diff --git a/lib/Xmds/Soap7.php b/lib/Xmds/Soap7.php
@@ -129,8 +129,8 @@ public function GetData($serverKey, $hardwareKey, $widgetId)
                 // We only ever return cache.
                 $dataProvider = $module->createDataProvider($widget);
                 $dataProvider->setDisplayProperties(
-                    $this->display->latitude,
-                    $this->display->longitude,
+                    $this->display->latitude ?: $this->getConfig()->getSetting('DEFAULT_LAT'),
+                    $this->display->longitude ?: $this->getConfig()->getSetting('DEFAULT_LONG'),
                     $this->display->displayId
                 );