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

data/lib/generators/geoblacklight/templates/assets/_customizations.scss

@@ -13,16 +13,17 @@ $logo-image: image_url('blacklight/logo.svg') !default;
 // Override default Bootstrap variables here
 
 // Example: Bootstrap Colors
-$blue:    #007bff !default;
+$blue:    #0d6efd !default;
 $indigo:  #6610f2 !default;
 $purple:  #6f42c1 !default;
-$pink:    #e83e8c !default;
+$pink:    #d63384 !default;
 $red:     #dc3545 !default;
 $orange:  #fd7e14 !default;
 $yellow:  #ffc107 !default;
-$green:   #28a745 !default;
+$green:   #198754 !default;
 $teal:    #20c997 !default;
-$cyan:    #17a2b8 !default;
+$cyan:    #0dcaf0 !default;
+$dark:    #212529 !default; // $gray-900
 
 // Example: Bootstrap Link color
 $link-color: $blue;

data/lib/generators/geoblacklight/templates/assets/application.scss

@@ -1,6 +1,3 @@
-/*
-*= require leaflet-label
-*/
 @import 'customizations';
 @import 'bootstrap';
 @import 'blacklight';

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

@@ -44,11 +44,15 @@ class CatalogController < ApplicationController
     config.index.title_field = Settings.FIELDS.TITLE
 
     # solr field configuration for document/show views
-
+    # This sets the metadata to display below the map viewer.
+    # To move metadata above the map viewer,
+    # remove the lines deleting and re-adding the :show partial
     config.show.display_type_field = 'format'
+    config.show.partials.delete(:show)
     config.show.partials << 'show_default_viewer_container'
     config.show.partials << 'show_default_attribute_table'
     config.show.partials << 'show_default_viewer_information'
+    config.show.partials << :show
 
     ##
     # Configure the index document presenter.
@@ -89,25 +93,32 @@ class CatalogController < ApplicationController
     # }
 
 
-	#FACETS
+    # FACETS
 
-	#DEFAULT FACETS
-	#to add additional facets, use the keys defined in the settings.yml file
+    # DEFAULT FACETS
+    # to add additional facets, use the keys defined in the settings.yml file
     config.add_facet_field Settings.FIELDS.INDEX_YEAR, :label => 'Year', :limit => 10
     config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, :label => 'Place', :limit => 8
-    config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access', limit: 8, item_component: Geoblacklight::IconFacetItemComponent
     config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', :limit => 8
     config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', :limit => 8
     config.add_facet_field Settings.FIELDS.FORMAT, :label => 'Format', :limit => 8
     config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8
-    config.add_facet_field Settings.FIELDS.ISO_TOPIC_CATEGORY, :label => 'Theme', :limit => 8
+    config.add_facet_field Settings.FIELDS.THEME, :label => 'Theme', :limit => 8
     config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Creator', :limit => 8
     config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8
-    config.add_facet_field Settings.FIELDS.PROVIDER, label: 'Provider', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.PROVIDER, label: 'Provider', limit: 8, item_component: Geoblacklight::IconFacetItemComponent
     config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3
     config.add_facet_field Settings.FIELDS.SOURCE, :label => 'Collection', :limit => 8, :show => false
 
+    # GEOBLACKLIGHT APPLICATION FACETS
 
+    # Map-Based "Search Here" Feature
+    # item_presenter       - Defines how the facet appears in the GBL UI
+    # filter_query_builder - Defines the query generated for Solr
+    # filter_class         - Defines how to add/remove facet from query
+    # label                - Defines the label used in contstraints container
+    config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD, label: 'Bounding Box'
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -115,7 +126,7 @@ class CatalogController < ApplicationController
     config.add_facet_fields_to_solr_request!
 
 
-	#SEARCH RESULTS FIELDS
+    # SEARCH RESULTS FIELDS
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
@@ -128,7 +139,7 @@ class CatalogController < ApplicationController
     config.add_index_field Settings.FIELDS.DESCRIPTION, helper_method: :snippit
     config.add_index_field Settings.FIELDS.PUBLISHER
 
