spatial_features 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6546da69d43dd7c33cc9b19158b3d3c9f470a408
-  data.tar.gz: 6d4c6fed9cf11d5e9ab969731f191da542b684b0
+  metadata.gz: f766538c6eab3f16deabfc99c389ac980c269369
+  data.tar.gz: c067ba772247abae57fd42b67543dfc6d0eae7f4
 SHA512:
-  metadata.gz: 0ded67ca6baf54207080e00c3c14887952a285d31b5a7c28af1a9c552be0a6706833ac809aa2719d76d276313eb70c9ff2a1fb0f95ce964110b65b85a95d4f69
-  data.tar.gz: 17edbcf806c5acdff92150dd1990f6c37b0ba1705050c55721d29dda7fb1d58edcbf70b7a71a8ba02288f8604018dc390ef8c29b63265c551a7d1f601ce11922
+  metadata.gz: 4787b48b20386bc4c7e1116a54a9a9aa22ba7132dd48c6286fea12f0ab3e77819ea0449fbf4be970415e6d5f6c04491ac54ac2f966b4b0de934e11ff5708a3a3
+  data.tar.gz: 20863a80c4cd3d674d0bf58e3f83bd062836635d3ecc7c86f121aa34189303394d784419c902555f4331b64c84df588a7ab35d36d033041896a4673d8d9497b3

data/lib/spatial_features/importers/file.rb

@@ -6,12 +6,11 @@ module SpatialFeatures
       def initialize(data, *args)
         file = Download.open(data, unzip: %w(.kml .shp))
 
-        if file.path.end_with? '.kml'
+        case ::File.extname(file.path.downcase)
+        when '.kml'
           __setobj__(KMLFile.new(file, *args))
-
-        elsif file.path.end_with? '.shp'
+        when '.shp'
           __setobj__(Shapefile.new(file, *args))
-
         else
           raise ImportError, "Could not import file. Supported formats are KMZ, KML, and zipped ArcGIS shapefiles"
         end

data/lib/spatial_features/importers/shapefile.rb

@@ -21,8 +21,10 @@ module SpatialFeatures
       end
 
       def proj4_from_file(file)
-        # Sanitize "'+proj=utm +zone=11 +datum=NAD83 +units=m +no_defs '\n"
-        `gdalsrsinfo "#{file.path}" -o proj4`[/'(.+)'/,1].presence || raise('Could not determine shapefile projection. Check that `gdalsrsinfo` is installed.')
+        # 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.')
       end
 
       def data_from_wkt(wkt, proj4)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.5.2"
+  VERSION = "2.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement