Use _getStation()

horde · Aug 13, 2016 · 5e610be · 5e610be
1 parent 010009d
commit 5e610be
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Metar.php b/framework/Service_Weather/lib/Horde/Service/Weather/Metar.php
@@ -222,9 +222,13 @@ public function searchLocations(
         $location,
         $type = Horde_Service_Weather::SEARCHTYPE_STANDARD)
     {
-        return new Horde_Service_Weather_Station(array(
-            'code' => $location
-        ));
+        try {
+            return $this->_getStation($location);
+        } catch (Horde_Exception_NotFound $e) {
+            return new Horde_Service_Weather_Station(array(
+                'code' => $location
+            ));
+        }
     }
 
     /**
@@ -319,6 +323,7 @@ protected function _getLocations()
      *
      * @return Horde_Service_Weather_Station  The station object.
      * @throws  Horde_Service_Weather_Exception
+     * @throws  Horde_Exception_NotFound
      */
     protected function _getStation($code)
     {
@@ -336,6 +341,10 @@ protected function _getStation($code)
             throw new Horde_Service_Weather_Exception($e);
         }
 
+        if (empty($result)) {
+            throw new Horde_Exception_NotFound();
+        }
+
         return new Horde_Service_Weather_Station(array(
             'name' => $result['name'],
             'code' => $code,