blacklight_heatmaps 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03189451c6ce94aa819be2e1e37b6b13682ae7b2e23346591602e78b414fae0
-  data.tar.gz: 9db2a647a7decc345acdaa2f627482b2878dfd505e25a65c9c1e57809e99f37e
+  metadata.gz: 24f086dfa95576ef614df42a0e330472852275e379efce3a10b018e22506c369
+  data.tar.gz: 3f17b5bf828fd918b39bc1fdcd2d41936b8d56083a25ca2d992d6bc75fa79e62
 SHA512:
-  metadata.gz: 05e65c68c3990bea54b4ac89092564815ef02a31bcb554e28c332d9ebfd1b49d221ddb9b6ee09bfb7352036b0e3043bde0eec91f8c3ce78c7bcaba63d90eff6b
-  data.tar.gz: ac76ff4fbb11bfb29881f6c9a966f2341123610f416aa21c2f5b64a618ea134bba46a5575f47427306f4ac5645667dee5c65f2df09a811d127c14bbe7f8c4f00
+  metadata.gz: 469bce42ba24493fd508fd413598106923b0eb0dc15f1a7bf4c71272a3fe4bbef4853e88a5cfbfbb3d5d5d60f891a118c1cb57a65d5c3dc6a6fe081d513aaa0a
+  data.tar.gz: fcc61b79be207c9fac704e5ad1c3db497928dbd5e7acc15eccc7018c56407df9c1f44670c0898384ce14f381994cb945c23a588034847e0d0ba99bfc65ea1c8c

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

@@ -1,8 +1,8 @@
 Blacklight.onLoad(function () {
   'use strict';
 
-  $('[data-index-map]').each(function () {
-    BlacklightHeatmaps.indexView(this, {});
+  document.querySelectorAll('[data-index-map]').forEach(function (el) {
+    BlacklightHeatmaps.indexView(el, {});
   });
 });
 
@@ -13,20 +13,22 @@ Blacklight.onLoad(function () {
     options: {},
 
     initialize: function (el, options) {
-      var _this = this;
-      var $el = $(el);
-      var requestUrl = $el.data().searchUrl + '&format=heatmaps';
-      var geometryField = $el.data().geometryField;
-      var template = $el.data().sidebarTemplate;
-      var colorRamp = $el.data().colorRamp;
+      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
-      $('#sortAndPerPage .page-links').html('');
-      $('ul.pagination').hide();
+      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[0].id).setView([0, 0], 1);
+      var map = L.map(el.id).setView([0, 0], 1);
       var basemap = BlacklightHeatmaps.selectBasemap(
-        $el.data().basemapProvider
+        el.dataset.basemapProvider
       ).addTo(map);
 
       var solrLayer = L.solrHeatmap(requestUrl, {
@@ -57,7 +59,7 @@ Blacklight.onLoad(function () {
       solrLayer.on('dataAdded', function (e) {
         if (e.response && e.response.docs) {
           var html = '';
-          $.each(e.response.docs, function (i, value) {
+          e.response.docs.forEach(function (value) {
             html += L.Util.template(template, value);
           });
 
@@ -65,16 +67,11 @@ Blacklight.onLoad(function () {
 
           var docCount = e.response.pages.total_count;
 
-          $('#sortAndPerPage .page-links').html(
-            parseInt(docCount).toLocaleString() + ' ' +
-            _this.pluralize(docCount, 'item') + ' found'
-          );
+          document.querySelectorAll('#sortAndPerPage .page-links').forEach(function (links) {
+            links.innerHTML = parseInt(docCount).toLocaleString() + ' ' + (docCount == 1 ? 'item' : 'items') + ' found';
+          });
         }
       });
-
-      $(document).on('turbolinks:click', function (e) {
-        e.preventDefault();
-      });
     },
 
     pluralize: function (count, word) {

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

@@ -1,8 +1,8 @@
 Blacklight.onLoad(function () {
   'use strict';
 
-  $('[data-show-map]').each(function () {
-    BlacklightHeatmaps.showView(this);
+  document.querySelectorAll('[data-show-map]').forEach(function (el) {
+    BlacklightHeatmaps.showView(el);
   });
 });
 
@@ -13,15 +13,14 @@ Blacklight.onLoad(function () {
     options: {},
 
     initialize: function (el, options) {
-      var $el = $(el);
-      var features = $el.data().features;
+      var json = JSON.parse(el.dataset.features);
 
-      var map = L.map($el[0].id).setView([0, 0], 1);
+      var map = L.map(el.id).setView([0, 0], 1);
       var basemap = BlacklightHeatmaps.selectBasemap(
-        $el.data().basemapProvider
+        el.dataset.basemapProvider
       ).addTo(map);
 
-      var features = L.geoJson(features, {
+      var features = L.geoJson(json, {
         pointToLayer: function(feature, latlng) {
           return L.marker(latlng, {
             icon: BlacklightHeatmaps.Icons.default

data/app/components/blacklight_heatmaps/icons/heatmaps_component.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module BlacklightHeatmaps
+  module Icons
+    # This is the gallery icon for the view type button.
+    # You can override the default svg by setting:
+    #   Blacklight::Gallery:Icons::SlideshowComponent.svg = '<svg>your SVG here</svg>'
+    class HeatmapsComponent < Blacklight::Icons::IconComponent
+      self.svg = <<~SVG
+        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M16 10h-2v2h2v-2zm0 4h-2v2h2v-2zm-8-4H6v2h2v-2zm4 0h-2v2h2v-2zm8-6H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V6h16v12z"/></svg>
+      SVG
+    end
+  end
+end

data/app/helpers/blacklight/maps_helper.rb

@@ -10,6 +10,7 @@ module Blacklight
         class: 'blacklight-heatmaps-index-map',
         id: 'index-map',
         data: index_map_data_attributes,
+        role: 'region',
         'aria-label': t('blacklight.heatmaps.aria-label')
       )
     end
@@ -24,7 +25,7 @@ module Blacklight
       <div class='media'>
         <div class='media-body'>
           <h3 class='media-heading'>
-            <a href=\"{url}\"}>
+            <a href="{url}">
               {title}
             </a>
           </h3>

data/app/views/catalog/_document_heatmaps.html.erb

@@ -1,4 +1,4 @@
-<div class='blacklight-heatmaps-index-map-container'>
+<div class='blacklight-heatmaps-index-map-container' data-turbolinks="false">
   <%= index_map_div %>
   <%= content_tag(:div, id: 'index-map-sidebar') do %>
   <% end %>

data/app/views/catalog/index.heatmaps.jbuilder

@@ -2,8 +2,9 @@ presenter = Blacklight::JsonPresenter.new(@response, blacklight_config)
 
 json.response do
   json.docs(presenter.documents) do |document|
-    json.url polymorphic_url(url_for_document(document))
-    json.title index_presenter(document).heading
+    document_presenter = document_presenter(document)
+    json.url url_for(search_state.url_for_document(document))
+    json.title document_presenter.heading
   end
 
   json.facet_heatmaps @response['facet_counts']['facet_heatmaps']

data/lib/blacklight_heatmaps/engine.rb

@@ -7,6 +7,12 @@ module BlacklightHeatmaps
       end
 
       Mime::Type.register 'application/vnd.heatmaps+json', :heatmaps
+      if Blacklight::VERSION > '8'
+        Blacklight::Configuration.default_configuration do
+          Blacklight::Configuration.default_values[:search_state_fields] ||= []
+          Blacklight::Configuration.default_values[:search_state_fields] += %i[bbox]
+        end
+      end
     end
   end
 end

data/lib/blacklight_heatmaps/version.rb

@@ -1,3 +1,3 @@
 module BlacklightHeatmaps
-  VERSION = "1.1.0"
+  VERSION = '1.3.0'
 end

data/lib/generators/blacklight_heatmaps/install_generator.rb

@@ -15,12 +15,6 @@ module BlacklightHeatmaps
       end
     end
 
-    def install_webpacker
-      return unless Rails.version.to_i == 6
-
-      rake 'webpacker:install'
-    end
-
     def configuration
       inject_into_file 'app/controllers/catalog_controller.rb', after: 'configure_blacklight do |config|' do
         "\n    # BlacklightHeatmaps configuration values" \
@@ -30,9 +24,9 @@ module BlacklightHeatmaps
         "\n    config.basemap_provider = 'positron'" \
         "\n    config.show.partials.insert(1, :show_leaflet_map)" \
         "\n    config.index.respond_to.heatmaps = true" \
-        "\n    config.view.heatmaps.partials = []" \
-        "\n    #Heatmap color ramp. For best results, use http://colorbrewer2.org or http://tristen.ca/hcl-picker/#/hlc/5/1" \
-        "\n    config.view.heatmaps.color_ramp = ['#ffffcc', '#a1dab4', '#41b6c4', '#2c7fb8', '#253494']" \
+        "\n    config.view.heatmaps(partials: []," \
+        "\n                         color_ramp: ['#ffffcc', '#a1dab4', '#41b6c4', '#2c7fb8', '#253494']," \
+        "\n                         icon: BlacklightHeatmaps::Icons::HeatmapsComponent)" \
         "\n"
       end
     end

data/lib/tasks/blacklight_heatmaps_tasks.rake

@@ -11,15 +11,5 @@ namespace :blacklight_heatmaps do
       conn.add docs
       conn.commit
     end
-
-    desc 'Fetch random data from WhosOnFirst gazetteer and index into Solr'
-    task :seed_random, [:n] => [:environment] do |_t, args|
-      args.with_defaults(n: 10)
-      puts "Indexing #{args[:n]} random data records"
-      docs = YAML.load(`bundle exec ruby #{File.join(BlacklightHeatmaps::Engine.root, 'scripts', 'sample_whosonfirst.rb')} #{args[:n]}`)
-      conn = Blacklight.default_index.connection
-      conn.add docs
-      conn.commit
-    end
   end
 end

data/spec/examples.txt

@@ -1,31 +1,31 @@
 example_id                                                                              | status | run_time        |
 --------------------------------------------------------------------------------------- | ------ | --------------- |
-./spec/features/configurable_basemap_spec.rb[1:1]                                       | passed | 0.41776 seconds |
-./spec/features/configurable_basemap_spec.rb[1:2:1]                                     | passed | 0.36464 seconds |
-./spec/features/configurable_basemap_spec.rb[1:3:1]                                     | passed | 0.71567 seconds |
-./spec/features/index_page_map_spec.rb[1:1]                                             | passed | 8.86 seconds    |
-./spec/features/show_page_map_spec.rb[1:1]                                              | passed | 0.62926 seconds |
-./spec/features/show_page_map_spec.rb[1:2]                                              | passed | 0.4947 seconds  |
-./spec/helpers/blacklight/maps_helper_spec.rb[1:1:1]                                    | passed | 0.00938 seconds |
-./spec/helpers/blacklight/maps_helper_spec.rb[1:2:1]                                    | passed | 0.00674 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:1:1]                  | passed | 0.00041 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:2:1]                  | passed | 0.00028 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:3:1]                  | passed | 0.00055 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:4:1]                  | passed | 0.00028 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:1:1]             | passed | 0.0003 seconds  |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:2:1]             | passed | 0.00053 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:3:1]             | passed | 0.00438 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:1:1]        | passed | 0.00081 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:2:1]        | passed | 0.03251 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:3:1]        | passed | 0.00094 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:4:1]        | passed | 0.00061 seconds |
-./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:1:1]                         | passed | 0.05593 seconds |
-./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:2:1]                         | passed | 0.00169 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:1:1] | passed | 0.00432 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:2:1] | passed | 0.01045 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:2:1]   | passed | 0.00528 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:3:1]   | passed | 0.00558 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:4:1]   | passed | 0.00459 seconds |
-./spec/views/catalog/_document_heatmaps.html.erb_spec.rb[1:1]                           | passed | 0.00637 seconds |
-./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:1:1]                  | passed | 0.01314 seconds |
-./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:2:1]                  | passed | 0.08646 seconds |
+./spec/features/configurable_basemap_spec.rb[1:1]                                       | passed | 0.16395 seconds |
+./spec/features/configurable_basemap_spec.rb[1:2:1]                                     | passed | 0.13941 seconds |
+./spec/features/configurable_basemap_spec.rb[1:3:1]                                     | passed | 0.16693 seconds |
+./spec/features/index_page_map_spec.rb[1:1]                                             | passed | 10.89 seconds   |
+./spec/features/show_page_map_spec.rb[1:1]                                              | passed | 0.1382 seconds  |
+./spec/features/show_page_map_spec.rb[1:2]                                              | passed | 0.17365 seconds |
+./spec/helpers/blacklight/maps_helper_spec.rb[1:1:1]                                    | passed | 0.00406 seconds |
+./spec/helpers/blacklight/maps_helper_spec.rb[1:2:1]                                    | passed | 0.00331 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:1:1]                  | passed | 0.00006 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:2:1]                  | passed | 0.00006 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:3:1]                  | passed | 0.00008 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:4:1]                  | passed | 0.00006 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:1:1]             | passed | 0.00012 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:2:1]             | passed | 0.00077 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:3:1]             | passed | 0.00193 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:1:1]        | passed | 0.0006 seconds  |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:2:1]        | passed | 0.00008 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:3:1]        | passed | 0.00028 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:4:1]        | passed | 0.00014 seconds |
+./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:1:1]                         | passed | 0.00008 seconds |
+./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:2:1]                         | passed | 0.00007 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:1:1] | passed | 0.00163 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:2:1] | passed | 0.00427 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:2:1]   | passed | 0.05584 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:3:1]   | passed | 0.00206 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:4:1]   | passed | 0.00917 seconds |
+./spec/views/catalog/_document_heatmaps.html.erb_spec.rb[1:1]                           | passed | 0.0042 seconds  |
+./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:1:1]                  | passed | 0.00266 seconds |
+./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:2:1]                  | passed | 0.00446 seconds |

