geoblacklight 4.7.0 → 5.0.0.pre.alpha.11

data/spec/features/web_services_modal_spec.rb

@@ -2,12 +2,44 @@
 
 require "spec_helper"
 
-feature "web services tools" do
-  feature "when wms/wfs are provided", js: true do
-    scenario "shows up in tools" do
+# Open the web services modal and wait for it to load
+def open_web_services_modal
+  expect(page).to have_link "Web services"
+  click_link "Web services"
+  expect(page).to have_css "h1", text: "Web services"
+end
+
+describe "web services tools", type: :feature do
+  context "when no linkable references provided" do
+    it "does not show up in tools" do
+      visit solr_document_path "mit-001145244"
+      expect(page).not_to have_link "Web services"
+    end
+  end
+
+  context "when any reference is linked" do
+    it "shows copy to clipboard button" do
+      visit solr_document_path "princeton-dc7h14b252v"
+      open_web_services_modal
+      expect(page).to have_text "Copy"
+    end
+
+    it "copies the link to clipboard", js: true do
+      sign_in # NOTE: this seems to be required for clipboard permissions to be granted succesfully
+      page.driver.browser.add_permission("clipboard-read", "granted")
+      page.driver.browser.add_permission("clipboard-write", "granted")
+      visit solr_document_path "princeton-1r66j405w"
+      open_web_services_modal
+      click_button "Copy"
+      clip_text = page.evaluate_async_script("navigator.clipboard.readText().then(arguments[0])")
+      expect(clip_text).to include("https://libimages1.princeton.edu/loris/figgy_prod/5a%2F20%2F58%2F5a20585db50d44959fe5ae44821fd174%2Fintermediate_file.jp2/info.json")
+    end
+  end
+
+  context "when wms/wfs are provided" do
+    it "shows up in tools" do
       visit solr_document_path "stanford-cg357zz0321"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
+      open_web_services_modal
       within ".modal-body" do
         expect(page).to have_css "input", count: 4
         expect(page).to have_css "label", text: "Web Feature Service (WFS)"
@@ -18,73 +50,59 @@ feature "web services tools" do
       end
     end
   end
-  feature "no wms or wfs provided" do
-    scenario "does not show up in tools" do
-      visit solr_document_path "mit-001145244"
-      expect(page).not_to have_css "div.web-services-sidebar a", text: "Web services"
-    end
-  end
-  feature "when xyz tile reference is provided", js: true do
-    scenario "shows up in tools" do
+
+  context "when xyz tile reference is provided" do
+    it "shows up in tools" do
       visit solr_document_path "6f47b103-9955-4bbe-a364-387039623106-xyz"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
+      open_web_services_modal
       within ".modal-body" do
         expect(page).to have_css "label", text: "XYZ Tiles"
         expect(page).to have_css 'input[value="https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png"]'
       end
     end
   end
-  feature "when wmts tile reference is provided", js: true do
-    scenario "shows up in tools" do
+
+  context "when wmts tile reference is provided" do
+    it "shows up in tools" do
       visit solr_document_path "princeton-fk4544658v-wmts"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
+      open_web_services_modal
       within ".modal-body" do
         expect(page).to have_css "label", text: "Web Map Tile Service"
         expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml"]'
       end
     end
   end
-  feature "when tilejson reference is provided", js: true do
-    scenario "shows up in tools" do
+
+  context "when tilejson reference is provided" do
+    it "shows up in tools" do
       visit solr_document_path "princeton-fk4544658v-tilejson"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
+      open_web_services_modal
       within ".modal-body" do
         expect(page).to have_css "label", text: "TileJSON Document"
         expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json"]'
       end
     end
   end
-  feature "when a PMTiles reference is provided", js: true do
-    scenario "shows up in tools" do
+
+  context "when a PMTiles reference is provided" do
+    it "shows up in tools" do
       visit solr_document_path "princeton-t722hd30j"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
