blacklight_heatmaps 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77506e7f719dfe48668fff1eee85870869345e18
-  data.tar.gz: 10b18e63457595f3b494571ac85b14bf52072cb2
+  metadata.gz: a3ccce3da873d326189a04751821096659975b08
+  data.tar.gz: 4bdd563cab7c22e9788d528bac24ee1521722879
 SHA512:
-  metadata.gz: e127e89b873b508bcc2d574f926da8437c183f31d6fe1b1401489ef4e14a959302527fc27b1c47fa2f7e5014b3a392fb18fa73557232b8de54d31cb8869c977f
-  data.tar.gz: c78589f392100861feb56966042431bd4037a1ddcfa2ea0fae68acde4ecf0206a95bb71575b12943503e14205610b16486e390d7185747cbbcf70cdd26fe6844
+  metadata.gz: acc8026a66f6ff89f5a945c69b0712ba1039a69d72a3e743d87b4031bd1df93ed1e9f2f12bdc60ca4840217996fddc66944439c5904b99c92d410a0cf2c3c5bb
+  data.tar.gz: 85681826d5992b5d02ea40566f27140530f17feaa81da8e5c6ef7c8e8320310b0ae9381d663acb2ced69cf83033c70ec04ceffdc463c9d9e68c6e38146ac4fb0

data/README.md

@@ -40,6 +40,20 @@ BlacklightHeatmaps expects your data to be indexed as a [Spatial Recursive Prefi
  - `x y` Syntax. example: "-121.631609 36.688128"
  - CQL ENVELOPE Syntax (`minX, maxX, maxY, minY`). example: "ENVELOPE(122.934585571, 153.987060547, 45.522888184, 20.422889709)"
 
+BlacklightHeatmaps also works with multivalued Spatial Recursive Prefix Tree types.
+
+```json
+{
+  "id": 1,
+  "name": "Null Island",
+  "geo_srpt": [
+    "ENVELOPE(-0.0005, 0.000379, 0.000309, -0.000282)", "0 0"
+  ]
+}
+```
+
+Solr does not seem to be able to handle multivalued points without an accompanying geometry.
+
 Additional formats could be added by extending `BlacklightHeatmaps::GeometryParser`
 
 ### Customizing the basemap

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

@@ -4,8 +4,18 @@ module BlacklightHeatmaps
   module GeometrySolrDocument
     def to_geojson(blacklight_config = nil)
       return unless blacklight_config.try(:geometry_field) && fetch(blacklight_config.geometry_field, nil)
-      BlacklightHeatmaps::GeometryParser
-        .parse(fetch(blacklight_config.geometry_field)).to_geojson
+      {
+        type: 'FeatureCollection',
+        features: Array(fetch(blacklight_config.geometry_field)).map do |geometry|
+          {
+            type: 'Feature',
+            geometry: JSON.parse(
+              BlacklightHeatmaps::GeometryParser.parse(geometry).to_geojson
+            ),
+            properties: {}
+          }
+        end
+      }.to_json
     end
   end
 end

data/lib/blacklight_heatmaps/version.rb

@@ -1,3 +1,3 @@
 module BlacklightHeatmaps
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/features/index_page_map_spec.rb

@@ -12,7 +12,7 @@ feature 'Index page map', js: true do
     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 '.page_links', text: '18 items found'
 
     expect(page).to have_css '#index-map-sidebar', visible: false
     page.first('svg g path').click

data/spec/features/show_page_map_spec.rb

@@ -8,8 +8,11 @@ feature 'Show map map', js: true do
     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
+  it 'renders a point type and a polygon' do
     visit solr_document_path '34860108'
-    expect(page).to have_css '.leaflet-marker-icon'
+    within '.leaflet-container' do
+      expect(page).to have_css 'svg g path'
+      expect(page).to have_css '.leaflet-marker-icon'
+    end
   end
 end

data/spec/fixtures/null_island.geojson

@@ -0,0 +1,36 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              -0.0005,
+              -0.000282
+            ],
+            [
+              -0.0005,
+              0.000309
+            ],
+            [
+              0.000379,
+              0.000309
+            ],
+            [
+              0.000379,
+              -0.000282
+            ],
+            [
+              -0.0005,
+              -0.000282
+            ]
+          ]
+        ]
+      },
+      "properties": {}
+    }
+  ]
+}

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

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe BlacklightHeatmaps::GeometrySolrDocument do
+describe BlacklightHeatmaps::GeometrySolrDocument, :include_fixtures do
   subject { SolrDocument.new(fields).to_geojson(blacklight_config) }
 
   context 'when configured' do
-    let(:fields) { { some_field: 'ENVELOPE(1,2,4,3)' } }
+    let(:fields) { { some_field: 'ENVELOPE(-0.0005, 0.000379, 0.000309, -0.000282)' } }
     let(:blacklight_config) { double('BlacklightConfig', geometry_field: :some_field) }
-    it 'returns the data from the document as geoJSON' do
-      expect(subject).to eq '{"type":"Polygon","coordinates":[[[1.0,3.0],[1.0,4.0],[2.0,4.0],[2.0,3.0],[1.0,3.0]]]}'
+    it 'returns the data from the document as GeoJson FeatureCollection' do
+      expect(subject).to eq null_island.gsub(/\s/, '')
     end
   end
   context 'when not configured' do
@@ -18,10 +18,10 @@ describe BlacklightHeatmaps::GeometrySolrDocument do
     end
   end
   context 'when the document has the field' do
-    let(:fields) { { some_field: 'ENVELOPE(1,2,4,3)' } }
+    let(:fields) { { some_field: 'ENVELOPE(-0.0005, 0.000379, 0.000309, -0.000282)' } }
     let(:blacklight_config) { double('BlacklightConfig', geometry_field: :some_field) }
-    it 'returns the data from the document as geoJSON' do
-      expect(subject).to eq '{"type":"Polygon","coordinates":[[[1.0,3.0],[1.0,4.0],[2.0,4.0],[2.0,3.0],[1.0,3.0]]]}'
+    it 'returns the data from the document as GeoJson FeatureCollection' do
+      expect(subject).to eq null_island.gsub(/\s/, '')
     end
   end
   context 'when the document does not have the field' do

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ EngineCart.load_application!
 
 require 'rspec/rails'
 
+Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each { |f| require f }
+
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
 

data/spec/support/fixture_data.rb

@@ -0,0 +1,9 @@
+module FixtureData
+  def null_island
+    File.read(Pathname.new(File.expand_path('../../fixtures/null_island.geojson', __FILE__)))
+  end
+end
+
+RSpec.configure do |config|
+  config.include FixtureData, :include_fixtures
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,6 +195,7 @@ files:
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
+- spec/fixtures/null_island.geojson
 - spec/helpers/blacklight/maps_helper_spec.rb
 - spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb
 - spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb
@@ -202,6 +203,7 @@ files:
 - spec/models/concerns/blacklight_heatmaps/point_spec.rb
 - spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_data.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_heatmaps.html.erb_spec.rb
 - spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb
@@ -235,6 +237,7 @@ test_files:
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
+- spec/fixtures/null_island.geojson
 - spec/helpers/blacklight/maps_helper_spec.rb
 - spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb
 - spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb
@@ -242,6 +245,7 @@ test_files:
 - spec/models/concerns/blacklight_heatmaps/point_spec.rb
 - spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_data.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_heatmaps.html.erb_spec.rb
 - spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb