Ap 709: Update Geodata to use Geoblacklight 5.3.0; AP-714: Update Geodata to use Ruby 3.4 by yzhoubk · Pull Request #76 · BerkeleyLibrary/geodata

yzhoubk · 2026-06-24T20:27:57Z

Integrated a Geoblacklight instance into the current GeoData
Updated to use Ruby 3.4.9
Temporarily excluded Rspec test in build.yml , it will revered back in AP-754 during add/update test.

anarchivist

looks okay - but i have a lot of questions. do we really intend to get rid a majority of the ERB templates and the css overrides?

anarchivist · 2026-06-25T18:30:55Z

ditto this - i know the last change to your file was to update the logos, so do we need to retain this?

Yes, this has been moved to the legacy folder so it can be reused later if needed.

anarchivist · 2026-06-25T18:31:28Z

+@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");
+
+@import 'customizations';


importing the customizations should probably happen last as it will override all the other rules.

yes, updated.

jason-raitz

This is a lot to go through. I've added some suggestions, comments, and questions. I'm also wondering if we should merge this into an upgrade branch first, since we have follow on work to do?

jason-raitz · 2026-06-29T14:28:59Z

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>


Screen readers do better if given the language.

Suggested change

<html>

<html lang="en-US">

On GeoData site, the content may include language other than English.

jason-raitz · 2026-06-29T14:30:24Z

+  <head>
+    <title><%= content_for(:title) || "Geodata V5" %></title>


Should probably include the charset here.

Suggested change

<head>

<title><%= content_for(:title) || "Geodata V5" %></title>

<head>

<meta charset="utf-8">

<title><%= content_for(:title) || "Geodata V5" %></title>

We can look into this while reviewing the UI updates for accessibility.

jason-raitz · 2026-06-29T14:45:19Z

+    config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD,
+                                                     label: 'Bounding Box'


Did anything change here? or is this just formatting? If just formatting, maybe we could make it easier to read? I think the following would work, but I do struggle to remember the intricacies of ruby formatting.

Suggested change

config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD,

label: 'Bounding Box'

config.add_facet_field Settings.FIELDS.GEOMETRY,

item_presenter: Geoblacklight::BboxItemPresenter,

filter_class: Geoblacklight::BboxFilterField,

filter_query_builder: Geoblacklight::BboxFilterQuery,

within_boost: Settings.BBOX_WITHIN_BOOST,

overlap_boost: Settings.OVERLAP_RATIO_BOOST,

overlap_field: Settings.FIELDS.OVERLAP_FIELD,

label: 'Bounding Box'

These are the original setup from the new GeoBlacklight instance. We'll address these files in future tickets.

jason-raitz · 2026-06-29T14:51:24Z

@@ -125,69 +135,88 @@ DISPLAY_NOTES_SHOWN:
    icon: triangle-exclamation-solid
    note_prefix: "Warning: "

-# Web services shown in tool panel
-WEBSERVICES_SHOWN:
-  # - 'wms'
-  - 'tms'
-  # - 'wfs'
-  - 'xyz'
-  - 'wmts'
-  - 'tilejson'
-  - 'iiif'
-  - 'feature_layer'
-  - 'tiled_map_layer'
-  - 'dynamic_map_layer'
-  - 'image_map_layer'
-  - 'cog'
-  - 'pmtiles'
-
 # Relationships to display


I'm not really familiar with the webservices yet. Why did we add in 'wms' and 'wfs' here?

This is the GeoBlacklight's original configuration (likely from Stanford0. The original setup doesn't include geoServer but we have GeoServer. We'll address these files in future ticket.

jason-raitz · 2026-06-29T14:54:04Z

 gem 'devise'
 gem 'devise-guests', '~> 0.8'
-gem 'geoblacklight', '~> 4.4.2'
+gem 'geoblacklight'


Should we specify geoblacklight 5.3 here?

This is the from the new Geoblacklight instance. We have another ticket (AP-710) for updating gem. I'll add it to that ticket.

yzhoubk · 2026-06-29T16:48:47Z

This is a lot to go through. I've added some suggestions, comments, and questions. I'm also wondering if we should merge this into an upgrade branch first, since we have follow on work to do?

Dan has a temporary workflow for staging and production deployments, so it is should be fine for us to use Main branch for this ticket.

yzhoubk added 13 commits June 22, 2026 09:37

integrate geobalcklight 5.3 to geodata repo

cce5fac

Add gitignore

27192b7

clean gem file

ef15f5e

add back ominiauth call back and session

be2819c

sitemap

3217d2d

add ucb images

574c91a

AP-714

2fc6f59

temporiarly remove CI test

3fe5408

temporially remove running rubocop

9ace261

enable runing rubocop and fix rubcop errors

00fd213

change to original formats

23a2468

bin/thrust

765686f

remove vite folder from .gitignore

f61e9b7

yzhoubk requested review from anarchivist and jason-raitz June 24, 2026 20:47

anarchivist reviewed Jun 25, 2026

View reviewed changes

yzhoubk added 3 commits June 25, 2026 14:04

keep the legacy css files

34c6f3d

change bootstrap file importing order

c0d764f

keep calnet old code for reference

62207bb

jason-raitz reviewed Jun 29, 2026

View reviewed changes

yzhoubk merged commit a8ce391 into main Jun 29, 2026
5 checks passed

yzhoubk deleted the AP-709 branch June 29, 2026 16:49

		<head>
		<title><%= content_for(:title) \|\| "Geodata V5" %></title>

		config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD,
		label: 'Bounding Box'

Uh oh!

Conversation

yzhoubk commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anarchivist left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jason-raitz left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yzhoubk commented Jun 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

yzhoubk commented Jun 24, 2026 •

edited

Loading