Merge fc76237 into de68dea

sul-dlss · Jan 13, 2020 · cbf8de6 · cbf8de6
2 parents de68dea + fc76237
commit cbf8de6
Show file tree

Hide file tree

Showing 13 changed files with 34,109 additions and 34,576 deletions.
diff --git a/app/assets/images/blacklight/heatmaps.svg b/app/assets/images/blacklight/heatmaps.svg
diff --git a/app/assets/javascripts/blacklight_heatmaps/viewers/index.js b/app/assets/javascripts/blacklight_heatmaps/viewers/index.js
@@ -15,7 +15,7 @@ Blacklight.onLoad(function () {
     initialize: function (el, options) {
       var _this = this;
       var $el = $(el);
-      var requestUrl = $el.data().searchUrl + '&format=json';
+      var requestUrl = $el.data().searchUrl + '&format=heatmaps';
       var geometryField = $el.data().geometryField;
       var template = $el.data().sidebarTemplate;
       var colorRamp = $el.data().colorRamp;

diff --git a/app/views/catalog/index.heatmaps.jbuilder b/app/views/catalog/index.heatmaps.jbuilder
@@ -0,0 +1,6 @@
+presenter = Blacklight::JsonPresenter.new(@response, blacklight_config)
+
+json.response do
+  json.facet_heatmaps @response['facet_counts']['facet_heatmaps']
+  json.pages presenter.pagination_info
+end
diff --git a/app/views/catalog/index.json.jbuilder b/app/views/catalog/index.json.jbuilder
diff --git a/blacklight_heatmaps.gemspec b/blacklight_heatmaps.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['spec/**/*']
 
   s.add_dependency 'rails', '>= 4.2.6', '< 6'
-  s.add_dependency 'blacklight', '~> 6.0'
+  s.add_dependency 'blacklight', '~> 7.0'
   s.add_dependency 'leaflet-rails', '~> 1.2.0'
   s.add_dependency 'leaflet-sidebar-rails', '~> 0.2'
 

diff --git a/lib/blacklight_heatmaps/engine.rb b/lib/blacklight_heatmaps/engine.rb
@@ -3,6 +3,7 @@ class Engine < ::Rails::Engine
     isolate_namespace BlacklightHeatmaps
     initializer 'blacklight-maps.helpers' do |app|
       ActionView::Base.send :include, Blacklight::MapsHelper
+      Mime::Type.register 'application/vnd.heatmaps+json', :heatmaps
     end
   end
 end
diff --git a/lib/generators/blacklight_heatmaps/install_generator.rb b/lib/generators/blacklight_heatmaps/install_generator.rb
@@ -17,6 +17,7 @@ def configuration
         "\n    # Basemaps configured include: 'positron', 'darkMatter', 'OpenStreetMap.HOT'" \
         "\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']" \

diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml