fixes

Author: jain-aayush1123

here_location_services/destination_weather_api.py

@@ -5,8 +5,10 @@
 """  # noqa E501
 
 import time
-from datetime import datetime
-from typing import Any, Dict, List, Optional
+from datetime import date, datetime
+from typing import Any, Dict, List, Optional, Union
+
+from geojson import Feature, FeatureCollection, LineString, MultiPolygon, Point, Polygon
 
 from here_location_services.platform.auth import Auth
 
@@ -33,7 +35,7 @@ def get_dest_weather(
         at: Optional[List] = None,
         query: Optional[str] = None,
         zipcode: Optional[str] = None,
-        hourly_date: Optional[Any] = None,
+        hourly_date: Optional[Union[date, datetime]] = None,
         one_observation: Optional[bool] = None,
         language: Optional[str] = None,
         units: Optional[str] = None,
@@ -49,7 +51,8 @@ def get_dest_weather(
         :param query: Free text query. Examples: "125, Berliner, berlin", "Beacon, Boston"
         :param zipcode: ZIP code of the location. This parameter is supported only for locations in
             the United States of America.
-        :param hourly_date: Date for which hourly forecasts are to be retrieved.
+        :param hourly_date: Date for which hourly forecasts are to be retrieved. Can be either a `date` or
+            `datetime` object
         :param one_observation: Boolean, if set to true, the response only includes the closest
             location. Only available when the `product` parameter is set to
             `DEST_WEATHER_PRODUCT.observation`.
@@ -71,7 +74,10 @@ def get_dest_weather(
         if zipcode:
             params["zipCode"] = zipcode
         if hourly_date:
-            params["hourlyDate"] = hourly_date.strftime("%Y-%m-%dT%H:%M:%S")
+            if type(hourly_date) is datetime.date:
+                params["hourlyDate"] = hourly_date.strftime("%Y-%m-%d")
+            else:
+                params["hourlyDate"] = hourly_date.strftime("%Y-%m-%dT%H:%M:%S")
         if one_observation:
             params["oneObservation"] = "true" if one_observation else "false"
         if language:
@@ -87,9 +93,7 @@ def get_dest_weather(
 
     def get_weather_alerts(
         self,
-        feature_type: str,
-        geometry_type: str,
-        geometry_coordinates: List,
+        geometry: Union[Point, LineString, Polygon, MultiPolygon],
         start_time: datetime,
         id: Optional[str] = None,
         weather_severity: Optional[int] = None,
@@ -102,9 +106,8 @@ def get_weather_alerts(
 
         See further information `Here Destination Weather API <https://developer.here.com/documentation/destination-weather/dev_guide/topics/overview.html>_`.
 
-        :param feature_type: String to define feature type
-        :param geometry_type: Point or LineString or Polygon or MultiPolygon
-        :param geometry_coordinates: Array of coordinates corressponding to type provided
+        :param geometry: Point or LineString or Polygon or MultiPolygon defining the route or
+            a single location
         :param start_time: Start time of the event
         :param id: Unique weather alert id.
         :param weather_severity: Defines the severity of the weather event as defined
@@ -122,17 +125,6 @@ def get_weather_alerts(
 
         path = "v3/alerts"
         url = f"{self._base_url}/{path}"
-        data: Dict[str, Any] = {
-            "type": "FeatureCollection",
-        }
-        features: Dict[str, Any] = {
-            "type": feature_type,
-        }
-
-        if id:
-            features["id"] = id
-
-        geometry: Dict[str, Any] = {"type": geometry_type, "coordinates": geometry_coordinates}
 
         properties: Dict[str, Any] = {
             "width": width,
@@ -151,10 +143,19 @@ def get_weather_alerts(
             weather_warnings["endTime"] = time.mktime(end_time.timetuple())
 
         properties["warnings"] = [weather_warnings]
-        features["properties"] = properties
-        features["geometry"] = geometry
-        data["features"] = [features]
-        resp = self.post(url, data=data)
+
+        f = Feature(
+            geometry=geometry,
+            properties=properties,
+        )
+
+        if id:
+            f.id = id
+
+        feature_collection = FeatureCollection([])
+        feature_collection.features.append(f)
+
+        resp = self.post(url, data=feature_collection)
         if resp.status_code == 200:
             return resp
         else:

here_location_services/ls.py

@@ -6,9 +6,11 @@
 import os
 import urllib
 import urllib.request
-from datetime import datetime
+from datetime import date, datetime
 from time import sleep
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union
+
+from geojson import LineString, MultiPolygon, Point, Polygon
 
 from here_location_services.config.routing_config import Scooter, Via
 from here_location_services.platform.apis.aaa_oauth2_api import AAAOauth2Api
@@ -320,7 +322,7 @@ def get_dest_weather(
         at: Optional[List] = None,
         query: Optional[str] = None,
         zipcode: Optional[str] = None,
-        hourly_date: Optional[Any] = None,
+        hourly_date: Optional[Union[date, datetime]] = None,
         one_observation: Optional[bool] = None,
         language: Optional[str] = None,
         units: Optional[str] = None,
@@ -335,7 +337,8 @@ def get_dest_weather(
         :param query: Free text query. Examples: "125, Berliner, berlin", "Beacon, Boston"
         :param zipcode: ZIP code of the location. This parameter is supported only for locations in
             the United States of America.
-        :param hourly_date: Date for which hourly forecasts are to be retrieved.
+        :param hourly_date: Date for which hourly forecasts are to be retrieved. Can be either a
+            `date` or `datetime` object
         :param one_observation: Boolean, if set to true, the response only includes the closest
             location. Only available when the `product` parameter is set to
             `DEST_WEATHER_PRODUCT.observation`.
@@ -370,9 +373,7 @@ def get_dest_weather(
 
     def get_weather_alerts(
         self,
-        feature_type: str,
-        geometry_type: str,
-        geometry_coordinates: List,
+        geometry: Union[Point, LineString, Polygon, MultiPolygon],
         start_time: datetime,
         id: Optional[str] = None,
         weather_severity: Optional[int] = None,
@@ -384,9 +385,8 @@ def get_weather_alerts(
         """Retrieves weather reports, weather forecasts, severe weather alerts
             and moon and sun rise and set information.
 
