Fixing Map loading since merges

publiclab · Aug 15, 2019 · 62d6a80 · 62d6a80
1 parent 12dd9c1
commit 62d6a80
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 93 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -11,42 +11,37 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 
-//= require leaflet/dist/leaflet-src.js
 
-//= require jquery
-//= require jquery-ujs
-//= require jquery/dist/jquery.js
-//= require jquery-ujs/src/rails.js 
-//= require jquery-ui/jquery-ui.min.js
+// = require leaflet/dist/leaflet-src.js
+
+// = require jquery
+// = require jquery-ujs
+// = require jquery/dist/jquery.js
+// = require jquery-ujs/src/rails.js 
+// = require jquery-ui/jquery-ui.min.js
 
 //= require blueimp-tmpl/js/tmpl.js
 //= require blueimp-file-upload/js/vendor/jquery.ui.widget
 //= require blueimp-file-upload/js/jquery.fileupload
 //= require blueimp-file-upload/js/jquery.fileupload-process
 //= require blueimp-file-upload/js/jquery.fileupload-ui
 
-//= require popper
-//= require bootstrap/dist/js/bootstrap.js
+// = require bootstrap/dist/js/bootstrap.js
 
-//= require leaflet-fullHash.js
-//= require leaflet-providers/leaflet-providers.js
-//= require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
-//= require leaflet-environmental-layers/src/windRoseLayer.js
-//= require leaflet-easybutton/src/easy-button.js
-//= require sparklines/source/sparkline.js
-//= require glfx-js/dist/glfx.js
-//= require ion-rangeslider/js/ion.rangeSlider.js
-//= require exif-js/exif.js
-//= require webgl-distort/dist/webgl-distort.js
-//= require mapknitter/core/Class.js
-//= require leaflet-spin/example/spin/dist/spin.min.js
-//= require leaflet-spin/example/leaflet.spin.min.js
-//= require image-sequencer/dist/image-sequencer.js
-//= require leaflet-toolbar/dist/leaflet.toolbar.js
-//= require leaflet-draw/dist/leaflet.draw-src.js
-//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
-//= require leaflet-illustrate/dist/Leaflet.Illustrate.js
-//= require leaflet-distortableimage/src/edit/tools/EditAction.js
-//= require mapknitter/Map.js
+// = require leaflet-fullHash.js
+// = require leaflet-providers/leaflet-providers.js
+// = require leaflet-toolbar/dist/leaflet.toolbar.js
+//=  require leaflet-draw/dist/leaflet.draw-src.js
+//=  require leaflet-illustrate/dist/Leaflet.Illustrate.js
+// = require leaflet-distortableimage/dist/leaflet.distortableimage.js
+// = require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
+// = require leaflet-environmental-layers/src/windRoseLayer.js
+// = require leaflet-easybutton/src/easy-button.js
+// = require sparklines/source/sparkline.js
+// = require glfx-js/dist/glfx.js
+// = require ion-rangeslider/js/ion.rangeSlider.js
+// = require exif-js/exif.js
+// = require webgl-distort/dist/webgl-distort.js
+// = require mapknitter/core/Class.js
 
-//= require_tree .
+// = require_tree .
diff --git a/app/views/front_ui/index.html.erb b/app/views/front_ui/index.html.erb
@@ -1,5 +1,7 @@
 <%# <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
 <%# # <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %> 
+<%= javascript_include_tag('/assets/leaflet-spin/example/spin/dist/spin.min.js') %>
+<%= javascript_include_tag('/assets/leaflet-spin/example/leaflet.spin.min.js') %>
 <%= javascript_include_tag('leaflet-fullHash.js') %>
 
 <style>
@@ -344,4 +346,4 @@
     //    "windrose (zoom in)": windrose
   };
   L.control.layers(baseMaps, overlayMaps).addTo(Mapknitterunique);
-</script>
+</script>
diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
@@ -1,8 +1,5 @@
-<%= javascript_include_tag('/node_modules/leaflet-fullhash/leaflet-fullHash.js') %>
-<%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
-<%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %>
-<%= javascript_include_tag('/node_modules/leaflet-spin/example/spin/dist/spin.min.js') %>
-<%= javascript_include_tag('/node_modules/leaflet-spin/example/leaflet.spin.min.js') %>
+<%= javascript_include_tag('/assets/leaflet-spin/example/spin/dist/spin.min.js') %>
+<%= javascript_include_tag('/assets/leaflet-spin/example/leaflet.spin.min.js') %>
 
 <div class="container-fluid">
   <div id="mapknitter-unique" style="height: 300px ; width: 100% ;  margin-bottom: 1%; z-index: 5;"></div> 
@@ -122,51 +119,40 @@
   jQuery(document).ready(function($) {
     $("#loginModal").appendTo("body");
   });
