geoblacklight 6.0.0.pre.alpha.7 → 6.0.0.pre.beta.2

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  module SolrDocument
+    # Derive a thumbnail for a document
+    module Thumbnail
+      IIIF_THUMBNAIL_WIDTH = 400
+
+      # The thumbnail URL if explicitly set; otherwise derived from IIIF URL
+      def thumbnail_url
+        return nil unless Geoblacklight.configuration.thumbnails_enabled
+
+        thumbnail_reference&.endpoint || iiif_thumbnail_url
+      end
+
+      private
+
+      def thumbnail_reference
+        references.find_by_uri(Geoblacklight.configuration.thumbnail_reference_key)
+      end
+
+      def iiif_image_reference
+        references.iiif
+      end
+
+      # Derives an image URL from a IIIF Image API info.json endpoint. Uses the
+      # sizeByW form (`w,`), which is Level 1 in both Image API v2 and v3 — unlike
+      # `full` (v2 only) and `max` (v3 only), so no version sniffing is needed.
+      def iiif_thumbnail_url
+        endpoint = iiif_image_reference&.endpoint
+        return nil unless endpoint&.end_with?("/info.json")
+
+        base = endpoint.delete_suffix("/info.json")
+        "#{base}/full/#{IIIF_THUMBNAIL_WIDTH},/0/default.jpg"
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ module Geoblacklight
     include Geoblacklight::SolrDocument::Inspection
     include Geoblacklight::SolrDocument::Arcgis
     include Geoblacklight::SolrDocument::Citation
+    include Geoblacklight::SolrDocument::Thumbnail
 
     delegate :viewer_protocol, to: :item_viewer
     delegate :viewer_endpoint, to: :item_viewer
@@ -16,6 +17,7 @@ module Geoblacklight
     included do
       field_config = Geoblacklight.configuration.fields
       attribute :display_note, :array, field_config.display_note
+      attribute :description, :array, field_config.description
       attribute :geom_field, :string, field_config.geometry
       attribute :wxs_identifier, :string, field_config.wxs_identifier
       attribute :file_format, :string, field_config.format

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

@@ -14,7 +14,7 @@ module Geoblacklight
     # @return [Blacklight::Solr::Request]
     def hide_suppressed_records(solr_params)
       # Show suppressed records when searching relationships
-      return if blacklight_params.fetch(:f,
+      return if search_state.params.fetch(:f,
         {}).keys.any? do |field|
                   Geoblacklight.configuration.relationships_shown.map do |_key, value|
                     value.field

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

@@ -1,16 +1,16 @@
 <div class="row">
-  <div
-    id="documents"
-    class="documents-list"
-    data-controller="search-results"
-    data-action="leaflet-viewer:loaded@window->search-results#fitResultBounds"
-    data-search-results-leaflet-viewer-outlet=".leaflet-viewer"
-    >
+  <% document_presenters = documents.map { |doc| document_presenter(doc) } -%>
+  <%
+    overview_results = document_presenters.each_with_index.map do |presenter, index|
+      document = presenter.document
+      {id: document.id, place: document_counter_with_offset(index), geometry: JSON.parse(document.geometry.geojson)}
+    end
+  -%>
+  <%= tag.div id: "documents", class: "documents-list", data: {overview_map_results: overview_results.to_json} do %>
     <div id="documents-container">
-      <% document_presenters = documents.map { |doc| document_presenter(doc) } -%>
       <% document_presenters.each_with_index do |presenter, index| %>
-        <%= render blacklight_config.index.document_component.new(document: presenter, document_counter: index) %>
+        <%= render blacklight_config.index.document_component.new(document: presenter, counter: document_counter_with_offset(index)) %>
       <% end %>
     </div>
-  </div>
+  <% end %>
 </div>

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

@@ -23,7 +23,7 @@
     </div>
     <div class="col-sm">
       <%= content_tag :h3, t('geoblacklight.home.map_heading') %>
-      <%= render(Geoblacklight::LocationLeafletMapComponent.new(page: 'home', geosearch: { dynamic: false })) %>
+      <%= render(Geoblacklight::OverviewMapComponent.new(geosearch: true)) %>
     </div>
   </div>
 </div>

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

@@ -8,7 +8,7 @@
     </div>
   <% end %>
   <% component.with_footer do %>
-    <a href="#" target="_blank" rel="noopener noreferrer" id="btn-metadata-download" class="btn btn-primary"><%= t('geoblacklight.download.download') %></a>
+    <a href="#" target="_blank" rel="noopener noreferrer" id="btn-metadata-download" class="btn btn-primary" aria-label="<%= t('geoblacklight.download.download_metadata_new_tab') %>"><%= t('geoblacklight.download.download') %></a>
     <button type="button" class="btn btn-secondary" data-bl-dismiss="modal"><%= t('blacklight.modal.close') %></button>
   <% end %>
 <% end %>

data/app/views/{relation → relations}/index.html.erb

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag "relations" do %>
   <%- Geoblacklight.configuration.relationships_shown.each do |relationship_type, rel_type_info| %>
-    <%= render Geoblacklight::RelationsComponent.new(relations: @relations, relationship_type:, rel_type_info:) %>
+    <%= render Geoblacklight::Relations::RelationsComponent.new(relations: @relations, relationship_type:, rel_type_info:) %>
   <% end %>
 <% end %>

data/app/views/relations/index.json.jbuilder

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+json.current_doc @relations.link_id
+json.relations do
+  Geoblacklight.configuration.relationships_shown.each do |key, _value|
+    results = @relations.public_send(key)
+    json.set! key.downcase.to_s, results unless results["numFound"].to_i.zero?
+  end
+end

data/config/importmap.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-# OpenLayers viewer
-pin "ol", to: "https://esm.sh/ol@8.1.0"
-pin "ol/", to: "https://esm.sh/ol@8.1.0/"
-pin "ol-pmtiles", to: "https://cdn.jsdelivr.net/npm/ol-pmtiles@0.3.0/+esm"
+# OGM viewer components: the previewer, the map of where a set of records is, and the map of where
+# one of them is
+pin "ogm-viewer", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/ogm-viewer.js"
+pin "ogm-overview", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/ogm-overview.js"
+pin "ogm-locator", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/ogm-locator.js"
 
-# Leaflet viewer
-pin "leaflet", to: "https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet-src.esm.js"
-pin "esri-leaflet", to: "https://cdn.jsdelivr.net/npm/esri-leaflet@3.0.19/+esm"
-pin "leaflet.fullscreen", to: "https://cdn.jsdelivr.net/npm/leaflet.fullscreen@5.3.0/+esm"
+# OGM viewer library, used for constructing the location previewers handed to the results map.
+# Not preloaded because only the pages with that map want it; loaded dynamically there.
+pin "ogm-viewer/lib", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/index.js", preload: false
 
 # Geoblacklight
 pin_all_from Geoblacklight::Engine.root.join("app", "javascript", "geoblacklight"), under: "geoblacklight"

data/config/locales/geoblacklight.en.yml

@@ -2,6 +2,8 @@ en:
   geoblacklight:
     bbox_label: "Bounding Box"
     location: "Location"
+    badges:
+      georeferenced: "Georeferenced"
     clipboard:
       citation: Citation copied to clipboard
       web_service: Web service copied to clipboard
@@ -11,6 +13,7 @@ en:
       generated_link: "Generated %{download_format}"
       iiif_image_link: "Full-size image"
       iiif_manifest_link: "IIIF manifest"
+      download_metadata_new_tab: "Download metadata (opens in a new tab)"
     home:
       headline: "Explore and discover..."
       search_heading: "Find the maps and data you need"
@@ -38,8 +41,7 @@ en:
     map:
       label: "Zoomable map"
       geosearch:
-        search_here: "Search here"
-        search_when_moved: "Search when I move the map"
+        search_help: "Shift + drag to search an area"
       index:
         website_label: "Website:"
         download_label: "Download:"
@@ -83,20 +85,49 @@ en:
       pmtiles: "PMTiles Layer"
       cog: "COG Layer"
     relations:
-      member_of_ancestors: "Belongs to collection..."
-      member_of_descendants: "Collection records..."
-      part_of_ancestors: "Is part of..."
-      part_of_descendants: "Has part..."
-      relation_ancestors: "Related records..."
-      relation_descendants: "Related records..."
-      replaces_ancestors: "Replaces..."
-      replaces_descendants: "Is replaced by..."
-      source_ancestors: "Source records..."
-      source_descendants: "Derived records..."
-      version_of_ancestors: "Is version of..."
-      version_of_descendants: "Has version..."
-      browse_all_no_count: "Browse all records..."
-      browse_all: "Browse all %{count} records..."
+      member_of_ancestors:
+        one: "In collection"
+        other: "In %{count} collections"
+      member_of_descendants:
+        one: "Contains"
+        other: "Contains %{count} items"
+      part_of_ancestors:
+        one: "Part of"
+        other: "Part of %{count} items"
+      part_of_descendants:
+        one: "Has part"
+        other: "Has %{count} parts"
+      relation_ancestors:
+        one: "Related to"
+        other: "Related to %{count} items"
+      relation_descendants:
+        one: "Related to"
+        other: "Related to %{count} items"
+      replaces_ancestors:
+        one: "Replaces"
+        other: "Replaces %{count} items"
+      replaces_descendants:
+        one: "Replaced by"
+        other: "Replaced by %{count} items"
+      source_ancestors:
+        one: "Sourced from"
+        other: "Sourced from %{count} items"
+      source_descendants:
+        one: "Source of"
+        other: "Source of %{count} items"
+      version_of_ancestors:
+        one: "Version of"
+        other: "Version of %{count} items"
+      version_of_descendants:
+        one: "Has version"
+        other: "Has %{count} versions"
+      browse:
+        member_of: "Browse all %{count} items in this collection"
+        part_of: "Browse all %{count} parts of this item"
+        relation: "Browse all %{count} items related to this item"
+        replaces: "Browse all %{count} items that replace this item"
+        source: "Browse all %{count} items sourced from this item"
+        version_of: "Browse all %{count} versions of this item"
     modal:
       copy-citation: "Copy Citation"
     metadata:
@@ -104,12 +135,12 @@ en:
       metadata_error: The metadata view for selected schema is not available
       metadata_trace: Please select another metadata view. Alternately, try downloading the file or reaching out to the holding institution.
       more_details: More details at
-      toggle_summary: Toggle summary
       transform_error: HTML view for selected schema is not available
       view_metadata: View Metadata
     truncate:
       read_more: "Read more"
       close: "Close"
+      button_label: "Show or hide the remaining values. Disabled because assistive technology has already been given all of them."
     show:
       attribute: "Attribute"
       value: "Value"
@@ -117,85 +148,3 @@ en:
       table_name: "Map data"
       inspecting: "Inspecting"
       not_found: "Could not find that feature"
-    help_text:
-      viewer_protocol:
-        cog:
-          title: COG Layer
-          content: A Cloud Optimized GeoTIFF
-        dynamic_map_layer:
-          title: ArcGIS Dynamic Map Layer
-          content: An ArcGIS Dynamic Map Layer represents vector data (points, lines, and polygons). Map image layers are dynamically rendered image tiles.
-        feature_layer:
-          title: ArcGIS Feature Layer
-          content: An ArcGIS Feature Layer Service displays vector data (points, lines, and polygons) as individual or collected features.
-        iiif:
-          title: IIIF Service
-          content: The International Image Interoperability Framework (IIIF) web service API displays an image from a server. This image can be panned and zoomed.
-        iiif_manifest:
-          title: IIIF Service
-          content: The International Image Interoperability Framework (IIIF) web service API displays an image from a server. This image can be panned and zoomed.
-        image_map_layer:
-          title: ArcGIS Image Map Layer
-          content: An ArcGIS Image Map Layer displays raster data (a grid of cells used to store imagery).
-        index_map:
-          title: Index Map
-          content: Index maps are a "table of contents" that allow users to select a specific map or item within a larger set and navigate to it for viewing or downloading.
-        oembed:
-          title: Embedded Content
-          content: This content is embedded through a third-party viewer.
-        pmtiles:
-          title: PMTiles Layer
-          content: A PMTiles layer is a single-file archive format for tiled data.
-        tiled_map_layer:
-          title: ArcGIS Tiled Map Layer
-          content: An ArcGIS Tiled Map Layer Service displays set of web-accessible tiles that reside on a server.
-        tilejson:
-          title: TileJSON
-          content: A JSON format used for describing tilesets.
-        tms:
-          title: Tile Map Service (TMS)
-          content: A Tile Map Service displays georeferenced map tiles as an image on a map.
-        wms:
-          title: Web Map Service (WMS)
-          content: A Web Map Service displays a geospatial dataset as map images.
-        wmts:
-          title: Web Map Tile Service (WMTS)
-          content: A Web Map Tile Service displays maps over the web using cached image tiles.
-        xyz:
-          title: XYZ Tiles
-          content: Also known as slippy map tiles, is a method of expressing map tile mosaics, indexed by (x,y) offsets and zoom levels (z).
-  blacklight:
-    icon:
-      american-geographical-society-library-uwm-libraries: American Geographical Society Library - UWM Libraries
-      arizona: The University of Arizona
-      arrow-circle-down: Arrow within a circle, pointing down
-      baruch-cuny: Baruch College
-      berkeley: University of California, Berkeley
-      cd-rom: CD-Rom
-      columbia: Columbia University
-      cornell: Cornell University
-      dvd-rom: DVD-Rom
-      esri-globe: Esri Global
-      george-mason: George Mason University
-      harvard: Harvard University
-      iiif-drag-drop: Drag icon to any IIIF viewer
-      indiana: Indiana University
-      lewis-clark: Lewis & Clark
-      massgis: MassGIS
-      mit: Massachusetts Institute of Technology
-      multilinestring: Multi-line string
-      multipoint: Multi-point
-      multipolygon: Multi-polygon
-      northwestern-university: Northwestern University
-      nyu: New York University
-      princeton: Princeton University
-      public: Public content
-      restricted: Restricted content
-      rutgers: Rutgers University
-      sms: SMS
-      stanford: Stanford University
-      texas: The University of Texas at Austin
-      tufts: Tufts University
-      triangle-exclamation-solid: Warning
-      ucla: University of California, Los Angeles
-      uva: University of Virginia

data/geoblacklight.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 2.5.2"
 
   spec.add_dependency "rails", ">= 8", "< 9"
-  spec.add_dependency "blacklight", ">= 8.0", "< 10"
+  spec.add_dependency "blacklight", ">= 9.1", "< 10"
   spec.add_dependency "commonmarker", "~> 2.9"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"
@@ -34,11 +34,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "engine_cart", "~> 2.0"
   spec.add_development_dependency "capybara", ">= 2.5.0"
-  spec.add_development_dependency "selenium-webdriver"
+  spec.add_development_dependency "selenium-webdriver", ">= 4.11"
   spec.add_development_dependency "factory_bot_rails"
   spec.add_development_dependency "simplecov", "~> 0.22"
   spec.add_development_dependency "foreman"
-  spec.add_development_dependency "standardrb", "1.0.1"
+  spec.add_development_dependency "standard", "~> 1.56.0"
   spec.add_development_dependency "webmock", "~> 3.14"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "axe-core-rspec"

data/lib/generators/geoblacklight/assets_generator.rb

@@ -14,8 +14,8 @@ module Geoblacklight
       ES modules via importmap, and their dependencies are pinned to versions
       delivered via CDN.
 
-      CSS needed for Geoblacklight's dependencies (e.g. leaflet viewer) are
-      imported via CDN in the app's main bootstrap stylesheet. Geoblacklight's own
+      CSS needed for Geoblacklight's dependencies (e.g. Bootstrap) is imported
+      via CDN in the app's main bootstrap stylesheet. Geoblacklight's own
       stylesheet is imported from the frontend asset package installed via yarn.
     DESCRIPTION
 

data/lib/generators/geoblacklight/install_generator.rb

@@ -22,7 +22,8 @@ module Geoblacklight
 
     def raise_unpermitted_params
       inject_into_file "config/environments/test.rb",
-        "config.action_controller.action_on_unpermitted_parameters = :raise\n", before: /^end/
+        "config.action_controller.action_on_unpermitted_parameters = :raise\n" \
+        "config.action_controller.always_permitted_parameters = %w[controller action commit]\n", before: /^end/
     end
 
     def mount_geoblacklight_engine
@@ -35,10 +36,6 @@ module Geoblacklight
         resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do
           concerns :gbl_exportable
         end
-        concern :gbl_wms, Geoblacklight::Routes::Wms.new
-        namespace :wms do
-          concerns :gbl_wms
-        end
       ROUTES
 
       inject_into_file "config/routes.rb", routes, before: /^end/
@@ -58,7 +55,7 @@ module Geoblacklight
     end
 
     def add_rsolr_gem
-      gem "rsolr", ">= 1.0", "< 3"
+      gem "rsolr", ">= 1.0", "< 4"
     end
 
     def docker_compose

data/lib/generators/geoblacklight/templates/assets/customizations.css

@@ -1,6 +1,10 @@
 /* Local Application Customizations */
 
+/* Header Logo */
 :root {
-  /* Header Logo */
   --bl-logo-image: url("geoblacklight/logo.svg");
 }
+
+[data-bs-theme="dark"] {
+  --bl-logo-image: url("geoblacklight/logo-dark.svg");
+}

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

@@ -39,6 +39,8 @@ class CatalogController < ApplicationController
     # config.index.show_link = 'title_display'
     # config.index.record_display_type = 'format'
     config.index.document_component = Geoblacklight::SearchResultComponent
+    config.index.thumbnail_method = :geoblacklight_thumbnail
+    config.index.default_thumbnail = :geoblacklight_default_thumbnail
     config.index.title_field = field_config.title
 
     # solr field configuration for document/show views
@@ -104,18 +106,18 @@ class CatalogController < ApplicationController
       label: "Bounding Box"
 
     # DEFAULT FACETS
-    config.add_facet_field field_config.index_year, label: "Year", limit: 10
-    config.add_facet_field field_config.spatial_coverage, label: "Place", limit: 8
-    config.add_facet_field field_config.access_rights, label: "Access", limit: 8
-    config.add_facet_field field_config.resource_class, label: "Resource Class", limit: 8
+    config.add_facet_field field_config.resource_class, label: "Resource Class"
     config.add_facet_field field_config.resource_type, label: "Resource Type", limit: 8
     config.add_facet_field field_config.format, label: "Format", limit: 8
-    config.add_facet_field field_config.subject, label: "Subject", limit: 8
-    config.add_facet_field field_config.theme, label: "Theme", limit: 8
-    config.add_facet_field field_config.creator, label: "Creator", limit: 8
-    config.add_facet_field field_config.publisher, label: "Publisher", limit: 8
+    config.add_facet_field field_config.temporal_coverage, label: "Temporal Coverage", limit: 8
+    config.add_facet_field field_config.spatial_coverage, label: "Spatial Coverage", limit: 8, index_range: "A".."Z"
+    config.add_facet_field field_config.subject, label: "Subject", limit: 8, index_range: "A".."Z"
+    config.add_facet_field field_config.theme, label: "Theme", limit: 8, index_range: "A".."Z"
+    config.add_facet_field field_config.creator, label: "Creator", limit: 8, index_range: "A".."Z"
+    config.add_facet_field field_config.publisher, label: "Publisher", limit: 8, index_range: "A".."Z"
     config.add_facet_field field_config.provider, label: "Provider", limit: 8
-    config.add_facet_field field_config.georeferenced, label: "Georeferenced", limit: 3
+    config.add_facet_field field_config.access_rights, label: "Access"
+    config.add_facet_field field_config.georeferenced, label: "Georeferenced"
 
     # If you wish to add a date range filter, first run `bundle add blacklight_range_limit && bin/rails generate blacklight_range_limit:install`
     # Then uncomment the following line:
@@ -138,19 +140,6 @@ class CatalogController < ApplicationController
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-    # 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
-    # config.add_index_field field_config.provider, :label => 'Institution:'
-    # config.add_index_field field_config.rights, :label => 'Access:'
-    # # config.add_index_field 'Area', :label => 'Area:'
-    # config.add_index_field field_config.subject, :label => 'Keywords:'
-    config.add_index_field field_config.index_year
-    config.add_index_field field_config.creator
-    config.add_index_field field_config.description, helper_method: :snippit
-    config.add_index_field field_config.publisher
-
     # ITEM VIEW FIELDS
 
     # solr fields to be displayed in the show (single result) view
@@ -162,7 +151,7 @@ class CatalogController < ApplicationController
 
     # 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.
+    # The labels and order can be customized. Comment out fields to hide them.
 
     config.add_show_field field_config.alternative_title, label: "Alternative Title",
       itemprop: "alt_title"
@@ -174,13 +163,14 @@ class CatalogController < ApplicationController
     config.add_show_field field_config.resource_class, label: "Resource Class", itemprop: "class"
     config.add_show_field field_config.resource_type, label: "Resource Type", itemprop: "type"
     config.add_show_field field_config.subject, label: "Subject", itemprop: "keywords",
-      link_to_facet: true
-    config.add_show_field field_config.theme, label: "Theme", itemprop: "theme"
+      link_to_facet: true, layout_component: Geoblacklight::TruncatableMetadataFieldLayoutComponent
+    config.add_show_field field_config.theme, label: "Theme", itemprop: "theme",
+      layout_component: Geoblacklight::TruncatableMetadataFieldLayoutComponent
     config.add_show_field field_config.temporal_coverage, label: "Temporal Coverage",
       itemprop: "temporal"
     config.add_show_field field_config.date_issued, label: "Date Issued", itemprop: "issued"
     config.add_show_field field_config.spatial_coverage, label: "Spatial Coverage", itemprop: "spatial",
-      link_to_facet: true
+      link_to_facet: true, layout_component: Geoblacklight::TruncatableMetadataFieldLayoutComponent
     config.add_show_field field_config.rights, label: "Rights", itemprop: "rights"
     config.add_show_field field_config.rights_holder, label: "Rights Holder",
       itemprop: "rights_holder"
@@ -247,7 +237,7 @@ class CatalogController < ApplicationController
 
     config.add_search_field "all_fields", label: "All Fields"
     # config.add_search_field 'dct_title_ti', :label => 'Title'
-    # config.add_search_field 'dct_description_ti', :label => 'Description'
+    # config.add_search_field 'dct_description_tmi', :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