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

data/vendor/assets/stylesheets/leaflet.fullscreen.css

@@ -0,0 +1,40 @@
+.leaflet-control-fullscreen a {
+  background:#fff url(fullscreen.png) no-repeat 0 0;
+  background-size:26px 52px;
+  }
+  .leaflet-touch .leaflet-control-fullscreen a {
+    background-position: 2px 2px;
+    }
+  .leaflet-fullscreen-on .leaflet-control-fullscreen a {
+    background-position:0 -26px;
+    }
+  .leaflet-touch.leaflet-fullscreen-on .leaflet-control-fullscreen a {
+    background-position: 2px -24px;
+    }
+
+/* Do not combine these two rules; IE will break. */
+.leaflet-container:-webkit-full-screen {
+  width:100%!important;
+  height:100%!important;
+  }
+.leaflet-container.leaflet-fullscreen-on {
+  width:100%!important;
+  height:100%!important;
+  }
+
+.leaflet-pseudo-fullscreen {
+  position:fixed!important;
+  width:100%!important;
+  height:100%!important;
+  top:0!important;
+  left:0!important;
+  z-index:99999;
+  }
+
+@media
+  (-webkit-min-device-pixel-ratio:2),
+  (min-resolution:192dpi) {
+    .leaflet-control-fullscreen a {
+      background-image:url(fullscreen@2x.png);
+    }
+  }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.alpha.1
+  version: 4.0.0.pre.rc1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.8'
+        version: '7.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.8'
+        version: '7.12'
 - !ruby/object:Gem::Dependency
   name: config
   requirement: !ruby/object:Gem::Requirement
@@ -65,30 +65,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -319,42 +305,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.14'
 description: GeoBlacklight provides a world-class discovery platform for geospatial
   (GIS) holdings. It is an open collaborative project aiming to build off of the successes
   of the Blacklight Solr-powered discovery interface and the multi-institutional OpenGeoportal
@@ -364,8 +364,7 @@ email:
 - drh@stanford.edu
 - eliotj@princeton.edu
 - pjreed@stanford.edu
-executables:
-- coverage.rb
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -392,10 +391,13 @@ files:
 - app/assets/images/blacklight/bookmark.svg
 - app/assets/images/blacklight/cd-rom.svg
 - app/assets/images/blacklight/chicago.svg
+- app/assets/images/blacklight/child-item.svg
 - app/assets/images/blacklight/citation.svg
 - app/assets/images/blacklight/collection.svg
+- app/assets/images/blacklight/collections.svg
 - app/assets/images/blacklight/columbia.svg
 - app/assets/images/blacklight/cornell.svg
+- app/assets/images/blacklight/datasets.svg
 - app/assets/images/blacklight/dvd-rom.svg
 - app/assets/images/blacklight/email.svg
 - app/assets/images/blacklight/esri-globe.svg
@@ -405,6 +407,7 @@ files:
 - app/assets/images/blacklight/home.svg
 - app/assets/images/blacklight/illinois.svg
 - app/assets/images/blacklight/image.svg
+- app/assets/images/blacklight/imagery.svg
 - app/assets/images/blacklight/indiana.svg
 - app/assets/images/blacklight/iowa.svg
 - app/assets/images/blacklight/leaf.svg
@@ -413,6 +416,7 @@ files:
 - app/assets/images/blacklight/logo.svg
 - app/assets/images/blacklight/map-marker.svg
 - app/assets/images/blacklight/map.svg
+- app/assets/images/blacklight/maps.svg
 - app/assets/images/blacklight/maryland.svg
 - app/assets/images/blacklight/massgis.svg
 - app/assets/images/blacklight/metadata.svg
@@ -429,6 +433,7 @@ files:
 - app/assets/images/blacklight/ohio-state.svg
 - app/assets/images/blacklight/pagelines-brands.svg
 - app/assets/images/blacklight/paper-map.svg
+- app/assets/images/blacklight/parent-item.svg
 - app/assets/images/blacklight/penn-state.svg
 - app/assets/images/blacklight/pennsylvania-state-university.svg
 - app/assets/images/blacklight/point.svg
@@ -449,6 +454,7 @@ files:
 - app/assets/images/blacklight/tufts.svg
 - app/assets/images/blacklight/ucla.svg
 - app/assets/images/blacklight/university-of-chicago.svg
+- app/assets/images/blacklight/university-of-colorado-boulder.svg
 - app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg
 - app/assets/images/blacklight/university-of-iowa.svg
 - app/assets/images/blacklight/university-of-maryland.svg
@@ -458,10 +464,12 @@ files:
 - app/assets/images/blacklight/university-of-wisconsin-madison.svg
 - app/assets/images/blacklight/uva.svg
 - app/assets/images/blacklight/web_services.svg
+- app/assets/images/blacklight/websites.svg
 - app/assets/images/blacklight/wisconsin.svg
 - app/assets/images/favicon.ico
 - app/assets/javascripts/geoblacklight/basemaps.js
 - app/assets/javascripts/geoblacklight/controls.js
+- app/assets/javascripts/geoblacklight/controls/fullscreen.js
 - app/assets/javascripts/geoblacklight/controls/opacity.js
 - app/assets/javascripts/geoblacklight/downloaders.js
 - app/assets/javascripts/geoblacklight/downloaders/downloader.js
@@ -493,9 +501,12 @@ files:
 - app/assets/javascripts/geoblacklight/viewers/index_map.js
 - app/assets/javascripts/geoblacklight/viewers/map.js
 - app/assets/javascripts/geoblacklight/viewers/oembed.js
+- app/assets/javascripts/geoblacklight/viewers/tilejson.js
 - app/assets/javascripts/geoblacklight/viewers/tms.js
 - app/assets/javascripts/geoblacklight/viewers/viewer.js
 - app/assets/javascripts/geoblacklight/viewers/wms.js
+- app/assets/javascripts/geoblacklight/viewers/wmts.js
+- app/assets/javascripts/geoblacklight/viewers/xyz.js
 - app/assets/stylesheets/geoblacklight/geoblacklight.scss
 - app/assets/stylesheets/geoblacklight/modules/_base.scss
 - app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss
@@ -521,6 +532,7 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/web_services.scss
 - app/components/geoblacklight/homepage_feature_facet_component.html.erb
 - app/components/geoblacklight/homepage_feature_facet_component.rb
+- app/components/geoblacklight/icon_facet_item_component.rb
 - app/controllers/download_controller.rb
 - app/controllers/relation_controller.rb
 - app/controllers/wms_controller.rb
@@ -529,27 +541,25 @@ files:
 - app/helpers/carto_helper.rb
 - app/helpers/geoblacklight/geoblacklight_helper_behavior.rb
 - app/helpers/geoblacklight_helper.rb
+- app/models/concerns/geoblacklight/bbox_filter_field.rb
+- app/models/concerns/geoblacklight/bbox_filter_query.rb
 - app/models/concerns/geoblacklight/solr_document.rb
 - app/models/concerns/geoblacklight/solr_document/arcgis.rb
 - app/models/concerns/geoblacklight/solr_document/carto.rb
 - app/models/concerns/geoblacklight/solr_document/citation.rb
 - app/models/concerns/geoblacklight/solr_document/finder.rb
 - app/models/concerns/geoblacklight/solr_document/inspection.rb
-- app/models/concerns/geoblacklight/spatial_search_behavior.rb
+- app/models/concerns/geoblacklight/suppressed_records_search_behavior.rb
+- app/presenters/geoblacklight/bbox_item_presenter.rb
 - app/presenters/geoblacklight/document_presenter.rb
 - app/views/catalog/_arcgis.html.erb
 - app/views/catalog/_carto.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_data_dictionary.html.erb
 - app/views/catalog/_document_split.html.erb
-- app/views/catalog/_download_generated_link.html.erb
-- app/views/catalog/_download_link.html.erb
-- app/views/catalog/_downloads_generated.html.erb
-- app/views/catalog/_downloads_primary.html.erb
-- app/views/catalog/_downloads_secondary.html.erb
+- app/views/catalog/_downloads_collapse.html.erb
 - app/views/catalog/_header_icons.html.erb
 - app/views/catalog/_home_text.html.erb
-- app/views/catalog/_icon_facet.html.erb
 - app/views/catalog/_index_split_default.html.erb
 - app/views/catalog/_metadata.html.erb
 - app/views/catalog/_relations_container.html.erb
@@ -560,6 +570,7 @@ files:
 - app/views/catalog/_show_downloads.html.erb
 - app/views/catalog/_show_header_default.html.erb
 - app/views/catalog/_show_sidebar.html.erb
+- app/views/catalog/_show_web_services.html.erb
 - app/views/catalog/_web_services.html.erb
 - app/views/catalog/_web_services_default.html.erb
 - app/views/catalog/_web_services_wfs.html.erb
@@ -576,7 +587,6 @@ files:
 - app/views/relation/index.json.jbuilder
 - app/views/shared/_header_navbar.html.erb
 - babel.config.json
