blacklight_heatmaps 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df455092ebc765d5e57a9a97e90bf9ddb30279b7
-  data.tar.gz: 711fa94cf9b0dd43693daad7e6bd993def580fb2
+  metadata.gz: b34bf3d4054840fa836d9d5124f96c49fba40682
+  data.tar.gz: 4cacc16ee841628ab63fed4ed7b2f072ce3340a9
 SHA512:
-  metadata.gz: cfddba84ce370773c2fc59628c22d6d923d8f0697b8f9994817eb414ff3b3ae1361a32d59001706e96a7a8055a39ab18b999a607c74f9075121c7ca068fe7cab
-  data.tar.gz: 9dadf291442c57715c9cd0b9814a190b34ae5efa90b6abacbb38ac91ff322a1467ef97f22e92f7d25d8d26b6938b0eeb6582e96cdfc10eae5d8e7bf8c0d3ce9a
+  metadata.gz: 0728f7fbf1a5980b8deaa924199f9c03ef31a031addd41b5d7356fd0e1099a29e88b0710e12c2da6191b75efaaaa27b77f4431a48fb9c31b061887ef1e30bb0e
+  data.tar.gz: f2e7af9957508046a24836ca8f3630ea693fcddf11dda70630d52b13958f6bb4fba3acf18d93ad01a2f66df4b9428c381b49b72fb5eb3976257a216db772ffc4

data/README.md

@@ -34,6 +34,7 @@ rails generate blacklight_heatmaps:install
 
 ## Getting started
 
