geoblacklight 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9e80f30735f8fa8f8e4c03e0a855b4e709acbf1eb860cad0a14e66dba72064
-  data.tar.gz: 824c5c71fb501807335ab0862522d5a14fec06f31b1f21b09d732338f27e5b89
+  metadata.gz: 1ece9d6b515fa64010cbc158c72b17ae35e019a842e83700e68650f7d6cb0a98
+  data.tar.gz: 268d83c2130ce59ac765ec0764164e3c081d7e62beedfe8494968ce8a74ba22c
 SHA512:
-  metadata.gz: acbee7539ae6c048356e42467b99f4e94c948cc9d5a35ddeeccc721028965808267d33d3d3ce91fc05afdd5992fbee5edeeda1760aa6257dea6420bc83e194ce
-  data.tar.gz: 8395fe82750ac0bfe3dc3de410a7039d0eff671ffee63690f1a0858b88687dc163ed92a711a46a94caf956eb3cdd5b04f7c96cb5a7cf2aedbaec9d74a2136412
+  metadata.gz: ee73a4e5fb22a94dd6b0f6010ec8259b360ebec2b99c007545b1bfedecc52a9e4296eee9d40af1d125d8771e11d15d9997bd9c8ac3deec5d05630fac542c0cad
+  data.tar.gz: e8658148c4a9289b38ed5258ad50b9538f8fea43d2d1733d0d05bf46fa0fe5e1868c291f62d0a771d3f3165b829d109fff5d6700e06638c871fe15c444bf38b7

data/app/components/geoblacklight/document/sidebar_component.html.erb

@@ -1,3 +1,5 @@
+<%# Rendered by GeoBlacklight itself, so the deprecated methods it calls are silenced here; an application that overrides them still gets warned when it calls them. %>
+<% Geoblacklight.deprecation.silence do %>
 <%= render_static_map_component %>
 <%= render_show_tools %>
 
@@ -10,3 +12,4 @@
 <%= render_more_like_this %>
 
 <%= render "relations_container", document: document %>
+<% end %>

data/app/components/geoblacklight/document/sidebar_component.rb

@@ -3,10 +3,12 @@
 module Geoblacklight
   module Document
     class SidebarComponent < Blacklight::Document::SidebarComponent
+      # @deprecated
       def render_static_map_component
         render Geoblacklight::StaticMapComponent.new(document:)
       end
 
+      # @deprecated
       def sidebar_buttons
         [
           Geoblacklight::WebServicesLinkComponent.new(document:),
@@ -15,9 +17,14 @@ module Geoblacklight
         ]
       end
 
+      # @deprecated
       def render_more_like_this
         render Blacklight::Document::MoreLikeThisComponent.new(document:)
       end
+      Geoblacklight.deprecation.deprecate_methods(Geoblacklight::Document::SidebarComponent,
+        render_static_map_component: "GeoBlacklight 6 builds the sidebar from a single #panels method",
+        sidebar_buttons: "GeoBlacklight 6 builds the sidebar from a single #panels method",
+        render_more_like_this: "GeoBlacklight 6 builds the sidebar from a single #panels method")
     end
   end
 end

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

@@ -1,3 +1,5 @@
+<%# Removed in GeoBlacklight 6. The deprecated download API it calls is silenced here so that a stock application is not warned once per request. %>
+<% Geoblacklight.deprecation.silence do %>
 <div data-controller="downloads" class="downloads-sidebar">
     <%# the dropdown-toggle class gives us the little arrow %>
     <button type="button" class="btn btn-primary dropdown-toggle sidebar-btn" id="downloads-button" data-bs-toggle="collapse" data-bs-target="#downloads-collapse" aria-expanded="false" aria-controls="downloads-collapse">
@@ -29,3 +31,4 @@
         </div>
     </div>
 </div>
+<% end %>

data/app/components/geoblacklight/download_links_component.rb

@@ -11,7 +11,7 @@ module Geoblacklight
     end
 
     def render?
-      downloadable? && (document.direct_download.present? || document.iiif_download.present? || document.download_types.present?)
+      Geoblacklight.deprecation.silence { downloadable? && (document.direct_download.present? || document.iiif_download.present? || document.download_types.present?) }
     end
 
     def downloadable?

data/app/components/geoblacklight/item_map_viewer_component.rb

@@ -84,12 +84,12 @@ module Geoblacklight
         data: {
           "controller" => viewer_name,
           "#{viewer_name}-available-value" => helpers.document_available?(@document),
-          "#{viewer_name}-basemap-value" => helpers.geoblacklight_basemap,
+          "#{viewer_name}-basemap-value" => Geoblacklight.deprecation.silence { helpers.geoblacklight_basemap },
           "#{viewer_name}-protocol-value" => protocol,
           "#{viewer_name}-url-value" => @document.viewer_endpoint,
           "#{viewer_name}-map-geom-value" => @document.geometry.geojson,
           "#{viewer_name}-layer-id-value" => @document.wxs_identifier,
-          "#{viewer_name}-options-value" => helpers.leaflet_options,
+          "#{viewer_name}-options-value" => Geoblacklight.deprecation.silence { helpers.leaflet_options },
           "#{viewer_name}-page-value" => params[:action]&.upcase,
           "#{viewer_name}-draw-initial-bounds-value" => true
         }.compact)

data/app/components/geoblacklight/location_leaflet_map_component.rb

@@ -26,7 +26,7 @@ module Geoblacklight
 
     # Add top-level geosearch control to leaflet options if configured
     def leaflet_options
-      options = helpers.leaflet_options.deep_dup
+      options = Geoblacklight.deprecation.silence { helpers.leaflet_options }.deep_dup
       options["CONTROLS"] = {"Geosearch" => @geosearch} if @geosearch
       options.to_json
     end
@@ -37,7 +37,7 @@ module Geoblacklight
         class: @classes,
         data: {
           "controller" => "leaflet-viewer",
-          "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
+          "leaflet-viewer-basemap-value" => Geoblacklight.deprecation.silence { helpers.geoblacklight_basemap },
           "leaflet-viewer-map-geom-value" => search_bbox || @map_geometry,
           "leaflet-viewer-data-map-value" => @data_map,
           "leaflet-viewer-page-value" => params[:action]&.upcase,

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

@@ -7,7 +7,7 @@
     <% relationship_type_results['docs'][0..2].map { |hash| SolrDocument.new(hash) }.each do |doc| %>
       <li class="list-group-item border-bottom-0">
         <%= link_to solr_document_path(doc) do %>
-          <%= helpers.relations_icon(doc, rel_type_info.icon) unless rel_type_info.icon.nil? %>
+          <%= Geoblacklight.deprecation.silence { helpers.relations_icon(doc, rel_type_info.icon) } unless rel_type_info.icon.nil? %>
           <%= doc.title %>
         <% end %>
       </li>

data/app/components/geoblacklight/static_map_component.rb

@@ -18,13 +18,13 @@ module Geoblacklight
     end
 
     def viewer_tag
-      leaflet_options = helpers.leaflet_options.deep_dup
+      leaflet_options = Geoblacklight.deprecation.silence { helpers.leaflet_options }.deep_dup
       leaflet_options.SLEEP.SLEEP = false
       tag.div(nil,
         id: "static-map",
         data: {
           "controller" => "leaflet-viewer",
-          "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
+          "leaflet-viewer-basemap-value" => Geoblacklight.deprecation.silence { helpers.geoblacklight_basemap },
           "leaflet-viewer-page-value" => "STATIC_MAP",
           "leaflet-viewer-map-geom-value" => @document.geometry.geojson,
           "leaflet-viewer-options-value" => leaflet_options,

data/app/controllers/download_controller.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class DownloadController < ApplicationController
+  before_action do
+    Geoblacklight.deprecation.warn(
+      "DownloadController is deprecated; GeoBlacklight 6 removes the generated download subsystem: downloads are direct links only, rendered by Geoblacklight::Document::DownloadLinksComponent"
+    )
+  end
+
   # include Blacklight::SearchHelper
   include Blacklight::Catalog
 

data/app/controllers/relation_controller.rb

@@ -6,7 +6,7 @@ class RelationController < ApplicationController
   copy_blacklight_config_from(CatalogController)
 
   def index
-    @relations = Geoblacklight::Relation::RelationResponse.new(params[:id], repository)
+    @relations = Geoblacklight.deprecation.silence { Geoblacklight::Relation::RelationResponse.new(params[:id], repository) }
     render layout: !request.xhr?
   end
 

data/app/helpers/geoblacklight_helper.rb

@@ -9,6 +9,7 @@ module GeoblacklightHelper
   # Blacklight catalog controller helper method to truncate field value to 150 chars
   # @param [SolrDocument] args
   # @return [String]
+  # @deprecated
   def snippit(args)
     truncate(Array(args[:value]).flatten.join(" "), length: 150)
   end
@@ -40,6 +41,7 @@ module GeoblacklightHelper
   # div. Arguments come from Blacklight::DocumentPresenter's
   # get_field_values method
   # @param [Hash] args from get_field_values
+  # @deprecated
   def render_value_as_truncate_abstract(args)
     tag.div class: "truncate-abstract" do
       Array(args[:value]).flatten.join(" ")
@@ -49,6 +51,7 @@ module GeoblacklightHelper
   ##
   # Selects the basemap used for map displays
   # @return [String]
+  # @deprecated
   def geoblacklight_basemap
     blacklight_config.basemap_provider || "positron"
   end
@@ -56,6 +59,7 @@ module GeoblacklightHelper
   ##
   # Returns a hash of the leaflet plugin settings to pass to the viewer.
   # @return[Hash]
+  # @deprecated
   def leaflet_options
     Settings.LEAFLET
   end
@@ -65,6 +69,7 @@ module GeoblacklightHelper
   # (Renders a partial when the metadata isn't available)
   # @param [Geoblacklight::Metadata::Base] metadata the metadata object
   # @return [String]
+  # @deprecated
   def render_transformed_metadata(metadata)
     render partial: "catalog/metadata/content", locals: {content: metadata.transform.html_safe}
   rescue Geoblacklight::MetadataTransformer::TransformError => transform_err
@@ -80,6 +85,7 @@ module GeoblacklightHelper
   # @param [SolrDocument] document the Solr Document for the item
   # @param [Geoblacklight::Metadata::Base] metadata the object for the metadata resource
   # @return [Boolean]
+  # @deprecated
   def first_metadata?(document, metadata)
     document.references.shown_metadata.first.type == metadata.type
   end
@@ -96,10 +102,22 @@ module GeoblacklightHelper
   end
 
   ## Returns the icon used based off a Settings strategy
+  # @deprecated
   def relations_icon(document, icon)
-    icon_html = render Geoblacklight::HeaderIconsComponent.new(document: document, fields: [Settings.FIELDS.GEOM_TYPE]) if Settings.USE_GEOM_FOR_RELATIONS_ICON
-    return icon_html unless !Settings.USE_GEOM_FOR_RELATIONS_ICON || icon_html.include?("icon-missing")
-    geoblacklight_icon(icon, **{})
+    # If configured to use geometry type for relations icon
+    if Settings.USE_GEOM_FOR_RELATIONS_ICON
+      Geoblacklight.deprecation.warn("USE_GEOM_FOR_RELATIONS_ICON is deprecated and will be removed in GeoBlacklight 6")
+      icon_html = render Geoblacklight::HeaderIconsComponent.new(
+        document: document,
+        fields: [Settings.FIELDS.GEOM_TYPE]
+      )
+
+      # Use geometry-based icon if it's valid (not missing)
+      return icon_html unless icon_html.include?("icon-missing")
+    end
+
+    # Fall back to the default icon
+    geoblacklight_icon(icon)
   end
 
   ## Returns the data-page attribute value used as the JS map selector
@@ -111,4 +129,14 @@ module GeoblacklightHelper
       "index"
     end
   end
+
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    snippit: "GeoBlacklight 6 removes it; its catalog_controller template no longer configures a " \
+      "truncated description index field",
+    render_value_as_truncate_abstract: "use Geoblacklight::MetadataDescriptionMarkdownComponent instead",
+    geoblacklight_basemap: "GeoBlacklight 6 reads the basemap from the viewer components themselves",
+    leaflet_options: "GeoBlacklight 6 reads the Leaflet options from the viewer components themselves",
+    render_transformed_metadata: "use Geoblacklight::MetadataComponent instead",
+    first_metadata?: "use Geoblacklight::MetadataComponent instead",
+    relations_icon: "use Geoblacklight::Relations::RelationComponent instead")
 end

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

@@ -110,13 +110,28 @@ export default class LeafletViewerController extends Controller {
 
   // Select the configured basemap to use
   getBasemap() {
-    const basemapName = this.basemapValue || "positron";
-    return tileLayer(basemaps[basemapName].url, {
-      ...basemaps[basemapName],
+    const definition = this.basemapDefinition();
+    return tileLayer(definition.url, {
+      ...definition,
       detectRetina: this.optionsValue.LAYERS.DETECT_RETINA || false,
     });
   }
 
+  // The basemap to draw, with any BASEMAPS values from settings.yml merged over
+  // the shipped definition. This lets an application change a basemap's URL --
+  // to add a CARTO API key, for example -- without restating the rest of the
+  // definition, and lets it define basemaps of its own. Falls back to positron
+  // for a name that resolves to nothing rather than drawing no basemap.
+  basemapDefinition() {
+    const name = this.basemapValue || "positron";
+    const definition = { ...basemaps[name], ...this.basemapOverrides()[name] };
+    return definition.url ? definition : basemaps.positron;
+  }
+
+  basemapOverrides() {
+    return this.optionsValue.BASEMAPS || {};
+  }
+
   // Add the configured controls to the map
   addControls() {
     // Add any top-level controls (e.g. geosearch) first

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

@@ -14,6 +14,7 @@ export default class OpenlayersViewerController extends Controller {
     protocol: String,
     basemap: String,
     mapGeom: String,
+    options: Object,
   };
 
   async connect() {
@@ -55,11 +56,41 @@ 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) });
+    const basemap = this.basemapDefinition();
+    const layer = new TileLayer({
+      source: new XYZ({
+        ...basemap,
+        url: this.normalizeUrl(basemap.url),
+        // The leaflet definitions spell this `attribution`; OpenLayers wants
+        // `attributions`. Accept either so one setting serves both viewers.
+        attributions: basemap.attributions || basemap.attribution,
+      }),
+    });
     return layer;
   }
 
+  // The basemap to draw, with any BASEMAPS values from settings.yml merged over
+  // the shipped definition. This lets an application change a basemap's URL --
+  // to add a CARTO API key, for example -- without restating the rest of the
+  // definition, and lets it define basemaps of its own. Falls back to positron
+  // for a name that resolves to nothing rather than drawing no basemap.
+  basemapDefinition() {
+    const name = this.basemapValue || "positron";
+    const definition = { ...basemaps[name], ...this.basemapOverrides()[name] };
+    return definition.url ? definition : basemaps.positron;
+  }
+
+  basemapOverrides() {
+    return this.optionsValue.BASEMAPS || {};
+  }
+
+  // Leaflet and OpenLayers spell tile URL templates differently, so accept the
+  // leaflet form a configured basemap is most likely to be written in: {s}
+  // becomes OpenLayers' subdomain range, and {retina} drops out.
+  normalizeUrl(url) {
+    return url.replace(/\{s\}/g, "{a-d}").replace(/\{retina\}/g, "");
+  }
+
   // Generate a layer based on the protocol
   getPreviewOverlay(protocol, url) {
     if (protocol === "Pmtiles") return pmTilesLayer(url);

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

@@ -23,38 +23,6 @@ export default {
     worldCopyJump: true,
     retina: "@2x",
   },
-  worldAntique: {
-    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>',
-    maxZoom: 18,
-    worldCopyJump: true,
-    retina: "@2x",
-  },
-  worldEco: {
-    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>',
-    maxZoom: 18,
-    worldCopyJump: true,
-    retina: "@2x",
-  },
-  flatBlue: {
-    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>',
-    maxZoom: 18,
-    worldCopyJump: true,
-    retina: "@2x",
-  },
-  midnightCommander: {
-    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>',
-    maxZoom: 18,
-    worldCopyJump: true,
-    retina: "@2x",
-  },
   openstreetmapHot: {
     url: "https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
     attribution:

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

@@ -1,4 +1,5 @@
 import { identifyFeatures } from "esri-leaflet";
+import { polygon, geoJSON, circleMarker, layerGroup } from "leaflet";
 import { appendErrorMessage, appendLoadingMessage, getLayerOpacity, linkify } from "geoblacklight/leaflet/utils";
 
 export const wmsInspection = (map, url, layerId, layer) => {
@@ -66,15 +67,15 @@ export const overlayLayer = (map, data, layer) => {
   const color = map.options.selected_color;
 
   if (data._latlngs) {
-    overlayLayer = L.polygon(data._latlngs, {color: color, weight: 2, layer: true, fillOpacity: opacity, addToOpacitySlider: true, highlightLayer: true });
+    overlayLayer = polygon(data._latlngs, {color: color, weight: 2, layer: true, fillOpacity: opacity, addToOpacitySlider: true, highlightLayer: true });
   } else {
-    overlayLayer = L.geoJSON(data, {
+    overlayLayer = geoJSON(data, {
       color: color,
       opacity: opacity,
       addToOpacitySlider: true,
       highlightLayer: true,
       pointToLayer: function(feature, latlng) {
-        return L.circleMarker(latlng, {
+        return circleMarker(latlng, {
           radius: 8,
           fillColor: color,
           color: color,
@@ -85,7 +86,7 @@ export const overlayLayer = (map, data, layer) => {
       }
     });
   }
-  L.layerGroup([overlayLayer]).addTo(map);
+  layerGroup([overlayLayer]).addTo(map);
 }
 
 export const tiledMapLayerInspection = (map, layer) => {

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

@@ -14,26 +14,6 @@ export default {
     attributions: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributionss">Carto</a>',
     maxZoom: 18
   },
-  worldAntique: {
-    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: {
-    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: {
-    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: {
-    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: {
     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>', 

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

@@ -38,7 +38,7 @@ export const cogLayer = (url) => {
   return new WebGLTileLayer({
     source: new GeoTIFF({
       sources: [{ url }],
-      convertToRGB: true,
+      convertToRGB: "auto",
     }),
   });
 };

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

@@ -31,6 +31,22 @@ module Geoblacklight
       attribute :format, :string, Settings.FIELDS.FORMAT
     end
 
+    ##
+    # Warn once per reader name rather than once per document: a search results page
+    # would otherwise emit one warning per result, because
+    # ActiveSupport::Deprecation does not deduplicate.
+    # @param method [Symbol]
+    def self.warn_about_url_reader(method)
+      @warned_url_readers ||= Set.new
+      return unless @warned_url_readers.add?(method)
+
+      Geoblacklight.deprecation.warn(
+        "SolrDocument##{method} is resolved dynamically by Geoblacklight::SolrDocument#method_missing, " \
+        "which GeoBlacklight 6 removes; call references.#{method.to_s.delete_suffix("_url")}&.endpoint " \
+        "instead"
+      )
+    end
+
     def available?
       public? || same_institution?
     end
@@ -44,7 +60,7 @@ module Geoblacklight
     end
 
     def downloadable?
-      (direct_download || download_types.present? || iiif_download) && available?
+      Geoblacklight.deprecation.silence { direct_download || download_types.present? || iiif_download } && available?
     end
 
     def references
@@ -101,7 +117,8 @@ module Geoblacklight
 
     def method_missing(method, *args, &block)
       if /.*_url$/.match?(method.to_s)
-        checked_endpoint(method.to_s.gsub("_url", ""))
+        Geoblacklight::SolrDocument.warn_about_url_reader(method)
+        Geoblacklight.deprecation.silence { checked_endpoint(method.to_s.gsub("_url", "")) }
       else
         super
       end

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

@@ -1,3 +1,5 @@
+<%# Removed in GeoBlacklight 6. The deprecated helpers it calls are silenced here so that a stock application is not warned once per request; Geoblacklight::DeprecatedConfiguration warns at boot if an application overrides it. %>
+<% Geoblacklight.deprecation.silence do %>
 <% document ||= @documents.first %>
 
 <div class='metadata-view'>
@@ -25,3 +27,4 @@
     <% end %>
   </div>
 </div>
+<% end %>

data/geoblacklight.gemspec

@@ -35,11 +35,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/templates/catalog_controller.rb

@@ -224,7 +224,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
@@ -309,12 +309,11 @@ class CatalogController < ApplicationController
     # 'positron'
     # 'darkMatter'
     # 'positronLite'
-    # 'worldAntique'
-    # 'worldEco'
-    # 'flatBlue'
-    # 'midnightCommander'
     # 'openstreetmapHot'
     # 'openstreetmapStandard'
+    #
+    # To change one of these basemaps' tile URLs, or to add a basemap of your
+    # own and name it here, set LEAFLET.BASEMAPS in settings.yml
 
     config.basemap_provider = "positron"
 

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

@@ -231,6 +231,25 @@ WMS_PARAMS:
 # Settings for leaflet
 LEAFLET:
   MAP:
+  # Basemap definitions, keyed by the name config.basemap_provider selects.
+  # Anything set here is merged over the basemap GeoBlacklight ships with, so
+  # you can change just the url and keep the rest of the definition.
+  #
+  # CARTO now watermarks raster tiles requested without an API key, which
+  # affects the positron, positronLite and darkMatter basemaps. Request a free
+  # key at https://carto.com/basemaps/apikey/ and pass it as a key parameter:
+  # BASEMAPS:
+  #   positron:
+  #     url: 'https://basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png?key=YOUR_KEY'
+  #   darkMatter:
+  #     url: 'https://basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png?key=YOUR_KEY'
+  #
+  # You can also define a basemap of your own here and select it with
+  # config.basemap_provider = 'myBasemap' in your CatalogController:
+  #   myBasemap:
+  #     url: 'https://tiles.example.edu/{z}/{x}/{y}.png'
+  #     attribution: 'Tiles courtesy of Example University'
+  #     maxZoom: 18
   BOUNDSOVERLAY:
     INDEX:
       color: '#3388ff'