fix timezone and location detection for dayloght detection under special cirumstances were country was england by default choosen. (#208)

Author: OliverDrechsler

camera/camera.py

@@ -386,7 +386,7 @@ def detect_daylight(self) -> bool:
         Detects whether it is currently daylight based on sunrise and sunset times.
 
         The method uses either the configured coordinates (latitude and longitude)
-        or the configured location to calculate sun times.
+        or the configured country to calculate sun times.
 
         Returns:
             bool: True if it is daylight (between sunrise and sunset),
@@ -399,17 +399,19 @@ def detect_daylight(self) -> bool:
             if (self.config.lat is not None and self.config.lon is not None):
                 self.logger.debug("using coordinates for daylight detection")
                 location = LocationInfo(
+                    name=self.config.city,
+                    region=self.config.country,
                     latitude=self.config.lat,
                     longitude=self.config.lon,
                     timezone=self.config.timezone
                 )
                 s = sun(location.observer, date=local_date)
-            elif self.config.location is not None:
-                self.logger.debug("using location - city for daylight detection")
-                location = LocationInfo(name=self.config.location)
+            elif self.config.country is not None:
+                self.logger.debug("using country - city for daylight detection")
+                location = LocationInfo(name=self.config.country)
                 s = sun(location.observer, date=local_date)
             else:
-                raise ValueError("No valid location data provided")
+                raise ValueError("No valid country data provided")
 
             self.logger.debug(f"Sunrise: {s['sunrise']}, Sunset: {s['sunset']}")
             time_now = datetime.now(tz=ZoneInfo(self.config.timezone))  # Konvertiere String zu ZoneInfo

config/config_util.py

@@ -52,10 +52,11 @@ def __init__(self) -> None:
         self.photo_image_path: str = self.config["photo_general"]["image_path"]
         self.default_camera_type = DefaultCam(self.config["photo_general"]["default_camera_type"].upper())
         self.enable_detect_daylight: bool = self.config["photo_general"]["enable_detect_daylight"]
-        self.timezone: str = self.config["photo_general"]["timezone"]
-        self.location: str = self.config["photo_general"]["location"]
+        self.timezone: str = self.config["photo_general"]["timezone"]  # Timezone name for daylight detection
+        self.country: str = self.config["photo_general"]["country"]  # Country name for timezone and daylight detection
+        self.city: str = self.config["photo_general"].get("city", None)  # City name for timezone and daylight detection
         self.lat: float = self.config["photo_general"].get("lat", None)  # optional value see config_template.yaml for more information
-        self.lon: float = self.config["photo_general"].get("lat", None)  # optional value see config_template.yaml for more information
+        self.lon: float = self.config["photo_general"].get("lon", None)  # optional value see config_template.yaml for more information
         self.image_brightness: float = self.config["photo_general"].get("brightness_enhancer", None)  # optional value see config_template.yaml for more information
         self.image_contrast: float = self.config["photo_general"].get("contrast_enhancer", None)  # optional value see config_template.yaml for more information
 

config_template.yaml

@@ -28,12 +28,14 @@ photo_general:
   default_camera_type: "blink"  # "blink" or "picam" careful - case senitive
   image_path: "/tmp/foto.jpg"   # path where downloaded foto from camera get intermediate stored
   timezone: "Europe/Berlin" # timezone for daylight detection
-  location: "Berlin" # location for daylight detection
-  lat: 1.1111111 # latitude for sunrise/sunset calculation if wanted based on lat  instead of location timezone 
-  lon: 2.2222222 # longitude for sunrise/sunset calculation if wanted based on lat  instead of location timezone
+  country: "Germany" # country for daylight detection
+  city: "Berlin" # city for daylight detection
+  lat: 1.1111111 # latitude for sunrise/sunset calculation if wanted based on lat  instead of country timezone
+  lon: 2.2222222 # longitude for sunrise/sunset calculation if wanted based on lat  instead of country timezone
   brightness_enhancer: 3 # brightness enhancer for image if camera does not provide night_vision (1.0 is normal, <1 darker, >1 lighter)
   contrast_enhancer: 2 # contrast enhancer for image if camera does not provide night_vision (1.0 is normal, <1 darker, >1 lighter)
 
+
 blink:
   enabled: True     # blink cam enabled ?
   username: "blink_account_email_address_here"  # blink account name here

test/test_camera_testsuite.py

@@ -195,15 +195,15 @@ def test_night_detected_with_coordinates(self):
     def test_night_detected_with_location(self):
         self.config.lat = None
         self.config.lon = None
-        self.config.location = "Berlin"
+        self.config.country = "Berlin"
         with patch('camera.camera.sun', new_callable=MagicMock) as mock_sun:
             with patch('camera.camera.datetime', new_callable=MagicMock) as mock_datetime:
                 mock_datetime.now.return_value = datetime(2023, 6, 21, 2, 0, 0, tzinfo=ZoneInfo('Europe/Berlin'))
                 mock_sun.return_value = {'sunrise': datetime(2023, 6, 21, 4, 0, 0, tzinfo=ZoneInfo('Europe/Berlin')),
                                          'sunset': datetime(2023, 6, 21, 22, 0, 0, tzinfo=ZoneInfo('Europe/Berlin'))}
                 self.assertFalse(self.camera.detect_daylight())
                 self.mock_logger_info.assert_any_call(msg="Is daylight detected: False")
-                self.mock_logger_debug.assert_any_call("using location - city for daylight detection")
+                self.mock_logger_debug.assert_any_call("using country - city for daylight detection")
 
     def test_invalid_location_data(self):
         with patch('camera.camera.sun', new_callable=MagicMock) as mock_sun:
@@ -214,9 +214,9 @@ def test_invalid_location_data(self):
     def test_invalid_location_data(self):
         self.config.lat = None
         self.config.lon = None
-        self.config.location = None
+        self.config.country = None
         self.assertTrue(self.camera.detect_daylight())
-        self.mock_logger_error.assert_any_call("Invalid Location data: No valid location data provided")
+        self.mock_logger_error.assert_any_call("Invalid Location data: No valid country data provided")
 
     def test_exception_handling(self):
         with patch('camera.camera.sun', new_callable=MagicMock) as mock_sun:

test/test_config_util.py

@@ -42,7 +42,8 @@ def setUp(self, mock_telebot, mock_define_config_file, mock_read_config, mock_ge
                 'default_camera_type': 'blink',
                 'enable_detect_daylight': True,
                 'timezone': 'Europe/Berlin',
-                'location': 'Berlin',
+                'country': 'Germany',
+                'city': 'Berlin',
                 'lat': 1.1111111,
                 'lon': 2.2222222,
                 'brightness_enhancer': 3,