geoblacklight 6.0.0.pre.alpha.1 → 6.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667a2a369d04716624d762876de8359effeddac901e1d1f009adbb09791264fb
-  data.tar.gz: 5872171cbac68976a9219cb812a670a8cf5a2e222e809a31f93103deb4d7ab97
+  metadata.gz: 27ebf1180cdf9e04df845da4327b42faffb8ea25d0d413a6c01002de3a76bca7
+  data.tar.gz: 35d488fd9c044dc6ad70eb70d2f556d1905a7c409539a873ad03b53170aff318
 SHA512:
-  metadata.gz: f4f52fb72f6dad913341e735ece7a4b828886f70b17816f4c7ca497f4ecca97f7effdeb8f2daf4e33ae1f2ecfce2bd9ef0aec958fbe464a4081225b78e103887
-  data.tar.gz: 0a4d1b12e4a99c47ef0bb253b6bd2c7446c9a960e5f0a2441829dc1cb7c35d261620333ca323520486414e306a300f898e0298af5b0a3a94ea691236e9892bab
+  metadata.gz: 5e4bebeecb4d9e4432d2d143a78a8bfecf928ebd531c9ccc1482ca7fd9142582fb0cd1625e3d86fe67c7a3894981c3f2b0ce4b3fd7cd9176e340205abbad80c1
+  data.tar.gz: 4ab390333dfa7c877e580a4fe83470fcd04d615e166a3732371a8cc464193a54dc93dc0908bd7a87db70254f1b8193d39d204a3d1646fe35ccb4982e571ac1ca

data/.github/workflows/ruby.yml

@@ -72,6 +72,7 @@ jobs:
           RAILS_VERSION: ${{ matrix.rails_version }}
           SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
       - name: Upload coverage artifacts
+        if: always()
         uses: actions/upload-artifact@v7
         with:
           name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}"

data/app/components/geoblacklight/document/relations_container_component.html.erb

@@ -0,0 +1 @@
+<%= helpers.turbo_frame_tag "relations", src: relations_solr_document_path(document.id), target: "_top" %>

data/app/components/geoblacklight/document/relations_container_component.rb

@@ -0,0 +1,12 @@
+module Geoblacklight
+  module Document
+    class RelationsContainerComponent < ViewComponent::Base
+      def initialize(document:)
+        super()
+        @document = document
+      end
+
+      attr_reader :document
+    end
+  end
+end

data/app/components/geoblacklight/document/sidebar_component.html.erb

@@ -1,12 +1,11 @@
 <%= render_static_map_component %>
 <%= render_show_tools %>
 
-<div class="sidebar-buttons">
+<div class="sidebar-buttons mt-3">
   <% sidebar_buttons.each do | sidebar_button | %>
     <%= render sidebar_button %>
   <% end %>
 </div>
 
 <%= render_more_like_this %>
-
-<%= render "relations_container", document: document %>
+<%= render Geoblacklight::Document::RelationsContainerComponent.new(document: document) %>

data/app/components/geoblacklight/download_links_component.rb

@@ -15,7 +15,7 @@ module Geoblacklight
     end
 
     def downloadable?
-      helpers.document_available? && @document.downloadable?
+      helpers.document_available?(@document) && @document.downloadable?
     end
 
     def download_link_file(label, id, url)

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 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>
   <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 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>
   <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 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>
 </div>

data/app/components/geoblacklight/login_link_component.rb

@@ -11,7 +11,7 @@ module Geoblacklight
     end
 
     def render?
-      document.restricted? && document.same_institution? && !helpers.document_available?
+      document.restricted? && document.same_institution? && !helpers.user_signed_in?
     end
   end
 end

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

@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card static-map">
   <div class="card-header">
     <%= @label %>
   </div>

data/app/controllers/relation_controller.rb

@@ -7,7 +7,7 @@ class RelationController < ApplicationController
 
   def index
     @relations = Geoblacklight::Relation::RelationResponse.new(params[:id], repository)
-    render layout: !request.xhr?
+    render layout: !(request.xhr? || request.headers["Turbo-Frame"].present?)
   end
 
   private

data/app/helpers/geoblacklight_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GeoblacklightHelper
-  def document_available?(document = @document)
+  def document_available?(document)
     document.public? || (document.same_institution? && user_signed_in?)
   end
 

data/app/javascript/geoblacklight/core.js

@@ -1,6 +1,5 @@
 // Initializers
 import initializePopovers from "geoblacklight/initializers/popovers"
