Initial refactor to extract some common logic

Author: JPrevost

app/views/record/_record_geo.html.erb

@@ -63,16 +63,6 @@
     <!-- We only care about geospatial locations for this, as place names are also subjects. -->
     <% if geospatial_coordinates?(@record['locations']) %>
       <h3 class="section-title">Geospatial coordinates</h3>
-      <% content_for :additional_meta_tag do %>
-        <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
-          integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
-          crossorigin=""/>
-
-      <!-- Make sure you put this AFTER Leaflet's CSS -->
-          <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
-              integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
-              crossorigin=""></script>
-      <% end %>
 
       <div id="map" style="height: 180px"></div>
       <script>

app/views/record/view.html.erb

@@ -9,6 +9,17 @@
 <% if @record.nil? %>
   <%= render('record_empty') %>
 <% elsif Flipflop.enabled?(:gdt) %>
+  <% content_for :additional_meta_tag do %>
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
+      integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+      crossorigin=""/>
+
+  <!-- Make sure you put this AFTER Leaflet's CSS -->
+    <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
+        integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
+        crossorigin=""></script>
+  <% end %>
+
   <%= render('record_geo') %>
 <% else %>
   <%= render('record') %>

app/views/search/_result_geo.html.erb

@@ -24,39 +24,8 @@
 
     <!-- We only care about geospatial locations for this, as place names are also subjects. -->
     <% if geospatial_coordinates?(result_geo['locations']) %>
-      <% content_for :additional_meta_tag do %>
-        <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
-          integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
-          crossorigin=""/>
-
-      <!-- Make sure you put this AFTER Leaflet's CSS -->
-          <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
-              integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
-              crossorigin=""></script>
-      <% end %>
-      <div id=<%= "map_#{result_geo_counter}" %> style="height: 180px"></div>
-
-      <script>
-        var <%= "map_#{result_geo_counter}" %> = L.map('<%= "map_#{result_geo_counter}" %>');
-        
-        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-          maxZoom: 19,
-          attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-        }).addTo(<%= "map_#{result_geo_counter}" %>);
-
-        // define rectangle geographical bounds
-        // -71.158693, -71.064796, 42.395972, 42.351993
-        // var bounds = [[42.395972, -71.158693],[42.351993, -71.064796]];
-
-        console.log('#<%= bounding_box_to_coords(result_geo) %>');
-        var bounds = <%= bounding_box_to_coords(result_geo) %>;
-
-        // create an orange rectangle
-        L.rectangle(bounds, {color: "#ff7800", weight: 1}).addTo(<%= "map_#{result_geo_counter}" %>);
-
-        // zoom the map to the rectangle bounds
-        <%= "map_#{result_geo_counter}" %>.fitBounds(bounds);
-      </script>
+      
+      <%= render partial: 'shared/map', locals: { result_geo_counter: result_geo_counter,  result_geo: result_geo} %>
 
       <p>
         <ul>

app/views/search/results.html.erb

@@ -1,5 +1,16 @@
 <%= content_for(:title, results_page_title(@enhanced_query)) %>
 
+<% content_for :additional_meta_tag do %>
+  <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
+    integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+    crossorigin=""/>
+
+<!-- Make sure you put this AFTER Leaflet's CSS -->
+  <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
+      integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
+      crossorigin=""></script>
+<% end %>
+
 <div class="space-wrap">
 
   <%= render partial: "shared/site_title" %>

app/views/shared/_map.html.erb

@@ -0,0 +1,21 @@
+<div id=<%= "map_#{result_geo_counter}" %> style="height: 180px"></div>
+
+<script>
+  var <%= "map_#{result_geo_counter}" %> = L.map('<%= "map_#{result_geo_counter}" %>');
+  
+  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+  }).addTo(<%= "map_#{result_geo_counter}" %>);
+
+  // define rectangle geographical bounds
+  var bounds = <%= bounding_box_to_coords(result_geo) %>;
+
+  // console.log(bounds);
+
+  // create an orange rectangle
+  L.rectangle(bounds, {color: "#ff7800", weight: 1}).addTo(<%= "map_#{result_geo_counter}" %>);
+
+  // zoom the map to the rectangle bounds
+  <%= "map_#{result_geo_counter}" %>.fitBounds(bounds);
+</script>