Show all places enclosed by a featured place on the map. (#1099)

bartfeenstra · Dec 27, 2023 · 547f352 · 547f352
1 parent 3c27ff6
commit 547f352
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/betty/extension/cotton_candy/assets/templates/entity/featured--place.html.j2 b/betty/extension/cotton_candy/assets/templates/entity/featured--place.html.j2
@@ -16,7 +16,13 @@
 </div>
 
 <div class="featured-entity-feature">
-    {% with entities = [entity], map_hides_list = True, featured = False %}
-        {% include ['entity/list--place.html.j2', 'entity/list.html.j2'] %}
-    {% endwith %}
+    {% set places = entity | walk('encloses') | select('place_entity') | list %}
+    {% if entity.coordinates %}
+        {% set places = places + [entity] %}
+    {% endif %}
+    {% if places | length > 0 %}
+        {% with entities = places, hide_list = True, featured = False %}
+            {% include ['entity/list--place.html.j2', 'entity/list.html.j2'] %}
+        {% endwith %}
+    {% endif %}
 </div>
diff --git a/betty/extension/cotton_candy/assets/templates/entity/list--place.html.j2 b/betty/extension/cotton_candy/assets/templates/entity/list--place.html.j2
@@ -4,7 +4,7 @@
     {% if 'betty.extension.Maps' in app.extensions and entities | rejectattr('coordinates', 'none') | list | length > 0 %}
         <div class="{% if featured %}featured {% endif %}map"></div>
     {% endif %}
-    <ul class="entities{% if map_hides_list | default(false) %} js-visually-hidden{% endif %}">
+    <ul class="entities{% if hide_list | default(false) %} visually-hidden{% endif %}{% if map_hides_list | default(false) %} js-visually-hidden{% endif %}">
         {% for place in entities | sort_localizeds(localized_attribute='names', sort_attribute='name') %}
             <li class="{{ loop.cycle('odd', 'even') }}" data-betty-place="{{ place | url(media_type='application/json') }}">
                 {% with entity = place %}