geoblacklight 5.2.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32b1f6b2ee7ddbd7ba16adc14ddad99cb87a9294004dfe7337ed0084626d1202
-  data.tar.gz: 3dfb956c7f0f3236671a65d9b3b8aea8135f473a388236b8879b0fdca064e310
+  metadata.gz: 1ece9d6b515fa64010cbc158c72b17ae35e019a842e83700e68650f7d6cb0a98
+  data.tar.gz: 268d83c2130ce59ac765ec0764164e3c081d7e62beedfe8494968ce8a74ba22c
 SHA512:
-  metadata.gz: a8f1c491b83df2cf7c3ca22b8239c718697eb9e9aa3596255e2bd2c6b59ee85d79ee04bbc70c8fac9fe9bd20f9d9ed56519184898d4e6bfa21adc3a2b7261728
-  data.tar.gz: 24f5d3148d558ffe6a2c8845419228bc51bf64d7277fa1ae7aad8e920341851cf02a91cb699cc7080dd7a27ea6c62d415d91620b0744b92bd9d8148cbe917362
+  metadata.gz: ee73a4e5fb22a94dd6b0f6010ec8259b360ebec2b99c007545b1bfedecc52a9e4296eee9d40af1d125d8771e11d15d9997bd9c8ac3deec5d05630fac542c0cad
+  data.tar.gz: e8658148c4a9289b38ed5258ad50b9538f8fea43d2d1733d0d05bf46fa0fe5e1868c291f62d0a771d3f3165b829d109fff5d6700e06638c871fe15c444bf38b7

data/.github/workflows/ruby.yml

@@ -39,13 +39,13 @@ jobs:
       matrix:
         ruby_version: ["3.2", "3.3", "3.4"]
         rails_version: ["7.2.3", "8.1.1"]
-        asset_pipeline: ["vite"]
-        additional_engine_cart_rails_options: ["--js rollup"]
+        asset_pipeline: ["importmap"]
+        additional_engine_cart_rails_options: ["--js importmap"]
         include:
           - ruby_version: "3.4"
             rails_version: "8.1.1"
-            asset_pipeline: "importmap"
-            additional_engine_cart_rails_options: "--js importmap"
+            asset_pipeline: "vite"
+            additional_engine_cart_rails_options: "--js rollup"
 
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / ${{ matrix.asset_pipeline }}
     steps:

data/app/assets/stylesheets/geoblacklight/modules/item.scss

@@ -49,13 +49,30 @@
     -webkit-line-clamp: 8;
   }
 
-  #table-container{
-    overflow:scroll;
-    max-height: 450px;
+  #table-container {
     margin-bottom: 1rem;
 
     table {
       margin-bottom: 0px;
     }
   }
+
+  .attribute-data {
+    --bs-accordion-active-bg: none;
+  }
+
+  .sidebar-container {
+    width: 25vw;
+    overflow: scroll;
+    overscroll-behavior: contain;
+
+    img {
+      width: 100%;
+    }
+
+    @media screen and (max-width: breakpoint-max(sm)) {
+      width: calc(100vw - 100px);
+      max-height: 20vh!important;
+    }
+  }
 }

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

@@ -0,0 +1,16 @@
+<div data-sidebar="<%= Settings.LEAFLET.SIDEBAR %>">
+  <div class="accordion attribute-data<% if Settings.LEAFLET.SIDEBAR %> sidebar-container<% end %>">
+    <div class="accordion-item">
+      <h2 class="accordion-header" id="accordionHeading">
+        <button class="accordion-button p-2 border-none bg-none" type="button" data-bs-toggle="collapse" data-bs-target="#<%= @id %>" aria-expanded="true" aria-controls="<%= @id %>">
+          <%= @title %>
+        </button>
+      </h2>
+      <div id="<%= @id %>" class="accordion-collapse collapse show" aria-labelledby="accordionHeading" data-bs-parent="#accordionHeading">
+        <div class="accordion-body p-0">
+          <%= content %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/components/geoblacklight/accordion_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class AccordionComponent < ViewComponent::Base
+    def initialize(id:, title:)
+      @id = id
+      @title = title
+      super()
+    end
+  end
+end

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

@@ -1,17 +1,15 @@
-<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">
-      <thead>
-        <tr>
-          <th><%= t('geoblacklight.show.attribute') %></th>
-          <th><%= t('geoblacklight.show.value') %></th>
-        </tr>
-      </thead>
-      <tbody class='attribute-table-body'>
-        <tr>
-          <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>
+<%= render Geoblacklight::AccordionComponent.new(id: 'attribute-table', title: t('geoblacklight.show.table_name')) do  %>
+  <table id="attribute-table" class="table table-hover table-condensed table-striped mb-0 collapse show">
+    <thead>
+      <tr>
+        <th><%= t('geoblacklight.show.attribute') %></th>
+        <th><%= t('geoblacklight.show.value') %></th>
+      </tr>
+    </thead>
+    <tbody class='attribute-table-body'>
+      <tr>
+        <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
+      </tr>
+    </tbody>
+  </table>
+<% end %>

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/index_map_inspect_component.html.erb

