blacklight_heatmaps 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adcba0150eab159cf8394afa9b77f9bd9ef21c77
-  data.tar.gz: 8d2e36ea948118384a245cc56b3ade2c5b760687
+  metadata.gz: 95fbd5c293e3bb1b0934cbb0ef75129609552d54
+  data.tar.gz: 6fc4101c575417ab48559edab0c74f31de41e7d8
 SHA512:
-  metadata.gz: c3ec478fb3d1030edef201bbe1abe1112137ae152c861942760da1bb7dec6b9beb25b269b1123cb7ca07c9a836e44784ba137e95c43867b3cc4115a21acd06b0
-  data.tar.gz: 869ca21a48da8934de63b2e0ef2fa31d906bd950b6cf64763bc1816c20dcf153d4c965766afb918153d97af5943d6d19b1df81e1a0ba55827bfa93c4278a495a
+  metadata.gz: 3df2e19e19eb7468961118cc60714f8c7311baf88d894877b4284937f20c1c148ff4c7f58dda756d91d40c5217f3aea911a2f9241f2c5588f52ffffbe209d8cf
+  data.tar.gz: 6f483cdf059e4276bdc9d86a7190f88a701ed0258f78239a8ecfef600d149db11a4fab826f7c71c55d91aa39f45ffbebcebb198ed4ad9cc81ff00c5538228fbd

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

@@ -4,4 +4,5 @@
 //= require leaflet_solr_heatmap
 //= require blacklight_heatmaps/blacklight_heatmaps
 //= require blacklight_heatmaps/basemaps
+//= require blacklight_heatmaps/icons
 //= require_tree ./viewers

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

@@ -0,0 +1,7 @@
+BlacklightHeatmaps.Icons = {
+  default: new L.Icon({
+    iconUrl: '<%= asset_path 'marker-icon.png'%>',
+    iconRetinaUrl: '<%= asset_path 'marker-icon-2x.png'%>',
+    shadowUrl: '<%= asset_path 'marker-shadow.png'%>'
+  })
+};

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

@@ -21,7 +21,13 @@ Blacklight.onLoad(function () {
         $el.data().basemapProvider
       ).addTo(map);
 
-      var features = L.geoJson(features).addTo(map);
+      var features = L.geoJson(features, {
+        pointToLayer: function(feature, latlng) {
+          return L.marker(latlng, {
+            icon: BlacklightHeatmaps.Icons.default
+          })
+        }
+      }).addTo(map);
 
       map.fitBounds(features.getBounds());
     },

data/app/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior.rb

@@ -15,6 +15,7 @@ module BlacklightHeatmaps
       if blacklight_params[:bbox]
         solr_parameters['facet.heatmap'] = geometry_field
         solr_parameters['facet.heatmap.geom'] = bbox_as_range
+        solr_parameters['facet.heatmap.distErrPct'] = dist_err_pct
         solr_parameters[:bq] ||= []
         solr_parameters[:bq] << "#{geometry_field}:\"IsWithin(#{bbox_as_envelope})\""
         solr_parameters[:fq] ||= []
@@ -23,6 +24,10 @@ module BlacklightHeatmaps
       solr_parameters
     end
 
+    def dist_err_pct
+      blacklight_config.heatmap_distErrPct || 0.15
+    end
+
     def geometry_field
       blacklight_config.geometry_field
     end

data/lib/blacklight_heatmaps/version.rb

@@ -1,3 +1,3 @@
 module BlacklightHeatmaps
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/generators/blacklight_heatmaps/install_generator.rb

@@ -13,6 +13,7 @@ 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.heatmap_distErrPct = 0.15 # Default Solr value" \
         "\n    # Basemaps configured include: 'positron', 'darkMatter', 'OpenStreetMap.HOT'" \
         "\n    config.basemap_provider = 'positron'" \
         "\n    config.show.partials.insert(1, :show_leaflet_map)" \

data/spec/examples.txt