-	#ITEM VIEW FIELDS
+    # ITEM VIEW FIELDS
 
     # solr fields to be displayed in the show (single result) view
     #  The ordering of the field names is the order of the display
@@ -136,14 +147,29 @@ class CatalogController < ApplicationController
     # link_to_search: [Boolean] that can be passed to link to a facet search
     # helper_method: [Symbol] method that can be used to render the value
 
-    #DEFAULT FIELDS
-    config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator'
+    # DEFAULT FIELDS
+    # The following fields all feature string values. If there is a value present in the metadata, they fields will show up on the item show page.
+    # The labels and order can be customed. Comment out fields to hide them.
+    
+    config.add_show_field Settings.FIELDS.ALTERNATIVE_TITLE, label: 'Alternative Title', itemprop: 'alt_title'
     config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
+    config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator', itemprop: 'creator'
     config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher'
-    config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial', link_to_facet: true
-    config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject(s)', itemprop: 'keywords', link_to_facet: true
-    config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Year', itemprop: 'temporal'
     config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', link_to_facet: true
+	config.add_show_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', itemprop: 'class'
+    config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', itemprop: 'type'
+    config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'keywords', link_to_facet: true
+    config.add_show_field Settings.FIELDS.THEME, label: 'Theme', itemprop: 'theme'
+    config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal'
+    config.add_show_field Settings.FIELDS.DATE_ISSUED, label: 'Date Issued', itemprop: 'issued'
+    config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Spatial Coverage', itemprop: 'spatial', link_to_facet: true
+    config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights'
+    config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: 'Rights Holder', itemprop: 'rights_holder'
+    config.add_show_field Settings.FIELDS.LICENSE, label: 'License', itemprop: 'license'
+    config.add_show_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access Rights', itemprop: 'access_rights'
+    config.add_show_field Settings.FIELDS.FORMAT, label: 'Format', itemprop: 'format'
+    config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File Size', itemprop: 'file_size'
+    config.add_show_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced', itemprop: 'georeferenced'    
     config.add_show_field(
       Settings.FIELDS.REFERENCES,
       label: 'More details at',
@@ -152,50 +178,35 @@ class CatalogController < ApplicationController
       helper_method: :render_references_url
     )
 
-    # OPTIONAL FIELDS
-    #optional fields to add to the item view display
-
-    # config.add_show_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access Rights', itemprop: 'access_rights'
-    # config.add_show_field Settings.FIELDS.ALTERNATIVE_TITLE, label: 'Alternative Title', itemprop: 'alt_title'
-    # config.add_show_field Settings.FIELDS.CENTROID, label: 'Centroid', itemprop: 'centroid'
-    # config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator'
-    # config.add_show_field Settings.FIELDS.DATE_ISSUED, label: 'Date Issued', itemprop: 'issued'
-    # config.add_show_field Settings.FIELDS.DATE_RANGE, label: 'Date Range', itemprop: 'date_range'
-    # config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
-    # config.add_show_field Settings.FIELDS.FORMAT, label: 'Format', itemprop: 'format'
-    # config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File Size', itemprop: 'file_size'
-    # config.add_show_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced', itemprop: 'georeferenced'
-    # config.add_show_field Settings.FIELDS.ID, label: 'ID', itemprop: 'id'
-    # config.add_show_field Settings.FIELDS.IDENTIFIER, label: 'Identifier', itemprop: 'identifier'
-    # config.add_show_field Settings.FIELDS.INDEX_YEAR, label: 'Year', itemprop: 'year'
-    # config.add_show_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', itemprop: 'is_part_of'
-    # config.add_show_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', itemprop: 'is_replaced_by'
-    # config.add_show_field Settings.FIELDS.ISO_TOPIC_CATEGORY, label: 'Theme', itemprop: 'theme'
-    # config.add_show_field Settings.FIELDS.KEYWORD, label: 'Keyword(s)', itemprop: 'keyword'
+    # ADDITIONAL FIELDS
+    # The following fields are not user friendly and are not set to appear on the item show page. They contain non-literal values, codes, URIs, or are otherwise designed to power features in the interface.
+    # These values might need a translations to be readable by users.
+    
     # config.add_show_field Settings.FIELDS.LANGUAGE, label: 'Language', itemprop: 'language'
