geoblacklight 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a935be20a30e560a0653acdd2397fe9393d40f
-  data.tar.gz: 325d07c535bf6b20a9a74f6f9d039dbd5257ce85
+  metadata.gz: d3613611043482bea42f602542263eb3e456cb0c
+  data.tar.gz: fa5d462b4d20b22ccc816f20e535e2dbda992668
 SHA512:
-  metadata.gz: 5a8f2aca97d1458f5c8932aebe58e86ffbce1e330363448f34e25facf451b58eb713f0abc4071a1f5b39dcadeb0fb2e2690e6b2ee7feec05e052eea543e56b97
-  data.tar.gz: 4a28c89f1d327a4cbf1c1cf1ddac47acf8e95d9730a6dab4bb65846904ed86e272b42a23f165ba2d5a05d5573ca42db0ef07d4ab2dd461f810ceafce55e46fd4
+  metadata.gz: b61a694e23f908f987682b1bef1d2f88ac3d034162343647d388c37c3a42f8405d2c9ca363218b08fc0467ce98adedf35c7a447e49e18c71540594279dd86bc4
+  data.tar.gz: 988a8942c3109c0244325bfee8db67be4a05a0e422eeb7c5ae2f0fa22d1fef5d4680fea982a084639237d60b352bd6efb7486a1b3056d5788c0811957fac9d6e

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+### Descriptive summary
+
+Include what version of GeoBlacklight related to this issue (1.3.0, master, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
+
+### Expected behavior
+
+### Actual behavior
+
+### Steps to reproduce the behavior
+
+1. Do this
+1. Then do this...
+
+### Related work
+
+Link to related tickets or prior related work here.
+

data/app/assets/javascripts/geoblacklight/geoblacklight.js

@@ -20,7 +20,7 @@
 
   var GeoBlacklight = L.Class.extend({
     statics: {
-      __version__: '1.3.0',
+      __version__: '1.4.0',
 
       debounce: function(fn, delay) {
         var timeout = null;

data/app/assets/javascripts/geoblacklight/modules/results.js

@@ -11,16 +11,22 @@ Blacklight.onLoad(function() {
   $('[data-map="index"]').each(function() {
     var data = $(this).data(),
     opts = { baseUrl: data.catalogPath },
-    geoblacklight, bbox;
+    geoblacklight;
+    var bbox = [[-180, -90], [180, 90]];
+
+    var parseableBbox = /(-?[0-9]{2})\s(-?[0-9]{3})\s(-?[0-9]{2})\s(-?[0-9]{3})/;
 
     if (typeof data.mapBbox === 'string') {
       bbox = L.bboxToBounds(data.mapBbox);
     } else {
       $('.document [data-bbox]').each(function() {
-        if (typeof bbox === 'undefined') {
-          bbox = L.bboxToBounds($(this).data().bbox);
-        } else {
-          bbox.extend(L.bboxToBounds($(this).data().bbox));
+        var currentBbox = $(this).data().bbox;
+        if (parseableBbox.test(currentBbox)) {
+          if (typeof bbox === 'undefined') {
+            bbox = L.bboxToBounds($(this).data().bbox);
+          } else {
+            bbox.extend(L.bboxToBounds($(this).data().bbox));
+          }
         }
       });
     }

data/app/models/concerns/geoblacklight/solr_document.rb

@@ -60,7 +60,7 @@ module Geoblacklight
     end
 
     def bounding_box_as_wsen
-      geom_field = fetch(Settings.FIELDS.GEOMETRY)
+      geom_field = fetch(Settings.FIELDS.GEOMETRY, '')
       exp = /^\s*ENVELOPE\(
                   \s*([-\.\d]+)\s*,
                   \s*([-\.\d]+)\s*,
@@ -68,13 +68,13 @@ module Geoblacklight
                   \s*([-\.\d]+)\s*
                   \)\s*$/x # uses 'x' option for free-spacing mode
       bbox_match = exp.match(geom_field)
-      return s unless bbox_match # return as-is, not a WKT
+      return geom_field unless bbox_match # return as-is, not a WKT
       w, e, n, s = bbox_match.captures
       "#{w} #{s} #{e} #{n}"
     end
 
     def wxs_identifier
-      fetch(Settings.FIELDS.WXS_IDENTIFIER)
+      fetch(Settings.FIELDS.WXS_IDENTIFIER, '')
     end
 
     def file_format

data/app/models/concerns/geoblacklight/spatial_search_behavior.rb

@@ -15,7 +15,7 @@ module Geoblacklight
     def add_spatial_params(solr_params)
       if blacklight_params[:bbox]
         solr_params[:bq] ||= []
-        solr_params[:bq] = ["#{Settings.FIELDS.GEOMETRY}:\"IsWithin(#{envelope_bounds})\"^10"]
+        solr_params[:bq] << "#{Settings.FIELDS.GEOMETRY}:\"IsWithin(#{envelope_bounds})\"#{boost}"
         solr_params[:fq] ||= []
         solr_params[:fq] << "#{Settings.FIELDS.GEOMETRY}:\"Intersects(#{envelope_bounds})\""
       end
@@ -31,6 +31,12 @@ module Geoblacklight
       bounding_box.to_envelope
     end
 
+    ## Allow bq boost to be configured, default 10 for backwards compatibility
+    # @return [String]
+    def boost
+      "^#{Settings.BBOX_WITHIN_BOOST || '10'}"
+    end
+
     ##
     # Returns a Geoblacklight::BoundingBox built from the blacklight_params
     # @return [Geoblacklight::BoundingBox]

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

@@ -2,8 +2,10 @@
   <div class='home-search-area'>
     <%= content_tag :h2, t('geoblacklight.home.headline') %>
     <%= content_tag :h3, t('geoblacklight.home.search_heading') %>
-    <div class='col-md-6 col-md-offset-3'>
-      <%= render_search_form_no_navbar %>
+    <div class='row'>
+      <div class='col-md-6 col-md-offset-3'>
+        <%= render_search_form_no_navbar %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,10 +1,12 @@
 <%= form_tag search_action_url, :method => :get, :class => 'search-query-form clearfix' do %>
 <%= render_hash_as_hidden_fields(search_state.params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
 
-<% unless search_fields.empty? %>
+<% if search_fields.length > 1 %>
 <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
 <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field form-control") %>
 <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
+<% elsif search_fields.length == 1 %>
+  <%= hidden_field_tag :search_field, search_fields.first.last %>
 <% end %>
 <div class="input-group search-input-group">
   <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>

data/lib/generators/geoblacklight/install_generator.rb

@@ -6,10 +6,6 @@ module Geoblacklight
 
     desc 'Install Geoblacklight'
 
-    def add_solr_wrapper
-      generate 'blacklight:solr5'
-    end
-
     def mount_geoblacklight_engine
       route "mount Geoblacklight::Engine => 'geoblacklight'"
     end

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -145,7 +145,7 @@ class CatalogController < ApplicationController
     # solr request handler? The one set in config[:default_solr_parameters][:qt],
     # since we aren't specifying it otherwise.
 
-    # config.add_search_field 'text', :label => 'All Fields'
+    config.add_search_field 'all_fields', :label => 'All Fields'
     # config.add_search_field 'dc_title_ti', :label => 'Title'
     # config.add_search_field 'dc_description_ti', :label => 'Description'
 

data/lib/generators/geoblacklight/templates/settings.yml

@@ -10,7 +10,10 @@ CARTO_ONECLICK_LINK: 'http://oneclick.cartodb.com/'
 # DEPRECATED Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
 GEOMETRY_FIELD: 'solr_geom'
 
-#Solr field mappings
+# The bq boost value for spatial search matches within a bounding box
+BBOX_WITHIN_BOOST: '10'
+
+# Solr field mappings
 FIELDS:
   :FILE_FORMAT: 'dc_format_s'
   :GEOMETRY: 'solr_geom'

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/spec/features/empty_search_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+feature 'Empty search' do
+  before do
+    visit root_path
+  end
+  scenario 'Entering empty search returns results page' do
+    click_button 'search'
+    expect(page).to have_css '#documents'
+  end
+end

data/spec/features/home_page_spec.rb

@@ -14,7 +14,7 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
   end
   scenario 'find by category' do
     expect(page).to have_css '.category-block', count: 4
-    expect(page).to have_css '.home-facet-link', count: 33
+    expect(page).to have_css '.home-facet-link', count: 34
     expect(page).to have_css 'a.more_facets_link', count: 4
     click_link 'Elevation'
     expect(page).to have_css '.filterName', text: 'Subject'

data/spec/features/missing_metadata_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+feature 'Missing metadata', js: true do
+  scenario 'Yields error free results page for no spatial' do
+    visit search_catalog_path(q: 'ASTER Global Emissivity')
+    expect(page).to have_css('#map')
+  end
+  scenario 'Yields error free show page for no wxs_identifier or spatial' do
+    visit solr_document_path('aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20')
+    expect(page).to have_css('#map')
+  end
+end

data/spec/fixtures/solr_documents/no_spatial.json

@@ -0,0 +1,21 @@
+{
+  "dc_identifier_s": "c0515c4e-97dc-4fff-82cb-f65144482631",
+  "dc_title_s": "ASTER Global Emissivity Dataset 1-kilometer V003 - AG1KM",
+  "dc_rights_s": "Public",
+  "layer_geom_type_s": "dataset",
+  "dct_provenance_s": "U.S. Geological Survey, Department of the Interior",
+  "dc_description_s": "The Advanced Spaceborne Thermal Emission and Reflection radiometer Global Emissivity Database (ASTER GED) was developed by the National Aeronautics and Space Administration's (NASA) Jet Propulsion Laboratory (JPL), California Institute of Technology. The North America portion of this collection was formerly called the North American ASTER Land Surface Emissivity Database (NAALSED) - a seasonal dataset consisting of mean summer (J-A-S) and winter (J-F-M) products. ASTER GED products are output on 1degree x 1 degree grids at 100-meter or 1-kilometer spatial resolution (nominal) and include the mean emissivity and standard deviation for all 5 ASTER thermal infrared bands, mean land surface temperature (LST) and standard deviation, a re-sampled ASTER GDEM (not included in the North America Winter products), land-water mask, mean Normalized Difference Vegetation Index (NDVI) and standard deviation, latitude, longitude, and observation count. Additional ASTER GED product information is available at https://lpdaac.usgs.gov/products/community_products_table. Product tiles are available in HDF and binary format and may be downloaded via HTTP by visiting the following data clients: NASA Reverb (http://reverb.echo.nasa.gov), LP DAAC Data Pool (http://e4ftl01.cr.usgs.gov/ASTT/), or EarthExplorer (http://earthexplorer.usgs.gov).",
+  "layer_slug_s": "aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20",
+  "dc_subject_sm": [
+    "imagery",
+    "land surface temperature",
+    "u.s. geological survey (usgs)",
+    "earth observing system",
+    "land processes distributed active archive center (lpdaac)",
+    "aster",
+    "normalized difference vegetation index",
+    "terra",
+    "image map",
+    "emissivity"
+  ]
+}

data/spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb

@@ -27,6 +27,18 @@ describe Geoblacklight::SpatialSearchBehavior do
       subject.with(params)
       expect(subject.add_spatial_params(solr_params)[:fq].to_s).to include('Intersects')
     end
+    it 'applies boost based on configured Settings.BBOX_WITHIN_BOOST' do
+      allow(Settings).to receive(:BBOX_WITHIN_BOOST).and_return 99
+      params = { bbox: '-180 -80 120 80' }
+      subject.with(params)
+      expect(subject.add_spatial_params(solr_params)[:bq].to_s).to include('^99')
+    end
+    it 'applies default boost of 10 when Settings.BBOX_WITHIN_BOOST not configured' do
+      allow(Settings).to receive(:BBOX_WITHIN_BOOST).and_return nil
+      params = { bbox: '-180 -80 120 80' }
+      subject.with(params)
+      expect(subject.add_spatial_params(solr_params)[:bq].to_s).to include('^10')
+    end
   end
   describe '#envelope_bounds' do
     it 'calls to_envelope on the bounding box' do

data/template.rb

@@ -1,9 +1,9 @@
 gem 'blacklight', '>= 6.3'
-gem 'geoblacklight', '>= 1.3'
+gem 'geoblacklight', '>= 1.4'
 
 run 'bundle install'
 
 generate 'blacklight:install', '--devise'
-generate 'geoblacklight:install', '--solrwrapper', '-f'
+generate 'geoblacklight:install', '-f'
 
 rake 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -271,6 +271,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"
@@ -442,6 +443,7 @@ files:
 - spec/features/configurable_basemap_spec.rb
 - spec/features/data_dictionary_download_spec.rb
 - spec/features/download_layer_spec.rb
+- spec/features/empty_search_spec.rb
 - spec/features/esri_viewer_spec.rb
 - spec/features/exports_spec.rb
 - spec/features/home_page_spec.rb
@@ -452,6 +454,7 @@ files:
 - spec/features/layer_with_no_references_spec.rb
 - spec/features/linkified_attribute_table_spec.rb
 - spec/features/metadata_panel_spec.rb
+- spec/features/missing_metadata_spec.rb
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
@@ -472,6 +475,7 @@ files:
 - spec/fixtures/solr_documents/esri-tiled_map_layer.json
 - spec/fixtures/solr_documents/esri-wms-layer.json
 - spec/fixtures/solr_documents/harvard_raster.json
+- spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/public_direct_download.json
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
@@ -541,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -555,6 +559,7 @@ test_files:
 - spec/features/configurable_basemap_spec.rb
 - spec/features/data_dictionary_download_spec.rb
 - spec/features/download_layer_spec.rb
+- spec/features/empty_search_spec.rb
 - spec/features/esri_viewer_spec.rb
 - spec/features/exports_spec.rb
 - spec/features/home_page_spec.rb
@@ -565,6 +570,7 @@ test_files:
 - spec/features/layer_with_no_references_spec.rb
 - spec/features/linkified_attribute_table_spec.rb
 - spec/features/metadata_panel_spec.rb
+- spec/features/missing_metadata_spec.rb
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
@@ -585,6 +591,7 @@ test_files:
 - spec/fixtures/solr_documents/esri-tiled_map_layer.json
 - spec/fixtures/solr_documents/esri-wms-layer.json
 - spec/fixtures/solr_documents/harvard_raster.json
+- spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/public_direct_download.json
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json