rgeo-proj4 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9135e04b9e8911c2ce6c1c0f39be9edbe80d8adcbfa661dc57116320c616ff2d
-  data.tar.gz: da0f069d9d7314c35a396fa0a2d2797944cc830a8f408b5ebdf577bba8c6a7c2
+  metadata.gz: b578b226ebc3b376a92f58cf080d34f237b5929751e6b856e493d9b6a6daa1ae
+  data.tar.gz: 84f4953ac2aea3783e7a807542c7aaf102b265dc454a9de97c340d70f04685c1
 SHA512:
-  metadata.gz: a9e9d80f1df22a9fb3f1564ed622f008a53cacad669af211766c6b43e1654e7b589bce9b95ba0c2018e501b2625a43208f2195b47dda472e7daee45faa21bd5c
-  data.tar.gz: d26e2e71aa7fab5737a70463f5a4689507707a9910eb874ae44e74df90899d4b3c52b88bef81b5d66298c28e0a22f6602c45fbcfa6c02633074e0351ee4e68e5
+  metadata.gz: bb2bddfdc101da5c0a4b2af5d5445ce7e57f8d49505b5bb2f53376e81b5ed392d4d2183c11e6cc1e0d86fc5b2fc83cc1afe1d6a3c72fcf8924d779fbd04fdffb
+  data.tar.gz: 3f21328f3beff54191cf496f784a432185f9999d4b71ddeab91d772627f26bbc97deb1882cab9d9f997d16432993d2c742c3d2638005d2f372959428201f4e05

data/lib/rgeo/coord_sys/crs_to_crs.rb

@@ -7,15 +7,77 @@ module RGeo
     # A crs_to_crs transformation object is a pipeline between two known coordinate reference systems.
     # https://proj.org/development/reference/functions.html#c.proj_create_crs_to_crs
     class CRSToCRS
+      attr_writer :from, :to
+
+      class << self
+        def create(from, to)
+          crs_to_crs = _create(from, to)
+          crs_to_crs.from = from
+          crs_to_crs.to = to
+          crs_to_crs
+        end
+      end
       # transform the coordinates from the initial CRS to the destination CRS
       def transform_coords(x, y, z)
-        _transform_coords(x, y, z)
+        if @from._radians? && @from._geographic?
+          x *= ImplHelper::Math::DEGREES_PER_RADIAN
+          y *= ImplHelper::Math::DEGREES_PER_RADIAN
+        end
+        result = _transform_coords(x, y, z)
+        if result && @to._radians? && @to._geographic?
+          result[0] *= ImplHelper::Math::RADIANS_PER_DEGREE
+          result[1] *= ImplHelper::Math::RADIANS_PER_DEGREE
+        end
+        result
       end
 
-      class << self
-        def create(from, to)
-          _create(from, to)
+      def transform(from_geometry, to_factory)
+        case from_geometry
+        when Feature::Point
+          transform_point(from_geometry, to_factory)
+        when Feature::Line
+          to_factory.line(from_geometry.points.map { |p| transform_point(p, to_factory) })
+        when Feature::LinearRing
+          transform_linear_ring(from_geometry, to_factory)
+        when Feature::LineString
+          to_factory.line_string(from_geometry.points.map { |p_| transform_point(p_, to_factory) })
+        when Feature::Polygon
+          transform_polygon(from_geometry, to_factory)
+        when Feature::MultiPoint
+          to_factory.multi_point(from_geometry.map { |p| transform_point(p, to_factory) })
+        when Feature::MultiLineString
+          to_factory.multi_line_string(from_geometry.map { |g| transform(g, to_factory) })
+        when Feature::MultiPolygon
+          to_factory.multi_polygon(from_geometry.map { |p| transform_polygon(p, to_factory) })
+        when Feature::GeometryCollection
+          to_factory.collection(from_geometry.map { |g| transform(g, to_factory) })
+        end
+      end
+
+      def transform_point(from_point, to_factory)
+        from_factory_ = from_point.factory
+        from_has_z_ = from_factory_.property(:has_z_coordinate)
+        from_has_m_ = from_factory_.property(:has_m_coordinate)
+        to_has_z_ = to_factory.property(:has_z_coordinate)
+        to_has_m_ = to_factory.property(:has_m_coordinate)
+        coords_ = transform_coords(from_point.x, from_point.y, from_has_z_ ? from_point.z : nil)
+        return unless coords_
+        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_ring_, to_factory_)
+        to_factory_.linear_ring(from_ring_.points[0..-2].map { |p_| transform_point(p_, to_factory_) })
+      end
+
+      def transform_polygon(from_polygon_, to_factory_)
+        ext_ = transform_linear_ring(from_polygon_.exterior_ring, to_factory_)
+        int_ = from_polygon_.interior_rings.map { |r_| transform_linear_ring(r_, to_factory_) }
+        to_factory_.polygon(ext_, int_)
       end
     end
 

data/lib/rgeo/coord_sys/proj4.rb

@@ -222,18 +222,8 @@ module RGeo
         # coordinate system to another. Returns an array with either two
         # or three elements.
         def transform_coords(from_proj_, to_proj_, x_, y_, z_ = nil)
-          if from_proj_._radians? && from_proj_._geographic?
-            x_ *= ImplHelper::Math::DEGREES_PER_RADIAN
-            y_ *= ImplHelper::Math::DEGREES_PER_RADIAN
-          end
-
           crs_to_crs = CRSStore.get(from_proj_, to_proj_)
-          result_ = crs_to_crs.transform_coords(x_, y_, z_)
-          if result_ && to_proj_._radians? && to_proj_._geographic?
-            result_[0] *= ImplHelper::Math::RADIANS_PER_DEGREE
-            result_[1] *= ImplHelper::Math::RADIANS_PER_DEGREE
-          end
-          result_
+          crs_to_crs.transform_coords(x_, y_, z_)
         end
 
         # Low-level geometry transform method.
@@ -241,56 +231,9 @@ module RGeo
         # The resulting geometry is constructed using the to_factory.
         # Any projections associated with the factories themselves are
         # ignored.
-
         def transform(from_proj_, from_geometry_, to_proj_, to_factory_)
-          case from_geometry_
-          when Feature::Point
-            transform_point(from_proj_, from_geometry_, to_proj_, to_factory_)
-          when Feature::Line
-            to_factory_.line(from_geometry_.points.map { |p_| transform_point(from_proj_, p_, to_proj_, to_factory_) })
-          when Feature::LinearRing
-            transform_linear_ring(from_proj_, from_geometry_, to_proj_, to_factory_)
-          when Feature::LineString
-            to_factory_.line_string(from_geometry_.points.map { |p_| transform_point(from_proj_, p_, to_proj_, to_factory_) })
-          when Feature::Polygon
-            transform_polygon(from_proj_, from_geometry_, to_proj_, to_factory_)
-          when Feature::MultiPoint
-            to_factory_.multi_point(from_geometry_.map { |p_| transform_point(from_proj_, p_, to_proj_, to_factory_) })
-          when Feature::MultiLineString
-            to_factory_.multi_line_string(from_geometry_.map { |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
-          when Feature::MultiPolygon
-            to_factory_.multi_polygon(from_geometry_.map { |p_| transform_polygon(from_proj_, p_, to_proj_, to_factory_) })
-          when Feature::GeometryCollection
-            to_factory_.collection(from_geometry_.map { |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
-          end
-        end
-
-        private
-
-        def transform_point(from_proj_, from_point_, to_proj_, to_factory_)
-          from_factory_ = from_point_.factory
-          from_has_z_ = from_factory_.property(:has_z_coordinate)
-          from_has_m_ = from_factory_.property(:has_m_coordinate)
-          to_has_z_ = to_factory_.property(:has_z_coordinate)
-          to_has_m_ = to_factory_.property(:has_m_coordinate)
-          coords_ = transform_coords(from_proj_, to_proj_, from_point_.x, from_point_.y, from_has_z_ ? from_point_.z : nil)
-          return unless coords_
-          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_)
-          to_factory_.linear_ring(from_ring_.points[0..-2].map { |p_| transform_point(from_proj_, p_, to_proj_, to_factory_) })
-        end
-
-        def transform_polygon(from_proj_, from_polygon_, to_proj_, to_factory_)
-          ext_ = transform_linear_ring(from_proj_, from_polygon_.exterior_ring, to_proj_, to_factory_)
-          int_ = from_polygon_.interior_rings.map { |r_| transform_linear_ring(from_proj_, r_, to_proj_, to_factory_) }
-          to_factory_.polygon(ext_, int_)
+          crs_to_crs = CRSStore.get(from_proj_, to_proj_)
+          crs_to_crs.transform(from_geometry_, to_factory_)
         end
       end
     end

data/lib/rgeo/proj4/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Proj4
-    VERSION = "3.1.0"
+    VERSION = "3.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-proj4
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tee Parham, Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo