geoblacklight 2.2.0 → 3.0.1

data/solr/conf/schema.xml

@@ -147,8 +147,8 @@
     <!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
     <fieldType name="bbox" class="solr.BBoxField"
            geo="true" distanceUnits="kilometers" numberType="pdouble" />
-    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>   
-   
+    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+
 
   </types>
 
@@ -169,8 +169,8 @@
   <copyField source="layer_slug_s"       dest="layer_slug_ti"       maxChars="100"/>
 
   <!-- core text search -->
-  <copyField source="*_ti"               dest="text" />
-  <copyField source="*_tmi"              dest="text" />
+  <copyField source="*_s"                dest="text" />
+  <copyField source="*_sm"               dest="text" />
 
   <!-- for sorting text fields -->
   <copyField source="dct_provenance_s"   dest="dct_provenance_sort"/>
@@ -192,7 +192,7 @@
   <copyField source="dct_provenance_s" dest="suggest"/>
   <copyField source="dc_subject_sm" dest="suggest"/>
   <copyField source="dct_spatial_sm" dest="suggest"/>
-  
+
   <!-- for bbox value -->
   <copyField source="solr_geom" dest="solr_bboxtype"/>
 </schema>

data/spec/controllers/catalog_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe CatalogController, type: :controller do

data/spec/controllers/download_controller_spec.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe Geoblacklight::DownloadController, type: :controller do
+describe DownloadController, type: :controller do
   describe '#file' do
     describe 'restricted file' do
       it 'redirects to login for authentication' do

data/spec/controllers/relation_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe RelationController, type: :controller do

data/spec/controllers/wms_controller_spec.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe Geoblacklight::WmsController, type: :controller do
+describe WmsController, type: :controller do
   let(:wms_layer) { instance_double('Geoblacklight::WmsLayer') }
   let(:feature_info) { { values: ['fid', 'layer:example'] } }
   let(:params) do

data/spec/factories/user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }

data/spec/features/bookmarks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Blacklight Bookmarks' do

data/spec/features/configurable_basemap_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Configurable basemap', js: true do
@@ -23,4 +24,13 @@ feature 'Configurable basemap', js: true do
       expect(page).to have_css "img[src*='dark_all']"
     end
   end
+  feature 'using openstreetmapHot' do
+    before do
+      CatalogController.blacklight_config.basemap_provider = 'openstreetmapHot'
+    end
+    scenario 'has openstreetmapHot map' do
+      visit root_path
+      expect(page).to have_css "img[src*='hot']"
+    end
+  end
 end

data/spec/features/data_dictionary_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Data dictionary download tool' do

data/spec/features/download_layer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Download layer' do

data/spec/features/empty_search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Empty search' do

data/spec/features/esri_viewer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'feature_layer reference', js: true do
@@ -13,7 +14,6 @@ feature 'feature_layer reference', js: true do
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays dynamic layer (single layer)' do
-    pending 'external service disabled cors access'
     visit solr_document_path '4669301e-b4b2-4c8b-bf40-01b968a2865b'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
@@ -25,11 +25,6 @@ feature 'feature_layer reference', js: true do
     expect(Nokogiri::HTML.parse(page.body).css('g').length).to eq 23
     fail
   end
-  scenario 'displays image map layer' do
-    visit solr_document_path '32653ed6-8d83-4692-8a06-bf13ffe2c018'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-image-layer', visible: true
-  end
   scenario 'displays tiled map layer' do
     visit solr_document_path 'nyu-test-soil-survey-map'
     expect(page).to have_css '.leaflet-control-zoom', visible: true

data/spec/features/exports_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Export features' do
@@ -5,7 +6,7 @@ feature 'Export features' do
     feature 'Open in Carto' do
       scenario 'shows up in tools' do
         visit solr_document_path 'tufts-cambridgegrid100-04'
-        expect(page).to have_css 'li.exports a', text: 'Open in Carto'
+        expect(page).to have_css 'li.carto a', text: 'Open in Carto'
         click_link 'Open in Carto'
       end
     end
