geo_combine 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8627401efabab03d06f210ee160e7e09c7223398
-  data.tar.gz: dcdc93c201e689dc2c9b8245ac2076617af34e39
+  metadata.gz: f0afe886cbbf89998cabcdad7c4daa67842f454d
+  data.tar.gz: bf8ea5de5455e02536043c038bcd96c0eae804c1
 SHA512:
-  metadata.gz: 9c957f3b783684f18c18c3265349c7efa4db3aa12094f573e9d4d9e5a2366f3464e390add7a12734213ca1801c5ef3d0d820a8139fdce47c07ba99e037f71e5f
-  data.tar.gz: e6bedee395328db1deed473721231e7a5d678e0bfa2a9b038e3f7de596e99622cc7dff7b4dc2d6db14d2d5734339d01fa9d5a462bfbe4363872afe87c98ecb48
+  metadata.gz: 8e3155d7e08bd953c81f8ae501a691406e5ab606d66749a6cb7bd30262f7d21094a3db830af11c9ed65000d81cf88b0fcb5f8868b3f878f22f8d8ee701511dec
+  data.tar.gz: 90c54a422198f1c960550a19dcf993b8083e13cf8d477870485bb196535a90393f5bbd83ed8a94a810905b1b537838e671c4cd406e1aa014acf5a6603254226f

data/.travis.yml

@@ -1,3 +1,7 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
-  - 2.1.5
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1

data/README.md

@@ -83,7 +83,15 @@ $ rake geocombine:index
 $ bundle exec geocombine index
 ```
 
-Indexs all of the `geoblacklight.json` files in cloned repositories to a Solr index running at http://127.0.0.1:8983/solr
+Indexes all of the `geoblacklight.json` files in cloned repositories to a Solr index running at http://127.0.0.1:8983/solr
+
+#### Custom Solr location
+
+Solr location can also be specified by an environment variable `SOLR_URL`.
+
+```sh
+$ SOLR_URL=http://www.example.com:1234/solr/collection rake geocombine:index
+```
 
 ## Contributing
 

data/lib/geo_combine.rb

@@ -48,6 +48,9 @@ module GeoCombine
   end
 end
 
+# Require custom exceptions
+require 'geo_combine/exceptions'
+
 # Require translation mixins
 require 'geo_combine/formats'
 require 'geo_combine/subjects'

data/lib/geo_combine/esri_open_data.rb

@@ -26,14 +26,12 @@ module GeoCombine
     # @return [Hash]
     def geoblacklight_terms
       {
-        uuid: @metadata['id'],
         dc_identifier_s: @metadata['id'],
         dc_title_s: @metadata['name'],
         dc_description_s: sanitize_and_remove_lines(@metadata['description']),
         dc_rights_s: 'Public',
         dct_provenance_s: @metadata['owner'],
         dct_references_s: references,
-        georss_box_s: georss_box,
         # layer_id_s is used for describing a layer id for a web serivce (WMS, WFS) but is still a required field
         layer_id_s: '',
         layer_geom_type_s: @metadata['geometry_type'],
@@ -62,13 +60,6 @@ module GeoCombine
       }
     end
 
-    ##
-    # Builds a GeoRSS box
-    # @return [String]
-    def georss_box
-      "#{south} #{west} #{north} #{east}"
-    end
-
     ##
     # Builds a Solr Envelope using CQL syntax
     # @return [String]

data/lib/geo_combine/exceptions.rb

@@ -0,0 +1,6 @@
+module GeoCombine
+  module Exceptions
+    class InvalidDCTReferences < StandardError
+    end
+  end
+end

data/lib/geo_combine/geoblacklight.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module GeoCombine
   class Geoblacklight
     include GeoCombine::Formats
@@ -6,6 +8,8 @@ module GeoCombine
 
     attr_reader :metadata
 
+    GEOBLACKLIGHT_VERSION = 'v1.1.0'
+
     ##
     # Initializes a GeoBlacklight object
     # @param [String] metadata be a valid JSON string document in
@@ -13,6 +17,7 @@ module GeoCombine
     # @param [Hash] fields enhancements to metadata that are merged with @metadata
     def initialize(metadata, fields = {})
       @metadata = JSON.parse(metadata).merge(fields)
+      @schema = nil
     end
 
     ##
@@ -39,8 +44,22 @@ module GeoCombine
     # Validates a GeoBlacklight-Schema json document
     # @return [Boolean]
     def valid?
-      schema = JSON.parse(File.read(File.join(File.dirname(__FILE__), '../schema/geoblacklight-schema.json')))
-      JSON::Validator.validate!(schema, to_json, validate_schema: true)
+      @schema ||= JSON.parse(open("https://raw.githubusercontent.com/geoblacklight/geoblacklight/#{GEOBLACKLIGHT_VERSION}/schema/geoblacklight-schema.json").read)
+      JSON::Validator.validate!(@schema, to_json, fragment: '#/properties/layer') && dct_references_validate!
+    end
+
+    ##
+    # Validate dct_references_s
+    # @return [Boolean]
+    def dct_references_validate!
+      return true unless metadata.key?('dct_references_s')
+      begin
+        ref = JSON.parse(metadata['dct_references_s'])
+        raise GeoCombine::Exceptions::InvalidDCTReferences, 'dct_references must be parsed to a Hash' unless ref.is_a?(Hash)
+        true
+      rescue JSON::ParserError => e
+        raise e, "Invalid JSON in dct_references_s: #{e.message}"
+      end
     end
 
     private

data/lib/geo_combine/version.rb

@@ -1,3 +1,3 @@
 module GeoCombine
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/tasks/geo_combine.rake

@@ -12,7 +12,7 @@ namespace :geocombine do
     ogm_repos = JSON.parse(Net::HTTP.get(ogm_api_uri)).map{ |repo| repo['git_url']}
     ogm_repos.each do |repo|
       if repo =~ /^git:\/\/github.com\/OpenGeoMetadata\/(edu|org|uk)\..*/
-        system "mkdir -p #{ogm_path} && cd #{ogm_path} && git clone #{repo}"
+        system "mkdir -p #{ogm_path} && cd #{ogm_path} && git clone --depth 1 #{repo}"
       end
     end
   end

data/lib/xslt/fgdc2geoBL.xsl

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
      fgdc2geoBL.xsl - Transformation from FGDC into GeoBlacklight Solr
-     
+
           -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0">
   <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
   <xsl:strip-space elements="*"/>
 
   <xsl:param name="zipName" select="'data.zip'"/>
-  
+
   <xsl:variable name="institution">
         <xsl:for-each select="metadata">
             <xsl:choose>
                 <xsl:when test="contains(distinfo/distrib/cntinfo/cntorgp/cntorg, 'Harvard')">
                     <xsl:text>Harvard</xsl:text>
-                </xsl:when> 
+                </xsl:when>
                 <xsl:when test="contains(distinfo/distrib/cntinfo/cntorgp/cntorg, 'Tufts')">
                     <xsl:text>Tufts</xsl:text>
-                </xsl:when> 
+                </xsl:when>
                 <xsl:when test="contains(distinfo/distrib/cntinfo/cntorgp/cntorg, 'MIT')">
                     <xsl:text>MIT</xsl:text>
                 </xsl:when>
@@ -40,18 +40,18 @@
                 <xsl:when test="contains(metainfo/metc/cntinfo/cntorgp/cntorg, 'Harvard')">
                     <xsl:text>Harvard</xsl:text>
                 </xsl:when>
-                
+
             </xsl:choose>
         </xsl:for-each>
     </xsl:variable>
-  
+
   <!-- Output bounding box -->
 <xsl:variable name="upperCorner">
     <xsl:value-of select="number(metadata/idinfo/spdom/bounding/eastbc)"/>
   <xsl:text> </xsl:text>
     <xsl:value-of select="number(metadata/idinfo/spdom/bounding/northbc)"/>
 </xsl:variable>
-  
+
   <xsl:variable name="lowerCorner">
 
       <xsl:value-of select="number(metadata/idinfo/spdom/bounding/westbc)"/>
@@ -64,28 +64,28 @@
   <xsl:variable name="y2" select="number(metadata/idinfo/spdom/bounding/northbc)"/><!-- N -->
   <xsl:variable name="y1" select="number(metadata/idinfo/spdom/bounding/southbc)"/><!-- S -->
 
-  
+
   <xsl:variable name="format">
     <xsl:choose>
       <xsl:when test="contains(metadata/idinfo/citation/citeinfo/geoform, 'raster digital data')">
-      <xsl:text>image/tiff</xsl:text>
+      <xsl:text>GeoTIFF</xsl:text>
     </xsl:when>
       <xsl:when test="contains(metadata/idinfo/citation/citeinfo/geoform, 'vector digital data')">
-        <xsl:text>application/x-esri-shapefile</xsl:text>
+        <xsl:text>Shapefile</xsl:text>
       </xsl:when>
       <xsl:when test="contains(metadata/distinfo/stdorder/digform/digtinfo/formname, 'TIFF')">
-        <xsl:text>image/tiff</xsl:text>
+        <xsl:text>GeoTIFF</xsl:text>
       </xsl:when>
       <xsl:when test="contains(metadata/distinfo/stdorder/digform/digtinfo/formname, 'JPEG2000')">
-        <xsl:text>image/tiff</xsl:text>
+        <xsl:text>image/jpeg</xsl:text>
       </xsl:when>
       <xsl:when test="contains(metadata/distinfo/stdorder/digform/digtinfo/formname, 'Shape')">
-        <xsl:text>application/x-esri-shapefile</xsl:text>
+        <xsl:text>Shapefile</xsl:text>
       </xsl:when>
     </xsl:choose>
   </xsl:variable>
-  
-  
+
+
   <xsl:variable name="uuid">
     <xsl:choose>
       <xsl:when test="$institution = 'Harvard'">
@@ -99,27 +99,25 @@
       </xsl:when>
     </xsl:choose>
   </xsl:variable>
-  
-  
+
+
   <xsl:template match="metadata">
     <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="idinfo/citation/citeinfo/onlink"/>
     <xsl:text>",</xsl:text>
-    
+
     <xsl:text>"dc_title_s": "</xsl:text>
     <xsl:value-of select="idinfo/citation/citeinfo/title"/>
     <xsl:text>",</xsl:text>
-    
+
     <xsl:text>"dc_description_s": "</xsl:text>
     <xsl:value-of select="idinfo/descript/abstract"/>
     <xsl:text>",</xsl:text>
-        
+
     <xsl:text>"dc_rights_s": "</xsl:text>
     <xsl:choose>
       <xsl:when test="contains(idinfo/accconst, 'Restricted')">
@@ -151,31 +149,31 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:text>",</xsl:text>
-     
+
     <xsl:text>"dct_provenance_s": "</xsl:text>
     <xsl:value-of select="$institution"/>
     <xsl:text>",</xsl:text>
-        
+
  <!--       <field name="dct_references_s">
           <xsl:text>{</xsl:text>
-          <xsl:text>"http://schema.org/url":"</xsl:text>              
+          <xsl:text>"http://schema.org/url":"</xsl:text>
           <xsl:value-of select="$purl"/>
           <xsl:text>",</xsl:text>
-          <xsl:text>"http://schema.org/thumbnailUrl":"</xsl:text>              
+          <xsl:text>"http://schema.org/thumbnailUrl":"</xsl:text>
           <xsl:value-of select="$stacks_root"/>
           <xsl:text>/file/druid:</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/preview.jpg",</xsl:text>
-          <xsl:text>"http://schema.org/DownloadAction":"</xsl:text>              
+          <xsl:text>"http://schema.org/DownloadAction":"</xsl:text>
           <xsl:value-of select="$stacks_root"/>
           <xsl:text>/file/druid:</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/data.zip",</xsl:text>
-          <xsl:text>"http://www.loc.gov/mods/v3":"</xsl:text>              
+          <xsl:text>"http://www.loc.gov/mods/v3":"</xsl:text>
           <xsl:text>http://earthworks.stanford.edu/opengeometadata/layers/edu.stanford.purl/</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/mods",</xsl:text>
-          <xsl:text>"http://www.isotc211.org/schemas/2005/gmd/":"</xsl:text>              
+          <xsl:text>"http://www.isotc211.org/schemas/2005/gmd/":"</xsl:text>
           <xsl:text>http://earthworks.stanford.edu/opengeometadata/layers/edu.stanford.purl/</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/iso19139",</xsl:text>
@@ -190,18 +188,18 @@
           <xsl:text>/wcs"</xsl:text>
           <xsl:text>}</xsl:text>
         </field>  -->
-       
+
     <xsl:text>"layer_id_s": "</xsl:text>
     <xsl:text>urn:</xsl:text>
     <xsl:value-of select="$uuid"/>
     <xsl:text>",</xsl:text>
-        
+
     <xsl:text>"layer_slug_s": "</xsl:text>
     <xsl:value-of select="$institution"/>
     <xsl:text>-</xsl:text>
     <xsl:value-of select="$uuid"/>
     <xsl:text>",</xsl:text>
-        
+
     <xsl:choose>
       <xsl:when test="contains(metadata/spdoinfo/ptvctinf/sdtsterm/sdtstype, 'G-polygon')">
         <xsl:text>"layer_geom_type_s": "</xsl:text>
@@ -213,7 +211,7 @@
         <xsl:text>Point</xsl:text>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="contains(metadata/spdoinfo/ptvctinf/sdtsterm/sdtstype, 'String')">
         <xsl:text>"layer_geom_type_s": "</xsl:text>
         <xsl:text>Line</xsl:text>
@@ -225,36 +223,36 @@
         <xsl:text>",</xsl:text>
       </xsl:when>
     </xsl:choose>
-    
-        
+
+
 
     <xsl:choose>
       <xsl:when test="string-length(metainfo/metd)=4">
         <xsl:text>"layer_modified_dt": "</xsl:text>
-        <xsl:value-of select="metainfo/metd"/>  
+        <xsl:value-of select="metainfo/metd"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(metainfo/metd)=6">
         <xsl:text>"layer_modified_dt": "</xsl:text>
-        <xsl:value-of select="substring(metainfo/metd,1,4)"/>  
+        <xsl:value-of select="substring(metainfo/metd,1,4)"/>
         <xsl:text>-</xsl:text>
         <xsl:value-of select="substring(metainfo/metd,5,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(metainfo/metd)=8">
         <xsl:text>"layer_modified_dt": "</xsl:text>
-        <xsl:value-of select="substring(metainfo/metd,1,4)"/>  
+        <xsl:value-of select="substring(metainfo/metd,1,4)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(metainfo/metd,5,2)"/>  
+        <xsl:value-of select="substring(metainfo/metd,5,2)"/>
         <xsl:text>-</xsl:text>
         <xsl:value-of select="substring(metainfo/metd,7,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
     </xsl:choose>
-        
-        
+
+
     <xsl:if test="idinfo/citation/citeinfo/origin">
       <xsl:text>"dc_creator_sm": [</xsl:text>
       <xsl:for-each select="idinfo/citation/citeinfo/origin">
@@ -267,9 +265,9 @@
       </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
-    
-    
+
+
+
     <xsl:if test="idinfo/citation/citeinfo/pubinfo/publish">
       <xsl:text>"dc_publisher_sm": [</xsl:text>
       <xsl:for-each select="idinfo/citation/citeinfo/pubinfo/publish">
@@ -280,26 +278,26 @@
           <xsl:text>,</xsl:text>
         </xsl:if>
       </xsl:for-each>
-      <xsl:text>],</xsl:text>      
-    </xsl:if>      
-             
-        
+      <xsl:text>],</xsl:text>
+    </xsl:if>
+
+
     <xsl:text>"dc_format_s": "</xsl:text>
     <xsl:value-of select="$format"/>
     <xsl:text>",</xsl:text>
-         
+
     <xsl:if test="contains(idinfo/descript/langdata, 'en')">
       <xsl:text>"dc_language_s": "</xsl:text>
       <xsl:text>English</xsl:text>
       <xsl:text>",</xsl:text>
     </xsl:if>
-    
+
     <!-- DCMI Type vocabulary: defaults to dataset -->
     <xsl:text>"dc_type_s": "</xsl:text>
     <xsl:text>Dataset</xsl:text>
     <xsl:text>",</xsl:text>
-    
-    
+
+
     <xsl:if test="idinfo/keywords/theme/themekey">
       <xsl:text>"dc_subject_sm": [</xsl:text>
       <xsl:for-each select="idinfo/keywords/theme/themekey">
@@ -314,7 +312,7 @@
       </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
+
     <xsl:if test="idinfo/keywords/place/placekey">
       <xsl:text>"dc_spatial_sm": [</xsl:text>
       <xsl:for-each select="idinfo/keywords/place/placekey">
@@ -330,47 +328,47 @@
     <xsl:choose>
       <xsl:when test="string-length(idinfo/citation/citeinfo/pubdate)=4">
         <xsl:text>"dct_issued_s": "</xsl:text>
-        <xsl:value-of select="idinfo/citation/citeinfo/pubdate"/>  
+        <xsl:value-of select="idinfo/citation/citeinfo/pubdate"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(idinfo/citation/citeinfo/pubdate)=6">
         <xsl:text>"dct_issued_s": "</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(idinfo/citation/citeinfo/pubdate)=8">
         <xsl:text>"dct_issued_s": "</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,7,2)"/> 
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,7,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
     </xsl:choose>
-    
+
     <!-- singular content date: YYYY -->
-    
+
     <xsl:for-each select="idinfo/timeperd/timeinfo/sngdate/caldate">
       <xsl:if test="text() !='' ">
-        <xsl:text>"dct_temporal_sm": "</xsl:text>
+        <xsl:text>"dct_temporal_sm": ["</xsl:text>
         <xsl:value-of select="substring(.,1,4)"/>
-        <xsl:text>",</xsl:text>
+        <xsl:text>"],</xsl:text>
       </xsl:if>
     </xsl:for-each>
-    
-    
-    <xsl:for-each select="idinfo/timeperd/timeinfo/mdattim/sngdate">  
-      <xsl:text>"dct_temporal_sm": "</xsl:text>
+
+
+    <xsl:for-each select="idinfo/timeperd/timeinfo/mdattim/sngdate">
+      <xsl:text>"dct_temporal_sm": ["</xsl:text>
       <xsl:value-of select="substring(caldate,1,4)"/>
-      <xsl:text>",</xsl:text>
-    </xsl:for-each>  
-    
-    
+      <xsl:text>"],</xsl:text>
+    </xsl:for-each>
+
+
     <!-- months, days YYYY-MM, YYYY-MM-DD
              <xsl:when test="string-length(idinfo/timeperd/timeinfo/sngdate/caldate)=4">
              <xsl:value-of select="idinfo/timeperd/timeinfo/sngdate/caldate"/>
@@ -387,29 +385,29 @@
              <xsl:text>-</xsl:text>
              <xsl:value-of select="substring(idinfo/timeperd/timeinfo/sngdate/caldate,7,2)"/>
              </xsl:when>  -->
-    
+
     <!-- content date range: YYYY-YYYY if dates in range differ -->
-    
+
     <xsl:for-each select="idinfo/timeperd/timeinfo/rngdates">
-      <xsl:text>"dct_temporal_sm": "</xsl:text>
+      <xsl:text>"dct_temporal_sm": ["</xsl:text>
       <xsl:value-of select="substring(begdate, 1,4)"/>
-      <xsl:if test="substring(begdate,1,4) != substring(enddate,1,4)"> 
+      <xsl:if test="substring(begdate,1,4) != substring(enddate,1,4)">
         <xsl:text>-</xsl:text>
         <xsl:value-of select="substring(enddate,1,4)"/>
       </xsl:if>
-      <xsl:text>",</xsl:text>  
+      <xsl:text>"],</xsl:text>
     </xsl:for-each>
-    
+
     <xsl:for-each select="idinfo/keywords/temporal/tempkey">
       <xsl:if test="text() != substring(idinfo/timeperd/timeinfo/sngdate/caldate,1,4)">
-        <xsl:text>"dct_temporal_sm": "</xsl:text>
+        <xsl:text>"dct_temporal_sm": ["</xsl:text>
         <xsl:value-of select="."/>
-        <xsl:text>",</xsl:text>
+        <xsl:text>"],</xsl:text>
       </xsl:if>
     </xsl:for-each>
-    
+
     <!-- collection -->
-    
+
     <xsl:if test="idinfo/citation/citeinfo/lworkcit/citeinfo | idinfo/citation/citeinfo/serinfo/sername">
       <xsl:text>"dct_isPartOf_sm": [</xsl:text>
       <xsl:for-each select="idinfo/citation/citeinfo/lworkcit/citeinfo | idinfo/citation/citeinfo/serinfo">
@@ -422,45 +420,7 @@
     </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
-    
-    <!-- cross-references -->
-    <xsl:if test="idinfo/crossref/citeinfo">
-      <xsl:text>"dct_relation_sm": [</xsl:text>
-      <xsl:for-each select="idinfo/crossref/citeinfo">
-        <xsl:text>"</xsl:text>
-        <xsl:value-of select="title"/>
-        <xsl:text>"</xsl:text>
-        <xsl:if test="position() != last()">
-          <xsl:text>,</xsl:text>
-        </xsl:if>
-        <xsl:text>],</xsl:text>
-      </xsl:for-each>
-    </xsl:if>
-    
-    <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>
@@ -470,55 +430,36 @@
     <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 for solr year: choose singular, or beginning date of range: YYYY -->
     <xsl:if test="idinfo/timeperd/timeinfo">
       <xsl:choose>
         <xsl:when test="idinfo/timeperd/timeinfo/sngdate/caldate/text() != ''">
 
             <xsl:text>"solr_year_i": </xsl:text>
-            <xsl:text>"</xsl:text>
             <xsl:value-of select="substring(idinfo/timeperd/timeinfo/sngdate/caldate,1,4)"/>
-            <xsl:text>"</xsl:text>
-          
+
         </xsl:when>
-        
+
         <xsl:when test="idinfo/timeperd/timeinfo/mdattim/sngdate/caldate">
           <xsl:if test="position() = 1">
             <xsl:text>"solr_year_i": </xsl:text>
-            <xsl:text>"</xsl:text>
             <xsl:value-of select="substring(caldate,1,4)"/>
-            <xsl:text>"</xsl:text>
           </xsl:if>
         </xsl:when>
-        
+
         <xsl:when test="idinfo/timeperd/timeinfo/rngdates/begdate/text() != ''[1]">
           <xsl:if test="position() = 1">
             <xsl:text>"solr_year_i": </xsl:text>
-            <xsl:text>"</xsl:text>
             <xsl:value-of select="substring(rngdates/begdate/text(), 1,4)"/>
-            <xsl:text>"</xsl:text>
           </xsl:if>
         </xsl:when>
-        
+
         <xsl:when test="//metadata/idinfo/keywords/temporal/tempkey">
           <xsl:for-each select="//metadata/idinfo/keywords/temporal/tempkey[1]">
             <xsl:if test="text() != ''">
               <xsl:text>"solr_year_i": </xsl:text>
-              <xsl:text>"</xsl:text>
               <xsl:value-of select="."/>
-              <xsl:text>"</xsl:text>
             </xsl:if>
           </xsl:for-each>
         </xsl:when>
@@ -526,6 +467,6 @@
     </xsl:if>
 
 
-    <xsl:text>}</xsl:text>  
+    <xsl:text>}</xsl:text>
    </xsl:template>
 </xsl:stylesheet>