geoblacklight 1.9.1 → 2.0.0

data/lib/generators/geoblacklight/templates/Procfile

@@ -0,0 +1,3 @@
+rails: bin/rails server --port=3000
+webpack: bin/webpack-dev-server
+

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

@@ -6,6 +6,12 @@ class CatalogController < ApplicationController
   include Blacklight::Catalog
 
   configure_blacklight do |config|
+
+    # Ensures that JSON representations of Solr Documents can be retrieved using
+    # the path /catalog/:id/raw
+    # Please see https://github.com/projectblacklight/blacklight/pull/2006/
+    config.raw_endpoint.enabled = true
+
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     ## @see https://lucene.apache.org/solr/guide/6_6/common-query-parameters.html
     ## @see https://lucene.apache.org/solr/guide/6_6/the-dismax-query-parser.html#TheDisMaxQueryParser-Theq.altParameter
@@ -26,6 +32,7 @@ class CatalogController < ApplicationController
      :q => '{!raw f=layer_slug_s v=$id}'
     }
 
+
     # solr field configuration for search results/index views
     # config.index.show_link = 'title_display'
     # config.index.record_display_type = 'format'
@@ -35,6 +42,9 @@ class CatalogController < ApplicationController
     # solr field configuration for document/show views
 
     config.show.display_type_field = 'format'
+    config.show.partials << 'show_default_viewer_container'
+    config.show.partials << 'show_default_attribute_table'
+    config.show.partials << 'show_default_viewer_information'
 
     ##
     # Configure the index document presenter.
@@ -127,10 +137,17 @@ class CatalogController < ApplicationController
     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_search: true
-    config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject(s)', itemprop: 'keywords', link_to_search: true
+    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_search: true
+    config.add_show_field Settings.FIELDS.PROVENANCE, label: 'Held by', link_to_facet: true
+    config.add_show_field(
+      Settings.FIELDS.REFERENCES,
+      label: 'More details at',
+      accessor: [:external_url],
+      if: proc { |_, _, doc| doc.external_url },
+      helper_method: :render_references_url
+    )
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -213,6 +230,17 @@ class CatalogController < ApplicationController
     # mean") suggestion is offered.
     config.spell_max = 5
 
+    # Nav actions from Blacklight
+    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+
+    # Tools from Blacklight
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+
     # Custom tools for GeoBlacklight
     config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
     config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
@@ -228,8 +256,8 @@ class CatalogController < ApplicationController
     # 'worldAntique'
     # 'worldEco'
     # 'flatBlue'
-    # 'midnightCommander' 
-    
+    # 'midnightCommander'
+
     config.basemap_provider = 'positron'
 
     # Configuration for autocomplete suggestor

data/lib/generators/geoblacklight/templates/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "internal",
+  "private": true,
+  "dependencies": {
+    "@rails/webpacker": "https://github.com/rails/webpacker.git"
+  },
+  "devDependencies": {
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.7.0",
+    "webpack-dev-server": "^3.1.14"
+  }
+}

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

@@ -2,7 +2,7 @@
 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.cartodb.com/'
+CARTO_ONECLICK_LINK: 'http://oneclick.carto.com/'
 
 # Download path can be configured using this setting
 #DOWNLOAD_PATH: "./tmp/cache/downloads"
@@ -13,6 +13,9 @@ 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:
   :FILE_FORMAT: 'dc_format_s'
@@ -78,6 +81,17 @@ 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

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

@@ -0,0 +1,67 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/javascript
+  source_entry_path: packs
+  public_output_path: packs
+  cache_path: tmp/cache/webpacker
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  resolved_paths: []
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  extensions:
+    - .js
+    - .sass
+    - .scss
+    - .css
+    - .module.sass
+    - .module.scss
+    - .module.css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+development: &development
+  <<: *default
+  compile: true
+
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3035
+    public: localhost:3035
+    hmr: false
+    # Inline should be set to true if using HMR
+    inline: true
+    overlay: true
+    compress: true
+    disable_host_check: true
+    use_local_ip: false
+    quiet: false
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: /node_modules/
+
+
+test:
+  <<: *development
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true