+### Indexing data
 BlacklightHeatmaps expects your data to be indexed as a [Spatial Recursive Prefix Tree](https://cwiki.apache.org/confluence/display/solr/Spatial+Search#SpatialSearch-RPT) type. The plugin currently supports data indexed in formats:
 
  - `x y` Syntax. example: "-121.631609 36.688128"
@@ -41,6 +42,38 @@ BlacklightHeatmaps expects your data to be indexed as a [Spatial Recursive Prefi
 
 Additional formats could be added by extending `BlacklightHeatmaps::GeometryParser`
 
+### Customizing the basemap
+
+By default three different basemaps are included with BlacklightHeatmaps. You can modify these by changing the configuration value in the `CatalogController`.
+
+```ruby
+  # Basemaps configured include: 'positron', 'darkMatter', 'OpenStreetMap.HOT'
+  config.basemap_provider = 'OpenStreetMap.HOT'
+```
+
+BlacklightHeatmaps allows you to customize your basemap further to any Leaflet TileLayer subclass. This includes WMS layers, TileLayers, etc. Checkout [Leaflet Providers](https://github.com/leaflet-extras/leaflet-providers) for more ideas on basemaps you can use.
+
+To customize the basemap, make sure that you extend the `BlacklightHeatmaps.Basemaps` object to include your basemap selection:
+
+```javascript
+  BlacklightHeatmaps.Basemaps[' OpenStreetMap.BlackAndWhite'] = L.tileLayer('http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png', {
+	maxZoom: 18,
+	attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+});
+```
+
+### Customizing the color display
+The heatmap color ramp is also customizable. This setting can be modified in `CatalogController` by passing in an array of hexadecimal color values as strings.
+
+```ruby
+  #Heatmap color ramp. For best results, use http://colorbrewer2.org or http://tristen.ca/hcl-picker/#/hlc/5/1
+  config.view.heatmaps.color_ramp = ['#fef0d9','#fdcc8a','#fc8d59','#e34a33','#b30000']
+```
+
+![changed_ramp](https://cloud.githubusercontent.com/assets/1656824/16814655/ce3a0170-4904-11e6-8d0f-a9cfb1d44057.png)
+
+[ColorBrewer](http://colorbrewer2.org/) is a great resource in choosing a color ramp. It also has options for colorblind safe ramps to use and can export the hex values in an array that you can paste into your configuration.
+
 ## Development
 
 Run Solr and Blacklight (with BlacklightMaps) for interactive development:

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

@@ -0,0 +1,24 @@
+BlacklightHeatmaps.Basemaps = {
+  darkMatter: L.tileLayer(
+    'https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
+      maxZoom: 18,
+      worldCopyJump: true,
+      detectRetina: true,
+    }
+  ),
+  positron: L.tileLayer(
+    'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
+      maxZoom: 18,
+      worldCopyJump: true,
+      detectRetina: true,
+    }
+  ),
+  'OpenStreetMap.HOT': L.tileLayer(
+    'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, Tiles courtesy of <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>',
+      maxZoom: 19,
+    }
+  ),
+};

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

@@ -3,7 +3,15 @@
 
   var BlacklightHeatmaps = L.Class.extend({
     statics: {
-      __version__: '0.0.2',
+      __version__: '0.0.3',
+
+      selectBasemap: function (basemap) {
+        if (basemap && basemap !== undefined) {
+          return BlacklightHeatmaps.Basemaps[basemap];
+        } else {
+          return BlacklightHeatmaps.Basemaps.positron;
+        }
+      },
     },
   });
   global.BlacklightHeatmaps = BlacklightHeatmaps;

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

@@ -3,4 +3,5 @@
 //= require L.Control.Sidebar
 //= require leaflet_solr_heatmap
 //= require blacklight_heatmaps/blacklight_heatmaps
+//= require blacklight_heatmaps/basemaps
 //= require_tree ./viewers

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

@@ -20,10 +20,14 @@ Blacklight.onLoad(function () {
       var template = $el.data().sidebarTemplate;
       var colorRamp = $el.data().colorRamp;
 
+      // Blank out page link content first and disable pagination
+      $('#sortAndPerPage .page_links').html('');
+      $('ul.pagination li').addClass('disabled');
+
       var map = L.map($el[0].id).setView([0, 0], 1);
-      var basemap = L.tileLayer($el.data().basemap, {
-        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
-      }).addTo(map);
+      var basemap = BlacklightHeatmaps.selectBasemap(
+        $el.data().basemapProvider
+      ).addTo(map);
 
       var solrLayer = L.solrHeatmap(requestUrl, {
         field: geometryField,

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

@@ -17,9 +17,9 @@ Blacklight.onLoad(function () {
       var features = $el.data().features;
 
       var map = L.map($el[0].id).setView([0, 0], 1);
-      var basemap = L.tileLayer($el.data().basemap, {
-        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
-      }).addTo(map);
+      var basemap = BlacklightHeatmaps.selectBasemap(
+        $el.data().basemapProvider
+      ).addTo(map);
 
       var features = L.geoJson(features).addTo(map);
 

data/app/helpers/blacklight/maps_helper.rb

@@ -48,7 +48,7 @@ module Blacklight
     def index_map_data_attributes
       {
         index_map: true,
-        basemap: blacklight_config.basemap,
+        basemap_provider: blacklight_config.basemap_provider,
         search_url: request.url,
         geometry_field: blacklight_config.geometry_field,
         sidebar_template: sidebar_template,

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

@@ -1,5 +1,5 @@
 <% features = document.to_geojson(blacklight_config) %>
 
 <% unless features.nil? %>
-  <%= content_tag(:div, nil, class: 'blacklight-heatmaps-show-map', id: "map-#{document.id}", data: {show_map: true, features: features, basemap: blacklight_config.basemap}) %>
+  <%= content_tag(:div, nil, class: 'blacklight-heatmaps-show-map', id: "map-#{document.id}", data: {show_map: true, features: features, basemap_provider: blacklight_config.basemap_provider}) %>
 <% end %>

data/lib/blacklight_heatmaps/version.rb

@@ -1,3 +1,3 @@
 module BlacklightHeatmaps
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/blacklight_heatmaps/install_generator.rb

@@ -17,7 +17,8 @@ module BlacklightHeatmaps
       inject_into_file 'app/controllers/catalog_controller.rb', after: 'configure_blacklight do |config|' do
         "\n    # BlacklightHeatmaps configuration values" \
         "\n    config.geometry_field = :geo_srpt" \
-        "\n    config.basemap = 'http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png'" \
+        "\n    # Basemaps configured include: 'positron', 'darkMatter', 'OpenStreetMap.HOT'" \
+        "\n    config.basemap_provider = 'positron'" \
         "\n    config.show.partials.insert(1, :show_leaflet_map)" \
         "\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" \

data/spec/features/configurable_basemap_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+feature 'Configurable basemap', js: true do
+  scenario 'defaults to positron' do
+    visit search_catalog_path(q: ' ', view: 'heatmaps', search_field: 'all_fields')
+    expect(page).to have_css "img[src*='light_all']"
+  end
+  feature 'without configured basemap' do
+    before do
+      CatalogController.blacklight_config.basemap_provider = nil
+    end
+    scenario 'defaults to positron' do
+      visit search_catalog_path(q: ' ', view: 'heatmaps', search_field: 'all_fields')
+      expect(page).to have_css "img[src*='light_all']"
+    end
+  end
+  feature 'with alterate configured basemap' do
+    before do
+      CatalogController.blacklight_config.basemap_provider = 'darkMatter'
+    end
+    after do
+      CatalogController.blacklight_config.basemap_provider = 'positron'
+    end
+    scenario 'defaults to positron' do
+      visit search_catalog_path(q: ' ', view: 'heatmaps', search_field: 'all_fields')
+      expect(page).to have_css "img[src*='dark_all']"
+    end
+  end
+end
+

data/spec/features/index_page_map_spec.rb

@@ -2,12 +2,20 @@ require 'spec_helper'
 
 feature 'Index page map', js: true do
   it 'renders a leaflet map' do
-    visit search_catalog_path(q: 'strong', view: 'heatmaps')
+    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="http://a.basemaps.cartocdn.com/light_all/1/0/0.png"]'
+    expect(page).to have_css 'img[src*="/light_all/1/0/0.png"]'
+
+    # Disabled pagination
+    expect(page).to have_css 'ul.pagination li.disabled', count: 6
+
+    # Document counts
+    expect(page).to have_css '.page_links', text: '17 items found'
+
     expect(page).to have_css '#index-map-sidebar', visible: false
-    page.find('svg g path').click
+    page.first('svg g path').click
     expect(page).to have_css '#index-map-sidebar', visible: true
     expect(page)
       .to have_css 'h3.media-heading a', text: '"Strong Medicine speaks"'

data/spec/features/show_page_map_spec.rb

@@ -5,7 +5,7 @@ feature 'Show map map', js: true do
     visit solr_document_path '43037890'
     expect(page).to have_css '.leaflet-map-pane'
     # Zoomed to Kazakhstan
-    expect(page).to have_css 'img[src="http://b.basemaps.cartocdn.com/light_all/4/11/5.png"]'
+    expect(page).to have_css 'img[src*="light_all/4/11/5.png"]'
     expect(page).to have_css 'svg g path'
   end
   it 'renders a point type' do

data/spec/helpers/blacklight/maps_helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Blacklight::MapsHelper do
   let(:blacklight_config) do
     Blacklight::Configuration.new(
-      basemap: 'http://www.example.com/{z}/{x}/{y}.png',
+      basemap_provider: 'positron',
       geometry_field: 'geo_srpt',
       index: Blacklight::OpenStructWithHashAccess.new(
         title_field: 'title_display'
@@ -24,7 +24,7 @@ describe Blacklight::MapsHelper do
       expect(helper.index_map_div)
         .to have_css '[data-geometry-field="geo_srpt"]'
       expect(helper.index_map_div)
-        .to have_css '[data-basemap="http://www.example.com/{z}/{x}/{y}.png"]'
+        .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]'
     end

data/spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb

@@ -17,7 +17,7 @@ describe 'catalog/_show_leaflet_map_default.html.erb' do
              locals: { document: document, blacklight_config: blacklight_config }
       expect(rendered).to have_css '.blacklight-heatmaps-show-map'
       expect(rendered).to have_css '#map-abc123'
-      expect(rendered).to have_css '[data-basemap]'
+      expect(rendered).to have_css '[data-basemap-provider]'
       expect(rendered).to have_css '[data-show-map]'
       expect(rendered).to have_css '[data-features]'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,6 +166,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/javascripts/blacklight_heatmaps/basemaps.js
 - app/assets/javascripts/blacklight_heatmaps/blacklight_heatmaps.js
 - app/assets/javascripts/blacklight_heatmaps/default.js
 - app/assets/javascripts/blacklight_heatmaps/viewers/index.js
@@ -191,6 +192,7 @@ files:
 - lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.js
 - lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.scss
 - lib/tasks/blacklight_heatmaps_tasks.rake
+- spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
 - spec/helpers/blacklight/maps_helper_spec.rb
@@ -230,6 +232,7 @@ signing_key:
 specification_version: 4
 summary: Search and view Blacklight resources on a map.
 test_files:
+- spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
 - spec/helpers/blacklight/maps_helper_spec.rb