geoblacklight 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70ec0fdb43d31e4d9c2d4d5902e5a5d19ea35a6171e6b37f74d9a3fbfd937661
-  data.tar.gz: f4b212c5ec24ee1c4c0263e8c0e1ba2c51c0ebcd7e70cf32ae5ccfe6e0a78d15
+  metadata.gz: 3edf2add9fde8d7a1c2989e1270f37643cbb122193e3600b53b10a321a49e902
+  data.tar.gz: 6d0d433f55915af261e636ea4cf640515ffa3fec5a09379949ea992407f18ce6
 SHA512:
-  metadata.gz: 9a6612a445ce525cd2610b4cc0c83a509a523b13e27ea3ee6314ee5f48cbb6da479f9e103c50ae75312911780e39740db155c9d1b6015a05e5dddd71e2237710
-  data.tar.gz: 0fc319d965119d9d7dd79456930fd6f4c32288d68967b9f408adf2da44c4096c7e99f39fe8e575021ef515f705a69e61f7513869774d7a87373972bcbfebebaa
+  metadata.gz: e07eec26c77cdfe96295c17821db3afef88dadfd4bc31be80b9a4c473ffc0104f7c3fec0d2e7895b7cb79b84654e93029f2d18466d96eb21e745382babc0fc72
+  data.tar.gz: 8b940bf6241ef7343f36855c312c3a3f1459ee6e754457ac01a7dfed56e01cb31c990b027a3d422ccc48c68d6cf9ace81102ec225a326825cbfe1d83ed902558

data/app/controllers/download_controller.rb

@@ -37,7 +37,12 @@ class DownloadController < ApplicationController
     send_file download_file_path_and_name, x_sendfile: true
   end
 
+  # @deprecated
   def hgl
+    Geoblacklight.deprecation.warn(
+      "DownloadController#hgl and the download_hgl route are deprecated; the Harvard " \
+      "Geospatial Library download integration is removed without replacement in GeoBlacklight 5"
+    )
     @response, @document = search_service.fetch params[:id]
     if params[:email]
       response = Geoblacklight::HglDownload.new(@document, params[:email]).get

data/app/helpers/arcgis_helper.rb

@@ -5,10 +5,13 @@ module ArcgisHelper
   # Generates an ArcGIS.com viewer url with params that can open content
   # directly
   # See: https://doc.arcgis.com/en/arcgis-online/reference/use-url-parameters.htm
+  # @deprecated
   def arcgis_link(arcgis_urls)
     params = URI.encode_www_form(
       urls: arcgis_urls
     )
     Settings.ARCGIS_BASE_URL + "?" + params
   end
+  Geoblacklight.deprecation.deprecate_methods(ArcgisHelper,
+    arcgis_link: "use Geoblacklight::ArcgisComponent instead")
 end

data/app/helpers/blacklight_helper.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+# @deprecated GeoBlacklight 5 no longer ships a BlacklightHelper override. The
+#   relations container is rendered by Geoblacklight::Document::SidebarComponent
+#   instead. Applications that define their own BlacklightHelper are unaffected.
 module BlacklightHelper
   include Blacklight::BlacklightHelperBehavior
   include Geoblacklight::GeoblacklightHelperBehavior
   include Blacklight::CatalogHelperBehavior
 
+  # @deprecated
   def render_document_sidebar_partial(document = @document)
     super + (render "relations_container", document: document)
   end

data/app/helpers/carto_helper.rb

@@ -5,6 +5,7 @@ module CartoHelper
   # Creates a Carto OneClick link, using the configuration link
   # @param [String] file_link
   # @return [String]
+  # @deprecated
   def carto_link(file_link)
     params = URI.encode_www_form(
       file: file_link,
@@ -17,9 +18,13 @@ module CartoHelper
   ##
   # Removes blank space from provider to accomodate Carto OneClick
   #
+  # @deprecated
   def carto_provider
     application_name.delete(" ")
   end
+  Geoblacklight.deprecation.deprecate_methods(CartoHelper,
+    carto_link: "the Carto OneClick integration is removed without replacement in GeoBlacklight 5",
+    carto_provider: "the Carto OneClick integration is removed without replacement in GeoBlacklight 5")
 
   private
 

data/app/helpers/geoblacklight/geoblacklight_helper_behavior.rb

@@ -3,6 +3,9 @@
 ##
 # Adds helper behavior logic for GeoBlacklight, to used alongside
 # BlacklightHelperBehavior
+#
+# @deprecated This module is removed in GeoBlacklight 5. Search result
+#   presentation moved to Geoblacklight::SearchResultComponent.
 module Geoblacklight
   module GeoblacklightHelperBehavior
     include Blacklight::BlacklightHelperBehavior
@@ -11,8 +14,11 @@ module Geoblacklight
     # Calls the presenter on the requested method
     # @param [Symbol, String] presenting_method
     # @return [String]
+    # @deprecated
     def geoblacklight_present(presenting_method, document = @document)
-      document_presenter(document).try(presenting_method.to_sym) || ""
+      Geoblacklight.deprecation.silence { document_presenter(document).try(presenting_method.to_sym) } || ""
     end
+    Geoblacklight.deprecation.deprecate_methods(Geoblacklight::GeoblacklightHelperBehavior,
+      geoblacklight_present: "use Geoblacklight::SearchResultComponent instead")
   end
 end

data/app/helpers/geoblacklight_helper.rb

@@ -5,14 +5,20 @@ module GeoblacklightHelper
     @document.public? || (@document.same_institution? && user_signed_in?)
   end
 
+  # @deprecated
   def document_downloadable?
     document_available? && @document.downloadable?
   end
 
+  # @deprecated
   def iiif_jpg_url
     @document.references.iiif.endpoint.sub! "info.json", "full/full/0/default.jpg"
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    document_downloadable?: "use Geoblacklight::DownloadLinksComponent instead",
+    iiif_jpg_url: "use Geoblacklight::DownloadLinksComponent instead")
 
+  # @deprecated
   def download_link_file(label, id, url)
     link_to(
       label,
@@ -26,6 +32,7 @@ module GeoblacklightHelper
     )
   end
 
+  # @deprecated
   def download_link_hgl(text, document)
     link_to(
       text,
@@ -41,20 +48,24 @@ module GeoblacklightHelper
 
   # Generates the link markup for the IIIF JPEG download
   # @return [String]
+  # @deprecated
   def download_link_iiif
-    link_to(
-      download_text("JPG"),
-      iiif_jpg_url,
-      "contentUrl" => iiif_jpg_url,
-      :data => {
-        download: "trigger"
-      }
-    )
+    Geoblacklight.deprecation.silence do
+      link_to(
+        download_text("JPG"),
+        iiif_jpg_url,
+        "contentUrl" => iiif_jpg_url,
+        :data => {
+          download: "trigger"
+        }
+      )
+    end
   end
 
+  # @deprecated
   def download_link_generated(download_type, document)
     link_to(
-      t("geoblacklight.download.export_link", download_format: export_format_label(download_type)),
+      t("geoblacklight.download.export_link", download_format: Geoblacklight.deprecation.silence { export_format_label(download_type) }),
       "",
       data: {
         download_path: download_path(document.id, type: download_type),
@@ -64,6 +75,11 @@ module GeoblacklightHelper
       }
     )
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    download_link_file: "use Geoblacklight::DownloadLinksComponent instead",
+    download_link_iiif: "use Geoblacklight::DownloadLinksComponent instead",
+    download_link_generated: "use Geoblacklight::DownloadLinksComponent instead",
+    download_link_hgl: "the Harvard Geospatial Library download integration is removed without replacement in GeoBlacklight 5")
 
   ##
   # Blacklight catalog controller helper method to truncate field value to 150 chars
@@ -91,14 +107,19 @@ module GeoblacklightHelper
   ##
   # Looks up properly formatted names for formats
   #
+  # @deprecated
   def proper_case_format(format)
     t("geoblacklight.formats.#{format.to_s.parameterize(separator: "_")}")
   end
 
   # Format labels are customized for exports - look up the appropriate key.
