From 82707f8528ae647a8da06eb0853eb6e9793750b2 Mon Sep 17 00:00:00 2001
From: Alexey Zakharenkov <a-zakh@yandex.ru>
Date: Thu, 7 Jul 2022 17:19:27 +0300
Subject: [PATCH] Make City.is_good a property

---
 process_subways.py         | 2 +-
 processors/gtfs.py         | 2 +-
 processors/mapsme.py       | 6 +++---
 subway_io.py               | 2 +-
 subway_structure.py        | 8 ++++++++
 tests/test_build_tracks.py | 2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/process_subways.py b/process_subways.py
index e1a6c46..a0579f5 100755
--- a/process_subways.py
+++ b/process_subways.py
@@ -336,7 +336,7 @@ if __name__ == '__main__':
             c.error("Validation logic error: {}".format(str(e)))
         else:
             c.validate()
-            if c.is_good():
+            if c.is_good:
                 good_cities.append(c)
 
     logging.info('Finding transfer stations')
diff --git a/processors/gtfs.py b/processors/gtfs.py
index 453db5f..3021c8f 100644
--- a/processors/gtfs.py
+++ b/processors/gtfs.py
@@ -171,7 +171,7 @@ def process(cities, transfers, filename, cache_path):
     )
 
     all_stops = {}  # stop (stop area center or station) el_id -> stop data
-    good_cities = [c for c in cities if c.is_good()]
+    good_cities = [c for c in cities if c.is_good]
 
     def add_stop_gtfs(route_stop):
         """Add stop to all_stops.
diff --git a/processors/mapsme.py b/processors/mapsme.py
index 4fc1b92..01da216 100755
--- a/processors/mapsme.py
+++ b/processors/mapsme.py
@@ -87,7 +87,7 @@ class MapsmeCache:
         # One stoparea may participate in routes of different cities
         self.stop_cities = defaultdict(set)  # stoparea id -> city names
         self.city_dict = {c.name: c for c in cities}
-        self.good_city_names = {c.name for c in cities if c.is_good()}
+        self.good_city_names = {c.name for c in cities if c.is_good}
 
     def _is_cached_city_usable(self, city):
         """Check if cached stations still exist in osm data and
@@ -118,7 +118,7 @@ class MapsmeCache:
         """Put stops and networks for bad cities into containers
         passed as arguments."""
         for city in self.city_dict.values():
-            if not city.is_good() and city.name in self.cache:
+            if not city.is_good and city.name in self.cache:
                 city_cached_data = self.cache[city.name]
                 if self._is_cached_city_usable(city):
                     stops.update(city_cached_data['stops'])
@@ -212,7 +212,7 @@ def process(cities, transfers, filename, cache_path):
     stop_areas = {}  # stoparea el_id -> StopArea instance
     stops = {}  # stoparea el_id -> stop jsonified data
     networks = []
-    good_cities = [c for c in cities if c.is_good()]
+    good_cities = [c for c in cities if c.is_good]
     platform_nodes = {}
     cache.provide_stops_and_networks(stops, networks)
 
diff --git a/subway_io.py b/subway_io.py
index 1aa8dfa..f45e367 100644
--- a/subway_io.py
+++ b/subway_io.py
@@ -282,7 +282,7 @@ def write_recovery_data(path, current_data, cities):
 
     data = current_data
     for city in cities:
-        if city.is_good():
+        if city.is_good:
             data[city.name] = make_city_recovery_data(city)
 
     try:
diff --git a/subway_structure.py b/subway_structure.py
index 6edd230..1a99f5e 100644
--- a/subway_structure.py
+++ b/subway_structure.py
@@ -1477,6 +1477,7 @@ class RouteMaster:
 
 class City:
     def __init__(self, city_data, overground=False):
+        self.validate_called = False
         self.errors = []
         self.warnings = []
         self.notices = []
@@ -1734,7 +1735,12 @@ class City:
     def __iter__(self):
         return iter(self.routes.values())
 
+    @property
     def is_good(self):
+        assert self.validate_called, (
+            "You mustn't refer to City.is_good property before calling "
+            "the City.validate() method."
+        )
         return len(self.errors) == 0
 
     def get_validation_result(self):
@@ -1972,6 +1978,8 @@ class City:
             )
             self.notice('More than one network: {}'.format(n_str))
 
+        self.validate_called = True
+
 
 def find_transfers(elements, cities):
     transfers = []
diff --git a/tests/test_build_tracks.py b/tests/test_build_tracks.py
index 782555f..44f7b93 100644
--- a/tests/test_build_tracks.py
+++ b/tests/test_build_tracks.py
@@ -43,7 +43,7 @@ class TestOneRouteTracks(unittest.TestCase):
         city.extract_routes()
         city.validate()
 
-        self.assertTrue(city.is_good())
+        self.assertTrue(city.is_good)
 
         route_master = list(city.routes.values())[0]
         variants = route_master.routes