diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/models.py | 106 |
1 files changed, 68 insertions, 38 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 5dfaa427a..01eb6e27b 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -23,11 +23,13 @@ import uuid from django.apps import apps from django.conf import settings from django.contrib.gis.db import models +from django.contrib.gis.geos import Point from django.contrib.postgres.indexes import GinIndex from django.core.urlresolvers import reverse from django.db import connection from django.db.models import Q from django.db.models.signals import post_delete, post_save, m2m_changed + from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy, pgettext from django.utils.text import slugify @@ -35,7 +37,7 @@ from ishtar_common.utils import ( cached_label_changed, m2m_historization_changed, post_save_geo, - task + task, ) from ishtar_common.models import ( @@ -62,7 +64,7 @@ from ishtar_common.models import ( DocumentItem, MainItem, QuickAction, - RelationsViews + RelationsViews, ) from ishtar_common.models_common import HistoricalRecords from archaeological_operations.models import ( @@ -856,6 +858,21 @@ class ContextRecord( return precise_poly return self.operation.get_precise_polygons() + def get_geo_items(self, get_polygons, rounded=True): + dict = super(ContextRecord, self).get_geo_items(get_polygons, rounded) + associated_geo_items = {"associated base finds": {}} + BaseFind = apps.get_model("archaeological_finds", "BaseFind") + for find_label in self._get_associated_cached_labels(): + try: + bf = BaseFind.objects.get(label=find_label) + associated_geo_items["associated base finds"][ + str(find_label) + ] = bf.get_geo_items(get_polygons, rounded) + except BaseFind.DoesNotExist: + pass + dict["properties"] = associated_geo_items + return dict + @classmethod def cached_label_bulk_update( cls, operation_id=None, parcel_id=None, transaction_id=None @@ -1385,21 +1402,23 @@ class ContextRecordTree(RelationsViews): ); CREATE INDEX {table}_id ON {table} (cr_id); CREATE INDEX {table}_parent_id ON {table} (cr_parent_id); - """.format(table="context_records_tree", - fk_table="archaeological_context_records_contextrecord") + """.format( + table="context_records_tree", + fk_table="archaeological_context_records_contextrecord", + ) key = models.TextField(primary_key=True) cr = models.ForeignKey( "archaeological_context_records.ContextRecord", verbose_name=_("Context record"), related_name="context_record_tree_parent", - on_delete=models.CASCADE + on_delete=models.CASCADE, ) cr_parent = models.ForeignKey( "archaeological_context_records.ContextRecord", verbose_name=_("Context record parent"), related_name="context_record_tree_child", - on_delete=models.CASCADE + on_delete=models.CASCADE, ) class Meta: @@ -1414,7 +1433,8 @@ class ContextRecordTree(RelationsViews): if child_id != parent_id: cls.objects.get_or_create( key=f"{child_id}_{parent_id}", - cr_id=child_id, cr_parent_id=parent_id + cr_id=child_id, + cr_parent_id=parent_id, ) keys.append((child_id, parent_id)) return keys @@ -1422,17 +1442,20 @@ class ContextRecordTree(RelationsViews): @classmethod def _get_base_relations(cls): return RelationType.objects.filter( - logical_relation__in=('included', 'equal')).values_list("id", flat=True) + logical_relation__in=("included", "equal") + ).values_list("id", flat=True) @classmethod def _get_base_equal_relations(cls): - return RelationType.objects.filter( - logical_relation='equal').values_list("id", flat=True) + return RelationType.objects.filter(logical_relation="equal").values_list( + "id", flat=True + ) @classmethod def _get_base_included_relations(cls): - return RelationType.objects.filter( - logical_relation='included').values_list("id", flat=True) + return RelationType.objects.filter(logical_relation="included").values_list( + "id", flat=True + ) @classmethod def _get_base_children(cls): @@ -1441,9 +1464,11 @@ class ContextRecordTree(RelationsViews): @classmethod def _update_child(cls, parent_id, tree, rel_types): whole_tree = set() - children = list(RecordRelations.objects.values_list( - "left_record_id", flat=True).filter( - right_record_id=parent_id, relation_type_id__in=rel_types)) + children = list( + RecordRelations.objects.values_list("left_record_id", flat=True).filter( + right_record_id=parent_id, relation_type_id__in=rel_types + ) + ) to_be_pop = [] for idx, c in enumerate(children[:]): if c in tree: # cyclic @@ -1459,8 +1484,8 @@ class ContextRecordTree(RelationsViews): @classmethod def _get_parent_trees(cls, child_id, trees, rel_types, deep=0): parents = RecordRelations.objects.values_list( - "right_record_id", flat=True).filter( - left_record_id=child_id, relation_type_id__in=rel_types) + "right_record_id", flat=True + ).filter(left_record_id=child_id, relation_type_id__in=rel_types) if not parents: return trees new_trees = [] @@ -1475,14 +1500,14 @@ class ContextRecordTree(RelationsViews): def _get_equals(cls, item_id, equal_rel_types, exclude=None): if not exclude: exclude = [item_id] - q = RecordRelations.objects.values_list( - "right_record_id", flat=True).filter( - left_record_id=item_id, relation_type_id__in=equal_rel_types) + q = RecordRelations.objects.values_list("right_record_id", flat=True).filter( + left_record_id=item_id, relation_type_id__in=equal_rel_types + ) q = q.exclude(right_record_id__in=exclude) equals = list(q) - q = RecordRelations.objects.values_list( - "left_record_id", flat=True).filter( - right_record_id=item_id, relation_type_id__in=equal_rel_types) + q = RecordRelations.objects.values_list("left_record_id", flat=True).filter( + right_record_id=item_id, relation_type_id__in=equal_rel_types + ) q = q.exclude(left_record_id__in=exclude) equals += list(q) exclude += equals @@ -1496,13 +1521,11 @@ class ContextRecordTree(RelationsViews): for equal_id in equals: if item_id != equal_id: cls.objects.get_or_create( - key=f"{item_id}_{equal_id}", - cr_id=item_id, cr_parent_id=equal_id + key=f"{item_id}_{equal_id}", cr_id=item_id, cr_parent_id=equal_id ) keys.append((item_id, equal_id)) cls.objects.get_or_create( - key=f"{equal_id}_{item_id}", - cr_id=equal_id, cr_parent_id=item_id + key=f"{equal_id}_{item_id}", cr_id=equal_id, cr_parent_id=item_id ) keys.append((equal_id, item_id)) return keys @@ -1518,7 +1541,8 @@ class ContextRecordTree(RelationsViews): if alt_child != child_id: cls.objects.get_or_create( key=f"{alt_child}_{parent_id}", - cr_id=alt_child, cr_parent_id=parent_id + cr_id=alt_child, + cr_parent_id=parent_id, ) keys.append((alt_child, parent_id)) equals_parent = set(cls._get_equals(parent_id, equal_rel_types)) @@ -1527,7 +1551,8 @@ class ContextRecordTree(RelationsViews): if alt_parent != parent_id: cls.objects.get_or_create( key=f"{child_id}_{alt_parent}", - cr_id=child_id, cr_parent_id=alt_parent + cr_id=child_id, + cr_parent_id=alt_parent, ) keys.append((child_id, alt_parent)) @@ -1535,7 +1560,8 @@ class ContextRecordTree(RelationsViews): if alt_child != child_id: cls.objects.get_or_create( key=f"{alt_child}_{alt_parent}", - cr_id=alt_child, cr_parent_id=alt_parent + cr_id=alt_child, + cr_parent_id=alt_parent, ) keys.append((alt_child, alt_parent)) return set(keys) @@ -1545,8 +1571,7 @@ class ContextRecordTree(RelationsViews): all_relations = set() # add self relation cls.objects.get_or_create( - key=f"{item_id}_{item_id}", - cr_id=item_id, cr_parent_id=item_id + key=f"{item_id}_{item_id}", cr_id=item_id, cr_parent_id=item_id ) all_relations.add((item_id, item_id)) current_relations_as_child = list( @@ -1561,8 +1586,9 @@ class ContextRecordTree(RelationsViews): # get first parents parent_ids = [ - tree[-1] for tree in cls._get_parent_trees(item_id, [[item_id]], - inc_rel_types)] + tree[-1] + for tree in cls._get_parent_trees(item_id, [[item_id]], inc_rel_types) + ] if not parent_ids: parent_ids = [item_id] @@ -1580,15 +1606,19 @@ class ContextRecordTree(RelationsViews): if not already_updated: already_updated = [item_id] for parent_id in current_relations_as_child: - if (item_id, parent_id) not in all_relations and \ - parent_id not in already_updated: + if ( + item_id, + parent_id, + ) not in all_relations and parent_id not in already_updated: # disappeared - must regenerate already_updated.append(parent_id) cls.objects.filter(key=f"{item_id}_{parent_id}").delete() cls._update(parent_id, already_updated) for child_id in current_relations_as_parent: - if (child_id, item_id) not in all_relations and \ - child_id not in already_updated: + if ( + child_id, + item_id, + ) not in all_relations and child_id not in already_updated: # disappeared - must regenerate already_updated.append(child_id) cls.objects.filter(key=f"{child_id}_{item_id}").delete() |