geoblacklight 3.4.0 → 4.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 623646febc134a8ecd4c02ceaf7f4d745918f1e1e2356f4814b17d0a511a9e0b
-  data.tar.gz: 1ca956025bd1cebcd15f8745a60a6155a193f669dd02fcd9e097b7d5daa66ed7
+  metadata.gz: 040dd47045422f5690fcbf94d66341e1a6c7f23a17f51d08c619d5735d1e8da0
+  data.tar.gz: 4433d184dca84709c3d448d1b37e518934f8f0504aa05008c2427754d85c37d8
 SHA512:
-  metadata.gz: ec59a0e309a167f37d2d0bff83e13498879b94827d711145c91bd05f3abd24616bd31c78f39ace056ad660c10512f1166f5d03919ad89f1214c2febe405838e2
-  data.tar.gz: 8260fb2cfb48040bda8a1d6394c3d88bc339eec409e08096c713cddb0eb17ef92e5e9599a5d43a784ce6287dd69af7e7c6836b66e331deaa2dff58f4f012df9f
+  metadata.gz: b3b8fc3bcf5d9796d7191d47c1d23e08426cf5d02227a4a3b8cd9325a4c404abf92c2f27935468b6c5673ca003672ab0955a95d7d1fadc8d19d8966bb9999d6b
+  data.tar.gz: 229378574de83e5899e25f0947de49f37e6e61946a7e2a0abe40cca934e1f8c06447aa2f86405de31ad05fe325574eb1c5f8c1350709eafb006783a324fdb73a

data/.rubocop.yml

@@ -35,6 +35,7 @@ Layout/LineLength:
   - 'bin/coverage.rb'
   - 'lib/generators/geoblacklight/install_generator.rb'
   - 'lib/geoblacklight/relation/ancestors.rb'
+  - 'lib/geoblacklight/relation/relation_response.rb'
   - 'lib/tasks/geoblacklight.rake'
   - 'Rakefile'
   - 'spec/**/*'
@@ -80,6 +81,10 @@ RSpec/DescribeClass:
 RSpec/ExampleLength:
   Enabled: false
 
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/features/split_view.html.erb_spec.rb'
+
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/lib/geoblacklight/download/hgl_download_spec.rb'

data/app/models/concerns/geoblacklight/solr_document/citation.rb

@@ -18,11 +18,11 @@ module Geoblacklight
       private
 
       def issued
-        fetch(Settings.FIELDS.ISSUED, nil)
+        fetch(Settings.FIELDS.DATE_ISSUED, nil)
       end
 
       def format
-        fetch(Settings.FIELDS.FILE_FORMAT, nil)
+        fetch(Settings.FIELDS.FORMAT, nil)
       end
     end
   end

data/app/models/concerns/geoblacklight/solr_document.rb

@@ -48,7 +48,7 @@ module Geoblacklight
     end
 
     def same_institution?
-      fetch(Settings.FIELDS.PROVENANCE, '').casecmp(Settings.INSTITUTION.downcase).zero?
+      fetch(Settings.FIELDS.PROVIDER, '').casecmp(Settings.INSTITUTION.downcase).zero?
     end
 
     def iiif_download
@@ -72,7 +72,7 @@ module Geoblacklight
     end
 
     def geom_field
-      fetch(Settings.FIELDS.GEOMETRY, '')
+      fetch(Settings.FIELDS.SPATIAL_EXTENT, '')
     end
 
     def geometry
@@ -84,7 +84,7 @@ module Geoblacklight
     end
 
     def file_format
-      fetch(Settings.FIELDS.FILE_FORMAT)
+      fetch(Settings.FIELDS.FORMAT)
     end
 
     ##
@@ -100,7 +100,7 @@ module Geoblacklight
     private
 
     def rights_field_data
-      fetch(Settings.FIELDS.RIGHTS, '')
+      fetch(Settings.FIELDS.ACCESS_RIGHTS, '')
     end
 
     def method_missing(method, *args, &block)

data/app/models/concerns/geoblacklight/spatial_search_behavior.rb

@@ -16,9 +16,9 @@ module Geoblacklight
     def add_spatial_params(solr_params)
       if blacklight_params[:bbox]
         solr_params[:bq] ||= []
-        solr_params[:bq] << "#{Settings.FIELDS.GEOMETRY}:\"IsWithin(#{envelope_bounds})\"#{boost}"
+        solr_params[:bq] << "#{Settings.FIELDS.SPATIAL_EXTENT}:\"IsWithin(#{envelope_bounds})\"#{boost}"
         solr_params[:fq] ||= []
-        solr_params[:fq] << "#{Settings.FIELDS.GEOMETRY}:\"Intersects(#{envelope_bounds})\""
+        solr_params[:fq] << "#{Settings.FIELDS.SPATIAL_EXTENT}:\"Intersects(#{envelope_bounds})\""
 
         if Settings.OVERLAP_RATIO_BOOST
           solr_params[:bf] ||= []
@@ -62,7 +62,7 @@ module Geoblacklight
 
       # Do not suppress action_documents method calls for individual documents
       # ex. CatalogController#web_services (exportable views)
-      return if solr_params[:q]&.include?("{!lucene}#{Settings.FIELDS.UNIQUE_KEY}:")
+      return if solr_params[:q]&.include?("{!lucene}#{Settings.FIELDS.ID}:")
 
       solr_params[:fq] ||= []
       solr_params[:fq] << "-#{Settings.FIELDS.SUPPRESSED}: true"

data/app/views/catalog/_header_icons.html.erb

@@ -1,3 +1,3 @@
 <%= geoblacklight_icon(document[Settings.FIELDS.GEOM_TYPE], classes: 'svg_tooltip') %>
-<%= geoblacklight_icon(document[Settings.FIELDS.PROVENANCE], classes: 'svg_tooltip') %>
+<%= geoblacklight_icon(document[Settings.FIELDS.PROVIDER], classes: 'svg_tooltip') %>
 <%= geoblacklight_icon(document[Settings.FIELDS.RIGHTS], classes: 'svg_tooltip') %>

data/app/views/catalog/_home_text.html.erb

@@ -3,9 +3,9 @@
     <div class='col-sm'>
       <%= content_tag :h3, t('geoblacklight.home.category_heading') %>
       <div class='row'>
-        <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'home', label: 'geoblacklight.home.institution', facet_field: Settings.FIELDS.PROVENANCE, response: @response)) %>
+        <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'home', label: 'geoblacklight.home.institution', facet_field: Settings.FIELDS.PROVIDER, response: @response)) %>
 
-        <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'arrow-circle-down', label: 'geoblacklight.home.data_type', facet_field: Settings.FIELDS.GEOM_TYPE, response: @response)) %>
+        <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'arrow-circle-down', label: 'geoblacklight.home.data_type', facet_field: Settings.FIELDS.RESOURCE_TYPE, response: @response)) %>
       </div>
       <div class='row'>
         <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'globe', label: 'geoblacklight.home.placename', facet_field: Settings.FIELDS.SPATIAL_COVERAGE, response: @response)) %>

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

@@ -0,0 +1,15 @@
+<% @relations.send(rel)['docs'][0..2].each do |entry| %>
+  <li class="list-group-item border-bottom-0">
+    <%= link_to solr_document_path(entry[Settings.FIELDS.ID]) do %>
+      <%= relations_icon(entry, value.icon) unless value.icon.nil? %>
+      <%= entry[Settings.FIELDS.TITLE] %>
+    <% end %>
+  </li>
+<% end %>
+<% unless (@relations.send(rel)['numFound'].to_i <= 3) %>
+  <li class="list-group-item border-bottom-0">
+    <%= link_to search_catalog_path({f: {"#{Settings.FIELDS.SOURCE}" => [@relations.link_id]}}) do %>
+      <%= t('geoblacklight.relations.browse_all', count: @relations.send(rel)['numFound']) %>
+    <% end %>
+  </li>
+<% end %>

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

