geo_concerns 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7a2c566517e2692c326da44ff6ac325a8605e91
-  data.tar.gz: 19af506201f28b351939901a46fb02dd599c6ff7
+  metadata.gz: d62f2f9412e6303a2245195a93b9d18b15c19461
+  data.tar.gz: 0e2cb97544d7aa1ace8c595f89637833bb00d860
 SHA512:
-  metadata.gz: 07c9520851640a1241417a758dea76fc4bc284e1463ee62d39b14de0b6bc675bf1e8063843b31d8a4d9ef664d094eb903a3758fc5b02ac68e744847586382cf5
-  data.tar.gz: 6d097f13341e4f4d5350bf89f6dba9f9eaff1a6808c5229b1a4993e4c6cea48244368e3d82fc6bf39211e2c0b382a5daa5f928d545e14f323ca3cc032e2a451c
+  metadata.gz: a0fa7ca52d44573c6bce5021977bc0502c87ebd125cf4f20b1725203ee761494b528ed7a7d196a284d8df1388b7b76af20685a0e6e59b399663bb13132632a27
+  data.tar.gz: 94b8701dcd59dcfc1160ddb11e9cbae5a03da1e925305b61eb9c90473904000984012c5d6edb74cebd30cfe1c0f0b2390f84ecbca02c4c0dbad17f44d201cf92

data/.rubocop.yml

@@ -49,6 +49,7 @@ Metrics/MethodLength:
   Exclude:
     - 'Rakefile'
     - 'app/models/concerns/geo_concerns/extractors/iso19139_helper.rb'
+    - 'app/models/concerns/geo_concerns/file_set/derivatives.rb'
 
 Metrics/ClassLength:
   Exclude:

data/.travis.yml

@@ -8,16 +8,17 @@ jdk:
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - MAPNIK_VERSION="2.3"
   matrix:
     - RAILS_VERSION=4.2.7.1
       RDF_VERSION=1.99.1
     - RAILS_VERSION=5.0.0.1
       RDF_VERSION=2.1.0
 before_install:
- - sudo apt-add-repository --yes ppa:mapnik/nightly-${MAPNIK_VERSION}
- - sudo apt-get update -y
- - sudo apt-get -y install libmapnik=${MAPNIK_VERSION}* mapnik-utils=${MAPNIK_VERSION}* libmapnik-dev=${MAPNIK_VERSION}* mapnik-input-plugin*=${MAPNIK_VERSION}*
+ - git clone https://github.com/propublica/simple-tiles.git
+ - cd simple-tiles
+ - ./configure && make
+ - sudo make install
+ - cd ..
  - gem install bundler -v 1.13.1 # hopefully temporary
 install: bundle install --jobs=3 --retry=3
 before_script:
@@ -27,4 +28,7 @@ services:
 addons:
   apt:
     packages:
+    - libgdal-dev
     - gdal-bin
+    - libcairo2-dev
+    - libpango1.0-dev

data/README.md

