geoblacklight 4.0.0.pre.alpha.1 → 4.0.0.pre.rc1

data/lib/geoblacklight/metadata/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'geoblacklight/faraday_middleware/follow_redirects'
 module Geoblacklight
   module Metadata
     ##
@@ -47,7 +48,7 @@ module Geoblacklight
       # connection error
       def retrieve_metadata
         connection = Faraday.new(url: @reference.endpoint) do |conn|
-          conn.use FaradayMiddleware::FollowRedirects
+          conn.use Geoblacklight::FaradayMiddleware::FollowRedirects
           conn.adapter Faraday.default_adapter
         end
         begin

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '4.0.0-alpha.1'
+  VERSION = '4.0.0-rc1'
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -1,41 +1,15 @@
 # frozen_string_literal: true
 module Geoblacklight
+  # Override Blacklight helpers to inject behavior
   module ViewHelperOverride
-    include CatalogHelperOverride
-
-    def spatial_parameters?
-      params[:bbox]
-    end
-
-    # Overrides BL method to enable results for spatial only params
-    def has_search_parameters?
-      spatial_parameters? || super
-    end
-
-    def query_has_constraints?(localized_params = params)
-      has_search_parameters? || super(localized_params)
-    end
-
     def render_search_to_s(params)
       super + render_search_to_s_bbox(params)
     end
 
     def render_search_to_s_bbox(params)
       return ''.html_safe if params['bbox'].blank?
-      render_search_to_s_element(t('geoblacklight.bbox_label'), render_filter_value(params['bbox']))
-    end
 
-    def render_constraints_filters(localized_params = params)
-      content = super(localized_params)
-      localized_params = localized_params.to_h if localized_params.respond_to?(:to_h)
-
-      if localized_params[:bbox]
-        path = search_action_path(remove_spatial_filter_group(:bbox, localized_params))
-        content << render_constraint_element(t('geoblacklight.bbox_label'),
-                                             localized_params[:bbox], remove: path)
-      end
-
-      content
+      render_search_to_s_element(t('geoblacklight.bbox_label'), render_filter_value(params['bbox']))
     end
   end
 end

data/lib/geoblacklight.rb

@@ -4,7 +4,6 @@ require 'geoblacklight/engine'
 
 module Geoblacklight
   require 'geoblacklight/bounding_box'
-  require 'geoblacklight/catalog_helper_override'
   require 'geoblacklight/constants'
   require 'geoblacklight/exceptions'
   require 'geoblacklight/geometry'
@@ -34,15 +33,6 @@ module Geoblacklight
   require 'geoblacklight/relation/ancestors'
   require 'geoblacklight/relation/relation_response'
 
-  def self.inject!
-    CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)
-    CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
-    CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless
-      CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
-    SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
-      SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
-  end
-
   def self.logger
     ::Rails.logger
   end

data/lib/tasks/geoblacklight.rake

@@ -87,7 +87,7 @@ namespace :geoblacklight do
         fail 'Please supply required arguments [document_id, download_type and timeout]'
       end
       document = Geoblacklight::SolrDocument.find(args[:doc_id])
-      fail Blacklight::Exceptions::RecordNotFound if document[:layer_slug_s] != args[:doc_id]
+      fail Blacklight::Exceptions::RecordNotFound if document[:id] != args[:doc_id]
       download = "Geoblacklight::#{args[:download_type].capitalize}Download"
                  .constantize.new(document, timeout: args[:timeout].to_i)
       download.get

data/schema/geoblacklight-schema-aardvark.json

@@ -67,28 +67,7 @@
     "dcat_theme_sm": {
       "type": "array",
       "items": {
-        "type": "string",
-        "enum": [
-          "Farming",
-          "Biota",
-          "Boundaries",
-          "Climatology, Meteorology and Atmosphere",
-          "Economy",
-          "Elevation",
-          "Environment",
-          "Geoscientific Information",
-          "Health",
-          "Imagery and Base Maps",
-          "Intelligence and Military",
-          "Inland Waters",
-          "Location",
-          "Oceans",
-          "Planning and Cadastral",
-          "Society",
-          "Structure",
-          "Transportation",
-          "Utilities and Communications"
-        ]
+        "type": "string"
       }
     },
     "dcat_keyword_sm": {
@@ -123,7 +102,8 @@
       }
     },
     "locn_geometry": { "type": "string" },
