rgeo 0.1.22 → 0.2.0

data/lib/rgeo/feature/polygon.rb

@@ -94,7 +94,7 @@ module RGeo
       # Returns an object that supports the LinearRing interface.
       
       def exterior_ring
-        raise Error::UnsupportedCapability, "Method Polygon#exterior_ring not defined."
+        raise Error::UnsupportedOperation, "Method Polygon#exterior_ring not defined."
       end
       
       
@@ -107,7 +107,7 @@ module RGeo
       # Returns an integer.
       
       def num_interior_rings
-        raise Error::UnsupportedCapability, "Method Polygon#num_interior_rings not defined."
+        raise Error::UnsupportedOperation, "Method Polygon#num_interior_rings not defined."
       end
       
       
@@ -121,7 +121,7 @@ module RGeo
       # if the given n is out of range.
       
       def interior_ring_n(n_)
-        raise Error::UnsupportedCapability, "Method Polygon#interior_ring_n not defined."
+        raise Error::UnsupportedOperation, "Method Polygon#interior_ring_n not defined."
       end
       
       
@@ -129,7 +129,7 @@ module RGeo
       # that support the LinearRing interface.
       
       def interior_rings
-        raise Error::UnsupportedCapability, "Method Polygon#interior_rings not defined."
+        raise Error::UnsupportedOperation, "Method Polygon#interior_rings not defined."
       end
       
       

data/lib/rgeo/feature/surface.rb

@@ -83,7 +83,7 @@ module RGeo
       # Returns a floating-point scalar value.
       
       def area
-        raise Error::UnsupportedCapability, "Method Surface#area not defined."
+        raise Error::UnsupportedOperation, "Method Surface#area not defined."
       end
       
       
@@ -97,7 +97,7 @@ module RGeo
       # Returns an object that supports the Point interface.
       
       def centroid
-        raise Error::UnsupportedCapability, "Method Surface#centroid not defined."
+        raise Error::UnsupportedOperation, "Method Surface#centroid not defined."
       end
       
       
@@ -110,7 +110,7 @@ module RGeo
       # Returns an object that supports the Point interface.
       
       def point_on_surface
-        raise Error::UnsupportedCapability, "Method Surface#point_on_surface not defined."
+        raise Error::UnsupportedOperation, "Method Surface#point_on_surface not defined."
       end
       
       

data/lib/rgeo/geographic.rb

@@ -34,10 +34,6 @@
 ;
 
 
-# Parent file
-require 'rgeo'
-
-
 module RGeo
   
   
@@ -66,13 +62,6 @@ module RGeo
 end
 
 
-# Dependency files
-require 'rgeo/feature'
-require 'rgeo/coord_sys'
-require 'rgeo/wkrep'
-require 'rgeo/impl_helper'
-require 'rgeo/cartesian'
-
 # Implementation files.
 require 'rgeo/geographic/factory'
 require 'rgeo/geographic/projected_window'

data/lib/rgeo/geographic/factory.rb

@@ -143,7 +143,9 @@ module RGeo
       # Returns true if this factory supports a projection and the
       # projection wraps its x (easting) direction. For example, a
       # Mercator projection wraps, but a local projection that is valid
-      # only for a small area does not wrap.
+      # only for a small area does not wrap. Returns nil if this factory
+      # does not support or a projection, or if it is not known whether
+      # or not it wraps.
       
       def projection_wraps?
         @projector ? @projector.wraps? : nil
@@ -152,7 +154,8 @@ module RGeo
       
       # Returns a ProjectedWindow specifying the limits of the domain of
       # the projection space.
-      # Returns nil if this factory does not support a projection.
+      # Returns nil if this factory does not support a projection, or the
+      # projection limits are not known.
       
       def projection_limits_window
         if @projector

data/lib/rgeo/geographic/interface.rb

@@ -240,7 +240,7 @@ module RGeo
       
       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."
+          raise Error::UnsupportedOperation, "Proj4 is not supported because the proj4 library was not found at install time."
         end
         if (projection_factory_ = opts_[:projection_factory])
           projection_proj4_ = projection_factory_.proj4

data/lib/rgeo/geos.rb

@@ -34,10 +34,6 @@
 ;
 
 
-# Parent file
-require 'rgeo'
-
-
 module RGeo
   
   
@@ -65,9 +61,6 @@ module RGeo
 end
 
 
-# Dependency files
-require 'rgeo/feature'
-
 # Implementation files
 require 'rgeo/geos/factory'
 require 'rgeo/geos/interface'

data/lib/rgeo/geos/factory.rb

@@ -62,7 +62,7 @@ module RGeo
           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."
+            raise Error::UnsupportedOperation, "GEOS cannot support both Z and M coordinates at the same time."
           end
           buffer_resolution_ = opts_[:buffer_resolution].to_i
           buffer_resolution_ = 1 if buffer_resolution_ < 1

data/lib/rgeo/impl_helper.rb

@@ -34,10 +34,6 @@
 ;
 
 
-# Parent file
-require 'rgeo'
-
-
 module RGeo
   
   
@@ -48,9 +44,6 @@ module RGeo
 end
 
 
-# Dependency files
-require 'rgeo/feature'
-
 # Implementation files
 require 'rgeo/impl_helper/math'
 require 'rgeo/impl_helper/basic_geometry_methods'

data/lib/rgeo/wkrep.rb

@@ -34,10 +34,6 @@
 ;
 
 
-# Parent file
-require 'rgeo'
-
-
 module RGeo
   
   
@@ -69,9 +65,6 @@ module RGeo
 end
 
 
-# Dependency files
-require 'rgeo/feature'
-
 # Implementation files
 require 'rgeo/wkrep/wkt_parser'
 require 'rgeo/wkrep/wkt_generator'

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -222,10 +222,10 @@ module RGeo
           @cur_srid = srid_
           @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"
+            raise Error::ParseError, "Data has Z coordinates but the factory doesn't have Z coordinates"
           end
           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"
+            raise Error::ParseError, "Data has M coordinates but the factory doesn't have M coordinates"
           end
         end
         case type_code_

data/test/tc_oneoff.rb

@@ -50,7 +50,6 @@ module RGeo
         @projected_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, :has_z_coordinate => true)
         @geos_factory = ::RGeo::Geos.factory(:srid => 4326, :has_z_coordinate => true)
         @cartesian_factory = ::RGeo::Cartesian.simple_factory(:srid => 1, :has_z_coordinate => true)
-        @entity_factory = ::RGeo::GeoJSON::EntityFactory.instance
       end
       
       

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 22
-  version: 0.1.22
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,100 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
+date: 2010-12-07 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: arel
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 3
-        version: 2.0.3
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 1
-        version: 2.8.1
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mysql2
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 2
-        version: 0.6.2
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dbf
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  version_requirements: *id006
-description: RGeo is a spatial data library for Ruby. It provides an implementation of the Open Geospatial Consortium's Simple Features Specification, used by most standard spatial/geographic data storage systems such as PostGIS. It also provides a suite of useful tools for writing location-based applications using Ruby-based frameworks such as Ruby On Rails.
+dependencies: []
+
+description: RGeo is a spatial data library for Ruby. It provides an implementation of the Open Geospatial Consortium's Simple Features Specification, used by most standard spatial/geographic data storage systems such as PostGIS. A number of add-on modules are also available to help with writing location-based applications using Ruby-based frameworks such as Ruby On Rails.
 email: dazuma@gmail.com
 executables: []
 
@@ -119,15 +30,6 @@ extra_rdoc_files:
 - README.rdoc
 - Spatial_Programming_With_RGeo.rdoc
 files: 
-- lib/active_record/connection_adapters/mysql2spatial_adapter.rb
-- lib/active_record/connection_adapters/mysqlspatial_adapter.rb
-- lib/active_record/connection_adapters/postgis_adapter.rb
-- lib/active_record/connection_adapters/spatialite_adapter.rb
-- lib/rgeo/active_record/arel_modifications.rb
-- lib/rgeo/active_record/base_modifications.rb
-- lib/rgeo/active_record/common.rb
-- lib/rgeo/active_record/mysql_common.rb
-- lib/rgeo/all.rb
 - lib/rgeo/cartesian/analysis.rb
 - lib/rgeo/cartesian/bounding_box.rb
 - lib/rgeo/cartesian/calculations.rb
@@ -157,10 +59,6 @@ files:
 - lib/rgeo/feature/surface.rb
 - lib/rgeo/feature/types.rb
 - lib/rgeo/feature.rb
-- lib/rgeo/geo_json/coder.rb
-- lib/rgeo/geo_json/entities.rb
-- lib/rgeo/geo_json/interface.rb
-- lib/rgeo/geo_json.rb
 - lib/rgeo/geographic/factory.rb
 - lib/rgeo/geographic/interface.rb
 - lib/rgeo/geographic/proj4_projector.rb
@@ -185,8 +83,6 @@ files:
 - lib/rgeo/impl_helper/basic_polygon_methods.rb
 - lib/rgeo/impl_helper/math.rb
 - lib/rgeo/impl_helper.rb
-- lib/rgeo/shapefile/reader.rb
-- lib/rgeo/shapefile.rb
 - lib/rgeo/version.rb
 - lib/rgeo/wkrep/wkb_generator.rb
 - lib/rgeo/wkrep/wkb_parser.rb
@@ -197,10 +93,6 @@ files:
 - History.rdoc
 - README.rdoc
 - Spatial_Programming_With_RGeo.rdoc
-- test/active_record/common_setup_methods.rb
-- test/active_record/tc_mysqlspatial.rb
-- test/active_record/tc_postgis.rb
-- test/active_record/tc_spatialite.rb
 - test/common/geometry_collection_tests.rb
 - test/common/line_string_tests.rb
 - test/common/multi_line_string_tests.rb
@@ -226,7 +118,6 @@ files:
 - test/projected_geographic/tc_multi_polygon.rb
 - test/projected_geographic/tc_point.rb
 - test/projected_geographic/tc_polygon.rb
-- test/shapefile/tc_shapelib_tests.rb
 - test/simple_cartesian/tc_calculations.rb
 - test/simple_cartesian/tc_geometry_collection.rb
 - test/simple_cartesian/tc_line_string.rb
@@ -252,45 +143,11 @@ files:
 - test/spherical_geographic/tc_point.rb
 - test/spherical_geographic/tc_polygon.rb
 - test/tc_cartesian_analysis.rb
-- test/tc_geojson.rb
 - test/tc_oneoff.rb
 - test/wkrep/tc_wkb_generator.rb
 - test/wkrep/tc_wkb_parser.rb
 - test/wkrep/tc_wkt_generator.rb
 - test/wkrep/tc_wkt_parser.rb
-- test/active_record/readme.txt
-- test/shapefile/shapelib_testcases/readme.txt
-- test/shapefile/shapelib_testcases/test.shp
-- test/shapefile/shapelib_testcases/test0.shp
-- test/shapefile/shapelib_testcases/test1.shp
-- test/shapefile/shapelib_testcases/test10.shp
-- test/shapefile/shapelib_testcases/test11.shp
-- test/shapefile/shapelib_testcases/test12.shp
-- test/shapefile/shapelib_testcases/test13.shp
-- test/shapefile/shapelib_testcases/test2.shp
-- test/shapefile/shapelib_testcases/test3.shp
-- test/shapefile/shapelib_testcases/test4.shp
-- test/shapefile/shapelib_testcases/test5.shp
-- test/shapefile/shapelib_testcases/test6.shp
-- test/shapefile/shapelib_testcases/test7.shp
-- test/shapefile/shapelib_testcases/test8.shp
-- test/shapefile/shapelib_testcases/test9.shp
-- test/shapefile/shapelib_testcases/test.shx
-- test/shapefile/shapelib_testcases/test0.shx
-- test/shapefile/shapelib_testcases/test1.shx
-- test/shapefile/shapelib_testcases/test10.shx
-- test/shapefile/shapelib_testcases/test11.shx
-- test/shapefile/shapelib_testcases/test12.shx
-- test/shapefile/shapelib_testcases/test13.shx
-- test/shapefile/shapelib_testcases/test2.shx
-- test/shapefile/shapelib_testcases/test3.shx
-- test/shapefile/shapelib_testcases/test4.shx
-- test/shapefile/shapelib_testcases/test5.shx
-- test/shapefile/shapelib_testcases/test6.shx
-- test/shapefile/shapelib_testcases/test7.shx
-- test/shapefile/shapelib_testcases/test8.shx
-- test/shapefile/shapelib_testcases/test9.shx
-- test/shapefile/shapelib_testcases/test.dbf
 - ext/geos_c_impl/extconf.rb
 - ext/proj4_c_impl/extconf.rb
 - ext/geos_c_impl/factory.c
@@ -344,9 +201,6 @@ signing_key:
 specification_version: 3
 summary: RGeo is a spatial data library for Ruby.
 test_files: 
-- test/active_record/tc_mysqlspatial.rb
-- test/active_record/tc_postgis.rb
-- test/active_record/tc_spatialite.rb
 - test/coord_sys/tc_proj4.rb
 - test/geos/tc_factory.rb
 - test/geos/tc_geometry_collection.rb
@@ -365,7 +219,6 @@ test_files:
 - test/projected_geographic/tc_multi_polygon.rb
 - test/projected_geographic/tc_point.rb
 - test/projected_geographic/tc_polygon.rb
-- test/shapefile/tc_shapelib_tests.rb
 - test/simple_cartesian/tc_calculations.rb
 - test/simple_cartesian/tc_geometry_collection.rb
 - test/simple_cartesian/tc_line_string.rb
@@ -391,7 +244,6 @@ test_files:
 - test/spherical_geographic/tc_point.rb
 - test/spherical_geographic/tc_polygon.rb
 - test/tc_cartesian_analysis.rb
-- test/tc_geojson.rb
 - test/tc_oneoff.rb
 - test/wkrep/tc_wkb_generator.rb
 - test/wkrep/tc_wkb_parser.rb