Merge pull request #220 from Seshat-Global-History-Databank/bug-208

Add version parameter to JS file includes to ensure latest version is used

seshat/apps/core/templates/core/polity_map.html

@@ -243,7 +243,7 @@ <h2 class="h2 text-dark federicka-medium">
                 style="width: 100%;" list="yearTickmarks">
             <div id="yearTickmarkValues"></div><br>
         </div>
-        <script src="{% static 'core/js/map_functions.js' %}"></script>
+        <script src="{% static 'core/js/map_functions.js' %}?v={{ version }}"></script>
         <script>
 
             // Hide components/polity switch for now so "Polity components" is always displayed

seshat/apps/core/templates/core/world_map.html

@@ -559,7 +559,7 @@ <h2>How to use the Seshat World Map</h2>
             </div>
         </div>
     </div>
-    <script src="{% static 'core/js/map_functions.js' %}"></script>
+    <script src="{% static 'core/js/map_functions.js' %}?v={{ version }}"></script>
     <script>
 
         // Hide components/polity switch for now so "Full polities" is always displayed

seshat/apps/core/views.py

@@ -4578,6 +4578,9 @@ def map_view_initial(request):
     # Set the last year in history we ever want to display, which will be used to determine when we should say "present"
     content['last_history_year'] = content['latest_year']  # Set this to the latest year in the data or a value of choice
 
+    # Add version parameter to force browser to fetch the latest JS file
+    content['version'] = int(time.time())
+
     return render(request,
                   'core/world_map.html',
                   content
@@ -4611,6 +4614,9 @@ def map_view_all(request):
     # Set the last year in history we ever want to display, which will be used to determine when we should say "present"
     content['last_history_year'] = content['latest_year']  # Set this to the latest year in the data or a value of choice
 
+    # Add version parameter to force browser to fetch the latest JS file
+    content['version'] = int(time.time())
+
     return JsonResponse(content)
 
 def map_view_all_with_vars(request):
@@ -4653,6 +4659,9 @@ def map_view_all_with_vars(request):
     content['highest_complexity_values']['military_level'] = max([max(filter(None, shape['military_level']), default=0) for shape in content['shapes'] if shape['military_level']], default=0)
     content['highest_complexity_values']['administrative_level'] = max([max(filter(None, shape['administrative_level']), default=0) for shape in content['shapes'] if shape['administrative_level']], default=0)
 
+    # Add version parameter to force browser to fetch the latest JS file
+    content['version'] = int(time.time())
+
     return JsonResponse(content)
 
 def provinces_and_countries_view(request):