-    "dcat_centroid_ss": { "type": "string" },
+    "dcat_bbox": { "type": "string" },
+    "dcat_centroid": { "type": "string" },
     "dct_relation_sm": {
       "type": "array",
       "items": {

data/solr/conf/schema.xml

@@ -4,20 +4,36 @@
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>
     <field name="timestamp" type="date"   stored="true" indexed="true" default="NOW"/>
-    <field name="geoblacklight_version" type="string" stored="true" indexed="true"/>
-    <field name="id"      type="string" stored="true" indexed="true" required="true"/>
+    <field name="id"        type="string" stored="true" indexed="true" required="true"/>
 
     <!-- core generated fields -->
     <field name="text" type="text_en" stored="false" indexed="true" multiValued="true"
                        termVectors="true" termPositions="true" termOffsets="true" />
 
+    <!-- Spatial Field Type: Represents the exent of the resource and powers map search functionality.
+      Value can be any valid WKT or ENVELOPE String:
+        <field name="locn_geometry">POLYGON((1 8, 1 9, 2 9, 2 8, 1 8))</field>
+        <field name="locn_geometry">ENVELOPE(-117.312, -115.39, 84.31, 83.1)</field> -->
+    <field name="locn_geometry" type="location_geo3d" stored="true" indexed="true"/>
+
+    <!-- Spatial Field Type: The bounding box of the resource. Used in overlap ratio boosting.
+      Value must be an ENVELOPE String:
+        <field name="dcat_bbox">ENVELOPE(-117.312, -115.39, 84.31, 83.1)</field> -->
+    <field name="dcat_bbox" type="location_rpt" stored="true" indexed="true"/>
+
+    <!-- Spatial Field Type: Used to display the center point of a resource. -->
+    <field name="dcat_centroid" type="location" stored="true" indexed="true"/>
+
+    <!-- Spatial Field Type: Internal field used for overlap ratio boosting. -->
+    <field name="solr_bboxtype" type="bbox" stored="true" indexed="true"/>
+
     <!-- dynamic field with simple types by suffix -->
     <dynamicField name="*_b"    type="boolean" stored="true"  indexed="true"/>
     <dynamicField name="*_d"    type="double"  stored="true"  indexed="true"/>
     <dynamicField name="*_dt"   type="date"    stored="true"  indexed="true"/>
     <dynamicField name="*_f"    type="float"   stored="true"  indexed="true"/>
     <dynamicField name="*_i"    type="int"     stored="true"  indexed="true"/>
-    <dynamicField name="*_im"   type="int"     stored="true"  indexed="true" multiValued="true" />
+    <dynamicField name="*_im"   type="int"     stored="true"  indexed="true" multiValued="true" sortMissingLast="true" />
     <dynamicField name="*_l"    type="long"    stored="true"  indexed="true"/>
     <dynamicField name="*_s"    type="string"  stored="true"  indexed="true"/>
     <dynamicField name="*_ss"   type="string"  stored="true"  indexed="false"/>
@@ -44,31 +60,6 @@
 
     <!-- date range (_drsim) -->
     <dynamicField name="*_drsim" type="dateRange" stored="true" indexed="true" multiValued="true"/>
-
-    <!-- Spatial field types:
-
-         Solr3:
-           <field name="my_pt">83.1,-117.312</field>
-             as (y,x)
-
-         Solr4:
-
-           <field name="my_bbox">-117.312 83.1 -115.39 84.31</field>
-             as (W S E N)
-
-           <field name="my_geom">ENVELOPE(-117.312, -115.39, 84.31, 83.1)</field>
-             as (W E N S)
-
-           <field name="my_jts">POLYGON((1 8, 1 9, 2 9, 2 8, 1 8))</field>
-             as WKT for point, linestring, polygon
-
-      -->
-    <dynamicField name="*_pt"   type="location"     stored="true" indexed="true"/>
-    <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/><!-- deprecated -->
-    <dynamicField name="*_geom" type="location_rpt" stored="true" indexed="true"/>
-    <dynamicField name="*_geometry" type="location_rpt" stored="true" indexed="true"/>
-    <dynamicField name="*_bboxtype" type="bbox" stored="true" indexed="true"/>
-
   </fields>
 
   <types>
@@ -146,32 +137,36 @@
     </fieldType>
 
     <!-- Spatial field types -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_d"/>
-
+    <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
                geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>
+    <fieldType name="location_geo3d"
+      class="solr.SpatialRecursivePrefixTreeFieldType"
+      spatialContextFactory="Geo3D"
+      prefixTree="s2"
+      geo="true"
+      maxDistErr="0.001"
+      planetModel="WGS84"/>
+
     <!-- 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"/>
-
-
   </types>
 
   <!-- for scoring formula -->
   <copyField source="dct_spatial_sm"     dest="dct_spatial_tmi"     maxChars="10000"/>
   <copyField source="dct_temporal_sm"    dest="dct_temporal_tmi"    maxChars="10000"/>
-  <copyField source="dct_creator_sm"      dest="dc_creator_tmi"      maxChars="1000"/>
-  <copyField source="dct_description_sm"   dest="dc_description_tmi"   maxChars="10000"/>
-  <copyField source="dct_format_s"        dest="dc_format_ti"        maxChars="100"/>
-  <copyField source="dct_identifier_sm"    dest="dc_identifier_tmi"    maxChars="100"/>
-  <copyField source="dct_publisher_sm"     dest="dc_publisher_tmi"     maxChars="1000"/>
-  <copyField source="dct_accessRights_s"        dest="dc_rights_ti"        maxChars="100"/>
+  <copyField source="dct_creator_sm"      dest="dct_creator_tmi"      maxChars="1000"/>
+  <copyField source="dct_description_sm"   dest="dct_description_tmi"   maxChars="10000"/>
+  <copyField source="dct_format_s"        dest="dct_format_ti"        maxChars="100"/>
+  <copyField source="dct_identifier_sm"    dest="dct_identifier_tmi"    maxChars="100"/>
+  <copyField source="dct_publisher_sm"     dest="dct_publisher_tmi"     maxChars="1000"/>
+  <copyField source="dct_accessRights_s"        dest="dct_accessRights_ti"        maxChars="100"/>
   <copyField source="schema_provider_s"   dest="dct_provider_ti"   maxChars="1000"/>
-  <copyField source="dct_subject_sm"      dest="dc_subject_tmi"      maxChars="10000"/>
-  <copyField source="dct_title_s"         dest="dc_title_ti"         maxChars="1000"/>
+  <copyField source="dct_subject_sm"      dest="dct_subject_tmi"      maxChars="10000"/>
+  <copyField source="dct_title_s"         dest="dct_title_ti"         maxChars="1000"/>
   <copyField source="dct_isPartOf_sm"    dest="dct_isPartOf_tmi"    maxChars="1000"/>
-  <copyField source="locn_geometry_s"  dest="layer_geom_type_ti"  maxChars="100"/>
   <copyField source="id"       dest="layer_slug_ti"       maxChars="100"/>
 
   <!-- core text search -->
@@ -180,7 +175,6 @@
 
   <!-- for sorting text fields -->
   <copyField source="schema_provider_s"   dest="schema_provider_sort"/>
-  <copyField source="dct_publisher_sm"     dest="dc_publisher_sort"/>
   <copyField source="dct_title_s"         dest="dct_title_sort"/>
 
   <!-- for spell checking -->
@@ -200,5 +194,5 @@
   <copyField source="dct_spatial_sm" dest="suggest"/>
 
   <!-- for bbox value -->
-  <copyField source="locn_geometry" dest="solr_bboxtype"/>
+  <copyField source="dcat_bbox" dest="solr_bboxtype"/>
 </schema>

data/solr/conf/solrconfig.xml

@@ -70,9 +70,9 @@
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <query>
     <maxBooleanClauses>1024</maxBooleanClauses>
-    <filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
+    <filterCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <queryResultCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <documentCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
     <enableLazyFieldLoading>true</enableLazyFieldLoading>
     <queryResultWindowSize>20</queryResultWindowSize>
     <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
@@ -117,35 +117,35 @@
       <str name="q.alt">*:*</str>
       <str name="qf">
         text^1
-        dc_description_ti^2
-        dc_creator_tmi^3
-        dc_publisher_ti^3
+        dct_description_ti^2
+        dct_creator_tmi^3
+        dct_publisher_ti^3
         dct_isPartOf_tmi^4
-        dc_subject_tmi^5
+        dct_subject_tmi^5
         dct_spatial_tmi^5
         dct_temporal_tmi^5
-        dc_title_ti^6
-        dc_rights_ti^7
+        dct_title_ti^6
+        dct_accessRights_ti^7
         dct_provider_ti^8
         layer_geom_type_ti^9
         layer_slug_ti^10
-        dc_identifier_ti^10
+        dct_identifier_ti^10
       </str>
       <str name="pf"><!-- phrase boost within result set -->
         text^1
-        dc_description_ti^2
-        dc_creator_tmi^3
-        dc_publisher_ti^3
+        dct_description_ti^2
+        dct_creator_tmi^3
+        dct_publisher_ti^3
         dct_isPartOf_tmi^4
-        dc_subject_tmi^5
+        dct_subject_tmi^5
         dct_spatial_tmi^5
         dct_temporal_tmi^5
-        dc_title_ti^6
-        dc_rights_ti^7
+        dct_title_ti^6
+        dct_accessRights_ti^7
         dct_provider_ti^8
         layer_geom_type_ti^9
         layer_slug_ti^10
-        dc_identifier_ti^10
+        dct_identifier_ti^10
       </str>
       <bool name="facet">true</bool>
       <int name="facet.mincount">1</int>

data/spec/components/geoblacklight/icon_facet_item_component_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Geoblacklight::IconFacetItemComponent, type: :component do
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(suppress_link: true, **kwargs))
+  end
+
+  let(:kwargs) { { facet_item: facet_item } }
+  let(:facet_item) { instance_double(Blacklight::FacetItemPresenter, label: 'Stanford', value: 'stanford', hits: 5, href: nil, selected?: false, facet_config: facet_config) }
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(field: 'provider_facet', label: 'Provider') }
+
+  it 'prepends the icon to the facet item label' do
+    expect(rendered).to have_selector('span.facet-label', text: 'Stanford')
+    expect(rendered).to have_selector('span.facet-label svg title', text: 'Stanford University')
+  end
+end