+      open_web_services_modal
       within ".modal-body" do
         expect(page).to have_css "label", text: "PMTiles Layer"
         expect(page).to have_css 'input[value="https://geodata.lib.princeton.edu/fe/d2/80/fed28076eaa04506b7956f10f61a2f77/display_vector.pmtiles"]'
       end
     end
   end
-  feature "when a COG reference is provided", js: true do
-    scenario "shows up in tools" do
+
+  context "when a COG reference is provided" do
+    it "shows up in tools" do
       visit solr_document_path "princeton-dc7h14b252v"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
+      open_web_services_modal
       within ".modal-body" do
         expect(page).to have_css "label", text: "COG Layer"
         expect(page).to have_css 'input[value="https://geodata.lib.princeton.edu/13/f5/58/13f5582c32a54be98fc2982077d0456e/display_raster.tif"]'
       end
     end
   end
-  feature "copy to clipboard is provided", js: true do
-    scenario "shows up in tools" do
-      visit solr_document_path "princeton-dc7h14b252v"
-      expect(page).to have_css "div.web-services-sidebar a", text: "Web services"
-      click_link "Web services"
-      expect(page).to have_text "Copy"
-    end
-  end
 end

data/spec/features/wmts_spec.rb

@@ -19,8 +19,8 @@ feature "wmts layer" do
 
       visit solr_document_path("princeton-fk4544658v-wmts")
       expect(page).to have_css ".leaflet-control-zoom", visible: :visible
-      expect(page).to have_css "div[data-protocol='Wmts']"
-      expect(page).to have_css "div[data-url='https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml']"
+      expect(page).to have_css "div[data-leaflet-viewer-protocol-value='Wmts']"
+      expect(page).to have_css "div[data-leaflet-viewer-url-value='https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml']"
     end
   end
   context "when referencing a WMTSCapabilities document with a multiple layers" do
@@ -30,8 +30,8 @@ feature "wmts layer" do
         .to_return(status: 200, body: read_fixture("manifests/wmts-multiple.xml"))
       visit solr_document_path("princeton-fk4db9hn29")
       expect(page).to have_css ".leaflet-control-zoom", visible: :visible
-      expect(page).to have_css "div[data-protocol='Wmts']"
-      expect(page).to have_css "div[data-url='https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml']"
+      expect(page).to have_css "div[data-leaflet-viewer-protocol-value='Wmts']"
+      expect(page).to have_css "div[data-leaflet-viewer-url-value='https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml']"
     end
   end
 end

data/spec/fixtures/solr_documents/README.md

@@ -17,12 +17,13 @@ If you add a new document, please add it to the table below, and indicate its pu
 | [baruch_ancestor2](baruch_ancestor2.json) | 2016 NYC Geodatabase, ArcGIS Version (jan2016) | nyu_2451_34636 | Geodatabase with documentation download Referenced as parent                   
 | [baruch_documentation_download](baruch_documentation_download.json) | 2015 New York City Subway Complexes and Ridership | nyu_2451_34502 | Point dataset with WMS and WFS, documentation download, and two parent records
 | [bbox-spans-180](bbox-spans-180.json) | East Asia and Oceania | princeton-sx61dn82p | Scanned map with IIIF and direct TIFF download that spans across the 180th meridian                     
+| [complex-geom](complex-geom.json) | Anglesey; Garnesay; Wight olim vectis; ... | c8b46b52-0846-4abb-ba56-b484064f84ac | Scanned map with MULTIPOLYGON locn_geometry value                     
 | [cornell_html_metadata](cornell_html_metadata.json) | Air Monitoring Stations, Adirondack Park, 2000 | cugir-007741 | Point dataset with WMS, WFS, direct download, and FGDC metadata XML and HTML                       
 | [esri-dynamic-layer-all-layers](esri-dynamic-layer-all-layers.json) | Glacial Boundaries: Illinois, 1998 | 90f14ff4-1359-4beb-b931-5cb41d20ab90 | This record points to an the top level of an Esri Rest Web Map Service It does not specify a layer
 | [esri-dynamic-layer-single-layer](esri-dynamic-layer-single-layer.json) | Abandoned Quarries: Indiana | 4669301e-b4b2-4c8b-bf40-01b968a2865b | ArcGIS Dynamic Map Layer with single layer indicated
 | [esri-feature-layer](esri-feature-layer.json) | Transit - Airports: Maryland | f406332e63eb4478a9560ad86ae90327_18| ArcGIS Feature Layer - point dataset |
 | [esri-image-map-layer](esri-image-map-layer.json)| Wabash Topo (27): Indiana, 1929 | 32653ed6-8d83-4692-8a06-bf13ffe2c018 | ArcGIS Image Map Layer with GeoTIFF direct download
