geoblacklight 6.0.0.pre.alpha.1 → 6.0.0.pre.alpha.3

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

data/lib/geoblacklight/configuration/layer_config.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class Configuration
+    # Configuration for Leaflet map layer styles.
+    class LayerConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attribute :color, :string
+      attribute :weight, :integer, default: 1
+      attribute :radius, :integer, default: 4
+      attribute :sr_color_name, :string
+
+      # Supports Hash-like access for backward compatibility
+      # @param [Symbol, String] key
+      def [](key)
+        respond_to?(key) ? send(key) : nil
+      end
+
+      # Returns the attributes as a symbolized hash
+      # @return [Hash]
+      def to_h
+        attributes.symbolize_keys
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/leaflet_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Geoblacklight
   class Configuration
     class LeafletConfig
@@ -11,43 +13,40 @@ module Geoblacklight
       attribute :sidebar, :boolean, default: false
       attribute :selected_color, :string, default: "#2C7FB8"
 
-      DEFAULT_LAYERS_CONFIG = {
-        index: {
-          DEFAULT: {
-            color: "#7FCDBB",
-            weight: 1,
-            radius: 4,
-            sr_color_name: "Green"
-          },
-          UNAVAILABLE: {
-            weight: 1,
-            radius: 4,
-            color: "#EDF8B1",
-            sr_color_name: "Yellow"
-          },
-          SELECTED: {
-            weight: 1,
-            radius: 4,
-            color: "#2C7FB8",
-            sr_color_name: "Blue"
-          }
-        }
-      }.freeze
-
       DEFAULT_SLEEP_CONFIG = {
         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)"
       }.freeze
 
+      # Built lazily (rather than as a frozen constant) so the sr_color_name
+      # values pick up the current I18n locale each time a config is built.
+      def self.default_layers_config
+        {
+          index: {
+            DEFAULT: LayerConfig.new(
+              color: "#7FCDBB",
+              sr_color_name: I18n.t("geoblacklight.map.legend.colors.default")
+            ),
+            UNAVAILABLE: LayerConfig.new(
+              color: "#EDF8B1",
+              sr_color_name: I18n.t("geoblacklight.map.legend.colors.unavailable")
+            ),
+            SELECTED: LayerConfig.new(
+              color: "#2C7FB8",
+              sr_color_name: I18n.t("geoblacklight.map.legend.colors.selected")
+            )
+          }
+        }
+      end
+
       def initialize
         super
         @sleep = LeafletSleepConfig.new(DEFAULT_SLEEP_CONFIG)
-        @layers = LeafletLayersConfig.new(DEFAULT_LAYERS_CONFIG)
+        @layers = LeafletLayersConfig.new(self.class.default_layers_config)
       end
 
       def sleep=(attributes)

data/lib/geoblacklight/configuration/leaflet_layers_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Geoblacklight
   class Configuration
     class LeafletLayersConfig
@@ -6,15 +8,25 @@ module Geoblacklight
 
       attribute :detect_retina, :boolean, default: true
 
-      attr_accessor :index
+      attr_reader :index
 
       def initialize(attributes = {})
         super
-        @index = attributes[:index]
+        self.index = attributes[:index]
+      end
+
+      def index=(values)
+        @index = (values || {}).transform_values do |val|
+          if val.is_a?(LayerConfig)
+            val
+          else
+            LayerConfig.new(val)
+          end
+        end
       end
 
       def to_h
-        attributes.merge({"index" => index})
+        attributes.merge({"index" => index.transform_values(&:to_h)})
       end
     end
   end

data/lib/geoblacklight/configuration/leaflet_sleep_config.rb

@@ -9,7 +9,7 @@ module Geoblacklight
       attribute :sleeptime, :integer, default: 750
       attribute :waketime, :integer, default: 750
       attribute :hovertowake, :boolean, default: false
-      attribute :message, :string, default: "Click to Wake"
+      attribute :message, :string, default: -> { I18n.t("geoblacklight.map.sleep.click_to_wake") }
       attribute :background, :string, default: "rgba(214, 214, 214, .7)"
 
       def to_h

data/lib/geoblacklight/configuration/relationship_config.rb

@@ -0,0 +1,15 @@
+module Geoblacklight
+  class Configuration
+    # Configuration for an individual relationship displayed on a document's show page.
+    class RelationshipConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attribute :field, :string
+      attribute :icon, :string
+      attribute :inverse, :string
+      attribute :label, :string
+      attribute :query_type, :string
+    end
+  end
+end

data/lib/geoblacklight/configuration/relationships_config.rb

@@ -0,0 +1,123 @@
+module Geoblacklight
+  class Configuration
+    # Hash-like configuration for the relationships displayed on a document's
+    # show page. By default it carries all of the relationships defined in the
+    # RELATIONSHIPS_SHOWN section of settings.yml, using lowercase keys.
+    class RelationshipsConfig
+      include Enumerable
+
+      DEFAULT_RELATIONSHIPS = {
+        member_of_ancestors: {
+          field: "pcdm_memberOf_sm",
+          icon: "parent-item",
+          inverse: :member_of_descendants,
+          label: "geoblacklight.relations.member_of_ancestors",
+          query_type: "ancestors"
+        },
+        member_of_descendants: {
+          field: "pcdm_memberOf_sm",
+          icon: "child-item",
+          inverse: :member_of_ancestors,
+          label: "geoblacklight.relations.member_of_descendants",
+          query_type: "descendants"
+        },
+        part_of_ancestors: {
+          field: "dct_isPartOf_sm",
+          icon: "parent-item",
+          inverse: :part_of_descendants,
+          label: "geoblacklight.relations.part_of_ancestors",
+          query_type: "ancestors"
+        },
+        part_of_descendants: {
+          field: "dct_isPartOf_sm",
+          icon: "child-item",
+          inverse: :part_of_ancestors,
+          label: "geoblacklight.relations.part_of_descendants",
+          query_type: "descendants"
+        },
+        relation_ancestors: {
+          field: "dct_relation_sm",
+          icon: nil,
+          inverse: :relation_descendants,
+          label: "geoblacklight.relations.relation_ancestors",
+          query_type: "ancestors"
+        },
+        relation_descendants: {
+          field: "dct_relation_sm",
+          icon: nil,
+          inverse: :relation_ancestors,
+          label: "geoblacklight.relations.relation_descendants",
+          query_type: "descendants"
+        },
+        replaces_ancestors: {
+          field: "dct_replaces_sm",
+          icon: nil,
+          inverse: :replaces_descendants,
+          label: "geoblacklight.relations.replaces_ancestors",
+          query_type: "ancestors"
+        },
+        replaces_descendants: {
+          field: "dct_replaces_sm",
+          icon: nil,
+          inverse: :replaces_ancestors,
+          label: "geoblacklight.relations.replaces_descendants",
+          query_type: "descendants"
+        },
+        source_ancestors: {
+          field: "dct_source_sm",
+          icon: "parent-item",
+          inverse: :source_descendants,
+          label: "geoblacklight.relations.source_ancestors",
+          query_type: "ancestors"
+        },
+        source_descendants: {
+          field: "dct_source_sm",
+          icon: "child-item",
+          inverse: :source_ancestors,
+          label: "geoblacklight.relations.source_descendants",
+          query_type: "descendants"
+        },
+        version_of_ancestors: {
+          field: "dct_isVersionOf_sm",
+          icon: "parent-item",
+          inverse: :version_of_descendants,
+          label: "geoblacklight.relations.version_of_ancestors",
+          query_type: "ancestors"
+        },
+        version_of_descendants: {
+          field: "dct_isVersionOf_sm",
+          icon: "child-item",
+          inverse: :version_of_ancestors,
+          label: "geoblacklight.relations.version_of_descendants",
+          query_type: "descendants"
+        }
+      }.freeze
+
+      def initialize(relationships = DEFAULT_RELATIONSHIPS)
+        @relationships = relationships.to_h.transform_values do |attrs|
+          attrs.is_a?(RelationshipConfig) ? attrs : RelationshipConfig.new(attrs)
+        end
+      end
+
+      def each(&block)
+        @relationships.each(&block)
+      end
+
+      def each_key(&block)
+        @relationships.each_key(&block)
+      end
+
+      def key?(key)
+        @relationships.key?(key)
+      end
+
+      def [](key)
+        @relationships[key]
+      end
+
+      def method_missing(name, *args, **kwargs, &block) # rubocop:disable Style/MissingRespondToMissing
+        @relationships.key?(name) ? @relationships[name] : super
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/settings_builder.rb

