geoblacklight 5.3.0 → 6.0.0.pre.alpha.2

data/lib/geoblacklight/configuration/leaflet_config.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class Configuration
+    class LeafletConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attr_accessor :bounds_overlay, :controls
+
+      attr_reader :sleep, :layers
+      # set to true to display attribute table as sidebar on map
+      attribute :sidebar, :boolean, default: false
+      attribute :selected_color, :string, default: "#2C7FB8"
+
+      DEFAULT_LAYERS_CONFIG = {
+        index: {
+          DEFAULT: LayerConfig.new(
+            color: "#7FCDBB",
+            sr_color_name: "Green"
+          ),
+          UNAVAILABLE: LayerConfig.new(
+            color: "#EDF8B1",
+            sr_color_name: "Yellow"
+          ),
+          SELECTED: LayerConfig.new(
+            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
+
+      def initialize
+        super
+        @sleep = LeafletSleepConfig.new(DEFAULT_SLEEP_CONFIG)
+        @layers = LeafletLayersConfig.new(DEFAULT_LAYERS_CONFIG)
+      end
+
+      def sleep=(attributes)
+        @sleep = LeafletSleepConfig.new(attributes)
+      end
+
+      def layers=(attributes)
+        @layers = LeafletLayersConfig.new(attributes)
+      end
+
+      def to_h
+        {
+          bounds_overlay: bounds_overlay,
+          selected_color: selected_color,
+          sleep: sleep.to_h,
+          sidebar: sidebar,
+          layers: layers.to_h,
+          controls: controls
+        }.compact
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/leaflet_layers_config.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class Configuration
+    class LeafletLayersConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attribute :detect_retina, :boolean, default: true
+
+      attr_reader :index
+
+      def initialize(attributes = {})
+        super
+        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.transform_values(&:to_h)})
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/leaflet_sleep_config.rb

@@ -0,0 +1,20 @@
+module Geoblacklight
+  class Configuration
+    class LeafletSleepConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attribute :sleep, :boolean, default: true # set to false to disable
+      attribute :margin_distance, :integer, default: 100 # set to zero / false if you want to disable this check
+      attribute :sleeptime, :integer, default: 750
+      attribute :waketime, :integer, default: 750
+      attribute :hovertowake, :boolean, default: false
+      attribute :message, :string, default: "Click to Wake"
+      attribute :background, :string, default: "rgba(214, 214, 214, .7)"
+
+      def to_h
+        attributes
+      end
+    end
+  end
+end

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

@@ -0,0 +1,153 @@
+module Geoblacklight
+  # Configuration for Geoblacklight
+  class Configuration
+    include ActiveModel::Attributes
+
+    # ArcGIS Online Base URL
+    attribute :arcgis_base_url, :string, default: "https://www.arcgis.com/apps/mapviewer/index.html"
+
+    # The bq boost value for spatial search matches within a bounding box
+    attribute :bbox_within_boost, :string, default: "10"
+
+    # The bf boost value for overlap ratio
+    attribute :overlap_ratio_boost, :string, default: "2"
+
+    # Institution deployed at
+    attribute :institution, :string, default: "Stanford"
+
+    # (For external Download) timeout and open_timeout parameters for Faraday
+    attribute :timeout_download, :integer, default: 180
+
+    # (For WMS inspection) timeout and open_timeout parameters for Faraday
+    attribute :timeout_wms, :integer, default: 4
+
+    # Display Notes to display / Non-prefixed default bootstrap class is alert-secondary
+    attr_accessor :display_notes_shown # typed as Hash
+
+    # Toggle the help text feature that offers users context
+    attr_accessor :help_text # typed as Hash
+
+    # Non-search-field GeoBlacklight application permitted params
+    attr_accessor :gbl_params # typed as Array
+
+    # WMS Parameters
+    attr_accessor :wms_params # typed as Hash
+
+    # Enable catalog#show sidebar static map for items with the following viewer protocols
+    attr_accessor :sidebar_static_map # typed as Array
+
+    attribute :iiif_drag_drop_link, :string, default: "@manifest?manifest=@manifest"
+
+    # Homepage Map Geometry
+    # Leave null to default to entire world
+    # Add a stringified GeoJSON object to scope initial render (example from UMass)
+    #   config.homepage_map_geom = '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
+    attribute :homepage_map_geom, :string
+
+    # Vector data download formats to be displayed
+    attr_accessor :vector_download_formats  # typed as Array
+
+    # Metadata shown in tool panel
+    attr_accessor :metadata_shown # typed as Array
+
+    # Web services shown in tool panel
+    attr_accessor :webservices_shown # typed as Array
+
+    # Relationships to display
+    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
+      ]
+      @wms_params = {
+        SERVICE: "WMS",
+        VERSION: "1.1.1",
+        REQUEST: "GetFeatureInfo",
+        STYLES: "",
+        SRS: "EPSG:4326",
+        EXCEPTIONS: "application/json",
+        INFO_FORMAT: "application/json"
+      }
+      @help_text = {
+        viewer_protocol: %w[
+          cog
+          dynamic_map_layer
+          feature_layer
+          iiif
+          iiif_manifest
+          image_map_layer
+          index_map
+          oembed
+          pmtiles
+          tiled_map_layer
+          tilejson
+          tms
+          wms
+          wmts
+          xyz
+        ]
+      }
+
+      @vector_download_formats = ["Shapefile", "KMZ", "GeoJSON", "CSV"]
+      @metadata_shown = ["mods", "fgdc", "iso19139", "html"]
+      @webservices_shown = %w[
+        wms
+        tms
+        wfs
+        xyz
+        wmts
+        tilejson
+        iiif
+        feature_layer
+        tiled_map_layer
+        dynamic_map_layer
+        image_map_layer
+        cog
+        pmtiles
+      ]
+
+      @display_notes_shown = {
+        danger: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-danger",
+          icon: "fire-solid",
+          note_prefix: "Danger: "
+        ),
+        info: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-info",
+          icon: "circle-info-solid",
+          note_prefix: "Info: "
+        ),
+        tip: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-success",
+          icon: "lightbulb-solid",
+          note_prefix: "Tip: "
+        ),
+        warning: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-warning",
+          icon: "triangle-exclamation-solid",
+          note_prefix: "Warning: "
+        )
+      }
+
+      @sidebar_static_map = ["iiif", "iiif_manifest"]
+    end
+
+    def fields
+      @fields ||= FieldsConfig.new
+    end
+
+    ##
+    # Returns Leaflet plugin settings to pass to the viewer.
+    # @return[Geoblacklight::Configuration::LeafletConfig]
+    def leaflet_options
+      @leaflet_options ||= Geoblacklight::Configuration::LeafletConfig.new
+    end
+  end
+end

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/download.rb

