lostplaces/lostplaces_app/models.py

@@ -9,7 +9,6 @@ database.
 import os
 import uuid
 
-from django.urls import reverse
 from django.db import models
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save

lostplaces/lostplaces_app/templates/home.html

@@ -2,8 +2,8 @@
 
 {% load static %}
 {% block additional_head %}
-<link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
+    <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
-<script src="{% static 'maps/ol.js' %}"></script>
+    <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
 # {% block title %}Start{% endblock %}
@@ -14,7 +14,7 @@
 <article class="LP-TextSection">
 </article>
 
-{% include 'partials/osm_map.html' with config=map_config %}
+{% include 'partials/osm_map.html' %}
 <div class="LP-PlaceGrid">
     <h1 class="LP-Headline LP-Headline">Explore the latest locations</h1>
     <ul class="LP-PlaceGrid__Grid">

lostplaces/lostplaces_app/templates/partials/osm_map.html

@@ -18,13 +18,13 @@
 
             var vectorSource = new ol.source.Vector({
                 features: [
-                    {% for point in config.point_list %}
+                    {% for config.point in point_list %}
                         new ol.Feature({
                             geometry: new ol.geom.Point(
                                 ol.proj.fromLonLat([{{point.longitude}},{{point.latitude}}])
                             ),
                             url: '{{point.get_absolute_url}}',
-                            name: '  {{point.name}}'
+                            name: '{{point.name}}'
                         }),
                     {% endfor %}
                 ]

lostplaces/lostplaces_app/templates/place/place_list.html

@@ -2,57 +2,57 @@
 {% load static %}
 
 {% block additional_head %}
-<link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
+    <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
-<script src="{% static 'maps/ol.js' %}"></script>
+    <script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
 {% block title %}Lost Places{% endblock %}
 
 {% block maincontent %}
 
-{% include 'partials/osm_map.html' with config=map_config %}
+{% include 'partials/osm_map.html' %}
 <div class="LP-PlaceList">
     <h1 class="LP-Headline">Listing our places</h1>
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
-        <li class="LP-PlaceList__Item">
+            <li class="LP-PlaceList__Item">
-            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-                <article class="LP-PlaceTeaser LP-PlaceTeaser--extended">
+                    <article class="LP-PlaceTeaser LP-PlaceTeaser--extended">
-                    <div class="LP-PlaceTeaser__Image">
+                        <div class="LP-PlaceTeaser__Image">
-                        <img class="LP-Image" src="{{ place.images.first.filename.thumbnail.url }}" />
+                            <img class="LP-Image" src="{{ place.images.first.filename.thumbnail.url }}" />
-                    </div>
-                    <div class="LP-PlaceTeaser__Meta">
-                        <div class="LP-PlaceTeaser__Info">
-                            <span class="LP-PlaceTeaser__Title">
-                                <h2 class="LP-Headline LP-Headline--teaser">{{place.name}}</h2>
-                            </span>
-                            <span class="LP-PlaceTeaser__Detail">
-                                <p class="LP-Paragraph">{{place.location}}</p>
-                            </span>
                         </div>
-                        <div class="LP-PlaceTeaser__Description">
+                        <div class="LP-PlaceTeaser__Meta">
-                            <p class="LP-Paragraph">
+                            <div class="LP-PlaceTeaser__Info">
-                                {% if place.description|length > 210 %}
+                                <span class="LP-PlaceTeaser__Title">
-                                {{place.description|truncatechars:210|truncatewords:-1}}
+                                    <h2 class="LP-Headline LP-Headline--teaser">{{place.name}}</h2>
-                                {% else %}
+                                </span>
-                                {{place.description}}
+                                <span class="LP-PlaceTeaser__Detail">
-                                {% endif %}
+                                    <p class="LP-Paragraph">{{place.location}}</p>
-                            </p>
+                                </span>
-                        </div>
+                            </div>
-                        <div class="LP-PlaceTeaser__Icons">
+                            <div class="LP-PlaceTeaser__Description">
-                            <ul class="LP-Icon__List">
+                                <p class="LP-Paragraph">
-                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
+                                    {% if place.description|length > 210 %}
+                                        {{place.description|truncatechars:210|truncatewords:-1}}
+                                    {% else %}
+                                        {{place.description}}
+                                    {% endif %}
+                                </p>
+                            </div>
+                            <div class="LP-PlaceTeaser__Icons">
+                                <ul class="LP-Icon__List">
+                                    <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
                                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
                                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
-                            </ul>
+                                </ul>
+                            </div>
                         </div>
-                    </div>
+                    </article>
-                </article>
+                </a>
-            </a>
+            </li>
-        </li>
         {% endfor %}
     </ul>
-
+    
     {% include 'partials/nav/pagination.html' %}
 
 </div>

lostplaces/lostplaces_app/tests/views/test_place_views.py

@@ -68,6 +68,6 @@ class TestPlaceListView(ViewTestCase, TestCase):
         self.client.login(username='testpeter', password='Develop123')
         response = self.client.get(reverse_lazy('place_list'))
         
-        self._test_has_context_key(response, 'map_config')
+        self._test_has_context_key(response, 'place_map_center')
     
     

lostplaces/lostplaces_app/views/place_views.py

@@ -23,10 +23,7 @@ class PlaceListView(IsAuthenticated, ListView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['map_config'] = {
+        context['place_map_center'] = Place.average_latlon(context['place_list'])
-            'point_list': context['place_list'],
-            'map_center': Place.average_latlon(context['place_list'])
-        }
         return context
 
 class PlaceDetailView(IsAuthenticated, View):

lostplaces/lostplaces_app/views/views.py

@@ -27,12 +27,10 @@ class SignUpView(SuccessMessageMixin, CreateView):
 class HomeView(IsAuthenticated, View):
     def get(self, request, *args, **kwargs):
         place_list = Place.objects.all().order_by('-submitted_when')[:10]
+        place_map_center = Place.average_latlon(place_list)
         context = {
             'place_list': place_list,
-            'map_config': {
+            'place_map_center': place_map_center
-                'point_list': place_list,
-                'map_center': Place.average_latlon(place_list)
-            }
         }
         return render(request, 'home.html', context)