geo_concerns 0.0.10 → 0.1.0

data/app/processors/geo_concerns/processors/vector.rb

@@ -1,10 +1,23 @@
 module GeoConcerns
   module Processors
     module Vector
-      extend ActiveSupport::Autoload
+      class Processor < Hydra::Derivatives::Processors::Processor
+        def process
+          vector_processor_class.new(source_path,
+                                     directives,
+                                     output_file_service: output_file_service).process
+        end
 
-      eager_autoload do
-        autoload :Processor
+        # Returns a vector processor class based on mime type passed in the directives object.
+        # @return vector processing class
+        def vector_processor_class
+          case directives.fetch(:input_format)
+          when 'application/zip; ogr-format="ESRI Shapefile"'
+            GeoConcerns::Processors::Vector::Shapefile
+          else
+            GeoConcerns::Processors::Vector::Base
+          end
+        end
       end
     end
   end

data/app/processors/geo_concerns/processors/vector/base.rb

@@ -4,9 +4,10 @@ module GeoConcerns
       class Base < Hydra::Derivatives::Processors::Processor
         include Hydra::Derivatives::Processors::ShellBasedProcessor
         include GeoConcerns::Processors::BaseGeoProcessor
+        include GeoConcerns::Processors::Image
         include GeoConcerns::Processors::Ogr
         include GeoConcerns::Processors::Gdal
-        include GeoConcerns::Processors::Mapnik
+        include GeoConcerns::Processors::Rendering
         include GeoConcerns::Processors::Zip
 
         def self.encode(path, options, output_file)
@@ -21,7 +22,7 @@ module GeoConcerns
         # Set of commands to run to encode the vector thumbnail.
         # @return [Array] set of command name symbols
         def self.encode_queue
-          [:reproject, :mapnik_vector_thumbnail]
+          [:reproject, :vector_thumbnail, :trim, :center]
         end
 
         # Set of commands to run to reproject the vector.

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

@@ -27,13 +27,19 @@ module GeoConcerns
           @geom = vector_geom
         end
 
+        # Returns vector bounds
+        # @return [String] bounds
+        def bounds
+          @bounds = vector_bounds
+        end
+
         private
 
           # Runs the ogrinfo command and returns the result as a string.
           # @param path [String] path to vector file or shapefile directory
           # @return [String] output of ogrinfo
           def ogrinfo(path)
-            stdout, _stderr, _status = Open3.capture3("ogrinfo #{path}")
+            stdout, _stderr, _status = Open3.capture3("ogrinfo -ro -so -al #{path}")
             stdout
           end
 
@@ -41,7 +47,7 @@ module GeoConcerns
           # the vector dataset name.
           # @return [String] vector dataset name
           def vector_name
-            match = /(?<=\d:\s).*?((?=\s)|($))/.match(doc)
+            match = /(?<=Layer name:\s).*?(?=\n)/.match(doc)
             match ? match[0] : ''
           end
 
@@ -57,9 +63,21 @@ module GeoConcerns
           # the vector geometry type.
           # @return [String] vector geom
           def vector_geom
-            match = /(?<=\().*?(?=\))/.match(doc)
+            match = /(?<=Geometry:\s).*?(?=\n)/.match(doc)
             match ? match[0] : ''
           end
+
+          # Given an output string from the ogrinfo command, returns
+          # the vector bounding box.
+          # @return [Hash] vector bounds
+          def vector_bounds
+            match = /(?<=Extent:\s).*?(?=\n)/.match(doc)
+            extent = match ? match[0] : ''
+
+            # remove parens and spaces, split into array, and assign elements to variables
+            w, s, e, n = extent.delete(' ').gsub(')-(', ',').delete('(').delete(')').split(',')
+            { north: n.to_f, east: e.to_f, south: s.to_f, west: w.to_f }
+          end
       end
     end
   end

data/app/services/geo_concerns/delivery/geoserver.rb

@@ -27,6 +27,8 @@ module GeoConcerns
         when :raster
           publish_raster
         end
+      rescue StandardError => e
+        Rails.logger.error("GeoServer delivery job failed with: #{e}")
       end
 
       private
@@ -62,19 +64,54 @@ module GeoConcerns
         end
 
         def datastore