@@ -14,23 +15,14 @@ feature 'Export features' do
     feature 'Open in ArcGIS Online' do
       scenario 'shows up in tools' do
         visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
-        expect(page).to have_css 'li.exports a', text: 'Open in ArcGIS Online'
+        expect(page).to have_css 'li.arcgis a', text: 'Open in ArcGIS Online'
       end
     end
   end
   feature 'when restricted or no wfs' do
     scenario 'is not in tools' do
       visit solr_document_path 'princeton-02870w62c'
-      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
-    end
-  end
-  context 'when carto is configured not to display' do
-    before do
-      allow(Settings).to receive(:CARTO_HIDE).and_return(true)
-    end
-    it 'will not display the carto link' do
-      visit solr_document_path 'tufts-cambridgegrid100-04'
-      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
+      expect(page).not_to have_css 'li.carto a', text: 'Open in Carto'
     end
   end
 end

data/spec/features/help_text_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Help Text' do

data/spec/features/home_page_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Home page', js: true do # use js: true for tests which require js, but it slows things down
@@ -37,4 +38,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     end
     expect(page).to have_css '#documents'
   end
+  scenario 'can search by placename' do
+    click_link 'Minnesota, United States'
+    results = page.all(:css, 'article.document')
+    expect(results.count).to equal(3)
+  end
 end

data/spec/features/iiif_viewer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'iiif reference' do

data/spec/features/index_map_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Index map' do

data/spec/features/layer_inspection_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Layer inspection', js: true do

data/spec/features/layer_opacity_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Layer opacity', js: true do

data/spec/features/layer_preview_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Layer preview', js: true do

data/spec/features/layer_with_no_references_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'layer with no wms or iiif' do

data/spec/features/linkified_attribute_table_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Attribute table values', js: true do

data/spec/features/metadata_panel_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Metadata tools' do

data/spec/features/missing_metadata_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Missing metadata', js: true do
@@ -9,4 +10,16 @@ feature 'Missing metadata', js: true do
     visit solr_document_path('aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20')
     expect(page).to have_css('#map')
   end
+  scenario 'Yields error free show page for no layer_geom_type_s' do
+    visit solr_document_path('05d-03-noGeomType')
+    expect(page).to have_css('#map')
+  end
+  scenario 'Yields error free show page for no dct_provenance_s' do
+    visit solr_document_path('99-0001-noProvenance')
+    expect(page).to have_css('#map')
+  end
+  scenario 'Yields error free show page for no solr_geom' do
+    visit solr_document_path('05d-p16022coll246-noGeo')
+    expect(page).to have_css('#map')
+  end
 end

data/spec/features/multiple_downloads_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'Multiple downloads' do
+  feature 'when item has multiple downloads in dct_references_s' do
+    scenario 'downloads are listed in download card' do
+      visit solr_document_path 'cugir-007950'
+      within '.card.downloads' do
+        expect(page).to have_link 'Shapefile', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/cugir-007950.zip'
+        expect(page).to have_link 'PDF', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/agBROO.pdf'
+        expect(page).to have_link 'KMZ', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/agBROO2011.kmz'
+      end
+    end
+  end
+end

data/spec/features/oembed_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Oembed layer' do

data/spec/features/relations_spec.rb

@@ -1,51 +1,33 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Display related documents' do
-  let(:expected_json_resp) do
-    {
-      'ancestors' =>
-        {
-          'numFound' => 0,
-          'start' => 0,
-          'docs' => []
-        },
-      'descendants' =>
-            {
-              'numFound' => 1,
-              'start' => 0,
-              'docs' =>
-                    [
-                      {
-                        'dc_title_s' => '2015 New York City Subway Complexes and Ridership',
-                        'layer_slug_s' => 'nyu_2451_34502'
-                      }
-                    ]
-            },
-      'current_doc' => 'nyu_2451_34635'
-    }
-  end
   scenario 'Record with dc_source_sm value(s) should have parent(s)' do
     visit relations_solr_document_path('nyu_2451_34502')
-    expect(page).to have_css('ul b', text: 'Source Datasets')
+    expect(page).to have_css('.relations .card-header h2', text: 'Source Datasets')
   end
 
   scenario 'Record that is pointed to by others should have children' do
     visit relations_solr_document_path('nyu_2451_34635')
