geoblacklight 3.8.1 → 4.0.0.pre.alpha

data/lib/geoblacklight/relation/descendants.rb

@@ -2,14 +2,15 @@
 module Geoblacklight
   module Relation
     class Descendants
-      def initialize(id, repository)
+      def initialize(id, field, repository)
         @search_id = id
+        @field = field
         @repository = repository
       end
 
       def create_search_params
-        { fq: "#{Settings.FIELDS.SOURCE}:#{@search_id}",
-          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE] }
+        { fq: "#{@field}:#{@search_id}",
+          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/relation_response.rb

@@ -9,16 +9,31 @@ module Geoblacklight
         @repository = repository
       end
 
-      def ancestors
-        @ancestors ||= Geoblacklight::Relation::Ancestors.new(@search_id, @repository).results
+      def method_missing(method, *args, &block)
+        if Settings.RELATIONSHIPS_SHOWN.key?(method)
+          field = Settings.RELATIONSHIPS_SHOWN[method].field
+          query_type = query_type(Settings.RELATIONSHIPS_SHOWN[method])
+          @results = query_type.new(@search_id, field, @repository).results
+        else
+          super
+        end
       end
 
-      def descendants
-        @descendants ||= Geoblacklight::Relation::Descendants.new(@search_id, @repository).results
+      def respond_to_missing?(method_name, *args)
+        Settings.RELATIONSHIPS_SHOWN.key?(method_name) or super
       end
 
-      def empty?
-        !(ancestors['numFound'].positive? || descendants['numFound'].positive?)
+      private
+
+      def query_type(option)
+        case option.query_type
+        when 'ancestors'
+          Geoblacklight::Relation::Ancestors
+        when 'descendants'
+          Geoblacklight::Relation::Descendants
+        else
+          fail ArgumentError, "Bad RelationResponse query_type: #{option.query_type}. Only 'ancestors' or 'descendants' is allowed."
+        end
       end
     end
   end

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '3.8.1'
+  VERSION = '4.0.0-alpha'
 end

data/schema/{geoblacklight-schema.json → geoblacklight-schema-1.0.json}

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Schema for GeoBlacklight. See https://github.com/geoblacklight/geoblacklight/wiki/Schema for more details.",
   "id": "http://geoblacklight.org/v1.0/schema",
-  "title": "GeoBlacklight Schema",
+  "title": "GeoBlacklight Schema - v1.0",
   "definitions": {
     "layer": {
       "title": "layer",

data/schema/geoblacklight-schema-aardvark.json

@@ -0,0 +1,211 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "description": "Schema for GeoBlacklight. See https://opengeometadata.github.io/aardvark/aardvarkMetadata.html for more details.",
+  "id": "http://geoblacklight.org/schema/aardvark",
+  "title": "GeoBlacklight Schema - Aardvark",
+  "type": "object",
+  "properties": {
+    "dct_title_s": { "type": "string" },
+    "dct_alternative_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_description_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_language_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_creator_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_publisher_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "schema_provider_s": { "type": "string" },
+    "gbl_resourceClass_sm": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "Datasets",
+          "Maps",
+          "Imagery",
+          "Collections",
+          "Websites",
+          "Web services",
+          "Other"
+        ]
+      }
+    },
+    "gbl_resourceType_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_subject_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dcat_theme_sm": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "Farming",
+          "Biota",
+          "Boundaries",
+          "Climatology, Meteorology and Atmosphere",
+          "Economy",
+          "Elevation",
+          "Environment",
+          "Geoscientific Information",
+          "Health",
+          "Imagery and Base Maps",
+          "Intelligence and Military",
+          "Inland Waters",
+          "Location",
+          "Oceans",
+          "Planning and Cadastral",
+          "Society",
+          "Structure",
+          "Transportation",
+          "Utilities and Communications"
+        ]
+      }
+    },
+    "dcat_keyword_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_temporal_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_issued_s": { "type": "string" },
+    "gbl_indexYear_im": {
+      "type": "array",
+      "items": {
+        "type": "integer"
+      }
+    },
+    "gbl_dateRange_drsim": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_spatial_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "locn_geometry": { "type": "string" },
+    "dcat_centroid_ss": { "type": "string" },
+    "dct_relation_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "pcdm_memberOf_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_isPartOf_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_source_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_isVersionOf_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_replaces_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_isReplacedBy_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_rights_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_rightsHolder_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_license_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_accessRights_s": { "type": "string" },
+    "dct_format_s": { "type": "string" },
+    "gbl_fileSize_s": { "type": "string" },
+    "gbl_wxsIdentifier_s": { "type": "string" },
+    "dct_references_s": { "type": "string" },
+    "id": { "type": "string" },
+    "dct_identifier_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "gbl_mdModified_dt": {
+      "type": "string",
+      "format": "date-time"
+    },
+    "gbl_mdVersion_s": {
+      "type": "string",
+      "const": "Aardvark"
+    },
+    "gbl_suppressed_b": { "type": "boolean" },
+    "gbl_georeferenced_b": { "type": "boolean" }
+  },
+  "required": ["id", "dct_title_s", "gbl_resourceClass_sm", "dct_accessRights_s", "gbl_mdVersion_s"]
+}

data/solr/conf/schema.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="geoblacklight-schema" version="1.7">
-  <uniqueKey>layer_slug_s</uniqueKey>
+<schema name="geoblacklight-schema" version="4.0">
+  <uniqueKey>id</uniqueKey>
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>
     <field name="timestamp" type="date"   stored="true" indexed="true" default="NOW"/>
-    <field name="layer_slug_s" type="string" stored="true" indexed="true" required="true"/>
     <field name="geoblacklight_version" type="string" stored="true" indexed="true"/>
-    <field name="uuid"      type="string" stored="true" indexed="true"/><!-- deprecated -->
+    <field name="id"      type="string" stored="true" indexed="true" required="true"/>
 
     <!-- core generated fields -->
     <field name="text" type="text_en" stored="false" indexed="true" multiValued="true"
@@ -43,6 +42,9 @@
 
     <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
 
+    <!-- date range (_drsim) -->
+    <dynamicField name="*_drsim" type="dateRange" stored="true" indexed="true" multiValued="true"/>
+
     <!-- Spatial field types:
 
          Solr3:
@@ -64,6 +66,7 @@
     <dynamicField name="*_pt"   type="location"     stored="true" indexed="true"/>
     <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/><!-- deprecated -->
     <dynamicField name="*_geom" type="location_rpt" stored="true" indexed="true"/>
+    <dynamicField name="*_geometry" type="location_rpt" stored="true" indexed="true"/>
     <dynamicField name="*_bboxtype" type="bbox" stored="true" indexed="true"/>
 
   </fields>
@@ -82,6 +85,9 @@
          A Trie based date field for faster date range queries and date faceting. -->
     <fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
 
+    <!-- A DateRange based date field for truly faster date range queries. -->
+    <fieldType name="dateRange" class="solr.DateRangeField"/>
+
     <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
     <fieldtype name="binary" class="solr.BinaryField"/>
 
@@ -143,54 +149,56 @@
     <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_d"/>
 
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />
+               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>
     <!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
     <fieldType name="bbox" class="solr.BBoxField"
            geo="true" distanceUnits="kilometers" numberType="pdouble" />
     <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+
+
   </types>
 
   <!-- for scoring formula -->
   <copyField source="dct_spatial_sm"     dest="dct_spatial_tmi"     maxChars="10000"/>
   <copyField source="dct_temporal_sm"    dest="dct_temporal_tmi"    maxChars="10000"/>
-  <copyField source="dc_creator_sm"      dest="dc_creator_tmi"      maxChars="1000"/>
-  <copyField source="dc_description_s"   dest="dc_description_ti"   maxChars="10000"/>
-  <copyField source="dc_format_s"        dest="dc_format_ti"        maxChars="100"/>
-  <copyField source="dc_identifier_s"    dest="dc_identifier_ti"    maxChars="100"/>
-  <copyField source="dc_publisher_s"     dest="dc_publisher_ti"     maxChars="1000"/>
-  <copyField source="dc_rights_s"        dest="dc_rights_ti"        maxChars="100"/>
-  <copyField source="dct_provenance_s"   dest="dct_provenance_ti"   maxChars="1000"/>
-  <copyField source="dc_subject_sm"      dest="dc_subject_tmi"      maxChars="10000"/>
-  <copyField source="dc_title_s"         dest="dc_title_ti"         maxChars="1000"/>
+  <copyField source="dct_creator_sm"      dest="dc_creator_tmi"      maxChars="1000"/>
+  <copyField source="dct_description_sm"   dest="dc_description_tmi"   maxChars="10000"/>
+  <copyField source="dct_format_s"        dest="dc_format_ti"        maxChars="100"/>
+  <copyField source="dct_identifier_sm"    dest="dc_identifier_tmi"    maxChars="100"/>
+  <copyField source="dct_publisher_sm"     dest="dc_publisher_tmi"     maxChars="1000"/>
+  <copyField source="dct_accessRights_s"        dest="dc_rights_ti"        maxChars="100"/>
+  <copyField source="schema_provider_s"   dest="dct_provider_ti"   maxChars="1000"/>
+  <copyField source="dct_subject_sm"      dest="dc_subject_tmi"      maxChars="10000"/>
+  <copyField source="dct_title_s"         dest="dc_title_ti"         maxChars="1000"/>
   <copyField source="dct_isPartOf_sm"    dest="dct_isPartOf_tmi"    maxChars="1000"/>