@@ -1,4 +1,5 @@
-<div class='row'>
-  <div class='viewer-information col-sm-12'>
+<%= render Geoblacklight::AccordionComponent.new(id: 'index-map-attributes', title: t('geoblacklight.show.table_name')) do  %>
+  <div class='viewer-information px-3'>
+    <em><%= t('geoblacklight.show.click_map') %></em>
   </div>
-</div>
+<% end %>

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

@@ -1,5 +1,5 @@
 import { Icon, Control } from "leaflet";
-import "leaflet-fullscreen";
+import { FullScreen } from "leaflet.fullscreen";
 import { layerGroup, polygon, map, tileLayer } from "leaflet";
 import { imageMapLayer } from "esri-leaflet";
 import { Controller } from "@hotwired/stimulus";
@@ -23,6 +23,7 @@ import {
 } from "geoblacklight/leaflet/layers";
 import { geoJSONToBounds } from "geoblacklight/leaflet/utils";
 import { DEFAULT_BOUNDS, DEFAULT_OPACITY, DEFAULT_GEOM_OVERLAY_OPTIONS } from "geoblacklight/leaflet/constants";
+import sidebarControl from "geoblacklight/leaflet/controls/sidebar";
 
 export default class LeafletViewerController extends Controller {
   static values = {
@@ -109,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
@@ -146,7 +162,7 @@ export default class LeafletViewerController extends Controller {
     if (controlName == "Opacity")
       return new LayerOpacityControl(this.previewOverlay);
     if (controlName == "Fullscreen")
-      return new Control.Fullscreen({ position: "topright", ...controlOptions });
+      return new FullScreen({ position: "bottomleft", ...controlOptions });
     if (controlName == "Geosearch")
       return new GeoSearchControl({ baseUrl: this.catalogBaseUrlValue, ...controlOptions });
     console.error(`Unsupported control name: "${controlName}"`);
@@ -179,10 +195,23 @@ export default class LeafletViewerController extends Controller {
     if (this.boundsOverlay) this.overlay.removeLayer(this.boundsOverlay);
   }
 
+  setUpSidebar() {
+    const sidebar = document.querySelector('[data-sidebar]')
+    if (!sidebar || sidebar.dataset.sidebar != 'true') return;
+    const control = new sidebarControl({
+      position: 'topright',
+      sidebar
+    });
+    this.map.addControl(control);
+  }
+
   addInspection() {
+    const inspectionProtocols = ['Wms', 'FeatureLayer', 'DynamicMapLayer', 'IndexMap']
+    if (!inspectionProtocols.includes(this.protocolValue)) return;
+    this.setUpSidebar();
     if (this.protocolValue == "Wms") return wmsInspection(this.map, this.urlValue, this.layerIdValue, this.previewOverlay);
     if (this.protocolValue == "FeatureLayer") return featureLayerInspection(this.map, this.previewOverlay);
-    if (this.protocolValue  == "DynamicMapLayer") return dynamicMapLayerInspection(this.map, this.previewOverlay, this.layerIdValue)
+    if (this.protocolValue  == "DynamicMapLayer") return dynamicMapLayerInspection(this.map, this.previewOverlay, this.layerIdValue);
     // TODO: TiledMapLayer is converted but seems busted -- see layers.js. Don't know what to test it with, need a fixture.
     // if (this.protocolValue == "TiledMapLayer") return tiledMapLayerInspection(this.map, this.previewOverlay);
   }

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/controls/sidebar.js

@@ -0,0 +1,47 @@
+import { Control } from "leaflet";
+
+export default class sidebarControl extends Control {
+  constructor(options) {
+    const _options = { ...options };
+    super(_options);
+  }
+
+  onAdd(map) {
+    var div = L.DomUtil.create('div', 'leaflet-sidebar');
+    div.setAttribute("tabindex", "0");
+    const sidebarContainer = this.options.sidebar;
+
+    // Disable zoom when the mouse enters the sidebar
+    div.addEventListener('mouseenter', function() {
+      map.scrollWheelZoom.disable();
+    });
+
+    div.addEventListener('touchstart', function() {
+      map.touchZoom.disable();
+      map.dragging.disable();
+    });
+
+    // without this the map will try to find data about whatever is behind the sidebar
+    div.addEventListener('click', function(event) {
+      event.stopPropagation();
+    });
+
+    // Enable zoom when the mouse leaves the sidebar
+    div.addEventListener('touchend', function() {
+      map.touchZoom.enable();
+      map.dragging.enable();
+    });
+
+    // Enable zoom when the mouse leaes the sidebar
+    div.addEventListener('mouseleave', function() {
+      map.scrollWheelZoom.enable();
+    });
+
+    if (!sidebarContainer) { return };
+    // Make sure table height is same as map (with a little padding)
+    sidebarContainer.children[0].style.maxHeight = `${map._container.offsetHeight - 30}px`;
+    div.innerHTML = sidebarContainer.innerHTML;
+    sidebarContainer.remove();
+    return div;
+  }
+}

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) => {