geoblacklight 1.0.0.pre2 → 1.0.0.pre3

data/schema/solr/conf/schema.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema name="geoblacklight-schema" version="1.5">
-  <uniqueKey>uuid</uniqueKey>
+  <uniqueKey>layer_slug_s</uniqueKey>
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>
     <field name="timestamp" type="date"   stored="true" indexed="true" default="NOW"/>
-    <field name="uuid"      type="string" stored="true" indexed="true" required="true"/>
+    <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 -->
 
     <!-- core generated fields -->
     <field name="text" type="text_en" stored="false" indexed="true" multiValued="true"
@@ -16,6 +18,7 @@
     <dynamicField name="*_dt"   type="date"    stored="true"  indexed="true"/>
     <dynamicField name="*_f"    type="float"   stored="true"  indexed="true"/>
     <dynamicField name="*_i"    type="int"     stored="true"  indexed="true"/>
+    <dynamicField name="*_im"   type="int"     stored="true"  indexed="true" multiValued="true" />
     <dynamicField name="*_l"    type="long"    stored="true"  indexed="true"/>
     <dynamicField name="*_s"    type="string"  stored="true"  indexed="true"/>
     <dynamicField name="*_ss"   type="string"  stored="true"  indexed="false"/>

data/spec/features/esri_viewer_spec.rb

@@ -2,39 +2,39 @@ require 'spec_helper'
 
 feature 'feature_layer reference', js: true do
   scenario 'displays image map layer' do
-    visit solr_document_path 'minnesota-test-oregon-naip-2011'
+    visit solr_document_path 'princeton-test-oregon-naip-2011'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays dynamic layer (all layers)' do
-    visit solr_document_path 'illinois-f14ff4-1359-4beb-b931-5cb41d20ab90'
+    visit solr_document_path 'minnesota-f14ff4-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
   end
   scenario 'displays dynamic layer (single layer)' do
-    visit solr_document_path 'maryland-fc5cd2-732d-4559-a9c7-df38dd683aec'
+    visit solr_document_path 'michigan-state-urn-ad0e6ebc-824e-4450-a0d9-987f2232724f'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays feature layer' do
     pending 'cannot currently test for svg feature'
-    visit solr_document_path 'minnesota-772ebcaf2ec0405ea1b156b5937593e7_0'
+    visit solr_document_path 'minnesota-e2f33b52-4039-4bbb-9095-b5cdc0175943'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(Nokogiri::HTML.parse(page.body).css('g').length).to eq 23
     fail
   end
   scenario 'displays image map layer' do
-    visit solr_document_path 'minnesota-test-oregon-naip-2011'
+    visit solr_document_path 'princeton-test-oregon-naip-2011'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays tiled map layer' do
-    visit solr_document_path 'minnesota-test-soil-survey-map'
+    visit solr_document_path 'nyu-test-soil-survey-map'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
   end
   scenario 'displays Esri WMS layer' do
-    visit solr_document_path 'psu-32ef9f-0762-445c-8250-f4a5e220a46d'
+    visit solr_document_path 'purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
   end

data/spec/features/home_page_spec.rb

@@ -14,7 +14,7 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
   end
   scenario 'find by category' do
     expect(page).to have_css '.category-block', count: 4
-    expect(page).to have_css '.home-facet-link', count: 32
+    expect(page).to have_css '.home-facet-link', count: 33
     expect(page).to have_css 'a.more_facets_link', count: 4
     click_link 'Elevation'
     expect(page).to have_css '.filterName', text: 'Subject'

data/spec/features/layer_opacity_spec.rb

@@ -8,7 +8,7 @@ feature 'Layer opacity', js: true do
   end
 
   scenario 'ESRI image service layer should have opacity control' do
-    visit solr_document_path('minnesota-test-oregon-naip-2011')
+    visit solr_document_path('princeton-test-oregon-naip-2011')
     expect(page).to have_css('div.opacity-text', text: '75%')
     expect(page.find('img.leaflet-image-layer', match: :first)[:style]).to match(/opacity: 0.75;/)
   end

