geoblacklight 4.0.0.pre.alpha.2 → 4.0.0.pre.rc2

data/app/assets/images/blacklight/imagery.svg

@@ -0,0 +1,4 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="34" height="32" viewBox="0 0 34 32">
+<path fill="#6c757d" d="M11.429 10.286c0 1.894-1.535 3.429-3.429 3.429s-3.429-1.535-3.429-3.429v0c0-1.894 1.535-3.429 3.429-3.429s3.429 1.535 3.429 3.429v0zM29.714 17.143v8h-25.143v-3.429l5.714-5.714 2.857 2.857 9.143-9.143zM31.429 4.571h-28.571c-0.309 0-0.571 0.263-0.571 0.571v21.714c0 0.309 0.263 0.571 0.571 0.571h28.571c0.309 0 0.571-0.263 0.571-0.571v-21.714c0-0.309-0.263-0.571-0.571-0.571zM34.286 5.143v21.714c0 1.578-1.279 2.857-2.857 2.857v0h-28.571c-1.578 0-2.857-1.279-2.857-2.857v0-21.714c0-1.578 1.279-2.857 2.857-2.857v0h28.571c1.578 0 2.857 1.279 2.857 2.857v0z"></path>
+</svg>

data/app/assets/images/blacklight/maps.svg

@@ -0,0 +1,4 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<path fill="#6c757d" d="M9.143 0c0.309 0 0.571 0.263 0.571 0.571v26.286c-0.002 0.218-0.125 0.406-0.305 0.501l-0.003 0.002-8.571 4.571c-0.073 0.043-0.16 0.069-0.254 0.069-0.003 0-0.006-0-0.010-0h0c-0.313-0.006-0.565-0.258-0.571-0.571v-26.286c0-0.217 0.114-0.411 0.309-0.503l8.571-4.571c0.073-0.043 0.16-0.069 0.254-0.069 0.003 0 0.006 0 0.010 0h-0zM31.429 0c0.309 0 0.571 0.263 0.571 0.571v26.286c-0.002 0.218-0.125 0.406-0.305 0.501l-0.003 0.002-8.571 4.571c-0.073 0.043-0.16 0.069-0.254 0.069-0.003 0-0.006-0-0.010-0h0c-0.313-0.006-0.565-0.258-0.571-0.571v-26.286c0-0.217 0.114-0.411 0.309-0.503l8.571-4.571c0.073-0.043 0.16-0.069 0.254-0.069 0.003 0 0.006 0 0.010 0h-0zM11.429 0c0.001 0 0.002 0 0.002 0 0.091 0 0.176 0.021 0.252 0.059l-0.003-0.002 9.143 4.571c0.194 0.114 0.32 0.297 0.32 0.514v26.286c0 0 0 0.001 0 0.001 0 0.316-0.256 0.571-0.571 0.571-0.092 0-0.178-0.022-0.255-0.060l0.003 0.002-9.143-4.571c-0.188-0.099-0.315-0.291-0.32-0.514v-26.286c0-0.309 0.263-0.571 0.571-0.571z"></path>
+</svg>

data/app/assets/images/blacklight/parent-item.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 32">
+  <path fill="#6c757d" d="M24 19.54c-3.44 8.55-11.7 3.38-11.7 3.38-2.53 5.11-6.7 8.4-11.53 8.42-1 0-1.04-1.53 0-1.53 4.02-.02 7.53-2.67 9.82-6.88-2.57 1-7.4 1.75-10.1-5.13 6.82-2.81 9.95.7 11.15 2.84a22.68 22.68 0 0 0 1.35-4.98s-8.73 1.37-9.35-6.13c7.45-3 9.54 4.8 9.54 4.8.1-1.05.2-3.3.2-3.35 0 0-6.64-4.6-2.37-10.32 7.78 2.69 3.83 10.15 3.83 10.15.03.1.03 1.49 0 2.09 0 0 2.83-5.57 8.53-3.6-.26 8.38-8.87 6.65-8.87 6.65-.28 1.71-.7 3.34-1.25 4.85 0 0 5.19-5.74 10.75-1.25z"/>
+</svg>

data/app/assets/images/blacklight/university-of-colorado-boulder.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 59.6 57.6">
+  <path fill="#6c757d" d="M47.4,57.6H24.4l-8.2-8.1v-6.1H8.1L0,35.3V8.1L8.1,0h27.2l8.1,8.1v6.1h16.2v15h-4v20.3L47.4,57.6z M24.9,56.3
+	h22l7.4-7.3V28h4V15.5H42.1V8.6l-7.3-7.3H8.6L1.3,8.6v26.1l7.4,7.3h8.8V49L24.9,56.3z M44,17.6V46H27.8v-6.1h6.1l6.1-6.1v-8.1h-8.1
+	v6h-4V17.6H15.6v8.1h4v6h-8.1V11.5h20.3v6.1H40V9.5l-6.1-6.1H9.5L3.4,9.5v24.3l6.1,6.1h10.1V48l6.2,6.1H46l6.2-6.1V25.8h4v-8.1
+	C56.1,17.6,44,17.6,44,17.6z"/>
+</svg>

data/app/assets/images/blacklight/websites.svg

@@ -0,0 +1,4 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<path fill="#6c757d" d="M25.143 16.571v5.714c0 2.84-2.303 5.143-5.143 5.143v0h-14.857c-2.84 0-5.143-2.303-5.143-5.143v0-14.857c0-2.84 2.303-5.143 5.143-5.143v0h12.571c0.32 0 0.571 0.251 0.571 0.571v1.143c0 0.316-0.256 0.571-0.571 0.571v0h-12.571c-1.578 0-2.857 1.279-2.857 2.857v0 14.857c0 1.578 1.279 2.857 2.857 2.857v0h14.857c1.578 0 2.857-1.279 2.857-2.857v0-5.714c0-0.32 0.251-0.571 0.571-0.571h1.143c0.32 0 0.571 0.251 0.571 0.571zM32 1.143v9.143c0 0.631-0.512 1.143-1.143 1.143v0c-0.314-0.003-0.597-0.134-0.8-0.343l-3.143-3.143-11.646 11.646c-0.114 0.114-0.263 0.183-0.411 0.183s-0.297-0.080-0.411-0.183l-2.034-2.034c-0.114-0.114-0.171-0.263-0.171-0.411s0.069-0.309 0.171-0.411l11.646-11.646-3.143-3.143c-0.208-0.204-0.338-0.486-0.343-0.799v-0.001c0-0.631 0.512-1.143 1.143-1.143v0h9.143c0.631 0 1.143 0.512 1.143 1.143v0z"></path>
+</svg>

data/app/assets/javascripts/geoblacklight/controls/fullscreen.js

@@ -0,0 +1,8 @@
+/*global GeoBlacklight */
+
+// Leaflet fullscreen control.
+GeoBlacklight.Controls.Fullscreen = function() {
+  this.map.addControl(new L.Control.Fullscreen({
+    position: 'topright'
+  }));
+};

data/app/assets/javascripts/geoblacklight/geoblacklight.js

@@ -1,4 +1,5 @@
-//= require leaflet
+//= require leaflet-src
+//= require Leaflet.fullscreen
 //= require native.history
 //= require_tree ./templates
 

data/app/assets/javascripts/geoblacklight/viewers/esri.js