data/spec/features/index_page_map_spec.rb

@@ -5,8 +5,12 @@ feature 'Index page map', js: true do
     visit search_catalog_path(q: ' ', view: 'heatmaps', search_field: 'all_fields')
     expect(page).to have_css '.leaflet-map-pane'
 
-    # Zoomed to world
-    expect(page).to have_css 'img[src*="/light_all/1/0/0.png"]'
+    # Conditionally check for the PNG only on GitHub CI
+    # Leaflet chooses tile zoom based on retina; this causes tests to fail locally
+    if ENV['GITHUB_ACTIONS']
+      # Zoomed to world
+      expect(page).to have_css 'img[src*="/light_all/1/0/0.png"]'
+    end
 
     # Hides pagination
     expect(page).to have_css 'ul.pagination', visible: false

data/spec/features/show_page_map_spec.rb

@@ -4,8 +4,14 @@ feature 'Show map map', js: true do
   it 'renders a leaflet map' do
     visit solr_document_path '43037890'
     expect(page).to have_css '.leaflet-map-pane'
-    # Zoomed to Kazakhstan
-    expect(page).to have_css 'img[src*="light_all/4/11/5.png"]'
+
+    # Conditionally check for the tile only on GitHub CI
+    # Leaflet chooses tile zoom based on retina; this causes tests to fail locally
+    if ENV['GITHUB_ACTIONS']
+      # Zoomed to Kazakhstan
+      expect(page).to have_css 'img[src*="light_all/4/11/5.png"]'
+    end
+
     expect(page).to have_css 'svg g path'
   end
   it 'renders a point type and a polygon' do