-        :param feature_type: String to define feature type
-        :param geometry_type: Point or LineString or Polygon or MultiPolygon
-        :param geometry_coordinates: Array of coordinates corressponding to type provided
+        :param geometry: Point or LineString or Polygon or MultiPolygon defining the route or
+            a single location
         :param start_time: Start time of the event
         :param id: Unique weather alert id.
         :param weather_severity: Defines the severity of the weather event as defined
@@ -402,9 +402,7 @@ def get_weather_alerts(
         """
 
         resp = self.destination_weather_api.get_weather_alerts(
-            feature_type=feature_type,
-            geometry_type=geometry_type,
-            geometry_coordinates=geometry_coordinates,
+            geometry=geometry,
             id=id,
             weather_severity=weather_severity,
             weather_type=weather_type,

tests/test_ls.py

@@ -7,7 +7,7 @@
 import pandas as pd
 import pytest
 import pytz
-from geojson import FeatureCollection
+from geojson import FeatureCollection, Point
 
 from here_location_services import LS
 from here_location_services.config.autosuggest_config import POLITICAL_VIEW, SHOW, SearchCircle
@@ -63,18 +63,14 @@ def test_ls_weather_alerts():
     """Test weather alerts endpoint of destination weather api."""
     ls = LS(api_key=LS_API_KEY)
     resp = ls.get_weather_alerts(
-        feature_type="Feature",
-        geometry_type="Point",
-        geometry_coordinates=[15.256, 23.456],
+        geometry=Point(coordinates=[15.256, 23.456]),
         start_time=datetime.now(),
         width=3000,
     )
     assert resp
 
     resp2 = ls.get_weather_alerts(
-        feature_type="Feature",
-        geometry_type="Point",
-        geometry_coordinates=[15.256, 23.456],
+        geometry=Point(coordinates=[15.256, 23.456]),
         start_time=datetime.now(),
         weather_type=WEATHER_TYPE.ice,
         weather_severity=WEATHER_SEVERITY.high,
@@ -86,9 +82,7 @@ def test_ls_weather_alerts():
     with pytest.raises(ApiError):
         ls2 = LS(api_key="dummy")
         ls2.get_weather_alerts(
-            feature_type="Feature",
-            geometry_type="Point",
-            geometry_coordinates=[15.256, 23.456],
+            geometry=Point(coordinates=[15.256, 23.456]),
             start_time=datetime.now(),
         )
 

tests/test_ls_apis.py

@@ -6,6 +6,7 @@
 
 import pytest
 import requests
+from geojson import Point
 
 from here_location_services.config.dest_weather_config import DEST_WEATHER_PRODUCT
 from here_location_services.config.isoline_routing_config import (
@@ -34,9 +35,7 @@ def test_destination_weather(destination_weather_api):
 def test_weather_alerts(destination_weather_api):
     """Test Destination Weather api."""
     resp = destination_weather_api.get_weather_alerts(
-        feature_type="Feature",
-        geometry_type="Point",
-        geometry_coordinates=[15.256, 23.456],
+        geometry=Point(coordinates=[15.256, 23.456]),
         start_time=datetime.now(),
     )
     assert type(resp) == requests.Response