@@ -20,6 +20,7 @@ GeoBlacklight.Viewer.Esri = GeoBlacklight.Viewer.Map.extend({
 
     // remove any trailing slash from endpoint url
     _this.data.url = _this.data.url.replace(/\/$/, '');
+
     L.esri.get(_this.data.url, {}, function(error, response){
       if(!error) {
         _this.layerInfo = response;

data/app/assets/javascripts/geoblacklight/viewers/index_map.js

@@ -7,6 +7,7 @@ GeoBlacklight.Viewer.IndexMap = GeoBlacklight.Viewer.Map.extend({
 
     if (this.data.available) {
       this.addPreviewLayer();
+      this.loadControls();
     } else {
       this.addBoundsOverlay(this.options.bbox);
     }

data/app/assets/javascripts/geoblacklight/viewers/tilejson.js

@@ -0,0 +1,33 @@
+//= require geoblacklight/viewers/wms
+
+GeoBlacklight.Viewer.Tilejson = GeoBlacklight.Viewer.Wms.extend({
+
+  addPreviewLayer: function() {
+    var _this = this;
+    fetch(this.data.url).then(function(response) {
+      if (!response.ok) {
+          throw new Error("Unable to fetch tile.json document");
+      }
+      return response.json();
+    }).then(function(tilejson) {
+      var bounds = _this.getBounds(tilejson),
+          options = bounds ? { bounds: bounds } : {},
+          url = tilejson.tiles[0],
+          tileJsonLayer = L.tileLayer(url, options);
+      _this.overlay.addLayer(tileJsonLayer);
+    }).catch(function(error) {
+      console.debug(error);
+    });
+  },
+
+  getBounds: function(doc) {
+    // Get the bounds from the document, if they exist, and
+    // convert to a Leaflet latlngBounds object
+    var bounds = doc.bounds;
+    if(bounds) {
+      var corner1 = L.latLng(bounds[1], bounds[0]),
+          corner2 = L.latLng(bounds[3], bounds[2]);
+      return L.latLngBounds(corner1, corner2);
+    }
+  }
+});

data/app/assets/javascripts/geoblacklight/viewers/tms.js

@@ -4,7 +4,7 @@ GeoBlacklight.Viewer.Tms = GeoBlacklight.Viewer.Wms.extend({
 
   addPreviewLayer: function() {
     var _this = this;
-    var wmtsLayer = L.tileLayer(this.data.url);
-    this.overlay.addLayer(wmtsLayer);
+    var tmsLayer = L.tileLayer(this.data.url, { tms: true });
+    this.overlay.addLayer(tmsLayer);
   }
 });

data/app/assets/javascripts/geoblacklight/viewers/viewer.js

@@ -10,6 +10,9 @@ GeoBlacklight.Viewer = L.Class.extend({
 
     L.Util.setOptions(this, options);
 
+    // Sets leaflet icon paths to ex. /assets/marker-icon-2x-rails-fingerprint
+    L.Icon.Default.imagePath = '..';
+
     // trigger viewer load functions
     this.load();
   },

data/app/assets/javascripts/geoblacklight/viewers/wms.js

@@ -40,8 +40,8 @@ GeoBlacklight.Viewer.Wms = GeoBlacklight.Viewer.Map.extend({
         URL: _this.data.url,
         LAYERS: _this.data.layerId,
         BBOX: _this.map.getBounds().toBBoxString(),
-        WIDTH: $('#map').width(),
-        HEIGHT: $('#map').height(),
+        WIDTH: Math.round($('#map').width()),
+        HEIGHT: Math.round($('#map').height()),
         QUERY_LAYERS: _this.data.layerId,
         X: Math.round(e.containerPoint.x),
         Y: Math.round(e.containerPoint.y)

data/app/assets/javascripts/geoblacklight/viewers/wmts.js

@@ -0,0 +1,85 @@
+//= require geoblacklight/viewers/wms
+
+GeoBlacklight.Viewer.Wmts = GeoBlacklight.Viewer.Wms.extend({
+
+  addPreviewLayer: function() {
+    var _this = this;
+    fetch(this.data.url).then(function(response) {
+      if (!response.ok) {
+          throw new Error("Unable to fetch WMTSCapabilities document");
+      }
+      return response.text();
+    }).then(function(wmtsCapabilities) {
+      var tileInfo = _this.parseCapabilities(wmtsCapabilities),
+          options = tileInfo.bounds ? { bounds: tileInfo.bounds } : {},
+          tileLayer = L.tileLayer(tileInfo.url, options);
+      _this.overlay.addLayer(tileLayer);
+    }).catch(function(error) {
+      console.debug(error);
+    });
+  },
+
+  parseCapabilities: function(wmtsCapabilities) {
+    var parser = new DOMParser(),
+        doc = parser.parseFromString(wmtsCapabilities, "application/xml"),
+        layers = doc.getElementsByTagName("Layer"),
+        selectedLayer = this.findLayer(layers),
+        resourceElement = selectedLayer.getElementsByTagName("ResourceURL")[0];
+
+    // Generate URL with Leaflet.TileLayer URL template formatting
+    var tileURL = resourceElement.getAttribute("template")
+      .replace("{Style}", this.getStyle(selectedLayer))
+      .replace("{TileMatrixSet}", this.getTileMatrixSet(selectedLayer))
+      .replace("TileMatrix", "z")
+      .replace("TileCol","x")
+      .replace("TileRow","y");
+
+    return { url: tileURL, bounds: this.getBounds(selectedLayer) };
+  },
+
+  findLayer: function(layers) {
+    if (layers.length === 1) {
+      // If there is only one layer in the document, return it
+      return layers[0];
+    } else {
+      // Search each layer for an identifier that matches the
+      // layerId and return it
+      for (i = 0; i < layers.length; i++) {
+        var ids = layers[i].getElementsByTagName("ows:Identifier");
+        for(x = 0; x < ids.length; x++) {
+          if (ids[x].textContent === this.data.layerId) {
+            return layers[i];
+          }
+        }
+      }
+    }
+  },
+
+  getStyle: function(layer) {
+    var styleElement = layer.getElementsByTagName("Style")[0];
+    if(styleElement) {
+      return styleElement.getElementsByTagName("ows:Identifier")[0].textContent;
+    }
+  },
+
+  getTileMatrixSet: function(layer) {
+    var tileMatrixElement = layer.getElementsByTagName("TileMatrixSet")[0];
+    if(tileMatrixElement) {
+      return tileMatrixElement.textContent;
+    }
+  },
+
+  getBounds: function(layer) {
+    // Get the layer's lower corner and upper corner values,
+    // if they exist, and convert to a Leaflet latlngBounds object
+    var lcElement = layer.getElementsByTagName("ows:LowerCorner")[0],
+        ucElement = layer.getElementsByTagName("ows:UpperCorner")[0];
+    if(lcElement && ucElement) {
+      var lc = lcElement.textContent.split(" "),
+          uc = ucElement.textContent.split(" "),
+          corner1 = L.latLng(lc[1], lc[0]),
+          corner2 = L.latLng(uc[1], uc[0]);
+      return L.latLngBounds(corner1, corner2);
+    }
+  }
+});

data/app/assets/javascripts/geoblacklight/viewers/xyz.js

@@ -0,0 +1,10 @@
+//= require geoblacklight/viewers/wms
+
+GeoBlacklight.Viewer.Xyz = GeoBlacklight.Viewer.Wms.extend({
+
+  addPreviewLayer: function() {
+    var _this = this;
+    var xyzLayer = L.tileLayer(this.data.url);
+    this.overlay.addLayer(xyzLayer);
+  }
+});

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

@@ -1,2 +1,3 @@
 @import 'leaflet';
+@import 'leaflet.fullscreen';
 @import 'modules/base';

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

@@ -10,7 +10,6 @@
  *
  */
 
-@import 'styles';
 @import 'facets';
 @import 'mixins';
 @import 'icon-customization';

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

@@ -1,5 +1,9 @@
 #table-container{
   overflow:scroll;
-  margin-top: 20px;
   max-height: 450px;
+  margin-bottom: 1rem;
+
+  table {
+    margin-bottom: 0px;
+  }
 }

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

@@ -1,6 +1,22 @@
-// Common styling for the Downloads, Export, and Authentication cards
-.downloads,
-.card.exports,
+// Styling for Download and Web services buttons
+.sidebar-btn {
+  width: 100%;
+
+  + #downloads-collapse {
+    width: 100%;
+  }
+}
+
+/* match bottom margin on tools card */
+.sidebar-buttons {
+  margin-bottom: 20px;
+}
+
+.sidebar-buttons div + div {
+  margin-top: 10px;
+}
+
+// Styling for the Authentication card
 .authentication {
   @include sidebar-children;
 
@@ -20,8 +36,7 @@
 }
 
 // This section could be eliminated if we update the Authentication card
-// to follow the pattern of Dowloads and Exports (put the button in a
-// list-group rather than the card header).
+// by putting the button in a list-group rather than the card header.
 .authentication {
   .card-header {
     background-color: inherit;
@@ -32,45 +47,3 @@
     }
   }
 }
-
-// Specific to the Export card (mostly because of the current external
-// label + button approach, which could be mostly eliminated by reworking
-// as suggested in https://github.com/sul-dlss/earthworks/issues/646)
-.card.exports {
-  .card-header {
-    .spinner-border { // if this is used, it probably should go in the card body rather than the card header
-      position: absolute;
-      right: 1rem;
-      top: 1rem;
-    }
-  }
-
-  .export {
-    text-align: center;
-
-    @include media-breakpoint-up(xl) {
-      text-align: left;
-    }
-
-    .export-label {
-      padding: 6px 6px 6px 0;
-
-      @include media-breakpoint-up(xl) {
-        display: inline-block;
-      }
-    }
-
-    .export-link-container {
-      @include media-breakpoint-up(xl) {
-        display: inline-block;
-        float: right;
-      }
-
-      a {
-        @include media-breakpoint-up(xl) {
-          width: inherit;
-        }
-      }
-    }
-  }
-}

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

@@ -5,3 +5,71 @@
     margin: 5px 0;
   }
 }
+
+#map[data-protocol="IndexMap"] {
+  .leaflet-interactive {
+    stroke: black;
+    fill-opacity: 0.65;
+  }
+}
+
+.index-map-legend {
+  font-size: 15px;
+  display: flex;
+  position: absolute;
+  right: 15px;
+  top: -2px;
+  left: 90px;
+
+  &-info {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    margin-left: 15px;
+  }
+
+  span {
+    display: inline-block;
+    border: 1px solid black;
+    margin-right: 10px;
+    height: 24px;
+    width: 24px;
+    min-height: 24px;
+    min-width: 24px;
+  }
+
+  p {
+    margin-bottom: 0;
+  }
+
+  &-default {
+    background: #7FCDBB;
+  }
+  &-unavailable {
+    background: #EDF8B1;
+  }
+  &-selected {
+    background: #2C7FB8;
+  }
+  &-default, &-unavailable, &-selected {
+    opacity: 0.65;
+  }
+
+  @media(max-width: 768px){
+    position: revert;
+    margin-bottom: 1.25rem;
+
+    :first-child {
+      margin-left: 0;
+    }
+  }
+
+  @media(max-width: 480px){
+    display: block;
+
+    .index-map-legend-info {
+      margin-left: 0;
+      margin-bottom: 10px;
+    }
+  }
+}

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

@@ -9,6 +9,11 @@
     [data-map="item"] {
       border: 1px solid $gray-400;
       height: 27.5rem;
+
+      // Ensure oembed iframe is the same height as its container
+      iframe {
+        height: 27.5rem;
+      }
     }
 
     [data-inspect="true"][data-available="true"] {
@@ -19,6 +24,7 @@
         cursor: crosshair;
       }
     }
+    margin-bottom: 1rem;
   }
 
   .help-text {
@@ -36,4 +42,14 @@
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 8;
   }
+
+  #table-container{
+    overflow:scroll;
+    max-height: 450px;
+    margin-bottom: 1rem;
+
+    table {
+      margin-bottom: 0px;
+    }
+  }
 }

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