-          RGeoServer::DataStore.new catalog, workspace: workspace, name: file_set.id
+          @datastore ||= RGeoServer::DataStore.new catalog, workspace: workspace,
+                                                            name: file_set.id
         end
 
-        def publish_vector
-          datastore.upload_file file_path, publish: true
+        def coveragestore
+          @coveragestore ||= RGeoServer::CoverageStore.new catalog, workspace: workspace,
+                                                                    name: file_set.id
         end
 
-        def coveragestore
-          RGeoServer::CoverageStore.new catalog, workspace: workspace, name: file_set.id
+        def base_path(path)
+          path.gsub(CurationConcerns.config.derivatives_path, '')
+        end
+
+        def persist_coveragestore
+          url = "file:///#{@config[:derivatives_path]}#{base_path(file_path)}"
+          coveragestore.url = url
+          coveragestore.enabled = 'true'
+          coveragestore.data_type = 'GeoTIFF'
+          coveragestore.save
+        end
+
+        def persist_coverage
+          coverage = RGeoServer::Coverage.new catalog, workspace: workspace,
+                                                       coverage_store: coveragestore,
+                                                       name: coveragestore.name
+          coverage.title = coveragestore.name
+          coverage.metadata_links = []
+          coverage.save
+        end
+
+        def publish_vector
+          shapefile_dir = "#{File.dirname(file_path)}/shapefile"
+
+          # Delete existing shapefile
+          FileUtils.rm_rf(shapefile_dir)
+
+          # Unzip derivative shapefiles
+          system "unzip -o #{file_path} -d #{shapefile_dir}"
+
+          shape_path = Dir.glob("#{shapefile_dir}/*.shp").first
+          raise Errno::ENOENT, 'Shapefile not found' unless shape_path
+          url = "file:///#{@config[:derivatives_path]}#{base_path(shape_path)}"
+          datastore.upload_external url, publish: true
         end
 
         def publish_raster
-          coveragestore.upload file_path
+          persist_coveragestore
+          persist_coverage
         end
     end
   end

data/app/services/geo_concerns/discovery/abstract_document.rb

@@ -5,7 +5,8 @@ module GeoConcerns
                     :title, :description, :access_rights, :language, :issued,
                     :publisher, :slug, :solr_coverage, :layer_year,
                     :layer_modified, :geom_type, :format, :resource_type, :wxs_identifier,
-                    :dct_references, :fgdc, :iso19139, :mods, :download, :url, :thumbnail
+                    :dct_references, :fgdc, :iso19139, :mods, :download, :url, :thumbnail,
+                    :wxs_identifier, :wms_path, :wfs_path
 
       # Cleans the document hash by removing unused fields.
       # @param [Hash] document hash

data/app/services/geo_concerns/discovery/document_builder.rb

@@ -4,17 +4,16 @@ module GeoConcerns
       attr_reader :geo_concern, :document
       delegate :to_json, :to_xml, :to_hash, to: :document
 
-      def initialize(geo_concern, document, ssl: false)
+      def initialize(geo_concern, document)
         @geo_concern = geo_concern
         @document = document
-        @ssl = ssl
         builders.build(document)
       end
 
       # Returns a document path object. Used to get urls for links in the document.
       # @return [DocumentPath] geoblacklight document as a json string
       def root_path
-        @root_path ||= DocumentPath.new(geo_concern, ssl: @ssl)
+        @root_path ||= DocumentPath.new(geo_concern)
       end
 
       # Instantiates a CompositeBuilder object with an array of

data/app/services/geo_concerns/discovery/document_builder/basic_metadata_builder.rb

@@ -1,3 +1,6 @@
+##
+# Workaround for setting the identifier in the geoblacklight document
+# Remove once
 module GeoConcerns
   module Discovery
     class DocumentBuilder
@@ -35,13 +38,21 @@ module GeoConcerns
           # Builds more complex metadata attributes.
           # @param [AbstractDocument] discovery document
           def build_complex_attributes(document)
-            document.identifier = URI.join(I18n.t('geo_concerns.institution.uri'),
-                                           geo_concern.id).to_s
+            document.identifier = identifier
             document.description = description
             document.access_rights = geo_concern.solr_document.visibility
             document.slug = slug
           end
 
+          # Returns the work indentifier. This is (usually) different from the hydra/fedora work id.
+          # The identifier might be an ARK, DOI, PURL, etc.
+          # If identifier is not set, the work id is used.
+          # @return [String] identifier
+          def identifier
+            indentifiers = geo_concern.identifier
+            indentifiers.empty? ? geo_concern.id : indentifiers.first
+          end
+
           # Returns the work description. If none is available,
           # a basic description is created.
           # @return [String] description

data/app/services/geo_concerns/discovery/document_builder/date_builder.rb

@@ -25,6 +25,8 @@ module GeoConcerns
             date = geo_concern.temporal.first
             year = date.match(/(?<=\D|^)(\d{4})(?=\D|$)/)
             year ? year[0].to_i : nil
+          rescue
+            ''
           end
 
           # Returns the date the work was modified.

data/app/services/geo_concerns/discovery/document_builder/document_path.rb

@@ -2,23 +2,22 @@ module GeoConcerns
   module Discovery
     class DocumentBuilder
       class DocumentPath
-        attr_reader :geo_concern, :ssl
-        def initialize(geo_concern, ssl: false)
+        attr_reader :geo_concern
+        def initialize(geo_concern)
           @geo_concern = geo_concern
-          @ssl = ssl
         end
 
         # Returns url for geo concern show page.
         # @return [String] geo concern show page url
         def to_s
-          helper.polymorphic_url(geo_concern, protocol: protocol)
+          helper.polymorphic_url(geo_concern, host: host, protocol: protocol)
         end
 
         # Returns url for downloading the original file.
         # @return [String] original file download url
         def file_download
           return unless file_set
-          helper.download_url(file_set, protocol: protocol)
+          helper.download_url(file_set, host: host, protocol: protocol)
         end
 
         # Returns url for downloading the metadata file.
@@ -26,7 +25,7 @@ module GeoConcerns
         # @return [String] metadata download url
         def metadata_download(format)
           return unless metadata_file_set
-          path = helper.download_url(metadata_file_set, protocol: protocol)
+          path = helper.download_url(metadata_file_set, host: host, protocol: protocol)
           mime_type = metadata_file_set.solr_document[:geo_mime_type_ssim].first
           path if MetadataFormatService.label(mime_type) == format
         end
@@ -64,7 +63,7 @@ module GeoConcerns
           # Indicates if the ssl is enabled.
           # @return [Boolean] use ssl
           def ssl?
-            @ssl == true
+            geo_concern.request.protocol == 'https://'
           end
 
           # Returns protocol to use in url. Depends on ssl status.
@@ -76,6 +75,12 @@ module GeoConcerns
               :http
             end
           end
+
+          # Returns hostname (with port) to use in url.
+          # @return [String] hostname
+          def host
+            geo_concern.request.host_with_port
+          end
       end
     end
   end

data/app/services/geo_concerns/discovery/document_builder/references_builder.rb

@@ -33,12 +33,27 @@ module GeoConcerns
             document.download = download
             document.url = url
             document.thumbnail = thumbnail
+            document.wxs_identifier = wxs_identifier
+            document.wms_path = wms_path
+            document.wfs_path = wfs_path
           end
 
           # Returns the identifier to use with WMS/WFS/WCS services.
           # @return [String] wxs indentifier
           def wxs_identifier
-            geo_concern.id
+            wxs.identifier
+          end
+
+          # Returns the wms server url.
+          # @return [String] wms server url
+          def wms_path
+            wxs.wms_path
+          end
+
+          # Returns the wfs server url.
+          # @return [String] wfs server url
+          def wfs_path
+            wxs.wfs_path
           end
 
           # Returns a url to access further descriptive information.
@@ -76,6 +91,10 @@ module GeoConcerns
           def thumbnail
             path.thumbnail
           end
+
+          def wxs
+            @wxs ||= Wxs.new(geo_concern)
+          end
       end
     end
   end

data/app/services/geo_concerns/discovery/document_builder/spatial_builder.rb

@@ -28,6 +28,8 @@ module GeoConcerns
           # @return [String] coverage in solr format
           def to_solr
             "ENVELOPE(#{coverage.w}, #{coverage.e}, #{coverage.n}, #{coverage.s})"
+          rescue
+            ''
           end
       end
     end