data/spec/features/linkified_attribute_table_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+feature 'Attribute table values', js: true do
+  scenario 'are linkified' do
+    visit solr_document_path 'minnesota-e2f33b52-4039-4bbb-9095-b5cdc0175943'
+    # Wait until SVG elements are added
+    expect(page).to have_css '.leaflet-overlay-pane svg'
+    page.first('svg g path').click
+    expect(page).to have_css 'td a[href="http://www.minneapolismn.gov/fire/stations/fire_station28"]', text: 'http://www.minneapolismn.gov/fire/stations/fire_station28'
+  end
+end

data/spec/fixtures/solr_documents/actual-papermap1.json

@@ -1,25 +1,23 @@
 {
-        "uuid": "urn:arrowsmith.mit.edu:MIT.001145244",
-        "dc_description_s": "Panel title. Depths shown by isolines. \"Geological map [copyright] NERC 1996.\" Also available on flat sheet. \"Sheet 1\"--on panel. Includes text, notes, organizations' logos, and ancillary map of \"Orogenic terranes of Britain, Ireland and surrounding seas.\"",
-        "dc_format_s": "Paper",
-        "dc_identifier_s": "urn:arrowsmith.mit.edu:MIT.001145244",
-        "dc_language_s": "English",
-        "dc_publisher_s": "British Geological Survey",
-        "dc_rights_s": "Public",
-        "dc_title_s": "1:1 500 000 series [cartographic material] : tectonic map of Britain, Ireland and adjacent areas / British Geological Survey ; Geological Survey of Ireland ; Geological Survey of Northern Ireland.",
-        "dc_type_s": "Dataset",
-        "dct_references_s": "{\"http://schema.org/url\":\"http://library.mit.edu/item/001145244\",\"http://www.opengis.net/cat/csw/csdgm\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/MIT:001145244/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/MIT:001145244/fgdc.html\"}",
-        "dct_temporal_sm": [
-          "1996"
-        ],
-        "dct_issued_s": "2000",
-        "dct_provenance_s": "MIT",
-        "georss_box_s": "49.0 -13.0 62.0 4.0",
-        "georss_polygon_s": "62.0 -13.0 62.0 4.0 49.0 4.0 49.0 -13.0 62.0 -13.0",
-        "layer_slug_s": "mit-001145244",
-        "layer_id_s": "MIT:001145244",
-        "layer_geom_type_s": "Paper Map",
-        "layer_modified_dt": "2014-12-04T21:32:59Z",
-        "solr_geom": "ENVELOPE(-13.0, 4.0, 62.0, 49.0)",
-        "solr_year_i": 1996
-      }
+  "geoblacklight_version": "1.0",
+  "dc_description_s": "Panel title. Depths shown by isolines. \"Geological map [copyright] NERC 1996.\" Also available on flat sheet. \"Sheet 1\"--on panel. Includes text, notes, organizations' logos, and ancillary map of \"Orogenic terranes of Britain, Ireland and surrounding seas.\"",
+  "dc_format_s": "Paper",
+  "dc_identifier_s": "urn:arrowsmith.mit.edu:MIT.001145244",
+  "dc_language_s": "English",
+  "dc_publisher_s": "British Geological Survey",
+  "dc_rights_s": "Public",
+  "dc_title_s": "1:1 500 000 series [cartographic material] : tectonic map of Britain, Ireland and adjacent areas / British Geological Survey ; Geological Survey of Ireland ; Geological Survey of Northern Ireland.",
+  "dc_type_s": "Dataset",
+  "dct_references_s": "{\"http://schema.org/url\":\"http://library.mit.edu/item/001145244\",\"http://www.opengis.net/cat/csw/csdgm\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/MIT:001145244/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/org.opengeoportal/MIT:001145244/fgdc.html\"}",
+  "dct_temporal_sm": [
+    "1996"
+  ],
+  "dct_issued_s": "2000",
+  "dct_provenance_s": "MIT",
+  "layer_slug_s": "mit-001145244",
+  "layer_id_s": "MIT:001145244",
+  "layer_geom_type_s": "Paper Map",
+  "layer_modified_dt": "2014-12-04T21:32:59Z",
+  "solr_geom": "ENVELOPE(-13.0, 4.0, 62.0, 49.0)",
+  "solr_year_i": 1996
+}