@@ -12,3 +12,9 @@
   }
 
 }
+
+// Add some separation between web services entries
+.web-services-modal-body > div + div {
+  border-top: 1px solid #dee2e6;
+  padding-top: 1rem;
+}

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

@@ -28,3 +28,7 @@
     }
   }
 }
+
+.card.relations {
+  margin-bottom: 20px;
+}

data/app/components/geoblacklight/icon_facet_item_component.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  # Display facet values with a decorative icon
+  # @example Usage in the blacklight configuration:
+  #   config.add_facet_field 'provider_facet', [...], item_component: Geoblacklight::IconFacetItemComponent
+  class IconFacetItemComponent < Blacklight::FacetItemComponent
+    delegate :safe_join, :geoblacklight_icon, to: :helpers
+
+    def initialize(facet_item:, **)
+      super
+
+      # store a copy of the original label value
+      @undecorated_label = @label
+    end
+
+    def before_render
+      # replace the original label with an icon-decorated version; this has to be done in
+      # #before_render or #render so we have access to the icon helpers.
+      @label = decorated_label
+
+      super
+    end
+
+    private
+
+    def decorated_label
+      icon = geoblacklight_icon(@facet_item.value, aria_hidden: true, classes: 'svg_tooltip')
+
+      safe_join([icon, @undecorated_label], ' ')
+    end
+  end
+end

