From fc3d058bafe6fd844bf6cb1d0f874fbac56f9b17 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 May 2019 19:37:31 +0200 Subject: Geo: fix display of precise polygons --- ishtar_common/models.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 4b14d852c..8774ed951 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1742,6 +1742,26 @@ class GeoItem(models.Model): if self.multi_polygon_source == 'P' and self.multi_polygon: return self.multi_polygon, self.multi_polygon_source_item + def most_precise_geo(self): + if self.point_source == 'M': + return 'multi_polygon' + current_source = unicode(self.__class__._meta.verbose_name) + if self.multi_polygon_source_item == current_source \ + and (self.multi_polygon_source == "P" or + self.point_source_item != current_source): + return 'multi_polygon' + if self.point_source_item == current_source\ + and self.point_source == 'P': + return 'point' + if self.multi_polygon_source == 'P': + return 'multi_polygon' + if self.point_source == 'P': + return 'point' + if self.multi_polygon: + return 'multi_polygon' + if self.point_2d: + return 'point' + def geo_point_source(self): if not self.point_source: return "" -- cgit v1.2.3