geo_combine 0.1.0 → 0.2.0

data/lib/xslt/iso2geoBL.xsl

@@ -1,14 +1,14 @@
-<!-- 
+<!--
      iso2geoBl.xsl - Transformation from ISO 19139 XML into GeoBlacklight solr json
-     
+
 -->
-<xsl:stylesheet 
-  xmlns="http://www.loc.gov/mods/v3" 
-  xmlns:gco="http://www.isotc211.org/2005/gco" 
-  xmlns:gmi="http://www.isotc211.org/2005/gmi" 
-  xmlns:gmd="http://www.isotc211.org/2005/gmd" 
+<xsl:stylesheet
+  xmlns="http://www.loc.gov/mods/v3"
+  xmlns:gco="http://www.isotc211.org/2005/gco"
+  xmlns:gmi="http://www.isotc211.org/2005/gmi"
+  xmlns:gmd="http://www.isotc211.org/2005/gmd"
   xmlns:gml="http://www.opengis.net/gml"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0" exclude-result-prefixes="gml gmd gco gmi xsl">
   <xsl:output method="text" version="1.0" omit-xml-declaration="yes" indent="no" media-type="application/json"/>
   <xsl:strip-space elements="*"/>
@@ -19,31 +19,31 @@
     <xsl:variable name="institution">
       <xsl:for-each select="gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty">
         <xsl:choose>
-          
-         <!-- Stanford --> 
+
+         <!-- Stanford -->
          <xsl:when test="contains(gmd:organisationName/gco:CharacterString, 'Stanford')">
             <xsl:text>Stanford</xsl:text>
           </xsl:when>
-         
-          <!-- UVa --> 
+
+          <!-- UVa -->
           <xsl:when test="contains(gmd:organisationName/gco:CharacterString, 'Virginia')">
             <xsl:text>UVa</xsl:text>
           </xsl:when>
           <xsl:when test="contains(gmd:organisationName/gco:CharacterString, 'Scholars&apos;)">
             <xsl:text>UVa</xsl:text>
           </xsl:when>
-          
+
           </xsl:choose>
       </xsl:for-each>
     </xsl:variable>
-    
+
     <!-- bounding box -->
     <xsl:variable name="upperCorner">
       <xsl:value-of select="number(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:eastBoundLongitude/gco:Decimal)"/>
       <xsl:text> </xsl:text>
       <xsl:value-of select="number(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:northBoundLatitude/gco:Decimal)"/>
     </xsl:variable>
-    
+
     <xsl:variable name="lowerCorner">
       <xsl:value-of select="number(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:westBoundLongitude/gco:Decimal)"/>
         <xsl:text> </xsl:text>
@@ -96,7 +96,7 @@
          </xsl:choose>
     </xsl:variable>
     <xsl:text>{</xsl:text>
-      <xsl:text>"uuid": "</xsl:text><xsl:value-of select="$uuid"/><xsl:text>",</xsl:text>
+      <xsl:text>"geoblacklight_version": "1.0",</xsl:text>
       <xsl:text>"dc_identifier_s": "</xsl:text><xsl:value-of select="$uuid"/><xsl:text>",</xsl:text>
       <xsl:text>"dc_title_s": "</xsl:text><xsl:value-of select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title"/><xsl:text>",</xsl:text>
       <xsl:text>"dc_description_s": "</xsl:text><xsl:value-of select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract"/><xsl:text>",</xsl:text>
@@ -132,7 +132,7 @@
             </xsl:otherwise>
           </xsl:choose><xsl:text>",</xsl:text>
       <xsl:text>"dct_provenance_s": "</xsl:text><xsl:value-of select="$institution"/>",
-      
+
       <xsl:text>"layer_id_s": "</xsl:text>
         <xsl:choose>
           <xsl:when test="$institution = 'Stanford'">
@@ -144,6 +144,31 @@
             <xsl:value-of select="$identifier"/>
           </xsl:otherwise>
         </xsl:choose>
+      <xsl:text>",</xsl:text>
+       <xsl:text>"layer_geom_type_s": "</xsl:text>
+      <xsl:choose>
+          <xsl:when test="gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_VectorSpatialRepresentation/gmd:geometricObjects/gmd:MD_GeometricObjects/gmd:geometricObjectType/gmd:MD_GeometricObjectTypeCode[@codeListValue='surface']">
+              <xsl:text>Polygon</xsl:text>
+          </xsl:when>
+          <xsl:when test="contains(gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_VectorSpatialRepresentation/gmd:geometricObjects/gmd:MD_GeometricObjects/gmd:geometricObjectType/gmd:MD_GeometricObjectTypeCode, 'surface')">
+              <xsl:text>Polygon</xsl:text>
+          </xsl:when>
+          <xsl:when test="gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_VectorSpatialRepresentation/gmd:geometricObjects/gmd:MD_GeometricObjects/gmd:geometricObjectType/gmd:MD_GeometricObjectTypeCode[@codeListValue='curve']">
+              <xsl:text>Line</xsl:text>
+          </xsl:when>
+          <xsl:when test="contains(gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_VectorSpatialRepresentation/gmd:geometricObjects/gmd:MD_GeometricObjects/gmd:geometricObjectType/gmd:MD_GeometricObjectTypeCode, 'curve')">
+              <xsl:text>Line</xsl:text>
+          </xsl:when>
+          <xsl:when test="gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_VectorSpatialRepresentation/gmd:geometricObjects/gmd:MD_GeometricObjects/gmd:geometricObjectType/gmd:MD_GeometricObjectTypeCode[@codeListValue='point']">
+              <xsl:text>Point</xsl:text>
+          </xsl:when>   
+          <xsl:when test="contains(gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_VectorSpatialRepresentation/gmd:geometricObjects/gmd:MD_GeometricObjects/gmd:geometricObjectType/gmd:MD_GeometricObjectTypeCode, 'point')">
+              <xsl:text>Point</xsl:text>
+          </xsl:when>
+          <xsl:when test="contains(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:spatialRepresentationType/gmd:MD_SpatialRepresentationTypeCode, 'grid')">
+              <xsl:text>Raster</xsl:text>
+          </xsl:when>         
+      </xsl:choose>
       <xsl:text>",</xsl:text>
       <xsl:text>"layer_slug_s": "</xsl:text>
         <xsl:value-of select="$institution"/>
@@ -163,10 +188,10 @@
           </xsl:when>
         </xsl:choose>
 
-             
+
     <xsl:if test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue='originator']">
       <xsl:text>"dc_creator_sm": [</xsl:text>
-      
+
       <xsl:for-each select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue='originator']">
         <xsl:if test="ancestor-or-self::*/gmd:organisationName">
           <xsl:text>"</xsl:text>
@@ -176,7 +201,7 @@
             <xsl:text>,</xsl:text>
           </xsl:if>
         </xsl:if>
-        
+
         <xsl:if test="ancestor-or-self::*/gmd:individualName">
           <xsl:text>"</xsl:text>
           <xsl:value-of select="ancestor-or-self::*/gmd:individualName"/>
@@ -190,7 +215,7 @@
     </xsl:if>
     <xsl:if test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue='publisher']">
       <xsl:text>"dc_publisher_sm": [</xsl:text>
-      
+
       <xsl:for-each select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue='publisher']">
         <xsl:if test="ancestor-or-self::*/gmd:organisationName">
           <xsl:text>"</xsl:text>
@@ -200,7 +225,7 @@
             <xsl:text>,</xsl:text>
           </xsl:if>
         </xsl:if>
-        
+
         <xsl:if test="ancestor-or-self::*/gmd:individualName">
           <xsl:text>"</xsl:text>
           <xsl:value-of select="ancestor-or-self::*/gmd:individualName"/>
