From 8b073f7054f4c825bdd934696201661fd7a58d3e Mon Sep 17 00:00:00 2001
From: hannes-kl <hannes.klinckaert@ugent.be>
Date: Wed, 28 Nov 2018 20:26:08 +0100
Subject: [PATCH 1/4] move leaflet map to partial

---
 layouts/eventpost.erb     | 63 +--------------------------------------
 layouts/partials/_map.erb | 62 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 62 deletions(-)
 create mode 100644 layouts/partials/_map.erb

diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb
index 8633a46..3ead2ca 100644
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@@ -78,72 +78,11 @@
       <div class="content has-text-justified is-medium-responsive">
         <%= yield %>
       </div>
-
-      <!-- MAPS -->
-      <div class="map-wrapper box">
-          <div id="map-error" class="is-invisible" style="height:100%;width:100%;position:absolute;left:0;top:0;background-color:#00000066;z-index:1000;color:white;font-size:30px;display:flex;justify-content:center;align-items:center;padding:50px;">
-              Could not find location. Please create an issue on github.
-          </div>
-          <div id="map" style="height:100%;"></div>
-      </div>
+      <%= render '/partials/_map.erb', location: item[:locationlink] %>
     </div>
   </div>
 </section>
 
-<script>
-var map = L.map('map');
-
-L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-}).addTo(map);
-
-function performRequest(url, success_callback) {
-    var request = new XMLHttpRequest();
-    request.open('GET', url, true);
-
-    request.onload = function() {
-      if (this.status >= 200 && this.status < 400) {
-        // Success!
-        var data = JSON.parse(this.response);
-        success_callback(data);
-      } else {
-        // We reached our target server, but it returned an error
-
-      }
-    };
-
-    request.onerror = function() {
-      // There was a connection error of some sort
-    };
-
-    request.send();
-}
-
-performRequest("https://photon.komoot.de/api/?limit=1&q=<%= URI::encode(item[:locationlink]) %>", function(data) {
-    var lat, lon;
-    if(data.features.length < 1) {
-        lat = 51.0538286;
-        lon = 3.7250121;
-
-        var className = 'is-invisible';
-        var el = document.getElementById('map-error');
-
-        if (el.classList)
-          el.classList.remove(className);
-        else
-          el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
-    } else {
-        var place = data.features[0].properties;
-        lat = data.features[0].geometry.coordinates[1];
-        lon = data.features[0].geometry.coordinates[0];
-
-        L.marker([lat, lon]).addTo(map)
-            .bindPopup(place.name + ', ' + place.street + ' ' + place.housenumber)
-            .openPopup();
-    }
-    map.setView([lat, lon], 18);
-});
-</script>
 
 <!-- SPONSORED BY -->
 <% if item[:sponsors] %>
diff --git a/layouts/partials/_map.erb b/layouts/partials/_map.erb
new file mode 100644
index 0000000..9759a71
--- /dev/null
+++ b/layouts/partials/_map.erb
@@ -0,0 +1,62 @@
+      <!-- MAPS -->
+      <div class="map-wrapper box">
+          <div id="map-error" class="is-invisible" style="height:100%;width:100%;position:absolute;left:0;top:0;background-color:#00000066;z-index:1000;color:white;font-size:30px;display:flex;justify-content:center;align-items:center;padding:50px;">
+              Could not find location. Please create an issue on github.
+          </div>
+          <div id="map" style="height:100%;"></div>
+      </div>
+
+<script>
+var map = L.map('map');
+
+L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+}).addTo(map);
+
+function performRequest(url, success_callback) {
+    var request = new XMLHttpRequest();
+    request.open('GET', url, true);
+
+    request.onload = function() {
+      if (this.status >= 200 && this.status < 400) {
+        // Success!
+        var data = JSON.parse(this.response);
+        success_callback(data);
+      } else {
+        // We reached our target server, but it returned an error
+
+      }
+    };
+
+    request.onerror = function() {
+      // There was a connection error of some sort
+    };
+
+    request.send();
+}
+
+performRequest("https://photon.komoot.de/api/?limit=1&q=<%= URI::encode(@location) %>", function(data) {
+    var lat, lon;
+	if(data.features.length < 1) {
+		        lat = 51.0538286;
+		        lon = 3.7250121;
+
+		        var className = 'is-invisible';
+		        var el = document.getElementById('map-error');
+
+		        if (el.classList)
+			          el.classList.remove(className);
+		        else
+			          el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
+		    } else {
+			            var place = data.features[0].properties;
+			            lat = data.features[0].geometry.coordinates[1];
+			            lon = data.features[0].geometry.coordinates[0];
+
+			            L.marker([lat, lon]).addTo(map)
+			                .bindPopup(place.name + ', ' + place.street + ' ' + place.housenumber)
+			                .openPopup();
+			        }
+	    map.setView([lat, lon], 18);
+});
+</script>

