rgeo 0.1.21 → 0.1.22

data/lib/rgeo/geos/zm_factory.rb

@@ -62,8 +62,8 @@ module RGeo
       
       
       def initialize(opts_={})  # :nodoc:
-        @zfactory = Factory.create(:support_z_coordinate => true, :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :buffer_resolution => opts_[:buffer_resolution], :srid => opts_[:srid])
-        @mfactory = Factory.create(:support_m_coordinate => true, :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :buffer_resolution => opts_[:buffer_resolution], :srid => opts_[:srid])
+        @zfactory = Factory.create(:has_z_coordinate => true, :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :buffer_resolution => opts_[:buffer_resolution], :srid => opts_[:srid], :proj4 => opts_[:proj4])
+        @mfactory = Factory.create(:has_m_coordinate => true, :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :buffer_resolution => opts_[:buffer_resolution], :srid => opts_[:srid], :proj4 => opts_[:proj4])
       end
       
       
@@ -111,14 +111,14 @@ module RGeo
       alias_method :==, :eql?
       
       
-      # See ::RGeo::Feature::Factory#has_capability?
+      # See ::RGeo::Feature::Factory#property
       
-      def has_capability?(name_)
+      def property(name_)
         case name_
-        when :z_coordinate, :m_coordinate
+        when :has_z_coordinate, :has_m_coordinate, :is_cartesian
           true
         else
-          @zfactory.has_capability?(name_)
+          nil
         end
       end
       
@@ -200,6 +200,20 @@ module RGeo
       end
       
       
+      # See ::RGeo::Feature::Factory#proj4
+      
+      def proj4
+        @zfactory.proj4
+      end
+      
+      
+      # See ::RGeo::Feature::Factory#coord_sys
+      
+      def coord_sys
+        @zfactory.coord_sys
+      end
+      
+      
       # See ::RGeo::Feature::Factory#override_cast
       
       def override_cast(original_, ntype_, flags_)

data/lib/rgeo/impl_helper/basic_point_methods.rb

@@ -46,8 +46,8 @@ module RGeo
         _set_factory(factory_)
         @x = x_.to_f
         @y = y_.to_f
-        @z = factory_.has_capability?(:z_coordinate) ? extra_.shift.to_f : nil
-        @m = factory_.has_capability?(:m_coordinate) ? extra_.shift.to_f : nil
+        @z = factory_.property(:has_z_coordinate) ? extra_.shift.to_f : nil
+        @m = factory_.property(:has_m_coordinate) ? extra_.shift.to_f : nil
         if extra_.size > 0
           raise ::ArgumentError, "Too many arguments for point initializer"
         end

data/lib/rgeo/shapefile/reader.rb

@@ -162,7 +162,7 @@ module RGeo
       #   A factory generator that should return a factory based on the
       #   srid and dimension settings in the input. The factory generator
       #   should understand the configuration options
-      #   <tt>:support_z_coordinate</tt> and <tt>:support_m_coordinate</tt>.
+      #   <tt>:has_z_coordinate</tt> and <tt>:has_m_coordinate</tt>.
       #   See RGeo::Feature::FactoryGenerator for more information.
       #   If no generator is provided, the <tt>:default_factory</tt> is
       #   used.
@@ -253,17 +253,17 @@ module RGeo
           factory_config_ = {}
           factory_config_[:srid] = opts_[:srid] if opts_[:srid]
           unless @zmin.nil?
-            factory_config_[:support_z_coordinate] = true
+            factory_config_[:has_z_coordinate] = true
           end
           unless @mmin.nil?
-            factory_config_[:support_m_coordinate] = true
+            factory_config_[:has_m_coordinate] = true
           end
           @factory = factory_generator_.call(factory_config_)
         else
           @factory = opts_[:default_factory] || Cartesian.preferred_factory
         end
-        @factory_supports_z = @factory.has_capability?(:z_coordinate)
-        @factory_supports_m = @factory.has_capability?(:m_coordinate)
+        @factory_supports_z = @factory.property(:has_z_coordinate)
+        @factory_supports_m = @factory.property(:has_m_coordinate)
         
         @assume_inner_follows_outer = opts_[:assume_inner_follows_outer]
       end

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -152,8 +152,8 @@ module RGeo
       def generate(obj_)
         factory_ = obj_.factory
         if @type_format == :ewkb || @type_format == :wkb12
-          @cur_has_z = factory_.has_capability?(:z_coordinate)
-          @cur_has_m = factory_.has_capability?(:m_coordinate)
+          @cur_has_z = factory_.property(:has_z_coordinate)
+          @cur_has_m = factory_.property(:has_m_coordinate)
         else
           @cur_has_z = nil
           @cur_has_m = nil

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -51,7 +51,7 @@ module RGeo
     # 
     # You must provide each parser with an RGeo::Feature::FactoryGenerator.
     # It should understand the configuration options <tt>:srid</tt>,
-    # <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
+    # <tt>:has_z_coordinate</tt>, and <tt>:has_m_coordinate</tt>.
     # You may also pass a specific RGeo::Feature::Factory, or nil to
     # specify the default Cartesian FactoryGenerator.
     # 
@@ -220,11 +220,11 @@ module RGeo
           @cur_has_m = has_m_
           @cur_dims = 2 + (@cur_has_z ? 1 : 0) + (@cur_has_m ? 1 : 0)
           @cur_srid = srid_
-          @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => has_z_, :support_m_coordinate => has_m_)
-          if @cur_has_z && !@cur_factory.has_capability?(:z_coordinate)
+          @cur_factory = @factory_generator.call(:srid => @cur_srid, :has_z_coordinate => has_z_, :has_m_coordinate => has_m_)
+          if @cur_has_z && !@cur_factory.property(:has_z_coordinate)
             raise Error::ParseError, "Data has Z coordinates but the factory doesn't have z_coordinate capability"
           end
-          if @cur_has_m && !@cur_factory.has_capability?(:m_coordinate)
+          if @cur_has_m && !@cur_factory.property(:has_m_coordinate)
             raise Error::ParseError, "Data has M coordinates but the factory doesn't have m_coordinate capability"
           end
         end

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -145,8 +145,8 @@ module RGeo
           @cur_support_z = nil
           @cur_support_m = nil
         else
-          @cur_support_z = factory_.has_capability?(:z_coordinate)
-          @cur_support_m = factory_.has_capability?(:m_coordinate)
+          @cur_support_z = factory_.property(:has_z_coordinate)
+          @cur_support_m = factory_.property(:has_m_coordinate)
         end
         str_ = _generate_feature(obj_, true)
         if @convert_case == :upper

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -54,7 +54,7 @@ module RGeo
     # 
     # You must provide each parser with an RGeo::Feature::FactoryGenerator.
     # It should understand the configuration options <tt>:srid</tt>,
-    # <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
+    # <tt>:has_z_coordinate</tt>, and <tt>:has_m_coordinate</tt>.
     # You may also pass a specific RGeo::Feature::Factory, or nil to
     # specify the default Cartesian FactoryGenerator.
     # 
@@ -179,8 +179,8 @@ module RGeo
         str_ = str_.downcase
         @cur_factory = @exact_factory
         if @cur_factory
-          @cur_factory_support_z = @cur_factory.has_capability?(:z_coordinate) ? true : false
-          @cur_factory_support_m = @cur_factory.has_capability?(:m_coordinate) ? true : false
+          @cur_factory_support_z = @cur_factory.property(:has_z_coordinate) ? true : false
+          @cur_factory_support_m = @cur_factory.property(:has_m_coordinate) ? true : false
         end
         @cur_expect_z = nil
         @cur_expect_m = nil
@@ -214,9 +214,9 @@ module RGeo
       
       def _ensure_factory  # :nodoc:
         unless @cur_factory
-          @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => @cur_expect_z, :support_m_coordinate => @cur_expect_m)
-          @cur_factory_support_z = @cur_factory.has_capability?(:z_coordinate) ? true : false
-          @cur_factory_support_m = @cur_factory.has_capability?(:m_coordinate) ? true : false
+          @cur_factory = @factory_generator.call(:srid => @cur_srid, :has_z_coordinate => @cur_expect_z, :has_m_coordinate => @cur_expect_m)
+          @cur_factory_support_z = @cur_factory.property(:has_z_coordinate) ? true : false
+          @cur_factory_support_m = @cur_factory.property(:has_m_coordinate) ? true : false
           _check_factory_support unless @cur_expect_z.nil?
         end
         @cur_factory
@@ -464,7 +464,7 @@ module RGeo
       end
       
       
-      def _next_token(expect_=nil)  # :nodoc:
+      def _next_token  # :nodoc:
         if @_scanner.scan_until(/\(|\)|\[|\]|,|[^\s\(\)\[\],]+/)
           token_ = @_scanner.matched
           case token_

data/test/active_record/common_setup_methods.rb

@@ -88,7 +88,7 @@ module RGeo
           
           def setup
             @factory = ::RGeo::Cartesian.preferred_factory(:srid => 4326)
-            @geographic_factory = ::RGeo::Geography.spherical_factory(:srid => 4326)
+            @geographic_factory = ::RGeo::Geographic.spherical_factory(:srid => 4326)
             cleanup_tables
           end
           

data/test/geos/tc_point.rb

@@ -49,9 +49,9 @@ module RGeo
         
         def setup
           @factory = ::RGeo::Geos.factory
-          @zfactory = ::RGeo::Geos.factory(:support_z_coordinate => true)
-          @mfactory = ::RGeo::Geos.factory(:support_m_coordinate => true)
-          @zmfactory = ::RGeo::Geos.factory(:support_z_coordinate => true, :support_m_coordinate => true)
+          @zfactory = ::RGeo::Geos.factory(:has_z_coordinate => true)
+          @mfactory = ::RGeo::Geos.factory(:has_m_coordinate => true)
+          @zmfactory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true)
         end
         
         

data/test/geos/tc_zmfactory.rb

@@ -46,7 +46,7 @@ module RGeo
         
         
         def setup
-          @factory = ::RGeo::Geos.factory(:support_z_coordinate => true, :support_m_coordinate => true, :srid => 1000, :buffer_resolution => 2)
+          @factory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true, :srid => 1000, :buffer_resolution => 2)
         end
         
         
@@ -57,12 +57,12 @@ module RGeo
           assert_equal(2, @factory.buffer_resolution)
           assert_equal(2, @factory.z_factory.buffer_resolution)
           assert_equal(2, @factory.m_factory.buffer_resolution)
-          assert(@factory.has_capability?(:z_coordinate))
-          assert(@factory.has_capability?(:m_coordinate))
-          assert(@factory.z_factory.has_capability?(:z_coordinate))
-          assert(!@factory.z_factory.has_capability?(:m_coordinate))
-          assert(!@factory.m_factory.has_capability?(:z_coordinate))
-          assert(@factory.m_factory.has_capability?(:m_coordinate))
+          assert(@factory.property(:has_z_coordinate))
+          assert(@factory.property(:has_m_coordinate))
+          assert(@factory.z_factory.property(:has_z_coordinate))
+          assert(!@factory.z_factory.property(:has_m_coordinate))
+          assert(!@factory.m_factory.property(:has_z_coordinate))
+          assert(@factory.m_factory.property(:has_m_coordinate))
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_geometry_collection.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirn
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
+          ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_line_string.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestLineString < ::Test::Unit::TestCase  # :nodoc:
         
         
         def setup
-          @factory = ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
+          @factory = ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_multi_line_string.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirnam
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
+          ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_multi_point.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FI
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factory
-          ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
+          ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_multi_polygon.rb

@@ -42,14 +42,14 @@ require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
         
         
         def create_factories
-          @factory = ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
-          @lenient_factory = ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857, :lenient_multi_polygon_assertions => true)
+          @factory = ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
+          @lenient_factory = ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857, :lenient_multi_polygon_assertions => true)
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_point.rb

@@ -42,16 +42,16 @@ require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestPoint < ::Test::Unit::TestCase  # :nodoc:
         
         
         def setup
-          @factory = ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
-          @zfactory = ::RGeo::Geography.projected_factory(:support_z_coordinate => true, :projection_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', :projection_srid => 3857)
-          @mfactory = ::RGeo::Geography.projected_factory(:support_m_coordinate => true, :projection_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', :projection_srid => 3857)
-          @zmfactory = ::RGeo::Geography.projected_factory(:support_z_coordinate => true, :support_m_coordinate => true, :projection_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', :projection_srid => 3857)
+          @factory = ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
+          @zfactory = ::RGeo::Geographic.projected_factory(:has_z_coordinate => true, :projection_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', :projection_srid => 3857)
+          @mfactory = ::RGeo::Geographic.projected_factory(:has_m_coordinate => true, :projection_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', :projection_srid => 3857)
+          @zmfactory = ::RGeo::Geographic.projected_factory(:has_z_coordinate => true, :has_m_coordinate => true, :projection_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', :projection_srid => 3857)
         end
         
         

data/test/{projected_geography → projected_geographic}/tc_polygon.rb

@@ -42,13 +42,13 @@ require ::File.expand_path('../common/polygon_tests.rb', ::File.dirname(__FILE__
 
 module RGeo
   module Tests  # :nodoc:
-    module ProjectedGeography  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
       
       class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
         
         
         def setup
-          @factory = ::RGeo::Geography.projected_factory(:projection_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', :projection_srid => 3857)
+          @factory = ::RGeo::Geographic.projected_factory(:projection_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', :projection_srid => 3857)
         end
         
         

data/test/shapefile/tc_shapelib_tests.rb

@@ -126,8 +126,8 @@ module RGeo
           _open_shapefile(filename_) do |file_|
             assert_equal(has_z_ ? 11 : has_m_ ? 21 : 1, file_.shape_type_code)
             assert_equal(2, file_.num_records)
-            assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
-            assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
+            assert_equal(has_z_, file_.factory.property(:has_z_coordinate))
+            assert_equal(has_m_, file_.factory.property(:has_m_coordinate))
             rec_ = file_.next
             assert_equal(0, rec_.index)
             assert_equal(::RGeo::Feature::Point, rec_.geometry.geometry_type)
@@ -166,8 +166,8 @@ module RGeo
           _open_shapefile(filename_) do |file_|
             assert_equal(has_z_ ? 18 : has_m_ ? 28 : 8, file_.shape_type_code)
             assert_equal(3, file_.num_records)
-            assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
-            assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
+            assert_equal(has_z_, file_.factory.property(:has_z_coordinate))
+            assert_equal(has_m_, file_.factory.property(:has_m_coordinate))
             rec_ = file_.next
             assert_equal(::RGeo::Feature::MultiPoint, rec_.geometry.geometry_type)
             assert_equal(4, rec_.geometry.num_geometries)
@@ -217,8 +217,8 @@ module RGeo
           _open_shapefile(filename_) do |file_|
             assert_equal(has_z_ ? 13 : has_m_ ? 23 : 3, file_.shape_type_code)
             assert_equal(4, file_.num_records)
-            assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
-            assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
+            assert_equal(has_z_, file_.factory.property(:has_z_coordinate))
+            assert_equal(has_m_, file_.factory.property(:has_m_coordinate))
             rec_ = file_.next
             assert_equal(::RGeo::Feature::MultiLineString, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
@@ -327,8 +327,8 @@ module RGeo
           _open_shapefile(filename_) do |file_|
             assert_equal(has_z_ ? 15 : has_m_ ? 25 : 5, file_.shape_type_code)
             assert_equal(4, file_.num_records)
-            assert_equal(has_z_, file_.factory.has_capability?(:z_coordinate))
-            assert_equal(has_m_, file_.factory.has_capability?(:m_coordinate))
+            assert_equal(has_z_, file_.factory.property(:has_z_coordinate))
+            assert_equal(has_m_, file_.factory.property(:has_m_coordinate))
             rec_ = file_.next
             assert_equal(::RGeo::Feature::MultiPolygon, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)
@@ -440,11 +440,11 @@ module RGeo
           _open_shapefile('test13') do |file_|
             assert_equal(31, file_.shape_type_code)
             assert_equal(4, file_.num_records)
-            assert_equal(true, file_.factory.has_capability?(:z_coordinate))
+            assert_equal(true, file_.factory.property(:has_z_coordinate))
             # I believe shapefile's test13 incorrectly includes bounding
             # box data for m, since there is no actual m data. So I 
             # disabled this test:
-            # assert_equal(false, file_.factory.has_capability?(:m_coordinate))
+            # assert_equal(false, file_.factory.property(:has_m_coordinate))
             rec_ = file_.next
             assert_equal(::RGeo::Feature::GeometryCollection, rec_.geometry.geometry_type)
             assert_equal(1, rec_.geometry.num_geometries)

data/test/simple_cartesian/tc_point.rb

@@ -49,9 +49,9 @@ module RGeo
         
         def setup
           @factory = ::RGeo::Cartesian.simple_factory(:srid => 1)
-          @zfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_z_coordinate => true)
-          @mfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_m_coordinate => true)
-          @zmfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_z_coordinate => true, :support_m_coordinate => true)
+          @zfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :has_z_coordinate => true)
+          @mfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :has_m_coordinate => true)
+          @zmfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :has_z_coordinate => true, :has_m_coordinate => true)
         end
         
         

data/test/simple_mercator/tc_geometry_collection.rb

@@ -48,7 +48,7 @@ module RGeo
         
         
         def create_factory
-          ::RGeo::Geography.simple_mercator_factory
+          ::RGeo::Geographic.simple_mercator_factory
         end