geoblacklight 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32b1f6b2ee7ddbd7ba16adc14ddad99cb87a9294004dfe7337ed0084626d1202
-  data.tar.gz: 3dfb956c7f0f3236671a65d9b3b8aea8135f473a388236b8879b0fdca064e310
+  metadata.gz: 2f9e80f30735f8fa8f8e4c03e0a855b4e709acbf1eb860cad0a14e66dba72064
+  data.tar.gz: 824c5c71fb501807335ab0862522d5a14fec06f31b1f21b09d732338f27e5b89
 SHA512:
-  metadata.gz: a8f1c491b83df2cf7c3ca22b8239c718697eb9e9aa3596255e2bd2c6b59ee85d79ee04bbc70c8fac9fe9bd20f9d9ed56519184898d4e6bfa21adc3a2b7261728
-  data.tar.gz: 24f5d3148d558ffe6a2c8845419228bc51bf64d7277fa1ae7aad8e920341851cf02a91cb699cc7080dd7a27ea6c62d415d91620b0744b92bd9d8148cbe917362
+  metadata.gz: acbee7539ae6c048356e42467b99f4e94c948cc9d5a35ddeeccc721028965808267d33d3d3ce91fc05afdd5992fbee5edeeda1760aa6257dea6420bc83e194ce
+  data.tar.gz: 8395fe82750ac0bfe3dc3de410a7039d0eff671ffee63690f1a0858b88687dc163ed92a711a46a94caf956eb3cdd5b04f7c96cb5a7cf2aedbaec9d74a2136412

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/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/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 = {
@@ -146,7 +147,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 +180,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/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/config/importmap.rb

@@ -3,18 +3,12 @@
 # OpenLayers viewer
 pin "ol", to: "https://esm.sh/ol@8.1.0"
 pin "ol/", to: "https://esm.sh/ol@8.1.0/"
-pin "ol-pmtiles", to: "https://cdn.skypack.dev/ol-pmtiles@0.3.0"
+pin "ol-pmtiles", to: "https://cdn.jsdelivr.net/npm/ol-pmtiles@0.3.0/+esm"
 
 # Leaflet viewer
-pin "leaflet", to: "https://cdn.skypack.dev/leaflet@1.9.4"
-pin "esri-leaflet", to: "https://cdn.skypack.dev/esri-leaflet@3.0.12"
-pin "leaflet-fullscreen", to: "https://cdn.skypack.dev/leaflet-fullscreen@1.0.2"
-
-# Clover viewer
-pin "react", to: "https://esm.sh/react@18.3.1"
-pin "react-dom/client", to: "https://esm.sh/react-dom@18.3.1/client"
-pin "@samvera/clover-iiif/viewer", to: "https://esm.sh/@samvera/clover-iiif@2.10.0/dist/viewer"
-pin "@samvera/clover-iiif/image", to: "https://esm.sh/@samvera/clover-iiif@2.10.0/dist/image"
+pin "leaflet", to: "https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet-src.esm.js"
+pin "esri-leaflet", to: "https://cdn.jsdelivr.net/npm/esri-leaflet@3.0.19/+esm"
+pin "leaflet.fullscreen", to: "https://cdn.jsdelivr.net/npm/leaflet.fullscreen@5.3.0/+esm"
 
 # Geoblacklight
 pin_all_from Geoblacklight::Engine.root.join("app", "javascript", "geoblacklight"), under: "geoblacklight"

data/config/locales/geoblacklight.en.yml

@@ -93,6 +93,7 @@ en:
       attribute: 'Attribute'
       value: 'Value'
       click_map: 'Click on map to inspect values'
+      table_name: 'Map data'
     help_text:
       viewer_protocol:
         cog:

data/lib/generators/geoblacklight/assets/importmap_generator.rb

@@ -21,16 +21,19 @@ module Geoblacklight
         delivered via CDN.
       DESCRIPTION
 
-      # Switch bootstrap import to ESM version so we can import individual parts
+      # Switch Blacklight's bootstrap and popper imports to ESM versions so we
+      # can import individual modules
       def use_bootstrap_esm
-        gsub_file "config/importmap.rb", /dist\/js\/bootstrap\.js/, "dist/js/bootstrap.esm.js"
+        gsub_file "config/importmap.rb", %r{dist/js/bootstrap.js}, "dist/js/bootstrap.esm.js"
+        gsub_file "config/importmap.rb", %r{dist/umd/popper.min.js}, "dist/esm/popper.js"
       end
 
-      # Add the customization overrides and insert before bootstrap import
+      # Add the SCSS customization overrides and insert before bootstrap import
       def add_customizations
         copy_file "assets/_customizations.scss", "app/assets/stylesheets/_customizations.scss"
         gsub_file "app/assets/stylesheets/_customizations.scss", "@geoblacklight/frontend/app/assets/", ""
-        insert_into_file "app/assets/stylesheets/application.bootstrap.scss", "@import 'customizations';\n", before: "@import 'bootstrap/scss/bootstrap';"
+        insert_into_file "app/assets/stylesheets/application.bootstrap.scss", "@import 'customizations';\n",
+          before: "@import 'bootstrap/scss/bootstrap';"
       end
 
       # Add CDN imports for CSS files used by Geoblacklight (leaflet, openlayers)
@@ -38,9 +41,9 @@ module Geoblacklight
         insert_into_file "app/assets/stylesheets/application.bootstrap.scss", before: "@import 'customizations';\n" do
           <<~SCSS
             /* GeoBlacklight dependencies CSS */
-            @import url("https://cdn.skypack.dev/leaflet@1.9.4/dist/leaflet.css");
-            @import url("https://cdn.jsdelivr.net/npm/leaflet-fullscreen@1.0.2/dist/leaflet.fullscreen.css");
-            @import url("https://cdn.skypack.dev/ol@8.1.0/ol.css");
+            @import url("https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.css");
+            @import url("https://cdn.jsdelivr.net/npm/leaflet.fullscreen@5.3.0/dist/Control.FullScreen.css");
+            @import url("https://cdn.jsdelivr.net/npm/ol@8.1.0/ol.css");
 
           SCSS
         end

data/lib/generators/geoblacklight/assets/vite_generator.rb

@@ -16,8 +16,8 @@ module Geoblacklight
       SCSS entrypoint file, which will be bundled by Vite.
 
       Geoblacklight's frontend assets are installed from the npm package. In
-      local development they automatically reference the versions from the
-      outer directory (the Geoblacklight repository) via a yarn symlink.
+      CI they automatically reference the versions from the outer directory
+      (the Geoblacklight repository) via a yarn symlink.
       DESCRIPTION
 
       # Install Vite
@@ -26,6 +26,13 @@ module Geoblacklight
         run "bundle install"
       end
 
+      # Symlink geoblacklight's frontend assets in CI
+      def link_geoblacklight_package
+        if options[:test]
+          run "yarn link @geoblacklight/frontend"
+        end
+      end
+
       # Add our version of the Blacklight base layout with Vite helper tags
       def geoblacklight_base_layout
         copy_file "base.html.erb", "app/views/layouts/blacklight/base.html.erb"

data/lib/generators/geoblacklight/assets_generator.rb

@@ -4,7 +4,7 @@ module Geoblacklight
   # Run general asset setup and then delegate to the appropriate generator
   # Based on Blacklight::AssetsGenerator
   class AssetsGenerator < Rails::Generators::Base
-    class_option :"asset-pipeline", type: :string, default: ENV.fetch("ASSET_PIPELINE", "vite"), desc: "Choose the asset pipeline to use (vite or importmap)"
+    class_option :"asset-pipeline", type: :string, default: ENV.fetch("ASSET_PIPELINE", "importmap"), desc: "Choose the asset pipeline to use (vite or importmap)"
     class_option :test, type: :boolean, default: ENV.fetch("CI", false), aliases: "-t", desc: "Indicates that app will be installed in a test environment"
 
     # Pick a version of the frontend asset package and install it.
@@ -27,7 +27,7 @@ module Geoblacklight
       generator = if options[:"asset-pipeline"]
         "geoblacklight:assets:#{options[:"asset-pipeline"]}"
       else
-        "geoblacklight:assets:vite"
+        "geoblacklight:assets:importmap"
       end
 
       generate generator, generated_options

data/lib/generators/geoblacklight/templates/assets/application.scss

@@ -2,7 +2,7 @@
 
 // Leaflet, OpenLayers, GeoBlacklight (includes Blacklight and Bootstrap)
 @import "leaflet/dist/leaflet.css";
-@import "leaflet-fullscreen/dist/leaflet.fullscreen.css";
+@import "leaflet.fullscreen/dist/Control.FullScreen.css";
 @import "ol/ol.css";
 @import "~/stylesheets/geoblacklight.scss";
 

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

@@ -247,6 +247,7 @@ LEAFLET:
     HOVERTOWAKE: false
     MESSAGE: 'Click to Wake'
     BACKGROUND: 'rgba(214, 214, 214, .7)'
+  SIDEBAR: false # set to true to display attribute table as sidebar on map
   LAYERS:
     DETECT_RETINA: true
     INDEX:

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "5.2.0"
+  VERSION = "5.3.0"
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@geoblacklight/frontend",
   "type": "module",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -9,8 +9,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "watch": "vite build --watch",
-    "test": "vitest"
+    "watch": "vite build --watch"
   },
   "files": [
     "app/assets",
@@ -26,15 +25,13 @@
     "bootstrap": "^5.3.3",
     "esri-leaflet": "^3.0.12",
     "leaflet": "^1.9.4",
-    "leaflet-iiif": "^3.0.0",
-    "leaflet-fullscreen": "^1.0.2",
+    "leaflet.fullscreen": "^5.3.0",
     "ol": "10.7.0",
     "ol-pmtiles": "^2.0.2"
   },
   "devDependencies": {
     "jsdom": "^27.3.0",
     "rollup-plugin-includepaths": "^0.2.4",
-    "vite": "^7.2.2",
-    "vitest": "^4.0.15"
+    "vite": "^7.2.2"
   }
 }

data/schema/geoblacklight-schema-aardvark.json

@@ -190,8 +190,8 @@
       "type": "string",
       "const": "Aardvark"
     },
-    "gbl_suppressed_b": { "type": "boolean" },
-    "gbl_georeferenced_b": { "type": "boolean" }
+    "gbl_suppressed_b": { "type": ["string", "boolean"] },
+    "gbl_georeferenced_b": { "type": ["string", "boolean"] }
   },
   "required": ["id", "dct_title_s", "gbl_resourceClass_sm", "dct_accessRights_s", "gbl_mdVersion_s"]
 }

data/spec/features/full_screen_control_spec.rb

@@ -5,20 +5,18 @@ require "spec_helper"
 feature "Leaflet fullscreen control", js: true do
   scenario "WMS layer should have full screen control" do
     visit solr_document_path("stanford-cz128vq0535")
-    expect(page).to have_css(".leaflet-control-fullscreen-button", visible: :all)
+    expect(page).to have_css(".leaflet-control-zoom-fullscreen", visible: :all)
   end
 end
 
-feature "Clover IIIF fullscreen control", js: true do
+feature "IIIF fullscreen control", js: true do
   scenario "IIIF layer should have full screen control" do
-    skip "Clover is disabled" # see https://github.com/geoblacklight/geoblacklight/issues/1675
     visit solr_document_path("princeton-sx61dn82p")