-| [esri-tiled_map_layer](esri-tiled_map_layer.json)| Soil Survey Geographic (SSURGO) | nyu-test-soil-survey-map | ArcGIS tiled map layer
+| [esri-tiled_map_layer](esri-tiled_map_layer.json)| Minnesota Land Cover Classification and Impervious Surface Area by Landsat and Lidar (2013 Update) | 31567cf1-bad8-4bc5-8d57-44b96c207ecc  | ArcGIS tiled map layer
 | [esri-wms-layer](esri-wms-layer.json) | Agriculture Census: Indiana, 1997 | purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa | Dataset with ArcGIS Dynamic Map Layer, ArcGIS WMS, and direct download                       
 | [harvard_raster](harvard_raster.json) | Saint Petersburg Region, Russia, 1834 (Raster Image) | harvard-g7064-s2-1834-k3 | This layer is a georeferenced raster image of the historic paper map
 | [iiif-eastern-hemisphere](iiif-eastern-hemisphere.json) | A new & accurate map of Asia: drawn from actual surveys, and otherwise collected from journals | 57f0f116-b64e-4773-8684-96ba09afb549                        | Eastern hemisphere scanned map with IIIF manifest

data/spec/fixtures/solr_documents/complex-geom.json

@@ -0,0 +1,61 @@
+{
+  "id": "c8b46b52-0846-4abb-ba56-b484064f84ac",
+  "gbl_mdVersion_s": "Aardvark",
+  "dct_title_s": "Anglesey; Garnesay; Wight olim vectis; Iarsay; Per Gerardum Mercatorem.; Title on verso: Isles d'Anglesey Wight Jarsay et Garnesay",
+  "dct_description_sm": [
+    "Relief shown pictorially. Each map is 15 x 21 cm. Does not match any states listed in Van der Krogt. From the Appendix Atlas of the British Isles and Northern Europe, title created to represent a unique collection within the Clark Library, University of Michigan. 4 maps on one sheet: 30 x 43 cm."
+  ],
+  "dct_language_sm": [
+    "eng"
+  ],
+  "dct_creator_sm": [
+    "Hondius, Hendrik, 1597-1651. Appendix Atlas of the British Isles and Northern Europe",
+    "Jansson, Jan, 1588-1664. Appendix Atlas of the British Isles and Northern Europe",
+    "Mercator, Gerhard, 1512-1594",
+    "Vignaud, Henry, 1830-1922, former owner."
+  ],
+  "schema_provider_s": "University of Michigan",
+  "gbl_resourceClass_sm": [
+    "Maps"
+  ],
+  "dcat_keyword_sm": [
+    "Clark Library Map Collections",
+    "2022-creator-sprint"
+  ],
+  "dct_temporal_sm": [
+    "between 1630 and 1639"
+  ],
+  "gbl_indexYear_im": [1630],
+  "gbl_dateRange_drsim": [
+    "[1630 TO 1639]"
+  ],
+  "dct_spatial_sm": [
+    "Isle of Wight",
+    "Guernsey (Isle)",
+    "Jersey (Isle)",
+    "Anglesey (Isle)",
+    "England",
+    "Wales"
+  ],
+  "locn_geometry": "MULTIPOLYGON(((-4.7 53.44, -4.02 53.44, -4.02 53.13, -4.7 53.13, -4.7 53.44)),((-1.591789 50.767556, -1.062732 50.767556, -1.062732 50.574678, -1.591789 50.574678, -1.591789 50.767556)),((-2.6825 49.5351, -2.3117 49.5351, -2.3117 49.3851, -2.6825 49.3851, -2.6825 49.5351)),((-2.2649 49.2775, -1.9958 49.2775, -1.9958 49.1411, -2.2649 49.1411, -2.2649 49.2775)),((-5.1707 54.5534, -3.9654 54.5534, -3.9654 53.845, -5.1707 53.845, -5.1707 54.5534)))",
+  "dcat_bbox": "ENVELOPE(-4.98,-1.04,54.47,49.14)",
+  "dcat_centroid": "51.805,-3.0100000000000002",
+  "pcdm_memberOf_sm": [
+    "64bd8c4c-8e60-4956-b43d-bdc3f93db488"
+  ],
+  "dct_isPartOf_sm": [
+    "07d-01"
+  ],
+  "dct_rights_sm": [
+    "This map is in the public domain."
+  ],
+  "dct_rightsHolder_sm": [
+    "Please attribute access and use of this digitized map to the Stephen S. Clark Library, University of Michigan Library. https://www.lib.umich.edu/about-us/policies/copyright-policy"
+  ],
+  "dct_accessRights_s": "Public",
+  "dct_format_s": "JPEG",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://quod.lib.umich.edu/c/clark1ic/x-010356232/39015091191992_01\",\"http://iiif.io/api/presentation#manifest\":\"https://quod.lib.umich.edu/cgi/i/image/api/search/clark1ic:010356232\"}",
+  "dct_identifier_sm": [
+    "c8b46b52-0846-4abb-ba56-b484064f84ac"
+  ]
+}

