rgeo 0.1.21 → 0.1.22

data/lib/rgeo/{geography → geographic}/factory.rb

@@ -36,11 +36,11 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     # This class implements the various factories for geography features.
-    # See methods of the RGeo::Geography module for the API for creating
+    # See methods of the RGeo::Geographic module for the API for creating
     # geography factories.
     
     class Factory
@@ -50,17 +50,17 @@ module RGeo
       
       def initialize(impl_prefix_, opts_={})  # :nodoc:
         @impl_prefix = impl_prefix_
-        @point_class = Geography.const_get("#{impl_prefix_}PointImpl")
-        @line_string_class = Geography.const_get("#{impl_prefix_}LineStringImpl")
-        @linear_ring_class = Geography.const_get("#{impl_prefix_}LinearRingImpl")
-        @line_class = Geography.const_get("#{impl_prefix_}LineImpl")
-        @polygon_class = Geography.const_get("#{impl_prefix_}PolygonImpl")
-        @geometry_collection_class = Geography.const_get("#{impl_prefix_}GeometryCollectionImpl")
-        @multi_point_class = Geography.const_get("#{impl_prefix_}MultiPointImpl")
-        @multi_line_string_class = Geography.const_get("#{impl_prefix_}MultiLineStringImpl")
-        @multi_polygon_class = Geography.const_get("#{impl_prefix_}MultiPolygonImpl")
-        @support_z = opts_[:support_z_coordinate] ? true : false
-        @support_m = opts_[:support_m_coordinate] ? true : false
+        @point_class = Geographic.const_get("#{impl_prefix_}PointImpl")
+        @line_string_class = Geographic.const_get("#{impl_prefix_}LineStringImpl")
+        @linear_ring_class = Geographic.const_get("#{impl_prefix_}LinearRingImpl")
+        @line_class = Geographic.const_get("#{impl_prefix_}LineImpl")
+        @polygon_class = Geographic.const_get("#{impl_prefix_}PolygonImpl")
+        @geometry_collection_class = Geographic.const_get("#{impl_prefix_}GeometryCollectionImpl")
+        @multi_point_class = Geographic.const_get("#{impl_prefix_}MultiPointImpl")
+        @multi_line_string_class = Geographic.const_get("#{impl_prefix_}MultiLineStringImpl")
+        @multi_polygon_class = Geographic.const_get("#{impl_prefix_}MultiPolygonImpl")
+        @support_z = opts_[:has_z_coordinate] ? true : false
+        @support_m = opts_[:has_m_coordinate] ? true : false
         @srid = opts_[:srid] || 4326
         @proj4 = opts_[:proj4]
         if CoordSys::Proj4.supported?
@@ -81,7 +81,7 @@ module RGeo
       # Equivalence test.
       
       def eql?(rhs_)
-        rhs_.is_a?(Geography::Factory) &&
+        rhs_.is_a?(Geographic::Factory) &&
           @impl_prefix == rhs_.instance_variable_get(:@impl_prefix) &&
           @support_z == rhs_.instance_variable_get(:@support_z) &&
           @support_m == rhs_.instance_variable_get(:@support_m) &&
@@ -166,16 +166,16 @@ module RGeo
       end
       
       
-      # See ::RGeo::Feature::Factory#has_capability?
+      # See ::RGeo::Feature::Factory#property
       
-      def has_capability?(name_)
+      def property(name_)
         case name_
-        when :z_coordinate
+        when :has_z_coordinate
           @support_z
-        when :m_coordinate
+        when :has_m_coordinate
           @support_m
-        when :proj4
-          @proj4 ? true : false
+        when :is_geographic
+          true
         else
           nil
         end
@@ -266,6 +266,13 @@ module RGeo
       end
       
       
+      # See ::RGeo::Feature::Factory#coord_sys
+      
+      def coord_sys
+        nil
+      end
+      
+      
     end
     
   end

data/lib/rgeo/{geography → geographic}/interface.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     class << self
       
@@ -82,10 +82,10 @@ module RGeo
       # You may use the following options when creating a spherical
       # factory:
       # 
-      # <tt>:support_z_coordinate</tt>::
-      #   Support <tt>z_coordinate</tt>. Default is false.
-      # <tt>:support_m_coordinate</tt>::
-      #   Support <tt>m_coordinate</tt>. Default is false.
+      # <tt>:has_z_coordinate</tt>::
+      #   Support a Z coordinate. Default is false.
+      # <tt>:has_m_coordinate</tt>::
+      #   Support an M coordinate. Default is false.
       # <tt>:proj4</tt>::
       #   Provide the coordinate system in Proj4 format. You may pass
       #   either an RGeo::CoordSys::Proj4 object, or a string or hash
@@ -102,7 +102,7 @@ module RGeo
       #   implies an ellipsoidal datum, not a spherical datum.
       
       def spherical_factory(opts_={})
-        Geography::Factory.new('Spherical', :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate], :proj4 => opts_[:proj4] || '+proj=longlat +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +no_defs', :srid => opts_[:srid] || 4055)
+        Geographic::Factory.new('Spherical', :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate], :proj4 => opts_[:proj4] || '+proj=longlat +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +no_defs', :srid => opts_[:srid] || 4055)
       end
       
       
@@ -161,20 +161,14 @@ module RGeo
       #   4-sided polygon. A resolution of 2 would cause that buffer
       #   to be approximated by an 8-sided polygon. The exact behavior
       #   for different kinds of buffers is defined by GEOS.
-      # <tt>:support_z_coordinate</tt>::
-      #   Support <tt>z_coordinate</tt>. Default is false.
-      #   Note that simple_mercator factories cannot support both
-      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
-      #   most support one or the other.
-      # <tt>:support_m_coordinate</tt>::
-      #   Support <tt>m_coordinate</tt>. Default is false.
-      #   Note that simple_mercator factories cannot support both
-      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
-      #   most support one or the other.
+      # <tt>:has_z_coordinate</tt>::
+      #   Support a Z coordinate. Default is false.
+      # <tt>:has_m_coordinate</tt>::
+      #   Support an M coordinate. Default is false.
       
       def simple_mercator_factory(opts_={})
-        factory_ = Geography::Factory.new('Projected', :proj4 => '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', :srid => 4326, :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
-        projector_ = Geography::SimpleMercatorProjector.new(factory_, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+        factory_ = Geographic::Factory.new('Projected', :proj4 => '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', :srid => 4326, :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
+        projector_ = Geographic::SimpleMercatorProjector.new(factory_, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
         factory_._set_projector(projector_)
         factory_
       end
@@ -188,7 +182,7 @@ module RGeo
       # calculations report results in the projected units.
       # 
       # This implementation is intended for advanced GIS applications
-      # requiring intimate control over the projection being used.
+      # requiring greater control over the projection being used.
       # 
       # === Options
       # 
@@ -203,7 +197,7 @@ module RGeo
       # 
       # <tt>:projection_factory</tt>::
       #   Specify an existing Cartesian factory to use for the projection.
-      #   This factory must support the <tt>:proj4</tt> capability.
+      #   This factory must have a non-nil Proj4.
       # 
       # Note that in this case, the geography factory's z-coordinate and
       # m-coordinate availability will be set to match the projection's
@@ -232,21 +226,41 @@ module RGeo
       #   4-sided polygon. A resolution of 2 would cause that buffer
       #   to be approximated by an 8-sided polygon. The exact behavior
       #   for different kinds of buffers is defined by GEOS.
-      # <tt>:support_z_coordinate</tt>::
-      #   Support <tt>z_coordinate</tt>. Default is false.
-      # <tt>:support_m_coordinate</tt>::
-      #   Support <tt>m_coordinate</tt>. Default is false.
+      # <tt>:has_z_coordinate</tt>::
+      #   Support a Z coordinate. Default is false.
+      # <tt>:has_m_coordinate</tt>::
+      #   Support an M coordinate. Default is false.
+      # 
+      # Normally, this geographic factory's actual proj4 projection is
+      # derived from the projection's proj4, by extracting the
+      # corresponding geographic coordinate system from the projected
+      # coordinate system. However, you can override this and provide
+      # your own geographic coordinate system by setting the
+      # <tt>:proj4</tt> option.
       
       def projected_factory(opts_={})
         unless CoordSys::Proj4.supported?
           raise Error::UnsupportedCapability, "Proj4 is not supported because the proj4 library was not found at install time."
         end
         if (projection_factory_ = opts_[:projection_factory])
-          factory_ = Geography::Factory.new('Projected', :proj4 => opts_[:proj4] || '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', :srid => opts_[:srid] || 4326, :support_z_coordinate => projection_factory_.has_capability?(:z_coordinate), :support_m_coordinate => projection_factory_.has_capability?(:m_coordinate))
-          projector_ = Geography::Proj4Projector.create_from_existing_factory(factory_, projection_factory_)
-        elsif opts_[:projection_proj4]
-          factory_ = Geography::Factory.new('Projected', :proj4 => opts_[:proj4] || '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', :srid => opts_[:srid] || 4326, :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
-          projector_ = Geography::Proj4Projector.create_from_proj4(factory_, opts_[:projection_proj4], :srid => opts_[:projection_srid], :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+          projection_proj4_ = projection_factory_.proj4
+          unless projection_proj4_
+            raise ::ArgumentError, 'The :projection_factory does not have a proj4.'
+          end
+          proj4_ = opts_[:proj4] || projection_proj4_.get_geographic || '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
+          factory_ = Geographic::Factory.new('Projected', :proj4 => proj4_, :srid => opts_[:srid] || 4326, :has_z_coordinate => projection_factory_.property(:has_z_coordinate), :has_m_coordinate => projection_factory_.property(:has_m_coordinate))
+          projector_ = Geographic::Proj4Projector.create_from_existing_factory(factory_, projection_factory_)
+        elsif (projection_proj4_ = opts_[:projection_proj4])
+          if projection_proj4_.kind_of?(::String) || projection_proj4_.kind_of?(::Hash)
+            actual_projection_proj4_ = CoordSys::Proj4.create(projection_proj4_)
+            unless actual_projection_proj4_
+              raise ::ArgumentError, "Bad proj4 syntax: #{projection_proj4_.inspect}"
+            end
+            projection_proj4_ = actual_projection_proj4_
+          end
+          proj4_ = opts_[:proj4] || projection_proj4_.get_geographic || '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
+          factory_ = Geographic::Factory.new('Projected', :proj4 => proj4_, :srid => opts_[:srid] || 4326, :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
+          projector_ = Geographic::Proj4Projector.create_from_proj4(factory_, opts_[:projection_proj4], :srid => opts_[:projection_srid], :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
         else
           raise ::ArgumentError, 'You must provide either :projection_proj4 or :projection_factory.'
         end

data/lib/rgeo/{geography → geographic}/proj4_projector.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     class Proj4Projector  # :nodoc:
@@ -82,7 +82,7 @@ module RGeo
         
         
         def create_from_proj4(geography_factory_, proj4_, opts_={})
-          projection_factory_ = Cartesian.preferred_factory(:proj4 => proj4_, :srid => opts_[:srid], :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+          projection_factory_ = Cartesian.preferred_factory(:proj4 => proj4_, :srid => opts_[:srid], :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
           new(geography_factory_, projection_factory_)
         end
         

data/lib/rgeo/{geography → geographic}/projected_feature_classes.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Mercator geography feature classes
+# Projtected geographic feature classes
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     class ProjectedPointImpl  # :nodoc:

data/lib/rgeo/{geography → geographic}/projected_feature_methods.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Mercator geography common method definitions
+# Projected geographic common method definitions
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     module ProjectedGeometryMethods  # :nodoc:

data/lib/rgeo/{geography → geographic}/projected_window.rb

@@ -36,19 +36,19 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     # This object represents an axis-aligned rectangle in a map projection
     # coordinate system. It is commonly used to specify the viewport for a
     # map visualization, an envelope in a projected coordinate system, or
-    # a spatial constraint. It must be attached to a Geography::Factory
+    # a spatial constraint. It must be attached to a Geographic::Factory
     # that has a projection.
     
     class ProjectedWindow
       
       
-      # Create a new ProjectedWindow given the Geography::Factory, and the
+      # Create a new ProjectedWindow given the Geographic::Factory, and the
       # x and y extents of the rectangle.
       # 
       # The window will be intelligently clamped to the limits imposed by
@@ -110,10 +110,10 @@ module RGeo
       end
       
       
-      # Returns the Geography::Factory associated with this window.
+      # Returns the Geographic::Factory associated with this window.
       # Note that this factory is the overall geography factory, not the
       # projected factory (which can be obtained by calling
-      # Geography::Factory#projection_factory on this factory).
+      # Geographic::Factory#projection_factory on this factory).
       
       def factory
         @factory

data/lib/rgeo/{geography → geographic}/simple_mercator_projector.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     class SimpleMercatorProjector  # :nodoc:
@@ -46,7 +46,7 @@ module RGeo
       
       def initialize(geography_factory_, opts_={})
         @geography_factory = geography_factory_
-        @projection_factory = Cartesian.preferred_factory(:srid => 3857, :proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+        @projection_factory = Cartesian.preferred_factory(:srid => 3857, :proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
       end
       
       

data/lib/rgeo/{geography → geographic}/spherical_feature_classes.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical geography feature classes
+# Spherical geographic feature classes
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     class SphericalPointImpl  # :nodoc:

data/lib/rgeo/{geography → geographic}/spherical_feature_methods.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical geometry common methods
+# Spherical geographic common methods
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     
     module SphericalGeometryMethods  # :nodoc:

data/lib/rgeo/{geography → geographic}/spherical_math.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module Geography
+  module Geographic
     
     module SphericalMath  # :nodoc:
       

data/lib/rgeo/geos/factory.rb

@@ -59,8 +59,8 @@ module RGeo
           return nil unless respond_to?(:_create)
           flags_ = 0
           flags_ |= 1 if opts_[:lenient_multi_polygon_assertions]
-          flags_ |= 2 if opts_[:support_z_coordinate]
-          flags_ |= 4 if opts_[:support_m_coordinate]
+          flags_ |= 2 if opts_[:has_z_coordinate]
+          flags_ |= 4 if opts_[:has_m_coordinate]
           if flags_ & 6 == 6
             raise Error::UnsupportedCapability, "GEOS cannot support both Z and M coordinates at the same time."
           end
@@ -119,16 +119,16 @@ module RGeo
       end
       
       
-      # See ::RGeo::Feature::Factory#has_capability?
+      # See ::RGeo::Feature::Factory#property
       
-      def has_capability?(name_)
+      def property(name_)
         case name_
-        when :z_coordinate
+        when :has_z_coordinate
           _flags & 0x2 != 0
-        when :m_coordinate
+        when :has_m_coordinate
           _flags & 0x4 != 0
-        when :proj4
-          !@proj4.nil?
+        when :is_cartesian
+          true
         else
           nil
         end
@@ -223,6 +223,20 @@ module RGeo
       end
       
       
+      # See ::RGeo::Feature::Factory#proj4
+      
+      def proj4
+        @proj4
+      end
+      
+      
+      # See ::RGeo::Feature::Factory#coord_sys
+      
+      def coord_sys
+        nil
+      end
+      
+      
       # See ::RGeo::Feature::Factory#override_cast
       
       def override_cast(original_, ntype_, flags_)
@@ -262,13 +276,6 @@ module RGeo
       end
       
       
-      # See ::RGeo::Feature::Factory#proj4
-      
-      def proj4
-        @proj4
-      end
-      
-      
     end
     
     

data/lib/rgeo/geos/interface.rb

@@ -88,14 +88,14 @@ module RGeo
       # <tt>:srid</tt>::
       #   Set the SRID returned by geometries created by this factory.
       #   Default is 0.
-      # <tt>:support_z_coordinate</tt>::
+      # <tt>:has_z_coordinate</tt>::
       #   Support <tt>z_coordinate</tt>. Default is false.
-      # <tt>:support_m_coordinate</tt>::
+      # <tt>:has_m_coordinate</tt>::
       #   Support <tt>m_coordinate</tt>. Default is false.
       
       def factory(opts_={})
         if supported?
-          if opts_[:support_z_coordinate] && opts_[:support_m_coordinate]
+          if opts_[:has_z_coordinate] && opts_[:has_m_coordinate]
             ZMFactory.new(opts_)
           else
             Factory.create(opts_)