-- bin/coverage.rb
 - config/initializers/new_gbl_settings_defaults_3_4.yml
 - config/initializers/rails_config.rb
 - config/locales/geoblacklight.en.yml
@@ -584,21 +594,16 @@ files:
 - jest.config.js
 - lib/generators/geoblacklight/assets_generator.rb
 - lib/generators/geoblacklight/install_generator.rb
-- lib/generators/geoblacklight/templates/Procfile
 - lib/generators/geoblacklight/templates/assets/_blacklight.scss
 - lib/generators/geoblacklight/templates/assets/_customizations.scss
 - lib/generators/geoblacklight/templates/assets/_geoblacklight.scss
 - lib/generators/geoblacklight/templates/assets/application.scss
 - lib/generators/geoblacklight/templates/assets/geoblacklight.js
 - lib/generators/geoblacklight/templates/catalog_controller.rb
-- lib/generators/geoblacklight/templates/package.json
 - lib/generators/geoblacklight/templates/settings.gbl_v1.yml
 - lib/generators/geoblacklight/templates/settings.yml
-- lib/generators/geoblacklight/templates/webpacker.yml
-- lib/generators/geoblacklight/webpacker_generator.rb
 - lib/geoblacklight.rb
 - lib/geoblacklight/bounding_box.rb
-- lib/geoblacklight/catalog_helper_override.rb
 - lib/geoblacklight/constants.rb
 - lib/geoblacklight/download.rb
 - lib/geoblacklight/download/geojson_download.rb
@@ -608,6 +613,7 @@ files:
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
+- lib/geoblacklight/faraday_middleware/follow_redirects.rb
 - lib/geoblacklight/geometry.rb
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/metadata.rb
@@ -655,6 +661,7 @@ files:
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
 - spec/components/geoblacklight/homepage_feature_facet_component_spec.rb
+- spec/components/geoblacklight/icon_facet_item_component_spec.rb
 - spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
@@ -668,6 +675,7 @@ files:
 - spec/features/empty_search_spec.rb
 - spec/features/esri_viewer_spec.rb
 - spec/features/exports_spec.rb
+- spec/features/full_screen_controll_spec.rb
 - spec/features/help_text_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/iiif_viewer_spec.rb
@@ -684,17 +692,26 @@ files:
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
+- spec/features/search_results_complex_geometry_spec.rb
+- spec/features/search_results_icons_spec.rb
 - spec/features/search_results_map_spec.rb
 - spec/features/search_results_overlap_ratio_spec.rb
 - spec/features/search_spec.rb
+- spec/features/show_page_download_spec.rb
 - spec/features/show_page_metadata_spec.rb
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tilejson_spec.rb
 - spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
+- spec/features/wmts_spec.rb
+- spec/features/xyz_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
+- spec/fixtures/manifests/tilejson.json
+- spec/fixtures/manifests/wmts-multiple.xml
+- spec/fixtures/manifests/wmts-single.xml
 - spec/fixtures/mods/fb897vt9938.mods
 - spec/fixtures/mods/stanford-cg357zz0321.mods
 - spec/fixtures/solr_documents/README.md
@@ -736,11 +753,15 @@ files:
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
 - spec/fixtures/solr_documents/the-related-record.json
+- spec/fixtures/solr_documents/tilejson.json
 - spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
 - spec/fixtures/solr_documents/uva_slug_colon.json
+- spec/fixtures/solr_documents/wmts-multiple.json
+- spec/fixtures/solr_documents/wmts-single-layer.json
+- spec/fixtures/solr_documents/xyz.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
@@ -773,12 +794,15 @@ files:
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
+- spec/models/concerns/geoblacklight/bbox_filter_field_spec.rb
+- spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/carto_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/citation_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
-- spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb
+- spec/models/concerns/geoblacklight/suppressed_records_search_behavior_spec.rb
+- spec/presenters/geoblacklight/bbox_item_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_test_helpers.rb
@@ -800,19 +824,22 @@ files:
 - spec/views/catalog/_show_downloads.html.erb_spec.rb
 - spec/views/catalog/_show_tools.html.erb_spec.rb
 - template.rb
+- vendor/assets/images/fullscreen.png
+- vendor/assets/images/fullscreen@2x.png
 - vendor/assets/images/layers-2x.png
 - vendor/assets/images/layers.png
 - vendor/assets/images/marker-icon-2x.png
 - vendor/assets/images/marker-icon.png
 - vendor/assets/images/marker-shadow.png