data/spec/fixtures/solr_documents/esri-tiled_map_layer.json

@@ -1,48 +1,69 @@
 {
-  "dct_title_s": "Soil Survey Geographic (SSURGO)",
-  "dct_alternative_sm": [
-    "esri-tiled_map_layer"
-  ],
+  "dct_title_s": "Minnesota Land Cover Classification and Impervious Surface Area by Landsat and Lidar (2013 Update)",
   "dct_description_sm": [
-    "ArcGIS tiled map layer. ",
-    "This map shows the Soil Survey Geographic (SSURGO) by the United States Department of Agriculture's Natural Resources Conservation Service. It also shows data that was developed by the National Cooperative Soil Survey and supersedes the State Soil Geographic (STATSGO) dataset published in 1994. SSURGO digitizing duplicates the original soil survey maps. This level of mapping is designed for use by landowners, townships, and county natural resource planning and management. The user should be knowledgeable of soils data and their characteristics. The smallest scale map shows the Global Soil Regions map by the United States Department of Agriculture’s Natural Resources Conservation Service."
+    "This is a 15-meter raster dataset of a land cover and impervious surface classification for 2013, level two classification. The classification was created using a combination of multitemporal Landsat 8 data and LiDAR data with Object-based image analysis. By using objects instead of pixels we were able to utilize multispectral data along with spatial and contextual information of objects such as shape, size, texture and LiDAR-derived metrics to distinguish different land cover types. While OBIA has become the standard procedure for classification of high resolution imagery we found that it works equally well with Landsat imagery. For the objects classified as urban or developed, a regression model relating the Landsat greenness variable to percent impervious was developed to estimate and map the percent impervious surface area at the pixel level."
   ],
   "dct_language_sm": [
     "eng"
   ],
-  "dct_publisher_sm": [
-    "United States Department of Agriculture, Natural Resources Conservation Service"
+  "dct_creator_sm": [
+    "Bauer, Marvin E.",
+    "Knight, Joe F.",
+    "Rampi, Lian P."
   ],
-  "schema_provider_s": "NYU",
+  "schema_provider_s": "University of Minnesota",
   "gbl_resourceClass_sm": [
-    "Maps"
+    "Datasets"
   ],
   "gbl_resourceType_sm": [
-    "Raster data"
+    "Vector data",
+    "Raster data",
+    "LiDAR"
+  ],
+  "dcat_theme_sm": [
+    "Imagery"
   ],
   "dcat_keyword_sm": [
-    "GBL Fixture records"
+    "Lidar",
+    "Landsat Satellites",
+    "Land cover",
+    "2022-creator-sprint"
   ],
   "dct_temporal_sm": [
-    "2010"
+    "2013"
   ],
+  "dct_issued_s": "2016-08-03",
   "gbl_indexYear_im": [
-    2010
+    2013
   ],
   "gbl_dateRange_drsim": [
-    "[2010 TO 2010]"
+    "[2013 TO 2013]"
+  ],
+  "dct_spatial_sm": [
+    "Minnesota"
+  ],
+  "locn_geometry": "POLYGON((-97.23 49.37, -89.53 49.37, -89.53 43.5, -97.23 43.5, -97.23 49.37))",
+  "dcat_bbox": "ENVELOPE(-97.23,-89.53,49.37,43.5)",
+  "dcat_centroid": "46.435,-93.38",
+  "pcdm_memberOf_sm": [
+    "dc8c18df-7d64-4ff4-a754-d18d0891187d"
+  ],
+  "dct_isPartOf_sm": [
+    "05d-03"
+  ],
+  "dct_rights_sm": [
+    "https://conservancy.umn.edu/pages/drum/policies/#terms-of-use"
+  ],
+  "dct_license_sm": [
+    "http://creativecommons.org/publicdomain/zero/1.0/"
   ],
-  "locn_geometry": "ENVELOPE(-129.4956,-64.4393,48.6336,21.8079)",
-  "dcat_bbox": "ENVELOPE(-129.4956,-64.4393,48.6336,21.8079)",
-  "dcat_centroid": "35.22075,-96.96745",
   "dct_accessRights_s": "Public",
   "dct_format_s": "GeoTIFF",
-  "gbl_wxsIdentifier_s": "test-soil-survey_map",
-  "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#TiledMapLayer\":\"http://services.arcgisonline.com/arcgis/rest/services/Specialty/Soil_Survey_Map/MapServer\"}",
-  "id": "nyu-test-soil-survey-map",
+  "dct_references_s": "{\"http://lccn.loc.gov/sh85035852\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Classification%20scheme%20for%20Level%201%20and%202%20land%20cover%20classes%202013.pdf\",\"http://schema.org/downloadUrl\":[{\"label\":\"Original GeoTIFF\",\"url\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Statewide_FinalMap_2013_2014_v2.zip\"}],\"http://www.opengis.net/cat/csw/csdgm\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Statewide_LandCoverMetadata_MN_2013_v2.xml\",\"http://www.w3.org/1999/xhtml\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Statewide_LandCover_Metadata_MN_2013_v2.html\",\"http://schema.org/url\":\"http://doi.org/10.13020/D6JP4S\",\"urn:x-esri:serviceType:ArcGIS#TiledMapLayer\":\"https://tiles.arcgis.com/tiles/8df8p0NlLFEShl0r/arcgis/rest/services/mn_landcover_impervious_2013v2_tiles/MapServer\"}",
+  "id": "31567cf1-bad8-4bc5-8d57-44b96c207ecc",
   "dct_identifier_sm": [
-    "test-soil-survey-map"
+    "http://doi.org/10.13020/D6JP4S",
+    "http://hdl.handle.net/11299/181555"
   ],
-  "gbl_mdModified_dt": "2021-06-01T22:14:15Z",
   "gbl_mdVersion_s": "Aardvark"
-}
+}

