0.7.29

fix search routes insert txt address points

RoutesApp/models.py

@@ -75,26 +75,18 @@ class Route(BaseModel):
         ordering = ('name',)
 
     def from_country_n_city_str(self):
-        country = 'Неизвестно'
+        res = 'Неизвестно'
         if self.from_city:
-            city = self.from_city.name
-            if self.from_city.country:
-                country = self.from_city.country
-        else:
-            city = 'Неизвестно'
+            res = self.from_city.get_country_n_city_str()
 
-        return f'{city} / {country}'
+        return res
 
     def to_country_n_city_str(self):
-        country = 'Неизвестно'
+        res = 'Неизвестно'
         if self.to_city:
-            city = self.to_city.name
-            if self.to_city.country:
-                country = self.to_city.country
-        else:
-            city = 'Неизвестно'
+            res = self.to_city.get_country_n_city_str()
 
-        return f'{city} / {country}'
+        return res
 
 
     def get_address_points(self):