@@ -0,0 +1,31 @@
+example_id                                                                              | status | run_time        |
+--------------------------------------------------------------------------------------- | ------ | --------------- |
+./spec/features/configurable_basemap_spec.rb[1:1]                                       | passed | 0.43154 seconds |
+./spec/features/configurable_basemap_spec.rb[1:2:1]                                     | passed | 0.50186 seconds |
+./spec/features/configurable_basemap_spec.rb[1:3:1]                                     | passed | 0.48439 seconds |
+./spec/features/index_page_map_spec.rb[1:1]                                             | passed | 8.17 seconds    |
+./spec/features/show_page_map_spec.rb[1:1]                                              | passed | 0.63302 seconds |
+./spec/features/show_page_map_spec.rb[1:2]                                              | passed | 0.4363 seconds  |
+./spec/helpers/blacklight/maps_helper_spec.rb[1:1:1]                                    | passed | 0.00677 seconds |
+./spec/helpers/blacklight/maps_helper_spec.rb[1:2:1]                                    | passed | 0.00646 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:1:1]                  | passed | 0.00016 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:2:1]                  | passed | 0.003 seconds   |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:3:1]                  | passed | 0.00034 seconds |
+./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:4:1]                  | passed | 0.00071 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:1:1]             | passed | 0.00026 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:2:1]             | passed | 0.00019 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:3:1]             | passed | 0.00176 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:1:1]        | passed | 0.00076 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:2:1]        | passed | 0.00031 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:3:1]        | passed | 0.00078 seconds |
+./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:4:1]        | passed | 0.01206 seconds |
+./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:1:1]                         | passed | 0.00024 seconds |
+./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:2:1]                         | passed | 0.00037 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:1:1] | passed | 0.00098 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:2:1] | passed | 0.00281 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:2:1]   | passed | 0.00109 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:3:1]   | passed | 0.00731 seconds |
+./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:4:1]   | passed | 0.00165 seconds |
+./spec/views/catalog/_document_heatmaps.html.erb_spec.rb[1:1]                           | passed | 0.0363 seconds  |
+./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:1:1]                  | passed | 0.00699 seconds |
+./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:2:1]                  | passed | 0.04711 seconds |

data/spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb

@@ -32,6 +32,8 @@ describe BlacklightHeatmaps::SolrFacetHeatmapBehavior do
           .to eq :geo_srpt
         expect(subject.add_solr_facet_heatmap(solr_params)['facet.heatmap.geom'])
           .to eq '["1 2" TO "4 3"]'
+        expect(subject.add_solr_facet_heatmap(solr_params)['facet.heatmap.distErrPct'])
+          .to eq 0.15
         expect(subject.add_solr_facet_heatmap(solr_params)[:bq])
           .to include(boost: 'stuff')
         expect(subject.add_solr_facet_heatmap(solr_params)[:bq])

data/vendor/assets/javascripts/leaflet_solr_heatmap.js

@@ -334,7 +334,9 @@ L.SolrHeatmap = L.GeoJSON.extend({
     }
 
     var bounds = this._map.getBounds();
-    return [bounds.getWest(), bounds.getSouth(), bounds.getEast(), bounds.getNorth()].join(',');
+    var wrappedSw = bounds.getSouthWest().wrap();
+    var wrappedNe = bounds.getNorthEast().wrap();
+    return [wrappedSw.lng, bounds.getSouth(), wrappedNe.lng, bounds.getNorth()].join(',');
   },
 
   _mapViewToEnvelope: function () {
@@ -343,7 +345,9 @@ L.SolrHeatmap = L.GeoJSON.extend({
     }
 
     var bounds = this._map.getBounds();
-    return ':"Intersects(ENVELOPE(' + bounds.getWest() + ', ' + bounds.getEast() + ', ' + bounds.getNorth() + ', ' + bounds.getSouth() + '))"';
+    var wrappedSw = bounds.getSouthWest().wrap();
+    var wrappedNe = bounds.getNorthEast().wrap();
+    return ':"Intersects(ENVELOPE(' + wrappedSw.lng + ', ' + wrappedNe.lng + ', ' + bounds.getNorth() + ', ' + bounds.getSouth() + '))"';
   },
 
   _mapViewToWkt: function () {
@@ -352,7 +356,9 @@ L.SolrHeatmap = L.GeoJSON.extend({
     }
 
     var bounds = this._map.getBounds();
-    return '["' + bounds.getWest() + ' ' + bounds.getSouth() + '" TO "' + bounds.getEast() + ' ' + bounds.getNorth() + '"]';
+    var wrappedSw = bounds.getSouthWest().wrap();
+    var wrappedNe = bounds.getNorthEast().wrap();
+    return '["' + wrappedSw.lng + ' ' + bounds.getSouth() + '" TO "' + wrappedNe.lng + ' ' + bounds.getNorth() + '"]';
   },
 
   _solrQuery: function () {
@@ -364,16 +370,6 @@ L.solrHeatmap = function (url, options) {
   return new L.SolrHeatmap(url, options);
 };
 
-L.LatLngBounds.prototype.getWest = function () {
-  var west = this._southWest.lng;
-  return west < -180 ? -180 : west;
-};
-
-L.LatLngBounds.prototype.getEast = function () {
-  var east = this._northEast.lng;
-  return east > 180 ? 180 : east;
-};
-
 // Check if L.MarkerCluster is included
 if (typeof L.MarkerCluster !== 'undefined') {
   L.MarkerCluster.prototype.initialize = function (group, zoom, a, b) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,6 +169,7 @@ files:
 - 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/icons.js.erb
 - app/assets/javascripts/blacklight_heatmaps/viewers/index.js
 - app/assets/javascripts/blacklight_heatmaps/viewers/show.js
 - app/assets/stylesheets/blacklight_heatmaps/default.scss
@@ -192,6 +193,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/examples.txt
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
@@ -229,11 +231,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 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