fix: hide map on detail pages when no location set

people/models/organisation.py

@@ -102,6 +102,10 @@ class OrganisationAnswerSet(AnswerSet):
     #: Answers to :class:`OrganisationQuestion`s
     question_answers = models.ManyToManyField(OrganisationQuestionChoice)
 
+    @property
+    def location_set(self) -> bool:
+        return self.latitude and self.longitude
+
     def public_answers(self) -> models.QuerySet:
         """Get answers to questions which are public."""
         return self.question_answers.filter(question__answer_is_public=True)

people/models/person.py

@@ -188,6 +188,10 @@ class PersonAnswerSet(AnswerSet):
     #: Longitude for displaying location on a map
     longitude = models.FloatField(blank=True, null=True)
 
+    @property
+    def location_set(self) -> bool:
+        return self.latitude and self.longitude
+
     def public_answers(self) -> models.QuerySet:
         """Get answers to questions which are public."""
         return self.question_answers.filter(question__answer_is_public=True)

people/templates/people/organisation/detail.html

@@ -58,7 +58,10 @@
 
     <hr>
 
+    {% if organisation.current_answers.location_set %}
         <div id="map" style="height: 800px; width: 100%"></div>
+        <hr>
+    {% endif %}
 
     <hr>
 

people/templates/people/person/detail_full.html

@@ -79,9 +79,10 @@
 
     <hr>
 
+    {% if person.current_answers.location_set %}
         <div id="map" style="height: 800px; width: 100%"></div>
-
         <hr>
+    {% endif %}
 
     {% include 'people/person/includes/relationships_full.html' %}
 

people/templates/people/person/detail_partial.html

@@ -55,7 +55,9 @@
 
     <hr>
 
+    {% if person.current_answers.location_set %}
         <div id="map" style="height: 800px; width: 100%"></div>
-
         <hr>
+    {% endif %}
+
 {% endblock %}