+- vendor/assets/javascripts/Leaflet.fullscreen.js
 - vendor/assets/javascripts/esri-leaflet.js
 - vendor/assets/javascripts/esri-leaflet.js.map
 - vendor/assets/javascripts/leaflet-iiif.js
+- vendor/assets/javascripts/leaflet-src.js.erb
 - vendor/assets/javascripts/leaflet-src.js.map
-- vendor/assets/javascripts/leaflet.js.erb
 - vendor/assets/javascripts/native.history.js
-- vendor/assets/stylesheets/leaflet-label.css
 - vendor/assets/stylesheets/leaflet.css
+- vendor/assets/stylesheets/leaflet.fullscreen.css
 homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
@@ -832,12 +859,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
 - spec/components/geoblacklight/homepage_feature_facet_component_spec.rb
+- spec/components/geoblacklight/icon_facet_item_component_spec.rb
 - spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
@@ -851,6 +879,7 @@ test_files:
 - spec/features/empty_search_spec.rb
 - spec/features/esri_viewer_spec.rb
 - spec/features/exports_spec.rb
+- spec/features/full_screen_controll_spec.rb
 - spec/features/help_text_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/iiif_viewer_spec.rb
@@ -867,17 +896,26 @@ test_files:
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
+- spec/features/search_results_complex_geometry_spec.rb
+- spec/features/search_results_icons_spec.rb
 - spec/features/search_results_map_spec.rb
 - spec/features/search_results_overlap_ratio_spec.rb
 - spec/features/search_spec.rb
+- spec/features/show_page_download_spec.rb
 - spec/features/show_page_metadata_spec.rb
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tilejson_spec.rb
 - spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
+- spec/features/wmts_spec.rb
+- spec/features/xyz_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
+- spec/fixtures/manifests/tilejson.json
+- spec/fixtures/manifests/wmts-multiple.xml
+- spec/fixtures/manifests/wmts-single.xml
 - spec/fixtures/mods/fb897vt9938.mods
 - spec/fixtures/mods/stanford-cg357zz0321.mods
 - spec/fixtures/solr_documents/README.md
@@ -919,11 +957,15 @@ test_files:
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
 - spec/fixtures/solr_documents/the-related-record.json
+- spec/fixtures/solr_documents/tilejson.json
 - spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
 - spec/fixtures/solr_documents/uva_slug_colon.json
+- spec/fixtures/solr_documents/wmts-multiple.json
+- spec/fixtures/solr_documents/wmts-single-layer.json
+- spec/fixtures/solr_documents/xyz.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
@@ -956,12 +998,15 @@ test_files:
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
+- spec/models/concerns/geoblacklight/bbox_filter_field_spec.rb
+- spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/carto_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/citation_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
-- spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb
+- spec/models/concerns/geoblacklight/suppressed_records_search_behavior_spec.rb
+- spec/presenters/geoblacklight/bbox_item_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_test_helpers.rb

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

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-module Geoblacklight
-  module SpatialSearchBehavior
-    extend ActiveSupport::Concern
-
-    included do
-      self.default_processor_chain += [:add_spatial_params, :hide_suppressed_records]
-    end
-
-    ##
-    # Adds spatial parameters to a Solr query if :bbox is present.
-    # @param [Blacklight::Solr::Request] solr_params :bbox should be in Solr
-    # :bbox should be passed in using Solr lat-lon rectangle format e.g.
-    # "minX minY maxX maxY"
-    # @return [Blacklight::Solr::Request]
-    def add_spatial_params(solr_params)
-      if blacklight_params[:bbox]
-        solr_params[:bq] ||= []
-        solr_params[:bq] << "#{Settings.FIELDS.SPATIAL_EXTENT}:\"IsWithin(#{envelope_bounds})\"#{boost}"
-        solr_params[:fq] ||= []
-        solr_params[:fq] << "#{Settings.FIELDS.SPATIAL_EXTENT}:\"Intersects(#{envelope_bounds})\""
-
-        if Settings.OVERLAP_RATIO_BOOST
-          solr_params[:bf] ||= []
-          solr_params[:overlap] =
-            "{!field uf=* defType=lucene f=#{Settings.FIELDS.OVERLAP_FIELD} score=overlapRatio}Intersects(#{envelope_bounds})"
-          solr_params[:bf] << "$overlap^#{Settings.OVERLAP_RATIO_BOOST}"
-        end
-      end
-      solr_params
-    rescue Geoblacklight::Exceptions::WrongBoundingBoxFormat
-      # TODO: Potentially delete bbox params here so that its not rendered as search param
-      solr_params
-    end
-
-    ##
-    # @return [String]
-    def envelope_bounds
-      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]
-    def bounding_box
-      Geoblacklight::BoundingBox.from_rectangle(blacklight_params[:bbox])
-    end
-
-    ##
-    # Hide suppressed records in search
-    # @param [Blacklight::Solr::Request]
-    # @return [Blacklight::Solr::Request]
-    def hide_suppressed_records(solr_params)
-      # Show child records if searching for a specific source parent
-      return unless blacklight_params.fetch(:f, {})[Settings.FIELDS.SOURCE.to_sym].nil?
-
-      # Do not suppress action_documents method calls for individual documents
-      # ex. CatalogController#web_services (exportable views)
-      return if solr_params[:q]&.include?("{!lucene}#{Settings.FIELDS.ID}:")
-
-      solr_params[:fq] ||= []
-      solr_params[:fq] << "-#{Settings.FIELDS.SUPPRESSED}: true"
-    end
-  end
-end

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