data/spec/fixtures/solr_documents/actual-point1.json

@@ -1,5 +1,5 @@
 {
-  "uuid": "urn:columbia.edu:Columbia.landinfo_global_aet",
+  "geoblacklight_version": "1.0",
   "dc_description_s": "Actual Evapotrans is a point theme representing the sum of evaporation and plant transpiration to the atmosphere from throughout the world.  Measurements are represented by points at every.5 degrees and provided for every month of the year. This dataset is a part of the Global Climate Database from the Global Change Department National Institute of Public Health and Environmental Protection.",
   "dc_format_s": "Shapefile",
   "dc_identifier_s": "urn:columbia.edu:Columbia.landinfo_global_aet",
@@ -15,12 +15,10 @@
     "1996"
   ],
   "dct_provenance_s": "Columbia",
-  "georss_box_s": "-56.0 -179.5 83.0 180.0",
-  "georss_polygon_s": "83.0 -179.5 83.0 180.0 -56.0 180.0 -56.0 -179.5 83.0 -179.5",
   "layer_slug_s": "columbia-columbia-landinfo-global-aet",
   "layer_id_s": "Columbia:Columbia.landinfo_global_aet",
   "layer_geom_type_s": "Point",
   "layer_modified_dt": "2014-12-12T19:54:57Z",
   "solr_geom": "ENVELOPE(-179.5, 180.0, 83.0, -56.0)",
   "solr_year_i": 1996
-}
+}

data/spec/fixtures/solr_documents/actual-polygon1.json

@@ -1,5 +1,5 @@
 {
-  "uuid": "urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04",
+  "geoblacklight_version": "1.0",
   "dc_description_s": "This polygon dataset is a 100 foot grid overlay for Cambridge, MA.",
   "dc_format_s": "Shapefile",
   "dc_identifier_s": "urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04",
@@ -14,12 +14,10 @@
   ],
   "dct_issued_s": "2005",
   "dct_provenance_s": "Tufts",
-  "georss_box_s": "42.34757 -71.163984 42.408316 -71.052581",
-  "georss_polygon_s": "42.408316 -71.163984 42.408316 -71.052581 42.34757 -71.052581 42.34757 -71.163984 42.408316 -71.163984",
   "layer_slug_s": "tufts-cambridgegrid100-04",
   "layer_id_s": "sde:GISPORTAL.GISOWNER01.CAMBRIDGEGRID100_04",
   "layer_geom_type_s": "Polygon",
   "layer_modified_dt": "2014-12-04T21:33:07Z",
   "solr_geom": "ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)",
   "solr_year_i": 2004
-}
+}

data/spec/fixtures/solr_documents/actual-raster1.json

