summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES-DEV.md2
-rw-r--r--docs/fr/source/_static/geo-source-point.pngbin49035 -> 49549 bytes
-rw-r--r--docs/fr/source/media-src/geo-source-point.diabin3178 -> 3209 bytes
-rw-r--r--ishtar_common/utils.py3
4 files changed, 4 insertions, 1 deletions
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
--- a/docs/fr/source/_static/geo-source-point.png
+++ b/docs/fr/source/_static/geo-source-point.png
Binary files 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
--- a/docs/fr/source/media-src/geo-source-point.dia
+++ b/docs/fr/source/media-src/geo-source-point.dia
Binary files 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