diff options
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 0616e2a10..5090fb15b 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -518,7 +518,7 @@ class StrChoiceFormater(Formater, ChoiceChecker): for value in values: new_values += r.split(value) values = new_values - for value in values: + for value in set(values): base_value = copy.copy(value) value = self.prepare(value) if value in self.equiv_dict: @@ -1376,12 +1376,11 @@ class Importer(object): geodata = {} if self.TYPE == "gis": if "geodata" in data: - geodata = data.pop("geodata") + geodata = self._defaults.get(("geodata",), {}) + geodata.update(data.pop("geodata")) obj, created = self.get_object(self.OBJECT_CLS, data, idx_line=idx_line) if self.simulate: return data - # print(data) - # print(self._defaults) if self.import_instance: self.import_instance.add_imported_line(self.idx_line) |