+  # @deprecated
   def export_format_label(format)
     t("geoblacklight.download.export_#{format.to_s.parameterize(separator: "_")}_link")
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    proper_case_format: "use Geoblacklight::DownloadLinksComponent instead",
+    export_format_label: "use Geoblacklight::DownloadLinksComponent instead")
 
   ##
   # Looks up formatted names for references
@@ -111,15 +132,19 @@ module GeoblacklightHelper
   ##
   # Wraps download text with proper_case_format
   #
+  # @deprecated
   def download_text(format)
-    download_format = proper_case_format(format)
+    download_format = Geoblacklight.deprecation.silence { proper_case_format(format) }
     value = t("geoblacklight.download.download_link", download_format: download_format)
     value.html_safe
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    download_text: "use Geoblacklight::DownloadLinksComponent instead")
 
   ##
   # Deteremines if a feature should include help text popover
   # @return [Boolean]
+  # @deprecated
   def show_help_text?(feature, key)
     Settings&.HELP_TEXT&.send(feature)&.include?(key)
   end
@@ -127,6 +152,7 @@ module GeoblacklightHelper
   ##
   # Render help text popover for a given feature and translation key
   # @return [HTML tag]
+  # @deprecated
   def render_help_text_entry(feature, key)
     if I18n.exists?("geoblacklight.help_text.#{feature}.#{key}", locale)
       help_text = I18n.t("geoblacklight.help_text.#{feature}.#{key}")
@@ -139,20 +165,29 @@ module GeoblacklightHelper
       tag.span class: "help-text translation-missing"
     end
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    show_help_text?: "use Geoblacklight::ViewerHelpTextComponent instead",
+    render_help_text_entry: "use Geoblacklight::ViewerHelpTextComponent instead")
 
   ##
   # Determines if item view should render the sidebar static map
   # @return [Boolean]
+  # @deprecated
   def render_sidebar_map?(document)
-    Settings.SIDEBAR_STATIC_MAP&.any? { |vp| document.viewer_protocol == vp }
+    Geoblacklight.deprecation.silence { Settings.SIDEBAR_STATIC_MAP&.any? { |vp| document.viewer_protocol == vp } }
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    render_sidebar_map?: "use Geoblacklight::StaticMapComponent instead")
 
   ##
   # Deteremines if item view should include attribute table
   # @return [Boolean]
+  # @deprecated
   def show_attribute_table?
     document_available? && @document.inspectable?
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    show_attribute_table?: "use Geoblacklight::AttributeTableComponent instead")
 
   ##
   # Render value for a document's field as a truncate abstract
@@ -176,6 +211,7 @@ module GeoblacklightHelper
   # Renders the partials for a Geoblacklight::Reference in the web services
   # modal
   # @param [Geoblacklight::Reference]
+  # @deprecated
   def render_web_services(reference)
     render(
       partial: "web_services_#{reference.type}",
@@ -184,6 +220,8 @@ module GeoblacklightHelper
   rescue ActionView::MissingTemplate
     render partial: "web_services_default", locals: {reference: reference}
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    render_web_services: "use Geoblacklight::WebServicesComponent instead")
 
   ##
   # Returns a hash of the leaflet plugin settings to pass to the viewer.
@@ -246,28 +284,33 @@ module GeoblacklightHelper
     end
   end
 
+  # @deprecated
   def viewer_container
-    if openlayers_container?
-      ol_viewer
-    elsif iiif_manifest_container?
-      iiif_manifest_viewer
-    else
-      leaflet_viewer
+    Geoblacklight.deprecation.silence do
+      if openlayers_container?
+        ol_viewer
+      elsif iiif_manifest_container?
+        iiif_manifest_viewer
+      else
+        leaflet_viewer
+      end
     end
   end
 
+  # @deprecated
   def openlayers_container?
     return false unless @document
     @document.item_viewer.pmtiles || @document.item_viewer.cog
   end
 
