From c31d1773e5fe60baf3108aba736cd6538a8e4e73 Mon Sep 17 00:00:00 2001 From: QuentinAndre Date: Fri, 16 Jul 2021 10:25:23 +0200 Subject: format GeoJSON and getting properly related objects --- archaeological_operations/models.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'archaeological_operations/models.py') diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 29b3eac91..277ca76d3 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1607,23 +1607,20 @@ class Operation( def get_geo_items(self, get_polygons, rounded=True): dict = super(Operation, self).get_geo_items(get_polygons, rounded) - associated_geo_items = {"associated context records": {}} ContextRecord = apps.get_model( "archaeological_context_records", "ContextRecord" ) - for ( - cr - ) in ( - self._get_associated_cached_labels() - ): # malgré le nom, ce ne sont pas des labels ? + collection_context_records = [] + for cr in self.context_record.distinct().all(): try: - associated_geo_items["associated context records"][ - str(cr.label) - ] = cr.get_geo_items(get_polygons, rounded) + geo_item = cr.get_geo_items(get_polygons, rounded) + collection_context_records.append(geo_item) except ContextRecord.DoesNotExist: - print("except") pass - dict["properties"] = associated_geo_items + dict["properties"]["context-records"] = { + "type": "FeatureCollection", + "features": collection_context_records, + } return dict def context_record_relations_q(self): -- cgit v1.2.3