spatial_features 2.7.6 → 2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5212c402e92554dacf5a96e9b0c37d7be41ae0d6e5a37f7979dec43fc2051c24
-  data.tar.gz: 3e74ccd3a3030d99063a1ab0b7e503c75c6c8f129b60d1f4259d116142094b18
+  metadata.gz: a1569586b460b18ee4a83871a3af3c5b4d8b54a5fbe84d9a4f1b3a191658a31f
+  data.tar.gz: d69c1f4fa29bd3b6b15770a59af3821521942723091def5945b6c065454ace5b
 SHA512:
-  metadata.gz: 19a54d24e4c472889d16fa92bdffd5d7f03d06f09d32e3484a0ce7bd558a80832b985fbfc6e1cfa7cc2ec861d31b7c7efdbbe923e12ae9df2122ccd69ac581c8
-  data.tar.gz: 4e4df3297bd72eb1694820f52b53ca13ba6a64a977dd5f43062c47f03e14d9c7c580bafadb1d3ab069d029eb9331ad113cdf8f1e6857a49e580b45a365a369ad
+  metadata.gz: df9042d3ef062b8662697970fe58715b27d69bdc46acead5d030697b4461ee25b06ad9afd0b6b03ebbba57b4f93e89cebe7278da5a9897b1e42f7c9135dbeb59
+  data.tar.gz: b64e7d40f30753e25be1d5be07b7b7261b72def8ca3eaffa622541386a772c5d39bdda7b94c70922ea9bebbb833bc292ea15dd4b5bf08c8796457f22fea4d5f8

data/README.md

@@ -21,7 +21,7 @@ Adds spatial methods to a model.
   execute("
     CREATE EXTENSION hstore;
     CREATE EXTENSION postgis;
-    
+
     CREATE TABLE features (
         id integer NOT NULL,
         spatial_model_type character varying(255),
@@ -42,12 +42,12 @@ Adds spatial methods to a model.
         centroid geography,
         kml_centroid text
     );
-    
+
     CREATE SEQUENCE features_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
     ALTER SEQUENCE features_id_seq OWNED BY features.id;
     ALTER TABLE ONLY features ALTER COLUMN id SET DEFAULT nextval('features_id_seq'::regclass);
     ALTER TABLE ONLY features ADD CONSTRAINT features_pkey PRIMARY KEY (id);
-    
+
     CREATE INDEX index_features_on_feature_type ON features USING btree (feature_type);
     CREATE INDEX index_features_on_spatial_model_id_and_spatial_model_type ON features USING btree (spatial_model_id, spatial_model_type);
     CREATE INDEX index_features_on_geom ON features USING gist (geom);
@@ -63,12 +63,12 @@ Adds spatial methods to a model.
         intersection_cache_distance double precision,
         features_hash character varying(255)
     );
-    
+
     CREATE SEQUENCE spatial_caches_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
     ALTER SEQUENCE spatial_caches_id_seq OWNED BY spatial_caches.id;
     ALTER TABLE ONLY spatial_caches ALTER COLUMN id SET DEFAULT nextval('spatial_caches_id_seq'::regclass);
     ALTER TABLE ONLY spatial_caches ADD CONSTRAINT spatial_caches_pkey PRIMARY KEY (id);
-    
+
     CREATE INDEX index_spatial_caches_on_spatial_model ON spatial_caches USING btree (spatial_model_id, spatial_model_type);
 
     CREATE TABLE spatial_proximities (
@@ -80,12 +80,12 @@ Adds spatial methods to a model.
         distance_in_meters double precision,
         intersection_area_in_square_meters double precision
     );
-    
+
     CREATE SEQUENCE spatial_proximities_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
     ALTER SEQUENCE spatial_proximities_id_seq OWNED BY spatial_proximities.id;
     ALTER TABLE ONLY spatial_proximities ALTER COLUMN id SET DEFAULT nextval('spatial_proximities_id_seq'::regclass);
     ALTER TABLE ONLY spatial_proximities ADD CONSTRAINT spatial_proximities_pkey PRIMARY KEY (id);
-    
+
     CREATE INDEX index_spatial_proximities_on_model_a ON spatial_proximities USING btree (model_a_id, model_a_type);
     CREATE INDEX index_spatial_proximities_on_model_b ON spatial_proximities USING btree (model_b_id, model_b_type);
   ")
@@ -120,3 +120,20 @@ class Location < ActiveRecord::Base
   end
 end
 ```
+
+### SpatialFeatures::Importers::Shapefile
+
+#### Default Options
+
+Default options can be specified on the Shapefile importer class itself.
+
+- ##### default_proj4_projection
+  A proj4 formatted projection string to use when no other projection has been specified either in the shapefile or the
+  importer instance.
+
+  Example:
+  ```ruby
+    SpatialFeatures::Importers::Shapefile.default_proj4_projection = "+proj=aea +lat_1=50 +lat_2=58.5 +lat_0=45 +lon_0=-126 +x_0=1000000 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs"
+  ```
+
+  Default: `nil`

data/lib/spatial_features/importers/file.rb

@@ -4,7 +4,7 @@ module SpatialFeatures
   module Importers
     class File < SimpleDelegator
       def initialize(data, *args)
-        file = Download.open(data, unzip: %w(.kml .shp))
+        file = Download.open(data, unzip: [/\.kml$/, /\.shp$/])
 
         case ::File.extname(file.path.downcase)
         when '.kml'

data/lib/spatial_features/importers/shapefile.rb

@@ -4,6 +4,8 @@ require 'digest/md5'
 module SpatialFeatures
   module Importers
     class Shapefile < Base
+      class_attribute :default_proj4_projection
+
       def initialize(data, *args, proj4: nil, **options)
         super(data, *args, **options)
         @proj4 = proj4
@@ -16,24 +18,22 @@ module SpatialFeatures
       private
 
       def each_record(&block)
-        file = Download.open(@data, unzip: '.shp')
-
-        if !@proj4
-          @proj4 = proj4_from_file(file)
-        end
-
         RGeo::Shapefile::Reader.open(file.path) do |records|
           records.each do |record|
-            yield OpenStruct.new data_from_wkt(record.geometry.as_text, @proj4).merge(:metadata => record.attributes) if record.geometry.present?
+            yield OpenStruct.new data_from_wkt(record.geometry.as_text, proj4_projection).merge(:metadata => record.attributes) if record.geometry.present?
           end
         end
       end
 
-      def proj4_from_file(file)
+      def proj4_projection
+        @proj4 ||= proj4_from_file || default_proj4_projection || raise(IndeterminateProjection, 'Could not determine shapefile projection. Check that `gdalsrsinfo` is installed.')
+      end
+
+      def proj4_from_file
         # Sanitize: "'+proj=utm +zone=11 +datum=NAD83 +units=m +no_defs '\n" and lately
         #           "+proj=utm +zone=11 +datum=NAD83 +units=m +no_defs \n" to
         #           "+proj=utm +zone=11 +datum=NAD83 +units=m +no_defs"
-        `gdalsrsinfo "#{file.path}" -o proj4`.strip.remove(/^'|'$/).presence || raise('Could not determine shapefile projection. Check that `gdalsrsinfo` is installed.')
+        `gdalsrsinfo "#{file.path}" -o proj4`.strip.remove(/^'|'$/).presence
       end
 
       def data_from_wkt(wkt, proj4)
@@ -41,6 +41,15 @@ module SpatialFeatures
           SELECT ST_Transform(ST_GeomFromText('#{wkt}'), '#{proj4}', 4326) AS geog, GeometryType(ST_GeomFromText('#{wkt}')) AS feature_type
         SQL
       end
+
+      def file
+        @file ||= Download.open(@data, unzip: /\.shp$/)
+      end
+
+
+      # ERRORS
+
+      class IndeterminateProjection < StandardError; end
     end
   end
 end

data/lib/spatial_features/unzip.rb

@@ -6,7 +6,7 @@ module SpatialFeatures
       paths = extract(file_path)
 
       if find = Array.wrap(find).presence
-        paths = paths.detect {|path| find.any? {|pattern| path.include?(pattern) } }
+        paths = paths.detect {|path| find.any? {|pattern| path.index(pattern) } }
         raise(ImportError, "No file matched #{find}") unless paths.present?
       end
 

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.7.6"
+  VERSION = "2.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.7
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.