GeoRuby 1.3.2 → 1.3.3

data/tools/lib/spatial_adapter/test/db/database_postgis.yml

@@ -1,4 +1,4 @@
 adapter: postgresql
 database: spatial_adapter_plugin_test
-username: gvellut
-password: 
+username: postgres
+password: 

data/tools/lib/spatial_adapter/test/find_postgis_test.rb

@@ -11,8 +11,8 @@ class FindPostgisTest < Test::Unit::TestCase
   def setup
     ActiveRecord::Schema.define() do
       create_table "parks", :force => true do |t|
-        t.column "data" , :string, :limit => 100
-        t.column "geom", :point,:null=>false,:srid=>123
+        t.string "data", :limit => 100
+        t.point "geom", :null=>false,:srid=>123
       end
       add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
     end

data/tools/lib/spatial_adapter/test/migration_mysql_test.rb

@@ -6,6 +6,9 @@ require 'common/common_mysql'
 class Park < ActiveRecord::Base
 end
 
+class CxGeographiclocation < ActiveRecord::Base
+  set_table_name "cx_geographiclocation"
+end
 
 class MigrationMysqlTest < Test::Unit::TestCase
   
@@ -131,5 +134,71 @@ class MigrationMysqlTest < Test::Unit::TestCase
     assert_equal("example_spatial_index",connection.indexes("parks")[0].name)
    end
 
+  def test_teresa
+     connection = ActiveRecord::Base.connection
+    
+    #creation
+    ActiveRecord::Schema.define() do
+      create_table(:cx_geographiclocation, :primary_key => "GeographicLocationID", :options=>"ENGINE=MyISAM", :force => true ) do |t|
+        t.column "CountryID", :integer,                           :null => false
+        t.column  "AddressLine1", :string,         :limit => 100, :null => false
+        t.column  "AddressLine2",  :string,        :limit => 100
+        t.column  "AddressLine3", :string,        :limit => 50
+        t.column  "City", :string,                :limit => 50
+        t.column  "StateProvince", :string,       :limit => 50
+        t.column  "PostalCode", :string,          :limit => 30
+        t.column  "Geocode", :point, :null  => false
+      end
+    end
+    
+    #test creation
+    assert_equal(9,connection.columns("cx_geographiclocation").length)
+    connection.columns("cx_geographiclocation").each do |col|
+      if col.name == "Geocode"
+        assert(col.is_a?(SpatialColumn))
+        assert(:geometry,col.type)
+        assert(:point,col.geometry_type)
+        assert(! col.null)
+      end
+    end
+
+    #creation index
+    ActiveRecord::Schema.define() do
+      add_index "cx_geographiclocation", ["addressline1"], :name => "ix_cx_geographiclocation_addressline1"
+      add_index "cx_geographiclocation", ["countryid"], :name => "ix_cx_geographiclocation_countryid"
+      add_index "cx_geographiclocation", "Geocode", :spatial=>true
+    end
+
+    #test index
+    assert_equal(3,connection.indexes("cx_geographiclocation").length)
+    assert(connection.indexes("cx_geographiclocation")[2].spatial)    
+
+    #insertion points
+    1.upto(1000) do |i|
+      pt = CxGeographiclocation.new("CountryID" => i, "AddressLine1" =>"Bouyoul", "Geocode" => Point.from_x_y(-180 + rand(360) + rand(),-90 + rand(180) + rand())) #insert floats
+      assert(pt.save)
+    end
+    
+    #should be outside the fetch by MBR
+    pt = CxGeographiclocation.new("CountryID" => 1337, "AddressLine1" =>"Bouyoul", "Geocode" => Point.from_x_y(-185,-90)) #insert floats
+    assert(pt.save)
+    
+    #fetch point and test
+    pt = CxGeographiclocation.find(:first)
+    assert(pt)
+    assert_equal("Bouyoul",pt.attributes["AddressLine1"])
+
+
+    #fetch by MBR and test
+    pts =  CxGeographiclocation.find_all_by_Geocode([[-181 + rand(),-91 + rand()],[181 + rand(),91 + rand()]]) #selects all : range limits are float
+    assert(pts)
+    assert(pts.is_a?(Array))
+    assert_equal(1000,pts.length)
+    assert_equal("Bouyoul",pts[0].attributes["AddressLine1"])
+
+   end
+
+  
+
   
 end

