Get forecasts for an asset-id instead of passing location

flexmeasures_openweathermap/cli/commands.py

@@ -12,7 +12,7 @@
 from ..utils.modeling import (
     get_or_create_weather_station,
 )
-from ..utils.locating import get_locations, get_asset_id_location
+from ..utils.locating import get_locations, get_location_by_asset_id
 from ..utils.filing import make_file_path
 from ..utils.owm import (
     save_forecasts_in_db,
@@ -105,7 +105,7 @@ def add_weather_sensor(**args):
     "--asset-id",
     type=int,
     required=False,
-    help='Get location "latitude,longitude" for a given asset',
+    help="ID of a weather station asset - forecasts will be gotten for its location. If present, --location will be ignored."
 )
 @click.option(
     "--store-in-db/--store-as-json-files",
@@ -146,9 +146,13 @@ def collect_weather_data(location, asset_id, store_in_db, num_cells, method, reg
             "[FLEXMEASURES-OWM] Setting OPENWEATHERMAP_API_KEY not available."
         )
     if asset_id is not None:
-        locations = get_asset_id_location(asset_id)
-    else:
+        locations = [(get_location_by_asset_id(asset_id))]
+    elif location is not None:
         locations = get_locations(location, num_cells, method)
+    else:
+        raise Warning(
+            "[FLEXMEASURES-OWM] Pass either location or asset-id to get weather forecasts."
+        )
 
     # Save the results
     if store_in_db:

flexmeasures_openweathermap/utils/locating.py

@@ -4,7 +4,7 @@
 
 from flexmeasures.utils.grid_cells import LatLngGrid, get_cell_nums
 from flexmeasures import Sensor
-from flexmeasures.data.models.generic_assets import GenericAsset
+from flexmeasures.data.models.generic_assets import GenericAsset, GenericAssetType
 from flexmeasures.utils import flexmeasures_inflection
 
 from .. import WEATHER_STATION_TYPE_NAME
@@ -108,13 +108,21 @@ def find_weather_sensor_by_location_or_fail(
     return weather_sensor
 
 
-def get_asset_id_location(asset_id: int) -> List[Tuple[float, float]]:
+def get_location_by_asset_id(asset_id: int) -> Tuple[float, float]:
     """Get location for forecasting by passing an asset id"""
     asset = GenericAsset.query.filter(
         GenericAsset.generic_asset_type_id == asset_id
     ).one_or_none()
-    if asset is None:
+    if asset is not None:
+        asset_type = GenericAssetType.query.filter(
+            GenericAssetType.id == asset.generic_asset_type_id
+        ).one_or_none()
+        if asset_type.name != WEATHER_STATION_TYPE_NAME:
+            raise Exception(
+                "[FLEXMEASURES-OWM] Generic asset type name and weather station type name are not the same."
+            )
+    else:
         raise Exception(
             "[FLEXMEASURES-OWM] No asset found for the given asset id %s." % asset_id
         )
-    return [(asset.latitude, asset.longitude)]
+    return (asset.latitude, asset.longitude)