From f9a77fc834e107dc92d169d045ccaee29494b8b5 Mon Sep 17 00:00:00 2001
From: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
Date: Sat, 7 Jul 2018 12:51:16 +0530
Subject: [PATCH 1/5] bower updated

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 61185f27a..afd9ce7af 100644
--- a/bower.json
+++ b/bower.json
@@ -29,7 +29,8 @@
     "glfx-js": "git+https://github.com/jywarren/glfx.js.git",
     "webgl-distort": "jywarren/webgl-distort",
     "image-sequencer": "git+https://github.com/publiclab/image-sequencer.git#~1.4.0",
-    "junction": "theleagueof/junction"
+    "junction": "theleagueof/junction",
+    "leaflet-environmental-layers": "*"
   },
   "resolutions": {
     "jquery": "^2.1.3"

From db542cb37949f0f3ec184ffdfccf3a96657b4856 Mon Sep 17 00:00:00 2001
From: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
Date: Sat, 7 Jul 2018 12:54:02 +0530
Subject: [PATCH 2/5] Map added

---
 app/views/maps/index.html.erb | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 3f90afbec..559e50d3d 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -1,3 +1,5 @@
+<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
+<%= stylesheet_link_tag "/lib/leaflet/dist/leaflet.css" %>
 <div class="container-fluid">
   <div class="row">
     <div class="col-md-3">
@@ -42,8 +44,9 @@
         <%= render :partial => 'maps/statistics' %>
       </div>
     </div><!-- .col-md-3 -->
-    <div class="maps-list col-md-9">
 
+    <div class="maps-list col-md-9">
+      <div id="mapknitter" style="height: 300px ; width: 98% ;"></div> 
       <div class="hero">
         <h1 style="margin-top:4px;">Make maps from aerial photos</h1>
         <p>
@@ -51,6 +54,7 @@
           <a class="btn btn-lg btn-success" onClick="$('#video-tutorial').toggle()"><i class="fa fa-video-camera"></i> Watch tutorial video</a>
           <a class="btn btn-lg btn-primary" href="https://publiclab.org/post?tags=mapknitter,aerial-imaging,aerial-photography,question:mapknitter,question:aerial-imaging,question:aerial-photography&template=question">Ask a question</a>
         </p>
+
       </div>
 
       <div style="display:none;" id="video-tutorial">
@@ -77,3 +81,18 @@
     </div><!-- .col-md-9 -->
   </div><!-- .row -->
 </div>
+
+<script>  
+    var bounds = new L.LatLngBounds(new L.LatLng(84.67351257 , -172.96875) , new L.LatLng(-54.36775852 , 178.59375)) ;
+    var mapknitter = L.map('mapknitter' , {
+      maxBounds: bounds , 
+      maxBoundsViscosity: 0.75
+    }).setView([43, -83], 2);  
+    mapknitter.options.minZoom = 2 ;
+
+    L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png',{
+          attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+       }).addTo(mapknitter) ; 
+    L.layerGroup.mapKnitterLayer().addTo(mapknitter);
+    
+</script>

From 499e0d5d6c7ccbdd44ee844c2a23138388a2ea1e Mon Sep 17 00:00:00 2001
From: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
Date: Sat, 7 Jul 2018 13:11:38 +0530
Subject: [PATCH 3/5] Update index.html.erb

---
 app/views/maps/index.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 559e50d3d..232621666 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -46,7 +46,8 @@
     </div><!-- .col-md-3 -->
 
     <div class="maps-list col-md-9">
-      <div id="mapknitter" style="height: 300px ; width: 98% ;"></div> 
+      <div id="mapknitter" style="height: 300px ; width: 80% ;"></div> 
+      <br>
       <div class="hero">
         <h1 style="margin-top:4px;">Make maps from aerial photos</h1>
         <p>

From 8c73df5e3455b6fea795c4d2c2b173044e288fdf Mon Sep 17 00:00:00 2001
From: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
Date: Wed, 11 Jul 2018 11:24:32 +0530
Subject: [PATCH 4/5] Update index.html.erb

---
 app/views/maps/index.html.erb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 232621666..3d3df65e2 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -1,6 +1,8 @@
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
 <%= stylesheet_link_tag "/lib/leaflet/dist/leaflet.css" %>
+<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
+
 <div class="container-fluid">
+  <div id="mapknitter-unique" style="height: 300px ; width: 80% ; margin-left: 10% ; margin-bottom: 1%"></div> 
   <div class="row">
     <div class="col-md-3">
       <% if logged_in? %>
@@ -46,7 +48,6 @@
     </div><!-- .col-md-3 -->
 
     <div class="maps-list col-md-9">
-      <div id="mapknitter" style="height: 300px ; width: 80% ;"></div> 
       <br>
       <div class="hero">
         <h1 style="margin-top:4px;">Make maps from aerial photos</h1>
@@ -85,15 +86,13 @@
 
 <script>  
     var bounds = new L.LatLngBounds(new L.LatLng(84.67351257 , -172.96875) , new L.LatLng(-54.36775852 , 178.59375)) ;
-    var mapknitter = L.map('mapknitter' , {
+    var Mapknitterunique = new L.map('mapknitter-unique' , {
       maxBounds: bounds , 
       maxBoundsViscosity: 0.75
-    }).setView([43, -83], 2);  
-    mapknitter.options.minZoom = 2 ;
+    }).setView([43, -83] , 2);  
+    Mapknitterunique.options.minZoom = 2 ;
 
-    L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png',{
-          attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-       }).addTo(mapknitter) ; 
-    L.layerGroup.mapKnitterLayer().addTo(mapknitter);
+    L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png').addTo(Mapknitterunique) ; 
+    L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
     
 </script>

From aa9d4140dbf209a9e07fb932604f1befecedc15c Mon Sep 17 00:00:00 2001
From: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
Date: Thu, 12 Jul 2018 23:19:55 +0530
Subject: [PATCH 5/5] Changed width to full width .

---
 app/views/maps/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 3d3df65e2..f858236db 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -2,7 +2,7 @@
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
 
 <div class="container-fluid">
-  <div id="mapknitter-unique" style="height: 300px ; width: 80% ; margin-left: 10% ; margin-bottom: 1%"></div> 
+  <div id="mapknitter-unique" style="height: 300px ; width: 100% ;  margin-bottom: 1%"></div> 
   <div class="row">
     <div class="col-md-3">
       <% if logged_in? %>