data/app/services/geo_concerns/discovery/document_builder/wxs.rb

@@ -0,0 +1,81 @@
+module GeoConcerns
+  module Discovery
+    class DocumentBuilder
+      class Wxs
+        attr_reader :geo_concern
+        def initialize(geo_concern)
+          @geo_concern = geo_concern
+          @config = fetch_config
+        end
+
+        # Returns the identifier to use with WMS/WFS/WCS services.
+        # @return [String] wxs indentifier
+        def identifier
+          return unless geo_file_set?
+          return file_set.id unless @config && visibility
+          "#{@config[:workspace]}:#{file_set.id}" if @config[:workspace]
+        end
+
+        # Returns the wms server url.
+        # @return [String] wms server url
+        def wms_path
+          return unless @config && visibility && geo_file_set?
+          "#{path}/#{@config[:workspace]}/wms"
+        end
+
+        # Returns the wfs server url.
+        # @return [String] wfs server url
+        def wfs_path
+          return unless @config && visibility && geo_file_set?
+          "#{path}/#{@config[:workspace]}/wfs"
+        end
+
+        private
+
+          # Fetch the geoserver configuration.
+          # @return [Hash] geoserver configuration
+          def fetch_config
+            data = ERB.new(File.read(Rails.root.join('config', 'geoserver.yml'))).result
+            YAML.load(data)['geoserver'][visibility].with_indifferent_access if visibility
+          end
+
+          # Gets the representative file set.
+          # @return [FileSet] representative file set
+          def file_set
+            @file_set ||= begin
+              representative_id = geo_concern.solr_document.representative_id
+              file_set_id = [representative_id]
+              geo_concern.member_presenters(file_set_id).first
+            end
+          end
+
+          # Tests if the file set is a geo file set.
+          # @return [Bool]
+          def geo_file_set?
+            return false unless file_set
+            @file_set_ids ||= geo_concern.geo_file_set_presenters.map(&:id)
+            @file_set_ids.include? file_set.id
+          end
+
+          # Returns the file set visibility if it's open and authenticated.
+          # @return [String] file set visibility
+          def visibility
+            return unless file_set
+            visibility = file_set.solr_document.visibility
+            visibility if valid_visibilities.include? visibility
+          end
+
+          def valid_visibilities
+            [Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
+             Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED]
+          end
+
+          # Geoserver base url.
+          # @return [String] geoserver base url
+          def path
+            @config[:url].chomp('/rest')
+          end
+      end
+    end
+  end
+end

data/app/services/geo_concerns/discovery/geoblacklight_document.rb

@@ -13,6 +13,7 @@ module GeoConcerns
       # @param _args [Array<Object>] arguments needed for the renderer, unused here
       # @return [Hash] geoblacklight document as a hash
       def to_hash(_args = nil)
+        return {} unless rights
         document
       end
 
@@ -20,6 +21,7 @@ module GeoConcerns
       # @param _args [Array<Object>] arguments needed for the json renderer, unused here
       # @return [String] geoblacklight document as a json string
       def to_json(_args = nil)
+        return '{}' unless rights
         document.to_json
       end
 
@@ -36,6 +38,7 @@ module GeoConcerns
             geoblacklight_version: '1.0',
             dc_identifier_s: identifier,
             layer_slug_s: slug,
+            uuid: slug,
             dc_title_s: title.first,
             solr_geom: solr_coverage,
             dct_provenance_s: provenance,
@@ -73,16 +76,19 @@ module GeoConcerns
             'http://www.isotc211.org/schemas/2005/gmd/' => iso19139,
             'http://www.loc.gov/mods/v3' => mods,
             'http://schema.org/downloadUrl' => download,
-            'http://schema.org/thumbnailUrl' => thumbnail
+            'http://schema.org/thumbnailUrl' => thumbnail,
+            'http://www.opengis.net/def/serviceType/ogc/wms' => wms_path,
+            'http://www.opengis.net/def/serviceType/ogc/wfs' => wfs_path
           }
         end
 
         # Returns the geoblacklight rights field based on work visibility.
         # @return [String] geoblacklight access rights
         def rights
-          if access_rights == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+          case access_rights
+          when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
             'Public'
-          else
+          when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
             'Restricted'
           end
         end