geo_works 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0533a41de0604673a4376d3597656459ecbbaf9
-  data.tar.gz: 4c0f1211b8313e5c5531d37152ce9332b9b2e50d
+  metadata.gz: bb061d01830fb5921dd128e5a1c8aae57828d706
+  data.tar.gz: 25df64e996fe4bf08d07ef03e9d1c873c53d75f1
 SHA512:
-  metadata.gz: 32233c2443c74edd7eece43f1558a399fb4444527cf7df4bac7658b0ea877257a1beb22807d10328ac54b8b672628d77472b5a7ee28174837aa6e3628fa85e5b
-  data.tar.gz: 37fe03c153f448b27fb28522eb98d92ffb5eea0b44e4d90b13120efcbb34510478408ca8976a9ce33582454a8f27c4f3a7ff79f825629caa1a670686f9c43d0d
+  metadata.gz: b92710175c86f0a448d8a9b791baaef368ddac96ef5e7b6b44390c471b187eec522f468a03e1f92bfc3cdb610ae45c748fea74983874a2e33c66ecaf3cdcd7e7
+  data.tar.gz: 182c7c85c84d908bcab4938d792e7a37daf0d9e2694d4b3fb5dc92959ceb64c8e1b39277b7f0b5282a21739e6c89e07ca84637867c99f74804afcb4c4eff1dbb

data/app/helpers/geo_works/geo_file_set_helper.rb

@@ -0,0 +1,7 @@
+module GeoWorks
+  module GeoFileSetHelper
+    def file_set_geometry(presenter)
+      presenter.solr_document.fetch(Solrizer.solr_name('geometry_type'), ['']).first
+    end
+  end
+end

data/app/processors/geo_works/processors/vector/info.rb

@@ -64,7 +64,9 @@ module GeoWorks
           # @return [String] vector geom
           def vector_geom
             match = /(?<=Geometry:\s).*?(?=\n)/.match(doc)
-            match ? match[0] : ''
+            geom = match ? match[0] : ''
+            # Transform OGR-style 'Line String' into GeoJSON 'Line'
+            geom == 'Line String' ? 'Line' : geom
           end
 
           # Given an output string from the ogrinfo command, returns

data/app/schemas/geo_works/file_set_metadata_required.rb

@@ -1,5 +1,6 @@
 module GeoWorks
   class FileSetMetadataRequired < ActiveTriples::Schema
     property :geo_mime_type, predicate: RDF::Vocab::EBUCore.hasMimeType, multiple: false
+    property :geometry_type, predicate: RDF::Vocab::GEOJSON.type, multiple: false
   end
 end

data/app/services/geo_works/discovery/document_builder/layer_info_builder.rb

@@ -46,19 +46,26 @@ module GeoWorks
           # Returns the geometry for a vector file.
           # @return [String] vector geometry
           def vector_geom_type
-            # TODO: Get the geom type as part of a geo characterization service.
-            # "Point, Line, Polygon, Mixed"
-            'Mixed'
+            return 'Mixed' if file_sets.nil? || file_sets.empty?
+            geom_field = Solrizer.solr_name('geometry_type')
+            file_sets.first.solr_document.fetch(geom_field, ['Mixed']).first
           end
 
           # Returns the 'geo' mime type of the first file attached to the work.
           # @return [String] file mime type
           def geo_mime_type
-            file_sets = geo_concern.geo_file_set_presenters
             return if file_sets.nil? || file_sets.empty?
             return unless (mime_types = file_sets.first.solr_document[:geo_mime_type_ssim])
             mime_types.first
           end
+
+          # Gets geo file set presenters.
+          # @return [FileSet] geo file sets
+          def file_sets
+            @file_sets ||= begin
+              geo_concern.geo_file_set_presenters
+            end
+          end
       end
     end
   end

data/app/services/geo_works/file_set_derivatives_service.rb

@@ -17,6 +17,7 @@ module GeoWorks
         create_raster_derivatives(filename)
       when *GeoWorks::VectorFormatService.select_options.map(&:last)
         create_vector_derivatives(filename)
+        GeoWorks::VectorGeometryService.new(file_set, derivative_url('display_vector')).call
       end
 
       # Once all the derivatives are created, send a created message

data/app/services/geo_works/vector_geometry_service.rb

@@ -0,0 +1,31 @@
+module GeoWorks
+  class VectorGeometryService
+    attr_reader :file_set, :file_path
+
+    def initialize(file_set, file_path)
+      @file_set = file_set
+      @file_path = file_path.gsub('file:', '')
+    end
+
+    # Extracts geometry type from display vector and saves value in FileSet.
+    def call
+      file_set.geometry_type = geometry
+      file_set.save!
+    end
+
+    private
+
+      def geometry
+        unzip_display_vector
+        GeoWorks::Processors::Vector::Info.new(shapefile_dir).geom
+      end
+
+      def shapefile_dir
+        "#{File.dirname(file_path)}/#{File.basename(file_path, '.zip')}"
+      end
+
+      def unzip_display_vector
+        system "unzip -o #{file_path} -d #{shapefile_dir}" unless File.directory?(shapefile_dir)
+      end
+  end
+end

