blacklight_heatmaps 1.3.1 → 2.0.0

data/vendor/assets/javascripts/leaflet_solr_heatmap.js

@@ -1,3 +1,5 @@
+import geostats from './geostats'
+
 L.SolrHeatmap = L.GeoJSON.extend({
   options: {
     solrRequestHandler: 'select',
@@ -136,7 +138,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
   _getGradient: function (classifications) {
     var gradient = {};
     var maxValue = classifications[classifications.length - 1];
-    var colors = _this.options.colors; 
+    var colors = _this.options.colors;
     // skip first lower bound, assumed to be 0 from Jenks
     for (var i = 1; i < classifications.length; i++)
   gradient[classifications[i] / maxValue] = colors[i];
@@ -145,7 +147,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
 
   // compute size of heatmap cells in pixels
   _getCellSize: function () {
-    _this = this;
+    const _this = this;
     var mapSize = _this._map.getSize();  // should't we use solr returned map extent?
     var widthInPixels = mapSize.x;
     var heightInPixels = mapSize.y;
@@ -261,7 +263,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
   // Jenks classification can be slow so we optionally sample the data
   // typically any big sample of counts are much the same, don't need to classify on all of them
   _sampleCounts: function (passedArray) {
-    _this = this;
+    const _this = this;
     if (passedArray.length <= _this.options.maxSampleSize) {
       return passedArray;   // array too small to sample
     }
@@ -269,7 +271,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
     var maxValue = Math.max.apply(Math, passedArray);
     var sampledArray = [];
     var period = Math.ceil(passedArray.length / _this.options.maxSampleSize);
-    for (i = 0; i < passedArray.length; i = i + period) {
+    for (let i = 0; i < passedArray.length; i = i + period) {
       sampledArray.push(passedArray[i]);
     }
 

metadata

@@ -1,42 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-12-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -46,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -79,21 +59,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 7.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,7 +107,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,7 +121,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
+- !ruby/object:Gem::Dependency
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,19 +149,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '0'
 description: Search and view Blacklight resources on a map.
 email:
 - phillipjreed@gmail.com
@@ -173,17 +173,19 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/blacklight/heatmaps.svg
-- app/assets/javascripts/blacklight_heatmaps/basemaps.js
-- app/assets/javascripts/blacklight_heatmaps/blacklight_heatmaps.js
+- app/assets/javascripts/blacklight_heatmaps/default.esm.js
+- app/assets/javascripts/blacklight_heatmaps/default.esm.js.map
 - app/assets/javascripts/blacklight_heatmaps/default.js
-- app/assets/javascripts/blacklight_heatmaps/icons.js
-- app/assets/javascripts/blacklight_heatmaps/viewers/index.js
-- app/assets/javascripts/blacklight_heatmaps/viewers/show.js
-- app/assets/javascripts/index.js
+- app/assets/javascripts/blacklight_heatmaps/default.js.map
 - app/assets/stylesheets/blacklight_heatmaps/default.scss
 - app/components/blacklight_heatmaps/icons/heatmaps_component.rb
 - app/controllers/blacklight_heatmaps/application_controller.rb
 - app/helpers/blacklight/maps_helper.rb
+- app/javascript/basemaps.js
+- app/javascript/blacklight_heatmaps.js
+- app/javascript/icons.js
+- app/javascript/viewers/index.js
+- app/javascript/viewers/show.js
 - app/models/concerns/blacklight_heatmaps/bounding_box.rb
 - app/models/concerns/blacklight_heatmaps/exceptions.rb
 - app/models/concerns/blacklight_heatmaps/geometry_parser.rb
@@ -203,9 +205,9 @@ files:
 - lib/blacklight_heatmaps/engine.rb
 - lib/blacklight_heatmaps/version.rb
 - lib/generators/blacklight_heatmaps/install_generator.rb
-- lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.js
-- lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.scss
+- lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.css
 - lib/tasks/blacklight_heatmaps_tasks.rake
+- spec/examples.txt
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
@@ -243,11 +245,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Search and view Blacklight resources on a map.
 test_files:
+- spec/examples.txt
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb

data/app/assets/javascripts/blacklight_heatmaps/blacklight_heatmaps.js

@@ -1,18 +0,0 @@
-!(function (global) {
-  'use strict';
-
-  var BlacklightHeatmaps = L.Class.extend({
-    statics: {
-      __version__: '0.0.3',
-
-      selectBasemap: function (basemap) {
-        if (basemap && basemap !== undefined) {
-          return BlacklightHeatmaps.Basemaps[basemap];
-        } else {
-          return BlacklightHeatmaps.Basemaps.positron;
-        }
-      },
-    },
-  });
-  global.BlacklightHeatmaps = BlacklightHeatmaps;
-}(this));

data/app/assets/javascripts/blacklight_heatmaps/icons.js

@@ -1,3 +0,0 @@
-BlacklightHeatmaps.Icons = {
-  default: new L.Icon.Default()
-};

data/app/assets/javascripts/blacklight_heatmaps/viewers/index.js

@@ -1,91 +0,0 @@
-Blacklight.onLoad(function () {
-  'use strict';
-
-  document.querySelectorAll('[data-index-map]').forEach(function (el) {
-    BlacklightHeatmaps.indexView(el, {});
-  });
-});
-
-!(function (global) {
-  'use strict';
-
-  var IndexView = L.Class.extend({
-    options: {},
-
-    initialize: function (el, options) {
-      var requestUrl = el.dataset.searchUrl + '&format=heatmaps';
-      var geometryField = el.dataset.geometryField;
-      var template = el.dataset.sidebarTemplate;
-      var colorRamp = JSON.parse(el.dataset.colorRamp);
-
-      // Blank out page link content first and disable pagination
-      document.querySelectorAll('#sortAndPerPage .page-links').forEach(function (links) {
-        links.innerHTML = '';
-      });
-      document.querySelectorAll('ul.pagination').forEach(function (links) {
-        links.classList.add('d-none');
-      });
-
-      var map = L.map(el.id).setView([0, 0], 1);
-      var basemap = BlacklightHeatmaps.selectBasemap(
-        el.dataset.basemapProvider
-      ).addTo(map);
-
-      var solrLayer = L.solrHeatmap(requestUrl, {
-        field: geometryField,
-        maxSampleSize: 50,
-        colors: colorRamp,
-      }).addTo(map);
-
-      var sidebar = L.control.sidebar('index-map-sidebar', {
-        position: 'right',
-      });
-
-      map.addControl(sidebar);
-
-      solrLayer.on('click', function (e) {
-        if (!sidebar.isVisible()) {
-          map.setView(e.latlng);
-        } else {
-          var point = map.project(e.latlng);
-          var offset = sidebar.getOffset();
-          var newPoint = L.point(point.x - (offset / 2), point.y);
-          map.setView(map.unproject(newPoint));
-        }
-
-        sidebar.show();
-      });
-
-      solrLayer.on('dataAdded', function (e) {
-        if (e.response && e.response.docs) {
-          var html = '';
-          e.response.docs.forEach(function (value) {
-            html += L.Util.template(template, value);
-          });
-
-          sidebar.setContent(html);
-
-          var docCount = e.response.pages.total_count;
-
-          document.querySelectorAll('#sortAndPerPage .page-links').forEach(function (links) {
-            links.innerHTML = parseInt(docCount).toLocaleString() + ' ' + (docCount == 1 ? 'item' : 'items') + ' found';
-          });
-        }
-      });
-    },
-
-    pluralize: function (count, word) {
-      switch (count) {
-        case 1:
-          return word;
-        default:
-          return word + 's';
-      }
-    },
-  });
-
-  global.BlacklightHeatmaps.IndexView = IndexView;
-  global.BlacklightHeatmaps.indexView = function (el, options) {
-    return new IndexView(el, options);
-  };
-})(this);

data/app/assets/javascripts/blacklight_heatmaps/viewers/show.js

@@ -1,39 +0,0 @@
-Blacklight.onLoad(function () {
-  'use strict';
-
-  document.querySelectorAll('[data-show-map]').forEach(function (el) {
-    BlacklightHeatmaps.showView(el);
-  });
-});
-
-!(function (global) {
-  'use strict';
-
-  var ShowView = L.Class.extend({
-    options: {},
-
-    initialize: function (el, options) {
-      var json = JSON.parse(el.dataset.features);
-
-      var map = L.map(el.id).setView([0, 0], 1);
-      var basemap = BlacklightHeatmaps.selectBasemap(
-        el.dataset.basemapProvider
-      ).addTo(map);
-
-      var features = L.geoJson(json, {
-        pointToLayer: function(feature, latlng) {
-          return L.marker(latlng, {
-            icon: BlacklightHeatmaps.Icons.default
-          })
-        }
-      }).addTo(map);
-
-      map.fitBounds(features.getBounds());
-    },
-  });
-
-  global.BlacklightHeatmaps.ShowView = ShowView;
-  global.BlacklightHeatmaps.showView = function (el, options) {
-    return new ShowView(el, options);
-  };
-})(this);

data/app/assets/javascripts/index.js

@@ -1,8 +0,0 @@
-//= require leaflet
-//= require L.Control.Sidebar
-import 'blacklight-heatmaps/vendor/assets/javascripts/leaflet_solr_heatmap'
-import 'blacklight_heatmaps'
-import 'basemaps'
-import 'icons'
-import 'viewers/index'
-import 'viewers/show'

data/lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.js

@@ -1 +0,0 @@
-//= require blacklight_heatmaps/default

data/lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.scss

@@ -1 +0,0 @@
-@import 'blacklight_heatmaps/default';