-    # config.add_show_field Settings.FIELDS.LICENSE, label: 'License', itemprop: 'license'
-    # config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', itemprop: 'member_of'
-    # config.add_show_field Settings.FIELDS.METADATA_VERSION, label: 'Metadata Version', itemprop: 'metadata_version'
-    # config.add_show_field Settings.FIELDS.MODIFIED, label: 'Date Modified', itemprop: 'modified'
+    # config.add_show_field Settings.FIELDS.KEYWORD, label: 'Keyword(s)', itemprop: 'keyword'
+    
+    # config.add_show_field Settings.FIELDS.INDEX_YEAR, label: 'Year', itemprop: 'year'
+    # config.add_show_field Settings.FIELDS.DATE_RANGE, label: 'Date Range', itemprop: 'date_range'
+    
+    # config.add_show_field Settings.FIELDS.CENTROID, label: 'Centroid', itemprop: 'centroid'
     # config.add_show_field Settings.FIELDS.OVERLAP_FIELD, label: 'Overlap BBox', itemprop: 'overlap_field'
-    # config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher'
-    # config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', itemprop: 'provider'
-    # config.add_show_field Settings.FIELDS.REFERENCES, label: 'References', itemprop: 'references'
+    
     # config.add_show_field Settings.FIELDS.RELATION, label: 'Relation', itemprop: 'relation'
-    # config.add_show_field Settings.FIELDS.REPLACES, label: 'Replaces', itemprop: 'replaces'
-    # config.add_show_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', itemprop: 'class'
-    # config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', itemprop: 'type'
-    # config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights'
-    # config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: 'Rights Holder', itemprop: 'rights_holder'
-    # config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial_coverage'
-    # config.add_show_field Settings.FIELDS.SPATIAL_EXTENT, label: 'Spatial Extent', itemprop: 'geometry'
-    # config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'subject'
-    # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed'
-    # config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal'
-    # config.add_show_field Settings.FIELDS.TITLE, label: 'Title', itemprop: 'title'
+    # config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', itemprop: 'member_of'
+    # config.add_show_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', itemprop: 'is_part_of'
     # config.add_show_field Settings.FIELDS.VERSION, label: 'Version', itemprop: 'version'
+    # config.add_show_field Settings.FIELDS.REPLACES, label: 'Replaces', itemprop: 'replaces'
+    # config.add_show_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', itemprop: 'is_replaced_by'
+    
     # config.add_show_field Settings.FIELDS.WXS_IDENTIFIER, label: 'Web Service Layer', itemprop: 'wxs_identifier'
+    # config.add_show_field Settings.FIELDS.ID, label: 'ID', itemprop: 'id'
+    # config.add_show_field Settings.FIELDS.IDENTIFIER, label: 'Identifier', itemprop: 'identifier'
 
+    # config.add_show_field Settings.FIELDS.MODIFIED, label: 'Date Modified', itemprop: 'modified'
+    # config.add_show_field Settings.FIELDS.METADATA_VERSION, label: 'Metadata Version', itemprop: 'metadata_version'
+    # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed'
+    
+    
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
     #
@@ -215,8 +226,8 @@ class CatalogController < ApplicationController
     # since we aren't specifying it otherwise.
 
     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'
+    # config.add_search_field 'dct_title_ti', :label => 'Title'
+    # config.add_search_field 'dct_description_ti', :label => 'Description'
 
     # Now we see how to over-ride Solr request handler defaults, in this
     # case for a BL "search field", which is really a dismax aggregate
@@ -291,7 +302,6 @@ class CatalogController < ApplicationController
     config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
 
     # Custom tools for GeoBlacklight
-    config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
     config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
     config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? }
     config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? }
@@ -317,6 +327,14 @@ class CatalogController < ApplicationController
     config.autocomplete_path = 'suggest'
   end
 
+  def web_services
+    @response, @documents = action_documents
 
-
+    respond_to do |format|
+      format.html do
+        return render layout: false if request.xhr?
+        # Otherwise draw the full page
+      end
+    end
+  end
 end

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

@@ -25,7 +25,7 @@ OVERLAP_RATIO_BOOST: '2'
 FIELDS:
   :ACCESS_RIGHTS: 'dc_rights_s'
   #:ALTERNATIVE_TITLE: 'dct_alternative_sm'
-  #:CENTROID: 'dcat_centroid_ss'
+  #:CENTROID: 'dcat_centroid'
   :CREATOR: 'dc_creator_sm'
   :DATE_ISSUED: 'dct_issued_s'
   #:DATE_RANGE: 'gbl_dateRange_drsim'
@@ -57,7 +57,7 @@ FIELDS:
   #:RIGHTS_HOLDER: 'dct_rightsHolder_sm'
   :SOURCE: 'dc_source_sm'
   :SPATIAL_COVERAGE: 'dct_spatial_sm'
-  :SPATIAL_EXTENT: 'solr_geom'
+  :GEOMETRY: 'solr_geom'
   :SUBJECT: 'dc_subject_sm'
   :SUPPRESSED: 'suppressed_b'
   :TEMPORAL_COVERAGE: 'dct_temporal_sm'
@@ -159,15 +159,15 @@ LEAFLET:
     DETECT_RETINA: true
     INDEX:
       DEFAULT: &default
-        color: "#1eb300"
+        color: "#7FCDBB"
         weight: "1"
         radius: "4"
       UNAVAILABLE:
         <<: *default
-        color: "#b3001e"
+        color: "#EDF8B1"
       SELECTED:
         <<: *default
-        color: "#006bde"
+        color: "#2C7FB8"
   VIEWERS:
     WMS:
       <<: *opacity_control

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

@@ -10,9 +10,6 @@ ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html'
 # Download path can be configured using this setting
 #DOWNLOAD_PATH: "./tmp/cache/downloads"
 
-# DEPRECATED Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
-GEOMETRY_FIELD: 'solr_geom'
-
 # The bq boost value for spatial search matches within a bounding box
 BBOX_WITHIN_BOOST: '10'
 
@@ -29,7 +26,7 @@ HOMEPAGE_MAP_GEOM: null
 FIELDS:
   :ACCESS_RIGHTS: 'dct_accessRights_s'
   :ALTERNATIVE_TITLE: 'dct_alternative_sm'
-  :CENTROID: 'dcat_centroid_ss'
+  :CENTROID: 'dcat_centroid'
   :CREATOR: 'dct_creator_sm'
   :DATE_ISSUED: 'dct_issued_s'
   :DATE_RANGE: 'gbl_dateRange_drsim'
@@ -42,9 +39,10 @@ FIELDS:
   :INDEX_YEAR: 'gbl_indexYear_im'
   :IS_PART_OF: 'dct_isPartOf_sm'
   :IS_REPLACED_BY: 'dct_isReplacedBy_sm'
-  :ISO_TOPIC_CATEGORY: 'dcat_theme_sm'
+  :THEME: 'dcat_theme_sm'
   :KEYWORD: 'dcat_keyword_sm'
   :LANGUAGE: 'dct_language_sm'
+  :LAYER_MODIFIED: 'gbl_mdModified_dt'
   :LICENSE: 'dct_license_sm'
   :MEMBER_OF: 'pcdm_memberOf_sm'
   :METADATA_VERSION: 'gbl_mdVersion_s'
@@ -61,7 +59,7 @@ FIELDS:
   :RIGHTS_HOLDER: 'dct_rightsHolder_sm'
   :SOURCE: 'dct_source_sm'
   :SPATIAL_COVERAGE: 'dct_spatial_sm'
-  :SPATIAL_EXTENT: 'locn_geometry'
+  :GEOMETRY: 'locn_geometry'
   :SUBJECT: 'dct_subject_sm'
   :SUPPRESSED: 'gbl_suppressed_b'
   :TEMPORAL_COVERAGE: 'dct_temporal_sm'
@@ -93,6 +91,9 @@ WEBSERVICES_SHOWN:
   - 'wms'
   - 'tms'
   - 'wfs'
+  - 'xyz'
+  - 'wmts'
+  - 'tilejson'
   - 'iiif'
   - 'feature_layer'
   - 'tiled_map_layer'
@@ -129,12 +130,12 @@ RELATIONSHIPS_SHOWN:
   SOURCE_ANCESTORS:
     field: dct_source_sm
     query_type: ancestors
-    icon: pagelines-brands
+    icon: parent-item
     label: geoblacklight.relations.ancestor
   SOURCE_DESCENDANTS:
     field: dct_source_sm
     query_type: descendants
-    icon: leaf
+    icon: child-item
     label: geoblacklight.relations.descendant
   VERSION_OF:
     field: dct_isVersionOf_sm
@@ -153,36 +154,48 @@ WMS_PARAMS:
   :INFO_FORMAT: 'text/html'
 
 # Settings for leaflet
-OPACITY_CONTROL: &opacity_control
-  CONTROLS:
-    - 'Opacity'
-
 LEAFLET:
   MAP:
   LAYERS:
     DETECT_RETINA: true
     INDEX:
       DEFAULT: &default
-        color: "#1eb300"
+        color: "#7FCDBB"
         weight: "1"
         radius: "4"
       UNAVAILABLE:
         <<: *default
-        color: "#b3001e"
+        color: "#EDF8B1"
       SELECTED:
         <<: *default
-        color: "#006bde"
+        color: "#2C7FB8"
   VIEWERS:
-    WMS:
-      <<: *opacity_control
-    TILEDMAPLAYER:
-      <<: *opacity_control
-    FEATURELAYER:
-      <<: *opacity_control
     DYNAMICMAPLAYER:
-      <<: *opacity_control
+      CONTROLS:
+        - 'Opacity'
+        - 'Fullscreen'
+    FEATURELAYER:
+      CONTROLS:
+        - 'Opacity'
+        - 'Fullscreen'
+    IIIF:
+      CONTROLS:
+        - 'Fullscreen'
     IMAGEMAPLAYER:
-      <<: *opacity_control
+      CONTROLS:
+        - 'Opacity'
+        - 'Fullscreen'
+    INDEXMAP:
+      CONTROLS:
+        - 'Fullscreen'
+    TILEDMAPLAYER:
+      CONTROLS:
+        - 'Opacity'
+        - 'Fullscreen'
+    WMS:
+      CONTROLS:
+        - 'Opacity'
+        - 'Fullscreen'
 
 # Toggle the help text feature that offers users context
 HELP_TEXT:

data/lib/geoblacklight/bounding_box.rb

@@ -23,6 +23,10 @@ module Geoblacklight
       "ENVELOPE(#{west}, #{east}, #{north}, #{south})"
     end
 
+    def to_param
+      "#{west} #{south} #{east} #{north}"
+    end
+
     ##
     # Create a Geoblacklight::BoundingBox from a Solr rectangle syntax
     # @param [String] bbox as "W S E N"

data/lib/geoblacklight/constants.rb

@@ -16,7 +16,10 @@ module Geoblacklight
       wcs: 'http://www.opengis.net/def/serviceType/ogc/wcs',
       wfs: 'http://www.opengis.net/def/serviceType/ogc/wfs',
       wms: 'http://www.opengis.net/def/serviceType/ogc/wms',
+      wmts: 'http://www.opengis.net/def/serviceType/ogc/wmts',
       tms: 'https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification',
+      tilejson: 'https://github.com/mapbox/tilejson-spec',
+      xyz: 'https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames',
       hgl: 'http://schema.org/DownloadAction',
       feature_layer: 'urn:x-esri:serviceType:ArcGIS#FeatureLayer',
       tiled_map_layer: 'urn:x-esri:serviceType:ArcGIS#TiledMapLayer',

data/lib/geoblacklight/engine.rb

@@ -3,7 +3,6 @@ require 'blacklight'
 require 'coderay'
 require 'config'
 require 'faraday'
-require 'faraday_middleware'
 require 'geoblacklight/version'
 require 'nokogiri'
 require 'mime/types'
@@ -19,7 +18,9 @@ module Geoblacklight
     end
 
     config.to_prepare do
-      Geoblacklight.inject!
+      unless SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
+        SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride)
+      end
     end
   end
 end

data/lib/geoblacklight/faraday_middleware/follow_redirects.rb

@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+# :nocov:
+require 'faraday'
+require 'set'
+
+module Geoblacklight
+  # NOTE: We copied this class from faraday_middleware in order to support
+  # both Faraday 1 & 2. If this middleware is ever extracted from
+  # faraday_middleware into its own gem we should remove this and use that
+  # instead.
+  module FaradayMiddleware
+    # Exception thrown when the maximum amount of requests is
+    # exceeded.
+    class RedirectLimitReached < ::Faraday::ClientError
+      attr_reader :response
+
+      def initialize(response)
+        super "too many redirects; last one to: #{response['location']}"
+        @response = response
+      end
+    end
+
+    # Public: Follow HTTP 301, 302, 303, 307, and 308 redirects.
+    #
+    # For HTTP 301, 302, and 303, the original GET, POST, PUT, DELETE, or PATCH
+    # request gets converted into a GET. With `:standards_compliant => true`,
+    # however, the HTTP method after 301/302 remains unchanged. This allows you
+    # to opt into HTTP/1.1 compliance and act unlike the major web browsers.
+    #
+    # This middleware currently only works with synchronous requests; i.e. it
+    # doesn't support parallelism.
+    #
+    # If you wish to persist cookies across redirects, you could use
+    # the faraday-cookie_jar gem:
+    #
+    #   Faraday.new(:url => url) do |faraday|
+    #     faraday.use FaradayMiddleware::FollowRedirects
+    #     faraday.use :cookie_jar
+    #     faraday.adapter Faraday.default_adapter
+    #   end
+    #
+    class FollowRedirects < ::Faraday::Middleware
+      # HTTP methods for which 30x redirects can be followed
+      ALLOWED_METHODS = Set.new [:head, :options, :get, :post, :put, :patch, :delete]
+      # HTTP redirect status codes that this middleware implements
+      REDIRECT_CODES  = Set.new [301, 302, 303, 307, 308]
+      # Keys in env hash which will get cleared between requests
+      ENV_TO_CLEAR    = Set.new [:status, :response, :response_headers]
+
+      # Default value for max redirects followed
+      FOLLOW_LIMIT = 3
+
+      # Regex that matches characters that need to be escaped in URLs, sans
+      # the "%" character which we assume already represents an escaped sequence.
+      URI_UNSAFE = %r{[^\-_.!~*'()a-zA-Z\d;/?:@&=+$,\[\]%]}.freeze
+
+      AUTH_HEADER = 'Authorization'
+
+      # Public: Initialize the middleware.
+      #
+      # options - An options Hash (default: {}):
+      #     :limit                      - A Numeric redirect limit (default: 3)
+      #     :standards_compliant        - A Boolean indicating whether to respect
+      #                                  the HTTP spec when following 301/302
+      #                                  (default: false)
+      #     :callback                   - A callable used on redirects
+      #                                  with the old and new envs
+      #     :cookies                    - An Array of Strings (e.g.
+      #                                  ['cookie1', 'cookie2']) to choose
+      #                                  cookies to be kept, or :all to keep
+      #                                  all cookies (default: []).
+      #     :clear_authorization_header - A Boolean indicating whether the request
+      #                                  Authorization header should be cleared on
+      #                                  redirects (default: true)
+      def initialize(app, options = {})
+        super(app)
+        @options = options
+
+        @convert_to_get = Set.new [303]
+        @convert_to_get << 301 << 302 unless standards_compliant?
+      end
+
+      def call(env)
+        perform_with_redirection(env, follow_limit)
+      end
+
+      private
+
+      def convert_to_get?(response)
+        [:head, :options].exclude?(response.env[:method]) &&
+          @convert_to_get.include?(response.status)
+      end
+
+      def perform_with_redirection(env, follows)
+        request_body = env[:body]
+        response = @app.call(env)
+
+        response.on_complete do |response_env|
+          if follow_redirect?(response_env, response)
+            fail RedirectLimitReached, response if follows.zero?
+
+            new_request_env = update_env(response_env.dup, request_body, response)
+            callback&.call(response_env, new_request_env)
+            response = perform_with_redirection(new_request_env, follows - 1)
+          end
+        end
+        response
+      end
+
+      def update_env(env, request_body, response)
+        redirect_from_url = env[:url].to_s
+        redirect_to_url = safe_escape(response['location'] || '')
+        env[:url] += redirect_to_url
+
+        ENV_TO_CLEAR.each { |key| env.delete key }
+
+        if convert_to_get?(response)
+          env[:method] = :get
+          env[:body] = nil
+        else
+          env[:body] = request_body
+        end
+
+        clear_authorization_header(env, redirect_from_url, redirect_to_url)
+
+        env
+      end
+
+      def follow_redirect?(env, response)
+        ALLOWED_METHODS.include?(env[:method]) &&
+          REDIRECT_CODES.include?(response.status)
+      end
+
+      def follow_limit
+        @options.fetch(:limit, FOLLOW_LIMIT)
+      end
+
+      def standards_compliant?
+        @options.fetch(:standards_compliant, false)
+      end
+
+      def callback
+        @options[:callback]
+      end
+
+      # Internal: escapes unsafe characters from an URL which might be a path
+      # component only or a fully qualified URI so that it can be joined onto an
+      # URI:HTTP using the `+` operator. Doesn't escape "%" characters so to not
+      # risk double-escaping.
+      def safe_escape(uri)
+        uri = uri.split('#')[0] # we want to remove the fragment if present
+        uri.to_s.gsub(URI_UNSAFE) do |match|
+          "%#{match.unpack('H2' * match.bytesize).join('%').upcase}"
+        end
+      end
+
+      def clear_authorization_header(env, from_url, to_url)
+        return env if redirect_to_same_host?(from_url, to_url)
+        return env unless @options.fetch(:clear_authorization_header, true)
+
+        env[:request_headers].delete(AUTH_HEADER)
+      end
+
+      def redirect_to_same_host?(from_url, to_url)
+        return true if to_url.start_with?('/')
+
+        from_uri = URI.parse(from_url)
+        to_uri = URI.parse(to_url)
+
+        [from_uri.scheme, from_uri.host, from_uri.port] ==
+          [to_uri.scheme, to_uri.host, to_uri.port]
+      end
+    end
+  end
+end
+# :nocov:

data/lib/geoblacklight/item_viewer.rb

@@ -51,8 +51,20 @@ module Geoblacklight
       @references.tms
     end
 
+    def xyz
+      @references.xyz
+    end
+
+    def tilejson
+      @references.tilejson
+    end
+
+    def wmts
+      @references.wmts
+    end
+
     def viewer_preference
-      [oembed, index_map, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
+      [oembed, index_map, tilejson, xyz, wmts, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
        image_map_layer, feature_layer].compact.map(&:to_hash).first
     end
   end