data/spec/fixtures/solr_documents/harvard_raster.json

@@ -54,7 +54,7 @@
   "dct_accessRights_s": "Public",
   "dct_format_s": "GeoTIFF",
   "gbl_wxsIdentifier_s": "cite:G7064_S2_1834_K3",
-  "dct_references_s": "{\"http://schema.org/DownloadAction\":\"http://pelham.lib.harvard.edu:8080/HGL/HGLOpenDelivery\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://pelham.lib.harvard.edu:8090/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://pelham.lib.harvard.edu:8090/geoserver/wms\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml\"}",
+  "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://pelham.lib.harvard.edu:8090/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://pelham.lib.harvard.edu:8090/geoserver/wms\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml\"}",
   "id": "harvard-g7064-s2-1834-k3",
   "dct_identifier_sm": [
     "urn:hul.harvard.edu:HARVARD.SDE2.G7064_S2_1834_K3"

data/spec/fixtures/solr_documents/multiple-downloads.json

@@ -37,6 +37,7 @@
   "dcat_centroid": "42.2063055,-75.775105",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Shapefile",
+  "gbl_wxsIdentifier_s": "cugir007950",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":[{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/cugir-007950.zip\",\"label\":\"Shapefile\"},{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/agBROO.pdf\",\"label\":\"PDF\"},{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/agBROO2011.kmz\",\"label\":\"KMZ\"}],\"http://www.opengis.net/cat/csw/csdgm\":\"https://cugir-data.s3.amazonaws.com/00/79/50/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"https://cugir-data.s3.amazonaws.com/00/79/50/fgdc.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://cugir.library.cornell.edu/geoserver/cugir/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://cugir.library.cornell.edu/geoserver/cugir/wms\"}",
   "id": "cugir-007950",
   "gbl_mdModified_dt": "2021-06-11T18:39:49Z",

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -11,7 +11,7 @@ describe GeoblacklightHelper, type: :helper do
     it "supports in use cases" do
       {
         "Paper map" => "paper-map",
-        "Michigan State" => "michigan-state",
+        "Michigan State University" => "michigan-state-university",
         "CD ROM" => "cd-rom",
         "Lewis & Clark" => "lewis-clark"
       }.each_key do |key|
@@ -23,85 +23,9 @@ describe GeoblacklightHelper, type: :helper do
       html = Capybara.string(geoblacklight_icon(nil))
       expect(html).to have_css ".icon-missing"
     end
-  end
-
-  describe "#proper_case_format" do
-    it "returns a properly cased format" do
-      expect(proper_case_format("GEOJSON")).to eq "GeoJSON"
-    end
-  end
-
-  describe "#download_text" do
-    it "returns download text concatenated with proper case format" do
-      expect(download_text("GEOJSON")).to eq "Original GeoJSON"
-    end
-  end
-
-  describe "#download_text" do
-    it "returns download text concatenated with proper case format" do
-      expect(download_text("GEOJSON")).to eq "Original GeoJSON"
-    end
-  end
-
-  describe "#download_link_file" do
-    let(:label) { "Test Link Text" }
-    let(:id) { "test-id" }
-    let(:url) { "http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" }
-
-    it "generates a link to download the original file" do
-      expect(download_link_file(label, id, url)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" data-download="trigger" data-download-type="direct" data-download-id="test-id" href="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip">Test Link Text</a>'
-    end
-  end
-
-  describe "#download_link_hgl" do
-    let(:text) { "Test Link Text" }
-    let(:document) { instance_double(SolrDocument) }
-
-    before do
-      allow(document).to receive(:id).and_return("test-id")
-      allow(document).to receive(:to_s).and_return("test-id")
-    end
-
-    it "generates a link to the HGL route" do
-      expect(download_link_hgl(text, document)).to eq '<a data-blacklight-modal="trigger" data-download="trigger" data-download-type="harvard-hgl" data-download-id="test-id" href="/download/hgl/test-id">Test Link Text</a>'
-    end
-  end
-
-  describe "#download_link_iiif" do
-    let(:references_field) { Settings.FIELDS.REFERENCES }
-    let(:document_attributes) do
-      {
-        references_field => {
-          "http://iiif.io/api/image" => "https://example.edu/image/info.json"
-        }.to_json
-      }
-    end
-    let(:document) { SolrDocument.new(document_attributes) }
-
-    before do
-      allow_any_instance_of(Geoblacklight::Reference).to receive(:to_hash).and_return(iiif: "https://example.edu/image/info.json")
-    end
-
-    it "generates a link to download the JPG file from the IIIF server" do
-      assign(:document, document)
-      expect(helper.download_link_iiif).to eq '<a contentUrl="https://example.edu/image/full/full/0/default.jpg" data-download="trigger" href="https://example.edu/image/full/full/0/default.jpg">Original JPG</a>'
-    end
-  end
-
-  describe "#download_link_generated" do
-    let(:download_type) { "SHAPEFILE" }
-    let(:document) { instance_double(SolrDocument) }
-
-    before do
-      allow(document).to receive(:id).and_return("test-id")
-      allow(document).to receive(:to_s).and_return("test-id")
-    end
-
-    it "generates a link to download the JPG file from the IIIF server" do
-      # Stub I18n to ensure the link can be customized via `export_` labels.
-      allow(helper).to receive(:t).and_call_original
-      allow(helper).to receive(:t).with("geoblacklight.download.export_shapefile_link").and_return("Shapefile Export Customization")
-      expect(helper.download_link_generated(download_type, document)).to eq '<a data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-download-type="SHAPEFILE" data-download-id="test-id" href="">Export Shapefile Export Customization</a>'
+    it "works with settings icon mapping" do
+      html = Capybara.string(geoblacklight_icon("ohio-state"))
+      expect(html).to have_css ".blacklight-icons-the-ohio-state-university"
     end
   end
 
@@ -182,30 +106,9 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#render_web_services" do
-    let(:reference) { instance_double(Geoblacklight::Reference, type: "wms") }
-    it "with a reference to a defined partial" do
-      expect(helper).to receive(:render)
-        .with(partial: "web_services_wms", locals: {reference: reference})
-      helper.render_web_services(reference)
-    end
-    context "when the partial is missing" do
-      let(:reference) { instance_double(Geoblacklight::Reference, type: "iiif") }
-
-      it "with a reference to a missing partial" do
-        expect(helper).to receive(:render)
-          .with(partial: "web_services_iiif", locals: {reference: reference})
-          .and_raise ActionView::MissingTemplate.new({}, "", "", "", "")
-        expect(helper).to receive(:render)
-          .with(partial: "web_services_default", locals: {reference: reference})
-        helper.render_web_services(reference)
-      end
-    end
-  end
-
   describe "#leaflet_options" do
     it "returns a hash of options for leaflet" do
-      expect(leaflet_options[:VIEWERS][:WMS][:CONTROLS]).to eq(%w[Opacity Fullscreen])
+      expect(leaflet_options[:LAYERS][:INDEX].keys).to eq([:DEFAULT, :UNAVAILABLE, :SELECTED])
     end
   end
 
@@ -272,32 +175,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#show_help_text?" do
-    let(:feature) { "viewer_protocol" }
-    let(:translation_key) { "wms" }
-
-    it "confirms help text is available" do
-      expect(helper.show_help_text?(feature, translation_key)).to be true
-    end
-  end
-
-  describe "#render_help_text_entry" do
-    let(:feature) { "viewer_protocol" }
-    let(:translation_key) { "wms" }
-
-    context "valid entry" do
-      it "renders help text entry for the wms viewer protocol" do
-        expect(helper.render_help_text_entry(feature, translation_key)).to eq '<h3 class="help-text viewer_protocol h6"><a data-toggle="popover" data-title="Web Map Service (WMS)" data-content="A Web Map Service displays a geospatial dataset as map images.">Web Map Service (WMS)</a></h3>'
-      end
-    end
-
-    context "invalid entry" do
-      it "renders an empty span" do
-        expect(helper.render_help_text_entry("foo", "bar")).to eq '<span class="help-text translation-missing"></span>'
-      end
-    end
-  end
-
   describe "#relations_icon" do
     context "when configured to use the geometry type" do
       before do
@@ -336,7 +213,7 @@ describe GeoblacklightHelper, type: :helper do
     context "viewing bookmarks" do
       let(:controller_name) { "bookmarks" }
 
-      it "returns bookmarks data-map selector" do
+      it "returns bookmarks data-page selector" do
         expect(results_js_map_selector(controller_name)).to eq "bookmarks"
       end
     end
@@ -344,7 +221,7 @@ describe GeoblacklightHelper, type: :helper do
     context "viewing catalog results" do
       let(:controller_name) { "catalog" }
 
-      it "returns index data-map selector" do
+      it "returns index data-page selector" do
         expect(results_js_map_selector(controller_name)).to eq "index"
       end
     end
@@ -352,51 +229,9 @@ describe GeoblacklightHelper, type: :helper do
     context "calling outside of intended scope" do
       let(:controller_name) { "outside" }
 
-      it "returns default data-map value" do
+      it "returns default data-page value" do
         expect(results_js_map_selector(controller_name)).to eq "index"
       end
     end
   end
-
-  describe "#viewer_container" do
-    let(:document) { SolrDocument.new(document_attributes) }
-    let(:references_field) { Settings.FIELDS.REFERENCES }
-    let(:rights_field) { Settings.FIELDS.RIGHTS }
-
-    context "with pmtiles layer" do
-      let(:document_attributes) do
-        {
-          references_field => {
-            "https://github.com/protomaps/PMTiles" => "https://geodata.lib.princeton.edu/fe/d2/80/fed28076eaa04506b7956f10f61a2f77/display_vector.pmtiles"
-          }.to_json
-        }
-      end
-
-      it "renders an OpenLayers container" do
-        allow(helper).to receive(:geoblacklight_basemap).and_return("esri")
-        assign(:document, document)
-        node = Capybara.string(helper.viewer_container)
-        div = node.first("div")
-        expect(div[:id]).to eq "ol-map"
-      end
-    end
-
-    context "with iiif manifest layer" do
-      let(:document_attributes) do
-        {
-          references_field => {
-            "http://iiif.io/api/presentation#manifest" => "https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll229/3210/manifest.json"
-          }.to_json
-        }
-      end
-
-      it "renders a Clover IIIF container" do
-        allow(helper).to receive(:geoblacklight_basemap).and_return("esri")
-        assign(:document, document)
-        node = Capybara.string(helper.viewer_container)
-        div = node.first("div")
-        expect(div[:id]).to eq "clover-viewer"
-      end
-    end
-  end
 end

data/spec/lib/geoblacklight/download/csv_download_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Geoblacklight::CsvDownload do
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => "test", :solr_wfs_url => "http://www.example.com/wfs", Settings.FIELDS.WXS_IDENTIFIER => "stanford-test", Settings.FIELDS.GEOMETRY => "ENVELOPE(-180, 180, 90, -90)") }
+  let(:download) { described_class.new(document) }
+  describe "#initialize" do
+    it "initializes as a CsvDownload object with specific options" do
+      expect(download).to be_an described_class
+      options = download.instance_variable_get(:@options)
+      expect(options[:content_type]).to eq "text/csv"
+      expect(options[:request_params][:typeName]).to eq "stanford-test"
+    end
+    it "merges custom options" do
+      download = described_class.new(document, timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
+  end
+end

data/spec/lib/geoblacklight/geometry_spec.rb

@@ -57,19 +57,4 @@ describe Geoblacklight::Geometry do
       end
     end
   end
-  describe "#bounding_box for a document with no geometry" do
-    it "warns that GeoBlacklight 5 raises instead of falling back to the whole world" do
-      expect(Geoblacklight.deprecation).to receive(:warn).with(
-        /#bounding_box falls back to the whole world extent/
-      )
-
-      expect(described_class.new("").bounding_box).to be_a String
-    end
-
-    it "does not warn for a document that has geometry" do
-      expect(Geoblacklight.deprecation).not_to receive(:warn)
-
-      described_class.new("ENVELOPE(-1,1,1,-1)").bounding_box
-    end
-  end
 end