@@ -214,14 +239,14 @@
     </xsl:if>
 
         <xsl:text>"dc_format_s": "</xsl:text><xsl:value-of select="$format"/><xsl:text>",</xsl:text>
-        
+
         <!-- TODO: add inputs for other languages -->
         <!-- <field name="dc_language_s">
           <xsl:if test="contains(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:language | gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:language/gmd:LanguageCode, 'eng')">
             <xsl:text>English</xsl:text>
           </xsl:if>
         </field> -->
-        
+
         <!-- from DCMI type vocabulary -->
         <xsl:choose>
           <xsl:when test="contains(gmd:MD_Metadata/gmd:hierarchyLevelName/gco:CharacterString, 'dataset')">
@@ -236,12 +261,12 @@
     <xsl:if test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:topicCategory/gmd:MD_TopicCategoryCode">
       <xsl:text>"dc_subject_sm": [</xsl:text>
       <xsl:for-each select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:topicCategory/gmd:MD_TopicCategoryCode">
-        <xsl:text>"</xsl:text>              
+        <xsl:text>"</xsl:text>
         <xsl:value-of select="."/>
         <xsl:text>"</xsl:text>
-        <xsl:text>,</xsl:text>              
+        <xsl:text>,</xsl:text>
       </xsl:for-each>
-      
+
       <xsl:for-each select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords">
         <xsl:if test="gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='theme']">
           <xsl:for-each select="gmd:keyword">
@@ -256,7 +281,7 @@
       </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
+
     <xsl:if test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='place']">
       <xsl:text>"dc_spatial_sm": [</xsl:text>
       <xsl:for-each select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='place']">
@@ -271,7 +296,7 @@
       </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
+
       <xsl:choose>
           <xsl:when test="contains(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:DateTime, 'T')">
             <xsl:text>"dct_issued_s": "</xsl:text>
@@ -290,30 +315,30 @@
               <xsl:value-of select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date"/>
             <xsl:text>",</xsl:text>
           </xsl:when>
-          
+
           <!-- <xsl:otherwise>unknown</xsl:otherwise> -->
         </xsl:choose>
-        
-        
+
+
       <!-- content date: range YYYY-YYYY if dates differ  -->
         <xsl:choose>
           <xsl:when test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition/text() != ''">
             <xsl:text>"dct_temporal_sm": "</xsl:text>
               <xsl:value-of select="substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition, 1,4)"/>
-              <xsl:if test="substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition, 1,4) != substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition,1,4)">  
+              <xsl:if test="substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition, 1,4) != substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition,1,4)">
                 <xsl:text>-</xsl:text>
               <xsl:value-of select="substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition, 1,4)"/>
               </xsl:if>
               <xsl:text>",</xsl:text>
           </xsl:when>
-            
+
             <xsl:when test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimeInstant">
               <xsl:text>"dct_temporal_sm": "</xsl:text>
                 <xsl:value-of select="substring(gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimeInstant, 1,4)"/>
               <xsl:text>",</xsl:text>
             </xsl:when>
           </xsl:choose>
-        
+
         <!-- collection -->
         <!-- <xsl:choose>
           <xsl:when test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode[@codeListValue='largerWorkCitation']">
@@ -331,44 +356,7 @@
             </xsl:for-each>
           </xsl:when>
         </xsl:choose> -->
-     
-        <!-- cross-references -->
-        <xsl:if test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode[@codeListValue='crossReference']">
-          <xsl:text>"dc_relation_sm": [</xsl:text> 
-          <xsl:for-each select="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode[@codeListValue='crossReference']">            
-            <xsl:text>"</xsl:text>
-              <xsl:value-of select="ancestor-or-self::*/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:title"/>
-            <xsl:text>"</xsl:text>
-            <xsl:if test="position() != last()">
-              <xsl:text>,</xsl:text>
-            </xsl:if>
-           </xsl:for-each>
-        </xsl:if>
-        
-        <!--<field name="georss_polygon_s">-->
-        <xsl:text>"georss_polygon_s": "</xsl:text> 
-          <xsl:text></xsl:text>
-          <xsl:value-of select="$y1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$y2"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$y2"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x2"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$y1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x2"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$y1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x1"/>
-        <xsl:text>",</xsl:text>
-        
+
     <xsl:text>"solr_geom": "ENVELOPE(</xsl:text>
     <xsl:value-of select="$x1"/>
     <xsl:text>, </xsl:text>
@@ -378,17 +366,7 @@
     <xsl:text>, </xsl:text>
     <xsl:value-of select="$y1"/>
     <xsl:text>)",</xsl:text>
-        
-        <xsl:text>"georss_box_s": "</xsl:text>
-          <xsl:value-of select="$y1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x1"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$y2"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$x2"/>
-        <xsl:text>",</xsl:text>
-        
+
         <!-- content date: singular, or beginning date of range: YYYY -->
         <xsl:choose>
           <xsl:when test="gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition/text() != ''">

data/spec/fixtures/docs/basic_geoblacklight.json

@@ -1,5 +1,5 @@
-{  
-  "uuid":"http://purl.stanford.edu/bb338jh0716",
+{
+  "geoblacklight_version":"1.0",
   "dc_identifier_s":"http://purl.stanford.edu/bb338jh0716",
   "dc_title_s":"Hydrologic Sub-Area Boundaries: Russian River Watershed, California, 1999",
   "dc_description_s":"This polygon dataset represents the Hydrologic Sub-Area boundaries for the Russian River basin, as defined by the Calwater 2.2a watershed boundaries. The original CALWATER22 layer (Calwater 2.2a watershed boundaries) was developed as a coverage named calw22a and is administered by the Interagency California Watershed Mapping Committee (ICWMC). ",
@@ -11,19 +11,17 @@
   "layer_modified_dt":"2014-10-08",
   "dc_format_s":"application/x-esri-shapefile",
   "dc_type_s":"Dataset",
-  "dc_subject_sm":[  
+  "dc_subject_sm":[
     "boundaries",
     "inlandWaters"
   ],
-  "dc_spatial_sm":[  
+  "dc_spatial_sm":[
     "Sonoma County (Calif.)",
     "Mendocino County (Calif.)",
     "Russian River Watershed (Calif.)"
   ],
   "dct_issued_s":"2002-09-01",
   "dct_temporal_sm":"1999",
-  "georss_polygon_s":"38.298024 -123.387866 39.399217 -123.387866 39.399217 -122.522658 38.298024 -122.522658 38.298024 -123.387866",
   "solr_geom":"ENVELOPE(-123.387866 38.298024, -122.522658 38.298024, -122.522658 39.399217, -123.387866 39.399217, -123.387866 38.298024)",
-  "georss_box_s":"38.298024 -123.387866 39.399217 -122.522658",
   "solr_year_i":1999
-}
+}

data/spec/fixtures/docs/full_geoblacklight.json

@@ -1,5 +1,5 @@
 {
-  "uuid":"http://purl.stanford.edu/cz128vq0535",
+  "geoblacklight_version":"1.0",
   "dc_identifier_s":"http://purl.stanford.edu/cz128vq0535",
   "dc_title_s":"2005 Rural Poverty GIS Database: Uganda",
   "dc_description_s":"This polygon shapefile contains 2005 poverty data for 855 rural subcounties in Uganda. These data are intended for researchers, students, policy makers and the general public for reference and mapping purposes, and may be used for basic applications such as viewing, querying, and map output production.",
@@ -28,12 +28,6 @@
   "dct_spatial_sm":[
     "Uganda"
   ],
-  "dc_relation_sm":[
-    "http://sws.geonames.org/226074/about.rdf"
-  ],
-  "georss_box_s":"-1.478794 29.572742 4.234077 35.000308",
-  "georss_polygon_s":"-1.478794 29.572742 4.234077 29.572742 4.234077 35.000308 -1.478794 35.000308 -1.478794 29.572742",
   "solr_geom":"ENVELOPE(29.572742, 35.000308, 4.234077, -1.478794)",
-  "solr_bbox":"29.572742 -1.478794 35.000308 4.234077",
   "solr_year_i":2005
-}
+}

data/spec/lib/geo_combine/esri_open_data_spec.rb

@@ -21,9 +21,6 @@ RSpec.describe GeoCombine::EsriOpenData do
   describe '#geoblacklight_terms' do
     describe 'builds a hash which maps metadata' do
       let(:metadata) { esri_sample.instance_variable_get(:@metadata) }
-      it 'with uuid' do
-        expect(esri_sample.geoblacklight_terms).to include(uuid: metadata['id'])
-      end
       it 'with dc_identifier_s' do
         expect(esri_sample.geoblacklight_terms).to include(dc_identifier_s: metadata['id'])
       end
@@ -44,10 +41,6 @@ RSpec.describe GeoCombine::EsriOpenData do
         expect(esri_sample).to receive(:references).and_return ''
         expect(esri_sample.geoblacklight_terms).to include(:dct_references_s)
       end
-      it 'with georss_box_s' do
-        expect(esri_sample).to receive(:georss_box).and_return ''
-        expect(esri_sample.geoblacklight_terms).to include(georss_box_s: '')
-      end
       it 'with layer_id_s that is blank' do
         expect(esri_sample.geoblacklight_terms).to include(layer_id_s: '')
       end
@@ -81,16 +74,10 @@ RSpec.describe GeoCombine::EsriOpenData do
       expect(esri_sample.references_hash).to include('http://resources.arcgis.com/en/help/arcgis-rest-api' => metadata['url'])
     end
   end
-  describe '#georss_box' do
-    it 'creates a GeoRSS box' do
-      expect(esri_sample.georss_box).to be_an String
-      expect(esri_sample.georss_box.split(' ').count).to eq 4
-    end
-  end
   describe '#envelope' do
     it 'creates an envelope for use in Solr' do
       expect(esri_sample.envelope).to be_an String
-      expect(esri_sample.envelope).to match /ENVELOPE\(/
+      expect(esri_sample.envelope).to match /ENVELOPE\(.+,.+,.+,.+\)/
     end
   end
 end

data/spec/lib/geo_combine/fgdc_spec.rb

@@ -19,16 +19,18 @@ RSpec.describe GeoCombine::Fgdc do
     end
   end
   describe '#to_geoblacklight' do
-    let(:fgdc_geobl) { fgdc_object.to_geoblacklight(dct_references_s: '', ) }
+    let(:fgdc_geobl) { fgdc_object.to_geoblacklight }
     it 'returns a GeoCombine::Geoblacklight object' do
       expect(fgdc_geobl).to be_an GeoCombine::Geoblacklight
     end
-    it 'is not valid' do
-      expect { fgdc_geobl.valid? }.to raise_error
+    it 'is not valid due to bad modification date but valid otherwise' do
+      expect { fgdc_geobl.valid? }.to raise_error(JSON::Schema::ValidationError, /layer_modified_dt/)
+      fgdc_geobl.metadata.delete 'layer_modified_dt'
+      expect(fgdc_geobl.valid?).to be_truthy
     end
     describe 'with GeoBlacklight-Schema fields' do
-      it 'uuid' do
-        expect(fgdc_geobl.metadata['uuid']).to eq 'Ecuador50KDrillingTower11'
+      it 'geoblacklight_version' do
+        expect(fgdc_geobl.metadata['geoblacklight_version']).to eq '1.0'
       end
       it 'dc_identifier_s' do
         expect(fgdc_geobl.metadata['dc_identifier_s']).to eq 'http://www.geoportaligm.gob.ec/portal/'
@@ -59,7 +61,7 @@ RSpec.describe GeoCombine::Fgdc do
         expect(fgdc_geobl.metadata['dc_creator_sm']).to include 'Instituto Geografico Militar (Ecuador)'
       end
       it 'dc_format_s' do
-        expect(fgdc_geobl.metadata['dc_format_s']).to eq 'application/x-esri-shapefile'
+        expect(fgdc_geobl.metadata['dc_format_s']).to eq 'Shapefile'
       end
       it 'dc_language_s' do
         expect(fgdc_geobl.metadata['dc_language_s']).to eq 'English'
@@ -79,23 +81,18 @@ RSpec.describe GeoCombine::Fgdc do
         expect(fgdc_geobl.metadata['dct_issued_s']).to eq '2011'
       end
       it 'dct_temporal_sm' do
-        expect(fgdc_geobl.metadata['dct_temporal_sm']).to eq '2011'
+        expect(fgdc_geobl.metadata['dct_temporal_sm']).to be_an Array
+        expect(fgdc_geobl.metadata['dct_temporal_sm']).to include '2011'
       end
       it 'dct_isPartOf_sm' do
         expect(fgdc_geobl.metadata['dct_isPartOf_sm']).to be_an Array
         expect(fgdc_geobl.metadata['dct_isPartOf_sm']).to include 'Ecuador', 'Instituto Geografico Militar Data'
       end
-      it 'georss_polygon_s' do
-        expect(fgdc_geobl.metadata['georss_polygon_s']).to eq '-1.377743 -79.904768 -1.377743 -79.904768 -1.377743 -79.904768 -1.377743 -79.904768 -1.377743 -79.904768'
-      end
       it 'solr_geom' do
         expect(fgdc_geobl.metadata['solr_geom']).to eq 'ENVELOPE(-79.904768, -79.904768, -1.377743, -1.377743)'
       end
-      it 'georss_box_s' do
-        expect(fgdc_geobl.metadata['georss_box_s']).to eq '-1.377743 -79.904768 -1.377743 -79.904768'
-      end
       it 'solr_year_i' do
-        expect(fgdc_geobl.metadata['solr_year_i']).to eq '2011'
+        expect(fgdc_geobl.metadata['solr_year_i']).to eq 2011
       end
     end
   end

data/spec/lib/geo_combine/geoblacklight_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 RSpec.describe GeoCombine::Geoblacklight do
   include XmlDocs
   include JsonDocs
+  include GeoCombine::Exceptions
   let(:full_geobl) { GeoCombine::Geoblacklight.new(full_geoblacklight) }
   let(:basic_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight) }
   describe '#initialize' do
@@ -10,9 +11,9 @@ RSpec.describe GeoCombine::Geoblacklight do
       expect(basic_geobl.instance_variable_get(:@metadata)).to be_an Hash
     end
     describe 'merges fields argument into metadata' do
-      let(:basic_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight, 'uuid' => 'new one', "extra_field" => true)}
+      let(:basic_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight, 'dc_identifier_s' => 'new one', "extra_field" => true)}
       it 'overwrites existing metadata fields' do
