rgeo 0.4.0 → 0.5.0

data/lib/rgeo/geographic/simple_mercator_projector.rb

@@ -5,38 +5,28 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Geographic
+    class SimpleMercatorProjector # :nodoc:
+      EQUATORIAL_RADIUS = 6_378_137.0
 
-
-    class SimpleMercatorProjector  # :nodoc:
-
-      EQUATORIAL_RADIUS = 6378137.0
-
-
-      def initialize(geography_factory_, opts_={})
+      def initialize(geography_factory_, opts_ = {})
         @geography_factory = geography_factory_
-        @projection_factory = Cartesian.preferred_factory(:srid => 3857,
-          :proj4 => SimpleMercatorProjector._proj4_3857,
-          :coord_sys => SimpleMercatorProjector._coordsys_3857,
-          :buffer_resolution => opts_[:buffer_resolution],
-          :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
-          :uses_lenient_assertions => opts_[:uses_lenient_assertions],
-          :has_z_coordinate => opts_[:has_z_coordinate],
-          :has_m_coordinate => opts_[:has_m_coordinate])
+        @projection_factory = Cartesian.preferred_factory(srid: 3857,
+                                                          proj4: SimpleMercatorProjector._proj4_3857,
+                                                          coord_sys: SimpleMercatorProjector._coordsys_3857,
+                                                          buffer_resolution: opts_[:buffer_resolution],
+                                                          lenient_multi_polygon_assertions: opts_[:lenient_multi_polygon_assertions],
+                                                          uses_lenient_assertions: opts_[:uses_lenient_assertions],
+                                                          has_z_coordinate: opts_[:has_z_coordinate],
+                                                          has_m_coordinate: opts_[:has_m_coordinate])
       end
 
-
-      def _set_factories(geography_factory_, projection_factory_)  # :nodoc:
+      def _set_factories(geography_factory_, projection_factory_) # :nodoc:
         @geography_factory = geography_factory_
         @projection_factory = projection_factory_
       end
 
-
-      def projection_factory
-        @projection_factory
-      end
-
+      attr_reader :projection_factory
 
       def project(geometry_)
         case geometry_
@@ -48,26 +38,23 @@ module RGeo
         when Feature::Line
           @projection_factory.line(project(geometry_.start_point), project(geometry_.end_point))
         when Feature::LinearRing
-          @projection_factory.linear_ring(geometry_.points.map{ |p_| project(p_) })
+          @projection_factory.linear_ring(geometry_.points.map { |p_| project(p_) })
         when Feature::LineString
-          @projection_factory.line_string(geometry_.points.map{ |p_| project(p_) })
+          @projection_factory.line_string(geometry_.points.map { |p_| project(p_) })
         when Feature::Polygon
           @projection_factory.polygon(project(geometry_.exterior_ring),
-                                      geometry_.interior_rings.map{ |p_| project(p_) })
+                                      geometry_.interior_rings.map { |p_| project(p_) })
         when Feature::MultiPoint
-          @projection_factory.multi_point(geometry_.map{ |p_| project(p_) })
+          @projection_factory.multi_point(geometry_.map { |p_| project(p_) })
         when Feature::MultiLineString
-          @projection_factory.multi_line_string(geometry_.map{ |p_| project(p_) })
+          @projection_factory.multi_line_string(geometry_.map { |p_| project(p_) })
         when Feature::MultiPolygon
-          @projection_factory.multi_polygon(geometry_.map{ |p_| project(p_) })
+          @projection_factory.multi_polygon(geometry_.map { |p_| project(p_) })
         when Feature::GeometryCollection
-          @projection_factory.collection(geometry_.map{ |p_| project(p_) })
-        else
-          nil
+          @projection_factory.collection(geometry_.map { |p_| project(p_) })
         end
       end
 
-
       def unproject(geometry_)
         case geometry_
         when Feature::Point
@@ -78,57 +65,46 @@ module RGeo
         when Feature::Line
           @geography_factory.line(unproject(geometry_.start_point), unproject(geometry_.end_point))
         when Feature::LinearRing
-          @geography_factory.linear_ring(geometry_.points.map{ |p_| unproject(p_) })
+          @geography_factory.linear_ring(geometry_.points.map { |p_| unproject(p_) })
         when Feature::LineString
-          @geography_factory.line_string(geometry_.points.map{ |p_| unproject(p_) })
+          @geography_factory.line_string(geometry_.points.map { |p_| unproject(p_) })
         when Feature::Polygon
           @geography_factory.polygon(unproject(geometry_.exterior_ring),
-            geometry_.interior_rings.map{ |p_| unproject(p_) })
+            geometry_.interior_rings.map { |p_| unproject(p_) })
         when Feature::MultiPoint
-          @geography_factory.multi_point(geometry_.map{ |p_| unproject(p_) })
+          @geography_factory.multi_point(geometry_.map { |p_| unproject(p_) })
         when Feature::MultiLineString
-          @geography_factory.multi_line_string(geometry_.map{ |p_| unproject(p_) })
+          @geography_factory.multi_line_string(geometry_.map { |p_| unproject(p_) })
         when Feature::MultiPolygon
-          @geography_factory.multi_polygon(geometry_.map{ |p_| unproject(p_) })
+          @geography_factory.multi_polygon(geometry_.map { |p_| unproject(p_) })
         when Feature::GeometryCollection
-          @geography_factory.collection(geometry_.map{ |p_| unproject(p_) })
-        else
-          nil
+          @geography_factory.collection(geometry_.map { |p_| unproject(p_) })
         end
       end
 
-
       def wraps?
         true
       end
 
-
       def limits_window
         @limits_window ||= ProjectedWindow.new(@geography_factory,
-          -20037508.342789, -20037508.342789, 20037508.342789, 20037508.342789,
-          :is_limits => true)
+          -20_037_508.342789, -20_037_508.342789, 20_037_508.342789, 20_037_508.342789,
+          is_limits: true)
       end
 
-
-      def self._proj4_3857  # :nodoc:
+      def self._proj4_3857 # :nodoc:
         unless defined?(@proj4_3857)
-          @proj4_3857 = CoordSys::Proj4.create('+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs')
+          @proj4_3857 = CoordSys::Proj4.create("+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs")
         end
         @proj4_3857
       end
 
-
-      def self._coordsys_3857  # :nodoc:
+      def self._coordsys_3857 # :nodoc:
         unless defined?(@coordsys_3857)
           @coordsys_3857 = CoordSys::CS.create_from_wkt('PROJCS["Popular Visualisation CRS / Mercator",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]')
         end
         @coordsys_3857
       end
-
-
     end
-
-
   end
-
 end

data/lib/rgeo/geographic/spherical_feature_classes.rb

@@ -5,45 +5,28 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Geographic
-
-
-    class SphericalPointImpl  # :nodoc:
-
-
+    class SphericalPointImpl # :nodoc:
       include Feature::Point
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPointMethods
       include SphericalGeometryMethods
       include SphericalPointMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::Point).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalLineStringImpl  # :nodoc:
-
-
+    class SphericalLineStringImpl # :nodoc:
       include Feature::LineString
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
       include SphericalGeometryMethods
       include SphericalLineStringMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::LineString).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalLineImpl  # :nodoc:
-
-
+    class SphericalLineImpl # :nodoc:
       include Feature::Line
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
@@ -51,16 +34,10 @@ module RGeo
       include SphericalGeometryMethods
       include SphericalLineStringMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::Line).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalLinearRingImpl  # :nodoc:
-
-
+    class SphericalLinearRingImpl # :nodoc:
       include Feature::LinearRing
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicLineStringMethods
@@ -68,62 +45,38 @@ module RGeo
       include SphericalGeometryMethods
       include SphericalLineStringMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::LinearRing).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalPolygonImpl  # :nodoc:
-
-
+    class SphericalPolygonImpl # :nodoc:
       include Feature::Polygon
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPolygonMethods
       include SphericalGeometryMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::Polygon).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalGeometryCollectionImpl  # :nodoc:
-
-
+    class SphericalGeometryCollectionImpl # :nodoc:
       include Feature::GeometryCollection
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include SphericalGeometryMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::GeometryCollection).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalMultiPointImpl  # :nodoc:
-
-
+    class SphericalMultiPointImpl # :nodoc:
       include Feature::MultiPoint
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPointMethods
       include SphericalGeometryMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPoint).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalMultiLineStringImpl  # :nodoc:
-
-
+    class SphericalMultiLineStringImpl # :nodoc:
       include Feature::MultiLineString
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
@@ -131,29 +84,17 @@ module RGeo
       include SphericalGeometryMethods
       include SphericalMultiLineStringMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiLineString).include_in_class(self, true)
-
-
     end
 
-
-    class SphericalMultiPolygonImpl  # :nodoc:
-
-
+    class SphericalMultiPolygonImpl # :nodoc:
       include Feature::MultiPolygon
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiPolygonMethods
       include SphericalGeometryMethods
 
-
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPolygon).include_in_class(self, true)
-
-
     end
-
-
   end
-
 end

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -5,24 +5,14 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Geographic
-
-
-    module SphericalGeometryMethods  # :nodoc:
-
-
+    module SphericalGeometryMethods # :nodoc:
       def srid
         factory.srid
       end
-
-
     end
 
-
-    module SphericalPointMethods   # :nodoc:
-
-
+    module SphericalPointMethods # :nodoc:
       def _validate_geometry
         if @x < -180.0 || @x > 180.0
           @x = @x % 360.0
@@ -33,12 +23,10 @@ module RGeo
         super
       end
 
-
       def _xyz
         @xyz ||= SphericalMath::PointXYZ.from_latlon(@y, @x)
       end
 
-
       def distance(rhs_)
         rhs_ = Feature.cast(rhs_, @factory)
         case rhs_
@@ -49,9 +37,8 @@ module RGeo
         end
       end
 
-
       def equals?(rhs_)
-        return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
+        return false unless rhs_.is_a?(self.class) && rhs_.factory == factory
         case rhs_
         when Feature::Point
           if @y == 90
@@ -62,15 +49,14 @@ module RGeo
             rhs_.x == @x && rhs_.y == @y
           end
         when Feature::LineString
-          rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
+          rhs_.num_points > 0 && rhs_.points.all? { |elem_| equals?(elem_) }
         when Feature::GeometryCollection
-          rhs_.num_geometries > 0 && rhs_.all?{ |elem_| equals?(elem_) }
+          rhs_.num_geometries > 0 && rhs_.all? { |elem_| equals?(elem_) }
         else
           false
         end
       end
 
-
       def buffer(distance_)
         radius_ = distance_ / SphericalMath::RADIUS
         radius_ = 1.5 if radius_ > 1.5
@@ -90,7 +76,6 @@ module RGeo
         factory.polygon(factory.linear_ring(points_))
       end
 
-
       def self.included(klass_)
         klass_.module_eval do
           alias_method :longitude, :x
@@ -99,28 +84,22 @@ module RGeo
           alias_method :lat, :y
         end
       end
-
-
     end
 
-
-    module SphericalLineStringMethods  # :nodoc:
-
-
+    module SphericalLineStringMethods # :nodoc:
       def _arcs
         unless defined?(@arcs)
-          @arcs = (0..num_points-2).map do |i_|
-            SphericalMath::ArcXYZ.new(point_n(i_)._xyz, point_n(i_+1)._xyz)
+          @arcs = (0..num_points - 2).map do |i_|
+            SphericalMath::ArcXYZ.new(point_n(i_)._xyz, point_n(i_ + 1)._xyz)
           end
         end
         @arcs
       end
 
-
       def is_simple?
         arcs_ = _arcs
         len_ = arcs_.length
-        return false if arcs_.any?{ |a_| a_.degenerate? }
+        return false if arcs_.any?(&:degenerate?)
         return true if len_ == 1
         return arcs_[0].s != arcs_[1].e if len_ == 2
         arcs_.each_with_index do |arc_, index_|
@@ -130,38 +109,26 @@ module RGeo
           pindex_ = index_ - 1
           pindex_ = nil if pindex_ < 0
           return false if pindex_ && arc_.contains_point?(arcs_[pindex_].s)
-          if nindex_
-            oindex_ = nindex_ + 1
-            while oindex_ < len_
-              oarc_ = arcs_[oindex_]
-              return false if !(index_ == 0 && oindex_ == len_-1 && arc_.s == oarc_.e) && arc_.intersects_arc?(oarc_)
-              oindex_ += 1
-            end
+          next unless nindex_
+          oindex_ = nindex_ + 1
+          while oindex_ < len_
+            oarc_ = arcs_[oindex_]
+            return false if !(index_ == 0 && oindex_ == len_ - 1 && arc_.s == oarc_.e) && arc_.intersects_arc?(oarc_)
+            oindex_ += 1
           end
         end
         true
       end
 
-
       def length
-        _arcs.inject(0.0){ |sum_, arc_| sum_ + arc_.length } * SphericalMath::RADIUS
+        _arcs.inject(0.0) { |sum_, arc_| sum_ + arc_.length } * SphericalMath::RADIUS
       end
-
-
     end
 
-
-    module SphericalMultiLineStringMethods  # :nodoc:
-
-
+    module SphericalMultiLineStringMethods # :nodoc:
       def length
-        inject(0.0){ |sum_, geom_| sum_ + geom_.length }
+        inject(0.0) { |sum_, geom_| sum_ + geom_.length }
       end
-
-
     end
-
-
   end
-
 end