data/spec/controllers/catalog_controller_spec.rb

@@ -77,7 +77,7 @@ describe CatalogController, type: :controller do
       expect(response_values).to include Settings.FIELDS.ACCESS_RIGHTS => 'Public'
       expect(response_values).to include Settings.FIELDS.PROVIDER => 'Tufts'
       expect(response_values).to include Settings.FIELDS.ID => 'tufts-cambridgegrid100-04'
-      expect(response_values).to include Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
+      expect(response_values).to include Settings.FIELDS.GEOMETRY => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
     end
   end
 end

data/spec/features/download_layer_spec.rb

@@ -13,71 +13,88 @@ feature 'Download layer' do
   scenario 'clicking initial shapefile download button should trigger download', js: true do
     expect(shapefile_download).to receive(:get).and_return('mit-f6rqs4ucovjk2-shapefile.zip')
     visit solr_document_path('mit-f6rqs4ucovjk2')
-    find('a[data-download-type="shapefile"]', text: 'Export').click
+    find('#downloads-button').click
+    find('a[data-download-type="shapefile"]', text: 'Export Shapefile').click
     expect(page).to have_css(
       'a[href="/download/file/mit-f6rqs4ucovjk2-shapefile.zip"]',
       text: 'Your file mit-f6rqs4ucovjk2-shapefile.zip is ready for download'
     )
   end