@@ -0,0 +1,118 @@
+module Geoblacklight
+  class Configuration
+    # Builds a configuration from legacy (uppercase) settings
+    class SettingsBuilder
+      def self.build
+        new.build
+      end
+
+      def initialize(settings: Settings)
+        @configuration = Configuration.new
+        @settings = CaseInsensitiveSettings.new(settings, deprecation: Geoblacklight::Deprecation)
+      end
+
+      def build
+        @configuration.tap do |config|
+          assign(config, :arcgis_base_url, settings.ARCGIS_BASE_URL)
+          assign(config, :bbox_within_boost, settings.BBOX_WITHIN_BOOST)
+          assign(config, :overlap_ratio_boost, settings.OVERLAP_RATIO_BOOST)
+          assign(config, :display_notes_shown, build_display_notes)
+          assign(config, :institution, settings.INSTITUTION)
+          assign(config, :help_text, settings.HELP_TEXT&.to_h)
+          assign(config, :sidebar_static_map, settings.SIDEBAR_STATIC_MAP)
+          assign(config, :iiif_drag_drop_link, settings.IIIF_DRAG_DROP_LINK)
+          assign(config, :homepage_map_geom, settings.HOMEPAGE_MAP_GEOM)
+          assign(config, :vector_download_formats, settings.DOWNLOAD_FORMATS&.VECTOR)
+          assign(config, :metadata_shown, settings.METADATA_SHOWN)
+          assign(config, :webservices_shown, settings.WEBSERVICES_SHOWN)
+          assign(config, :relationships_shown, build_relationships)
+          assign(config, :timeout_download, settings.TIMEOUT_DOWNLOAD)
+          assign(config, :download_path, settings.DOWNLOAD_PATH)
+          assign(config, :gbl_params, settings.GBL_PARAMS)
+          assign(config, :wms_params, settings.WMS_PARAMS&.to_h)
+          assign(config, :timeout_wms, settings.TIMEOUT_WMS)
+
+          build_fields(config)
+          build_leaflet_options(config)
+        end
+      end
+
+      private
+
+      attr_reader :settings
+
+      # Assigns the value to the target's attribute unless it is nil, so that
+      # missing settings do not overwrite the defaults provided by Configuration.
+      def assign(target, attribute, value)
+        target.public_send("#{attribute}=", value) unless value.nil?
+      end
+
+      def build_display_notes
+        settings.DISPLAY_NOTES_SHOWN&.to_h&.transform_values do |value|
+          DisplayNoteShownConfig.new(value.to_h)
+        end
+      end
+
+      def build_relationships
+        RelationshipsConfig.new(settings.RELATIONSHIPS_SHOWN.to_h) if settings.RELATIONSHIPS_SHOWN
+      end
+
+      def build_leaflet_options(config)
+        return unless settings.LEAFLET
+
+        assign(config.leaflet_options, :bounds_overlay, settings.LEAFLET.BOUNDSOVERLAY&.to_h)
+        assign(config.leaflet_options, :selected_color, settings.LEAFLET.SELECTED_COLOR)
+        assign(config.leaflet_options, :sleep, settings.LEAFLET.SLEEP&.to_h&.transform_keys(&:downcase))
+        assign(config.leaflet_options, :sidebar, settings.LEAFLET.SIDEBAR)
+        assign(config.leaflet_options, :layers, settings.LEAFLET.LAYERS&.to_h&.transform_keys(&:downcase))
+      end
+
+      def build_fields(config)
+        return unless settings.FIELDS
+
+        assign(config.fields, :access_rights, settings.FIELDS.ACCESS_RIGHTS)
+        assign(config.fields, :alternative_title, settings.FIELDS.ALTERNATIVE_TITLE)
+        assign(config.fields, :centroid, settings.FIELDS.CENTROID)
+        assign(config.fields, :creator, settings.FIELDS.CREATOR)
+        assign(config.fields, :date_issued, settings.FIELDS.DATE_ISSUED)
+        assign(config.fields, :date_range, settings.FIELDS.DATE_RANGE)
+        assign(config.fields, :description, settings.FIELDS.DESCRIPTION)
+        assign(config.fields, :display_note, settings.FIELDS.DISPLAY_NOTE)
+        assign(config.fields, :format, settings.FIELDS.FORMAT)
+        assign(config.fields, :file_size, settings.FIELDS.FILE_SIZE)
+        assign(config.fields, :georeferenced, settings.FIELDS.GEOREFERENCED)
+        assign(config.fields, :id, settings.FIELDS.ID)
+        assign(config.fields, :identifier, settings.FIELDS.IDENTIFIER)
+        assign(config.fields, :index_year, settings.FIELDS.INDEX_YEAR)
+        assign(config.fields, :is_part_of, settings.FIELDS.IS_PART_OF)
+        assign(config.fields, :is_replaced_by, settings.FIELDS.IS_REPLACED_BY)
+        assign(config.fields, :theme, settings.FIELDS.THEME)
+        assign(config.fields, :keyword, settings.FIELDS.KEYWORD)
+        assign(config.fields, :language, settings.FIELDS.LANGUAGE)
+        assign(config.fields, :license, settings.FIELDS.LICENSE)
+        assign(config.fields, :member_of, settings.FIELDS.MEMBER_OF)
+        assign(config.fields, :metadata_version, settings.FIELDS.METADATA_VERSION)
+        assign(config.fields, :modified, settings.FIELDS.MODIFIED)
+        assign(config.fields, :overlap_field, settings.FIELDS.OVERLAP_FIELD)
+        assign(config.fields, :publisher, settings.FIELDS.PUBLISHER)
+        assign(config.fields, :provider, settings.FIELDS.PROVIDER)
+        assign(config.fields, :references, settings.FIELDS.REFERENCES)
+        assign(config.fields, :relation, settings.FIELDS.RELATION)
+        assign(config.fields, :replaces, settings.FIELDS.REPLACES)
+        assign(config.fields, :resource_class, settings.FIELDS.RESOURCE_CLASS)
+        assign(config.fields, :resource_type, settings.FIELDS.RESOURCE_TYPE)
+        assign(config.fields, :rights, settings.FIELDS.RIGHTS)
+        assign(config.fields, :rights_holder, settings.FIELDS.RIGHTS_HOLDER)
+        assign(config.fields, :source, settings.FIELDS.SOURCE)
+        assign(config.fields, :spatial_coverage, settings.FIELDS.SPATIAL_COVERAGE)
+        assign(config.fields, :geometry, settings.FIELDS.GEOMETRY)
+        assign(config.fields, :subject, settings.FIELDS.SUBJECT)
+        assign(config.fields, :suppressed, settings.FIELDS.SUPPRESSED)
+        assign(config.fields, :temporal_coverage, settings.FIELDS.TEMPORAL_COVERAGE)
+        assign(config.fields, :title, settings.FIELDS.TITLE)
+        assign(config.fields, :version, settings.FIELDS.VERSION)
+        assign(config.fields, :wxs_identifier, settings.FIELDS.WXS_IDENTIFIER)
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration.rb

@@ -54,13 +54,14 @@ module Geoblacklight
     attr_accessor :webservices_shown # typed as Array
 
     # Relationships to display
-    attr_accessor :relationships_shown # typed as Hash
+    attr_accessor :relationships_shown # typed as RelationshipsConfig
 
     attribute :download_path, :string
 
     def initialize
       super
       self.download_path ||= Rails.root.join("tmp", "cache", "downloads")
+      @relationships_shown = RelationshipsConfig.new
       @gbl_params = [
         :bbox, :email, :file, :format, :id, :logo, :provider, :type,
         :BBOX, :HEIGHT, :LAYERS, :QUERY_LAYERS, :URL, :WIDTH, :X, :Y
@@ -94,6 +95,8 @@ module Geoblacklight
         ]
       }
 
+      @vector_download_formats = ["Shapefile", "KMZ", "GeoJSON", "CSV"]
+      @metadata_shown = ["mods", "fgdc", "iso19139", "html"]
       @webservices_shown = %w[
         wms
         tms
@@ -107,7 +110,7 @@ module Geoblacklight
         dynamic_map_layer
         image_map_layer
         cog
-        pmtile
+        pmtiles
       ]
 
       @display_notes_shown = {
@@ -132,6 +135,8 @@ module Geoblacklight
           note_prefix: "Warning: "
         )
       }
+
+      @sidebar_static_map = ["iiif", "iiif_manifest"]
     end
 
     def fields

data/lib/geoblacklight/deprecation.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "active_support/deprecation"
+
+module Geoblacklight
+  Deprecation = ActiveSupport::Deprecation.new("7.0", "GeoBlacklight")
+end

data/lib/geoblacklight/engine.rb

@@ -4,6 +4,7 @@ require "blacklight"
 require "coderay"
 require "config"
 require "faraday"
+require "faraday/follow_redirects"
 require "geoblacklight/version"
 require "nokogiri"
 require "mime/types"

data/lib/geoblacklight/metadata/base.rb

@@ -48,7 +48,7 @@ module Geoblacklight
       # connection error
       def retrieve_metadata
         connection = Faraday.new(url: @reference.endpoint) do |conn|
-          conn.use Geoblacklight::FaradayMiddleware::FollowRedirects
+          conn.response :follow_redirects
           conn.adapter Faraday.default_adapter
         end
         begin

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "6.0.0-alpha.1"
+  VERSION = "6.0.0-alpha.3"
 end

data/lib/geoblacklight.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/dependencies"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
@@ -14,7 +13,7 @@ module Geoblacklight
     ::Rails.logger
   end
 
-  mattr_accessor :configuration_builder, default: Geoblacklight::Configuration::LegacySettingsBuilder
+  mattr_accessor :configuration_builder, default: Geoblacklight::Configuration::SettingsBuilder
 
   def self.configuration
     @configuration ||= configuration_builder.build

data/solr/conf/schema.xml

@@ -66,15 +66,15 @@
     <fieldType name="string"  class="solr.StrField"  sortMissingLast="true" />
     <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
 
-    <fieldType name="int"    class="solr.TrieIntField"     precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="float"  class="solr.TrieFloatField"   precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="long"   class="solr.TrieLongField"    precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField"  precisionStep="8" positionIncrementGap="0"/>
+    <fieldType name="int"    class="solr.IntPointField"    docValues="true"/>
+    <fieldType name="float"  class="solr.FloatPointField"  docValues="true"/>
+    <fieldType name="long"   class="solr.LongPointField"   docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" docValues="true"/>
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
          The trailing "Z" designates UTC time and is mandatory.
-         A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
+         A Point based date field for faster date range queries and date faceting. -->
+    <fieldType name="date" class="solr.DatePointField" docValues="true"/>
 
     <!-- A DateRange based date field for truly faster date range queries. -->
     <fieldType name="dateRange" class="solr.DateRangeField"/>
@@ -98,7 +98,8 @@
       </analyzer>
       <analyzer type="query">
         <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.FlattenGraphFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.EnglishPossessiveFilterFactory"/>

data/solr/conf/solrconfig.xml

@@ -27,7 +27,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>7.6</luceneMatchVersion>
+  <luceneMatchVersion>9.0</luceneMatchVersion>
 
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />

data/spec/components/geoblacklight/document/sidebar_component_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Document::SidebarComponent, type: :component do
+  subject(:component) { described_class.new(presenter: presenter) }
+
+  let(:view_context) { vc_test_controller.view_context }
+  let(:presenter) { view_context.document_presenter(document) }
+  let(:document) { SolrDocument.new(JSON.parse(read_fixture(fixture))) }
+
+  before do
+    allow_any_instance_of(Geoblacklight::DownloadLinksComponent).to receive(:render?).and_return(false)
+    allow_any_instance_of(Geoblacklight::LoginLinkComponent).to receive(:render?).and_return(false)
+
+    allow(document).to receive(:more_like_this).and_return([])
+    allow_any_instance_of(Blacklight::DocumentHelperBehavior).to receive(:current_bookmarks).and_return([])
+
+    with_controller_class(CatalogController) do
+      allow(vc_test_controller).to receive_messages(current_or_guest_user: User.new)
+      render_inline(component)
+    end
+  end
+
+  context "when the document viewer protocol is IIIF" do
+    let(:fixture) { "solr_documents/public_iiif_princeton.json" }
+
+    it "renders the static map" do
+      expect(page).to have_css("#static-map")
+    end
+
+    it "renders the Location label" do
+      expect(page).to have_content("Location")
+    end
+  end
+
+  context "when the document viewer protocol is WMS" do
+    let(:fixture) { "solr_documents/restricted-line.json" }
+
+    it "does not render the static map" do
+      expect(page).to have_no_css("#static-map")
+    end
+
+    it "does not render the Location label" do
+      expect(page).to have_no_content("Location")
+    end
+  end
+end