From 8c9d48c885a52d8399ef2d13d8269184bd15c875 Mon Sep 17 00:00:00 2001
From: Daniel Pett <danielpett@gmail.com>
Date: Sun, 23 Jul 2023 09:57:37 +0100
Subject: [PATCH] Fix map

---
 _includes/structure/javascript.html |  4 +--
 _includes/structure/map.html        | 52 +++++++++++++++--------------
 map.md                              |  3 +-
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/_includes/structure/javascript.html b/_includes/structure/javascript.html
index e6300c8..e8bd65b 100644
--- a/_includes/structure/javascript.html
+++ b/_includes/structure/javascript.html
@@ -6,6 +6,4 @@
 <!-- Cookie management -->
 <script defer type="text/javascript" src="{{site.baseurl}}/js/config.js"></script>
 <script defer type="text/javascript" src="{{site.baseurl}}/js/klaro.js"></script>
-<!-- End of body -->
-
-<script>
+<!-- End of body -->
\ No newline at end of file
diff --git a/_includes/structure/map.html b/_includes/structure/map.html
index 116c97e..799c879 100644
--- a/_includes/structure/map.html
+++ b/_includes/structure/map.html
@@ -3,34 +3,36 @@
 
 <script type="text/javascript">
 
-var dareLayer = L.tileLayer('https://dh.gu.se/tiles/imperium/{z}/{x}/{y}.png', {
-              attribution: 'Tiles: <a href="http://imperium.ahlfeldt.se/">DARE 2014</a>'
-            }),
+    var dareLayer = L.tileLayer('https://dh.gu.se/tiles/imperium/{z}/{x}/{y}.png', {
+            attribution: 'Tiles: <a href="http://imperium.ahlfeldt.se/">DARE 2014</a>'
+        }),
 
-            awmcLayer = L.tileLayer('https://dh.gu.se/tiles/imperium/{z}/{x}/{y}.png', {
-              attribution: 'Recogito/Pelagios Tiles &copy; <a href="http://mapbox.com/" target="_blank">MapBox</a> | ' +
-                'Data &copy; <a href="https://www.openstreetmap.org/" target="_blank">OpenStreetMap</a> and contributors, CC-BY-SA | '+
+        awmcLayer = L.tileLayer('https://dh.gu.se/tiles/imperium/{z}/{x}/{y}.png', {
+            attribution: 'Recogito/Pelagios Tiles &copy; <a href="http://mapbox.com/" target="_blank">MapBox</a> | ' +
+                'Data &copy; <a href="https://www.openstreetmap.org/" target="_blank">OpenStreetMap</a> and contributors, CC-BY-SA | ' +
                 'Tiles and Data &copy; 2013 <a href="http://www.awmc.unc.edu" target="_blank">AWMC</a> ' +
                 '<a href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US" target="_blank">CC-BY-NC 3.0</a>'
-            });
-
-        var map = new L.Map('map', {
-          center: new L.LatLng(34.82,24.14 ),
-          zoom: 5,
-          layers: [awmcLayer],
-          minZoom: 5,
-          maxZoom: 11
         });
-{% for json in page.geoJson %}
-  // load GeoJSON from an external file
-  $.getJSON("{{site.baseurl}}{{json.file}}",function(data){
-    // add GeoJSON layer to the map once the file is loaded
-    L.geoJson(data, {
-  onEachFeature: function (feature, layer) {
-    layer.bindPopup('<h3 class="lead text-info">'+feature.properties.titles+'</h3>');
-  }
-}).addTo(map);
-  });
-{% endfor %}
+
+    var map = new L.Map('map', {
+        center: new L.LatLng(34.82, 24.14),
+        zoom: 5,
+        layers: [awmcLayer],
+        minZoom: 5,
+        maxZoom: 11
+    });
+    {%
+        for json in page.geoJson %}
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', '{{site.baseurl}}{{json.file}}');
+    xhr.setRequestHeader('Content-Type', 'application/json');
+    xhr.responseType = 'json';
+    xhr.onload = function () {
+        if (xhr.status !== 200) return
+        L.geoJSON(xhr.response).addTo(map);
+    };
+    xhr.send();
+    {% endfor %}
 </script>
 {% endif %}
diff --git a/map.md b/map.md
index 7688e8a..0534b1f 100644
--- a/map.md
+++ b/map.md
@@ -4,7 +4,6 @@ layout: funders
 geoJson:
   -
     file: /geojson/places.json
-  -
-    file: /geojson/secondary.json
+ 
 ---
 <div id="map" style="width: 100%; height: 600px;"></div>