+
   scenario 'failed download should return message with link to layer', js: true do
     expect(shapefile_download).to receive(:get).and_raise(Geoblacklight::Exceptions::ExternalDownloadFailed.new(message: 'Failed', url: 'http://www.example.com/failed'))
     visit solr_document_path('mit-f6rqs4ucovjk2')
-    find('a[data-download-type="shapefile"]', text: 'Export').click
+    find('#downloads-button').click
+    find('#downloads-collapse a[data-download-type="shapefile"]', text: 'Export Shapefile').click
     expect(page).to have_css 'div.alert.alert-danger', text: 'Sorry, the requested file could not be downloaded. Try downloading it directly from:'
     expect(page).to have_css 'a', text: 'http://www.example.com/failed'
   end
+
   scenario 'clicking kmz download button should trigger download', js: true do
     expect(kmz_download).to receive(:get).and_return('mit-f6rqs4ucovjk2-kmz.kmz')
     visit solr_document_path('mit-f6rqs4ucovjk2')
-    find('a[data-download-type="kmz"]', text: 'Export').click
+    find('#downloads-button').click
+    find('#downloads-collapse a[data-download-type="kmz"]', text: 'Export KMZ').click
     expect(page).to have_css(
       'a[href="/download/file/mit-f6rqs4ucovjk2-kmz.kmz"]',
       text: 'Your file mit-f6rqs4ucovjk2-kmz.kmz is ready for download'
     )
   end
