diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index 4d450b9..3f1bc3f 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -109,9 +109,9 @@ def get_profile_new_route_page_html(request, data): return html -def get_country_n_city_str_by_type_transport_and_address_point(type_transport, address_point): - city = get_city_by_type_transport_and_address_point(type_transport, address_point) - return city.get_country_n_city_str() +# def get_country_n_city_str_by_type_transport_and_address_point(type_transport, address_point): +# city = get_city_by_type_transport_and_address_point(type_transport, address_point) +# return city.get_country_n_city_str() def get_city_by_type_transport_and_address_point(type_transport, address_point): @@ -219,7 +219,7 @@ def get_routes_Dict(user=None, data=None): ): kwargs.update({key: val}) - if key == 'from_address_point': + if key == 'from_address_point': # в from_address_point всегда город # city = get_city_by_type_transport_and_address_point(type_transport, val) city = get_city_by_address_point(val) kwargs.update({f'from_city': city}) @@ -229,7 +229,7 @@ def get_routes_Dict(user=None, data=None): 'from_address_point_txt': city.get_country_n_city_str() }) - if key == 'to_address_point': + if key == 'to_address_point': # в to_address_point всегда город # city = get_city_by_type_transport_and_address_point(type_transport, val) city = get_city_by_address_point(val) kwargs.update({f'to_city': city})