+  # @deprecated
   def leaflet_viewer
     tag.div(nil,
       id: "map",
       data: {
-        :map => "item", :protocol => @document.viewer_protocol.camelize,
+        :map => "item", :protocol => Geoblacklight.deprecation.silence { @document.viewer_protocol }.camelize,
         :url => @document.viewer_endpoint,
-        "layer-id" => @document.wxs_identifier,
+        "layer-id" => Geoblacklight.deprecation.silence { @document.wxs_identifier },
         "map-geom" => @document.geometry.geojson,
         "catalog-path" => search_catalog_path,
         :available => document_available?,
@@ -276,13 +319,14 @@ module GeoblacklightHelper
       })
   end
 
+  # @deprecated
   def ol_viewer
     tag.div(nil,
       id: "ol-map",
       data: {
-        :map => "item", :protocol => @document.viewer_protocol.camelize,
+        :map => "item", :protocol => Geoblacklight.deprecation.silence { @document.viewer_protocol }.camelize,
         :url => @document.viewer_endpoint,
-        "layer-id" => @document.wxs_identifier,
+        "layer-id" => Geoblacklight.deprecation.silence { @document.wxs_identifier },
         "map-geom" => @document.geometry.geojson,
         "catalog-path" => search_catalog_path,
         :available => document_available?,
@@ -291,12 +335,21 @@ module GeoblacklightHelper
       })
   end
 
+  # @deprecated
   def iiif_manifest_container?
     return false unless @document
     @document&.item_viewer&.viewer_preference&.key?(:iiif_manifest)
   end
 
+  # @deprecated
   def iiif_manifest_viewer
     tag.div(nil, id: "clover-viewer", iiif_content: @document.viewer_endpoint)
   end
+  Geoblacklight.deprecation.deprecate_methods(GeoblacklightHelper,
+    viewer_container: "use Geoblacklight::ItemMapViewerComponent instead",
+    openlayers_container?: "use Geoblacklight::ItemMapViewerComponent instead",
+    leaflet_viewer: "use Geoblacklight::ItemMapViewerComponent instead",
+    ol_viewer: "use Geoblacklight::ItemMapViewerComponent instead",
+    iiif_manifest_container?: "use Geoblacklight::ItemMapViewerComponent instead",
+    iiif_manifest_viewer: "use Geoblacklight::ItemMapViewerComponent instead")
 end

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

@@ -4,14 +4,21 @@ module Geoblacklight
   module SolrDocument
     ##
     # Module for providing external Carto download references for a document
+    #
+    # @deprecated The Carto OneClick integration is removed without replacement
+    #   in GeoBlacklight 5. Remove the `:carto` show tools partial from your
+    #   CatalogController before upgrading.
     module Carto
       ##
       # Returns a url to a file that should be used with CartoDB integration
       # @return [String]
+      # @deprecated
       def carto_reference
         return unless public? && download_types.try(:[], :geojson).present?
         Geoblacklight::GeojsonDownload.new(self).url_with_params
       end
+      Geoblacklight.deprecation.deprecate_methods(Geoblacklight::SolrDocument::Carto,
+        carto_reference: "the Carto OneClick integration is removed without replacement in GeoBlacklight 5")
     end
   end
 end

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

@@ -6,6 +6,13 @@ module Geoblacklight
       include ActionView::Helpers::OutputSafetyHelper
 
       def geoblacklight_citation(solr_document_url)
