geoblacklight 6.0.0.pre.alpha.2 → 6.0.0.pre.alpha.3

data/app/components/geoblacklight/homepage_feature_facet_component.rb

@@ -15,7 +15,7 @@ module Geoblacklight
         item_presenter = @facet_field_presenter.item_presenter(item)
         link_to(item_presenter.value, item_presenter.href, class: "home-facet-link")
       end
-      links << link_to("more »", facet_catalog_path(@facet_field_presenter.key), class: "more_facets_link")
+      links << link_to(I18n.t("geoblacklight.home.more_facets_link"), facet_catalog_path(@facet_field_presenter.key), class: "more_facets_link")
       safe_join(links, ", ")
     end
   end

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

@@ -1,5 +1,12 @@
 <%= render Geoblacklight::AccordionComponent.new(id: 'index-map-attributes', title: t('geoblacklight.show.table_name')) do %>
-  <div class="viewer-information px-3">
+  <div class="viewer-information px-3"
+    data-website-label="<%= t('geoblacklight.map.index.website_label') %>"
+    data-download-label="<%= t('geoblacklight.map.index.download_label') %>"
+    data-record-identifier-label="<%= t('geoblacklight.map.index.record_identifier_label') %>"
+    data-label-label="<%= t('geoblacklight.map.index.label_label') %>"
+    data-note-label="<%= t('geoblacklight.map.index.note_label') %>"
+    data-selected-feature="<%= t('geoblacklight.map.index.selected_feature') %>"
+    data-download-text="<%= t('geoblacklight.download.download') %>">
     <em><%= t('geoblacklight.show.click_map') %></em>
   </div>
 <% end %>

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

@@ -1,14 +1,14 @@
 <div class="index-map-legend">
   <div class="index-map-legend-info">
     <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:DEFAULT).color %>"></div>
-    <div><span class="visually-hidden"><%= index_config.dig(:DEFAULT).sr_color_name %> tile indicates </span>Map held by collection</div>
+    <div><span class="visually-hidden"><%= t('geoblacklight.map.legend.sr_tile_indicates', color: index_config.dig(:DEFAULT).sr_color_name) %></span><%= t('geoblacklight.map.legend.held') %></div>
   </div>
   <div class="index-map-legend-info">
     <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:UNAVAILABLE).color %>"></div>
-    <div><span class="visually-hidden"><%= index_config.dig(:UNAVAILABLE).sr_color_name %> tile indicates </span>Map not held by collection</div>
+    <div><span class="visually-hidden"><%= t('geoblacklight.map.legend.sr_tile_indicates', color: index_config.dig(:UNAVAILABLE).sr_color_name) %></span><%= t('geoblacklight.map.legend.not_held') %></div>
   </div>
   <div class="index-map-legend-info">
     <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:SELECTED).color %>"></div>
-    <div><span class="visually-hidden"><%= index_config.dig(:SELECTED).sr_color_name %> tile indicates </span>Selected map tile</div>
+    <div><span class="visually-hidden"><%= t('geoblacklight.map.legend.sr_tile_indicates', color: index_config.dig(:SELECTED).sr_color_name) %></span><%= t('geoblacklight.map.legend.selected') %></div>
   </div>
 </div>

data/app/components/geoblacklight/location_leaflet_map_component.rb

@@ -27,10 +27,17 @@ module Geoblacklight
     # Add top-level geosearch control to leaflet options if configured
     def leaflet_options
       config.leaflet_options.deep_dup.tap do |options|
-        options.controls = {"Geosearch" => @geosearch} if @geosearch
+        options.controls = {"Geosearch" => geosearch_options} if @geosearch
       end
     end
 
+    def geosearch_options
+      {
+        search_here_text: I18n.t("geoblacklight.map.geosearch.search_here"),
+        search_when_moved_text: I18n.t("geoblacklight.map.geosearch.search_when_moved")
+      }.merge(@geosearch)
+    end
+
     def config
       Geoblacklight.configuration
     end

data/app/components/geoblacklight/web_services_link_component.rb