data/spec/helpers/blacklight/maps_helper_spec.rb

@@ -26,6 +26,7 @@ describe Blacklight::MapsHelper do
         .to have_css '[data-basemap-provider="positron"]'
       expect(helper.index_map_div).to have_css '[data-sidebar-template]'
       expect(helper.index_map_div).to have_css '[data-color-ramp]'
+      expect(helper.index_map_div).to have_css '[role="region"]'
       expect(helper.index_map_div).to have_css '[aria-label="heatmap"]'
     end
   end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'rspec/rails'
 
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each { |f| require f }
 
-require 'webdrivers/chromedriver'
+require 'selenium-webdriver'
 
 Capybara.javascript_driver = :selenium_chrome_headless
 

data/spec/test_app_templates/Gemfile.extra

@@ -1 +0,0 @@
-gem 'sprockets', '< 4'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -4,7 +4,7 @@ class TestAppGenerator < Rails::Generators::Base
   source_root './spec/test_app_templates'
 
   def add_gems
-    gem 'blacklight', '~> 7.0'
+    gem 'blacklight', ENV.fetch('BLACKLIGHT_VERSION', '~> 7.0')
 
     Bundler.with_clean_env do
       run 'bundle install'
@@ -24,4 +24,13 @@ class TestAppGenerator < Rails::Generators::Base
   def install_engine
     generate 'blacklight_heatmaps:install'
   end
+
+  # Temporarily force js assets to fall back to sprockets
+  def clean_up_js_builds
+    return unless File.exist?('app/assets/builds')
+
+    append_to_file 'app/assets/config/manifest.js', "\n//= link application.js\n" if File.exist?('app/assets/config/manifest.js')
+    gsub_file 'app/assets/config/manifest.js', '//= link_tree ../builds', ''
+    remove_dir 'app/assets/builds'
+  end
 end