@@ -23,18 +23,32 @@ Rails application for developing Hydra Geo models. Built around Curation Concern
     * On Ubuntu, use `sudo apt-get install gdal-bin`.
 1. [GeoServer](http://geoserver.org/) (Optional)
 
-## Mapnik
+## Simple Tiles
 
-GeoConcerns requires that Mapnik 3.x or 2.x be installed at `/usr/local/lib/libmapnik.*`. For linux, a C++ compiler and build environment is also needed.
+GeoConcerns requires the image generation library [Simple Tiles](http://propublica.github.io/simple-tiles/).
 
 Mac OS X:
 
-- https://github.com/mapnik/mapnik/wiki/MacInstallation or ```brew install mapnik```
+- Install via Homebrew: ```brew install simple-tiles```
 
 Linux:
 
-- https://github.com/mapnik/mapnik/wiki/LinuxInstallation
-- Build environment: [gcc](https://help.ubuntu.com/community/InstallingCompilers) or clang 
+- Install dependencies:
+
+  ```
+  libgdal-dev
+  libcairo2-dev
+  libpango1.0-dev 
+  ```
+
+- Compile:
+	
+  ```
+  $ git clone git@github.com:propublica/simple-tiles.git
+  $ cd simple-tiles
+  $ ./configure
+  $ make && make install
+  ```
 
 ## Installation
 
@@ -49,8 +63,9 @@ $ rake hydra:server
 Add GeoConcerns models to an existing CurationConcerns application:
 
 1. Add `gem 'geo_concerns'` to your Gemfile.
-2. `bundle install`
-3. `rails generate geo_concerns:install`
+1. `bundle install`
+1. `rails generate curation_concerns:install`
+1. `rails generate geo_concerns:install -f`
 
 ## Development
 
@@ -122,4 +137,4 @@ rspec spec/path/to/your_spec.rb:linenumber
 	$ cd geoserver-vagrant/
 	$ vagrant up
 	
-	```
+	```

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

@@ -0,0 +1,29 @@
+module GeoConcerns
+  module MessengerBehavior
+    extend ActiveSupport::Concern
+
+    def destroy
+      messenger.record_deleted(geo_concern)
+      super
+    end
+
+    def after_create_response
+      super
+      messenger.record_created(geo_concern)
+    end
+
+    def after_update_response
+      super
+      messenger.record_updated(geo_concern)
+    end
+
+    def messenger
+      @messenger ||= Messaging.messenger
+    end
+
+    def geo_concern
+      doc = SolrDocument.new(curation_concern.to_solr)
+      show_presenter.new(doc, current_ability, request)
+    end
+  end
+end

data/app/jobs/delivery_job.rb

@@ -10,9 +10,22 @@ class DeliveryJob < ActiveJob::Base
   # Precondition is that all derivatives are created and saved.
   # @param [FileSet] file_set
   # @param [String] content_url contains the display copy to deliver
-  def perform(file_set, content_url)
-    uri = URI.parse(content_url)
+  def perform(message)
+    file_set = ActiveFedora::Base.find(message['id'])
+    uri = URI.parse(content_url(file_set))
+    raise NotImplementedError, 'Only supports vector and raster file formats' if uri.path == ''
     raise NotImplementedError, 'Only supports file URLs' unless uri.scheme == 'file'
     GeoConcerns::DeliveryService.new(file_set, uri.path).publish
   end
+
+  def content_url(file_set)
+    case file_set.geo_mime_type
+    when *GeoConcerns::RasterFormatService.select_options.map(&:last)
+      return file_set.send(:derivative_url, 'display_raster')
+    when *GeoConcerns::VectorFormatService.select_options.map(&:last)
+      return file_set.send(:derivative_url, 'display_vector')
+    else
+      return ''
+    end
+  end
 end

data/app/jobs/geoblacklight_job.rb

@@ -0,0 +1,10 @@
+require 'uri'
+
+# Loads geoblacklight
+class GeoblacklightJob < ActiveJob::Base
+  queue_as :default
+
+  def perform(message)
+    GeoblacklightMessaging::GeoblacklightEventProcessor.new(message).process
+  end
+end

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

@@ -3,31 +3,25 @@ module GeoConcerns
     module Derivatives
       extend ActiveSupport::Concern
 
-      # rubocop:disable Metrics/MethodLength
       def create_derivatives(filename)
-        content_url = nil
         case geo_mime_type
         when *GeoConcerns::ImageFormatService.select_options.map(&:last)
           image_derivatives(filename)
         when *GeoConcerns::RasterFormatService.select_options.map(&:last)
           raster_derivatives(filename)
-          content_url = derivative_url('display_raster')
         when *GeoConcerns::VectorFormatService.select_options.map(&:last)
           vector_derivatives(filename)
-          content_url = derivative_url('display_vector')
         end
-
         super
 
-        # Once all the derivatives are created, we can run a job to
-        # deliver them to external services
-        DeliveryJob.perform_later(self, content_url) if content_url.present?
+        # Once all the derivatives are created, send a derivatives created message
+        messenger.derivatives_created(self)
       end
-      # rubocop:enable Metrics/MethodLength
 
       def image_derivatives(filename)
         Hydra::Derivatives::ImageDerivatives
           .create(filename, outputs: [{ label: :thumbnail,
+                                        id: id,
                                         format: 'png',
                                         size: '200x150>',
                                         url: derivative_url('thumbnail') }])
@@ -37,10 +31,12 @@ module GeoConcerns
         GeoConcerns::Runners::RasterDerivatives
           .create(filename, outputs: [{ input_format: geo_mime_type,
                                         label: :display_raster,
+                                        id: id,
                                         format: 'tif',
                                         url: derivative_url('display_raster') },
                                       { input_format: geo_mime_type,
                                         label: :thumbnail,
+                                        id: id,
                                         format: 'png',
                                         size: '200x150',
                                         url: derivative_url('thumbnail') }])
@@ -50,10 +46,12 @@ module GeoConcerns
         GeoConcerns::Runners::VectorDerivatives
           .create(filename, outputs: [{ input_format: geo_mime_type,
                                         label: :display_vector,
+                                        id: id,
                                         format: 'zip',
                                         url: derivative_url('display_vector') },
                                       { input_format: geo_mime_type,
                                         label: :thumbnail,
+                                        id: id,
                                         format: 'png',
                                         size: '200x150',
                                         url: derivative_url('thumbnail') }])
@@ -64,6 +62,10 @@ module GeoConcerns
         def derivative_path_factory
           GeoConcerns::DerivativePath
         end
+
+        def messenger
+          @messenger ||= Messaging.messenger
+        end
     end
   end
 end

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

@@ -37,5 +37,10 @@ module GeoConcerns
       dt = first(Solrizer.solr_name('system_modified', :stored_sortable, type: :date))
       dt.nil? ? nil : DateTime.parse(dt).utc
     end
+
+    # @return [Array<String>]
+    def identifier
+      fetch(Solrizer.solr_name('identifier'), [])
+    end
   end
 end

data/app/presenters/geo_concerns/geo_concerns_show_presenter.rb

@@ -1,7 +1,7 @@
 module GeoConcerns
   class GeoConcernsShowPresenter < CurationConcerns::WorkShowPresenter
     delegate :spatial, :temporal, :issued, :coverage, :provenance, :layer_modified,
-             to: :solr_document
+             :identifier, to: :solr_document
     class_attribute :file_format_service
 
     def geo_file_set_presenters

data/app/processors/geo_concerns/processors/base_geo_processor.rb

@@ -1,5 +1,3 @@
-require 'mini_magick'
-
 module GeoConcerns
   module Processors
     module BaseGeoProcessor
@@ -36,26 +34,6 @@ module GeoConcerns
           time = (Time.now.to_f * 1000).to_i
           "#{File.dirname(path)}/#{File.basename(path, File.extname(path))}_#{time}"
         end
-
-        # Uses imagemagick to resize an image and convert it to the output format.
-        # Keeps the aspect ratio of the original image and adds padding to
-        # to the output image. The file extension is the output format.
-        # @param in_path [String] file input path
-        # @param out_path [String] processor output file path.
-        # @param options [Hash] creation options
-        # @option options [String] `:output_size` as "w h" or "wxh"
-        def self.convert(in_path, out_path, options)
-          image = MiniMagick::Image.open(in_path) # copies image
-          image.combine_options do |i|
-            size = options[:output_size].tr(' ', 'x')
-            i.resize size
-            i.background 'white'
-            i.gravity 'center'
-            i.extent size
-          end
-          image.format File.extname(out_path).gsub(/^\./, '')
-          image.write(out_path)
-        end
       end
 
       def options_for(_format)
@@ -63,7 +41,8 @@ module GeoConcerns
           label: label,
           output_size: output_size,
           output_srid: output_srid,
-          basename: basename
+          basename: basename,
+          id: id
         }
       end
 
@@ -73,7 +52,7 @@ module GeoConcerns
         directives.fetch(:label, '')
       end
 
-      # Tranforms the size directive into a GDAL size parameter.
+      # Transforms the size directive into a GDAL size parameter.
       # @return [String] derivative size
       def output_size
         return unless directives[:size]
@@ -91,6 +70,12 @@ module GeoConcerns
       def basename
         File.basename(source_path, File.extname(source_path))
       end
+
+      # Gets the fileset id or returns nil.
+      # @return [String] fileset id
+      def id
+        directives.fetch(:id, nil)
+      end
     end
   end
 end

data/app/processors/geo_concerns/processors/image.rb

@@ -0,0 +1,59 @@
+require 'mini_magick'
+
+module GeoConcerns
+  module Processors
+    module Image
+      extend ActiveSupport::Concern
+      included do
+        # Uses imagemagick to resize an image and convert it to the output format.
+        # Keeps the aspect ratio of the original image and adds padding to
+        # to the output image. The file extension is the output format.
+        # @param in_path [String] file input path
+        # @param out_path [String] processor output file path.
+        # @param options [Hash] creation options
+        # @option options [String] `:output_size` as "w h" or "wxh"
+        def self.convert(in_path, out_path, options)
+          image = MiniMagick::Image.open(in_path) # copies image
+          image.combine_options do |i|
+            size = options[:output_size].tr(' ', 'x')
+            i.resize size
+            i.background 'white'
+            i.gravity 'center'
+            i.extent size
+          end
+          image.format File.extname(out_path).gsub(/^\./, '')
+          image.write(out_path)
+        end
+
+        # Trims extra whitespace.
+        # @param in_path [String] file input path
+        # @param out_path [String] processor output file path.
+        # @param options [Hash] creation options
+        def self.trim(in_path, out_path, _options)
+          MiniMagick::Tool::Convert.new do |convert|
+            convert << in_path
+            convert << "-trim"
+            convert << out_path
+          end
+        end
+
+        # Centers and pads image.
+        # @param in_path [String] file input path
+        # @param out_path [String] processor output file path.
+        # @param options [Hash] creation options
+        def self.center(in_path, out_path, options)
+          MiniMagick::Tool::Convert.new do |convert|
+            convert << "-size"
+            convert << options[:output_size].tr(' ', 'x')
+            convert << "xc:white"
+            convert << in_path
+            convert << "-gravity"
+            convert << "center"
+            convert << "-composite"
+            convert << out_path
+          end
+        end
+      end
+    end
+  end
+end

data/app/processors/geo_concerns/processors/ogr.rb

@@ -10,7 +10,7 @@ module GeoConcerns
         # #param options [Hash] creation options
         # @param out_path [String] processor output file path
         def self.reproject(in_path, out_path, options)
-          execute "env SHAPE_ENCODING= ogr2ogr -q -nln #{options[:basename]} -f 'ESRI Shapefile'"\
+          execute "env SHAPE_ENCODING= ogr2ogr -q -nln #{options[:id]} -f 'ESRI Shapefile'"\
                     " -t_srs #{options[:output_srid]} -preserve_fid '#{out_path}' '#{in_path}'"
         end
       end

data/app/processors/geo_concerns/processors/raster.rb

@@ -1,10 +1,25 @@
 module GeoConcerns
   module Processors
     module Raster
-      extend ActiveSupport::Autoload
+      class Processor < Hydra::Derivatives::Processors::Processor
+        def process
+          raster_processor_class.new(source_path,
+                                     directives,
+                                     output_file_service: output_file_service).process
+        end
 
-      eager_autoload do
-        autoload :Processor
+        # Returns a raster processor class based on mime type passed in the directives object.
+        # @return raster processing class
+        def raster_processor_class
+          case directives.fetch(:input_format)
+          when 'text/plain; gdal-format=USGSDEM'
+            GeoConcerns::Processors::Raster::Dem
+          when 'application/octet-stream; gdal-format=AIG'
+            GeoConcerns::Processors::Raster::Aig
+          else
+            GeoConcerns::Processors::Raster::Base
+          end
+        end
       end
     end
   end

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

@@ -4,6 +4,7 @@ module GeoConcerns
       class Base < Hydra::Derivatives::Processors::Processor
         include Hydra::Derivatives::Processors::ShellBasedProcessor
         include GeoConcerns::Processors::BaseGeoProcessor
+        include GeoConcerns::Processors::Image
         include GeoConcerns::Processors::Gdal
 
         def self.encode(path, options, output_file)

data/app/processors/geo_concerns/processors/rendering.rb

@@ -0,0 +1,79 @@
+require 'simpler_tiles'
+
+module GeoConcerns
+  module Processors
+    module Rendering
+      extend ActiveSupport::Concern
+      included do
+        # Renders a thumbnail from a vector dataset.
+        # @param in_path [String] file input path
+        # @param out_path [String] processor output file path
+        # @param options [Hash] creation options
+        def self.vector_thumbnail(in_path, out_path, options)
+          map = GeoConcerns::Processors::Rendering.simple_tiles_map(in_path, options)
+          File.open(out_path, 'wb') { |f| f.write map.to_png }
+        end
+      end
+
+      class << self
+        # Builds a simple tiles map from a shapefile.
+        # @param in_path [String] file input path
+        # @param options [Hash] creation
+        # @return [SimplerTiles::Map] simple tiles map
+        def simple_tiles_map(in_path, options)
+          assign_rendering_options(in_path, options)
+          size = rendering_size(options)
+          SimplerTiles::Map.new do |m|
+            m.srs     = 'EPSG:4326'
+            m.bgcolor = SimplerTiles.config.bg_color
+            m.width   = size[0]
+            m.height  = size[1]
+            m.set_bounds(*simple_tiles_bounds(options))
+            add_shapefile_layer(in_path, m)
+          end
+        end
+
+        private
+
+          # Adds a shapefile layer to a simple tiles map.
+          # @param in_path [String] file input path
+          # @param options [Hash] creation options
+          def add_shapefile_layer(in_path, map)
+            Dir.glob("#{in_path}/*.shp").each do |shp|
+              map.layer shp do |l|
+                l.query "select * from '#{File.basename shp, '.shp'}'" do |q|
+                  q.styles SimplerTiles.config.to_h
+                end
+              end
+            end
+          end
+
+          # Re-orders options bounds for use with a simple tiles map.
+          # @param options [Hash] creation options
+          # @return [Array] simple tiles map bounds
+          def simple_tiles_bounds(options)
+            [options[:bounds][:east],
+             options[:bounds][:north],
+             options[:bounds][:west],
+             options[:bounds][:south]]
+          end
+
+          # Transforms the size directive into an array.
+          # @param options [Hash] creation options
+          # @return [Array] derivative size
+          def rendering_size(options)
+            options[:output_size].split(' ').map(&:to_i)
+          end
+
+          # Assigns new values from the vector info command to the creation options hash.
+          # @param in_path [String] file input path
+          # @param options [Hash] creation options
+          def assign_rendering_options(in_path, options)
+            vector_info = GeoConcerns::Processors::Vector::Info.new(in_path)
+            options[:name] = vector_info.name
+            options[:bounds] = vector_info.bounds
+          end
+      end
+    end
+  end
+end