data/tools/lib/spatial_adapter/test/migration_postgis_test.rb

@@ -21,9 +21,9 @@ class MigrationPostgisTest < Test::Unit::TestCase
     #create a table with a geometric column
     ActiveRecord::Schema.define do
       create_table "parks", :force => true do |t|
-        t.column "data" , :string, :limit => 100
-        t.column "value", :integer
-        t.column "geom", :polygon, :null=>false, :srid => 555 , :with_z => true,:with_m => true
+        t.string "data",  :limit => 100
+        t.integer "value"
+        t.polygon "geom", :null=>false, :srid => 555 , :with_z => true,:with_m => true
       end
     end
     
@@ -115,10 +115,10 @@ class MigrationPostgisTest < Test::Unit::TestCase
   def test_keyword_column_name
     ActiveRecord::Schema.define do
       create_table "parks", :force => true do |t|
-        t.column "data" , :string, :limit => 100
-        t.column "value", :integer
+        t.string "data", :limit => 100
+        t.integer "value"
         #location is a postgreSQL keyword and is surrounded by double-quotes ("") when appearing in constraint descriptions ; tests a bug corrected in version 39
-        t.column "location", :point,:null=>false,:srid => 0, :with_m => true, :with_z => true
+        t.point "location", :null=>false,:srid => 0, :with_m => true, :with_z => true
       end
     end
 
@@ -144,9 +144,9 @@ class MigrationPostgisTest < Test::Unit::TestCase
     #Force the creation of a table
     ActiveRecord::Schema.define do
       create_table "parks", :force => true do |t|
-        t.column "data" , :string, :limit => 100
-        t.column "value", :integer
-        t.column "geom", :multi_polygon,:null=>false,:srid => 0, :with_m => true, :with_z => true
+        t.string "data" , :limit => 100
+        t.integer "value"
+        t.multi_polygon "geom", :null=>false,:srid => 0, :with_m => true, :with_z => true
       end
       
       add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"

data/tools/lib/spatial_adapter/test/schema/schema_postgis.rb

@@ -4,66 +4,62 @@ require File.dirname(__FILE__) + '/../common/common_postgis.rb'
 ActiveRecord::Schema.define() do
 
   create_table "table_points", :force => true do |t|
-    t.column "data", :string
-    t.column "geom", :point, :null=>false
+    t.string "data"
+    t.point "geom", :null=>false
   end
 
   create_table "table_keyword_column_points", :force => true do |t|
-    t.column "location", :point, :null => false
+    t.point "location", :null => false
   end
 
   create_table "table_line_strings", :force => true do |t|
-    t.column "value", :integer
-    t.column "geom", :line_string, :null=>false
+    t.integer "value"
+    t.line_string "geom", :null=>false
   end
   
   create_table "table_polygons", :force => true do |t|
-    t.column "geom", :polygon, :null=>false
+    t.polygon "geom", :null=>false
   end
 
   create_table "table_multi_points", :force => true do |t|
-    t.column "geom", :multi_point, :null=>false
+    t.multi_point "geom", :null=>false
   end
   
   create_table "table_multi_line_strings", :force => true do |t|
-    t.column "geom", :multi_line_string, :null=>false
+    t.multi_line_string "geom", :null=>false
   end
 
   create_table "table_multi_polygons", :force => true do |t|
-    t.column "geom", :multi_polygon, :null=>false
+    t.multi_polygon "geom", :null=>false
   end
 
   create_table "table_geometries", :force => true do |t|
-    t.column "geom", :geometry, :null=>false
+    t.geometry "geom", :null=>false
   end
 
   create_table "table_geometry_collections", :force => true do |t|
-    t.column "geom", :geometry_collection, :null=>false
+    t.geometry_collection "geom", :null=>false
   end
 
   create_table "table3dz_points", :force => true do |t|
     t.column "data", :string
-    t.column "geom", :point, :null => false , :with_z => true
+    t.point "geom", :null => false , :with_z => true
   end
 
   create_table "table3dm_points", :force => true do |t|
-    t.column "geom", :point, :null => false , :with_m => true
+    t.point "geom", :null => false , :with_m => true
   end
 
   create_table "table4d_points", :force => true do |t|
-    t.column "geom", :point, :null => false, :with_m => true, :with_z => true
+    t.point "geom", :null => false, :with_m => true, :with_z => true
   end
 
    create_table "table_srid_line_strings", :force => true do |t|
-    t.column "geom", :line_string, :null => false , :srid => 123
+    t.line_string "geom", :null => false , :srid => 123
   end
 
   create_table "table_srid4d_polygons", :force => true do |t|
-    t.column "geom", :polygon, :with_m => true, :with_z => true, :srid => 123
+    t.polygon "geom", :with_m => true, :with_z => true, :srid => 123
   end
  
 end
-
-
-
-

data/tools/shp2sql.rb

@@ -20,7 +20,7 @@ end
 def shp_geom_type_2_rails(type)
   case type
   when ShpType::POINT then :point
-  when ShpType::POLYLINE then :mlti_line_string
+  when ShpType::POLYLINE then :multi_line_string
   when ShpType::POLYGON then :multi_polygon
   when ShpType::MULTIPOINT then :multi_point 
   end

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2007-09-14 00:00:00 +02:00
-summary: Ruby data holder for OGC Simple Features
-require_paths: 
-- lib
-email: guilhem.vellut@gmail.com
-homepage: http://thepochisuperstarmegashow.com/projects/
-rubyforge_project: 
-description: GeoRuby is intended as a holder for data returned from PostGIS and MySQL Spatial queries. The data model roughly follows the OGC "Simple Features for SQL" specification (see www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections)
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.3.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Guilhem Vellut
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-03-02 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: GeoRuby is intended as a holder for data returned from PostGIS and MySQL Spatial queries. The data model roughly follows the OGC "Simple Features for SQL" specification (see www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections)
+email: guilhem.vellut@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - lib/geo_ruby/shp4r/dbf.rb
 - lib/geo_ruby/shp4r/shp.rb
@@ -39,11 +32,8 @@ files:
 - lib/geo_ruby/simple_features/geometry_factory.rb
 - lib/geo_ruby/simple_features/georss_parser.rb
 - lib/geo_ruby/simple_features/helper.rb
-- lib/geo_ruby/simple_features/io/ewkb_parser.rb
-- lib/geo_ruby/simple_features/io/ewkt_parser.rb
-- lib/geo_ruby/simple_features/io/geometry_factory.rb
-- lib/geo_ruby/simple_features/linear_ring.rb
 - lib/geo_ruby/simple_features/line_string.rb
+- lib/geo_ruby/simple_features/linear_ring.rb
 - lib/geo_ruby/simple_features/multi_line_string.rb
 - lib/geo_ruby/simple_features/multi_point.rb
 - lib/geo_ruby/simple_features/multi_polygon.rb
@@ -101,6 +91,33 @@ files:
 - tools/lib/spatial_adapter/test/db
 - tools/lib/spatial_adapter/test/models
 - tools/lib/spatial_adapter/test/schema
+has_rdoc: true
+homepage: http://thepochisuperstarmegashow.com/projects/
+post_install_message: 
+rdoc_options: 
+- --main
+- README
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: 
+- none
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby data holder for OGC Simple Features
 test_files: 
 - test/test_ewkb_parser.rb
 - test/test_ewkt_parser.rb
@@ -108,16 +125,3 @@ test_files:
 - test/test_shp.rb
 - test/test_shp_write.rb
 - test/test_simple_features.rb
-rdoc_options: 
-- --main
-- README
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
-requirements: 
-- none
-dependencies: []
-

data/lib/geo_ruby/simple_features/io/ewkb_parser.rb

@@ -1,213 +0,0 @@
-require 'geo_ruby/simple_features/point'
-require 'geo_ruby/simple_features/line_string'
-require 'geo_ruby/simple_features/linear_ring'
-require 'geo_ruby/simple_features/polygon'
-require 'geo_ruby/simple_features/multi_point'
-require 'geo_ruby/simple_features/multi_line_string'
-require 'geo_ruby/simple_features/multi_polygon'
-require 'geo_ruby/simple_features/geometry_collection'
-
-module GeoRuby
-  module SimpleFeatures
-    module Io
-      #Raised when an error in the EWKB string is detected
-      class EWKBFormatError < StandardError
-      end
-      
-      #Parses EWKB strings and notifies of events (such as the beginning of the definition of geometry, the value of the SRID...) the factory passed as argument to the constructor.
-      #
-      #=Example
-      # factory = GeometryFactory::new
-      # ewkb_parser = EWKBParser::new(factory)
-      # ewkb_parser.parse(<EWKB String>)
-      # geometry = @factory.geometry
-      #
-      #You can also use directly the static method Geometry.from_ewkb
-      class EWKBParser
-        
-        def initialize(factory)
-          @factory = factory
-          @parse_options ={
-            1 => method(:parse_point),
-            2 => method(:parse_line_string),
-            3 => method(:parse_polygon),
-            4 => method(:parse_multi_point),
-            5 => method(:parse_multi_line_string),
-            6 => method(:parse_multi_polygon),
-            7 => method(:parse_geometry_collection)
-          }
-        end
-        
-        #Parses the ewkb string passed as argument and notifies the factory of events
-        def parse(ewkb)
-          @factory.reset
-          @unpack_structure=UnpackStructure::new(ewkb)
-          @with_z = false
-          @with_m = false
-          parse_geometry
-          @unpack_structure.done
-          @srid=nil
-        end
-        
-        private
-        def parse_geometry
-          @unpack_structure.endianness=@unpack_structure.read_byte
-          @geometry_type = @unpack_structure.read_uint
-          
-          if (@geometry_type & Z_MASK) != 0
-            @with_z=true
-            @geometry_type = @geometry_type & ~Z_MASK
-          end
-          if (@geometry_type & M_MASK) != 0
-            @with_m=true
-            @geometry_type = @geometry_type & ~M_MASK
-          end
-          if (@geometry_type & SRID_MASK) != 0
-            @srid = @unpack_structure.read_uint
-            @geometry_type = @geometry_type & ~SRID_MASK
-          else
-            #to manage multi geometries : the srid is not present in sub_geometries, therefore we take the srid of the parent ; if it is the root, we take the default srid
-            @srid= @srid || DEFAULT_SRID
-          end
-          
-          if @parse_options.has_key? @geometry_type
-            @parse_options[@geometry_type].call
-          else
-            raise EWKBFormatError::new("Unknown geometry type")
-          end
-        end
-        
-        def parse_geometry_collection
-          parse_multi_geometries(GeometryCollection)
-        end
-        
-        def parse_multi_polygon
-          parse_multi_geometries(MultiPolygon)
-        end
-        
-        def parse_multi_line_string
-          parse_multi_geometries(MultiLineString)
-        end
-        
-        def parse_multi_point
-          parse_multi_geometries(MultiPoint)
-        end
-        
-        def parse_multi_geometries(geometry_type)
-          @factory.begin_geometry(geometry_type,@srid)
-          num_geometries = @unpack_structure.read_uint
-          1.upto(num_geometries) { parse_geometry }
-          @factory.end_geometry(@with_z,@with_m)
-        end
-        
-        def parse_polygon
-          @factory.begin_geometry(Polygon,@srid)
-          num_linear_rings = @unpack_structure.read_uint
-          1.upto(num_linear_rings) {parse_linear_ring}
-          @factory.end_geometry(@with_z,@with_m)
-        end
-        
-        def parse_linear_ring
-          parse_point_list(LinearRing)
-        end
-        
-        def parse_line_string
-          parse_point_list(LineString)
-        end
-        
-        #used to parse line_strings and linear_rings
-        def parse_point_list(geometry_type)
-          @factory.begin_geometry(geometry_type,@srid)
-          num_points = @unpack_structure.read_uint
-          1.upto(num_points) {parse_point}
-          @factory.end_geometry(@with_z,@with_m)
-        end
-        
-        def parse_point
-          @factory.begin_geometry(Point,@srid)
-          x = @unpack_structure.read_double
-          y = @unpack_structure.read_double
-          if ! (@with_z or @with_m) #most common case probably
-            @factory.add_point_x_y(x,y)
-          elsif @with_m and @with_z
-            z = @unpack_structure.read_double
-            m = @unpack_structure.read_double
-            @factory.add_point_x_y_z_m(x,y,z,m)
-          elsif @with_z
-            z = @unpack_structure.read_double
-            @factory.add_point_x_y_z(x,y,z)
-          else
-            m = @unpack_structure.read_double
-            @factory.add_point_x_y_m(x,y,m)
-          end
-          
-          @factory.end_geometry(@with_z,@with_m)
-        end
-      end
-      
-      #Parses HexEWKB strings. In reality, it just transforms the HexEWKB string into the equivalent EWKB string and lets the EWKBParser do the actual parsing.
-      class HexEWKBParser < EWKBParser
-        def initialize(factory)
-          super(factory)
-        end
-        #parses an HexEWKB string
-        def parse(hexewkb)
-          super(decode_hex(hexewkb))
-        end
-        #transforms a HexEWKB string into an EWKB string 
-        def decode_hex(hexewkb)
-          temp_hexewkb= hexewkb.clone
-          result=""
-          while c = temp_hexewkb.slice!(0,2) do
-            break if c.length==0
-            result << c.hex
-          end
-          result
-        end
-        
-      end
-      
-      class UnpackStructure #:nodoc:
-        NDR=1
-        XDR=0
-        def initialize(ewkb)
-          @position=0
-          @ewkb=ewkb
-        end
-        def done
-          raise EWKBFormatError::new("Trailing data") if @position != @ewkb.length
-        end
-        def read_double
-          i=@position
-          @position += 8
-          packed_double = @ewkb[i...@position]
-          raise EWKBFormatError::new("Truncated data") if packed_double.nil? or packed_double.length < 8
-          packed_double.unpack(@double_mark)[0]
-        end
-        def read_uint
-          i=@position
-          @position += 4
-          packed_uint = @ewkb[i...@position]
-          raise EWKBFormatError::new("Truncated data") if packed_uint.nil? or packed_uint.length < 4
-          packed_uint.unpack(@uint_mark)[0]
-        end
-        def read_byte
-          i = @position
-          @position += 1
-          packed_byte = @ewkb[i...@position]
-          raise EWKBFormatError::new("Truncated data") if packed_byte.nil? or packed_byte.length < 1
-          packed_byte.unpack("C")[0]
-        end
-        def endianness=(byte_order)
-          if(byte_order == NDR)
-            @uint_mark="V"
-            @double_mark="E"
-          elsif(byte_order == XDR)
-            @uint_mark="N"
-            @double_mark="G"
-          end
-        end
-      end
-    end
-  end
-end