diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-11-10 11:41:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-11-16 17:04:41 +0100 |
| commit | 37c2cbe4bb769dee9c5d2663055c795dd75491c0 (patch) | |
| tree | 2cd88a3a3536627f8f0835dd8ded6dcb65d146fa | |
| parent | 426b3a89830e3e923b0510361dedc48f2a34bf81 (diff) | |
| download | Ishtar-37c2cbe4bb769dee9c5d2663055c795dd75491c0.tar.bz2 Ishtar-37c2cbe4bb769dee9c5d2663055c795dd75491c0.zip | |
Geo: use own precise multipolygone centroid before parent precise point
| -rw-r--r-- | CHANGES-DEV.md | 2 | ||||
| -rw-r--r-- | docs/fr/source/_static/geo-source-point.png | bin | 49035 -> 49549 bytes | |||
| -rw-r--r-- | docs/fr/source/media-src/geo-source-point.dia | bin | 3178 -> 3209 bytes | |||
| -rw-r--r-- | ishtar_common/utils.py | 3 |
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 Binary files differindex bf13b727f..eadfe3a48 100644 --- a/docs/fr/source/_static/geo-source-point.png +++ b/docs/fr/source/_static/geo-source-point.png diff --git a/docs/fr/source/media-src/geo-source-point.dia b/docs/fr/source/media-src/geo-source-point.dia Binary files differindex 858bddf57..4de8527fd 100644 --- a/docs/fr/source/media-src/geo-source-point.dia +++ b/docs/fr/source/media-src/geo-source-point.dia 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 |