@@ -1,24 +1,12 @@
-<% unless @relations.empty? %>
-  <% unless @relations.ancestors['numFound'].to_i.zero? %>
+<%- Settings.RELATIONSHIPS_SHOWN.each do |rel, value| %>
+  <% unless @relations.send(rel)['numFound'].to_i.zero? %>
     <div class="card relations">
       <div class="card-header">
-        <h2 class="mb-0 h6"><%= t('geoblacklight.relations.ancestor') %></h2>
+        <h2 class="mb-0 h6"><%= t("#{value.label}") %></h2>
       </div>
 
       <ul class="list-group list-group-flush">
-        <%= render 'ancestors' %>
-      </ul>
-    </div>
-  <% end %>
-
-  <% unless @relations.descendants['numFound'].to_i.zero? %>
-    <div class="card relations">
-      <div class="card-header">
-        <h2 class="mb-0 h6"><%= t('geoblacklight.relations.descendant') %></h2>
-      </div>
-
-      <ul class="list-group list-group-flush">
-        <%= render 'descendants' %>
+        <%= render partial: 'relations', locals: { rel: rel, value: value } %>
       </ul>
     </div>
   <% end %>

data/app/views/relation/index.json.jbuilder

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
-json.ancestors @relations.ancestors
-json.descendants @relations.descendants
+
 json.current_doc @relations.search_id
+json.relations do
+  Settings.RELATIONSHIPS_SHOWN.each do |key, _value|
+    json.set! key.downcase.to_s, @relations.send(key) unless @relations.send(key)['numFound'].to_i.zero?
+  end
+end

data/config/initializers/rails_config.rb

@@ -2,11 +2,3 @@
 Config.setup do |config|
   config.const_name = 'Settings'
 end
-
-# GeoBlacklight v3.3 - New Settings.FIELDS values
-Settings.prepend_source!(File.expand_path('new_gbl_settings_defaults_3_3.yml', __dir__))
-Settings.reload!
-
-# GeoBlacklight v3.4 - New Settings.HOMEPAGE_MAP_GEOM option
-Settings.prepend_source!(File.expand_path('new_gbl_settings_defaults_3_4.yml', __dir__))
-Settings.reload!

data/config/locales/geoblacklight.en.yml

@@ -68,6 +68,14 @@ en:
     relations:
       ancestor: 'Source Datasets'
       descendant: 'Derived Datasets'
+      member_of: 'Belongs to collection...'
+      part_of: 'Is part of...'
+      relation: 'Related Records'
+      replaces: 'Item replaces...'
+      replaced_by: 'Item replaced by...'
+      source: 'Source Datasets'
+      version_of: 'Version of...'
+
       browse_all: "Browse all %{count} records..."
     metadata:
       toggle_summary: 'Toggle summary'

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -29,7 +29,7 @@ class CatalogController < ApplicationController
     #
     config.default_document_solr_params = {
      :qt => 'document',
-     :q => "{!raw f=#{Settings.FIELDS.UNIQUE_KEY} v=$id}"
+     :q => "{!raw f=#{Settings.FIELDS.ID} v=$id}"
     }
 
 
@@ -76,7 +76,6 @@ class CatalogController < ApplicationController
     # config.add_facet_field 'lc_1letter_facet', :label => 'Call Number'
     # config.add_facet_field 'subject_geo_facet', :label => 'Region'
     # config.add_facet_field 'solr_bbox', :fq => "solr_bbox:IsWithin(-88,26,-79,36)", :label => 'Spatial'
-
     # config.add_facet_field 'example_pivot_field', :label => 'Pivot Field', :pivot => ['format', 'language_facet']
 
     # config.add_facet_field 'example_query_facet_field', :label => 'Publish Date', :query => {
@@ -85,63 +84,62 @@ class CatalogController < ApplicationController
     #    :years_25 => { :label => 'within 25 Years', :fq => "pub_date:[#{Time.now.year - 25 } TO *]" }
     # }
 
-    config.add_facet_field Settings.FIELDS.PROVENANCE, label: 'Institution', limit: 8, partial: "icon_facet"
-    config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Author', :limit => 8
-    config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8
-    config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8
+
+	#FACETS
+
+	#DEFAULT FACETS
+	#to add additional facets, use the keys defined in the settings.yml file
+    config.add_facet_field Settings.FIELDS.INDEX_YEAR, :label => 'Year', :limit => 10
     config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, :label => 'Place', :limit => 8
