geo_concerns 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5860cade4910404ebfc81e6d1dcb6524ab1b2a88
-  data.tar.gz: cb1f2d4920984de204a0d04b06593c9d804abe02
+  metadata.gz: 11ccf6c23e362602390bfef2deccfa1a4db6bbf3
+  data.tar.gz: 9545ced09e1698ba1593290995281a664876e9be
 SHA512:
-  metadata.gz: d04edc92c51d7de7f69fadec0b189e244a92586773715646efebb7076421301ff8c3ee97cd95fceeb1b9a903683968f51815e5120c4ce7d3b0d8058453cce79e
-  data.tar.gz: b17861f0bc73e579ab4cf38614988c6909c033bbc66a03215399e0f6b71a360068ec8a39a53a4fb854c831707af2f654c8d765e58ff3e0051cbf4c70621de53c
+  metadata.gz: 1c56506cab52e2766131fd741694fd377bb6aba742415ac65f3431937220c14755258d03e0ee88e4bfbe14883ca894d28f0ed83e867c67c075938f7498ac39e6
+  data.tar.gz: 7d636601661854a5ac61772a5eb93e5925cca7cdccfa97c9adde6802f2d9fa54766075956712c64f7aaf76085e5230232bb61da2bd3598e7025744be6b2e3339

data/.travis.yml

@@ -1,14 +1,21 @@
 language: ruby
-# cache: bundler
-sudo: false
+sudo: true
 rvm:
   - 2.3.0
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  - MAPNIK_VERSION="2.3"
+before_install:
+ - sudo apt-add-repository --yes ppa:mapnik/nightly-${MAPNIK_VERSION}
+ - sudo apt-get update -y
+install:
+ - sudo apt-get -y install wget build-essential make libmapnik=${MAPNIK_VERSION}* mapnik-utils=${MAPNIK_VERSION}* libmapnik-dev=${MAPNIK_VERSION}* mapnik-input-plugin*=${MAPNIK_VERSION}*
 before_script:
   - jdk_switcher use oraclejdk8
   - gdalinfo --version
+  - gem install bundler -v 1.12.3
+  - bundle install
 services:
   - redis-server
 addons:

data/README.md

@@ -20,6 +20,19 @@ Rails application for developing Hydra Geo models. Built around Curation Concern
     * You can install it on Mac OSX with `brew install gdal`.
     * On Ubuntu, use `sudo apt-get install gdal-bin`.
 
+## Mapnik
+
+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.
+
+Mac OS X:
+
+- https://github.com/mapnik/mapnik/wiki/MacInstallation or ```brew install mapnik```
+
+Linux:
+
+- https://github.com/mapnik/mapnik/wiki/LinuxInstallation
+- Build environment: [gcc](https://help.ubuntu.com/community/InstallingCompilers) or clang 
+
 ## Installation
 
 Create and run a new GeoConcerns application from a template:

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

@@ -6,6 +6,15 @@ module GeoConcerns
       self.form_class = CurationConcerns::Forms::FileSetEditForm
     end
 
+    # Render geo file sets form if parent is a geo work
+    def new
+      if geo?
+        render 'geo_concerns/file_sets/new'
+      else
+        super
+      end
+    end
+
     # inject mime_type into permitted params
     def file_set_params
       super.tap do |permitted_params|
@@ -16,5 +25,11 @@ module GeoConcerns
     def actor
       @actor ||= GeoConcerns::Actors::FileSetActor.new(@file_set, current_user)
     end
+
+    protected
+
+      def geo?
+        parent.image_work? || parent.raster_work? || parent.vector_work?
+      end
   end
 end

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

@@ -0,0 +1,29 @@
+module GeoConcerns
+  module GeoblacklightControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      def geoblacklight
+        respond_to do |f|
+          f.json do
+            if builder.to_hash.fetch(:error, nil)
+              render json: builder, status: 404
+            else
+              render json: builder
+            end
+          end
+        end
+      end
+    end
+
+    private
+
+      def document_class
+        Discovery::GeoblacklightDocument
+      end
+
+      def builder
+        @builder ||= Discovery::DocumentBuilder.new(presenter, document_class.new)
+      end
+  end
+end

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

@@ -0,0 +1,12 @@
+module GeoConcerns
+  module Ability
+    extend ActiveSupport::Concern
+    included do
+      self.ability_logic += [:geo_concerns_permissions]
+    end
+
+    def geo_concerns_permissions
+      alias_action :geoblacklight, to: :read
+    end
+  end
+end

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

@@ -5,11 +5,11 @@ module GeoConcerns
 
       def create_derivatives(filename)
         case geo_mime_type
-        when *ImageFormatService.select_options.map(&:last)
+        when *GeoConcerns::ImageFormatService.select_options.map(&:last)
           image_derivatives(filename)
-        when *RasterFormatService.select_options.map(&:last)
+        when *GeoConcerns::RasterFormatService.select_options.map(&:last)
           raster_derivatives(filename)
-        when *VectorFormatService.select_options.map(&:last)
+        when *GeoConcerns::VectorFormatService.select_options.map(&:last)
           vector_derivatives(filename)
         end
 
@@ -19,7 +19,7 @@ module GeoConcerns
       def image_derivatives(filename)
         Hydra::Derivatives::ImageDerivatives
           .create(filename, outputs: [{ label: :thumbnail,
-                                        format: 'jpg',
+                                        format: 'png',
                                         size: '200x150>',
                                         url: derivative_url('thumbnail') }])
       end
@@ -32,7 +32,7 @@ module GeoConcerns
                                         url: derivative_url('display_raster') },
                                       { input_format: geo_mime_type,
                                         label: :thumbnail,
-                                        format: 'jpg',
+                                        format: 'png',
                                         size: '200x150',
                                         url: derivative_url('thumbnail') }])
       end