@@ -1,43 +1,37 @@
 {
-        "uuid": "http://purl.stanford.edu/dp018hs9766",
-        "dc_identifier_s": "http://purl.stanford.edu/dp018hs9766",
-        "dc_title_s": "1-Meter Shaded Relief Multibeam Bathymetry Image (Color): Elkhorn Slough, California, 2005",
-        "dc_description_s": "This layer is a 10-color shaded relief GeoTIFF that contains high-resolution bathymetric data collected from the Elkhorn Slough region of Monterey Bay, California. The survey for Elkhorn Slough was conducted 8/12/2005 - 8/15/2005. Elkhorn Slough, one of the largest remaining coastal wetlands in California, has been directly subjected to tidal scour since the opening of Moss Landing Harbor in 1946. This erosion endangers the habitat of several rare and endangered species and disrupts the wetland ecosystem as a whole. In 2003, the Seafloor Mapping Lab of California State University, Monterey Bay created the most detailed bathymetry model of the Slough to date using a combination of multi-beam sonar, single-beam sonar and aerial photography. This layer was created as part of the California Seafloor Mapping Project.This project was conducted to determine changes in the pattern of erosion and deposition in Elkhorn Slough since surveys conducted in 1993, 2001 and 2003. Marine data offered here represent the efforts of a comprehensive state waters mapping program for California launched by the California State Coastal Conservancy, Ocean Protection Council, Department of Fish and Game, and the NOAA National Marine Sanctuary Program. The ultimate goal is the creation of a high-resolution 1:24,000 scale geologic and habitat base map series covering all of California's 14,500 km2 state waters out to the 3 mile limit, and support of the state's Marine Life Protection Act Initiative (MLPA) goal to create a statewide network of Marine Protected Areas (MPAs). This statewide project requires, involves and leverages expertise from industry, resource management agencies and academia. The tiered mapping campaign involves the use of state-of-the-art sonar, LIDAR (aerial laser) and video seafloor mapping technologies; computer aided classification and visualization; expert geologic and habitat interpretations codified into strip maps spanning California's land/sea boundary; and the creation of an online, publicly accessible data repository for the dissemination of all mapping products.\n",
-        "dc_rights_s": "Restricted",
-        "dct_provenance_s": "Stanford",
-        "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/dp018hs9766\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:dp018hs9766/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/dp018hs9766.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/dp/018/hs/9766/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:dp018hs9766/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://kurma-podd1.stanford.edu/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://kurma-podd1.stanford.edu/geoserver/wms\"}",
-        "layer_id_s": "druid:dp018hs9766",
-        "layer_slug_s": "stanford-dp018hs9766",
-        "layer_geom_type_s": "Raster",
-        "layer_modified_dt": "2014-12-03T02:15:20Z",
-        "dc_format_s": "GeoTIFF",
-        "dc_language_s": "English",
-        "dc_type_s": "Dataset",
-        "dc_publisher_s": "Seafloor Mapping Lab",
-        "dc_creator_sm": [
-          "Seafloor Mapping Lab"
-        ],
-        "dc_subject_sm": [
-          "Continental margins",
-          "Multibeam mapping",
-          "Elevation",
-          "Imagery and Base Maps",
-          "Inland Waters"
-        ],
-        "dct_issued_s": "2006",
-        "dct_temporal_sm": [
-          "2005"
-        ],
-        "dct_spatial_sm": [
-          "Elkhorn Slough (Calif.)",
-          "Monterey Bay (Calif.)"
-        ],
-        "dc_relation_sm": [
-          "http://sws.geonames.org/5346182/about.rdf",
-          "http://sws.geonames.org/5374363/about.rdf"
-        ],
-        "georss_box_s": "36.8085911 -121.7948738 36.8606925 -121.7389503",
-        "georss_polygon_s": "36.8085911 -121.7948738 36.8606925 -121.7948738 36.8606925 -121.7389503 36.8085911 -121.7389503 36.8085911 -121.7948738",
-        "solr_geom": "ENVELOPE(-121.7948738, -121.7389503, 36.8606925, 36.8085911)",
-        "solr_year_i": 2005
-      }
+  "geoblacklight_version": "1.0",
+  "dc_identifier_s": "http://purl.stanford.edu/dp018hs9766",
+  "dc_title_s": "1-Meter Shaded Relief Multibeam Bathymetry Image (Color): Elkhorn Slough, California, 2005",
+  "dc_description_s": "This layer is a 10-color shaded relief GeoTIFF that contains high-resolution bathymetric data collected from the Elkhorn Slough region of Monterey Bay, California. The survey for Elkhorn Slough was conducted 8/12/2005 - 8/15/2005. Elkhorn Slough, one of the largest remaining coastal wetlands in California, has been directly subjected to tidal scour since the opening of Moss Landing Harbor in 1946. This erosion endangers the habitat of several rare and endangered species and disrupts the wetland ecosystem as a whole. In 2003, the Seafloor Mapping Lab of California State University, Monterey Bay created the most detailed bathymetry model of the Slough to date using a combination of multi-beam sonar, single-beam sonar and aerial photography. This layer was created as part of the California Seafloor Mapping Project.This project was conducted to determine changes in the pattern of erosion and deposition in Elkhorn Slough since surveys conducted in 1993, 2001 and 2003. Marine data offered here represent the efforts of a comprehensive state waters mapping program for California launched by the California State Coastal Conservancy, Ocean Protection Council, Department of Fish and Game, and the NOAA National Marine Sanctuary Program. The ultimate goal is the creation of a high-resolution 1:24,000 scale geologic and habitat base map series covering all of California's 14,500 km2 state waters out to the 3 mile limit, and support of the state's Marine Life Protection Act Initiative (MLPA) goal to create a statewide network of Marine Protected Areas (MPAs). This statewide project requires, involves and leverages expertise from industry, resource management agencies and academia. The tiered mapping campaign involves the use of state-of-the-art sonar, LIDAR (aerial laser) and video seafloor mapping technologies; computer aided classification and visualization; expert geologic and habitat interpretations codified into strip maps spanning California's land/sea boundary; and the creation of an online, publicly accessible data repository for the dissemination of all mapping products.\n",
+  "dc_rights_s": "Restricted",
+  "dct_provenance_s": "Stanford",
+  "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/dp018hs9766\",\"http://schema.org/downloadUrl\":\"http://stacks.stanford.edu/file/druid:dp018hs9766/data.zip\",\"http://www.loc.gov/mods/v3\":\"http://purl.stanford.edu/dp018hs9766.mods\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/dp/018/hs/9766/iso19139.xml\",\"http://www.w3.org/1999/xhtml\":\"http://opengeometadata.stanford.edu/metadata/edu.stanford.purl/druid:dp018hs9766/default.html\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://kurma-podd1.stanford.edu/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://kurma-podd1.stanford.edu/geoserver/wms\"}",
+  "layer_id_s": "druid:dp018hs9766",
+  "layer_slug_s": "stanford-dp018hs9766",
+  "layer_geom_type_s": "Raster",
+  "layer_modified_dt": "2014-12-03T02:15:20Z",
+  "dc_format_s": "GeoTIFF",
+  "dc_language_s": "English",
+  "dc_type_s": "Dataset",
+  "dc_publisher_s": "Seafloor Mapping Lab",
+  "dc_creator_sm": [
+    "Seafloor Mapping Lab"
+  ],
+  "dc_subject_sm": [
+    "Continental margins",
+    "Multibeam mapping",
+    "Elevation",
+    "Imagery and Base Maps",
+    "Inland Waters"
+  ],
+  "dct_issued_s": "2006",
+  "dct_temporal_sm": [
+    "2005"
+  ],
+  "dct_spatial_sm": [
+    "Elkhorn Slough (Calif.)",
+    "Monterey Bay (Calif.)"
+  ],
+  "solr_geom": "ENVELOPE(-121.7948738, -121.7389503, 36.8606925, 36.8085911)",
+  "solr_year_i": 2005
+}