-  <copyField source="layer_geom_type_s"  dest="layer_geom_type_ti"  maxChars="100"/>
-  <copyField source="layer_slug_s"       dest="layer_slug_ti"       maxChars="100"/>
+  <copyField source="locn_geometry_s"  dest="layer_geom_type_ti"  maxChars="100"/>
+  <copyField source="id"       dest="layer_slug_ti"       maxChars="100"/>
 
   <!-- core text search -->
   <copyField source="*_s"                dest="text" />
   <copyField source="*_sm"               dest="text" />
 
   <!-- for sorting text fields -->
-  <copyField source="dct_provenance_s"   dest="dct_provenance_sort"/>
-  <copyField source="dc_publisher_s"     dest="dc_publisher_sort"/>
-  <copyField source="dc_title_s"         dest="dc_title_sort"/>
+  <copyField source="schema_provider_s"   dest="schema_provider_sort"/>
+  <copyField source="dct_publisher_sm"     dest="dc_publisher_sort"/>
+  <copyField source="dct_title_s"         dest="dct_title_sort"/>
 
   <!-- for spell checking -->
-  <copyField source="dc_title_s" dest="spell"/>
-  <copyField source="dc_creator_sm" dest="spell"/>
-  <copyField source="dc_publisher_s" dest="spell"/>
-  <copyField source="dct_provenance_s" dest="spell"/>
-  <copyField source="dc_subject_sm" dest="spell"/>
+  <copyField source="dct_title_s" dest="spell"/>
+  <copyField source="dct_creator_sm" dest="spell"/>
+  <copyField source="dct_publisher_sm" dest="spell"/>
+  <copyField source="schema_provider_s" dest="spell"/>
+  <copyField source="dct_subject_sm" dest="spell"/>
   <copyField source="dct_spatial_sm" dest="spell"/>
 
   <!-- for suggestions -->
-  <copyField source="dc_title_s" dest="suggest"/>
-  <copyField source="dc_creator_sm" dest="suggest"/>
-  <copyField source="dc_publisher_s" dest="suggest"/>
-  <copyField source="dct_provenance_s" dest="suggest"/>
-  <copyField source="dc_subject_sm" dest="suggest"/>
+  <copyField source="dct_title_s" dest="suggest"/>
+  <copyField source="dct_creator_sm" dest="suggest"/>
+  <copyField source="dct_publisher_sm" dest="suggest"/>
+  <copyField source="schema_provider_s" dest="suggest"/>
+  <copyField source="dct_subject_sm" dest="suggest"/>
   <copyField source="dct_spatial_sm" dest="suggest"/>
 
   <!-- for bbox value -->
-  <copyField source="solr_geom" dest="solr_bboxtype"/>
+  <copyField source="locn_geometry" dest="solr_bboxtype"/>
 </schema>

data/solr/conf/solrconfig.xml

@@ -20,7 +20,7 @@
      this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -28,7 +28,7 @@
        affect both how text is indexed and queried.
   -->
   <luceneMatchVersion>7.6</luceneMatchVersion>
-  
+
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
@@ -38,7 +38,7 @@
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-    
+
   <indexConfig>
     <lockType>${solr.lock.type:native}</lockType>
   </indexConfig>
@@ -70,9 +70,9 @@
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <query>
     <maxBooleanClauses>1024</maxBooleanClauses>
-    <filterCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
-    <queryResultCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
-    <documentCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0"/>
+    <queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
+    <documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
     <enableLazyFieldLoading>true</enableLazyFieldLoading>
     <queryResultWindowSize>20</queryResultWindowSize>
     <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
@@ -113,7 +113,7 @@
       <int name="ps">0</int>
       <float name="tie">0.01</float>
       <str name="fl">*,score</str>