data/vendor/assets/javascripts/leaflet_solr_heatmap.js

@@ -55,12 +55,12 @@ L.SolrHeatmap = L.GeoJSON.extend({
     geojson.type = 'FeatureCollection';
     geojson.features = [];
 
-    $.each(_this.facetHeatmap.counts_ints2D, function (row, value) {
+    _this.facetHeatmap.counts_ints2D.forEach(function(value, row) {
       if (value === null) {
         return;
       }
 
-      $.each(value, function (column, val) {
+      value.forEach(function (val, column) {
         if (val === 0) {
           return;
         }
@@ -105,12 +105,12 @@ L.SolrHeatmap = L.GeoJSON.extend({
     var maxValue = classifications[classifications.length - 1];
     var gradient = _this._getGradient(classifications);
 
-    $.each(_this.facetHeatmap.counts_ints2D, function (row, value) {
+    _this.facetHeatmap.counts_ints2D.forEach(function(value, row) {
       if (value === null) {
         return;
       }
 
-      $.each(value, function (column, val) {
+      value.forEach(function (val, column) {
         if (val === 0) {
           return;
         }
@@ -172,12 +172,12 @@ L.SolrHeatmap = L.GeoJSON.extend({
       maxClusterRadius: 140,
     });
 
-    $.each(_this.facetHeatmap.counts_ints2D, function (row, value) {
+    _this.facetHeatmap.counts_ints2D.forEach(function(value, row) {
       if (value === null) {
         return;
       }
 
-      $.each(value, function (column, val) {
+      value.forEach(function (val, column) {
         if (val === 0) {
           return;
         }
@@ -218,7 +218,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
   _getClassifications: function (howMany) {
     var _this = this;
     var oneDArray = [];
-    $.each(_this.facetHeatmap.counts_ints2D, function (row, value) {
+    _this.facetHeatmap.counts_ints2D.forEach(function(value, row) {
       if (value != null) {
         oneDArray = oneDArray.concat(value);
       }
@@ -244,7 +244,7 @@ L.SolrHeatmap = L.GeoJSON.extend({
 
     _this.eachLayer(function (layer) {
       var color;
-      $.each(classifications, function (i, val) {
+      classifications.forEach(function (val, i) {
         if (layer.feature.properties.count >= val) {
           color = scale[i];
         }
@@ -296,22 +296,26 @@ L.SolrHeatmap = L.GeoJSON.extend({
   _getData: function () {
     var _this = this;
     var startTime = Date.now();
-    $.getJSON({
-      url: _this._solrUrl,
-      data: {
-        bbox: _this._mapViewToBbox(),
-      },
-      success: function (data) {
-        var totalTime = 'Solr response time: ' + (Date.now() - startTime) + ' ms';
-        if (_this.options.logging) {
-          console.log(totalTime);
-        }
 
-        _this.docsCount = data.response.numFound;
-        _this.renderStart = Date.now();
-        _this._computeHeatmapObject(data);
-        _this.fireEvent('dataAdded', data);
-      },
+    var url = new URL(_this._solrUrl);
+    url.searchParams.append('bbox', _this._mapViewToBbox());
+
+    fetch(url, {
+      headers: {
+        'Accept': 'application/json',
+      }
+    }).then(function (response) {
+      return response.json();
+    }).then(function (data) {
+      var totalTime = 'Solr response time: ' + (Date.now() - startTime) + ' ms';
+      if (_this.options.logging) {
+        console.log(totalTime);
+      }
+
+      _this.docsCount = data.response.numFound;
+      _this.renderStart = Date.now();
+      _this._computeHeatmapObject(data);
+      _this.fireEvent('dataAdded', data);
     });
   },
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 7.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 7.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -34,30 +34,36 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.17.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.17.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: leaflet-sidebar-rails
   requirement: !ruby/object:Gem::Requirement
@@ -143,19 +149,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.11'
 description: Search and view Blacklight resources on a map.
 email:
 - phillipjreed@gmail.com
@@ -174,6 +180,7 @@ files:
 - app/assets/javascripts/blacklight_heatmaps/viewers/index.js
 - app/assets/javascripts/blacklight_heatmaps/viewers/show.js
 - 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/models/concerns/blacklight_heatmaps/bounding_box.rb
@@ -235,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Search and view Blacklight resources on a map.