geo_concerns 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4be533d84cfd89f0199d8fed8ef426c0880856f9
-  data.tar.gz: 585d77df727e269c05768bd4faa1fdc87d874edc
+  metadata.gz: 5860cade4910404ebfc81e6d1dcb6524ab1b2a88
+  data.tar.gz: cb1f2d4920984de204a0d04b06593c9d804abe02
 SHA512:
-  metadata.gz: c2a18e387eba255c23a475fbb9ab0064dc2d31e1ea7dd55f55f93df2be6b65780b8ef63b0b0ba486af162f11705439c63217e9efde0510d85e80eab08b583d0e
-  data.tar.gz: 99721d9388d56b1afafd583161cb0f546ab1aceaac380346b504319c3c6c27a9154ab731f35fe28bad61fb240b45420ea9c1725a28cc0776ad966d25659124a4
+  metadata.gz: d04edc92c51d7de7f69fadec0b189e244a92586773715646efebb7076421301ff8c3ee97cd95fceeb1b9a903683968f51815e5120c4ce7d3b0d8058453cce79e
+  data.tar.gz: b17861f0bc73e579ab4cf38614988c6909c033bbc66a03215399e0f6b71a360068ec8a39a53a4fb854c831707af2f654c8d765e58ff3e0051cbf4c70621de53c

data/app/actors/geo_concerns/actors/file_actor.rb

@@ -0,0 +1,25 @@
+module GeoConcerns
+  module Actors
+    class FileActor < CurationConcerns::Actors::FileActor
+      def ingest_file(file)
+        working_file = copy_file_to_working_directory(file, file_set.id)
+        IngestFileJob.perform_later(file_set,
+                                    working_file,
+                                    mime_type(file),
+                                    user,
+                                    relation)
+        true
+      end
+
+      # Determines the correct mime type for a file. If the mime type is stored on
+      # the file_set (set in the view), then use that value. If not, use the file
+      # content type, if it exists.
+      # @param [File, ActionDigest::HTTP::UploadedFile] file to get mime type from
+      # @return [String] Mime type for the file
+      def mime_type(file)
+        return file_set.geo_mime_type if file_set.geo_mime_type
+        file.respond_to?(:content_type) ? file.content_type : nil || file_set.geo_mime_type
+      end
+    end
+  end
+end

data/app/actors/geo_concerns/actors/file_set_actor.rb

@@ -0,0 +1,9 @@
+module GeoConcerns
+  module Actors
+    class FileSetActor < CurationConcerns::Actors::FileSetActor
+      def file_actor_class
+        ::GeoConcerns::Actors::FileActor
+      end
+    end
+  end
+end

data/app/controllers/concerns/geo_concerns/file_sets_controller_behavior.rb

@@ -3,17 +3,18 @@ module GeoConcerns
     extend ActiveSupport::Concern
     included do
       self.show_presenter = ::FileSetPresenter
+      self.form_class = CurationConcerns::Forms::FileSetEditForm
     end
 
     # inject mime_type into permitted params
     def file_set_params
       super.tap do |permitted_params|
-        permitted_params[:mime_type] = params[:file_set][:mime_type]
+        permitted_params[:geo_mime_type] = params[:file_set][:geo_mime_type]
       end
     end
 
     def actor
-      @actor ||= GeoConcerns::FileSetActor.new(@file_set, current_user)
+      @actor ||= GeoConcerns::Actors::FileSetActor.new(@file_set, current_user)
     end
   end
 end

data/app/helpers/geo_concerns/bounding_box_helper.rb

@@ -0,0 +1,26 @@
+module GeoConcerns
+  module BoundingBoxHelper
+    ##
+    # Builds HTML string for bounding box selector tool.
+    # Calls boundingBoxSelector javascript function and
+    # passes the id of the location input element that it binds to.
+    # @param [Symbol] name of property that holds bounding box string
+    # @return[String]
+    def bbox(property)
+      %(
+        <div id='bbox'></div>
+        <script>
+          boundingBoxSelector({inputId: #{bbox_input_id(property)}});
+        </script>
+      ).html_safe
+    end
+
+    ##
+    # Returns id of location input that is bound to bbox selector.
+    # @param [Symbol] name of property that holds bounding box string
+    # @return[String] id of location input element
+    def bbox_input_id(property)
+      "#{curation_concern.class.name.underscore}_#{property}"
+    end
+  end
+end

data/app/helpers/geo_concerns/geo_works_helper.rb

@@ -0,0 +1,22 @@
+module GeoConcerns
+  module GeoWorksHelper
+    # Returns human readable name of child geo work type.
+    # @param [GeoConcernsShowPresenter] geo work show presenter
+    # @return[String]
+    def child_geo_works_type(presenter)
+      case presenter.class.to_s
+      when 'GeoConcerns::ImageWorkShowPresenter'
+        'Raster'
+      when 'GeoConcerns::RasterWorkShowPresenter'
+        'Vector'
+      end
+    end
+
+    # Returns human readable name of geo work type.
+    # @param [GeoConcernsShowPresenter] geo work show presenter
+    # @return[String]
+    def geo_work_type(presenter)
+      presenter.human_readable_type.sub('Work', '')
+    end
+  end
+end

data/app/models/concerns/geo_concerns/external_metadata_file_behavior.rb

@@ -25,7 +25,7 @@ module GeoConcerns
     end
 
     def schema
-      (MetadataFormatService.label(mime_type) || '').parameterize('_')
+      (MetadataFormatService.label(geo_mime_type) || '').parameterize('_')
     end
   end
 end

data/app/models/concerns/geo_concerns/file_set/derivatives.rb

@@ -4,7 +4,7 @@ module GeoConcerns
       extend ActiveSupport::Concern
 
       def create_derivatives(filename)
-        case mime_type
+        case geo_mime_type
         when *ImageFormatService.select_options.map(&:last)
           image_derivatives(filename)
         when *RasterFormatService.select_options.map(&:last)
@@ -26,11 +26,11 @@ module GeoConcerns
 
       def raster_derivatives(filename)
         GeoConcerns::Runners::RasterDerivatives
-          .create(filename, outputs: [{ input_format: mime_type,
+          .create(filename, outputs: [{ input_format: geo_mime_type,
                                         label: :display_raster,
                                         format: 'tif',
                                         url: derivative_url('display_raster') },
-                                      { input_format: mime_type,
+                                      { input_format: geo_mime_type,
                                         label: :thumbnail,
                                         format: 'jpg',
                                         size: '200x150',
@@ -39,11 +39,11 @@ module GeoConcerns
 
       def vector_derivatives(filename)
         GeoConcerns::Runners::VectorDerivatives
-          .create(filename, outputs: [{ input_format: mime_type,
+          .create(filename, outputs: [{ input_format: geo_mime_type,
                                         label: :display_vector,
                                         format: 'zip',
                                         url: derivative_url('display_vector') },
-                                      { input_format: mime_type,
+                                      { input_format: geo_mime_type,
                                         label: :thumbnail,
                                         format: 'jpg',
                                         size: '200x150',

data/app/models/concerns/geo_concerns/file_set_metadata.rb

@@ -0,0 +1,15 @@
+module GeoConcerns
+  # Attributes and methods for basic geospatial metadata used by Works
+  module FileSetMetadata
+    extend ActiveSupport::Concern
+
+    included do
+      apply_schema ::GeoConcerns::FileSetMetadataRequired,
+                   ActiveFedora::SchemaIndexingStrategy.new(
+                     ActiveFedora::Indexers::GlobalIndexer.new(
+                       [:stored_searchable, :symbol]
+                     )
+                   )
+    end
+  end
+end

data/app/models/concerns/geo_concerns/geo_file_format_behavior.rb

@@ -3,19 +3,19 @@ module GeoConcerns
     extend ActiveSupport::Concern
 
     def image_file?
-      ImageFormatService.include?(mime_type)
+      ImageFormatService.include?(geo_mime_type)
     end
 
     def raster_file?
-      RasterFormatService.include?(mime_type)
+      RasterFormatService.include?(geo_mime_type)
     end
 
     def vector_file?
-      VectorFormatService.include?(mime_type)
+      VectorFormatService.include?(geo_mime_type)
     end
 
     def external_metadata_file?
-      MetadataFormatService.include?(mime_type)
+      MetadataFormatService.include?(geo_mime_type)
     end
 
     def geo_file_format?

data/app/models/concerns/geo_concerns/geo_file_set_behavior.rb

@@ -6,6 +6,7 @@ module GeoConcerns
     include ::GeoConcerns::RasterFileBehavior
     include ::GeoConcerns::VectorFileBehavior
     include ::GeoConcerns::ExternalMetadataFileBehavior
+    include ::GeoConcerns::FileSetMetadata
     include ::GeoConcerns::FileSet::Derivatives
   end
 end

data/app/presenters/geo_concerns/geo_concerns_show_presenter.rb

@@ -2,26 +2,25 @@ module GeoConcerns
   class GeoConcernsShowPresenter < CurationConcerns::WorkShowPresenter
     delegate :has?, :first, to: :solr_document
     delegate :spatial, :temporal, :issued, :coverage, :provenance, to: :solr_document
+    class_attribute :file_format_service
 
-    def members(presenter)
-      # TODO: member ids appear twice in member_ids_ssim.
-      # Figure out why instead of removing duplicates.
-      ids = solr_document.fetch('member_ids_ssim', [])
-      CurationConcerns::PresenterFactory.build_presenters(ids.uniq,
-                                                          presenter,
-                                                          current_ability)
+    def geo_file_set_presenters
+      # filter for geo file sets
+      file_set_presenters.select do |member|
+        file_format_service.include? member.solr_document[:geo_mime_type_tesim][0]
+      end
     end
 
-    def external_metadata_file_formats_presenters
+    def external_metadata_file_set_presenters
       # filter for external metadata files
-      members(::FileSetPresenter).select do |member|
-        MetadataFormatService.include? member.solr_document[:mime_type_ssi]
+      file_set_presenters.select do |member|
+        MetadataFormatService.include? member.solr_document[:geo_mime_type_tesim][0]
       end
     end
 
     def attribute_to_html(field, options = {})
       if field == :coverage
-        ::CoverageRenderer.new(field, send(field), options).render
+        GeoConcerns::CoverageRenderer.new(field, send(field), options).render
       else
         super field, options
       end

data/app/presenters/geo_concerns/image_work_show_presenter.rb

@@ -1,18 +1,6 @@
 module GeoConcerns
   class ImageWorkShowPresenter < GeoConcernsShowPresenter
-    def raster_work_presenters
-      # filter for raster works
-      members(::GeoConcerns::RasterWorkShowPresenter).select do |member|
-        format = member.solr_document[:has_model_ssim]
-        format ? format.first == 'RasterWork' : false
-      end
-    end
-
-    def image_file_presenters
-      # filter for image files
-      members(::FileSetPresenter).select do |member|
-        ImageFormatService.include? member.solr_document[:mime_type_ssi]
-      end
-    end
+    self.work_presenter_class = ::GeoConcerns::RasterWorkShowPresenter
+    self.file_format_service = ImageFormatService
   end
 end

data/app/presenters/geo_concerns/raster_work_show_presenter.rb

@@ -1,18 +1,6 @@
 module GeoConcerns
   class RasterWorkShowPresenter < GeoConcernsShowPresenter
-    def vector_work_presenters
-      # filter for vector works
-      members(::GeoConcerns::VectorWorkShowPresenter).select do |member|
-        format = member.solr_document[:has_model_ssim]
-        format ? format.first == 'VectorWork' : false
-      end
-    end
-
-    def raster_file_presenters
-      # filter for raster files
-      members(::FileSetPresenter).select do |member|
-        RasterFormatService.include? member.solr_document[:mime_type_ssi]
-      end
-    end
+    self.work_presenter_class = ::GeoConcerns::VectorWorkShowPresenter
+    self.file_format_service = RasterFormatService
   end
 end

data/app/presenters/geo_concerns/vector_work_show_presenter.rb

@@ -1,10 +1,5 @@
 module GeoConcerns
   class VectorWorkShowPresenter < GeoConcernsShowPresenter
-    def vector_file_presenters
-      # filter for vector files
-      members(::FileSetPresenter).select do |member|
-        VectorFormatService.include? member.solr_document[:mime_type_ssi]
-      end
-    end
+    self.file_format_service = VectorFormatService
   end
 end

data/app/renderers/geo_concerns/coverage_renderer.rb

@@ -0,0 +1,36 @@
+module GeoConcerns
+  class CoverageRenderer < CurationConcerns::Renderers::AttributeRenderer
+    def render
+      coverage = values.first if values
+      return '' unless coverage
+      markup(coverage).html_safe
+    end
+
+    private
+
+      def markup(coverage)
+        markup = ''
+        markup << %(<tr><th>#{label}</th>\n<td id='accordion'><ul class='tabular'>)
+        markup << value(coverage)
+        markup << toggle_button
+        markup << map(coverage)
+        markup << %(</ul></td></tr>)
+        markup
+      end
+
+      def value(coverage)
+        attributes = microdata_object_attributes(field).merge(class: "attribute #{field}")
+        %(<li#{html_attributes(attributes)}>#{attribute_value_to_html(coverage.to_s)})
+      end
+
+      def toggle_button
+        %( <a data-toggle='collapse' data-parent='accordion' href='#bbox' class='btn btn-default'>
+           Toggle Map</a>)
+      end
+
+      def map(coverage)
+        %(<div id='bbox' class='collapse in'></div>
+          <script>boundingBoxSelector({coverage: '#{coverage}', readonly: true});</script>)
+      end
+  end
+end

data/app/schemas/geo_concerns/file_set_metadata_required.rb

@@ -0,0 +1,5 @@
+module GeoConcerns
+  class FileSetMetadataRequired < ActiveTriples::Schema
+    property :geo_mime_type, predicate: RDF::Vocab::EBUCore.hasMimeType, multiple: false
+  end
+end

data/app/views/curation_concerns/file_sets/_form.html.erb

@@ -24,7 +24,7 @@
               VectorFormatService.select_options
             end %>
           <% if select_options %>
-           <%= f.input(:mime_type, as: :select, collection: select_options,
+           <%= f.input(:geo_mime_type, as: :select, collection: select_options,
                 input_html: { class: 'form-control' }, label: 'Type') %>
           <% end %>
           <%= f.input :files, as: :multifile %>

data/app/views/curation_concerns/image_works/show.html.erb

@@ -9,9 +9,8 @@
 <%= render 'representative_media', presenter: @presenter %>
 <%= render 'geo_concerns/attributes', presenter: @presenter %>
 
-<%= render 'related_image_files', presenter: @presenter %>
+<%= render 'geo_concerns/related_geo_files', presenter: @presenter %>
 <%= render 'geo_concerns/related_external_metadata_files', presenter: @presenter %>
-
-<%= render 'members', presenter: @presenter %>
+<%= render 'geo_concerns/related_geo_works', presenter: @presenter %>
 
 <%= render "show_actions", collector: collector, editor: editor%>

data/app/views/curation_concerns/raster_works/show.html.erb

@@ -9,9 +9,8 @@
 <%= render 'representative_media', presenter: @presenter %>
 <%= render 'geo_concerns/attributes', presenter: @presenter %>
 
-<%= render 'related_raster_files', presenter: @presenter %>
+<%= render 'geo_concerns/related_geo_files', presenter: @presenter %>
 <%= render 'geo_concerns/related_external_metadata_files', presenter: @presenter %>
-
-<%= render 'members', presenter: @presenter %>
+<%= render 'geo_concerns/related_geo_works', presenter: @presenter %>
 
 <%= render "show_actions", collector: collector, editor: editor%>

data/app/views/curation_concerns/vector_works/show.html.erb

@@ -9,7 +9,8 @@
 <%= render 'representative_media', presenter: @presenter %>
 <%= render 'geo_concerns/attributes', presenter: @presenter %>
 
-<%= render 'related_vector_files', presenter: @presenter %>
+<%= render 'geo_concerns/related_geo_files', presenter: @presenter %>
 <%= render 'geo_concerns/related_external_metadata_files', presenter: @presenter %>
+<%= render 'geo_concerns/related_geo_works', presenter: @presenter %>
 
 <%= render "show_actions", collector: collector, editor: editor%>

data/app/views/geo_concerns/_related_external_metadata_files.html.erb

@@ -1,4 +1,4 @@
-<% if presenter.external_metadata_file_formats_presenters.present? %>
+<% if presenter.external_metadata_file_set_presenters.present? %>
 <div class="panel panel-default related_files">
   <div class="panel-heading">
     <h2>Metadata Files</h2>
@@ -14,7 +14,7 @@
       </tr>
     </thead>
     <tbody>
-      <%= render partial: 'member', collection: presenter.external_metadata_file_formats_presenters %>
+      <%= render partial: 'member', collection: presenter.external_metadata_file_set_presenters %>
     </tbody>
   </table>
 </div>

data/app/views/{curation_concerns/image_works/_related_image_files.html.erb → geo_concerns/_related_geo_files.html.erb}

@@ -1,7 +1,7 @@
-<% if presenter.image_file_presenters.present? %>
+<% if presenter.geo_file_set_presenters.present? %>
 <div class="panel panel-default related_files">
   <div class="panel-heading">
-    <h2>Image File</h2>
+    <h2><%= geo_work_type(presenter) %> File</h2>
   </div>
   <table class="table table-striped">
     <thead>
@@ -14,11 +14,11 @@
       </tr>
     </thead>
     <tbody>
-      <%= render partial: 'member', collection: @presenter.image_file_presenters %>
+      <%= render partial: 'member', collection: @presenter.geo_file_set_presenters %>
     </tbody>
   </table>
 </div>
 <% elsif can? :edit, presenter.id %>
-  <h2>Image File</h2>
-  <p class="center"><em>This <%= presenter.human_readable_type %> doesn't have an image file associated with it. You can add one using the "Attach a File" button below.</em></p>
+  <h2><%= geo_work_type(presenter) %> File</h2>
+  <p class="center"><em>This <%= presenter.human_readable_type %> doesn't have an <%= geo_work_type(presenter).downcase %> file associated with it.</em></p>
 <% end %>