data/app/views/geo_works/_member.html.erb

@@ -4,6 +4,7 @@
   </td>
   <td class="attribute filename"><%= link_to(member.link_name, main_app.hyrax_file_set_path(member)) %></td>
   <td class="attribute date_uploaded"><%= member.date_uploaded %></td>
+  <td class="attribute geometry"><%= file_set_geometry(member) %></td>
   <td class="attribute permission"><%= member.permission_badge %></td>
   <td>
     <%= file_set_actions(member) %>

data/app/views/geo_works/related/_geo_files.html.erb

@@ -9,6 +9,7 @@
         <th>File</th>
         <th>Filename</th>
         <th>Date Uploaded</th>
+        <th>Geometry</th>
         <th>Visibility</th>
         <th>Actions</th>
       </tr>

data/lib/geo_works/version.rb

@@ -1,3 +1,3 @@
 module GeoWorks
-  VERSION = "0.1.4".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/features/vector_work_show_spec.rb

@@ -9,10 +9,11 @@ describe "display a vector work as its owner", type: :feature do
   let(:attributes) { { title: title, coverage: coverage, spatial: spatial, temporal: temporal, user: user } }
   let(:fgdc_file) { test_data_fixture_path('zipcodes_fgdc.xml') }
   let(:vector_file) { test_data_fixture_path('files/tufts-cambridgegrid100-04.zip') }
+  let(:generator) { instance_double(GeoWorks::EventsGenerator).as_null_object }
 
   before do
-    allow(GeoblacklightJob).to receive(:perform_later)
-    allow(CharacterizeJob).to receive(:perform_later)
+    allow(GeoWorks::EventsGenerator).to receive(:new).and_return(generator)
+    allow(Hydra::Works::CharacterizationService).to receive(:run)
     create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s)
   end
 
@@ -33,29 +34,40 @@ describe "display a vector work as its owner", type: :feature do
       expect(page).to have_css("input#work_parent_members_ids")
     end
 
-    it "allows the user to attach files and extract attributes from metadata file" do
-      click_button 'Attach File'
-      click_link 'Attach Vector'
-      fill_in 'file_set[title][]', with: 'Vector File'
-      select 'ESRI Shapefile', from: 'file_set_geo_mime_type'
-      attach_file 'file_set[files][]', vector_file
-      click_button 'Attach to Vector Work'
-      expect(page).to have_text 'Vector File'
-      expect(page).to have_selector(:link_or_button, 'Download')
-
-      click_button 'Attach File'
-      click_link 'Attach Metadata'
-      fill_in 'file_set[title][]', with: 'Metadata File'
-      select 'FGDC', from: 'file_set_geo_mime_type'
-      attach_file 'file_set[files][]', fgdc_file
-      click_button 'Attach to Vector Work'
-      expect(page).to have_text 'Metadata File'
-
-      click_link 'Edit Work'
-      select 'zipcodes_fgdc.xml', from: 'vector_work[should_populate_metadata]'
-      click_button 'Save'
-      click_link "No. I'll update it manually."
-      expect(page).to have_text 'Louisiana ZIP Code Areas 2002'
+    context 'when attaching files' do
+      after do
+        # Clean up derivatives
+        work_presenter = GeoWorks::VectorWorkShowPresenter.new(work, nil)
+        file_set = work_presenter.geo_file_set_presenters.first
+        dir = File.join(Hyrax.config.derivatives_path, file_set.id[0..1])
+        FileUtils.rm_r(dir) if File.directory?(dir)
+      end
+
+      it "allows the user to attach files and extract attributes from metadata file" do
+        click_button 'Attach File'
+        click_link 'Attach Vector'
+        fill_in 'file_set[title][]', with: 'Vector File'
+        select 'ESRI Shapefile', from: 'file_set_geo_mime_type'
+        attach_file 'file_set[files][]', vector_file
+        click_button 'Attach to Vector Work'
+        expect(page).to have_text 'Vector File'
+        expect(page).to have_selector(:link_or_button, 'Download')
+        expect(page).to have_text 'Polygon'
+
+        click_button 'Attach File'
+        click_link 'Attach Metadata'
+        fill_in 'file_set[title][]', with: 'Metadata File'
+        select 'FGDC', from: 'file_set_geo_mime_type'
+        attach_file 'file_set[files][]', fgdc_file
+        click_button 'Attach to Vector Work'
+        expect(page).to have_text 'Metadata File'
+
+        click_link 'Edit Work'
+        select 'zipcodes_fgdc.xml', from: 'vector_work[should_populate_metadata]'
+        click_button 'Save'
+        click_link "No. I'll update it manually."
+        expect(page).to have_text 'Louisiana ZIP Code Areas 2002'
+      end
     end
   end
 end

data/spec/models/concerns/geo_works/file_set/derivatives_spec.rb

@@ -26,13 +26,17 @@ end
 
 shared_examples 'a set of vector derivatives' do
   let(:generator) { instance_double(GeoWorks::EventsGenerator) }
+  let(:geometry_service) { instance_double(GeoWorks::VectorGeometryService) }
+
   before do
     allow(GeoWorks::EventsGenerator).to receive(:new).and_return(generator)
+    allow(GeoWorks::VectorGeometryService).to receive(:new).and_return(geometry_service)
     allow(generator).to receive(:derivatives_created)
   end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
     expect(generator).to receive(:derivatives_created).with(file_set)
+    expect(geometry_service).to receive(:call)
     expect {
       file_set.create_derivatives(file_name)
     }.to change { Dir[new_thumb].empty? }
@@ -41,6 +45,7 @@ shared_examples 'a set of vector derivatives' do
 
   it 'makes a display vector' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/display_vector.display_vector"
+    expect(geometry_service).to receive(:call)
     expect {
       file_set.create_derivatives(file_name)
     }.to change { Dir[new_thumb].empty? }

data/spec/processors/geo_works/processors/vector/info_spec.rb

@@ -3,21 +3,22 @@ require 'open3'
 
 describe GeoWorks::Processors::Vector::Info do
   let(:path) { 'test.tif' }
-  let(:info_doc) { read_test_data_fixture('ogrinfo.txt') }
+  let(:polygon_info_doc) { read_test_data_fixture('ogrinfo_polygon.txt') }
+  let(:line_info_doc) { read_test_data_fixture('ogrinfo_line.txt') }
 
   subject { described_class.new(path) }
 
   context 'when initializing a new info class' do
     it 'shells out to ogrinfo and sets the doc variable to the output string' do
       expect(Open3).to receive(:capture3).with("ogrinfo -ro -so -al #{path}")
-        .and_return([info_doc, '', ''])
-      expect(subject.doc).to eq(info_doc)
+        .and_return([polygon_info_doc, '', ''])
+      expect(subject.doc).to eq(polygon_info_doc)
     end
   end
 
-  context 'after intialization' do
+  context 'with a polygon vector' do
     before do
-      allow(subject).to receive(:doc).and_return(info_doc)
+      allow(subject).to receive(:doc).and_return(polygon_info_doc)
     end
 
     describe '#name' do
@@ -33,7 +34,7 @@ describe GeoWorks::Processors::Vector::Info do
     end
 
     describe '#geom' do
-      it 'returns raster size' do
+      it 'returns vector geometry' do
         expect(subject.geom).to eq('Polygon')
       end
     end
@@ -47,4 +48,16 @@ describe GeoWorks::Processors::Vector::Info do
       end
     end
   end
+
+  context 'with a line vector' do
+    before do
+      allow(subject).to receive(:doc).and_return(line_info_doc)
+    end
+
+    describe '#geom' do
+      it 'returns vector geometry' do
+        expect(subject.geom).to eq('Line')
+      end
+    end
+  end
 end

data/spec/services/geo_works/discovery/document_builder_spec.rb

@@ -14,7 +14,7 @@ describe GeoWorks::Discovery::DocumentBuilder do
   let(:metadata_file) { FileSet.new(id: 'metadatafile', geo_mime_type: metadata__mime_type) }
   let(:metadata_presenter) { Hyrax::FileSetPresenter.new(SolrDocument.new(metadata_file.to_solr), nil) }
   let(:geo_file_mime_type) { 'application/zip; ogr-format="ESRI Shapefile"' }
-  let(:geo_file) { FileSet.new(id: 'geofile', geo_mime_type: geo_file_mime_type) }
+  let(:geo_file) { FileSet.new(id: 'geofile', geo_mime_type: geo_file_mime_type, geometry_type: 'Line') }
   let(:geo_file_presenter) { Hyrax::FileSetPresenter.new(SolrDocument.new(geo_file.to_solr), nil) }
   let(:coverage) { GeoWorks::Coverage.new(43.039, -69.856, 42.943, -71.032) }
   let(:issued) { '01/02/2013' }
@@ -83,7 +83,7 @@ describe GeoWorks::Discovery::DocumentBuilder do
       end
 
       it 'has layer info fields' do
-        expect(document['layer_geom_type_s']).to eq('Mixed')
+        expect(document['layer_geom_type_s']).to eq('Line')
         expect(document['dc_format_s']).to eq('Shapefile')
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_works
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - James Griffin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyrax
@@ -386,6 +386,7 @@ files:
 - app/helpers/geo_works/application_helper.rb
 - app/helpers/geo_works/bounding_box_helper.rb
 - app/helpers/geo_works/file_set_actions_helper.rb
+- app/helpers/geo_works/geo_file_set_helper.rb
 - app/helpers/geo_works/geo_works_helper.rb
 - app/helpers/geo_works/populate_metadata_helper.rb
 - app/jobs/geoblacklight_job.rb
@@ -466,6 +467,7 @@ files:
 - app/services/geo_works/metadata_format_service.rb
 - app/services/geo_works/raster_format_service.rb
 - app/services/geo_works/vector_format_service.rb
+- app/services/geo_works/vector_geometry_service.rb
 - app/services/hyrax/curation_concern.rb
 - app/values/geo_works/coverage.rb
 - app/values/geo_works/time_period.rb