data/lib/generators/geoblacklight/webpacker_generator.rb

@@ -0,0 +1,35 @@
+require 'rails/generators'
+
+module Geoblacklight
+  class Webpacker < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'Integrate Webpacker for GeoBlacklight'
+
+    def webpacker_install
+      run 'bundle exec rails webpacker:install --force'
+    end
+
+    def webpacker_config
+      copy_file 'webpacker.yml', 'config/webpacker.yml'
+    end
+
+    def procfile
+      copy_file 'Procfile', 'Procfile'
+    end
+
+    def javascript_install
+      # This overrides the default dependencies specified using
+      # webpacker:install
+      copy_file 'package.json', 'package.json'
+      yarn_available = system('yarn --version')
+      if yarn_available
+        run 'yarn install'
+        run 'yarn upgrade'
+      else
+        run 'npm install'
+        run 'npm update'
+      end
+    end
+  end
+end

data/lib/geoblacklight.rb

@@ -5,7 +5,7 @@ module Geoblacklight
   require 'geoblacklight/bounding_box'
   require 'geoblacklight/catalog_helper_override'
   require 'geoblacklight/constants'
-  require 'geoblacklight/controller_override'
+  # require 'geoblacklight/controller_override'
   require 'geoblacklight/exceptions'
   require 'geoblacklight/geoblacklight_helper_behavior'
   require 'geoblacklight/view_helper_override'
@@ -35,15 +35,13 @@ module Geoblacklight
   require 'geoblacklight/relation/relation_response'
 
   def self.inject!
-    CatalogController.send(:include, Geoblacklight::ControllerOverride)
+    # CatalogController.send(:include, Geoblacklight::ControllerOverride)
     CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)
     CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
     CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
     SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
-    SavedSearchesController.send(:helper, Geoblacklight::ViewHelperOverride) unless
-      SavedSearchesController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
   end
 
   def self.logger

data/lib/geoblacklight/controller_override.rb

@@ -1,22 +1,27 @@
-module Geoblacklight
-  module ControllerOverride
-    extend ActiveSupport::Concern
-    def web_services
-      @response, @document = fetch params[:id]
-      respond_to do |format|
-        format.html do
-          return render layout: false if request.xhr?
-        end
-      end
-    end
-
-    def metadata
-      @response, @document = fetch params[:id]
-      respond_to do |format|
-        format.html do
-          return render layout: false if request.xhr?
-        end
-      end
-    end
-  end
-end
+# @TODO: Remove
+#
+# Blacklight 7.0 introduces ActionBuilder, which adds controller methods from
+# CatalogController config.add_show_tools_partial statements
+#
+# module Geoblacklight
+#  module ControllerOverride
+#    extend ActiveSupport::Concern
+#    def web_services
+#      @response, @document = search_service.fetch(params[:id])
+#      respond_to do |format|
+#        format.html do
+#          return render layout: false if request.xhr?
+#        end
+#      end
+#    end
+#
+#    def metadata
+#      @response, @document = search_service.fetch(params[:id])
+#      respond_to do |format|
+#        format.html do
+#          return render layout: false if request.xhr?
+#        end
+#      end
+#    end
+#  end
+# end

data/lib/geoblacklight/engine.rb

@@ -1,5 +1,4 @@
 require 'blacklight'
-require 'leaflet-rails'
 require 'font-awesome-rails'
 require 'coderay'
 require 'config'

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.9.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/tasks/geoblacklight.rake

@@ -20,6 +20,24 @@ namespace :geoblacklight do
     end
   end
 
