Skip to content

Commit

Permalink
Merge branch 'release/5.12.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewlarson
ewlarson committed Jan 6, 2025
2 parents 0056075 + 8edc58c commit eec7bb5
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 41 deletions.
80 changes: 41 additions & 39 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_record_query_trace (1.8.2)
active_record_query_trace (1.8.3)
activerecord (>= 6.0.0)
active_storage_validations (1.3.5)
active_storage_validations (1.4.0)
activejob (>= 6.1.4)
activemodel (>= 6.1.4)
activestorage (>= 6.1.4)
Expand Down Expand Up @@ -129,7 +129,7 @@ GEM
net-http-persistent
amazing_print (1.6.0)
ansi (1.5.0)
appsignal (4.2.2)
appsignal (4.3.2)
logger
rack
attr_json (2.5.0)
Expand All @@ -138,16 +138,16 @@ GEM
execjs (~> 2)
awesome_print (1.9.2)
aws-eventstream (1.3.0)
aws-partitions (1.1023.0)
aws-sdk-core (3.214.0)
aws-partitions (1.1031.0)
aws-sdk-core (3.214.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.176.1)
aws-sdk-s3 (1.177.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand All @@ -164,7 +164,7 @@ GEM
base64 (0.2.0)
bcp47_spec (0.2.1)
bcrypt (3.1.20)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
bindex (0.8.1)
blacklight (7.33.1)
deprecation
Expand Down Expand Up @@ -238,7 +238,7 @@ GEM
connection_pool (2.4.1)
content_disposition (1.0.0)
crass (1.0.6)
csv (3.3.1)
csv (3.3.2)
database_cleaner (2.1.0)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.2.0)
Expand Down Expand Up @@ -275,41 +275,42 @@ GEM
down (5.4.2)
addressable (~> 2.8)
dry-cli (1.2.0)
dry-configurable (1.2.0)
dry-core (~> 1.0, < 2)
dry-configurable (1.3.0)
dry-core (~> 1.1)
zeitwerk (~> 2.6)
dry-core (1.0.2)
dry-core (1.1.0)
concurrent-ruby (~> 1.0)
logger
zeitwerk (~> 2.6)
dry-inflector (1.1.0)
dry-initializer (3.1.1)
dry-logic (1.5.0)
dry-inflector (1.2.0)
dry-initializer (3.2.0)
dry-logic (1.6.0)
bigdecimal
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
dry-core (~> 1.1)
zeitwerk (~> 2.6)
dry-schema (1.13.4)
dry-schema (1.14.0)
concurrent-ruby (~> 1.0)
dry-configurable (~> 1.0, >= 1.0.1)
dry-core (~> 1.0, < 2)
dry-initializer (~> 3.0)
dry-logic (>= 1.4, < 2)
dry-types (>= 1.7, < 2)
dry-core (~> 1.1)
dry-initializer (~> 3.2)
dry-logic (~> 1.5)
dry-types (~> 1.8)
zeitwerk (~> 2.6)
dry-types (1.7.2)
dry-types (1.8.0)
bigdecimal (~> 3.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
dry-inflector (~> 1.0)
dry-logic (~> 1.4)
zeitwerk (~> 2.6)
dry-validation (1.10.0)
dry-validation (1.11.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
dry-initializer (~> 3.0)
dry-schema (>= 1.12, < 2)
dry-core (~> 1.1)
dry-initializer (~> 3.2)
dry-schema (~> 1.14)
zeitwerk (~> 2.6)
dumb_delegator (1.0.0)
dumb_delegator (1.1.0)
erubi (1.13.1)
ethon (0.16.0)
ffi (>= 1.15.0)
Expand All @@ -332,8 +333,8 @@ GEM
net-http-persistent (>= 4.0.4, < 5)
faraday-retry (2.2.1)
faraday (~> 2.0)
fastimage (2.3.1)
ffi (1.17.0)
fastimage (2.4.0)
ffi (1.17.1)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
Expand Down Expand Up @@ -365,7 +366,7 @@ GEM
rgeo-geojson
sprockets-rails (~> 3.0)
vite_rails (~> 3.0)
geoblacklight_admin (0.6.2)
geoblacklight_admin (0.6.3)
active_storage_validations (~> 1.0)
amazing_print
blacklight (~> 7.33)
Expand Down Expand Up @@ -498,7 +499,7 @@ GEM
ffi-compiler (~> 1.0)
rake (~> 13.0)
logger (1.6.4)
loofah (2.23.1)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
m (1.5.1)
Expand Down Expand Up @@ -550,7 +551,7 @@ GEM
uri
net-http-persistent (4.0.5)
connection_pool (~> 2.2)
net-imap (0.5.3)
net-imap (0.5.5)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -560,7 +561,7 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.17.2)
nokogiri (1.18.1)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
noticed (1.6.3)
Expand Down Expand Up @@ -609,7 +610,7 @@ GEM
rack (>= 1.2.0)
rack-proxy (0.7.7)
rack
rack-test (2.1.0)
rack-test (2.2.0)
rack (>= 1.3)
rails (7.0.8.7)
actioncable (= 7.0.8.7)
Expand Down Expand Up @@ -643,15 +644,15 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rchardet (1.8.0)
rchardet (1.9.0)
rdf (3.3.2)
bcp47_spec (~> 0.2)
bigdecimal (~> 3.1, >= 3.1.5)
link_header (~> 0.0, >= 0.0.8)
rdf-vocab (3.3.2)
rdf (~> 3.3)
redis (4.8.1)
regexp_parser (2.9.3)
regexp_parser (2.10.0)
request_store (1.7.0)
rack (>= 1.4)
responders (3.1.1)
Expand Down Expand Up @@ -688,11 +689,11 @@ GEM
ruby-vips (2.2.2)
ffi (~> 1.12)
logger
rubyzip (2.3.2)
rubyzip (2.4.1)
safely_block (0.4.1)
sanitize (6.1.3)
sanitize (7.0.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
nokogiri (>= 1.16.8)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand Down Expand Up @@ -831,7 +832,8 @@ GEM
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
whenever (1.0.0)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport

#### Release Version

B1G Geoportal Version v5.12.1 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.6.2
B1G Geoportal Version v5.12.1 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.6.3
5 changes: 5 additions & 0 deletions app/controllers/catalog_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ class CatalogController < ApplicationController
config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File Size', itemprop: 'file_size'
config.add_show_field Settings.FIELDS.B1G_LANGUAGE, label: 'Language', itemprop: 'language'
config.add_show_field Settings.FIELDS.B1G_DATE_CREATED, label: 'Date Added', helper_method: :render_date_created
config.add_show_field Settings.FIELDS.B1G_DCT_CONFORMS_TO, label: 'Conforms To', itemprop: 'conforms_to'
config.add_show_field Settings.FIELDS.B1G_DCAT_SPATIAL_RESOLUTION_IN_METERS, label: 'Spatial Resolution in Meters', itemprop: 'dcat_spatial_resolution'
config.add_show_field Settings.FIELDS.B1G_GEODCAT_SPATIAL_RESOLUTION_AS_TEXT, label: 'Spatial Resolution as Text', itemprop: 'geodcat_spatial_resolution'
config.add_show_field Settings.FIELDS.B1G_DCT_PROVENANCE_STATEMENT, label: 'Provenance Statement', itemprop: 'provenance_statement'
config.add_show_field Settings.FIELDS.B1G_DCT_EXTENT, label: 'Extent in square kilometers', itemprop: 'extent'

# "fielded" search configuration. Used by pulldown among other places.
# For supported keys in hash, see rdoc for Blacklight::SearchFields
Expand Down
7 changes: 6 additions & 1 deletion config/settings.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ FIELDS:
:TITLE: 'dct_title_s'
:VERSION: 'dct_isVersionOf_sm'
:WXS_IDENTIFIER: 'gbl_wxsIdentifier_s'
# B1G Custom Fields Geoportal / GEOMG
# B1G Custom Fields Geoportal / GBL Admin
:B1G_ACCESS: 'b1g_access_s'
:B1G_DATE_ACCESSIONED: 'b1g_dateAccessioned_sm'
:B1G_ACCRUAL_METHOD: 'b1g_dct_accrualMethod_s'
Expand All @@ -104,6 +104,11 @@ FIELDS:
:B1G_MEDIATOR: 'b1g_dct_mediator_sm'
:B1G_PUBLICATION_STATE: 'b1g_publication_state_s'
:B1G_IMPORT_ID: 'b1g_geom_import_id_ssi'
:B1G_DCT_CONFORMS_TO: 'b1g_dct_conformsTo_sm'
:B1G_DCT_EXTENT: 'b1g_dct_extent_sm'
:B1G_DCAT_SPATIAL_RESOLUTION_IN_METERS: 'b1g_dcat_spatialResolutionInMeters_sm'
:B1G_GEODCAT_SPATIAL_RESOLUTION_AS_TEXT: 'b1g_geodcat_spatialResolutionAsText_sm'
:B1G_DCT_PROVENANCE_STATEMENT: 'b1g_dct_provenanceStatement_sm'

GEOMONITOR_TOLERANCE: 0.8
#GOOGLE_ANALYTICS_ID: 'UA-XXXXX-X'
Expand Down

0 comments on commit eec7bb5

Please sign in to comment.