-    expect(page).to have_button("Toggle full page")
+    expect(page).to have_button("Full screen", visible: :all)
   end
 
   scenario "IIIF image should have full screen control" do
-    skip "Clover is disabled" # see https://github.com/geoblacklight/geoblacklight/issues/1675
     visit solr_document_path("princeton-02870w62c")
-    expect(page).to have_css("[data-button='full-page']")
+    expect(page).to have_css("img[alt='Toggle full page']", visible: :all)
   end
 end

data/spec/features/saved_searches_spec.rb

@@ -4,14 +4,7 @@ require "spec_helper"
 
 feature "saved searches" do
   scenario "list spatial search", js: true do
-    visit root_path
-    within "#leaflet-viewer" do
-      find(".search-control a").click
-      expect(page.current_url).to match(/bbox=/)
-    end
-    if Rails.version == "6.1.7.6"
-      visit root_path({bbox: "-180 -89.338214 180 88.918831"})
-    end
+    visit root_path({bbox: "-180 -89.338214 180 88.918831"})
     visit blacklight.search_history_path
     expect(page).to have_css "td.query a", text: /#{I18n.t("geoblacklight.bbox_label")}/
   end

data/vite.config.ts

@@ -28,8 +28,5 @@ export default defineConfig(() => {
         ],
       },
     },
-    test: {
-      environment: "jsdom",
-    },
   };
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Mike Graves
@@ -10,7 +10,7 @@ authors:
 - Jack Reed
 bindir: bin
 cert_chain: []
-date: 2026-02-18 00:00:00.000000000 Z
+date: 2026-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -483,6 +483,8 @@ files:
 - app/components/blacklight/icons/uva_component.rb
 - app/components/blacklight/icons/web_services_component.rb
 - app/components/blacklight/icons/websites_component.rb
+- app/components/geoblacklight/accordion_component.html.erb
+- app/components/geoblacklight/accordion_component.rb
 - app/components/geoblacklight/arcgis_component.html.erb
 - app/components/geoblacklight/arcgis_component.rb
 - app/components/geoblacklight/attribute_table_component.html.erb
@@ -557,6 +559,7 @@ files:
 - app/javascript/geoblacklight/leaflet/constants.js
 - app/javascript/geoblacklight/leaflet/controls/geosearch.js
 - app/javascript/geoblacklight/leaflet/controls/layer_opacity.js
+- app/javascript/geoblacklight/leaflet/controls/sidebar.js
 - app/javascript/geoblacklight/leaflet/controls/sleep.js
 - app/javascript/geoblacklight/leaflet/inspection.js
 - app/javascript/geoblacklight/leaflet/layer_index_map.js
@@ -927,7 +930,6 @@ files:
 - spec/tasks/geoblacklight_spec.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - template.rb
-- test/leaflet/layers.test.js
 - vite.config.ts
 homepage: http://github.com/geoblacklight/geoblacklight
 licenses:

data/test/leaflet/layers.test.js

@@ -1,17 +0,0 @@
-import { wmsLayer, wmtsLayer } from "../../app/javascript/leaflet/layers";
-import { describe, expect, it } from "vitest";
-
-describe("leaflet/layers", () => {
-  describe("wmsLayer", () => {
-    it("returns a WMS tile layer", () => {
-      const url = "http://example.com/wms";
-      const layerId = "layerId";
-      const opacity = 0.5;
-      const detectRetina = true;
-      const layer = wmsLayer(url, { layerId, opacity, detectRetina });
-      expect(layer.options.layers).toEqual(layerId);
-      expect(layer.options.opacity).toEqual(opacity);
-      expect(layer.options.detectRetina).toEqual(detectRetina);
-    });
-  });
-});