From 0b5e37281b3e741928b6d87b812c171726011e16 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 16 Jul 2024 15:34:35 +0300
Subject: [PATCH] 1.6.5 parsing timezones

---
 ReferenceDataApp/models.py |  2 +-
 RoutesApp/views.py         | 72 ++++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/ReferenceDataApp/models.py b/ReferenceDataApp/models.py
index b8b322a..35d35a9 100644
--- a/ReferenceDataApp/models.py
+++ b/ReferenceDataApp/models.py
@@ -62,7 +62,7 @@ class City(BaseModel):
 
     def get_n_save_timezone(self):
         from ReferenceDataApp.funcs import tzf
-        self.timezone = tzf.timezone_at(lng=self.geo_lon, lat=self.geo_lat)
+        self.timezone = tzf.timezone_at(lng=float(self.geo_lon), lat=float(self.geo_lat))
         self.save(update_fields=['timezone'])
         return self.timezone
 
diff --git a/RoutesApp/views.py b/RoutesApp/views.py
index 141cbeb..9ff36aa 100644
--- a/RoutesApp/views.py
+++ b/RoutesApp/views.py
@@ -21,44 +21,46 @@ def route_search_results_View(request):
     Dict = {}
     data = {}
 
-    try:
+    # try:
 
-        if request.GET:
-            data = request.GET.dict()
+    if request.GET:
+        data = request.GET.dict()
 
-        routes_Dict = get_routes_Dict(data=data)
-        if routes_Dict:
-            Dict = {
-                'routes': routes_Dict['routes'],
-                'last_block': routes_Dict['last_block'],
-                'show_filter_and_results': True,
-                'owner_type': data['owner_type'],
-                'last_el': routes_Dict['last_el'],
-                'page_type': 'routes',
-                'next_page_els_count': routes_Dict['next_page_els_count'],
-            }
-        if 'from_address_point_txt' in routes_Dict:
-            data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})
-        if 'to_address_point_txt' in routes_Dict:
-            data.update({'to_address_point_txt': routes_Dict['to_address_point_txt']})
-        Dict.update({'route_form': RouteForm(initial=data)})
+    routes_Dict = get_routes_Dict(data=data)
+    if routes_Dict:
+        Dict = {
+            'routes': routes_Dict['routes'],
+            'last_block': routes_Dict['last_block'],
+            'show_filter_and_results': True,
+            'owner_type': data['owner_type'],
+            'last_el': routes_Dict['last_el'],
+            'page_type': 'routes',
+            'next_page_els_count': routes_Dict['next_page_els_count'],
+        }
+    if 'from_address_point_txt' in routes_Dict:
+        data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})
+    if 'to_address_point_txt' in routes_Dict:
+        data.update({'to_address_point_txt': routes_Dict['to_address_point_txt']})
+    Dict.update({'route_form': RouteForm(initial=data)})
 
-        title = _('Результат поиска маршрутов')
-        if 'from_address_point_txt' in data:
-            title = f'{title} из {data["from_address_point_txt"]}'
-        if 'to_address_point_txt' in data:
-            title = f'{title} в {data["to_address_point_txt"]}'
+    title = _('Результат поиска маршрутов')
+    if 'from_address_point_txt' in data:
+        title = f'{title} из {data["from_address_point_txt"]}'
+    if 'to_address_point_txt' in data:
+        title = f'{title} в {data["to_address_point_txt"]}'
 
-        Dict.update({
-            'page': {
-                'title': title,
-                'description': title,
-                'keywords': title,
-            }
-        })
+    Dict.update({
+        'page': {
+            'title': title,
+            'description': title,
+            'keywords': title,
+        }
+    })
 
-        t = loader.get_template('pages/p_results_find_route.html')
-        return get_inter_http_response(t, Dict, request)
+    t = loader.get_template('pages/p_results_find_route.html')
+    return get_inter_http_response(t, Dict, request)
     # return HttpResponse(t.render(Dict, request))
-    except Exception as e:
-        raise Http404
+    # except Exception as e:
+    #     msg = f'!!! --- route_search_results_View Exception {str(e)}'
+    #     print(msg)
+    #     raise Http404