-import initializeRelations from "geoblacklight/initializers/relations"
 import initializeTooltips from "geoblacklight/initializers/tooltips"
 import initializeTruncation from "geoblacklight/initializers/truncation"
 import initializeMetadataDownload from "geoblacklight/initializers/metadata_download"
@@ -44,7 +43,6 @@ Geoblacklight.listeners().forEach((listener) =>
 
 // Register our initializers
 Geoblacklight.onLoad(initializePopovers)
-Geoblacklight.onLoad(initializeRelations)
 Geoblacklight.onLoad(initializeTooltips)
 Geoblacklight.onLoad(initializeTruncation)
 Geoblacklight.onLoad(initializeMetadataDownload)

data/app/views/relation/index.html.erb

@@ -1,3 +1,5 @@
-<%- Geoblacklight.configuration.relationships_shown.each do |relationship_type, rel_type_info| %>
-  <%= render Geoblacklight::RelationsComponent.new(relations: @relations, relationship_type:, rel_type_info:) %>
+<%= turbo_frame_tag "relations" do %>
+  <%- Geoblacklight.configuration.relationships_shown.each do |relationship_type, rel_type_info| %>
+    <%= render Geoblacklight::RelationsComponent.new(relations: @relations, relationship_type:, rel_type_info:) %>
+  <% end %>
 <% end %>

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

@@ -1,23 +1,25 @@
 # ArcGIS Online Base URL
-ARCGIS_BASE_URL: "https://www.arcgis.com/apps/mapviewer/index.html"
+arcgis_base_url: "https://www.arcgis.com/apps/mapviewer/index.html"
 
 # Download path can be configured using this setting
-#DOWNLOAD_PATH: "./tmp/cache/downloads"
+#download_path: "./tmp/cache/downloads"
 
 # The bq boost value for spatial search matches within a bounding box
-BBOX_WITHIN_BOOST: "10"
+bbox_within_boost: "10"
 
 # The bf boost value for overlap ratio
-OVERLAP_RATIO_BOOST: "2"
+overlap_ratio_boost: "2"
 
 # Homepage Map Geometry
 # Leave null to default to entire world
 # Add a stringified GeoJSON object to scope initial render (example from UMass)
-HOMEPAGE_MAP_GEOM: null
-# HOMEPAGE_MAP_GEOM: '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
+homepage_map_geom: null
+# homepage_map_geom: '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
 
-# Non-search-field GeoBlacklight application permitted params
-GBL_PARAMS:
+# Non-search-field GeoBlacklight application permitted params.
+# Values are left mixed-case on purpose: the uppercase symbols are WMS/OGC
+# request parameter names (BBOX, WIDTH, etc.) and must match what clients send.
+gbl_params:
   - :bbox
   - :email
   - :file
@@ -36,71 +38,68 @@ GBL_PARAMS:
   - :Y
 
 # Solr field mappings
-FIELDS:
-  :ACCESS_RIGHTS: "dct_accessRights_s"
-  :ALTERNATIVE_TITLE: "dct_alternative_sm"
-  :CENTROID: "dcat_centroid"
-  :CREATOR: "dct_creator_sm"
-  :DATE_ISSUED: "dct_issued_s"
-  :DATE_RANGE: "gbl_dateRange_drsim"
-  :DESCRIPTION: "dct_description_sm"
-  :DISPLAY_NOTE: "gbl_displayNote_sm"
-  :FORMAT: "dct_format_s"
-  :FILE_SIZE: "gbl_fileSize_s"
-  :GEOREFERENCED: "gbl_georeferenced_b"
-  :ID: "id"
-  :IDENTIFIER: "dct_identifier_sm"
-  :INDEX_YEAR: "gbl_indexYear_im"
-  :IS_PART_OF: "dct_isPartOf_sm"
-  :IS_REPLACED_BY: "dct_isReplacedBy_sm"
-  :THEME: "dcat_theme_sm"
-  :KEYWORD: "dcat_keyword_sm"
-  :LANGUAGE: "dct_language_sm"
-  :LICENSE: "dct_license_sm"
-  :MEMBER_OF: "pcdm_memberOf_sm"
-  :METADATA_VERSION: "gbl_mdVersion_s"
-  :MODIFIED: "gbl_mdModified_dt"
-  :OVERLAP_FIELD: "solr_bboxtype"
-  :PUBLISHER: "dct_publisher_sm"
-  :PROVIDER: "schema_provider_s"
-  :REFERENCES: "dct_references_s"
-  :RELATION: "dct_relation_sm"
-  :REPLACES: "dct_replaces_sm"
-  :RESOURCE_CLASS: "gbl_resourceClass_sm"
-  :RESOURCE_TYPE: "gbl_resourceType_sm"
-  :RIGHTS: "dct_rights_sm"
-  :RIGHTS_HOLDER: "dct_rightsHolder_sm"
-  :SOURCE: "dct_source_sm"
-  :SPATIAL_COVERAGE: "dct_spatial_sm"
-  :GEOMETRY: "locn_geometry"
-  :SUBJECT: "dct_subject_sm"
-  :SUPPRESSED: "gbl_suppressed_b"
-  :TEMPORAL_COVERAGE: "dct_temporal_sm"
-  :TITLE: "dct_title_s"
-  :VERSION: "dct_isVersionOf_sm"
-  :WXS_IDENTIFIER: "gbl_wxsIdentifier_s"
+fields:
+  access_rights: "dct_accessRights_s"
+  alternative_title: "dct_alternative_sm"
+  centroid: "dcat_centroid"
+  creator: "dct_creator_sm"
+  date_issued: "dct_issued_s"
+  date_range: "gbl_dateRange_drsim"
+  description: "dct_description_sm"
+  display_note: "gbl_displayNote_sm"
+  format: "dct_format_s"
+  file_size: "gbl_fileSize_s"
+  georeferenced: "gbl_georeferenced_b"
+  id: "id"
+  identifier: "dct_identifier_sm"
+  index_year: "gbl_indexYear_im"
+  is_part_of: "dct_isPartOf_sm"
+  is_replaced_by: "dct_isReplacedBy_sm"
+  theme: "dcat_theme_sm"
+  keyword: "dcat_keyword_sm"
+  language: "dct_language_sm"
+  license: "dct_license_sm"
+  member_of: "pcdm_memberOf_sm"
+  metadata_version: "gbl_mdVersion_s"
+  modified: "gbl_mdModified_dt"
+  overlap_field: "solr_bboxtype"
+  publisher: "dct_publisher_sm"
+  provider: "schema_provider_s"
+  references: "dct_references_s"
+  relation: "dct_relation_sm"
+  replaces: "dct_replaces_sm"
+  resource_class: "gbl_resourceClass_sm"
+  resource_type: "gbl_resourceType_sm"
+  rights: "dct_rights_sm"
+  rights_holder: "dct_rightsHolder_sm"
+  source: "dct_source_sm"
+  spatial_coverage: "dct_spatial_sm"
+  geometry: "locn_geometry"
+  subject: "dct_subject_sm"
+  suppressed: "gbl_suppressed_b"
+  temporal_coverage: "dct_temporal_sm"
+  title: "dct_title_s"
+  version: "dct_isVersionOf_sm"
+  wxs_identifier: "gbl_wxsIdentifier_s"
 
 # Institution deployed at
-INSTITUTION: "Stanford"
+institution: "Stanford"
 
 # Metadata shown in tool panel
-METADATA_SHOWN:
+metadata_shown:
   - "mods"
   - "fgdc"
   - "iso19139"
   - "html"
 
 # (For external Download) timeout and open_timeout parameters for Faraday
-TIMEOUT_DOWNLOAD: 180
+timeout_download: 180
 
 # (For WMS inspection) timeout and open_timeout parameters for Faraday
-TIMEOUT_WMS: 4
-
-# Use the geometry type for the data relations icon
-USE_GEOM_FOR_RELATIONS_ICON: false
+timeout_wms: 4
 
 # Web services shown in tool panel
-WEBSERVICES_SHOWN:
+webservices_shown:
   - "wms"
   - "tms"
   - "wfs"
@@ -116,7 +115,7 @@ WEBSERVICES_SHOWN:
   - "pmtiles"
 
 # Display Notes to display / Non-prefixed default bootstrap class is alert-secondary
-DISPLAY_NOTES_SHOWN:
+display_notes_shown:
   danger:
     bootstrap_alert_class: alert-danger
     icon: fire-solid
@@ -135,120 +134,125 @@ DISPLAY_NOTES_SHOWN:
     note_prefix: "Warning: "
 
 # Relationships to display
-RELATIONSHIPS_SHOWN:
-  MEMBER_OF_ANCESTORS:
+relationships_shown:
+  member_of_ancestors:
     field: pcdm_memberOf_sm
     icon: parent-item
-    inverse: :MEMBER_OF_DESCENDANTS
+    inverse: :member_of_descendants
     label: geoblacklight.relations.member_of_ancestors
     query_type: ancestors
-  MEMBER_OF_DESCENDANTS:
+  member_of_descendants:
     field: pcdm_memberOf_sm
     icon: child-item
-    inverse: :MEMBER_OF_ANCESTORS
+    inverse: :member_of_ancestors
     label: geoblacklight.relations.member_of_descendants
     query_type: descendants
-  PART_OF_ANCESTORS:
+  part_of_ancestors:
     field: dct_isPartOf_sm
     icon: parent-item
-    inverse: :PART_OF_DESCENDANTS
+    inverse: :part_of_descendants
     label: geoblacklight.relations.part_of_ancestors
     query_type: ancestors
-  PART_OF_DESCENDANTS:
+  part_of_descendants:
     field: dct_isPartOf_sm
     icon: child-item
-    inverse: :PART_OF_ANCESTORS
+    inverse: :part_of_ancestors
     label: geoblacklight.relations.part_of_descendants
     query_type: descendants
-  RELATION_ANCESTORS:
+  relation_ancestors:
     field: dct_relation_sm
     icon: nil
-    inverse: :RELATION_DESCENDANTS
+    inverse: :relation_descendants
     label: geoblacklight.relations.relation_ancestors
     query_type: ancestors
-  RELATION_DESCENDANTS:
+  relation_descendants:
     field: dct_relation_sm
     icon: nil
-    inverse: :RELATION_ANCESTORS
+    inverse: :relation_ancestors
     label: geoblacklight.relations.relation_descendants
     query_type: descendants
-  REPLACES_ANCESTORS:
+  replaces_ancestors:
     field: dct_replaces_sm
     icon: nil
-    inverse: :REPLACES_DESCENDANTS
+    inverse: :replaces_descendants
     label: geoblacklight.relations.replaces_ancestors
     query_type: ancestors
-  REPLACES_DESCENDANTS:
+  replaces_descendants:
     field: dct_replaces_sm
     icon: nil
-    inverse: :REPLACES_ANCESTORS
+    inverse: :replaces_ancestors
     label: geoblacklight.relations.replaces_descendants
     query_type: descendants
-  SOURCE_ANCESTORS:
+  source_ancestors:
     field: dct_source_sm
     icon: parent-item
-    inverse: :SOURCE_DESCENDANTS
+    inverse: :source_descendants
     label: geoblacklight.relations.source_ancestors
     query_type: ancestors
-  SOURCE_DESCENDANTS:
+  source_descendants:
     field: dct_source_sm
     icon: child-item
-    inverse: :SOURCE_ANCESTORS
+    inverse: :source_ancestors
     label: geoblacklight.relations.source_descendants
     query_type: descendants
-  VERSION_OF_ANCESTORS:
+  version_of_ancestors:
     field: dct_isVersionOf_sm
     icon: parent-item
-    inverse: :VERSION_OF_DESCENDANTS
+    inverse: :version_of_descendants
     label: geoblacklight.relations.version_of_ancestors
     query_type: ancestors
-  VERSION_OF_DESCENDANTS:
+  version_of_descendants:
     field: dct_isVersionOf_sm
     icon: child-item
-    inverse: :VERSION_OF_ANCESTORS
+    inverse: :version_of_ancestors
     label: geoblacklight.relations.version_of_descendants
     query_type: descendants
 
 # Vector data download formats to be displayed
-DOWNLOAD_FORMATS:
-  VECTOR:
+download_formats:
+  vector:
     - "Shapefile"
     - "KMZ"
     - "GeoJSON"
     - "CSV"
 
-# WMS Parameters
-WMS_PARAMS:
-  :SERVICE: "WMS"
-  :VERSION: "1.1.1"
-  :REQUEST: "GetFeatureInfo"
-  :STYLES: ""
-  :SRS: "EPSG:4326"
-  :EXCEPTIONS: "application/json"
-  :INFO_FORMAT: "application/json"
+# WMS Parameters. Keys are OGC WMS request parameter names and are sent to
+# remote WMS servers, so they are intentionally left uppercase.
+wms_params:
+  SERVICE: "WMS"
+  VERSION: "1.1.1"
+  REQUEST: "GetFeatureInfo"
+  STYLES: ""
+  SRS: "EPSG:4326"
+  EXCEPTIONS: "application/json"
+  INFO_FORMAT: "application/json"
 
 # Settings for leaflet
-LEAFLET:
-  BOUNDSOVERLAY:
+leaflet:
+  # Keys below are consumed by the JS viewer via the page value
+  # ("INDEX" / "SHOW" / "STATIC_MAP"), so they are intentionally left uppercase.
+  boundsoverlay:
     INDEX:
       color: "#3388ff"
     SHOW:
       color: "#3388ff"
     STATIC_MAP:
       color: "#3388ff"
-  SELECTED_COLOR: "#2C7FB8"
-  SLEEP:
-    SLEEP: true # set to false to disable
-    MARGIN_DISTANCE: 100 # set to zero / false if you want to disable this check
-    SLEEPTIME: 750
-    WAKETIME: 750
-    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:
+  selected_color: "#2C7FB8"
+  sleep:
+    sleep: true # set to false to disable
+    margin_distance: 100 # set to zero / false if you want to disable this check
+    sleeptime: 750
+    waketime: 750
+    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:
+      # DEFAULT / UNAVAILABLE / SELECTED are consumed by the JS viewer and the
+      # index-map legend, so they are intentionally left uppercase.
       DEFAULT: &default
         color: "#7FCDBB"
         weight: 1
@@ -264,7 +268,7 @@ LEAFLET:
         sr_color_name: "Blue"
 
 # Toggle the help text feature that offers users context
-HELP_TEXT:
+help_text:
   viewer_protocol:
     - "cog"
     - "dynamic_map_layer"
@@ -283,8 +287,8 @@ HELP_TEXT:
     - "xyz"
 
 # Enable catalog#show sidebar static map for items with the following viewer protocols
-SIDEBAR_STATIC_MAP:
+sidebar_static_map:
   - "iiif"
   - "iiif_manifest"
 
-IIIF_DRAG_DROP_LINK: "@manifest?manifest=@manifest"
+iiif_drag_drop_link: "@manifest?manifest=@manifest"

data/lib/geoblacklight/configuration/case_insensitive_settings.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class Configuration
+    # Wraps the global +Settings+ object so that its keys can be resolved
+    # case-insensitively. When a key exists in both lower- and uppercase forms
+    # the lowercase value wins. Nested hash values are wrapped recursively, so
+    # chained access (e.g. +settings.fields.access_rights+) resolves regardless
+    # of the case used in settings.yml. Missing keys return +nil+, mirroring the
+    # behavior of the underlying Config::Options object.
+    #
+    # When a +deprecation+ (e.g. an ActiveSupport::Deprecation) is provided, a
+    # deprecation warning is issued whenever an uppercase key has to be used
+    # because no lowercase equivalent is present.
+    class CaseInsensitiveSettings
+      def initialize(settings, deprecation: nil)
+        @hash = settings.to_h
+        @deprecation = deprecation
+      end
+
+      def [](key)
+        resolve(key)
+      end
+
+      def to_h
+        @hash
+      end
+
+      def method_missing(name, *) # rubocop:disable Style/MissingRespondToMissing, Style/MethodMissingSuper
+        resolve(name)
+      end
+
+      private
+
+      def resolve(name)
+        target = name.to_s.downcase
+        keys = @hash.keys.select { |key| key.to_s.downcase == target }
+        return nil if keys.empty?
+
+        key = keys.find { |candidate| candidate.to_s == candidate.to_s.downcase }
+        if key.nil?
+          key = keys.first
+          warn_deprecated(key)
+        end
+        value = @hash[key]
+        value.is_a?(Hash) ? self.class.new(value, deprecation: @deprecation) : value
+      end
+
+      def warn_deprecated(key)
+        return unless @deprecation
+
+        @deprecation.warn(
+          "GeoBlacklight settings.yml key #{key} is uppercase; rename it to #{key.to_s.downcase}. " \
+          "Uppercase keys are deprecated and support will be removed in a future version."
+        )
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/fields_config.rb

@@ -11,41 +11,41 @@ module Geoblacklight
       attribute :date_issued, :string, default: "dct_issued_s"
       attribute :date_range, :string, default: "gbl_dateRange_drsim"
       attribute :description, :string, default: "dct_description_sm"
-      attribute :display_note, :string, default: "gbl_displayNote_s"
+      attribute :display_note, :string, default: "gbl_displayNote_sm"
       attribute :format, :string, default: "dct_format_s"
-      attribute :file_size, :string, default: "gbl_fileSize_drsim"
-      attribute :georeferenced, :string, default: "gbl_georeferenced_drsim"
+      attribute :file_size, :string, default: "gbl_fileSize_s"
+      attribute :georeferenced, :string, default: "gbl_georeferenced_b"
       attribute :id, :string, default: "id"
-      attribute :identifier, :string, default: "dct_identifier_s"
-      attribute :index_year, :string, default: "gbl_indexYear_drsim"
-      attribute :is_part_of, :string, default: "gbl_isPartOf_drsim"
-      attribute :is_replaced_by, :string, default: "gbl_isReplacedBy_drsim"
-      attribute :theme, :string, default: "gbl_theme_drsim"
-      attribute :keyword, :string, default: "dct_keyword_sm"
-      attribute :language, :string, default: "dct_language_s"
-      attribute :license, :string, default: "dct_license_s"
-      attribute :member_of, :string, default: "gbl_memberOf_drsim"
-      attribute :metadata_version, :string, default: "gbl_metadataVersion_drsim"
-      attribute :modified, :string, default: "gbl_modified_drsim"
-      attribute :overlap_field, :string, default: "gbl_overlapField_drsim"
-      attribute :publisher, :string, default: "gbl_publisher_drsim"
-      attribute :provider, :string, default: "gbl_provider_drsim"
-      attribute :references, :string, default: "gbl_references_drsim"
-      attribute :relation, :string, default: "gbl_relation_drsim"
-      attribute :replaces, :string, default: "gbl_replaces_drsim"
-      attribute :resource_class, :string, default: "gbl_resourceClass_drsim"
-      attribute :resource_type, :string, default: "gbl_resourceType_drsim"
-      attribute :rights, :string, default: "gbl_rights_drsim"
-      attribute :rights_holder, :string, default: "gbl_rightsHolder_drsim"
-      attribute :source, :string, default: "gbl_source_drsim"
-      attribute :spatial_coverage, :string, default: "gbl_spatialCoverage_drsim"
-      attribute :geometry, :string, default: "gbl_geometry_drsim"
-      attribute :subject, :string, default: "gbl_subject_drsim"
-      attribute :suppressed, :string, default: "gbl_suppressed_drsim"
-      attribute :temporal_coverage, :string, default: "gbl_temporalCoverage_drsim"
-      attribute :title, :string, default: "gbl_title_drsim"
-      attribute :version, :string, default: "gbl_version_drsim"
-      attribute :wxs_identifier, :string, default: "gbl_wxsIdentifier_drsim"
+      attribute :identifier, :string, default: "dct_identifier_sm"
+      attribute :index_year, :string, default: "gbl_indexYear_im"
+      attribute :is_part_of, :string, default: "dct_isPartOf_sm"
+      attribute :is_replaced_by, :string, default: "dct_isReplacedBy_sm"
+      attribute :theme, :string, default: "dcat_theme_sm"
+      attribute :keyword, :string, default: "dcat_keyword_sm"
+      attribute :language, :string, default: "dct_language_sm"
+      attribute :license, :string, default: "dct_license_sm"
+      attribute :member_of, :string, default: "pcdm_memberOf_sm"
+      attribute :metadata_version, :string, default: "gbl_mdVersion_s"
+      attribute :modified, :string, default: "gbl_mdModified_dt"
+      attribute :overlap_field, :string, default: "solr_bboxtype"
+      attribute :publisher, :string, default: "dct_publisher_sm"
+      attribute :provider, :string, default: "schema_provider_s"
+      attribute :references, :string, default: "dct_references_s"
+      attribute :relation, :string, default: "dct_relation_sm"
+      attribute :replaces, :string, default: "dct_replaces_sm"
+      attribute :resource_class, :string, default: "gbl_resourceClass_sm"
+      attribute :resource_type, :string, default: "gbl_resourceType_sm"
+      attribute :rights, :string, default: "dct_rights_sm"
+      attribute :rights_holder, :string, default: "dct_rightsHolder_sm"
+      attribute :source, :string, default: "dct_source_sm"
+      attribute :spatial_coverage, :string, default: "dct_spatial_sm"
+      attribute :geometry, :string, default: "locn_geometry"
+      attribute :subject, :string, default: "dct_subject_sm"
+      attribute :suppressed, :string, default: "gbl_suppressed_b"
+      attribute :temporal_coverage, :string, default: "dct_temporal_sm"
+      attribute :title, :string, default: "dct_title_s"
+      attribute :version, :string, default: "dct_isVersionOf_sm"
+      attribute :wxs_identifier, :string, default: "gbl_wxsIdentifier_s"
     end
   end
 end