summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md7
-rw-r--r--ishtar_common/models_imports.py7
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index cd03926e6..fa1448a4a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,11 +3,16 @@ title: Ishtar changelog
date: 2022-10-17
---
+
+### Bug fix ###
+- Geodata import:
+
+
v4.0.24 - 2022-10-27
--------------------
### Bug fix ###
-- Geodata save: transactions to limit deadlocks
+- Geodata import: fix total number evaluation on imports
v4.0.23 - 2022-10-26
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 087710fa7..87e631842 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -1262,10 +1262,10 @@ class Import(models.Model):
return errors
def get_number_of_lines(self):
- if self.importer_type.type == "gis":
- return
if self.number_of_line:
return self.number_of_line
+ if self.importer_type.type == "gis":
+ return
if not self.imported_file or not self.imported_file.path:
return
filename = self.imported_file.path
@@ -1513,6 +1513,9 @@ class Import(models.Model):
# Warning: RuntimeWarning: Sequential read of iterator was interrupted.
# Resetting iterator.
# not relevant -> bug in fiona 1.8.18 (fixed in 1.8.19)
+ if not self.number_of_line:
+ self.number_of_line = len(collection)
+ self.save()
for idx, feature in enumerate(collection):
try:
line = [