geoblacklight 6.0.0.pre.alpha.6 → 6.0.0.pre.alpha.7

data/app/components/geoblacklight/metadata_description_markdown_component.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class MetadataDescriptionMarkdownComponent < Blacklight::MetadataFieldComponent
+    # Transform markdown into HTML
+    # @param [String] value markdown to transform
+    # @return [ActiveSupport::SafeBuffer] rendered HTML
+    def markdown_to_html(value)
+      Commonmarker.to_html(value).html_safe
+    end
+
+    def render_field_values
+      [tag.div(class: "truncate-abstract", data: {
+        read_more_text: t("geoblacklight.truncate.read_more"),
+        close_text: t("geoblacklight.truncate.close")
+      }) do
+        safe_join(Array(@field.values).flatten.map { |value| markdown_to_html(value) })
+      end]
+    end
+  end
+end

data/app/components/geoblacklight/relations_component.html.erb

@@ -5,7 +5,7 @@
 
   <ul class="list-group list-group-flush">
     <% relationship_type_results['docs'][0..2].map { |hash| SolrDocument.new(hash) }.each do |doc| %>
-      <li class="list-group-item border-bottom-0">
+      <li class="list-group-item">
         <%= link_to solr_document_path(doc) do %>
           <%= helpers.geoblacklight_icon(rel_type_info.icon) unless rel_type_info.icon.nil? %>
           <%= doc.title %>
@@ -13,7 +13,7 @@
       </li>
     <% end %>
     <% unless (relationship_type_results['numFound'].to_i <= 3) %>
-      <li class="list-group-item border-bottom-0">
+      <li class="list-group-item">
         <%= link_to search_catalog_path({f: {"#{Geoblacklight.configuration.relationships_shown.public_send(relationship_type).field}" => [relations.link_id]}}) do %>
           <%= t('geoblacklight.relations.browse_all', count: relationship_type_results['numFound']) %>
         <% end %>

data/app/components/geoblacklight/resource_header_badge_component.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class ResourceHeaderBadgeComponent < HeaderBadgeComponent
+    def label
+      return first_resource if resource_type_icon_missing?
+
+      dataset_type
+    end
+
+    def icon(field)
+      return resource_type_icon unless resource_type_icon_missing?
+      default_resource_icon
+    end
+
+    def default_resource_icon
+      helpers.geoblacklight_icon(first_resource)
+    end
+
+    def resource_type_icon_missing?
+      return @resource_type_icon_missing if defined?(@resource_type_icon_missing)
+      @resource_type_icon_missing = resource_type_icon.include?("icon-missing")
+    end
+
+    def resource_type_icon
+      @resource_type_icon ||= helpers.geoblacklight_icon(dataset_type)
+    end
+
+    def dataset_type
+      @dataset_type ||= @document.resource_type.find { |type| type.include?(" data") }&.gsub(" data", "")
+    end
+
+    def first_resource
+      @first_resource ||= @document.resource_class.first
+    end
+  end
+end

data/app/components/geoblacklight/search_result_component.html.erb

@@ -12,9 +12,10 @@
   },
   itemscope: true,
   itemtype: @document.itemtype,
-  class: classes.flatten.join(' ') do %>
+  class: classes do %>
 
-  <%= content_tag :div, class: 'documentHeader index-split', data: { layer_id: @document.id, geom: @document.geometry.geojson } do %>
+  <%= content_tag :div, class: 'document-main-section' do %>
+  <%= content_tag :header, class: 'documentHeader index-split', data: { layer_id: @document.id, geom: @document.geometry.geojson } do %>
     <div class="document-counter">
       <%= t('blacklight.search.documents.counter', :counter => @counter) if @counter %>
     </div>
@@ -23,18 +24,18 @@
       <%= helpers.link_to_document(@document, counter: @counter, itemprop: "name") %>
     </h3>
 
-    <div class="status-icons">
-      <%= render Geoblacklight::HeaderIconsComponent.new(document: @document) %>
-      <button
-          class="btn dropdown-toggle collapsed"
-          data-bs-toggle="collapse"
-          data-bs-target="#doc-<%= @document.id %>-fields-collapse"
-          aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
-          aria-expanded="false"
-          aria-controls="doc-<%= @document.id %>-fields-collapse">
-      </button>
-    </div>
-
+    <button
+        class="btn dropdown-toggle collapsed"
+        data-bs-toggle="collapse"
+        data-bs-target="#doc-<%= @document.id %>-fields-collapse"
+        aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
+        aria-expanded="false"
+        aria-controls="doc-<%= @document.id %>-fields-collapse">
+    </button>
+  <% end %>
+  <div class="status-icons mx-4 mt-2">
+    <%= render Geoblacklight::HeaderIconsComponent.new(document: @document) %>
+  </div>
   <% end %>
 <% end %>
 <div class="more-info-area border-bottom">

data/app/components/geoblacklight/static_map_component.rb

@@ -9,8 +9,10 @@ module Geoblacklight
       super()
     end
 
+    # If there's no preview using the big map, or there is a IIIF preview that
+    # is not georeferenced, we need to see where the item is located.
     def render?
-      Geoblacklight.configuration.sidebar_static_map&.any? { |vp| @document.viewer_protocol == vp }
+      !@document.previewable? || (@document.iiif_preview? && !@document.georeferenced?)
     end
 
     def before_render
@@ -25,7 +27,8 @@ module Geoblacklight
         class: "viewer border",
         data: {
           "controller" => "leaflet-viewer",
-          "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
+          "leaflet-viewer-basemap-value" => Geoblacklight.configuration.basemap_provider,
+          "leaflet-viewer-dark-basemap-value" => Geoblacklight.configuration.dark_basemap_provider,
           "leaflet-viewer-page-value" => "STATIC_MAP",
           "leaflet-viewer-map-geom-value" => @document.geometry.geojson,
           "leaflet-viewer-options-value" => leaflet_options.to_h,

data/app/helpers/geoblacklight_helper.rb

@@ -1,6 +1,28 @@
 # frozen_string_literal: true
 
 module GeoblacklightHelper
+  include Blacklight::LayoutHelperBehavior
+
+  # Let the facets take up more space for the locator map
+  def sidebar_classes
+    "page-sidebar col-lg-4 order-first"
+  end
+
+  # Make the search results take up less space so the facets can take more
+  def main_content_classes
+    "col-lg-8"
+  end
+
+  # Needed so we keep the defaults instead of using sidebar_classes
+  def show_sidebar_classes
+    "page-sidebar col-lg-3"
+  end
+
+  # Needed so we keep the defaults instead of using main_content_classes
+  def show_content_classes
+    "col-lg-9 show-document"
+  end
+
   def document_available?(document)
     document.public? || (document.same_institution? && user_signed_in?)
   end
@@ -34,60 +56,15 @@ module GeoblacklightHelper
     t "geoblacklight.references.#{reference}"
   end
 
-  ##
-  # Render value for a document's field as a truncate abstract
-  # div. Arguments come from Blacklight::DocumentPresenter's
-  # get_field_values method
-  # @param [Hash] args from get_field_values
-  def render_value_as_truncate_abstract(args)
-    tag.div class: "truncate-abstract", data: {
-      read_more_text: t("geoblacklight.truncate.read_more"),
-      close_text: t("geoblacklight.truncate.close")
-    } do
-      Array(args[:value]).flatten.collect { |v| concat tag.p(v) }
-    end
-  end
-
-  ##
-  # Selects the basemap used for map displays
-  # @return [String]
-  def geoblacklight_basemap
-    blacklight_config.basemap_provider || "positron"
-  end
-
-  ##
-  # Renders the transformed metadata
-  # (Renders a partial when the metadata isn't available)
-  # @param [Geoblacklight::Metadata::Base] metadata the metadata object
-  # @return [String]
-  def render_transformed_metadata(metadata)
-    render partial: "catalog/metadata/content", locals: {content: metadata.transform.html_safe}
-  rescue Geoblacklight::MetadataTransformer::TransformError => transform_err
-    Geoblacklight.logger.warn transform_err.message
-    render partial: "catalog/metadata/markup", locals: {content: metadata.to_xml}
-  rescue => err
-    Geoblacklight.logger.warn err.message
-    render partial: "catalog/metadata/missing"
-  end
-
-  ##
-  # Determines whether or not the metadata is the first within the array of References
-  # @param [SolrDocument] document the Solr Document for the item
-  # @param [Geoblacklight::Metadata::Base] metadata the object for the metadata resource
-  # @return [Boolean]
-  def first_metadata?(document, metadata)
-    document.references.shown_metadata.first.type == metadata.type
-  end
-
   ##
   # Renders a reference url for a document
   # @param [Hash] document, field_name
   def render_references_url(args)
-    return unless args[:document]&.references&.url
-    link_to(
-      args[:document].references.url.endpoint,
-      args[:document].references.url.endpoint
-    )
+    url = args[:document]&.references&.url
+    return unless url
+
+    endpoint = url.endpoint
+    link_to(endpoint, endpoint)
   end
 
   ## Returns the data-page attribute value used as the JS map selector

data/app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js

@@ -34,6 +34,7 @@ export default class LeafletViewerController extends Controller {
     available: Boolean,
     options: Object,
     basemap: String,
+    darkBasemap: String,
     mapGeom: Object,
     page: String,
     layerId: String,
@@ -44,6 +45,10 @@ export default class LeafletViewerController extends Controller {
     // Use leaflet icon images from CDN
     Icon.Default.imagePath = "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/images/"
 
+    // The map can be turbo-permanent; if we're reconnected but the map already
+    // exists, no need to destroy and recreate the layers and controls.
+    if (this.map) return
+
     // Set up layers
     this.basemap = this.getBasemap()
     this.overlay = layerGroup()
@@ -54,6 +59,13 @@ export default class LeafletViewerController extends Controller {
 
     // Load the map
     this.loadMap()
+
+    // Check for changes to dark/light mode and update the basemap accordingly
+    const observer = new MutationObserver(() => {
+      this.map.removeLayer(this.basemap)
+      this.map.addLayer(this.getBasemap())
+    })
+    observer.observe(document.documentElement, { attributes: true, attributeFilter: ["data-bs-theme"] })
   }
 
   // Create the map, add layers, fit the bounds
@@ -103,11 +115,14 @@ export default class LeafletViewerController extends Controller {
     this.element.dataset.bounds = this.bounds.toBBoxString()
   }
 
-  // Select the configured basemap to use
+  // Select the configured basemaps to use
   getBasemap() {
-    const basemapName = this.basemapValue || "positron"
-    return tileLayer(basemaps[basemapName].url, {
-      ...basemaps[basemapName],
+    if (document.documentElement.getAttribute("data-bs-theme") === "dark")
+      this.basemapName = this.darkBasemapValue || "dark_matter"
+    else this.basemapName = this.basemapValue || "positron"
+
+    return tileLayer(basemaps[this.basemapName].url, {
+      ...basemaps[this.basemapName],
       detectRetina: this.optionsValue.layers.detect_retina || false,
     })
   }

data/app/javascript/geoblacklight/controllers/openlayers_viewer_controller.js

@@ -13,6 +13,7 @@ export default class OpenlayersViewerController extends Controller {
     url: String,
     protocol: String,
     basemap: String,
+    darkBasemap: String,
     mapGeom: String,
   }
 
@@ -24,6 +25,10 @@ export default class OpenlayersViewerController extends Controller {
     await this.getBounds()
     // Load the map
     this.loadMap()
+
+    // Check for changes to dark/light mode and update the basemap accordingly
+    const observer = new MutationObserver(() => this.map.getLayers().setAt(0, this.getBasemap()))
+    observer.observe(document.documentElement, { attributes: true, attributeFilter: ["data-bs-theme"] })
   }
 
   // Create the map, add layers, and fit the bounds
@@ -52,8 +57,11 @@ export default class OpenlayersViewerController extends Controller {
 
   // Select the configured basemap to use
   getBasemap() {
-    const basemap = basemaps[this.basemapValue || "positron"]
-    const layer = new TileLayer({ source: new XYZ(basemap) })
+    if (document.documentElement.getAttribute("data-bs-theme") === "dark")
+      this.basemapName = this.darkBasemapValue || "dark_matter"
+    else this.basemapName = this.basemapValue || "positron"
+
+    const layer = new TileLayer({ source: new XYZ(basemaps[this.basemapName]) })
     return layer
   }
 

data/app/javascript/geoblacklight/leaflet/basemaps.js

@@ -1,5 +1,5 @@
 export default {
-  darkMatter: {
+  dark_matter: {
     url: "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{retina}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
@@ -15,7 +15,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  positronLite: {
+  positron_lite: {
     url: "https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{retina}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
@@ -23,7 +23,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  worldAntique: {
+  world_antique: {
     url: "https://cartocdn_{s}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}{retina}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
@@ -31,7 +31,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  worldEco: {
+  world_eco: {
     url: "https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}{retina}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
@@ -39,7 +39,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  flatBlue: {
+  flat_blue: {
     url: "https://cartocdn_{s}.global.ssl.fastly.net/base-flatblue/{z}/{x}/{y}{retina}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
@@ -47,7 +47,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  midnightCommander: {
+  midnight_commander: {
     url: "https://cartocdn_{s}.global.ssl.fastly.net/base-midnight/{z}/{x}/{y}{retina}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
@@ -55,7 +55,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  openstreetmapHot: {
+  openstreetmap_hot: {
     url: "https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
     attribution:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, Tiles courtesy of <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>',
@@ -63,7 +63,7 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  openstreetmapStandard: {
+  openstreetmap_standard: {
     url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
     maxZoom: 19,

data/app/javascript/geoblacklight/openlayers/basemaps.js

@@ -1,5 +1,5 @@
 export default {
-  darkMatter: {
+  dark_matter: {
     url: "https://{a-d}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
@@ -11,43 +11,43 @@ export default {
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18,
   },
-  positronLite: {
+  positron_lite: {
     url: "https://{a-d}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18,
   },
-  worldAntique: {
+  world_antique: {
     url: "https://cartocdn_{a-d}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18,
   },
-  worldEco: {
+  world_eco: {
     url: "https://cartocdn_{a-d}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18,
   },
-  flatBlue: {
+  flat_blue: {
     url: "https://cartocdn_{a-d}.global.ssl.fastly.net/base-flatblue/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18,
   },
-  midnightCommander: {
+  midnight_commander: {
     url: "https://cartocdn_{a-d}.global.ssl.fastly.net/base-midnight/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18,
   },
-  openstreetmapHot: {
+  openstreetmap_hot: {
     url: "https://{a-c}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
     attributions:
       '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, Tiles courtesy of <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>',
     maxZoom: 19,
   },
-  openstreetmapStandard: {
+  openstreetmap_standard: {
     url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
     attributions: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
     maxZoom: 19,

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

@@ -29,6 +29,7 @@ module Geoblacklight
       attribute :identifiers, :array, field_config.identifier
       attribute :issued, :string, field_config.date_issued
       attribute :format, :string, field_config.format
+      attribute :georeferenced?, :boolean, field_config.georeferenced
     end
 
     def available?
@@ -47,6 +48,14 @@ module Geoblacklight
       (direct_download || iiif_download) && available?
     end
 
+    def iiif_preview?
+      viewer_protocol == "iiif" || viewer_protocol == "iiif_manifest"
+    end
+
+    def previewable?
+      viewer_endpoint.present?
+    end
+
     def references
       References.new(self)
     end

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div
     id="documents"
-    class="documents-list col-md-6"
+    class="documents-list"
     data-controller="search-results"
     data-action="leaflet-viewer:loaded@window->search-results#fitResultBounds"
     data-search-results-leaflet-viewer-outlet=".leaflet-viewer"
@@ -13,9 +13,4 @@
       <% end %>
     </div>
   </div>
-  <% if results_js_map_selector(controller.controller_name) == "index" %>
-    <%= render(Geoblacklight::LocationLeafletMapComponent.new(page: 'index', geosearch: { dynamic: true }, classes: 'col-md-6 sticky-top position-sticky leaflet-viewer border')) %>
-  <% else %>
-    <%= render(Geoblacklight::LocationLeafletMapComponent.new(page: 'index', classes: 'col-md-6 leaflet-viewer border')) %>
-  <% 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 }, classes: 'border')) %>
+      <%= render(Geoblacklight::LocationLeafletMapComponent.new(page: 'home', geosearch: { dynamic: false })) %>
     </div>
   </div>
 </div>

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

@@ -4,7 +4,7 @@
   <% end %>
   <% component.with_body do %>
     <div class="modal-body metadata-body">
-      <%= render partial: 'metadata' %>
+      <%= render Geoblacklight::MetadataComponent.new(document: @documents.first) %>
     </div>
   <% end %>
   <% component.with_footer do %>

data/geoblacklight.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", ">= 8", "< 9"
   spec.add_dependency "blacklight", ">= 8.0", "< 10"
+  spec.add_dependency "commonmarker", "~> 2.9"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"
   spec.add_dependency "faraday-follow_redirects"
   spec.add_dependency "coderay"
   spec.add_dependency "deprecation"
-  spec.add_dependency "geo_combine", "~> 0.10"
+  spec.add_dependency "geo_combine", "~> 0.11"
   spec.add_dependency "mime-types"
   spec.add_dependency "rgeo-geojson"
 

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

@@ -86,6 +86,23 @@ class CatalogController < ApplicationController
 
     # FACETS
 
+    # GEOBLACKLIGHT APPLICATION FACETS
+
+    # Map-Based "Search Here" Feature
+    # component:           - Defines how the facet appears in the sidebar
+    # item_presenter       - Defines how the facet values appear in the constraints section
+    # filter_query_builder - Defines the query generated for Solr
+    # filter_class         - Defines how to add/remove facet from query
+    # label                - Defines the label used for the facet
+    config.add_facet_field field_config.geometry, component: Geoblacklight::Facets::BboxFieldComponent,
+      item_presenter: Geoblacklight::BboxItemPresenter,
+      filter_class: Geoblacklight::BboxFilterField,
+      filter_query_builder: Geoblacklight::BboxFilterQuery,
+      within_boost: gbl_config.bbox_within_boost,
+      overlap_boost: gbl_config.overlap_ratio_boost,
+      overlap_field: field_config.overlap_field,
+      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
@@ -100,20 +117,9 @@ class CatalogController < ApplicationController
     config.add_facet_field field_config.provider, label: "Provider", limit: 8
     config.add_facet_field field_config.georeferenced, label: "Georeferenced", limit: 3
 
-    # 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 field_config.geometry, item_presenter: Geoblacklight::BboxItemPresenter,
-      filter_class: Geoblacklight::BboxFilterField,
-      filter_query_builder: Geoblacklight::BboxFilterQuery,
-      within_boost: gbl_config.bbox_within_boost,
-      overlap_boost: gbl_config.overlap_ratio_boost,
-      overlap_field: field_config.overlap_field,
-      label: "Bounding Box"
+    # 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:
+    # config.add_facet_field field_config.index_year, label: "Date", range: true
 
     # Item Relationship Facets
     # * Not displayed to end user (show: false)
@@ -152,6 +158,7 @@ class CatalogController < ApplicationController
     # item_prop: [String] property given to span with Schema.org item property
     # 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
+    # component: [ViewComponent::Base] component that can be used to render the field
 
     # 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.
@@ -160,7 +167,7 @@ class CatalogController < ApplicationController
     config.add_show_field field_config.alternative_title, label: "Alternative Title",
       itemprop: "alt_title"
     config.add_show_field field_config.description, label: "Description", itemprop: "description",
-      helper_method: :render_value_as_truncate_abstract
+      component: Geoblacklight::MetadataDescriptionMarkdownComponent
     config.add_show_field field_config.creator, label: "Creator", itemprop: "creator"
     config.add_show_field field_config.publisher, label: "Publisher", itemprop: "publisher"
     config.add_show_field field_config.provider, label: "Provider", link_to_facet: true
@@ -327,21 +334,6 @@ class CatalogController < ApplicationController
     config.add_show_tools_partial :web_services, component: Geoblacklight::WebServicesLinkComponent,
       if: proc { |_context, _config, options| options[:document] && (gbl_config.webservices_shown & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
 
-    # Configure basemap provider for GeoBlacklight maps (uses https only basemap
-    # providers with open licenses)
-    # Valid basemaps include:
-    # 'positron'
-    # 'darkMatter'
-    # 'positronLite'
-    # 'worldAntique'
-    # 'worldEco'
-    # 'flatBlue'
-    # 'midnightCommander'
-    # 'openstreetmapHot'
-    # 'openstreetmapStandard'
-
-    config.basemap_provider = "positron"
-
     # Configuration for autocomplete suggestor
     config.autocomplete_enabled = true
     config.autocomplete_path = "suggest"

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

@@ -283,9 +283,4 @@
 #     - "wmts"
 #     - "xyz"
 
-# # Enable catalog#show sidebar static map for items with the following viewer protocols
-# sidebar_static_map:
-#   - "iiif"
-#   - "iiif_manifest"
-
 # iiif_drag_drop_link: "@manifest?manifest=@manifest"

data/lib/geoblacklight/configuration/leaflet_config.rb

@@ -9,8 +9,9 @@ module Geoblacklight
       attr_accessor :bounds_overlay, :controls
 
       attr_reader :sleep, :layers
-      # set to true to display attribute table as sidebar on map
-      attribute :sidebar, :boolean, default: false
+
+      # set to false to display attribute table as a separate panel below the map
+      attribute :sidebar, :boolean, default: true
       attribute :selected_color, :string, default: "#2C7FB8"
 
       DEFAULT_SLEEP_CONFIG = {

data/lib/geoblacklight/configuration/settings_builder.rb

@@ -19,7 +19,6 @@ module Geoblacklight
           assign(config, :display_notes_shown, build_display_notes)
           assign(config, :institution, settings.INSTITUTION)
           assign(config, :help_text, settings.HELP_TEXT&.to_h)
-          assign(config, :sidebar_static_map, settings.SIDEBAR_STATIC_MAP)
           assign(config, :iiif_drag_drop_link, settings.IIIF_DRAG_DROP_LINK)
           assign(config, :homepage_map_geom, settings.HOMEPAGE_MAP_GEOM)
           assign(config, :metadata_shown, settings.METADATA_SHOWN)