@@ -1,4 +0,0 @@
-<li class="list-group-item export">
-  <div class="export-label"><%= download_body %></div>
-  <div class="export-link-container"><%= download_link %></div>
-</li>

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

@@ -1,3 +0,0 @@
-<li class="list-group-item download">
-  <div class="download-link-container"><%= download_link %></div>
-</li>

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

@@ -1,6 +0,0 @@
-<%# Renders the secondary downloads displayed in the split dropdown %>
-<% document ||= @document %>
-
-<% document.download_types.each do |type| %>
-  <%= render partial: 'download_generated_link', locals: { download_body: download_generated_body(type.first), download_link: download_link_generated(type.first, document) } %>
-<% end %>

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

@@ -1,21 +0,0 @@
-<%# Renders the primary download that is shown first %>
-<% document ||= @document %>
-
-<% if document.direct_download.present? %>
-  <% if document.direct_download[:download].is_a? Array %>
-    <% document.direct_download[:download].each do |download| %>
-      <%= render partial: 'download_link', locals: { download_link: download_link_file(download['label'], document.id, download['url']) } %>
-    <% end %>
-  <% end %>
-  <% if document.direct_download[:download].is_a? String %>
-    <%= render partial: 'download_link', locals: { download_link: download_link_file(download_text(document.file_format), document.id, document.direct_download[:download]['url']) } %>
-  <% end %>
-<% end %>
-
-<% if document.hgl_download.present? %>
-  <%= render partial: 'download_link', locals: { download_link: download_link_hgl(download_text(document.download_types.first[0]), document) } %>
-<% end %>
-
-<% if document.iiif_download.present? %>
-  <%= render partial: 'download_link', locals: { download_link: download_link_iiif } %>
-<% end %>

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

@@ -1,39 +0,0 @@
-<%# Renders the secondary downloads displayed in the split dropdown %>
-<% document ||= @document %>
-
-<button type='button' class='btn btn-default dropdown-toggle download-dropdown-toggle' data-toggle='dropdown' aria-expanded='false'>
-  <span class='caret'></span>
-  <span class='sr-only'>Toggle Download Dropdown</span>
-</button>
-<ul class='dropdown-menu' role='menu'>
-  <% if document.hgl_download.present? %>
-    <li role="presentation" class="dropdown-header">Original</li>
-    <li>
-      <%= link_to(download_text(document.download_types.first[0]),
-      download_hgl_path(id: document), data: {blacklight_modal: 'trigger', download: 'trigger', download_type: 'harvard-hgl', download_id: document.id }) %>
-    </li>
-  <% else %>
-    <% if document.direct_download.present? %>
-      <li role="presentation" class="dropdown-header">Original</li>
-      <li>
-        <%= link_to(download_text(@document.file_format), document.direct_download[:download], 'contentUrl' => document.direct_download[:download], data: { download: 'trigger', download_type: 'direct', download_id: document.id }) %>
-      </li>
-    <% end %>
-    <% if document.download_types.present? || document.iiif_download.present? %>
-      <li role="presentation" class="dropdown-header">Generated</li>
-    <% end %>
-    <% if document.iiif_download.present? %>
-      <li>
-        <%= link_to "Download JPG", iiif_jpg_url, download: 'trigger' %>
-      </li>
-    <% end %>
-
-    <% if document.download_types.present? %>
-      <% document.download_types.each do |type| %>
-        <%= content_tag(:li) do %>
-          <% link_to(download_text(type[0]), '', data: { download_path: "#{download_path(document.id, type: type[0])}", download: 'trigger', download_type: type[0], download_id: document.id }) %>
-        <% end %>
-      <% end %>
-    <% end %>
-  <% end %>
-</ul>