-    config.add_facet_field Settings.FIELDS.PART_OF, :label => 'Collection', :limit => 8
+    config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', :limit => 8  
+    config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', :limit => 8
+    config.add_facet_field Settings.FIELDS.FORMAT, :label => 'Format', :limit => 8
+    config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8
+    config.add_facet_field Settings.FIELDS.ISO_TOPIC_CATEGORY, :label => 'Theme', :limit => 8
+    config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Creator', :limit => 8
+    config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8
+    config.add_facet_field Settings.FIELDS.PROVIDER, label: 'Provider', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3
+    config.add_facet_field Settings.FIELDS.SOURCE, :label => 'Collection', :limit => 8, :show => false
 
-    config.add_facet_field Settings.FIELDS.YEAR, :label => 'Year', :limit => 10
 
-    config.add_facet_field Settings.FIELDS.RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
-    config.add_facet_field Settings.FIELDS.GEOM_TYPE, label: 'Data type', limit: 8, partial: "icon_facet"
-    config.add_facet_field Settings.FIELDS.FILE_FORMAT, :label => 'Format', :limit => 8
-    config.add_facet_field Settings.FIELDS.SOURCE, show: false
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
+
+	#SEARCH RESULTS FIELDS
+
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    # config.add_index_field 'title_display', :label => 'Title:'
-    # config.add_index_field 'title_vern_display', :label => 'Title:'
-    # config.add_index_field 'author_display', :label => 'Author:'
-    # config.add_index_field 'author_vern_display', :label => 'Author:'
-    # config.add_index_field 'format', :label => 'Format:'
-    # config.add_index_field 'language_facet', :label => 'Language:'
-    # config.add_index_field 'published_display', :label => 'Published:'
-    # config.add_index_field 'published_vern_display', :label => 'Published:'
-    # config.add_index_field 'lc_callnum_display', :label => 'Call number:'
-
-    # config.add_index_field 'dc_title_t', :label => 'Display Name:'
-    # config.add_index_field Settings.FIELDS.PROVENANCE, :label => 'Institution:'
+    # config.add_index_field Settings.FIELDS.PROVIDER, :label => 'Institution:'
     # config.add_index_field Settings.FIELDS.RIGHTS, :label => 'Access:'
     # # config.add_index_field 'Area', :label => 'Area:'
     # config.add_index_field Settings.FIELDS.SUBJECT, :label => 'Keywords:'
-    config.add_index_field Settings.FIELDS.YEAR
+    config.add_index_field Settings.FIELDS.INDEX_YEAR
     config.add_index_field Settings.FIELDS.CREATOR
     config.add_index_field Settings.FIELDS.DESCRIPTION, helper_method: :snippit
     config.add_index_field Settings.FIELDS.PUBLISHER
 
-
+	#ITEM VIEW FIELDS
 
     # solr fields to be displayed in the show (single result) view
     #  The ordering of the field names is the order of the display
-    #
     # item_prop: [String] property given to span with Schema.org item property
     # link_to_search: [Boolean] that can be passed to link to a facet search
     # helper_method: [Symbol] method that can be used to render the value
-    config.add_show_field Settings.FIELDS.CREATOR, label: 'Author(s)', itemprop: 'author'
+
+    #DEFAULT FIELDS
+    config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator'
     config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
     config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher'
-    config.add_show_field Settings.FIELDS.PART_OF, label: 'Collection', itemprop: 'isPartOf'
     config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial', link_to_facet: true
     config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject(s)', itemprop: 'keywords', link_to_facet: true
-    config.add_show_field Settings.FIELDS.TEMPORAL, label: 'Year', itemprop: 'temporal'
-    config.add_show_field Settings.FIELDS.PROVENANCE, label: 'Held by', link_to_facet: true
+    config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Year', itemprop: 'temporal'
+    config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', link_to_facet: true
     config.add_show_field(
       Settings.FIELDS.REFERENCES,
       label: 'More details at',
@@ -150,6 +148,50 @@ class CatalogController < ApplicationController
       helper_method: :render_references_url
     )
 