@@ -16,7 +16,7 @@ module Geoblacklight
     end
 
     def self.file_path
-      Settings.DOWNLOAD_PATH || Rails.root.join("tmp", "cache", "downloads")
+      Geoblacklight.configuration.download_path
     end
 
     def file_path_and_name
@@ -95,7 +95,7 @@ module Geoblacklight
     # the Geoblacklight::Download class
     # @return [Fixnum] download timeout in seconds
     def timeout
-      @options[:timeout] || Settings.TIMEOUT_DOWNLOAD || 20
+      @options[:timeout] || Geoblacklight.configuration.timeout_download
     end
 
     ##

data/lib/geoblacklight/engine.rb

@@ -7,6 +7,7 @@ require "faraday"
 require "geoblacklight/version"
 require "nokogiri"
 require "mime/types"
+require "geo_combine"
 
 module Geoblacklight
   class Engine < ::Rails::Engine
@@ -18,21 +19,22 @@ module Geoblacklight
       end
     end
 
-    PRECOMPILE_ASSETS = %w[favicon.ico geoblacklight/geoblacklight.umd.cjs geoblacklight/geoblacklight.umd.cjs.map geoblacklight/geoblacklight.js geoblacklight/geoblacklight.js.map].freeze
+    PRECOMPILE_ASSETS = %w[favicon.ico].freeze
 
     # Make the source JS and CSS available to built apps
     initializer "geoblacklight.assets" do |app|
       app.config.assets.paths << Geoblacklight::Engine.root.join("app/javascript")