data/app/helpers/geoblacklight_helper.rb

@@ -17,7 +17,6 @@ module GeoblacklightHelper
       label,
       url,
       'contentUrl' => url,
-      class: ['btn', 'btn-default', 'download', 'download-original'],
       data: {
         download: 'trigger',
         download_type: 'direct',
@@ -30,7 +29,6 @@ module GeoblacklightHelper
     link_to(
       text,
       download_hgl_path(id: document),
-      class: ['btn', 'btn-default', 'download', 'download-original'],
       data: {
         blacklight_modal: 'trigger',
         download: 'trigger',
@@ -47,7 +45,6 @@ module GeoblacklightHelper
       download_text('JPG'),
       iiif_jpg_url,
       'contentUrl' => iiif_jpg_url,
-      class: ['btn', 'btn-default', 'download', 'download-generated'],
       data: {
         download: 'trigger'
       }
@@ -56,9 +53,8 @@ module GeoblacklightHelper
 
   def download_link_generated(download_type, document)
     link_to(
-      t('geoblacklight.download.export_link', download_format: proper_case_format(download_type)),
+      t('geoblacklight.download.export_link', download_format: export_format_label(download_type)),
       '',
-      class: ['btn', 'btn-default', 'download', 'download-generated'],
       data: {
         download_path: download_path(document.id, type: download_type),
         download: 'trigger',
@@ -88,16 +84,6 @@ module GeoblacklightHelper
     end
   end
 
-  ##
-  # Renders an unique array of search links based off of terms
-  # passed in using the facet parameter
-  #
-  def render_facet_links(facet, items)
-    items.uniq.map do |item|
-      link_to item, search_catalog_path(f: { facet => [item] })
-    end.join(', ').html_safe
-  end
-
   ##
   # Looks up properly formatted names for formats
   #
@@ -105,6 +91,11 @@ module GeoblacklightHelper
     t("geoblacklight.formats.#{format.to_s.parameterize(separator: '_')}")
   end
 
+  # Format labels are customized for exports - look up the appropriate key.
+  def export_format_label(format)
+    t("geoblacklight.download.export_#{format.to_s.parameterize(separator: '_')}_link")
+  end
+
   ##
   # Looks up formatted names for references
   # @param (String, Symbol) reference
@@ -122,22 +113,6 @@ module GeoblacklightHelper
     value.html_safe
   end
 
-  def download_generated_body(format)
-    value = proper_case_format(format)
-    value = case value
-            when t('geoblacklight.formats.shapefile')
-              t('geoblacklight.download.export_shapefile_link')
-            when t('geoblacklight.formats.kmz')
-              t('geoblacklight.download.export_kmz_link')
-            when t('geoblacklight.formats.geojson')
-              t('geoblacklight.download.export_geojson_link')
-            else
-              value
-            end
-
-    value.html_safe
-  end
-
   ##
   # Deteremines if a feature should include help text popover
   # @return [Boolean]
@@ -206,18 +181,6 @@ module GeoblacklightHelper
     Settings.LEAFLET
   end
 
-  ##
-  # Renders a facet item with an icon placed as the first child of
-  # `.facet-label`. This works with `render_facet_value` and
-  # `render_selected_facet_value`
-  # @return String
-  def render_facet_item_with_icon(field_name, item)
-    doc = Nokogiri::HTML.fragment(render_facet_item(field_name, item))
-    doc.at_css('.facet-label').children.first
-       .add_previous_sibling(geoblacklight_icon(item.value, aria_hidden: true, classes: 'svg_tooltip'))
-    doc.to_html.html_safe
-  end
-
   ##
   # Renders the transformed metadata
   # (Renders a partial when the metadata isn't available)
@@ -267,8 +230,6 @@ module GeoblacklightHelper
     case controller_name
     when 'bookmarks'
       'bookmarks'
-    when 'catalog'
-      'index'
     else
       'index'
     end

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class BboxFilterField < Blacklight::SearchState::FilterField
+    # this accessor is unnecessary after Blacklight 7.25.0
+    attr_accessor :filters_key
+
+    def initialize(*args)
+      super
+      @filters_key = :bbox
+    end
+
+    # @param [String,#value] a filter item to add to the url
+    # @return [Blacklight::SearchState] new state
+    def add(item)
+      new_state = search_state.reset_search
+      params = new_state.params
+      value = as_url_parameter(item)
+
+      params[filters_key] = value.to_param
+
+      new_state.reset(params)
+    end
+
+    # @param [String,#value] a filter to remove from the url
+    # @return [Blacklight::SearchState] new state
+    def remove(_item)
+      new_state = search_state.reset_search
+      params = new_state.params
+
+      params.delete(filters_key)
+      new_state.reset(params)
+    end
+
+    # @return [Array] an array of applied filters
+    def values(except: [])
+      params = search_state.params
+      return [] if except.include?(:filters) || params[filters_key].blank?
+
+      [Geoblacklight::BoundingBox.from_rectangle(params[filters_key])]
+    rescue Geoblacklight::Exceptions::WrongBoundingBoxFormat => e
+      Rails.logger.warn(e)
+
+      []
+    end
+
+    # @param [String,#value] a filter to remove from the url
+    # @return [Boolean] whether the provided filter is currently applied/selected
+    delegate :include?, to: :values
+
+    # @since Blacklight v7.25.0
+    # normal filter fields demangle when they encounter a hash, which they assume to be a number-indexed map
+    def needs_normalization?(value_params)
+      value_params.is_a?(Hash) && value_params.keys.map(&:to_s).all? { |k| k =~ /^\d+$/ }
+    end
+
+    # @since Blacklight v7.25.0
+    # value should be the first value from a mangled hash,
+    # otherwise return the value as-is
+    def normalize(value_params)
+      needs_normalization?(value_params) ? value_params.values : value_params
+    end
+  end
+end