+
   scenario 'jpg download option should be present under toggle' do
     visit solr_document_path('princeton-02870w62c')
-    expect(page).to have_css('li a', text: 'Original JPG')
+    find('#downloads-button').click
+    expect(page).to have_css('#downloads-collapse a', text: 'Original JPG')
   end
+
   scenario 'clicking jpg download button should redirect to external image' do
     visit solr_document_path('princeton-02870w62c')
-    expect(page).to have_css("a.btn.btn-default[href='https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/full/full/0/default.jpg']", text: 'Original JPG')
+    find('#downloads-button').click
+    expect(page).to have_css("#downloads-collapse a[href='https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/full/0/default.jpg']", text: 'Original JPG')
   end
+
   scenario 'options should be available under toggle' do
     visit solr_document_path('mit-f6rqs4ucovjk2')
-    expect(page).to have_css('li a[data-download-type="shapefile"]', text: 'Export')
-    expect(page).to have_css('li a[data-download-type="kmz"]', text: 'Export')
+    find('#downloads-button').click
+    expect(page).to have_css('#downloads-collapse a[data-download-type="shapefile"]', text: 'Export Shapefile')
+    expect(page).to have_css('#downloads-collapse a[data-download-type="kmz"]', text: 'Export KMZ')
   end
+
   scenario 'restricted layer should not have download available to non logged in user' do
     visit solr_document_path('stanford-cg357zz0321')
     expect(page).to have_css 'a', text: 'Login to View and Download'
-    expect(page).not_to have_css 'button', text: 'Download Shapefile'
+    expect(page).not_to have_css 'button', text: 'Download'
   end
+
   scenario 'restricted layer should have download available to logged in user' do
     sign_in
     visit solr_document_path('stanford-cg357zz0321')
     expect(page).not_to have_css 'a', text: 'Login to view and download'
-    expect(page).to have_css 'a[data-download-type="shapefile"]', text: 'Export'
+    expect(page).to have_css 'button', text: 'Download'
   end
+
   scenario 'layer with direct download and wms/wfs should include all download types' do
     sign_in
     visit solr_document_path('stanford-cg357zz0321')
-    expect(page).to have_css 'h2', text: 'Downloads'
-    expect(page).to have_css 'a', text: 'Original Shapefile'
-    expect(page).to have_css 'h2', text: 'Export Formats'
-    expect(page).to have_css 'a', text: 'Export'
+    find('#downloads-button').click
+    expect(page).to have_css('#downloads-collapse a', text: 'Original')
+    expect(page).to have_css('#downloads-collapse a', text: 'Export')
   end
-  scenario 'clicking GeoTIFF button for Harvard layer should show email form', js: true do
+
+  scenario 'clicking download GeoTIFF for Harvard layer should show email form', js: true do
     visit solr_document_path('harvard-g7064-s2-1834-k3')
+    find('#downloads-button').click
     find('a[data-download-type="harvard-hgl"]', text: 'GeoTIFF').click
     expect(page).to have_css('#hglRequest')
   end
+
   context 'with a successful request to the server' do
     let(:hgl_download) { instance_double(Geoblacklight::HglDownload) }
 
     xscenario 'submitting email form should trigger HGL request', js: true do
       # There are currently difficulties with testing the HGL downloader
       visit solr_document_path('harvard-g7064-s2-1834-k3')
+      find('#downloads-button').click
       find('a[data-download-type="harvard-hgl"]', text: 'Original GeoTIFF').click
 
       allow_any_instance_of(Geoblacklight::HglDownload).to receive(:new).and_return(hgl_download)

data/spec/features/esri_viewer_spec.rb

@@ -3,17 +3,19 @@ require 'spec_helper'
 
 feature 'feature_layer reference', js: true do
   scenario 'displays image map layer' do
-    skip 'CORS error - Purdue web services are down'
+    skip 'spec depend on potentially flaky external services'
     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 dynamic layer (all layers)' do
+    skip 'spec depend on potentially flaky external services'
     visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays dynamic layer (single layer)' do
+    skip 'spec depend on potentially flaky external services'
     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
@@ -26,11 +28,13 @@ feature 'feature_layer reference', js: true do
     fail
   end
   scenario 'displays tiled map layer' do
+    skip 'spec depend on potentially flaky external services'
     visit solr_document_path 'nyu-test-soil-survey-map'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
   end
   scenario 'displays Esri WMS layer' do
+    skip 'spec depend on potentially flaky external services'
     visit solr_document_path 'purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true