+    # OPTIONAL FIELDS
+    #optional fields to add to the item view display
+
+    # config.add_show_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access Rights', itemprop: 'access_rights'
+    # config.add_show_field Settings.FIELDS.ALTERNATIVE_TITLE, label: 'Alternative Title', itemprop: 'alt_title'
+    # config.add_show_field Settings.FIELDS.CENTROID, label: 'Centroid', itemprop: 'centroid'
+    # config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator'
+    # config.add_show_field Settings.FIELDS.DATE_ISSUED, label: 'Date Issued', itemprop: 'issued'
+    # config.add_show_field Settings.FIELDS.DATE_RANGE, label: 'Date Range', itemprop: 'date_range'
+    # config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
+    # config.add_show_field Settings.FIELDS.FORMAT, label: 'Format', itemprop: 'format'
+    # config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File Size', itemprop: 'file_size'
+    # config.add_show_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced', itemprop: 'georeferenced'
+    # config.add_show_field Settings.FIELDS.ID, label: 'ID', itemprop: 'id'
+    # config.add_show_field Settings.FIELDS.IDENTIFIER, label: 'Identifier', itemprop: 'identifier'
+    # config.add_show_field Settings.FIELDS.INDEX_YEAR, label: 'Year', itemprop: 'year'
+    # config.add_show_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', itemprop: 'is_part_of'
+    # config.add_show_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', itemprop: 'is_replaced_by'
+    # config.add_show_field Settings.FIELDS.ISO_TOPIC_CATEGORY, label: 'Theme', itemprop: 'theme'
+    # config.add_show_field Settings.FIELDS.KEYWORD, label: 'Keyword(s)', itemprop: 'keyword'
+    # config.add_show_field Settings.FIELDS.LANGUAGE, label: 'Language', itemprop: 'language'
+    # config.add_show_field Settings.FIELDS.LICENSE, label: 'License', itemprop: 'license'
+    # config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', itemprop: 'member_of'
+    # config.add_show_field Settings.FIELDS.METADATA_VERSION, label: 'Metadata Version', itemprop: 'metadata_version'
+    # config.add_show_field Settings.FIELDS.MODIFIED, label: 'Date Modified', itemprop: 'modified'
+    # config.add_show_field Settings.FIELDS.OVERLAP_FIELD, label: 'Overlap BBox', itemprop: 'overlap_field'
+    # config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher'
+    # config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', itemprop: 'provider'
+    # config.add_show_field Settings.FIELDS.REFERENCES, label: 'References', itemprop: 'references'
+    # config.add_show_field Settings.FIELDS.RELATION, label: 'Relation', itemprop: 'relation'
+    # config.add_show_field Settings.FIELDS.REPLACES, label: 'Replaces', itemprop: 'replaces'
+    # config.add_show_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', itemprop: 'class'
+    # config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', itemprop: 'type'
+    # config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights'
+    # config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: 'Rights Holder', itemprop: 'rights_holder'
+    # config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial_coverage'
+    # config.add_show_field Settings.FIELDS.SPATIAL_EXTENT, label: 'Spatial Extent', itemprop: 'geometry'
+    # config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'subject'
+    # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed'
+    # config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal'
+    # config.add_show_field Settings.FIELDS.TITLE, label: 'Title', itemprop: 'title'
+    # config.add_show_field Settings.FIELDS.VERSION, label: 'Version', itemprop: 'version'
+    # config.add_show_field Settings.FIELDS.WXS_IDENTIFIER, label: 'Web Service Layer', itemprop: 'wxs_identifier'
+
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
     #
@@ -222,11 +264,11 @@ class CatalogController < ApplicationController
     # label in pulldown is followed by the name of the SOLR field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
-    config.add_sort_field 'score desc, dc_title_sort asc', :label => 'Relevance'
-    config.add_sort_field "#{Settings.FIELDS.YEAR} desc, dc_title_sort asc", :label => 'Year (Newest first)'
-    config.add_sort_field "#{Settings.FIELDS.YEAR} asc, dc_title_sort asc", :label => 'Year (Oldest first)'
-    config.add_sort_field 'dc_title_sort asc', :label => 'Title (A-Z)'
-    config.add_sort_field 'dc_title_sort desc', :label => 'Title (Z-A)'
+    config.add_sort_field 'score desc, dct_title_sort asc', :label => 'Relevance'
+    config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} desc, dct_title_sort asc", :label => 'Year (Newest first)'
+    config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} asc, dct_title_sort asc", :label => 'Year (Oldest first)'
+    config.add_sort_field 'dct_title_sort asc', :label => 'Title (A-Z)'
+    config.add_sort_field 'dct_title_sort desc', :label => 'Title (Z-A)'
 
     # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.

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

@@ -0,0 +1,195 @@
+#Solr field mappings for GeoBlacklight Metadata Schema version 1.0
+
+# Configurable Logo Used for CartoDB export
+APPLICATION_LOGO_URL: 'http://geoblacklight.org/images/geoblacklight-logo.png'
+
+# Carto OneClick Service https://carto.com/engine/open-in-carto/
+CARTO_ONECLICK_LINK: 'http://oneclick.carto.com/'
+
+# ArcGIS Online Base URL
+ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html'
+
+# Download path can be configured using this setting
+#DOWNLOAD_PATH: "./tmp/cache/downloads"
+
+# DEPRECATED Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
+GEOMETRY_FIELD: 'solr_geom'
+
+# The bq boost value for spatial search matches within a bounding box
+BBOX_WITHIN_BOOST: '10'
+
+# The bf boost value for overlap ratio
+OVERLAP_RATIO_BOOST: '2'
+
+# Solr field mappings
+FIELDS:
+  :ACCESS_RIGHTS: 'dc_rights_s'
+  #:ALTERNATIVE_TITLE: 'dct_alternative_sm'
+  #:CENTROID: 'dcat_centroid_ss'
+  :CREATOR: 'dc_creator_sm'
+  :DATE_ISSUED: 'dct_issued_s'
+  #:DATE_RANGE: 'gbl_dateRange_drsim'
+  :DESCRIPTION: 'dc_description_sm'
+  :FORMAT: 'dc_format_s'
+  #:FILE_SIZE: 'gbl_fileSize_s'
+  #:GEOREFERENCED: 'gbl_georeferenced_b'
+  :ID: 'layer_slug_s'
+  :IDENTIFIER: 'dc_identifier_s'
+  :INDEX_YEAR: 'solr_year_i'
+  #:IS_PART_OF: 'dct_isPartOf_sm'
+  #:IS_REPLACED_BY: 'dct_isReplacedBy_sm'
+  #:ISO_TOPIC_CATEGORY: 'dcat_theme_sm'
+  #:KEYWORD: 'dcat_keyword_sm'
+  :LANGUAGE: 'dc_language_sm'
+  #:LICENSE: 'dct_license_sm'
+  #:MEMBER_OF: 'pcdm_memberOf_sm'
+  :METADATA_VERSION: 'geoblacklight_version'
+  :MODIFIED: 'layer_modified_dt'
+  :OVERLAP_FIELD: 'solr_bboxtype'
+  :PUBLISHER: 'dc_publisher_s'
+  :PROVIDER: 'dct_provenance_s'
+  :REFERENCES: 'dct_references_s'
+  #:RELATION: 'dct_relation_sm'
+  #:REPLACES: 'dct_replaces_sm'
+  #:RESOURCE_CLASS: 'gbl_resourceClass_sm'
+  :RESOURCE_TYPE: 'layer_geom_type_s'
+  #:RIGHTS: 'dct_rights_sm'
+  #:RIGHTS_HOLDER: 'dct_rightsHolder_sm'
+  :SOURCE: 'dc_source_sm'
+  :SPATIAL_COVERAGE: 'dct_spatial_sm'
+  :SPATIAL_EXTENT: 'solr_geom'
+  :SUBJECT: 'dc_subject_sm'
+  :SUPPRESSED: 'suppressed_b'
+  :TEMPORAL_COVERAGE: 'dct_temporal_sm'
+  :TITLE: 'dc_title_s'
+  #:VERSION: 'dct_isVersionOf_sm'
+  :WXS_IDENTIFIER: 'layer_id_s'
+
+# Institution deployed at
+INSTITUTION: 'Stanford'
+
+# Metadata shown in tool panel
+METADATA_SHOWN:
+  - 'mods'
+  - 'fgdc'
+  - 'iso19139'
+  - 'html'
+
+# (For external Download) timeout and open_timeout parameters for Faraday
+TIMEOUT_DOWNLOAD: 16
+
+# (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
+
+# Web services shown in tool panel
+WEBSERVICES_SHOWN:
+  - 'wms'
+  - 'tms'
+  - 'wfs'
+  - 'iiif'
+  - 'feature_layer'
+  - 'tiled_map_layer'
+  - 'dynamic_map_layer'
+  - 'image_map_layer'
+
+# Relationships to display
+RELATIONSHIPS_SHOWN:
+# MEMBER_OF:
+#    field: pcdm_memberOf_sm
+#    query_type: ancestors
+#    icon: nil
+#    label: geoblacklight.relations.member_of
+#  PART_OF:
+#    field: dct_isPartOf_sm
+#    query_type: ancestors
+#    icon: nil
+#    label: geoblacklight.relations.part_of
+#  RELATION:
+#    field: dct_relation_sm
+#    query_type: ancestors
+#    icon: nil
+#    label: geoblacklight.relations.relation
+#  REPLACES:
+#    field: dct_replaces_sm
+#    query_type: ancestors
+#    icon: nil
+#    label: geoblacklight.relations.replaces
+#  REPLACED_BY:
+#    field: dct_isReplacedBy_sm
+#    query_type: descendants
+#    icon: nil
+#    label: geoblacklight.relations.replaced_by
+  SOURCE_ANCESTORS:
+    field: dct_source_sm
+    query_type: ancestors
+    icon: pagelines-brands
+    label: geoblacklight.relations.ancestor
+  SOURCE_DESCENDANTS:
+    field: dct_source_sm
+    query_type: descendants
+    icon: leaf
+    label: geoblacklight.relations.descendant
+#  VERSION_OF:
+#    field: dct_isVersionOf_sm
+#    query_type: descendants
+#    icon: nil
+#    label: geoblacklight.relations.version_of
+
+# WMS Parameters
+WMS_PARAMS:
+  :SERVICE: 'WMS'
+  :VERSION: '1.1.1'
+  :REQUEST: 'GetFeatureInfo'
+  :STYLES: ''
+  :SRS: 'EPSG:4326'
+  :EXCEPTIONS: 'application/json'
+  :INFO_FORMAT: 'text/html'
+
+# Settings for leaflet
+OPACITY_CONTROL: &opacity_control
+  CONTROLS:
+    - 'Opacity'
+
+LEAFLET:
+  MAP:
+  LAYERS:
+    DETECT_RETINA: true
+    INDEX:
+      DEFAULT: &default
+        color: "#1eb300"
+        weight: "1"
+        radius: "4"
+      UNAVAILABLE:
+        <<: *default
+        color: "#b3001e"
+      SELECTED:
+        <<: *default
+        color: "#006bde"
+  VIEWERS:
+    WMS:
+      <<: *opacity_control
+    TILEDMAPLAYER:
+      <<: *opacity_control
+    FEATURELAYER:
+      <<: *opacity_control
+    DYNAMICMAPLAYER:
+      <<: *opacity_control
+    IMAGEMAPLAYER:
+      <<: *opacity_control
+
+# Toggle the help text feature that offers users context
+HELP_TEXT:
+  viewer_protocol:
+      - 'dynamic_map_layer'
+      - 'feature_layer'
+      - 'iiif'
+      - 'iiif_manifest'
+      - 'image_map_layer'
+      - 'index_map'
+      - 'tiled_map_layer'
+      - 'wms'
+      - 'tms'
+      - 'oembed'