data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json

@@ -1,13 +1,13 @@
 {
-    "uuid": "urn-90f14ff4-1359-4beb-b931-5cb41d20ab90",
+    "geoblacklight_version": "1.0",
     "layer_geom_type_s": "Polygon",
     "dc_identifier_s": "urn-90f14ff4-1359-4beb-b931-5cb41d20ab90",
     "dc_title_s": "Glacial Boundaries: Illinois, 1997",
     "dc_description_s": "This is an SDE feature class containing glacial boundary polygons representing the extent of glaciation for major glacial episodes in Illinois. Data are originally from the Quaternary Deposits in Illinois (1:500,000) map by Lineback (1979). Data have been subsequently modified to conform with the reclassification by Hansel and Johnson, ISGS Bulletin 104 (1996). Glacial episode is identified for each polygon. The data include the Wisconsin, Illinois and the Pre-Illinois episodes. Areas not glaciated are also identified. The nominal scale is 1:500,000.",
     "dc_rights_s": "Public",
-    "dct_provenance_s": "University of Illinois",
+    "dct_provenance_s": "Minnesota",
     "layer_id_s": "urn:f14ff4-1359-4beb-b931-5cb41d20ab90",
-    "layer_slug_s": "illinois-f14ff4-1359-4beb-b931-5cb41d20ab90",
+    "layer_slug_s": "minnesota-f14ff4-1359-4beb-b931-5cb41d20ab90",
     "layer_modified_dt": "2016-01-12T16:10:41Z",
     "dc_creator_sm": [
         "Illinois State Geological Survey"
@@ -31,7 +31,6 @@
     "dct_issued_s": "1997-12-13",
     "dct_temporal_sm": "1996",
     "solr_geom": "ENVELOPE(-91.513518, -87.495214, 42.508348, 36.969972)",
-    "georss_box_s": "36.969972 -91.513518 42.508348 -87.495214",
     "solr_year_i": 1997,
     "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"http://data.isgs.illinois.edu/arcgis/rest/services/Geology/Glacial_Boundaries/MapServer\",\"http://schema.org/url\":\"https://clearinghouse.isgs.illinois.edu/data/geology/glacial-boundaries\",\"http://schema.org/downloadUrl\":\"https://clearinghouse.isgs.illinois.edu/sites/clearinghouse.isgs/files/Clearinghouse/data/ISGS/Geology/zips/IL_Glacial_Bndys_Py.zip\"}"
 }

data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json

@@ -1,40 +1,34 @@
 {
-  "uuid": "urn-bdfc5cd2-732d-4559-a9c7-df38dd683aec",
-  "layer_geom_type_s": "Polygon",
-  "georss_box_s": "38.0044 -79.4871 39.7226 -75.2327",
-  "layer_modified_dt": "2016-01-11T12:28:18Z",
+  "geoblacklight_version": "1.0",
   "dc_creator_sm": [
-    "Maryland Department of Planning"
+    "State of Michigan"
   ],
-  "layer_id_s": "Permanently Preserved Agricultural Lands",
-  "dc_type_s": "Dataset",
-  "dc_identifier_s": "urn-bdfc5cd2-732d-4559-a9c7-df38dd683aec",
-  "dct_provenance_s": "University of Maryland",
-  "dc_title_s": "Permanently Preserved Agricultural Lands: Maryland, 2014",
-  "layer_slug_s": "maryland-fc5cd2-732d-4559-a9c7-df38dd683aec",
+  "dc_description_s": "Michigan Glacial Landsystems",
   "dc_format_s": "Shapefile",
-  "dc_description_s": "This layer contains lands that have been forever restricted from development on prime farmland and woodland. Permanently preserved agricultural lands are parcels subject to some type of preservation easement as well as properties owned by federal, state and local governments. In addition, properties owned by local trusts and private conservation organizations such as The Nature Conservancy are included. Conservation easements include easements from the Maryland Agricultural Land Preservation Foundation (MALPF), Rural Legacy, Forest Legacy, Maryland Environmental Trust (MET), county and state purchases of development rights, transfers of development rights, open space from home owners associations, local open space requirements, and private conservation easements. This data is compiled from settlement data directly from conservation program administrators, county GIS updates on preservation activities, and publicly available data from the Maryland Department of Natural Resources. In addition, this data is in the process of being realigned to the 2012 MD iMap parcel polygons. The realignments are available on a county by county basis depending on the production schedule.",
-  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"http://geodata.md.gov/imap/rest/directories/arcgisoutput/AGRL_PermPreservedAgLands_MDP.zip\",\"http://schema.org/url\":\"http://data.imap.maryland.gov/datasets/20f240af3be54be581f9ceef1b314b6a_0\",\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"http://geodata.md.gov/imap/rest/services/Agriculture/MD_AgriculturalDesignations/MapServer/0\"}",
-  "dc_subject_sm": [
-    "Planning and Cadastral",
-    "Farming",
-    "Maryland",
-    "MDP",
-    "MALPF",
-    "Agriculture",
-    "Rural Legacy",
-    "Maryland Department of Planning",
-    "Easement",
-    "MET",
-    "Preservation",
-    "AGRL",
-    "Conservation",
-    "protected lands",
-    "MD iMAP",
-    "MD"
+  "dc_identifier_s": "urn-ad0e6ebc-824e-4450-a0d9-987f2232724f",
+  "dc_publisher_sm": [
+    "State of Michigan GIS Open Data"
   ],
-  "solr_year_i": 2014,
-  "solr_geom": "ENVELOPE(-79.4871, -75.2327, 39.7226, 38.0044)",
   "dc_rights_s": "Public",
-  "dct_issued_s": "2014-04-02"
-}
+  "dc_subject_sm": [
+    "geoscientificinformation",
+    "utilitiesCommunications",
+    "inlandWaters",
+    "glaciers",
+    "geology"
+  ],
+  "dc_title_s": "Glacial Landsystems: Michigan, 2015",
+  "dc_type_s": "Dataset",
+  "dct_issued_s": "2015-02-28T18:53:27Z",
+  "dct_provenance_s": "Michigan State",
+  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"http://gis.michigan.opendata.arcgis.com/datasets/a020fc444ff04d6abf7b03b268cadb71_9.zip\",\"http://schema.org/url\":\"http://gis.michigan.opendata.arcgis.com/datasets/a020fc444ff04d6abf7b03b268cadb71_9\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://opengeometadata.github.io/edu.michstate/ad/0e/6e/bc824e4450a0d9987f2232724f/iso19139.xml\",\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"https://gisago.mcgi.state.mi.us/arcgis/rest/services/OpenData/hydro/MapServer/9\"}",
+  "dct_spatial_sm": [
+    "Michigan"
+  ],
+  "layer_geom_type_s": "Polygon",
+  "layer_id_s": "urn:urn-ad0e6ebc-824e-4450-a0d9-987f2232724f",
+  "layer_modified_dt": "2016-07-18T15:17:46Z",
+  "layer_slug_s": "michigan-state-urn-ad0e6ebc-824e-4450-a0d9-987f2232724f",
+  "solr_geom": "ENVELOPE(-90.5497, -82.0758, 48.2152, 41.6321)",
+  "solr_year_i": 2015
+}

data/spec/fixtures/solr_documents/esri-feature-layer.json

@@ -1,22 +1,16 @@
- {
+{
+  "geoblacklight_version": "1.0",
   "layer_geom_type_s": "Polygon",
-  "layer_modified_dt": "2016-01-19T09:33:12.85Z",
+  "layer_modified_dt": "2016-07-11T09:15:37Z",
   "solr_geom": "ENVELOPE(-93.3291083642602, -93.1896159986687, 45.0512462600492, 44.8901520021226)",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":\"http://opendata.minneapolismn.gov/datasets/772ebcaf2ec0405ea1b156b5937593e7_0.zip\",\"urn:x-esri:serviceType:ArcGIS#FeatureLayer\":\"https://services.arcgis.com/afSMGVsC7QlRK1kZ/arcgis/rest/services/Fire_Station_Areas/FeatureServer/0\",\"http://schema.org/url\":\"http://opendata.minneapolismn.gov/datasets/772ebcaf2ec0405ea1b156b5937593e7_0\"}",
   "dc_rights_s": "Public",
-  "uuid": "http://opendata.minneapolismn.gov/datasets/772ebcaf2ec0405ea1b156b5937593e7_0",
-  "dct_provenance_s": "University of Minnesota",
+  "dct_provenance_s": "Minnesota",
   "dc_subject_sm": [
-    "Boundaries",
-    "Minneapolis",
-    "Fire Station Areas",
-    "Fire",
-    "Fire Department",
-    "Boundaries"
-  ],
-  "dct_temporal_sm": [
-    "2015"
+    "utilitiesCommunications",
+    "fire"
   ],
+  "dct_temporal_sm": "2015",
   "dc_description_s": "Map service showing the Fire Station service areas for the Minneapolis Fire Department.",
   "dct_issued_s": "2012-04-25T19:32:02.000ZZ",
   "dc_format_s": "Shapefile",
@@ -24,16 +18,16 @@
     "MapIT Minneapolis"
   ],
   "dc_type_s": "Dataset",
-  "dc_identifier_s": "http://opendata.minneapolismn.gov/datasets/772ebcaf2ec0405ea1b156b5937593e7_0",
-  "solr_year_i": 2015,
+  "dc_identifier_s": "e2f33b52-4039-4bbb-9095-b5cdc0175943",
+  "solr_year_i": 2012,
   "dct_spatial_sm": [
-    "Minneapolis, City of"
+    "City of Minneapolis, Minnesota",
+    "Minneapolis"
   ],
   "dc_publisher_sm": [
     "MapIT Minneapolis"
   ],
-  "layer_id_s": "urn:772ebcaf2ec0405ea1b156b5937593e7_0",
-  "georss_box_s": "44.8901520021226 -93.3291083642602 45.0512462600492 -93.1896159986687",
-  "dc_title_s": "Fire Station Areas",
-  "layer_slug_s": "minnesota-772ebcaf2ec0405ea1b156b5937593e7_0"
-}
+  "layer_id_s": "urn:e2f33b52-4039-4bbb-9095-b5cdc0175943",
+  "dc_title_s": "Fire Station Areas: Minneapolis, Minnesota",
+  "layer_slug_s": "minnesota-e2f33b52-4039-4bbb-9095-b5cdc0175943"
+}