data/spec/features/full_screen_controll_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+feature 'Leaflet fullscreen control', js: true do
+  scenario 'IIIF layer should have full screen control' do
+    visit solr_document_path('princeton-sx61dn82p')
+    expect(page).to have_css('.leaflet-control-fullscreen-button')
+  end
+
+  scenario 'WMS layer should have full screen control' do
+    visit solr_document_path('stanford-cz128vq0535')
+    expect(page).to have_css('.leaflet-control-fullscreen-button')
+  end
+end

data/spec/features/home_page_spec.rb

@@ -21,9 +21,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     expect(page).to have_css '.category-block', count: 4
     expect(page).to have_css '.home-facet-link', count: 36
     expect(page).to have_css 'a.more_facets_link', count: 4
-    click_link 'Topography'
+    click_link 'Counties'
     expect(page).to have_css '.filter-name', text: 'Subject'
-    expect(page).to have_css '.filter-value', text: 'Topography'
+    expect(page).to have_css '.filter-value', text: 'Counties'
   end
   scenario 'map should be visible' do
     within '#main-container' do

data/spec/features/index_map_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 feature 'Index map' do
   # Colors
-  default_color = '#1eb300'
-  selected_color = '#006bde'
+  default_color = '#7FCDBB'
+  selected_color = '#2C7FB8'
   scenario 'displays index map viewer (polygon)', js: true do
     visit solr_document_path('stanford-fb897vt9938')
     # Wait until SVG elements are added

data/spec/features/missing_metadata_spec.rb

@@ -18,7 +18,7 @@ feature 'Missing metadata', js: true do
     visit solr_document_path('99-0001-noprovider')
     expect(page).to have_css('#map')
   end
-  scenario 'Yields error free show page for no solr_geom' do
+  scenario 'Yields error free show page for no locn_geometry' do
     visit solr_document_path('05d-p16022coll246-noGeo')
     expect(page).to have_css('#map')
   end

data/spec/features/multiple_downloads_spec.rb

@@ -5,7 +5,8 @@ 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
+      find('#downloads-button').click
+      within '#downloads-collapse' 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'

data/spec/features/relations_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 feature 'Display related documents' do
-  scenario 'Record with dc_source_sm value(s) should have parent(s)' do
+  scenario 'Record with dct_source_sm value(s) should have parent(s)' do
     visit relations_solr_document_path('nyu_2451_34502')
     expect(page).to have_css('.relations .card-header h2', text: 'Source Datasets')
   end

data/spec/features/saved_searches_spec.rb

@@ -9,6 +9,6 @@ feature 'saved searches' do
       expect(page.current_url).to match(/bbox=/)
     end
     visit blacklight.search_history_path
-    expect(page).to have_css 'td.query a', text: /#{I18n.t('geoblacklight.bbox_label')}:/
+    expect(page).to have_css 'td.query a', text: /#{I18n.t('geoblacklight.bbox_label')}/
   end
 end

data/spec/features/search_results_complex_geometry_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'spatial search results with an WKT bounding box that crosses the anti-meridian' do
+  scenario 'when searching within the covered area' do
+    # BBox param is in China
+    visit search_catalog_path(
+      q: 'A new & accurate map of Asia',
+      bbox: '98.4375 31.765537 117.202148 45.429299'
+    )
+    result_id = page.all('div.documentHeader.row').first['data-layer-id']
+    expect(result_id).to eq '57f0f116-b64e-4773-8684-96ba09afb549'
+  end
+
+  scenario 'when searching outside the covered area' do
+    # BBox param is in Oklahoma
+    visit search_catalog_path(
+      q: 'A new & accurate map of Asia',
+      bbox: '-98.717651 34.40691 -96.37207 36.199958'
+    )
+    results = page.all('div.documentHeader.row')
+    expect(results.count).to eq 0
+  end
+end

data/spec/features/search_results_icons_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'search results display document iconography' do
+  scenario 'when viewing result row' do
+    # Search returns fixture stanford-cg357zz0321
+    visit search_catalog_path(
+      search_field: 'all_fields',
+      q: 'stanford-cg357zz0321'
+    )
+    first_result = page.all('span.status-icons > span')
+    expect(first_result[0][:class]).to include 'blacklight-icon-dataset'
+    expect(first_result[1][:class]).to include 'blacklight-icon-stanford'
+    expect(first_result[2][:class]).to include 'blacklight-icon-restricted'
+  end
+end