+  desc 'Run Solr and GeoBlacklight for interactive development with Webpack enabled'
+  task :webpack do |_t|
+    require 'solr_wrapper'
+    SolrWrapper.wrap(port: '8983') do |solr|
+      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
+        puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
+        puts "\n^C to stop"
+        puts ' '
+        begin
+          Rake::Task['geoblacklight:solr:seed'].invoke
+          system "foreman start"
+        rescue Interrupt
+          puts 'Shutting down...'
+        end
+      end
+    end
+  end
+
   namespace :index do
     desc "Put sample data into solr"
     task :seed => :environment do

data/schema/geoblacklight-schema.md

@@ -1,32 +1,33 @@
 ## GeoBlacklight 1.0 Metadata Schema
-
+This is an overview of the GeoBlacklight Metadata Schema, Version 1.0. For more information on applications of these elements, visit the [Schema Commentary document](/schema/schema-commentary.md).
 ## Brief
 
 | Label 						| uri| Required?|
 |-------------------						|-----------------------|:----------:|
-| [Identifier](#identifier)					| dc_identifier_s| X|
-| [Rights](#rights)							| dc_rights_s| X|
-| [Title](#title)							| dc_title_s| X|
-| [Provenance](#provenance)					| dct_provenance_s| X|
-| [Schema Version](#schema-version)			| geoblacklight_version| X|
-| [Slug](#slug)								| layer_slug_s| X|
-| [Bounding Box](#bounding-box)				| solr_geom| X|
-| [Creator](#creator)						| dc_creator_sm||
-| [Description](#description)				| dc_description_s||
-| [Format](#format)							| dc_format_s||
-| [Language](#language)						| dc_language_sm||
-| [Publisher](#publisher)					| dc_publisher_sm||
-| [Source](#source)							| dc_source_sm||
-| [Subject](#subject)						| dc_subject_sm||
-| [Type](#type)								| dc_type_s||
-| [Is Part Of](#is-part-of)					| dct_isPartOf_sm||
-| [Date Issued](#date-issued)				| dct_issued_dt||
-| [References](#references)					| dct_references_s||
-| [Spatial Coverage](#spatial-coverage)		| dct_spatial_sm||
-| [Temporal Coverage](#temporal-coverage)	| dct_temporal_sm||
-| [Geometry Type](#geometry-type)			| layer_geom_type_s||
-| [Layer ID](#layer-id)						| layer_id_s||
-| [Modified Date](#modified-date)			| layer_modified_dt||
+| [Identifier](#identifier)					| `dc_identifier_s`| X|
+| [Rights](#rights)							| `dc_rights_s`| X|
+| [Title](#title)							| `dc_title_s`| X|
+| [Provenance](#provenance)					| `dct_provenance_s`| X|
+| [Schema Version](#schema-version)			| `geoblacklight_version`| X|
+| [Slug](#slug)								| `layer_slug_s`| X|
+| [Bounding Box](#bounding-box)				| `solr_geom`| X|
+| [Solr Year](#solr-year)					| `solr_year_i`||
+| [Creator](#creator)						| `dc_creator_sm`||
+| [Description](#description)				| `dc_description_s`||
+| [Format](#format)							| `dc_format_s`||
+| [Language](#language)						| `dc_language_sm`||
+| [Publisher](#publisher)					| `dc_publisher_sm`||
+| [Source](#source)							| `dc_source_sm`||
+| [Subject](#subject)						| `dc_subject_sm`||
+| [Type](#type)								| `dc_type_s`||
+| [Is Part Of](#is-part-of)					| `dct_isPartOf_sm`||
+| [Date Issued](#date-issued)				| `dct_issued_s`||
+| [References](#references)					| `dct_references_s`||
+| [Spatial Coverage](#spatial-coverage)		| `dct_spatial_sm`||
+| [Temporal Coverage](#temporal-coverage)	| `dct_temporal_sm`||
+| [Geometry Type](#geometry-type)			| `layer_geom_type_s`||
+| [Layer ID](#layer-id)						| `layer_id_s`||
+| [Modified Date](#modified-date)			| `layer_modified_dt`|||
 
 
 ## Details
@@ -38,7 +39,7 @@
 | Required						| yes|
 | Type							| string|
 | Description					| Unique identifier for layer as a URI. It should be globally unique across all institutions, assumed not to be end-user visible|
-| Entry Guidelines				| This is usually of the form http://institution/id.|
+| Entry Guidelines				| This is usually in the form of http://institution/id.|
 | Controlled Vocabulary			| no|
 | Element Set					| Dublin Core Metadata Element Set|
 | Example						| "http://purl.stanford.edu/vr593vj7147"|
@@ -50,7 +51,7 @@
 | uri							| `dc_rights_s`|
 | Required						| yes|
 | Type							| string|
-| Description					| Controls access in the geoportal and is indicated by a padlock icon. Users need to sign in to download restricted items|
+| Description					| Signals access in the geoportal and is indicated by a padlock icon. Users need to sign in to download restricted items|
 | Entry Guidelines				| Choose either Public or Restricted|
 | Controlled Vocabulary			| "Public" or "Restricted"|
 | Element Set					| Dublin Core Metadata Element Set|
@@ -74,8 +75,8 @@
 | uri							| `dct_provenance_s`|
 | Required						| yes|
 | Type							| string|
-| Description					| The name of the institution that holds the resource or acts as the custodian for the metadata record.|
-| Entry Guidelines				| Each institution should contribute an icon the the GeoBlacklight Icons project. The value for this field should be one of the agreed upon shortened names for each institution (see Provenance list). This will embed the correct icon into the search results and item pages.|
+| Description					| The name of the institution that holds the resource or acts as the custodian for the metadata record|
+| Entry Guidelines				| The value for this field should be one of the agreed upon shortened names for each institution. This will embed the correct icon into the search results and item pages.|
 | Controlled Vocabulary			| This repository contains the insitutions that have shared icons: https://github.com/geoblacklight/geoblacklight-icons|
 | Element Set					| DCMI Metadata Terms|
 | Example						| "Stanford"|
@@ -86,7 +87,7 @@
 | uri							| `geoblacklight_version`	|
 | Required						| yes|
 | Type							| string|
-| Description					| Indicates which version of the GeoBlacklight schema is in use.|
+| Description					| Indicates which version of the GeoBlacklight schema is in use|
 | Entry Guidelines				| Only current value is "1.0"|
 | Controlled Vocabulary			| no|
 | Element Set					| GeoBlacklight|
@@ -98,8 +99,8 @@
 | uri							| `layer_slug_s`|
 | Required						| yes|
 | Type							| string|
-| Description					| This is a string appended to the base URL of a GeoBlacklight installation to create a unique landing page for each resource. It is visible to the user and is used for Permalinks.|
-| Entry Guidelines				| This string must be a globally unique value. The value should be alpha-numeric characters separated by dashes, and is typically of the form institution-keyword1-keyword2.|
+| Description					| This is a string appended to the base URL of a GeoBlacklight installation to create a unique landing page for each resource. It is visible to the user and serves the purpose of forming a persistent URL for each catalog item.|
+| Entry Guidelines				| This string must be a globally unique value. The value should be alpha-numeric characters separated by dashes.|
 | Controlled Vocabulary			| no|
 | Element Set					| GeoBlacklight|
 | Example						| "stanford-andhra-pradesh-village-boundaries"|
@@ -110,12 +111,24 @@
 | uri							| `solr_geom`|
 | Required						| yes|
 | Type							| string|
-| Description					| The rectangular extents of the resource. Note that this field is indexed as a Solr spatial (RPT) field.|
+| Description					| The rectangular extents of the resource. Note that this field is indexed as a Solr spatial (RPT) field|
 | Entry Guidelines				| Bounding box of the layer as a ENVELOPE WKT (from the CQL standard) using coordinates in (West, East, North, South) order. The pattern is: ENVELOPE(.*,.*,.*,.*)|
 | Controlled Vocabulary			| no|
 | Element Set					| GeoBlacklight|
 | Example						| "ENVELOPE(76.76, 84.76, 19.91, 12.62)"|
 
+### Solr Year
+| Label 						| Solr Year|
+|:------------------------------|:---------------------------------------------------------|
+| uri							| `solr_year_i`|
+| Required						| no|
+| Type							| integer|
+| Description					| A four digit integer representing a year of temporal coverage or date issued for the resource. This field is used to populate the Year facet and the optional [Blacklight Range Limit gem](https://github.com/projectblacklight/blacklight_range_limit)|
+| Entry Guidelines				| This field must be an integer.|
+| Controlled Vocabulary			| no|
+| Element Set					| GeoBlacklight|
+| Example						| "1982"|
+
 ### Creator
 | Label							| Creator|
 |:------------------------------|:---------------------------------------------------------|
@@ -124,7 +137,7 @@
 | Type							| array|
 | Description					| The person(s) or organization that created the resource|
 | Entry Guidelines				| This may be an individual or an organization. If available, it should match with the Library of Congress Name Authority File.|
-| Controlled Vocabulary			| If available, it should match with the Library of Congress Name Authority File.|
+| Controlled Vocabulary			| The suggested controlled vocabulary is the [Library of Congress Name Authority File](http://id.loc.gov/authorities/names.html).|
 | Element Set					| Dublin Core Metadata Element Set|
 | Example						| "George Washington", "Thomas Jefferson"|
 
@@ -135,10 +148,10 @@
 | Required						| no|
 | Type							| string|
 | Description					| At minimum, this is a reiteration of the title in sentence format. Other relevant information, such as data creation methods, data sources, and special licenses, may also be included.|
-| Entry Guidelines				| If the description is minimal or lacking, it can be improved by concatenating available metadata fields, such as title, date, format, and place.|
+| Entry Guidelines				| This is a plain text field.|
 | Controlled Vocabulary			| no|
 | Element Set					| Dublin Core Metadata Element Set|
-| Example						| "My Description"|
+| Example						| "This polygon shapefile represents boundaries of election districts in New York City. It was harvested from the NYC Open Data Portal."|
 
 ### Format
 | Label							| Format|
@@ -146,7 +159,7 @@
 | uri							| `dc_format_s`|
 | Required						| no|
 | Type							| string|
-| Description					| This indicates the file format of the data. If a download link is included, this value shows up on the item page display in the download widget.|
+| Description					| This indicates the file format of the data. If a download link is included, this value shows up on the item page display in the download widget|
 | Entry Guidelines				| Choose from set values (see Format list)|
 | Controlled Vocabulary			| [Format Controlled Vocabulary](/schema/format-values.md)|
 | Element Set					| Dublin Core Metadata Element Set|
@@ -159,7 +172,7 @@
 | Required						| no|
 | Type							| array|
 | Description					| Indicates the language of the data or map|
-| Entry Guidelines				| Current practice is to spell out language (in English) instead of using a code. Ex “French” instead of “fra”|
+| Entry Guidelines				| Spell out language (in English) instead of using the ISO 639-1 code (e.g.,“French” instead of “fra”).|
 | Controlled Vocabulary			| no|
 | Element Set					| Dublin Core Metadata Element Set|
 | Example						| "English"|
@@ -167,14 +180,14 @@
 ### Publisher
 | Label							| Publisher|
 |:------------------------------|:---------------------------------------------------------|
-| uri							| `dc_publisher_sm`|
+| uri							| `dc_publisher_s`|
 | Required						| no|
 | Type							| array|
 | Description					| The organization that made the original resource available|
 | Entry Guidelines				| This should always be an organization.|
-| Controlled Vocabulary			| If available, it should match with the Library of Congress Name Authority File.|
+| Controlled Vocabulary			| The suggested controlled vocabulary is the [Library of Congress Name Authority File](http://id.loc.gov/authorities/names.html).|
 | Element Set					| Dublin Core Metadata Element Set|
-| Example						| "ML InfoMap"|
+| Example						| "ML InfoMap (Firm)"|
 
 ### Source
 | Label							| Source|
@@ -182,8 +195,8 @@
 | uri							| `dc_source_sm`|
 | Required						| no|
 | Type							| array|
-| Description					| This is used for parent/child relationships and activates the Data Relations widget in GeoBlacklight.|
-| Entry Guidelines				| This is only added to the child records. Enter the layer_slug_s of the parent record(s) into this field. See https://github.com/geoblacklight/geoblacklight/wiki/Using-data-relations-widget for more information.|
+| Description					| This is used to indicate parent/child relationships between data layers and activates the Data Relations widget in GeoBlacklight|
+| Entry Guidelines				| This is only added to the child records. Enter the layer_slug_s of the parent record(s) into this field.|
 | Controlled Vocabulary			| no|
 | Element Set					| Dublin Core Metadata Element Set|
 | Example						| "stanford-vr593vj7147"|
@@ -195,8 +208,8 @@
 | Required						| no|
 | Type							| array|
 | Description					| These are theme or topic keywords|
-| Entry Guidelines				| These should be consistent and chosen from a controlled vocabulary. Place name subject headings should be transferred to Spatial Coverage. Use sentence style capitalization, where only the first word of a phrase is capitalized|
-| Controlled Vocabulary			| Recommended thesauri are ISO Topic Categories and Library of Congress Subject Headings. Library of Congress place name subject headings should be transferred to Spatial Coverage.|
+| Entry Guidelines				| These should be consistent and chosen from a controlled vocabulary. Use sentence style capitalization, where only the first word of a phrase is capitalized.|
+| Controlled Vocabulary			| Recommended thesauri are [ISO Topic Categories](https://www2.usgs.gov/science/about/thesaurus-full.php?thcode=15) and Library of Congress Subject Headings.|
 | Element Set					| Dublin Core Metadata Element Set|
 | Example						| "Census", "Human settlements"|
 
@@ -207,7 +220,7 @@
 | uri							| `dc_type_s`|
 | Required						| no|
 | Type							| string|
-| Description					| This is a general element to indicate the larger genre of the resource.|
+| Description					| This is a general element to indicate the larger genre of the resource|
 | Entry Guidelines				| Choose from Dublin Core Type values|
 | Controlled Vocabulary			| [Type Controlled Vocabulary](/schema/type-values.md)|
 | Element Set					| Dublin Core Metadata Element Set|
@@ -222,20 +235,20 @@
 | Description					| Holding entity for the layer, such as the title of a collection|
 | Entry Guidelines				| Plain text that is indexed in the Collections facet|
 | Controlled Vocabulary			| no|
-| Element Set					| DCMI Metadata Terms|
+| Element Set					| [DCMI Metadata Terms](http://dublincore.org/documents/dcmi-terms/)|
 | Example						| "Village Maps of India"|
 
 ### Date Issued
 | Label							| Date Issued|
 |:------------------------------|:---------------------------------------------------------|
-| uri							| `dct_issued_dt`|
+| uri							| `dct_issued_s`|
 | Required						| no|
-| Type							| date-time|
+| Type							| string|
 | Description					| This is the publication date for the resource|
-| Entry Guidelines				| Use the XML Schema dateTime format (YYYY-MM-DDThh:mm:ssZ)|
+| Entry Guidelines				| Use any date format, such as the XML Schema dateTime format (YYYY-MM-DDThh:mm:ssZ)|
 | Controlled Vocabulary			| no|
-| Element Set					| DCMI Metadata Terms|
-| Example						| "2015-01-01T12:00:00Z"|
+| Element Set					| [DCMI Metadata Terms](http://dublincore.org/documents/dcmi-terms/)|
+| Example						| "2015-01-01"|
 
 ### References
 | Label							| References|
@@ -243,9 +256,9 @@
 | uri							| `dct_references_s`|
 | Required						| no|
 | Type							| string|
-| Description					| This element is a hash of key/value pairs for different types of external links. It external services and references using the CatInterOp approach.|
+| Description					| This element is a hash of key/value pairs for different types of external links. It integrates external services and references using the CatInterOp approach|
 | Entry Guidelines				| See [External Services](https://github.com/geoblacklight/geoblacklight/wiki/Schema#external-services)|
-| Controlled Vocabulary			| [References URIs](https://github.com/geoblacklight/geoblacklight/wiki/Schema#external-services)|
+| Controlled Vocabulary			| [References URIs](/schema/references.md)|
 | Element Set					| DCMI Metadata Terms|
 | Example						| "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/bm662dm5913\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:bm662dm5913/data.zip\"}"|
 
@@ -256,8 +269,8 @@
 | Required						| no|
 | Type							| array|
 | Description					| This field is for place name keywords|
-| Entry Guidelines				| If records are shared across institutions, the place name text strings should be specified out to the nation level.|
-| Controlled Vocabulary			| Recommended thesaurus is GeoNames|
+| Entry Guidelines				| Place name text strings should be specified out to the nation level. It is typical for the place name to represent the largest extent the data layer represents.|
+| Controlled Vocabulary			| Recommended thesaurus is [GeoNames](https://www.geonames.org/)|
 | Element Set					| DCMI Metadata Terms|
 | Example						| "Philadelphia, Pennsylvania, United States"|
 
@@ -267,7 +280,7 @@
 | uri							| `dct_temporal_sm`|
 | Required						| no|
 | Type							| array|
-| Description					| This represents the "Ground Condition" of the resource, meaning the time period data was collected or is intended to represent. Displays on the item page in the Year value.|
+| Description					| This represents the "Ground Condition" of the resource, meaning the time period data was collected or is intended to represent. Displays on the item page in the Year value|
 | Entry Guidelines				| This is a text string and can indicate uncertainty|
 | Controlled Vocabulary			| no|
 | Element Set					| DCMI Metadata Terms|
@@ -279,7 +292,7 @@
 | uri							| `layer_geom_type_s`|
 | Required						| no|
 | Type							| string|
-| Description					| This shows up as Data type in GeoBlacklight and each value has an associated icon. It differentiates between vector types (point, line, polygon, etc.) and raster types (raster data, image, paper map)|
+| Description					| This element shows up as Data type in GeoBlacklight, and each value has an associated icon|
 | Entry Guidelines				| Choose from set values (see Controlled Vocabulary Lists)|
 | Controlled Vocabulary			| [Geometry Type Controlled Vocabulary](/schema/geometry-type-values.md)|
 | Element Set					| GeoBlacklight|
@@ -291,8 +304,8 @@
 | uri							| `layer_id_s`|
 | Required						| no|
 | Type							| string|
-| Description					| This indicates the layer id for any WMS or WFS web services listed in the dct_references_s field|
-| Entry Guidelines				| Only the layer name is added here. The base service endpoint URLs (e.g. "https://maps-public.geo.nyu.edu/geoserver/sdr/wms") are added to References|
+| Description					| Indicates the layer id for any WMS or WFS web services listed in the dct_references_s field|
+| Entry Guidelines				| Only the layer name is added here. The base service endpoint URLs (e.g. "https://maps-public.geo.nyu.edu/geoserver/sdr/wms") are added to the `dct_references_s` field.|
 | Controlled Vocabulary			| no|
 | Element Set					| GeoBlacklight|
 | Example						| "druid:vr593vj7147"|