Merge pull request #59 from gjohansson-ST/mod-camera

Modifications camera

Author: gjohansson-ST

pytrafikverket/trafikverket_camera.py

@@ -109,7 +109,7 @@ def __init__(self, client_session: aiohttp.ClientSession, api_key: str) -> None:
         """Initialize Camera object."""
         self._api = Trafikverket(client_session, api_key)
 
-    async def async_get_camera(self, location_name: str) -> CameraInfo:
+    async def async_get_camera(self, search_string: str) -> CameraInfo:
         """Retrieve camera from API."""
         cameras = await self._api.async_make_request(
             "Camera",
@@ -118,9 +118,9 @@ async def async_get_camera(self, location_name: str) -> CameraInfo:
             [
                 OrFilter(
                     [
-                        FieldFilter(FilterOperation.LIKE, "Name", location_name),
-                        FieldFilter(FilterOperation.LIKE, "Location", location_name),
-                        FieldFilter(FilterOperation.EQUAL, "Id", location_name),
+                        FieldFilter(FilterOperation.LIKE, "Name", search_string),
+                        FieldFilter(FilterOperation.LIKE, "Location", search_string),
+                        FieldFilter(FilterOperation.LIKE, "Id", search_string),
                     ]
                 )
             ],
@@ -132,18 +132,18 @@ async def async_get_camera(self, location_name: str) -> CameraInfo:
 
         return CameraInfo.from_xml_node(cameras[0])
 
-    async def async_get_cameras(self, location_name: str) -> CameraInfo:
-        """Retrieve camera from API."""
+    async def async_get_cameras(self, search_string: str) -> CameraInfo:
+        """Retrieve multipple cameras from API."""
         cameras = await self._api.async_make_request(
             "Camera",
             "1.0",
             CAMERA_INFO_REQUIRED_FIELDS,
             [
                 OrFilter(
                     [
-                        FieldFilter(FilterOperation.LIKE, "Name", location_name),
-                        FieldFilter(FilterOperation.LIKE, "Location", location_name),
-                        FieldFilter(FilterOperation.EQUAL, "Id", location_name),
+                        FieldFilter(FilterOperation.LIKE, "Name", search_string),
+                        FieldFilter(FilterOperation.LIKE, "Location", search_string),
+                        FieldFilter(FilterOperation.LIKE, "Id", search_string),
                     ]
                 )
             ],