summaryrefslogtreecommitdiff
path: root/archaeological_operations/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-09-01 19:15:02 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-12-12 12:23:18 +0100
commit4798e764adf21e259e6738eaaf18c0fa7ae18bac (patch)
tree5b95b1695cf8772e547deca7313af2e9b19d3344 /archaeological_operations/models.py
parente0bcbeaa84c2adf3b8a179cdea792dd58fa109b2 (diff)
downloadIshtar-4798e764adf21e259e6738eaaf18c0fa7ae18bac.tar.bz2
Ishtar-4798e764adf21e259e6738eaaf18c0fa7ae18bac.zip
Geo: display related items on sheet
Diffstat (limited to 'archaeological_operations/models.py')
-rw-r--r--archaeological_operations/models.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index bb41848a5..080ddddab 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1728,23 +1728,33 @@ class Operation(
return None
return q.all()[0].poly, self._meta.verbose_name
- def get_geo_items(self, get_polygons, rounded=True):
- dict = super(Operation, self).get_geo_items(get_polygons, rounded)
+ def get_geo_items(self, rounded=True):
+ dct = super(Operation, self).get_geo_items(rounded=rounded)
ContextRecord = apps.get_model(
"archaeological_context_records", "ContextRecord"
)
collection_context_records = []
+ import datetime
+ n = datetime.datetime.now()
+ n1 = datetime.datetime.now()
+ times = []
+ print("archaeological_operations.models.py", "get_geo_items", 1741)
for cr in self.context_record.distinct().all():
try:
- geo_item = cr.get_geo_items(get_polygons, rounded)
+ geo_item = cr.get_geo_items(rounded=rounded)
collection_context_records.append(geo_item)
+ times.append((datetime.datetime.now() - n1).seconds)
+ n1 = datetime.datetime.now()
except ContextRecord.DoesNotExist:
pass
- dict["properties"]["context-records"] = {
+ print("full", datetime.datetime.now() - n)
+ if times:
+ print("mean", sum(times)/len(times))
+ dct["context-records"] = {
"type": "FeatureCollection",
"features": collection_context_records,
}
- return dict
+ return dct
def context_record_relations_q(self):
from archaeological_context_records.models import RecordRelations as CRRL