fix spider for russia file, db count optimization

MatsGej · Feb 19, 2021 · cb3ad31 · cb3ad31
1 parent 2e13339
commit cb3ad31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/openpoiservice/server/db_import/parser.py b/openpoiservice/server/db_import/parser.py
@@ -76,7 +76,7 @@ def run_import(osm_files_to_import, import_log):
         update_mode = False
         # run query on separate database connection, will conflict otherwise since parse_import runs in separate process
         separate_db_con = SQLAlchemy()
-        prev_poi_count = separate_db_con.session.query(POIs).count()
+        prev_poi_count = separate_db_con.session.query(POIs.osm_type, POIs.osm_id).count()
         if prev_poi_count > 0:
             update_mode = True
             logger.info("Data import running in UPDATE MODE")

diff --git a/osm/GeoFabrikSpider.py b/osm/GeoFabrikSpider.py
@@ -54,7 +54,10 @@ def fetch_sub_regions(self, response):
 
             print('Starting download of {}'.format(tail))
             download_link = parse.urljoin(response.url, sub_region)
-            subprocess.call(["wget", "-q", "-N", f"-P{head}", download_link])
+            if head:
+                subprocess.call(["wget", "-q", "-N", f"-P{head}", download_link])
+            else:
+                subprocess.call(["wget", "-q", "-N", download_link])
             sleep(self.wait_time)
 
             yield {