@@ -45,7 +45,7 @@ module GeoConcerns
                                         url: derivative_url('display_vector') },
                                       { input_format: geo_mime_type,
                                         label: :thumbnail,
-                                        format: 'jpg',
+                                        format: 'png',
                                         size: '200x150',
                                         url: derivative_url('thumbnail') }])
       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?(geo_mime_type)
+      GeoConcerns::ImageFormatService.include?(geo_mime_type)
     end
 
     def raster_file?
-      RasterFormatService.include?(geo_mime_type)
+      GeoConcerns::RasterFormatService.include?(geo_mime_type)
     end
 
     def vector_file?
-      VectorFormatService.include?(geo_mime_type)
+      GeoConcerns::VectorFormatService.include?(geo_mime_type)
     end
 
     def external_metadata_file?
-      MetadataFormatService.include?(geo_mime_type)
+      GeoConcerns::MetadataFormatService.include?(geo_mime_type)
     end
 
     def geo_file_format?

data/app/presenters/geo_concerns/raster_work_show_presenter.rb

@@ -1,6 +1,6 @@
 module GeoConcerns
   class RasterWorkShowPresenter < GeoConcernsShowPresenter
     self.work_presenter_class = ::GeoConcerns::VectorWorkShowPresenter
-    self.file_format_service = RasterFormatService
+    self.file_format_service = GeoConcerns::RasterFormatService
   end
 end

data/app/processors/geo_concerns/processors/mapnik.rb

@@ -0,0 +1,30 @@
+require 'simple_mapnik'
+
+module GeoConcerns
+  module Processors
+    module Mapnik
+      extend ActiveSupport::Concern
+
+      included do
+        def self.mapnik_vector_thumbnail(in_path, out_path, options)
+          vector_info = GeoConcerns::Processors::Vector::Info.new(in_path)
+          options[:name] = vector_info.name
+          SimpleMapnik.register_datasources '/usr/local/lib/mapnik/input'
+          map = SimpleMapnik::Map.new(*mapnik_size(options))
+          map.load_string(mapnik_config(in_path, options).xml)
+          map.zoom_all
+          map.to_file out_path
+        end
+
+        def self.mapnik_size(options)
+          options[:output_size].split(' ').map(&:to_i)
+        end
+
+        def self.mapnik_config(in_path, options)
+          path_name = "#{in_path}/#{options[:name]}"
+          SimpleMapnik::Config.new(path_name)
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module GeoConcerns
         include GeoConcerns::Processors::BaseGeoProcessor
         include GeoConcerns::Processors::Ogr
         include GeoConcerns::Processors::Gdal
+        include GeoConcerns::Processors::Mapnik
         include GeoConcerns::Processors::Zip
 
         def self.encode(path, options, output_file)
@@ -20,7 +21,7 @@ module GeoConcerns
         # Set of commands to run to encode the vector thumbnail.
         # @return [Array] set of command name symbols
         def self.encode_queue
-          [:rasterize, :convert]
+          [:reproject, :mapnik_vector_thumbnail]
         end
 
         # Set of commands to run to reproject the vector.

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

@@ -0,0 +1,66 @@
+module GeoConcerns
+  module Processors
+    module Vector
+      class Info
+        attr_accessor :doc
+        attr_writer :name, :driver
+
+        def initialize(path)
+          @doc = ogrinfo(path)
+        end
+
+        # Returns the vector dataset name
+        # @return [String] dataset name
+        def name
+          @name = vector_name
+        end
+
+        # Returns the ogr driver name
+        # @return [String] driver name
+        def driver
+          @driver = driver_name
+        end
+
+        # Returns vector geometry type
+        # @return [String] geom
+        def geom
+          @geom = vector_geom
+        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
+          end
+
+          # Given an output string from the ogrinfo command, returns
+          # the vector dataset name.
+          # @return [String] vector dataset name
+          def vector_name
+            match = /(?<=\d:\s).*?((?=\s)|($))/.match(doc)
+            match ? match[0] : ''
+          end
+
+          # Given an output string from the ogrinfo command, returns
+          # the ogr driver used to read dataset.
+          # @return [String] ogr driver name
+          def driver_name
+            match = /(?<=driver\s`).*?(?=')/.match(doc)
+            match ? match[0] : ''
+          end
+
+          # Given an output string from the ogrinfo command, returns
+          # the vector geometry type.
+          # @return [String] vector geom
+          def vector_geom
+            match = /(?<=\().*?(?=\))/.match(doc)
+            match ? match[0] : ''
+          end
+      end
+    end
+  end
+end

data/app/services/geo_concerns/authority_service.rb

@@ -0,0 +1,29 @@
+module GeoConcerns
+  module AuthorityService
+    extend ActiveSupport::Concern
+
+    included do
+      mattr_accessor :authority
+    end
+
+    class_methods do
+      def select_options
+        authority.all.map do |element|
+          [element[:label], element[:id]]
+        end
+      end
+
+      def label(id)
+        (authority.find(id) || {}).fetch('term', nil)
+      end
+
+      def code(id)
+        (authority.find(id) || {}).fetch('code', nil)
+      end
+
+      def include?(id)
+        !authority.find(id).nil? && !authority.find(id).empty?
+      end
+    end
+  end
+end

data/app/services/geo_concerns/discovery.rb

@@ -0,0 +1,4 @@
+module GeoConcerns
+  module Discovery
+  end
+end

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

@@ -0,0 +1,36 @@
+module GeoConcerns
+  module Discovery
+    class AbstractDocument
+      attr_accessor :id, :provenance, :creator, :subject, :spatial, :temporal,
+                    :title, :identifier, :description, :access_rights, :language,
+                    :publisher, :slug, :solr_coverage, :geo_rss_coverage, :layer_year,
+                    :date_modified, :geom_type, :format, :resource_type, :wxs_identifier,
+                    :dct_references, :fgdc, :iso19139, :mods, :download, :url, :thumbnail
+
+      # Cleans the document hash by removing unused fields.
+      # @param [Hash] document hash
+      # @return [Hash] cleaned document hash
+      def clean_document(hash)
+        hash.delete_if do |_k, v|
+          begin
+            v.nil? || v.empty?
+          rescue
+            false
+          end
+        end
+      end
+
+      def to_hash(_arg)
+        raise 'this method should be overriden and return the document as a hash'
+      end
+
+      def to_json(_arg)
+        raise 'this method should be overriden and return the document as json'
+      end
+
+      def to_xml(_arg)
+        raise 'this method should be overriden and return the document as xml'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module GeoConcerns
+  module Discovery
+    class DocumentBuilder
+      attr_reader :geo_concern, :document
+      delegate :to_json, :to_xml, :to_hash, to: :document
+
+      def initialize(geo_concern, document, ssl: false)
+        @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)
+      end
+
+      # Instantiates a CompositeBuilder object with an array of
+      # builder instances that are used to create the document.
+      # @return [CompositeBuilder] composite builder for document
+      def builders
+        @builders ||= CompositeBuilder.new(
+          basic_metadata_builder,
+          spatial_builder,
+          date_builder,
+          references_builder,
+          layer_info_builder
+        )
+      end
+
+      # Instantiates a BasicMetadataBuilder object.
+      # Builds fields such as id, subject, and publisher.
+      # @return [BasicMetadataBuilder] basic metadata builder for document
+      def basic_metadata_builder
+        BasicMetadataBuilder.new(geo_concern)
+      end
+
+      # Instantiates a SpatialBuilder object.
+      # Builds spatial fields such as bounding box and solr geometry.
+      # @return [SpatialBuilder] spatial builder for document
+      def spatial_builder
+        SpatialBuilder.new(geo_concern)
+      end
+
+      # Instantiates a DateBuilder object.
+      # Builds date fields such as layer year and modified date.
+      # @return [DateBuilder] date builder for document
+      def date_builder
+        DateBuilder.new(geo_concern)
+      end
+
+      # Instantiates a ReferencesBuilder object.
+      # Builds service reference fields such as thumbnail and download url.
+      # @return [ReferencesBuilder] references builder for document
+      def references_builder
+        ReferencesBuilder.new(geo_concern, root_path)
+      end
+
+      # Instantiates a LayerInfoBuilder object.
+      # Builds fields about the geospatial file such as geometry and format.
+      # @return [LayerInfoBuilder] layer info builder for document
+      def layer_info_builder
+        LayerInfoBuilder.new(geo_concern)
+      end
+    end
+  end
+end