-      <str name="sort">score desc, dc_title_sort asc</str>
+      <str name="sort">score desc, dct_title_sort asc</str>
       <str name="q.alt">*:*</str>
       <str name="qf">
         text^1
@@ -126,7 +126,7 @@
         dct_temporal_tmi^5
         dc_title_ti^6
         dc_rights_ti^7
-        dct_provenance_ti^8
+        dct_provider_ti^8
         layer_geom_type_ti^9
         layer_slug_ti^10
         dc_identifier_ti^10
@@ -142,7 +142,7 @@
         dct_temporal_tmi^5
         dc_title_ti^6
         dc_rights_ti^7
-        dct_provenance_ti^8
+        dct_provider_ti^8
         layer_geom_type_ti^9
         layer_slug_ti^10
         dc_identifier_ti^10
@@ -151,16 +151,16 @@
       <int name="facet.mincount">1</int>
       <int name="facet.limit">10</int>
       <str name="facet.field">dct_isPartOf_sm</str>
-      <str name="facet.field">dct_provenance_s</str>
+      <str name="facet.field">schema_provider_s</str>
       <str name="facet.field">dct_spatial_sm</str>
-      <str name="facet.field">dc_creator_sm</str>
-      <str name="facet.field">dc_format_s</str>
-      <str name="facet.field">dc_language_s</str>
-      <str name="facet.field">dc_publisher_s</str>
-      <str name="facet.field">dc_rights_s</str>
-      <str name="facet.field">dc_subject_sm</str>
-      <str name="facet.field">layer_geom_type_s</str>
-      <str name="facet.field">solr_year_i</str>
+      <str name="facet.field">dct_creator_sm</str>
+      <str name="facet.field">dct_format_s</str>
+      <str name="facet.field">dct_language_sm</str>
+      <str name="facet.field">dct_publisher_sm</str>
+      <str name="facet.field">dct_accessRights_s</str>
+      <str name="facet.field">dct_subject_sm</str>
+      <str name="facet.field">locn_geometry_s</str>
+      <str name="facet.field">gbl_indexYear_im</str>
 
       <str name="spellcheck">true</str>
     </lst>

data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Geoblacklight::HomepageFeatureFacetComponent, type: :component do
       {
         icon: 'home',
         label: 'geoblacklight.home.institution',
-        facet_field: Settings.FIELDS.PROVENANCE,
+        facet_field: Settings.FIELDS.PROVIDER,
         response: @response
       }
     end

data/spec/config/initializers/rails_config_spec.rb

@@ -2,14 +2,11 @@
 require 'spec_helper'
 
 describe 'Config' do
-  it 'Loads new v3.3 Settings.FIELDS defaults' do
-    expect(Settings.FIELDS.IDENTIFIER).to eq 'dc_identifier_s'
-    expect(Settings.FIELDS.LANGUAGE).to eq 'dc_language_s'
-    expect(Settings.FIELDS.LAYER_MODIFIED).to eq 'layer_modified_dt'
-    expect(Settings.FIELDS.SOURCE).to eq 'dc_source_sm'
-    expect(Settings.FIELDS.SUPPRESSED).to eq 'suppressed_b'
-    expect(Settings.FIELDS.TYPE).to eq 'dc_type_s'
-    expect(Settings.FIELDS.UNIQUE_KEY).to eq 'layer_slug_s'
+  it 'Loads new Aardvark relationships' do
+    expect(Settings).to respond_to('RELATIONSHIPS_SHOWN')
+    [:field, :query_type, :icon, :label].each do |method|
+      expect(Settings.RELATIONSHIPS_SHOWN.MEMBER_OF).to respond_to(method)
+    end
   end
 
   it 'Loads new v3.4 Settings.FIELDS defaults' do

data/spec/controllers/catalog_controller_spec.rb

@@ -71,13 +71,13 @@ describe CatalogController, type: :controller do
       expect(response.status).to eq 200
       expect(response.body).not_to be_empty
       response_values = JSON.parse(response.body)
-      expect(response_values).to include 'geoblacklight_version' => '1.0'
+      expect(response_values).to include 'gbl_mdVersion_s' => 'Aardvark'
       expect(response_values).to include Settings.FIELDS.TITLE => '100 Foot Grid Cambridge MA 2004'
-      expect(response_values).to include Settings.FIELDS.IDENTIFIER => 'urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04'
-      expect(response_values).to include Settings.FIELDS.RIGHTS => 'Public'
-      expect(response_values).to include Settings.FIELDS.PROVENANCE => 'Tufts'
-      expect(response_values).to include Settings.FIELDS.UNIQUE_KEY => 'tufts-cambridgegrid100-04'
-      expect(response_values).to include Settings.FIELDS.GEOMETRY => 'ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)'
+      expect(response_values).to include Settings.FIELDS.IDENTIFIER => ['urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04']
+      expect(response_values).to include Settings.FIELDS.ACCESS_RIGHTS => 'Public'
+      expect(response_values).to include Settings.FIELDS.PROVIDER => 'Tufts'
+      expect(response_values).to include Settings.FIELDS.ID => 'tufts-cambridgegrid100-04'
+      expect(response_values).to include Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
     end
   end
 end

data/spec/features/download_layer_spec.rb

@@ -41,7 +41,7 @@ feature 'Download layer' do
   end
   scenario 'clicking jpg download button should redirect to external image' do
     visit solr_document_path('princeton-02870w62c')
-    expect(page).to have_css("a.btn.btn-default[href='https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/full/0/default.jpg']", text: 'Original JPG')
+    expect(page).to have_css("a.btn.btn-default[href='https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/full/full/0/default.jpg']", text: 'Original JPG')
   end
   scenario 'options should be available under toggle' do
     visit solr_document_path('mit-f6rqs4ucovjk2')

data/spec/features/esri_viewer_spec.rb

@@ -9,7 +9,6 @@ feature 'feature_layer reference', js: true do
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays dynamic layer (all layers)' do
-    pending 'external service disabled cors access'
     visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true

data/spec/features/home_page_spec.rb

@@ -21,9 +21,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     expect(page).to have_css '.category-block', count: 4
     expect(page).to have_css '.home-facet-link', count: 36
     expect(page).to have_css 'a.more_facets_link', count: 4
-    click_link 'Transportation'
+    click_link 'Topography'
     expect(page).to have_css '.filter-name', text: 'Subject'
-    expect(page).to have_css '.filter-value', text: 'Transportation'
+    expect(page).to have_css '.filter-value', text: 'Topography'
   end
   scenario 'map should be visible' do
     within '#main-container' do
@@ -39,8 +39,8 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     expect(page).to have_css '#documents'
   end
   scenario 'can search by placename' do
-    click_link 'Minnesota, United States'
+    click_link 'New York, New York'
     results = page.all(:css, 'article.document')
-    expect(results.count).to equal(3)
+    expect(results.count).to equal(4)
   end
 end

data/spec/features/missing_metadata_spec.rb

@@ -14,8 +14,8 @@ feature 'Missing metadata', js: true do
     visit solr_document_path('05d-03-noGeomType')
     expect(page).to have_css('#map')
   end
-  scenario 'Yields error free show page for no dct_provenance_s' do
-    visit solr_document_path('99-0001-noProvenance')
+  scenario 'Yields error free show page for no dct_provider_s' do
+    visit solr_document_path('99-0001-noprovider')
     expect(page).to have_css('#map')
   end
   scenario 'Yields error free show page for no solr_geom' do

data/spec/features/relations_spec.rb

@@ -15,8 +15,8 @@ feature 'Display related documents' do
   scenario 'Relations should respond to json' do
     visit relations_solr_document_path('nyu_2451_34635', format: 'json')
     response = JSON.parse(page.body)
-    expect(response['ancestors']['numFound']).to eq 0
-    expect(response['descendants']['docs'].first[Settings.FIELDS.UNIQUE_KEY]).to eq 'nyu_2451_34502'
+    expect(response['relations']).not_to respond_to('source_ancestors')
+    expect(response['relations']['source_descendants']['docs'].first[Settings.FIELDS.ID]).to eq 'nyu_2451_34502'
     expect(response['current_doc']).to eq 'nyu_2451_34635'
   end
 

data/spec/features/search_results_map_spec.rb

@@ -7,6 +7,7 @@ feature 'search results map', js: true do
     expect(page).to have_css '#map'
   end
   scenario 'view is scoped to Minnesota' do
+    pending 'Minnesota fixtures have changed.'
     visit root_path
     click_link 'Minnesota, United States'
     expect(page).to have_css '#map'
@@ -35,7 +36,7 @@ feature 'search results map', js: true do
   end
   scenario 'view is scoped to NYC' do
     visit root_path
-    click_link 'New York, New York, United States'
+    click_link 'New York, New York'
     expect(page).to have_css '#map'
     bbox = page.find('#map')['data-js-map-render-bbox']