batch upload

Author: rendrom

.gitignore

@@ -1,5 +1,4 @@
 tmp/
-*.geojson
 .vscode/
 *.pyc
 .DS_Store
@@ -10,4 +9,5 @@ env/
 *.egg-info/
 .idea/
 
-/catalog.json
+*.json
+output/

README.md

@@ -25,6 +25,7 @@ ROSREESTR TO COORDINATE
   * -o - путь для полученого geojson файла
   * -e - параметр, определяющий точность аппроксимации
   * -t - тип плащади: Участки 1, ОКС 5, Кварталы 2, Районы 3, Округа 4, Границы 7, ЗОУИТ 10, Тер. зоны 6, Красные линии 13, Лес 12, СРЗУ 15, ОЭЗ 16, ГОК 9
+  * -l - пакетная загрузка из списка в текстовом файле (тестовый файл -l list_example.txt )
 
 programmatically:
 

list_example.txt

@@ -0,0 +1,3 @@
+38:36:000021:1106
+38:06:144003:4723
+38:36:000033:375

script/batch.py

@@ -0,0 +1,40 @@
+from __future__ import print_function
+from script.catalog import Catalog
+from script.parser import Area
+
+
+def batch_parser(codes, area_type=1, media_path="", with_log=False, catalog=""):
+    catalog = Catalog(catalog)
+    restores = []
+    with_error = 0
+    success = 0
+    from_catalog = 0
+    print("Launched parsing of of %i areas:" % len(codes))
+    print("================================")
+    for c in codes:
+        code = c.strip()
+        print("%s" % code, end="")
+        restore = catalog.find(code)
+        if not restore:
+            try:
+                area = Area(code, media_path=media_path, area_type=area_type, with_log=with_log)
+                restore = catalog.update(area)
+                print(" - ok")
+                success += 1
+            except Exception as er:
+                print(" - error")
+                with_error += 1
+                pass
+        else:
+            print(" - ok, from catalog")
+            success += 1
+            from_catalog += 1
+        restores.append(restore)
+    catalog.close()
+
+    print("=================")
+    print("Parsing complate:")
+    print("  success     : %i" % success)
+    print("  error       : %i" % with_error)
+    print("  from catalog: %i" % from_catalog)
+    print("-----------------")

script/catalog.py

@@ -44,6 +44,7 @@ def update(self, area):
             for a in attr_list:
                 to_store[a] = getattr(area, a)
             self.store["Area"][getattr(area, "code")] = to_store
+            return to_store
 
     def close(self, buffering=-1):
         with open(self.file_path, "w", buffering=buffering) as local_file:

script/console.py

@@ -3,6 +3,7 @@
 
 import os
 
+from script.batch import batch_parser
 from script.parser import Area, TYPES
 
 
@@ -20,19 +21,23 @@ def getopts():
         http://pkk5.rosreestr.ru/
         """)
     )
-    parser.add_argument('-c', '--code', action='store', type=str, required=True,
+    parser.add_argument('-c', '--code', action='store', type=str, required=False,
                         help='area cadastral number')
     parser.add_argument('-t', '--area_type', action='store', type=int, required=False, default=1,
                         help='area types: %s' % "; ".join(["%s:%s" % (k, v) for k, v in TYPES.items()]))
     parser.add_argument('-p', '--path', action='store', type=str, required=False,
                         help='media path')
     parser.add_argument('-o', '--output', action='store', type=str, required=False,
                         help='output path')
+    parser.add_argument('-l', '--list', action='store', type=str, required=False,
+                        help='code list path')
     parser.add_argument('-e', '--epsilon', action='store', type=int, required=False,
                         help='Parameter specifying the approximation accuracy. '
                              'This is the maximum distance between the original curve and its approximation.')
     opts = parser.parse_args()
 
+
+
     return opts
 
 
@@ -52,9 +57,15 @@ def main():
     area_type = opt.area_type if opt.area_type else 1
 
     catalog_path = os.path.join(os.getcwd(), "catalog.json")
-
     abspath = os.path.abspath(output)
-    if code:
+
+    if opt.list:
+        f = open(opt.list, 'r')
+        codes = f.readlines()
+        f.close()
+        batch_parser(codes, media_path=path, area_type=area_type, catalog=catalog_path)
+
+    elif code:
         area = Area(code, media_path=path, area_type=area_type, epsilon=epsilon, with_log=True, catalog=catalog_path)
         geojson = area.to_geojson_poly()
         if geojson:

script/parser.py

@@ -122,7 +122,7 @@ def __init__(self, code="", area_type=1, epsilon=5, media_path="", with_log=Fals
                     image = self.download_image(f)
                     if image:
                         self.get_geometry()
-                        if self.catalog and self.catalog.store:
+                        if catalog:
                             self.catalog.update(self)
                             self.catalog.close()
                         break