From 37c2cbe4bb769dee9c5d2663055c795dd75491c0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 10 Nov 2021 11:41:11 +0100 Subject: Geo: use own precise multipolygone centroid before parent precise point --- CHANGES-DEV.md | 2 ++ docs/fr/source/_static/geo-source-point.png | Bin 49035 -> 49549 bytes docs/fr/source/media-src/geo-source-point.dia | Bin 3178 -> 3209 bytes ishtar_common/utils.py | 3 ++- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES-DEV.md b/CHANGES-DEV.md index ae493c8fb..5b457f6af 100644 --- a/CHANGES-DEV.md +++ b/CHANGES-DEV.md @@ -17,3 +17,5 @@ Ishtar changelog ### Bugs ### - Search: fix url for person and organization +- Geo: use own precise multipolygone centroid before parent precise point + diff --git a/docs/fr/source/_static/geo-source-point.png b/docs/fr/source/_static/geo-source-point.png index bf13b727f..eadfe3a48 100644 Binary files a/docs/fr/source/_static/geo-source-point.png and b/docs/fr/source/_static/geo-source-point.png differ diff --git a/docs/fr/source/media-src/geo-source-point.dia b/docs/fr/source/media-src/geo-source-point.dia index 858bddf57..4de8527fd 100644 Binary files a/docs/fr/source/media-src/geo-source-point.dia and b/docs/fr/source/media-src/geo-source-point.dia differ diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 47fd3bad6..eb010035b 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -907,7 +907,8 @@ def _post_save_geo(sender, **kwargs): instance.point_source = None # get coordinates from parents precise_points = instance.get_precise_points() - if precise_points: + if not (instance.multi_polygon and instance.multi_polygon_source == "P") and \ + precise_points: point_2d, point, source_item = precise_points instance.point_2d = point_2d instance.point = point -- cgit v1.2.3