-    var bounds = L.latLngBounds(L.latLng(84.67351257 , -172.96875) , L.latLng(-54.36775852 , 178.59375)) ;
-    var Mapknitterunique = L.map('mapknitter-unique' , {
-      maxBounds: bounds , 
-      maxBoundsViscosity: 0.75
-    }).setView([43, -83] , 2);  
-    Mapknitterunique.options.minZoom = 2 ;
-
-    //L.tileLayer('').addTo() ; 
-  //  L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
-     var baselayer = 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(Mapknitterunique) ; 
-
-    Mapknitterunique.addControl(new L.Control.Fullscreen()); // to go full-screen
-    Mapknitterunique.on('fullscreenchange', function () {
-      if (Mapknitterunique.isFullscreen()) {
-        Mapknitterunique.options.minZoom = 3 ;
-       } 
-      else {
-        Mapknitterunique.options.minZoom = 1 ;
-       // Mapknitterunique.panTo(new L.LatLng(lat,lon));
-      }
-    });
-
-   // var PurpleLayer = L.layerGroup.purpleLayer() ;
-    var PurpleAirMarkerLayer = L.layerGroup.purpleAirMarkerLayer() ;
-    var SkyTruth = L.layerGroup.skyTruthLayer() ;
-    var Fractracker = L.layerGroup.fracTrackerLayer() ;
-    var OdorReport = L.layerGroup.odorReportLayer() ;
-    var MapKnitter = L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique) ;
-    var ToxicRelease = L.layerGroup.toxicReleaseLayer() ;
-
-    var OpenInfraMap_Power = L.tileLayer('https://tiles-{s}.openinframap.org/power/{z}/{x}/{y}.png',{
-        maxZoom: 18,
-        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-    var OpenInfraMap_Petroleum = L.tileLayer('https://tiles-{s}.openinframap.org/petroleum/{z}/{x}/{y}.png', {
-      maxZoom: 18,
-      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-    var OpenInfraMap_Telecom = L.tileLayer('https://tiles-{s}.openinframap.org/telecoms/{z}/{x}/{y}.png', {
-      maxZoom: 18,
-      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-    var OpenInfraMap_Water = L.tileLayer('https://tiles-{s}.openinframap.org/water/{z}/{x}/{y}.png',{
+
+  var bounds = new L.LatLngBounds(new L.LatLng(84.67351257 , -172.96875) , new L.LatLng(-54.36775852 , 178.59375)) ;
+  var Mapknitterunique = new L.map('mapknitter-unique' , {
+    maxBounds: bounds , 
+    maxBoundsViscosity: 0.75
+  }).setView([43, -83] , 2);  
+  Mapknitterunique.options.minZoom = 2 ;
+
+  //L.tileLayer('').addTo() ; 
+//  L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
+    var baselayer = 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(Mapknitterunique) ; 
+
+  Mapknitterunique.addControl(new L.Control.Fullscreen()); // to go full-screen
+  Mapknitterunique.on('fullscreenchange', function () {
+    if (Mapknitterunique.isFullscreen()) {
+      Mapknitterunique.options.minZoom = 3 ;
+      } 
+    else {
+      Mapknitterunique.options.minZoom = 1 ;
+      // Mapknitterunique.panTo(new L.LatLng(lat,lon));
+    }
+  });
+
+  // var PurpleLayer = L.layerGroup.purpleLayer() ;
+  var PurpleAirMarkerLayer = L.layerGroup.purpleAirMarkerLayer() ;
+  var SkyTruth = L.layerGroup.skyTruthLayer() ;
+  var Fractracker = L.layerGroup.fracTrackerLayer() ;
+  var OdorReport = L.layerGroup.odorReportLayer() ;
+  var MapKnitter = L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique) ;
+  var ToxicRelease = L.layerGroup.toxicReleaseLayer() ;
+
+  var OpenInfraMap_Power = L.tileLayer('https://tiles-{s}.openinframap.org/power/{z}/{x}/{y}.png',{
       maxZoom: 18,
       attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
   });
@@ -249,4 +235,4 @@
   };
   L.control.layers(baseMaps,overlayMaps).addTo(Mapknitterunique);
 
-</script>
+</script>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
@@ -1,12 +1,12 @@
-<%= stylesheet_link_tag "/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/windRoseLayer.js') %>
-<%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %>
+<%= stylesheet_link_tag "/assets/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
+<%= javascript_include_tag('/assets/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
+<%= javascript_include_tag('/assets/leaflet-environmental-layers/dist/windRoseLayer.js') %>
+<%= javascript_include_tag('/assets/leaflet-fullhash/leaflet-fullHash.js') %>
 <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
 <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %>
 
-<%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
-<%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
+<%= javascript_include_tag('/assets/leaflet-spin/example/spin/dist/spin.min.js') %>
+<%= javascript_include_tag('/assets/leaflet-spin/example/leaflet.spin.min.js') %>
 
 <div class="container-fluid">
   <div id="mapknitter-unique" class="mx-auto" style="height: 450px; width: 100%;">

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -11,12 +11,13 @@
     config.assets.paths << Rails.root.join('node_modules')
 
     config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
-    config.assets.precompile += ['tags.js',
-                               'uploads.js',
-                               'knitter.js',
-                               'annotations.js',
-                               'maps.js',
-                               'leaflet-fullHash.js']
+    config.assets.precompile += ['uploads.js',
+                                 'knitter.js',
+                                 'annotations.js',
+                                 'maps.js',
+                                 'mapknitter.js',
+                                 'leaflet-fullHash.js'
+                                ]
 
     # Precompile additional assets.
     # application.js, application.css, and all non-JS/CSS in the app/assets