From 484f784d88d7bb08977879503da6a652a5a210cb Mon Sep 17 00:00:00 2001
From: hannes-kl <hannes.klinckaert@ugent.be>
Date: Tue, 4 Dec 2018 19:15:29 +0100
Subject: [PATCH 2/4] changed google maps to OSM

---
 content/about/contact.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/contact.erb b/content/about/contact.erb
index 98922db..6fab6f2 100644
--- a/content/about/contact.erb
+++ b/content/about/contact.erb
@@ -122,5 +122,5 @@ contact_links:
 
 <!-- Embedded Google Maps -->
 <div class="map-wrapper box">
-  <iframe id='google-maps' src='https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1156.8611760710044!2d3.7102397000000003!3d51.023149499999995!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47c373c271502d9b%3A0x49fd54f81cafeb5f!2sZeus+WPI!5e0!3m2!1sen!2sbe!4v1481415854540' height='450' style='border:0;width:100%' allowfullscreen></iframe>
+    <%= render '/partials/_map.erb', location: item[:locationlink] %>
 </div>

From cbd50d9310731b4b50c2aed9d876dd9a2dd9b460 Mon Sep 17 00:00:00 2001
From: hannes-kl <hannes.klinckaert@ugent.be>
Date: Tue, 4 Dec 2018 20:12:03 +0100
Subject: [PATCH 3/4] Moved css and js links to _map.erb

---
 layouts/eventpost.erb     |  2 --
 layouts/partials/_map.erb | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb
index 3ead2ca..353318e 100644
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@@ -13,8 +13,6 @@
 <meta name="twitter:data2" value="<%= item[:location] %>" />
 <meta name="twitter:card" content="summary_large_image" />
 
-<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
-<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
 <% end %>
 
 <% if item[:banner] %>
diff --git a/layouts/partials/_map.erb b/layouts/partials/_map.erb
index 9759a71..e238198 100644
--- a/layouts/partials/_map.erb
+++ b/layouts/partials/_map.erb
@@ -1,4 +1,12 @@
-      <!-- MAPS -->
+<% content_for :head do %>
+
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
+<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
+
+<% end %>
+
+
+<!-- MAPS -->
       <div class="map-wrapper box">
           <div id="map-error" class="is-invisible" style="height:100%;width:100%;position:absolute;left:0;top:0;background-color:#00000066;z-index:1000;color:white;font-size:30px;display:flex;justify-content:center;align-items:center;padding:50px;">
               Could not find location. Please create an issue on github.

From 0dada8f80509fe7ecc0ce9578214d4517e327099 Mon Sep 17 00:00:00 2001
From: hannes-kl <hannes.klinckaert@ugent.be>
Date: Tue, 4 Dec 2018 20:46:14 +0100
Subject: [PATCH 4/4] fixed bugs : Google Maps to OSM

---
 content/about/contact.erb | 9 ++++++++-
 layouts/eventpost.erb     | 3 +++
 layouts/partials/_map.erb | 8 --------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/content/about/contact.erb b/content/about/contact.erb
index 6fab6f2..8beff40 100644
--- a/content/about/contact.erb
+++ b/content/about/contact.erb
@@ -31,6 +31,13 @@ contact_links:
     description: Phone
     action: Call us
 ---
+
+<% content_for :head do %>
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
+<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
+<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
+<% end %>
+
 <%= render '/partials/_about_sub_navbar.*', selected: 'contact' %>
 <h1 class='title is-1 has-text-centered'>Contact us</h1>
 <h2 class='subtitle is-4 has-text-centered has-text-weight-light'>bleep bloop</h1>
@@ -122,5 +129,5 @@ contact_links:
 
 <!-- Embedded Google Maps -->
 <div class="map-wrapper box">
-    <%= render '/partials/_map.erb', location: item[:locationlink] %>
+    <%= render '/partials/_map.erb', location: "Zeus WPI" %>
 </div>
diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb
index 353318e..2a6d72d 100644
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@@ -13,6 +13,9 @@
 <meta name="twitter:data2" value="<%= item[:location] %>" />
 <meta name="twitter:card" content="summary_large_image" />
 
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
+<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
+
 <% end %>
 
 <% if item[:banner] %>
diff --git a/layouts/partials/_map.erb b/layouts/partials/_map.erb
index e238198..d703c7d 100644
--- a/layouts/partials/_map.erb
+++ b/layouts/partials/_map.erb
@@ -1,11 +1,3 @@
-<% content_for :head do %>
-
-<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
-<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
-
-<% end %>
-
-
 <!-- MAPS -->
       <div class="map-wrapper box">
           <div id="map-error" class="is-invisible" style="height:100%;width:100%;position:absolute;left:0;top:0;background-color:#00000066;z-index:1000;color:white;font-size:30px;display:flex;justify-content:center;align-items:center;padding:50px;">