+        if Array(self[Settings.FIELDS.PUBLISHER]).size > 1
+          Geoblacklight.deprecation.warn(
+            "Geoblacklight::SolrDocument::Citation#geoblacklight_citation includes every value of " \
+            "#{Settings.FIELDS.PUBLISHER}; GeoBlacklight 5 reads the publisher as a single value and keeps " \
+            "only the first, so citations for this document will lose its other publishers"
+          )
+        end
         [
           fetch(Settings.FIELDS.CREATOR, nil),
           ("(#{issued})" if issued),

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

@@ -10,7 +10,7 @@ module Geoblacklight
       # @return [Boolean]
       def inspectable?
         %w[wms feature_layer dynamic_map_layer tiled_map_layer]
-          .include? viewer_protocol
+          .include? Geoblacklight.deprecation.silence { viewer_protocol }
       end
     end
   end

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

@@ -24,6 +24,13 @@ module Geoblacklight
     end
 
     def restricted?
+      if key?(Settings.FIELDS.ACCESS_RIGHTS) && self[Settings.FIELDS.ACCESS_RIGHTS].blank?
+        Geoblacklight.deprecation.warn(
+          "Geoblacklight::SolrDocument#restricted? returns true for a document whose " \
+          "#{Settings.FIELDS.ACCESS_RIGHTS} is present but blank; GeoBlacklight 5 returns false for the " \
+          "same document, because it tests the value for nil rather than for blankness"
+        )
+      end
       rights_field_data.blank? || rights_field_data.casecmp("restricted").zero?
     end
 
@@ -43,9 +50,14 @@ module Geoblacklight
       fetch(Settings.FIELDS.DISPLAY_NOTE, "")
     end
 
+    # @deprecated
     def hgl_download
-      references.hgl.to_hash if references.hgl.present?
+      Geoblacklight.deprecation.silence do
+        references.hgl.to_hash if references.hgl.present?
+      end
     end
+    Geoblacklight.deprecation.deprecate_methods(Geoblacklight::SolrDocument,
+      hgl_download: "the Harvard Geospatial Library download integration is removed without replacement in GeoBlacklight 5")
 
     def oembed
       references.oembed.endpoint if references.oembed.present?
@@ -76,14 +88,16 @@ module Geoblacklight
     end
 
     def geom_field
+      warn_about_blank_default(Settings.FIELDS.GEOMETRY, "geom_field")
       fetch(Settings.FIELDS.GEOMETRY, "")
     end
 
     def geometry
-      @geometry ||= Geoblacklight::Geometry.new(geom_field)
+      @geometry ||= Geoblacklight::Geometry.new(Geoblacklight.deprecation.silence { geom_field })
     end
 
     def wxs_identifier
+      warn_about_blank_default(Settings.FIELDS.WXS_IDENTIFIER, "wxs_identifier")
       fetch(Settings.FIELDS.WXS_IDENTIFIER, "")
     end
 
@@ -103,6 +117,20 @@ module Geoblacklight
 
     private
 
+    ##
+    # In GeoBlacklight 5 these readers are Blacklight `attribute` declarations, which
+    # return nil rather than "" when the Solr field is missing.
+    # @param field [String] the Solr field backing the reader
+    # @param reader [String] the name of the reader, for the warning
+    def warn_about_blank_default(field, reader)
+      return if key?(field)
+
+      Geoblacklight.deprecation.warn(
+        "Geoblacklight::SolrDocument##{reader} returns \"\" for a document with no #{field}; " \
+        "GeoBlacklight 5 returns nil instead, so calls like ##{reader}.empty? or ##{reader}.split will raise"
+      )
+    end
+
     def rights_field_data
       fetch(Settings.FIELDS.ACCESS_RIGHTS, "")
     end

data/app/presenters/geoblacklight/document_presenter.rb

@@ -3,6 +3,11 @@
 module Geoblacklight
   ##
   # Adds custom functionality for Geoblacklight document presentation
+  #
+  # @deprecated This class is removed in GeoBlacklight 5. Applications that set
+  #   `config.index.document_presenter_class = Geoblacklight::DocumentPresenter`
+  #   in their CatalogController must drop that line, because the constant no
+  #   longer exists.
   class DocumentPresenter < Blacklight::IndexPresenter
     include ActionView::Helpers::OutputSafetyHelper
     ##
@@ -10,6 +15,7 @@ module Geoblacklight
     # configured helper_method. Multivalued fields separated by presenter
     # field_value_separator (default: comma). Fields separated by period.
     # @return [String]
+    # @deprecated
     def index_fields_display
       fields_values = []
       @configuration.index_fields.each do |_field_name, field_config|
@@ -21,5 +27,7 @@ module Geoblacklight
       end
       safe_join(fields_values, " ")
     end
+    Geoblacklight.deprecation.deprecate_methods(Geoblacklight::DocumentPresenter,
+      index_fields_display: "use Geoblacklight::SearchResultComponent instead")
   end
 end

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

@@ -1,4 +1,4 @@
 <% document ||= @document %>
-<%= link_to(arcgis_link(document.arcgis_urls)) do %>
+<%= link_to(Geoblacklight.deprecation.silence { arcgis_link(document.arcgis_urls) }) do %>
   <%= blacklight_icon('esri-globe') %><%= t('geoblacklight.tools.open_arcgis') %>
 <% end %>

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

@@ -1,4 +1,4 @@
 <% document ||= @document %>
-<%= link_to carto_link(document.carto_reference), target: '_blank' do %>
+<%= link_to Geoblacklight.deprecation.silence { carto_link(document.carto_reference) }, target: '_blank' do %>
   <span class='geoblacklight geoblacklight-carto'></span><%= t('geoblacklight.tools.open_carto') %>
 <% end %>

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

@@ -1,3 +1,5 @@
+<%# This template is removed in GeoBlacklight 5. The deprecated download 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 %>
 <%# Renders the options of the downloads dropdown button %>
 <% document ||= @document %>
 
@@ -25,3 +27,4 @@
     <%= download_link_generated(type.first, document) %>
   <% end %>
 <% end %>
+<% end %>

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

@@ -24,7 +24,7 @@
 <div class='more-info-area'>
   <div id="doc-<%= document.id %>-fields-collapse" class='collapse'>
     <small itemprop="description">
-      <%= geoblacklight_present(:index_fields_display, document) %>
+      <%= Geoblacklight.deprecation.silence { geoblacklight_present(:index_fields_display, document) } %>
     </small>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-<% if show_attribute_table? %>
+<% if Geoblacklight.deprecation.silence { show_attribute_table? } %>
   <div class='row'>
     <div id='table-container' class='col-md-12'>
       <table id="attribute-table" class="table table-hover table-condensed table-striped table-bordered col-md-12">

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

@@ -2,8 +2,8 @@
 <div class='row'>
   <div id='viewer-container' class="col-md-12">
 
-    <% if show_help_text?('viewer_protocol', document.viewer_protocol) %>
-      <%= render_help_text_entry('viewer_protocol', document.viewer_protocol) %>
+    <% if Geoblacklight.deprecation.silence { show_help_text?('viewer_protocol', document.viewer_protocol) } %>
+      <%= Geoblacklight.deprecation.silence { render_help_text_entry('viewer_protocol', document.viewer_protocol) } %>
     <% end %>
 
     <% if document.item_viewer.index_map %>
@@ -23,6 +23,6 @@
       </div>
     <% end %>
 
-    <%= viewer_container %>
+    <%= Geoblacklight.deprecation.silence { viewer_container } %>
   </div>
 </div>

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

@@ -1,3 +1,5 @@
+<%# This template is removed in GeoBlacklight 5. The deprecated download 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 ||= @document %>
 
 <% if document_downloadable? %>
@@ -21,3 +23,4 @@
     </div>
   </div>
 <% end %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'show_sidebar_static_map' if render_sidebar_map?(@document) %>
+<%= render :partial => 'show_sidebar_static_map' if Geoblacklight.deprecation.silence { render_sidebar_map?(@document) } %>
 <%= render :partial => 'show_tools' %>
 
 <div class="sidebar-buttons">

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

@@ -1,3 +1,5 @@
+<%# Rendered by GeoBlacklight itself, so the deprecated helpers and accessors it calls are silenced here; Geoblacklight::DeprecatedConfiguration warns at boot if an application overrides it. %>
+<% Geoblacklight.deprecation.silence do %>
 <div class="card">
   <div class="card-header">
     <%= I18n.t('geoblacklight.location') %>
@@ -8,3 +10,4 @@
     <% end %>
   </div>
 </div>
+<% end %>

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

@@ -3,7 +3,7 @@
 <% document.references.refs.each do |reference| %>
   <% if Settings.WEBSERVICES_SHOWN.include? reference.type.to_s %>
     <div class="web-services-modal-entry">
-      <%= render_web_services(reference) %>
+      <%= Geoblacklight.deprecation.silence { render_web_services(reference) } %>
     </div>
   <% end %>
 <% end %>