-      app.config.assets.paths << Geoblacklight::Engine.root.join("app/assets")
+      app.config.assets.paths << Geoblacklight::Engine.root.join("app/assets/images")
+      app.config.assets.paths << Geoblacklight::Engine.root.join("app/assets/stylesheets")
       app.config.assets.precompile += Geoblacklight::Engine::PRECOMPILE_ASSETS
     end
 
     # Add the Geoblacklight importmap to the built app's importmap
     initializer "geoblacklight.importmap", before: "importmap" do |app|
-      next unless app.config.respond_to?(:importmap) # skip for Vite
+      next unless app.config.respond_to?(:importmap)
 
-      app.config.importmap.paths << Engine.root.join("config/importmap.rb")
-      app.config.importmap.cache_sweepers << Engine.root.join("app/javascript")
+      app.config.importmap.paths << Geoblacklight::Engine.root.join("config/importmap.rb")
+      app.config.importmap.cache_sweepers << Geoblacklight::Engine.root.join("app/javascript")
     end
   end
 end

data/lib/geoblacklight/metadata/base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "geo_combine"
-
 module Geoblacklight
   module Metadata
     ##

data/lib/geoblacklight/metadata_transformer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "geo_combine"
-
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/references.rb

@@ -5,7 +5,7 @@ module Geoblacklight
   class References
     attr_reader :refs, :reference_field
 
-    def initialize(document, reference_field = Settings.FIELDS.REFERENCES)
+    def initialize(document, reference_field = Geoblacklight.configuration.fields.references)
       @document = document
       @reference_field = reference_field
       @refs = parse_references.map { |ref| Reference.new(ref) }
@@ -15,9 +15,10 @@ module Geoblacklight
     # Return only those metadata references which are exposed within the configuration
     # @return [Geoblacklight::Reference]
     def shown_metadata_refs
-      metadata = @refs.select { |ref| Settings.METADATA_SHOWN.include?(ref.type.to_s) }
+      metadata_shown = Geoblacklight.configuration.metadata_shown
+      metadata = @refs.select { |ref| metadata_shown.include?(ref.type.to_s) }
       metadata.sort do |u, v|
-        Settings.METADATA_SHOWN.index(u.type.to_s) <=> Settings.METADATA_SHOWN.index(v.type.to_s)
+        metadata_shown.index(u.type.to_s) <=> metadata_shown.index(v.type.to_s)
       end
     end
 
@@ -111,7 +112,7 @@ module Geoblacklight
     end
 
     def format_list
-      Settings.DOWNLOAD_FORMATS&.VECTOR
+      Geoblacklight.configuration.vector_download_formats || []
     end
 
     def web_service_hash(format)

data/lib/geoblacklight/relation/ancestors.rb

@@ -10,8 +10,9 @@ module Geoblacklight
       end
 
       def create_search_params
-        {fq: ["{!join from=#{@field} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:#{@search_id}"],
-         fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE]}
+        {fq: ["{!join from=#{@field} to=#{Geoblacklight.configuration.fields.id}}#{Geoblacklight.configuration.fields.id}:#{@search_id}"],
+         fl: [Geoblacklight.configuration.fields.title, Geoblacklight.configuration.fields.id,
+           Geoblacklight.configuration.fields.resource_type]}
       end
 
       def execute_query

data/lib/geoblacklight/relation/descendants.rb

@@ -11,7 +11,8 @@ module Geoblacklight
 
       def create_search_params
         {fq: "#{@field}:#{@search_id}",
-         fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE]}
+         fl: [Geoblacklight.configuration.fields.title, Geoblacklight.configuration.fields.id,
+           Geoblacklight.configuration.fields.resource_type]}
       end
 
       def execute_query