-        expect(basic_geobl.metadata['uuid']).to eq 'new one'
+        expect(basic_geobl.metadata['dc_identifier_s']).to eq 'new one'
       end
       it 'adds in new fields' do
         expect(basic_geobl.metadata['extra_field']).to be true
@@ -22,7 +23,7 @@ RSpec.describe GeoCombine::Geoblacklight do
   describe '#metadata' do
     it 'reads the metadata instance variable' do
       expect(basic_geobl.metadata).to be_an Hash
-      expect(basic_geobl.metadata).to have_key 'uuid'
+      expect(basic_geobl.metadata).to have_key 'dc_identifier_s'
     end
   end
   describe '#to_json' do
@@ -31,11 +32,10 @@ RSpec.describe GeoCombine::Geoblacklight do
       expect(valid_json?(basic_geobl.to_json)).to be_truthy
     end
   end
+  let(:enhanced_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight, 'layer_geom_type_s' => 'esriGeometryPolygon') }
+  before { enhanced_geobl.enhance_metadata }
   describe '#enhance_metadata' do
-    let(:enhanced_geobl) { GeoCombine::Geoblacklight.new(basic_geoblacklight, 'dct_references_s' => '', 'layer_geom_type_s' => 'esriGeometryPolygon') }
-    before { enhanced_geobl.enhance_metadata }
     it 'calls enhancement methods to validate document' do
-      expect { basic_geobl.valid? }.to raise_error JSON::Schema::ValidationError
       expect(enhanced_geobl.valid?).to be true
     end
     it 'enhances the dc_subject_sm field' do
@@ -52,8 +52,103 @@ RSpec.describe GeoCombine::Geoblacklight do
     it 'a valid geoblacklight-schema document should be valid' do
       expect(full_geobl.valid?).to be true
     end
+    context 'must have required fields' do
+      %w(
+        dc_title_s
+        dc_identifier_s
+        dc_rights_s
+        dct_provenance_s
+        layer_slug_s
+        solr_geom
+      ).each do |field|
+        it field do
+          full_geobl.metadata.delete field
+          expect { full_geobl.valid? }.to raise_error(JSON::Schema::ValidationError, /#{field}/)
+        end
+      end
+    end
+    context 'need not have optional fields' do
+      %w(
+        dc_description_s
+        dc_format_s
+        dc_language_s
+        dc_publisher_s
+        dc_source_sm
+        dc_subject_sm
+        dct_isPartOf_sm
+        dct_issued_dt
+        dct_references_s
+        dct_spatial_sm
+        dct_temporal_sm
+        geoblacklight_version
+        layer_geom_type_s
+        layer_id_s
+        layer_modified_dt
+        solr_year_i
+      ).each do |field|
+        it field do
+          full_geobl.metadata.delete field
+          expect { full_geobl.valid? }.not_to raise_error
+        end
+      end
+    end
+    context 'need not have deprecated fields' do
+      %w(
+        dc_relation_sm
+        dc_type_s
+        georss_box_s
+        georss_point_s
+        uuid
+      ).each do |field|
+        it field do
+          full_geobl.metadata.delete field
+          expect { full_geobl.valid? }.not_to raise_error
+        end
+      end
+    end
     it 'an invalid document' do
       expect { basic_geobl.valid? }.to raise_error JSON::Schema::ValidationError
     end
+    it 'calls the dct_references_s validator' do
+      expect(enhanced_geobl).to receive(:dct_references_validate!)
+      enhanced_geobl.valid?
+    end
+  end
+  describe '#dct_references_validate!' do
+    context 'with valid document' do
+      it 'is valid' do
+        expect(full_geobl.dct_references_validate!).to be true
+      end
+    end
+    context 'with invalid document' do
+      let(:unparseable_json) do
+        <<-JSON
+          {
+            \"http://schema.org/url\":\"http://example.com/abc123\",,
+            \"http://schema.org/downloadUrl\":\"http://example.com/abc123/data.zip\"
+          }
+        JSON
+      end
+      let(:bad_ref) do
+        GeoCombine::Geoblacklight.new(
+          basic_geoblacklight, 'dct_references_s' => unparseable_json, 'layer_geom_type_s' => 'esriGeometryPolygon'
+        )
+      end
+      let(:not_hash) do
+        GeoCombine::Geoblacklight.new(
+          basic_geoblacklight, 'dct_references_s' => '[{}]', 'layer_geom_type_s' => 'esriGeometryPolygon'
+        )
+      end
+      before do
+        bad_ref.enhance_metadata
+        not_hash.enhance_metadata
+      end
+      it 'unparseable json' do
+        expect { bad_ref.dct_references_validate! }.to raise_error JSON::ParserError
+      end
+      it 'not a hash' do
+        expect { not_hash.dct_references_validate! }.to raise_error GeoCombine::Exceptions::InvalidDCTReferences
+      end
+    end
   end
 end