geo_works-derivatives 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd74e4256a47a4aa51bce1260b257cb3521534bd14b4e95a7fa928b574fa327e
-  data.tar.gz: ee24d60ba5067f5cba81c82598373b46c886ba2e9ace2b6eb67a0c3b8f9f2d68
+  metadata.gz: baeb8171c1ebdac8b02b7e748d04658e2da0fceaeda277965af0eed4824db64a
+  data.tar.gz: 136fcf622a11c30eea882beee962f8dbca2b53830c415f7129e00aebc04cf8e0
 SHA512:
-  metadata.gz: 62e76e0daed6a0c682f0f249fa874e24988f2c2e799428eb427666bcfb8b7554464e7c7858d9677389ef02e1795ae7609042250906672a0fa7f411932f64f2a6
-  data.tar.gz: ae2422b043ea514fdb690788ec8370d8b4f8f9a9039e6c49d7846097ec02f71041c64bc734259e551078f7926925d44b2705ea23cb4dea25f873582e7401f8b3
+  metadata.gz: 6e5aa369904ce63ec509d80868e3867fe7ecf6c6d3671f0a523ca1acf6967620866bae7372e3c5bdb4c8a12b8167f177fa5be3afde332a6e48af94f354a5f23b
+  data.tar.gz: 6ca2866e946abb4569d754d5d6b3c6e12a0ed1fb6b84361f88d8c185767bc5c48ea93a3cbcea0bf592bede4afd80d3a1618661a77d7bd5f21d2658f0dcc3cce0

data/.circleci/config.yml

@@ -0,0 +1,57 @@
+---
+version: 2
+jobs:
+  build:
+    working_directory: ~/geo_works
+    docker:
+      - image: circleci/ruby:2.7.5-node-browsers
+    steps:
+      - checkout
+      - run: sudo apt update -y
+      - run: sudo apt-get install gdal-bin libgdal-dev libcairo2-dev libpango1.0-dev python3-pip python-is-python3
+      - run: sudo sh bin/ci_simple_tiles_install.sh
+      # Install Bundler
+      - run: gem install bundler -v '2.2.14'
+      # Bundle install dependencies
+      - run: bundle install --path vendor/bundle
+      - persist_to_workspace:
+          root: '~/geo_works'
+          paths: '*'
+  test:
+    working_directory: ~/geo_works
+    docker:
+      - image: circleci/ruby:2.7.5-node-browsers
+    steps:
+      - attach_workspace:
+          at: '~/geo_works'
+      - run: sudo apt update -y
+      - run: sudo apt-get install gdal-bin libgdal-dev libcairo2-dev libpango1.0-dev python3-pip python-is-python3
+      - run: sudo sh bin/ci_simple_tiles_install.sh
+      # Install Bundler
+      - run: gem install bundler -v '2.2.14'
+      # Bundle install dependencies
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rspec
+  rubocop:
+    working_directory: ~/geo_works
+    docker:
+      - image: circleci/ruby:2.7.5-node-browsers
+    steps:
+      - attach_workspace:
+          at: '~/geo_works'
+      # Install Bundler
+      - run: gem install bundler -v '2.2.14'
+      # Bundle install dependencies
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rubocop
+workflows:
+  version: 2
+  build_accept_deploy:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+      - rubocop:
+          requires:
+            - build

data/.rubocop.yml

@@ -2,10 +2,12 @@ inherit_gem:
   bixby: bixby_default.yml
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  NewCops: enable
+  TargetRubyVersion: 2.7
   Exclude:
     - 'bin/*'
     - 'vendor/**/*'
+    - 'tmp/**/*'
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.5

data/bin/ci_simple_tiles_install.sh

@@ -0,0 +1,15 @@
+if [ ! -d "tmp/simple-tiles" ]; then
+  mkdir -p -m 777 tmp && cd tmp
+  wget --no-check-certificate https://github.com/propublica/simple-tiles/archive/master.zip -O simple-tiles.zip
+  unzip simple-tiles.zip
+  mv simple-tiles-master simple-tiles
+  cd simple-tiles
+  ./configure -t $PWD && make
+  sudo make install
+  cd ../..
+fi
+cd tmp/simple-tiles && sudo make install && cd ../..
+# Clean up after the build
+if [ -d "simple-tiles" ]; then
+  mv simple-tiles tmp/simple-tiles-build
+fi

data/geo_works-derivatives.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'simpler-tiles'
 
   spec.add_development_dependency 'bixby'
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/geo_works/derivatives/processors/raster/info.rb

@@ -11,6 +11,12 @@ module GeoWorks
             @doc = gdalinfo(path)
           end
 
+          # Returns raster bounds
+          # @return [Hash] bounds
+          def bounds
+            @bounds = raster_bounds
+          end
+
           # Returns the gdal driver name
           # @return [String] driver name
           def driver
@@ -31,37 +37,82 @@ module GeoWorks
 
           private
 
-            # Given an output string from the gdalinfo command, returns
-            # the gdal driver used to read dataset.
-            # @return [String] gdal driver name
-            def driver_name
-              match = /(?<=Driver:\s).*?(?=\s)/.match(doc)
-              match ? match[0] : ''
-            end
-
-            # Runs the gdalinfo command and returns the result as a string.
-            # @param path [String] path to raster file
-            # @return [String] output of gdalinfo
-            def gdalinfo(path)
-              stdout, _stderr, _status = Open3.capture3("gdalinfo -mm #{path}")
-              stdout
-            end
-
-            # Given an output string from the gdalinfo command, returns
-            # a formatted string for the computed min and max values.
-            # @return [String] computed min and max values
-            def raster_min_max
-              match = %r{(?<=Computed Min/Max=).*?(?=\s)}.match(doc)
-              match ? match[0].tr(',', ' ') : ''
-            end
-
-            # Given an output string from the gdalinfo command, returns
-            # an array containing the raster width and height as strings.
-            # @return [String] raster size
-            def raster_size
-              match = /(?<=Size is ).*/.match(doc)
-              match ? match[0].tr(',', '') : ''
-            end
+          # Given an output string from the gdalinfo command, returns
+          # the gdal driver used to read dataset.
+          # @return [String] gdal driver name
+          def driver_name
+            match = /(?<=Driver:\s).*?(?=\s)/.match(doc)
+            match ? match[0] : ''
+          end
+
+          ## Converts coordinate in degrees, minutes, seconds to decimal degrees
+          #   Example: 74° 25' 55.8" -> 74.43217
+          # @param d [String] degrees
+          # @param m [String] minutes
+          # @param s [String] seconds
+          # @return [Float] coordinate in decimal degrees
+          def dms_to_dd(d, m, s)
+            dd = d.to_f + (m.to_f / 60) + (s.to_f / 3600)
+
+            # Truncate to 6 decimal places
+            # https://observablehq.com/@mourner/latitude-and-longitude-precision
+            dd.truncate(6)
+          end
+
+          ## Extracts lon/lat values from gdal_info corner coordinates string
+          #   Example:
+          #   (  546945.000, 4662235.000) ( 74d25'55.80"W, 42d 6'45.83"N) ->
+          #   [74.432166, 42.11273]
+          # @param gdal_string [String] corner corner string from gdal_info
+          # @return [Array<Float, Float>] coordinates in decimal degrees
+          def extract_coordinates(gdal_string)
+            # remove parens and spaces, split into array, and assign elements to variables
+            _, _, lon, lat = gdal_string.delete(" ").gsub(")(", ",").delete("(").delete(")").split(",")
+            # split coordinate string into degree, minute, second values
+            lon = lon.delete("\"W").tr("d", ",").tr("'", ",").split(",")
+            lat = lat.delete("\"N").tr("d", ",").tr("'", ",").split(",")
+
+            # Convert to decimal degrees and return
+            [dms_to_dd(*lon), dms_to_dd(*lat)]
+          end
+
+          # Runs the gdalinfo command and returns the result as a string.
+          # @param path [String] path to raster file
+          # @return [String] output of gdalinfo
+          def gdalinfo(path)
+            stdout, _stderr, _status = Open3.capture3("gdalinfo -mm #{path}")
+            stdout
+          end
+
+          # Given an output string from the gdalinfo command, returns
+          # the raster bounding box.
+          # @return [Hash] raster bounds
+          def raster_bounds
+            ul = /(?<=Upper Left\s).*?(?=\n)/.match(doc)
+            lr = /(?<=Lower Right\s).*?(?=\n)/.match(doc)
+            w, n = extract_coordinates(ul[0])
+            e, s = extract_coordinates(lr[0])
+
+            { north: n, east: e, south: s, west: w }
+          rescue StandardError
+            ''
+          end
+
+          # Given an output string from the gdalinfo command, returns
+          # a formatted string for the computed min and max values.
+          # @return [String] computed min and max values
+          def raster_min_max
+            match = %r{(?<=Computed Min/Max=).*?(?=\s)}.match(doc)
+            match ? match[0].tr(',', ' ') : ''
+          end
+
+          # Given an output string from the gdalinfo command, returns
+          # an array containing the raster width and height as strings.
+          # @return [String] raster size
+          def raster_size
+            match = /(?<=Size is ).*/.match(doc)
+            match ? match[0].tr(',', '') : ''
+          end
         end
       end
     end

data/lib/geo_works/derivatives/processors/rendering.rb

@@ -37,44 +37,44 @@ module GeoWorks
 
           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 GeoWorks::Derivatives::Config.rendering_config.to_h
-                  end
+          # 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 GeoWorks::Derivatives::Config.rendering_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
+          # 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
+          # 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 = GeoWorks::Derivatives::Processors::Vector::Info.new(in_path)
-              options[:name] = vector_info.name
-              options[:bounds] = vector_info.bounds
-            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 = GeoWorks::Derivatives::Processors::Vector::Info.new(in_path)
+            options[:name] = vector_info.name
+            options[:bounds] = vector_info.bounds
+          end
         end
       end
     end

data/lib/geo_works/derivatives/processors/vector/info.rb

@@ -37,51 +37,51 @@ module GeoWorks
 
           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 -ro -so -al #{path}")
-              stdout
-            end
+          # 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 -ro -so -al #{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 = /(?<=Layer name:\s).*?(?=\n)/.match(doc)
-              match ? match[0] : ''
-            end
+          # Given an output string from the ogrinfo command, returns
+          # the vector dataset name.
+          # @return [String] vector dataset name
+          def vector_name
+            match = /(?<=Layer name:\s).*?(?=\n)/.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 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 = /(?<=Geometry:\s).*?(?=\n)/.match(doc)
-              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
+          # the vector geometry type.
+          # @return [String] vector geom
+          def vector_geom
+            match = /(?<=Geometry:\s).*?(?=\n)/.match(doc)
+            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
-            # the vector bounding box.
-            # @return [Hash] vector bounds
-            def vector_bounds
-              match = /(?<=Extent:\s).*?(?=\n)/.match(doc)
-              extent = match ? match[0] : ''
+          # 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
+            # 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/lib/geo_works/derivatives/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GeoWorks
   module Derivatives
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_works-derivatives
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Eliot Jordan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +143,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".tool-versions"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/ci_simple_tiles_install.sh
 - bin/console
 - bin/setup
 - config/simpler_tiles.yml
@@ -166,7 +182,7 @@ files:
 homepage: https://github.com/pulibrary/geo_works-derivatives
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Geospatial derivative generation
 test_files: []

data/.travis.yml

@@ -1,21 +0,0 @@
-sudo: true
-language: ruby
-rvm:
-  - 2.4.5
-addons:
-  apt:
-    packages:
-    - libgdal1i
-    - libgdal-dev
-    - gdal-bin
-    - libcairo2-dev
-    - libpango1.0-dev
-before_install:
- - git clone https://github.com/propublica/simple-tiles.git
- - cd simple-tiles
- - ./configure && make
- - sudo make install
- - cd ..
- - gem install bundler -v 1.16.1
-before_script:
-  - gdalinfo --version