-    expect(page).to have_css('ul b', text: 'Derived Datasets')
+    expect(page).to have_css('.relations .card-header h2', text: 'Derived Datasets')
   end
 
   scenario 'Relations should respond to json' do
     visit relations_solr_document_path('nyu_2451_34635', format: 'json')
-    expect(page.body).to eq(expected_json_resp.to_json)
+    response = JSON.parse(page.body)
+    expect(response['ancestors']['numFound']).to eq 0
+    expect(response['descendants']['docs'].first['layer_slug_s']).to eq 'nyu_2451_34502'
+    expect(response['current_doc']).to eq 'nyu_2451_34635'
   end
 
   scenario 'Record with relations should render widget in catalog#show', js: true do
     visit solr_document_path('nyu_2451_34635')
-    expect(page).to have_css('div.card-header', text: 'Data Relations')
+    expect(page).to have_css('.card.relations')
+    expect(page).to have_css('div.card-header', text: 'Derived Datasets')
   end
 
   scenario 'Record without relations should not render widget in catalog#show', js: true do
     visit solr_document_path('harvard-g7064-s2-1834-k3')
-    expect(page).to have_no_css('div.panel-heading', text: 'Data Relations')
+    expect(page).to have_no_css('.card.relations')
   end
 end

data/spec/features/saved_searches_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'saved searches' do

data/spec/features/search_bar_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'search bar' do

data/spec/features/search_results_map_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'search results map', js: true do
@@ -5,12 +6,6 @@ feature 'search results map', js: true do
     visit search_catalog_path(q: 'Minnesota')
     expect(page).to have_css '#map'
   end
-  scenario 'present on a search result page' do
-    visit root_path
-    click_link 'Minnesota, United States'
-    results = page.all(:css, 'article.document')
-    expect(results.count).to equal(3)
-  end
   scenario 'view is scoped to Minnesota' do
     visit root_path
     click_link 'Minnesota, United States'

data/spec/features/search_results_overlap_ratio_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'spatial search results overlap ratio' do
@@ -34,15 +35,15 @@ feature 'spatial search results overlap ratio' do
 
     # NY State result
     # Bigger bbox / result bbox overlaps bbox param best
-    expect(position_in_result_page(page, 'cugir-008186')).to be < 3
+    expect(position_in_result_page(page, 'cugir-008186')).to be < 4
 
     # NY State result
     # Bigger bbox / result bbox overlaps bbox param best (score tie)
-    expect(position_in_result_page(page, 'cugir-008186-no-downloadurl')).to be < 3
+    expect(position_in_result_page(page, 'cugir-008186-no-downloadurl')).to be < 4
 
     # NY Adirondak Region result
     # Smaller bbox / result bbox overlaps bbox param the least
-    expect(position_in_result_page(page, 'cugir-007741')).to eq 3
+    expect(position_in_result_page(page, 'cugir-007741')).to eq 4
   end
 end
 

data/spec/features/search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Search' do

data/spec/features/show_page_metadata_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Metadata display on show page' do

data/spec/features/sms_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'SMS tool', js: true do

data/spec/features/split_view.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Index view', js: true do
@@ -30,7 +31,7 @@ feature 'Index view', js: true do
       expect(page).to have_css('div.card.facet-limit', text: 'Data type')
       expect(page).to have_css('div.card.facet-limit', text: 'Format')
     end
-    click_link 'Institution'
+    click_button 'Institution'
     using_wait_time 120 do
       expect(page).to have_css('a.facet-select', text: 'Minnesota', visible: true)
       expect(page).to have_css('a.facet-select', text: 'MIT', visible: true)
@@ -51,9 +52,9 @@ feature 'Index view', js: true do
   end
 
   scenario 'click on a record area to expand collapse' do
-    within('.documentHeader', match: :first) do
+    within('article', match: :first) do
       expect(page).not_to have_css('.collapse')
-      find('.status-icons').click
+      find('button').click
       expect(page).to have_css('.collapse', visible: true)
     end
   end