data/spec/fixtures/solr_documents/esri-image-map-layer.json

@@ -1,5 +1,5 @@
 {
-  "uuid": "oregon-naip-2011",
+  "geoblacklight_version": "1.0",
   "dc_description_s": "A Web Mercator mosaic derived from half-meter resolution color Digital Orthophoto Quadrangles (DOQ) of the entire state of Oregon from the summer of 2011 for multiple state agencies in Oregon. The original content was produced utilizing the scanned aerial film acquired during peak agriculture growing seasons under the National Agriculture Imagery Program (NAIP) under contract for the United States Department of Agriculture (USDA) for the Farm Service Agency's (FSA) Compliance Program. A DOQ is a raster image in which displacement in the image caused by sensor orientation and terrain relief has been removed. A DOQ combines the image characteristics of a photograph with the geometric qualities of a map. The geographic extent of the DOQ is a full 7.5-minute map (latitude and longitude) with a nominal buffer. The horizontal accuracy is within 5 meters of reference ortho imagery (1992 USGS DOQs.) The 1992 USGS DOQ imagery met National Map Accuracy Standards at 1:24,000 scale for 7.5-minute quadrangles. Translated to the ground, the 0.5 mm error distance at 1:24,000 scale is 39.4 ft (12 meters), making the absolute accuracy for the 2011 Oregon DOQs +/- 17 meters. The process of reprojecting and mosaicing the images may have added a potential shift of +/-0.75 meters, making the cumulative accuracy +/-17.75 meters. The original images were projected into a GCS_WGS_1984_Web_Mercator(Auxiliary Sphere) for compatibility with other generic web map services.",
   "dc_format_s": "GeoTIFF",
   "dc_identifier_s": "oregon-naip-2011",
@@ -11,12 +11,11 @@
   "dct_temporal_sm": [
     "2011"
   ],
-  "dct_provenance_s": "University of Minnesota",
-  "georss_box_s": "41.91 -124.88 46.34 -116.41",
-  "layer_slug_s": "minnesota-test-oregon-naip-2011",
+  "dct_provenance_s": "Princeton",
+  "layer_slug_s": "princeton-test-oregon-naip-2011",
   "layer_id_s": "oregon-naip-2011",
   "layer_geom_type_s": "Raster",
   "layer_modified_dt": "2015-27-15T00:41:49Z",
   "solr_geom": "ENVELOPE(-124.88, -116.41, 46.34, 41.91)",
   "solr_year_i": 2008
-}
+}