rgeo-proj4 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: add7aff85bba20a77acc75be326d9f4ace2a08fe9193db60d88fd51658ea853f
-  data.tar.gz: ef6b8db6bbe814ce8d3519b9fd292b90a9075c86a477101292dba490e5ae9b47
+  metadata.gz: 05e81871744567d55f6b9d11e115954040f5262e9d3317b9792973f1806f655a
+  data.tar.gz: 0a3f2943bf7c80eb4c9d0680b382ab0c9eed83543ef1f4383326e4bdfb6da250
 SHA512:
-  metadata.gz: 5a30c4b6f99c1fb414e65529d2d938f962bbe756f07f0e85788c805d27183103dee7bf05f6580f0c0bcc4bfc30dbcaf78e841311c90073b6d13d7219b1998447
-  data.tar.gz: c3bd4a4042e5ee0255d8722307cf545b1a6fed5d527ab9d195c66aa4ba4922e37ab23af7be7311fac2f1036ac4448a455b9895f07f16fd8907a5da0301f7ecee
+  metadata.gz: 74ad26d2f7f983b9415b1b301180fe0352a09d4df7425227c2d012220468e147d9b1787c41de2b13f2db9cb5bf9e8a35038beee362393427911854cbff4c49f8
+  data.tar.gz: bcd150775bfa449dad65dd8035f9ceb4e23192dac1f258de2c0b3edf58362e6c48a4b7da7c710bcf3b43de61c92ca64b159f7b6eec2cdaa1ca0cda7a1a1a5ff0

data/ext/proj4_c_impl/extconf.rb

@@ -45,9 +45,10 @@ else
 
   found_proj_ = false
   header_dirs_, lib_dirs_ = dir_config("proj", header_dirs_, lib_dirs_)
-  if have_header("proj_api.h")
+  dflag = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+  if have_header("proj_api.h", nil, dflag)
     $libs << " -lproj"
-    if have_func("pj_init_plus", "proj_api.h")
+    if have_func("pj_init_plus", "proj_api.h", dflag)
       found_proj_ = true
     else
       $libs.gsub!(" -lproj", "")

data/ext/proj4_c_impl/main.c

@@ -1,9 +1,9 @@
 /*
   Main initializer for Proj4 wrapper
 */
-
 #ifdef HAVE_PROJ_API_H
 #ifdef HAVE_PJ_INIT_PLUS
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #define RGEO_PROJ4_SUPPORTED
 #endif
 #endif

data/lib/rgeo/coord_sys/proj4.rb

@@ -44,7 +44,7 @@ module RGeo
       def eql?(rhs_)
         rhs_.class == self.class && rhs_.canonical_hash == canonical_hash && rhs_._radians? == _radians?
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Marshal support
 
@@ -78,9 +78,7 @@ module RGeo
       def canonical_str
         unless defined?(@canonical_str)
           @canonical_str = _canonical_str
-          if @canonical_str.respond_to?(:force_encoding)
-            @canonical_str.force_encoding("US-ASCII")
-          end
+          @canonical_str.force_encoding("US-ASCII") if @canonical_str.respond_to?(:force_encoding)
         end
         @canonical_str
       end
@@ -174,9 +172,7 @@ module RGeo
             if defn_.is_a?(::Hash)
               defn_ = defn_.map { |k_, v_| v_ ? "+#{k_}=#{v_}" : "+#{k_}" }.join(" ")
             end
-            unless defn_ =~ /^\s*\+/
-              defn_ = defn_.sub(/^(\s*)/, '\1+').gsub(/(\s+)([^+\s])/, '\1+\2')
-            end
+            defn_ = defn_.sub(/^(\s*)/, '\1+').gsub(/(\s+)([^+\s])/, '\1+\2') unless defn_ =~ /^\s*\+/
             result_ = _create(defn_, opts_[:radians])
             result_ = nil unless result_._valid?
           end
@@ -202,9 +198,7 @@ module RGeo
 
         def new(defn_, opts_ = {})
           result_ = create(defn_, opts_)
-          unless result_
-            raise Error::UnsupportedOperation, "Proj4 not supported in this installation"
-          end
+          raise Error::UnsupportedOperation, "Proj4 not supported in this installation" unless result_
           result_
         end
 
@@ -270,16 +264,17 @@ module RGeo
             y_ *= ImplHelper::Math::RADIANS_PER_DEGREE
           end
           coords_ = _transform_coords(from_proj_, to_proj_, x_, y_, from_has_z_ ? from_point_.z : nil)
-          if coords_
-            if !to_proj_._radians? && to_proj_._geographic?
-              coords_[0] *= ImplHelper::Math::DEGREES_PER_RADIAN
-              coords_[1] *= ImplHelper::Math::DEGREES_PER_RADIAN
-            end
-            extras_ = []
-            extras_ << coords_[2].to_f if to_has_z_
-            extras_ << from_has_m_ ? from_point_.m : 0.0 if to_has_m_
-            to_factory_.point(coords_[0], coords_[1], *extras_)
+          return unless coords_
+          if !to_proj_._radians? && to_proj_._geographic?
+            coords_[0] *= ImplHelper::Math::DEGREES_PER_RADIAN
+            coords_[1] *= ImplHelper::Math::DEGREES_PER_RADIAN
+          end
+          extras_ = []
+          extras_ << coords_[2].to_f if to_has_z_
+          if to_has_m_
+            extras_ << from_has_m_ ? from_point_.m : 0.0
           end
+          to_factory_.point(coords_[0], coords_[1], *extras_)
         end
 
         def transform_linear_ring(from_proj_, from_ring_, to_proj_, to_factory_)

data/lib/rgeo/coord_sys/srs_database/proj4_data.rb

@@ -79,7 +79,7 @@ module RGeo
 
         def get(ident_)
           ident_ = ident_.to_s
-          return @cache[ident_] if @cache && @cache.include?(ident_)
+          return @cache[ident_] if @cache&.include?(ident_)
           result_ = nil
           if @populate_state == 0
             data_ = search_file(ident_)
@@ -96,7 +96,7 @@ module RGeo
         # Clear the cache if one exists.
 
         def clear_cache
-          @cache.clear if @cache
+          @cache&.clear
           @populate_state = 1 if @populate_state == 2
         end
 
@@ -109,7 +109,7 @@ module RGeo
             cur_text_ = nil
             file_.each do |line_|
               line_.strip!
-              if (comment_delim_ = line_.index('#'))
+              if (comment_delim_ = line_.index("#"))
                 cur_name_ = line_[comment_delim_ + 1..-1].strip
                 line_ = line_[0..comment_delim_ - 1].strip
               end

data/lib/rgeo/proj4/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Proj4
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-proj4
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Tee Parham, Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: Proj4 extension for rgeo.
 email:
 - parhameter@gmail.com, dazuma@gmail.com
@@ -114,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Proj4 extension for rgeo.