@@ -11,7 +11,7 @@ module Geoblacklight
 
     def call
       link_to(
-        "Web services",
+        I18n.t("geoblacklight.references.services"),
         helpers.web_services_solr_document_path(id: document.id),
         class: "nav-link",
         data: {blacklight_modal: "trigger"}

data/app/helpers/geoblacklight_helper.rb

@@ -40,7 +40,10 @@ module GeoblacklightHelper
   # get_field_values method
   # @param [Hash] args from get_field_values
   def render_value_as_truncate_abstract(args)
-    tag.div class: "truncate-abstract" do
+    tag.div class: "truncate-abstract", data: {
+      read_more_text: t("geoblacklight.truncate.read_more"),
+      close_text: t("geoblacklight.truncate.close")
+    } do
       Array(args[:value]).flatten.join(" ")
     end
   end

data/app/javascript/geoblacklight/controllers/downloads_controller.js

@@ -10,7 +10,7 @@ export default class extends Controller {
     ev.target.classList.add("download-in-progress")
     const url = ev.target.dataset.downloadPath
     ev.target.removeAttribute("href")
-    ev.target.innerHTML = '<div class="spinner-border spinner-border-sm float-end"></div> Preparing download...'
+    ev.target.innerHTML = `<div class="spinner-border spinner-border-sm float-end"></div> ${ev.target.dataset.downloadPreparingMessage}`
 
     fetch(url)
       .then((response) => {
@@ -31,7 +31,7 @@ export default class extends Controller {
     this.downloading = false
     target.classList.remove("download-in-progress")
     target.classList.add("download-complete")
-    target.innerHTML = `Download ready (${target.dataset.downloadType})`
+    target.innerHTML = target.dataset.downloadReadyMessage
     target.href = data[1]
     this.renderMessage(data[0])
     //target.click();
@@ -41,7 +41,7 @@ export default class extends Controller {
     this.downloading = false
     target.classList.remove("download-in-progress")
     target.classList.add("download-complete")
-    target.innerHTML = `Download failed (${target.dataset.downloadType})`
+    target.innerHTML = target.dataset.downloadFailedMessage
     console.log(exception)
 
     this.renderMessage(exception.data[0])

data/app/javascript/geoblacklight/initializers/truncation.js

@@ -11,6 +11,8 @@ class Truncator {
     // set a unique ID for the element if it doesn't have one
     this.element = element
     this.element.id ||= id
+    this.readMoreText = element.dataset.readMoreText
+    this.closeText = element.dataset.closeText
 
     // add the button
     this.button = document.createElement("button")
@@ -19,7 +21,7 @@ class Truncator {
     this.button.dataset.bsTarget = `#${this.element.id}`
     this.button.setAttribute("aria-expanded", "false")
     this.button.setAttribute("aria-controls", this.element.id)
-    this.button.textContent = "Read more"
+    this.button.textContent = this.readMoreText
     this.button.addEventListener("click", this.toggle.bind(this))
     element.parentNode.insertBefore(this.button, element.nextSibling)
 
@@ -28,8 +30,8 @@ class Truncator {
   }
 
   toggle() {
-    if (this.button.textContent == "Read more") this.button.textContent = "Close"
-    else this.button.textContent = "Read more"
+    if (this.button.textContent == this.readMoreText) this.button.textContent = this.closeText
+    else this.button.textContent = this.readMoreText
   }
 }
 

data/app/javascript/geoblacklight/leaflet/controls/geosearch.js

@@ -4,6 +4,8 @@ import { debounce, boundsToBbox } from "geoblacklight/leaflet/utils"
 export const geosearchDefaultOptions = {
   dynamic: true,
   delay: 800,
+  search_here_text: "Search here",
+  search_when_moved_text: "Search when I move the map",
 }
 
 export default class GeoSearchControl extends Control {
@@ -51,7 +53,7 @@ export default class GeoSearchControl extends Control {
     staticButtonNode.setAttribute("href", "#")
     staticButtonNode.setAttribute("style", "display:none;")
     staticButtonNode.className = "btn btn-primary shadow"
-    staticButtonNode.textContent = "Search here"
+    staticButtonNode.textContent = this.options.search_here_text
     staticButtonNode.addEventListener("click", this.staticSearch.bind(this))
     return staticButtonNode
   }
@@ -61,7 +63,7 @@ export default class GeoSearchControl extends Control {
     const dynamicButtonNode = DomUtil.create("label")
     dynamicButtonNode.setAttribute("id", "gbl-dynamic-button")
     dynamicButtonNode.className = "btn shadow border form-check-label"
-    dynamicButtonNode.textContent = " Search when I move the map"
+    dynamicButtonNode.textContent = ` ${this.options.search_when_moved_text}`
     dynamicButtonNode.setAttribute("style", "display:none;")
     dynamicButtonNode.setAttribute("for", "gbl-dynamic-search-toggle")
     const input = DomUtil.create("input")

data/app/javascript/geoblacklight/leaflet/inspection.js

@@ -1,5 +1,12 @@
 import { identifyFeatures } from "esri-leaflet"
-import { appendErrorMessage, appendLoadingMessage, getLayerOpacity, linkify } from "geoblacklight/leaflet/utils"
+import {
+  appendErrorMessage,
+  appendLoadingMessage,
+  getInspectingText,
+  getLayerOpacity,
+  getNotFoundText,
+  linkify,
+} from "geoblacklight/leaflet/utils"
 
 export const wmsInspection = (map, url, layerId, layer) => {
   // add crosshair class for map items
@@ -9,8 +16,7 @@ export const wmsInspection = (map, url, layerId, layer) => {
   map.on("click", async (e) => {
     const spinner = document.createElement("tbody")
     spinner.className = "attribute-table-body"
-    spinner.innerHTML =
-      '<tr><td colspan="2"><div class="spinner-border" role="status"><span class="visually-hidden">Inspecting</span></div></td></tr>'
+    spinner.innerHTML = `<tr><td colspan="2"><div class="spinner-border" role="status"><span class="visually-hidden">${getInspectingText()}</span></div></td></tr>`
     document.querySelector(".attribute-table-body").replaceWith(spinner)
 
     const wmsoptions = {
@@ -43,8 +49,7 @@ export const wmsInspection = (map, url, layerId, layer) => {
         response_data.hasOwnProperty("exceptions") ||
         response_data.features.length === 0
       ) {
-        document.querySelector(".attribute-table-body").innerHTML =
-          '<tr><td colspan="2">Could not find that feature</td></tr>'
+        document.querySelector(".attribute-table-body").innerHTML = `<tr><td colspan="2">${getNotFoundText()}</td></tr>`
         return
       }
       const data = response_data.features[0]

data/app/javascript/geoblacklight/leaflet/layer_index_map.js

@@ -1,4 +1,4 @@
-const indexMapInfoTemplate = (data) => `
+const indexMapInfoTemplate = (data, labels) => `
   <div class="index-map-info">
     ${
       data.title
@@ -27,35 +27,35 @@ const indexMapInfoTemplate = (data) => `
         ${
           data.websiteUrl
             ? `
-          <dt class="col-sm-3">Website:</dt>
+          <dt class="col-sm-3">${labels.websiteLabel}</dt>
           <dd class="col-sm-9"><a href="${data.websiteUrl}">${data.websiteUrl}</a></dd>`
             : ""
         }
         ${
           data.downloadUrl
             ? `
-          <dt class="col-sm-3">Download:</dt>
+          <dt class="col-sm-3">${labels.downloadLabel}</dt>
           <dd class="col-sm-9"><a href="${data.downloadUrl}">${data.downloadUrl}</a></dd>`
             : ""
         }
         ${
           data.recordIdentifier
             ? `
-          <dt class="col-sm-3">Record Identifier:</dt>
+          <dt class="col-sm-3">${labels.recordIdentifierLabel}</dt>
           <dd class="col-sm-9">${data.recordIdentifier}</dd>`
             : ""
         }
         ${
           data.label
             ? `
-          <dt class="col-sm-3">Label:</dt>
+          <dt class="col-sm-3">${labels.labelLabel}</dt>
           <dd class="col-sm-9">${data.label}</dd>`
             : ""
         }
         ${
           data.note
             ? `
-          <dt class="col-sm-3">Note:</dt>
+          <dt class="col-sm-3">${labels.noteLabel}</dt>
           <dd class="col-sm-9">${data.note}</dd>`
             : ""
         }
@@ -63,16 +63,16 @@ const indexMapInfoTemplate = (data) => `
     </div>
   </div>`
 
-const indexMapDownloadTemplate = (data) =>
+const indexMapDownloadTemplate = (data, labels) =>
   data.downloadUrl
     ? `
   <li class="list-group-item download js-index-map-feature">
-    <h3 class="card-subtitle">Selected feature</h3>
+    <h3 class="card-subtitle">${labels.selectedFeature}</h3>
     <ul class="list-group list-group-flush list-group-nested">
       <li class="list-group-item download">
         <div class="download-link-container">
           <a class="btn btn-default download download-original" href="${data.downloadUrl}">
-            ${data.label ? data.label : "Download"}
+            ${data.label ? data.label : labels.downloadText}
           </a>
         </div>
       </li>
@@ -110,11 +110,14 @@ export const availabilityStyle = (availability, leafletOptions) => {
 }
 
 export const updateInformation = (properties) => {
+  const informationContainer = document.querySelector(".viewer-information")
+  const labels = informationContainer.dataset
+
   indexMapTemplate(properties).then((updatedProperties) => {
-    const indexMapHtml = indexMapInfoTemplate(updatedProperties)
-    document.querySelector(".viewer-information").innerHTML = indexMapHtml
+    const indexMapHtml = indexMapInfoTemplate(updatedProperties, labels)
+    informationContainer.innerHTML = indexMapHtml
 
-    const indexMapDownloadHtml = indexMapDownloadTemplate(updatedProperties)
+    const indexMapDownloadHtml = indexMapDownloadTemplate(updatedProperties, labels)
     const downloadElement = document.querySelector(".js-download-list")
 
     if (Boolean(downloadElement)) {

data/app/javascript/geoblacklight/leaflet/utils.js

@@ -49,10 +49,16 @@ export const getTileJsonBounds = (doc) => {
   }
 }
 
+export const getInspectingText = () =>
+  document.getElementById("attribute-table")?.dataset.inspectingText || "Inspecting"
+
+export const getNotFoundText = () =>
+  document.getElementById("attribute-table")?.dataset.notFoundText || "Could not find that feature"
+
 export const appendLoadingMessage = () => {
   const spinner = `<tbody class="attribute-table-body"><tr><td colspan="2">
     <span id="attribute-table">
-    <div class="spinner-border" role="status"><span class="visually-hidden">Inspecting</span></div>
+    <div class="spinner-border" role="status"><span class="visually-hidden">${getInspectingText()}</span></div>
     </span>
     </td></tr></tbody>`
 
@@ -61,7 +67,7 @@ export const appendLoadingMessage = () => {
 
 export const appendErrorMessage = () => {
   document.querySelector(".attribute-table-body").innerHTML = `<tbody class="attribute-table-body">
-    <tr><td colspan="2">Could not find that feature</td></tr></tbody>`
+    <tr><td colspan="2">${getNotFoundText()}</td></tr></tbody>`
 }
 
 // Looks for strings that could be URLs and wraps them in <a> tags

data/app/javascript/geoblacklight/openlayers/inspection.js

@@ -1,4 +1,4 @@
-import { linkify } from "geoblacklight/leaflet/utils"
+import { getInspectingText, getNotFoundText, linkify } from "geoblacklight/leaflet/utils"
 
 export const pmTilesInspection = (map) => {
   // add crosshair class for map items
@@ -11,14 +11,12 @@ export const pmTilesInspection = (map) => {
   map.on("click", (event) => {
     const spinner = document.createElement("tbody")
     spinner.className = "attribute-table-body"
-    spinner.innerHTML =
-      '<tr><td colspan="2"><div class="spinner-border" role="status"><span class="visually-hidden">Inspecting</span></div></td></tr>'
+    spinner.innerHTML = `<tr><td colspan="2"><div class="spinner-border" role="status"><span class="visually-hidden">${getInspectingText()}</span></div></td></tr>`
     document.querySelector(".attribute-table-body").replaceWith(spinner)
 
     const features = map.getFeaturesAtPixel(event.pixel)
     if (features.length == 0) {
-      document.querySelector(".attribute-table-body").innerHTML =
-        '<tr><td colspan="2">Could not find that feature</td></tr>'
+      document.querySelector(".attribute-table-body").innerHTML = `<tr><td colspan="2">${getNotFoundText()}</td></tr>`
       return
     }
 

data/app/views/catalog/metadata/_markup.html.erb

@@ -1,6 +1,6 @@
 <div id="metadata-markup-container" class="container-fluid">
   <div class="alert alert-warning" role="alert">
-    <span class="visually-hidden">Error:</span>
+    <span class="visually-hidden"><%= t('geoblacklight.metadata.error_label') %></span>
     <span><%= t('geoblacklight.metadata.transform_error') %></span>
   </div>
   <%= CodeRay.scan(content, :xml).div.html_safe %>

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

@@ -8,7 +8,7 @@
     </div>
   <% end %>
   <% component.with_footer do %>
-    <a href="#" target="_blank" rel="noopener noreferrer" id="btn-metadata-download" class="btn btn-primary">Download</a>
+    <a href="#" target="_blank" rel="noopener noreferrer" id="btn-metadata-download" class="btn btn-primary"><%= t('geoblacklight.download.download') %></a>
     <button type="button" class="btn btn-secondary" data-bl-dismiss="modal"><%= t('blacklight.modal.close') %></button>
   <% end %>
 <% end %>

data/config/locales/geoblacklight.en.yml

@@ -17,6 +17,9 @@ en:
       export_geojson_link: "GeoJSON"
       export_geotiff_link: "GeoTIFF"
       export_csv_link: "CSV"
+      preparing: "Preparing download..."
+      ready: "Download ready (%{type})"
+      failed: "Download failed (%{type})"
     home:
       headline: "Explore and discover..."
       search_heading: "Find the maps and data you need"
@@ -27,6 +30,7 @@ en:
       placename: "Placename"
       subject: "Subject"
       version: "GeoBlacklight version %{version}"
+      more_facets_link: "more »"
     tools:
       login_to_view: "Login to View and Download"
       open_arcgis: "Open in ArcGIS Online"
@@ -42,6 +46,27 @@ en:
       sqlite_database: "SQLite Database"
     map:
       label: "Zoomable map"
+      geosearch:
+        search_here: "Search here"
+        search_when_moved: "Search when I move the map"
+      index:
+        website_label: "Website:"
+        download_label: "Download:"
+        record_identifier_label: "Record Identifier:"
+        label_label: "Label:"
+        note_label: "Note:"
+        selected_feature: "Selected feature"
+      legend:
+        held: "Map held by collection"
+        not_held: "Map not held by collection"
+        selected: "Selected map tile"
+        sr_tile_indicates: "%{color} tile indicates "
+        colors:
+          default: "Green"
+          unavailable: "Yellow"
+          selected: "Blue"
+      sleep:
+        click_to_wake: "Click to Wake"
     references:
       wms: "Web Mapping Service (WMS)"
       wms_abv: "WMS"
@@ -84,17 +109,23 @@ en:
     modal:
       copy-citation: "Copy Citation"
     metadata:
+      error_label: "Error:"
       metadata_error: The metadata view for selected schema is not available
       metadata_trace: Please select another metadata view. Alternately, try downloading the file or reaching out to the holding institution.
       more_details: More details at
       toggle_summary: Toggle summary
       transform_error: HTML view for selected schema is not available
       view_metadata: View Metadata
+    truncate:
+      read_more: "Read more"
+      close: "Close"
     show:
       attribute: "Attribute"
       value: "Value"
       click_map: "Click on map to inspect values"
       table_name: "Map data"
+      inspecting: "Inspecting"
+      not_found: "Could not find that feature"
     help_text:
       viewer_protocol:
         cog:

data/geoblacklight.gemspec

@@ -18,17 +18,17 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.2.0"
   spec.required_rubygems_version = ">= 2.5.2"
 
-  spec.add_dependency "rails", ">= 6.1", "< 9"
+  spec.add_dependency "rails", ">= 8", "< 9"
   spec.add_dependency "blacklight", ">= 8.0", "< 10"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"
+  spec.add_dependency "faraday-follow_redirects"
   spec.add_dependency "coderay"
   spec.add_dependency "deprecation"
-  spec.add_dependency "geo_combine", "~> 0.9"
+  spec.add_dependency "geo_combine", "~> 0.10"
   spec.add_dependency "mime-types"
   spec.add_dependency "rgeo-geojson"
   spec.add_dependency "rsolr"
-  spec.add_dependency "zeitwerk"
 
   spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "rspec-rails"