Replace timezonefinder with tzfpy

osmcal/api/views.py

@@ -4,7 +4,7 @@
 from django.views import View
 from osmcal import views
 from pytz import timezone as tzp
-from timezonefinder import TimezoneFinder
+from tzfpy import get_tz
 
 from . import serializers
 from .decorators import ALLOWED_HEADERS, cors_any, language_from_header
@@ -13,8 +13,6 @@
     "application/json; charset=" + settings.DEFAULT_CHARSET
 )  # This shall be utf-8, otherwise we're not friends anymore.
 
-tf = TimezoneFinder()
-
 
 class CORSOptionsMixin(object):
     def options(self, request, *args, **kwargs):
@@ -31,7 +29,9 @@ def get_serializer(self):
     @cors_any
     @language_from_header
     def get(self, request, *args, **kwargs):
-        es = self.get_serializer()(self.get_queryset(request.GET), context={"request": request})
+        es = self.get_serializer()(
+            self.get_queryset(request.GET), context={"request": request}
+        )
         return HttpResponse(es.json, content_type=JSON_CONTENT_TYPE)
 
 
@@ -49,7 +49,7 @@ class Timezone(View):
     def get(self, request, *args, **kwargs):
         lat = float(request.GET["lat"])
         lon = float(request.GET["lon"])
-        tz = tf.timezone_at(lng=lon, lat=lat)
+        tz = get_tz(lon, lat)
         if tz is None:
             return HttpResponse("", status=400)
         return HttpResponse(tzp(tz))

osmcal/migrations/0027_timezone_data.py

@@ -1,19 +1,18 @@
 from django.db import migrations
 from pytz import timezone
-from timezonefinder import TimezoneFinder
+from tzfpy import get_tz
 
 
 def set_timezones(apps, schema_editor):
-    tf = TimezoneFinder()
-    Event = apps.get_model('osmcal', 'Event')
+    Event = apps.get_model("osmcal", "Event")
     for event in Event.objects.filter(timezone=None):
         if event.location:
-            tz = tf.timezone_at(lng=event.location.x, lat=event.location.y)
+            tz = get_tz(event.location.x, event.location.y)
             if tz is not None:
                 event.timezone = tz
         if not event.timezone:
             # Either time zone could not be determined from location or no location is available.
-            event.timezone = 'UTC'
+            event.timezone = "UTC"
         tz = timezone(event.timezone)
         event.start = tz.localize(event.start.replace(tzinfo=None))
 
@@ -24,10 +23,6 @@ def set_timezones(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('osmcal', '0026_event_timezone'),
-    ]
+    dependencies = [("osmcal", "0026_event_timezone")]
 
-    operations = [
-        migrations.RunPython(set_timezones)
-    ]
+    operations = [migrations.RunPython(set_timezones)]

osmcal/models.py

@@ -12,9 +12,7 @@
 from django.utils.text import Truncator
 from pytz import timezone
 from sentry_sdk import add_breadcrumb
-from timezonefinder import TimezoneFinder
-
-tf = TimezoneFinder()
+from tzfpy import get_tz
 
 
 class EventType(Enum):
@@ -38,7 +36,9 @@ class Event(models.Model):
     location_address = models.JSONField(blank=True, null=True)
 
     link = models.URLField(blank=True, null=True)
-    kind = models.CharField(max_length=4, choices=[(x.name, x.value) for x in EventType])
+    kind = models.CharField(
+        max_length=4, choices=[(x.name, x.value) for x in EventType]
+    )
     description = models.TextField(
         blank=True,
         null=True,
@@ -70,7 +70,12 @@ def geocode_location(self):
     def _geocode_location(self):
         nr = requests.get(
             "https://nominatim.openstreetmap.org/reverse",
-            params={"format": "jsonv2", "lat": self.location.y, "lon": self.location.x, "accept-language": "en"},
+            params={
+                "format": "jsonv2",
+                "lat": self.location.y,
+                "lon": self.location.x,
+                "accept-language": "en",
+            },
             headers={"User-Agent": "osmcal"},
         )
         nr.raise_for_status()
@@ -93,7 +98,13 @@ def location_text(self):
         return ", ".join(
             filter(
                 lambda x: x is not None,
-                [addr.get("village"), addr.get("town"), addr.get("city"), addr.get("state"), addr.get("country")],
+                [
+                    addr.get("village"),
+                    addr.get("town"),
+                    addr.get("city"),
+                    addr.get("state"),
+                    addr.get("country"),
+                ],
             )
         )
 
@@ -163,25 +174,33 @@ class AnswerType(Enum):
 
 
 class ParticipationQuestion(models.Model):
-    event = models.ForeignKey("Event", null=True, on_delete=models.SET_NULL, related_name="questions")
+    event = models.ForeignKey(
+        "Event", null=True, on_delete=models.SET_NULL, related_name="questions"
+    )
     question_text = models.CharField(max_length=200)
-    answer_type = models.CharField(max_length=4, choices=[(x.name, x.value) for x in AnswerType])
+    answer_type = models.CharField(
+        max_length=4, choices=[(x.name, x.value) for x in AnswerType]
+    )
     mandatory = models.BooleanField(default=True)
 
     class Meta:
         ordering = ("event", "id")
 
 
 class ParticipationQuestionChoice(models.Model):
-    question = models.ForeignKey(ParticipationQuestion, related_name="choices", on_delete=models.CASCADE)
+    question = models.ForeignKey(
+        ParticipationQuestion, related_name="choices", on_delete=models.CASCADE
+    )
     text = models.CharField(max_length=200)
 
     class Meta:
         ordering = ("question", "id")
 
 
 class EventParticipation(models.Model):
-    event = models.ForeignKey("Event", null=True, on_delete=models.SET_NULL, related_name="participation")
+    event = models.ForeignKey(
+        "Event", null=True, on_delete=models.SET_NULL, related_name="participation"
+    )
     user = models.ForeignKey("User", null=True, on_delete=models.SET_NULL)
     added_on = models.DateTimeField(auto_now_add=True, null=True)
 
@@ -190,12 +209,18 @@ class Meta:
 
 
 class ParticipationAnswer(models.Model):
-    question = models.ForeignKey(ParticipationQuestion, on_delete=models.CASCADE, related_name="answers")
+    question = models.ForeignKey(
+        ParticipationQuestion, on_delete=models.CASCADE, related_name="answers"
+    )
     user = models.ForeignKey("User", null=True, on_delete=models.SET_NULL)
     answer = models.CharField(max_length=200)
 
     class Meta:
-        constraints = (models.UniqueConstraint(fields=("question", "user"), name="unique_question_answer"),)
+        constraints = (
+            models.UniqueConstraint(
+                fields=("question", "user"), name="unique_question_answer"
+            ),
+        )
 
 
 class EventLog(models.Model):
@@ -217,7 +242,7 @@ class User(AbstractUser):
     def home_timezone(self):
         if not self.home_location:
             return None
-        return tf.timezone_at(lng=self.home_location.x, lat=self.home_location.y)
+        return tf.get_tz(self.home_location.x, self.home_location.y)
 
     def save(self, *args, **kwargs):
         if not self.username: