nofxx-georuby 1.3.7 → 1.3.9

data/.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+pkg/*.gem
+pkg/*.tgz
+pkg/**/*
+coverage/*
+doc/*

data/README.txt

@@ -1,29 +1,9 @@
-= geo_ruby
+=GeoRuby
 
-Experiment with GeoRuby (http://georuby.rubyforge.org) with the fast Geo (http://geo.rubyforge.org).
-
-
-== DESCRIPTION:
-
-the objective is provide all the georuby functionalities, with time consuming calculus in C.
-_this is not usable yet_
-
-See:
-GeoRuby (http://georuby.rubyforge.org)
-Copyright (c) 2006 Guilhem Vellut <guilhem.vellut+georuby@gmail.com>
-
-Geo (http://geo.rubyforge.org)
-Copyright (C) 2007 Martin Kihlgren
-
-
-== REQUIREMENTS:
-
-glib:: http://www.gtk.org/
-
-== FEATURES:
-
-=Available data types
+This is a fork of GeoRuby. It is intended as a holder for data returned from PostGIS and the Spatial Extensions of MySql. The data model roughly follows the OGC "Simple Features for SQL" specification (see http://www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections). It also supports various output and input formats (GeoRSS, KML, Shapefile).
 
+===Available data types
+The following geometric data types are provided :
 - Point
 - Line string
 - Linear ring
@@ -35,25 +15,69 @@ glib:: http://www.gtk.org/
 
 They can be in 2D, 3DZ, 3DM, and 4D.
 
+On top of this an Envelope class is available, to contain the bounding box of a geometry.
+
+===Input and output
+These geometries can be input and output in WKB/EWKB/WKT/EWKT format (as well as the related HexWKB and HexEWKB formats). HexEWKB and WKB are the default form under which geometric data is returned respectively from PostGIS and MySql.
+
+GeoRSS Simple, GeoRSS W3CGeo, GeoRSS GML can also be input and output. Note that they will not output valid RSS, but just the part strictly concerning the geometry as outlined in http://www.georss.org/1/ . Since the model does not allow multiple geometries, for geometry collections, only the first geometry will be output. Similarly, for polygons, the GeoRSS output will only contain the outer ring. As for W3CGeo output, only points can be output, so the first point of the geometry is chosen. By default the Simple format is output. Envelope can also be output in these formats: The box geometric type is chosen (except for W3CGeo, where the center of the envelope is chose). These formats can also be input and a GeoRuby geometry will be created. Note that it will not read a valid RSS file, only a geometry string.
+
+On top of that, there is now support for KML output and input. As for GeoRSS, a valid KML file will not be output, but only the geometric data. Options <tt>:id</tt>, <tt>:extrude</tt>, <tt>:tesselate</tt> and <tt>:altitude_mode</tt> can be given. Note that if the <tt>:altitude_mode</tt> option is not passed or set to <tt>clampToGround</tt>, the altitude data will not be output even if present. Envelopes output a LatLonAltBox instead of a geometry. For the output, the following geometric types are supported : Point, LineString, Polygon.
+
+===SHP reading et writing
+Georuby has support for reading ESRI shapefiles (http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf). A tool called <tt>shp2sql.rb</tt> is also provided : it shows how to use the SHP reading functionality together with the spatial adapter plugin for Rails to import spatial features into MySQL and PostGIS.
 
-Geo::Point:: A 2D point providing some common geometry operations.
-Geo::Line:: A 2D line consisting of 2 Geo::Points providing some common geometry operations.
-Geo::Triangle:: A 2D triangle consisting of 3 Geo::Points providing some common geometry operations.
-Geo::PointSet:: A Set-like container of Points.
-Geo::LineSet:: A Set-like container of Lines that provides optimized versions of some common geometry operations on lines.
-Geo::TriangleSet:: A Set-like container of Triangles that provides optimized versions of some common geometry operations on lines.
+Here is an example of Shapefile reading, that goes through all the geometries in a file and disaply the values of the attributes :
+        ShpFile.open(shpfile) do |shp|
+                shp.each do |shape|
+                        geom = shape.geometry #a GeoRuby SimpleFeature
+                        att_data = shape.data #a Hash
+                        shp.fields.each do |field|
+                                puts att_data[field.name]
+                        end
+                end
+        end
 
-== Usage:
+Support for ESRI shapefile creation and modification has been added as well. New shapefiles can be created given a geometry type and specifications for the DBF fields. Data can be added and removed from an existing shapefile. An update operation is also provided for convenience : it just performs a 'delete' and an 'add', which means the index of the modified record will change. Note that once a shapefile has been created, GeoRuby does not allow the modification of the schema (it will probably be done in a subsequent version).
 
-Just install the gem.
+Here is an example of how to create a new Shapefile with 2 fields :
+        shpfile = ShpFile.create('hello.shp',ShpType::POINT,[Dbf::Field.new("Hoyoyo","C",10),Dbf::Field.new("Boyoul","N",10,0)])
+The file is then open for reading and writing.
 
-== Examples:
+Here is an example of how to write to a shapefile (created or not with GeoRuby) :
+        shpfile = ShpFile.open('places.shp')
+        shpfile.transaction do |tr|
+                tr.add(ShpRecord.new(Point.from_x_y(123.4,123.4),'Hoyoyo' => "AEZ",'Bouyoul' => 45))
+                tr.update(4,ShpRecord.new(Point.from_x_y(-16.67,16.41),'Hoyoyo' => "EatMe",'Bouyoul' => 42))
+                tr.delete(1)
+        end
+        shpfile.close
 
-To find if a given line intersects a set of 100 000 other lines:
+Note the transaction is just there so the operations on the files can be buffered. Nothing happens on the original files until the block has finished executing. Calling <tt>tr.rollback</tt> at anytime during the execution will prevent the modifications.
 
- :include:examples/intersects.rb
+Also currently, error reporting is minimal and it has not been tested that thoroughly so caveat emptor and backup before performing any destructive operation.
 
-== License:
+===Installation
+To install the latest version, just type :
+      gem install GeoRuby
 
+===Changes since the last version
+- Writing of ESRI shapefiles
+- Reading of ESRI shapefiles
+- Addition of a small tool to import spatial features in MySQL and PostGIS from a SHP file
+
+===Coming in the next versions
+- Schema modification of existing shapefiles
+- More error reporting when writing shapefiles
+- More tests on writing shapefiles ; tests on real-world shapefiles
+- Better shp2sql import tool
+- Documentation
+
+===Acknowledgement
+The SHP reading part uses a modified version of the DBF library (http://rubyforge.org/projects/dbf/) by Keith Morrison (http://infused.org). Thanks also to Pramukta Kumar and Pete Schwamb for their contributions.
+
+===License
 GeoRuby is released under the MIT license.
-geo is provided under the GPL-2.
+
+===Support
+Any questions, enhancement proposals, bug notifications or corrections can be sent to mailto:guilhem.vellut@gmail.com.

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 3
-:patch: 7
+:patch: 9

data/georuby.gemspec

@@ -0,0 +1,112 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{georuby}
+  s.version = "1.3.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Guilhem Vellut", "Marcos Augusto"]
+  s.date = %q{2009-05-07}
+  s.description = %q{GeoRuby provides geometric data types from the OGC 'Simple Features' specification.}
+  s.email = %q{x@nofxx.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "README.txt",
+     "Rakefile",
+     "VERSION.yml",
+     "georuby.gemspec",
+     "lib/geo_ruby.rb",
+     "lib/geo_ruby/shp4r/dbf.rb",
+     "lib/geo_ruby/shp4r/shp.rb",
+     "lib/geo_ruby/simple_features/envelope.rb",
+     "lib/geo_ruby/simple_features/ewkb_parser.rb",
+     "lib/geo_ruby/simple_features/ewkt_parser.rb",
+     "lib/geo_ruby/simple_features/geometry.rb",
+     "lib/geo_ruby/simple_features/geometry_collection.rb",
+     "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/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",
+     "lib/geo_ruby/simple_features/point.rb",
+     "lib/geo_ruby/simple_features/polygon.rb",
+     "script/console",
+     "script/destroy",
+     "script/generate",
+     "script/txt2html",
+     "spec/data/multipoint.dbf",
+     "spec/data/multipoint.shp",
+     "spec/data/multipoint.shx",
+     "spec/data/point.dbf",
+     "spec/data/point.shp",
+     "spec/data/point.shx",
+     "spec/data/polygon.dbf",
+     "spec/data/polygon.shp",
+     "spec/data/polygon.shx",
+     "spec/data/polyline.dbf",
+     "spec/data/polyline.shp",
+     "spec/data/polyline.shx",
+     "spec/geo_ruby/shp4r/shp_spec.rb",
+     "spec/geo_ruby/simple_features/envelope_spec.rb",
+     "spec/geo_ruby/simple_features/ewkb_parser_spec.rb",
+     "spec/geo_ruby/simple_features/ewkt_parser_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_collection_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_factory_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_spec.rb",
+     "spec/geo_ruby/simple_features/georss_parser_spec.rb",
+     "spec/geo_ruby/simple_features/line_string_spec.rb",
+     "spec/geo_ruby/simple_features/linear_ring_spec.rb",
+     "spec/geo_ruby/simple_features/multi_line_string_spec.rb",
+     "spec/geo_ruby/simple_features/multi_point_spec.rb",
+     "spec/geo_ruby/simple_features/multi_polygon_spec.rb",
+     "spec/geo_ruby/simple_features/point_spec.rb",
+     "spec/geo_ruby/simple_features/polygon_spec.rb",
+     "spec/geo_ruby_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/nofxx/georuby}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{Ruby data holder for OGC Simple Features}
+  s.test_files = [
+    "spec/geo_ruby/shp4r/shp_spec.rb",
+     "spec/geo_ruby/simple_features/polygon_spec.rb",
+     "spec/geo_ruby/simple_features/linear_ring_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_factory_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_spec.rb",
+     "spec/geo_ruby/simple_features/georss_parser_spec.rb",
+     "spec/geo_ruby/simple_features/multi_point_spec.rb",
+     "spec/geo_ruby/simple_features/ewkt_parser_spec.rb",
+     "spec/geo_ruby/simple_features/line_string_spec.rb",
+     "spec/geo_ruby/simple_features/multi_line_string_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_collection_spec.rb",
+     "spec/geo_ruby/simple_features/ewkb_parser_spec.rb",
+     "spec/geo_ruby/simple_features/multi_polygon_spec.rb",
+     "spec/geo_ruby/simple_features/point_spec.rb",
+     "spec/geo_ruby/simple_features/envelope_spec.rb",
+     "spec/geo_ruby_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/geo_ruby/shp4r/shp.rb

@@ -161,7 +161,7 @@ module GeoRuby
         case(rec_shp_type)
         when ShpType::POINT
           x, y = @shp.read(16).unpack("E2")
-          geometry = GeoRuby::Base::Point.from_x_y(x,y)
+          geometry = GeoRuby::SimpleFeatures::Point.from_x_y(x,y)
         when ShpType::POLYLINE #actually creates a multi_polyline
           @shp.seek(32,IO::SEEK_CUR) #extent
           num_parts, num_points = @shp.read(8).unpack("V2")
@@ -169,12 +169,12 @@ module GeoRuby
           parts << num_points #indexes for LS of idx i go to parts of idx i to idx i +1
           points = Array.new(num_points) do
             x, y = @shp.read(16).unpack("E2")
-            GeoRuby::Base::Point.from_x_y(x,y)
+            GeoRuby::SimpleFeatures::Point.from_x_y(x,y)
           end
           line_strings = Array.new(num_parts) do |i|
-            GeoRuby::Base::LineString.from_points(points[(parts[i])...(parts[i+1])])
+            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])])
           end
-          geometry = GeoRuby::Base::MultiLineString.from_line_strings(line_strings)
+          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings)
         when ShpType::POLYGON
           #TODO : TO CORRECT
           #does not take into account the possibility that the outer loop could be after the inner loops in the SHP + more than one outer loop
@@ -185,25 +185,25 @@ module GeoRuby
           parts << num_points #indexes for LS of idx i go to parts of idx i to idx i +1
           points = Array.new(num_points) do
             x, y = @shp.read(16).unpack("E2")
-            GeoRuby::Base::Point.from_x_y(x,y)
+            GeoRuby::SimpleFeatures::Point.from_x_y(x,y)
           end
           linear_rings = Array.new(num_parts) do |i|
-            GeoRuby::Base::LinearRing.from_points(points[(parts[i])...(parts[i+1])])
+            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])])
           end
-          geometry = GeoRuby::Base::MultiPolygon.from_polygons([GeoRuby::Base::Polygon.from_linear_rings(linear_rings)])
+          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)])
         when ShpType::MULTIPOINT
           @shp.seek(32,IO::SEEK_CUR)
           num_points = @shp.read(4).unpack("V")[0]
           points = Array.new(num_points) do
             x, y = @shp.read(16).unpack("E2")
-            GeoRuby::Base::Point.from_x_y(x,y)
+            GeoRuby::SimpleFeatures::Point.from_x_y(x,y)
           end
-          geometry = GeoRuby::Base::MultiPoint.from_points(points)
+          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points)
 
 
         when ShpType::POINTZ
           x, y, z, m = @shp.read(24).unpack("E4")
-          geometry = GeoRuby::Base::Point.from_x_y_z_m(x,y,z,m)
+          geometry = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(x,y,z,m)
 
 
         when ShpType::POLYLINEZ
@@ -217,12 +217,12 @@ module GeoRuby
           @shp.seek(16,IO::SEEK_CUR)
           ms = Array.new(num_points) {@shp.read(8).unpack("E")[0]}
           points = Array.new(num_points) do |i|
-            GeoRuby::Base::Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
+            GeoRuby::SimpleFeatures::Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
           end
           line_strings = Array.new(num_parts) do |i|
-            GeoRuby::Base::LineString.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::Base::default_srid,true,true)
+            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::default_srid,true,true)
           end
-          geometry = GeoRuby::Base::MultiLineString.from_line_strings(line_strings,GeoRuby::Base::default_srid,true,true)
+          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings,GeoRuby::SimpleFeatures::default_srid,true,true)
 
 
         when ShpType::POLYGONZ
@@ -241,9 +241,9 @@ module GeoRuby
             Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
           end
           linear_rings = Array.new(num_parts) do |i|
-            GeoRuby::Base::LinearRing.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::Base::default_srid,true,true)
+            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::default_srid,true,true)
           end
-          geometry = GeoRuby::Base::MultiPolygon.from_polygons([GeoRuby::Base::Polygon.from_linear_rings(linear_rings)],GeoRuby::Base::default_srid,true,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)],GeoRuby::SimpleFeatures::default_srid,true,true)
 
 
         when ShpType::MULTIPOINTZ
@@ -259,11 +259,11 @@ module GeoRuby
             Point.from_x_y_z_m(xys[i][0],xys[i][1],zs[i],ms[i])
           end
 
-          geometry = GeoRuby::Base::MultiPoint.from_points(points,GeoRuby::Base::default_srid,true,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points,GeoRuby::SimpleFeatures::default_srid,true,true)
 
         when ShpType::POINTM
           x, y, m = @shp.read(24).unpack("E3")
-          geometry = GeoRuby::Base::Point.from_x_y_m(x,y,m)
+          geometry = GeoRuby::SimpleFeatures::Point.from_x_y_m(x,y,m)
 
         when ShpType::POLYLINEM
           @shp.seek(32,IO::SEEK_CUR)
@@ -277,9 +277,9 @@ module GeoRuby
             Point.from_x_y_m(xys[i][0],xys[i][1],ms[i])
           end
           line_strings = Array.new(num_parts) do |i|
-            GeoRuby::Base::LineString.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::Base::default_srid,false,true)
+            GeoRuby::SimpleFeatures::LineString.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::default_srid,false,true)
           end
-          geometry = GeoRuby::Base::MultiLineString.from_line_strings(line_strings,GeoRuby::Base::default_srid,false,true)
+          geometry = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings(line_strings,GeoRuby::SimpleFeatures::default_srid,false,true)
 
 
         when ShpType::POLYGONM
@@ -296,9 +296,9 @@ module GeoRuby
             Point.from_x_y_m(xys[i][0],xys[i][1],ms[i])
           end
           linear_rings = Array.new(num_parts) do |i|
-            GeoRuby::Base::LinearRing.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::Base::default_srid,false,true)
+            GeoRuby::SimpleFeatures::LinearRing.from_points(points[(parts[i])...(parts[i+1])],GeoRuby::SimpleFeatures::default_srid,false,true)
           end
-          geometry = GeoRuby::Base::MultiPolygon.from_polygons([GeoRuby::Base::Polygon.from_linear_rings(linear_rings)],GeoRuby::Base::default_srid,false,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_linear_rings(linear_rings)],GeoRuby::SimpleFeatures::default_srid,false,true)
 
 
         when ShpType::MULTIPOINTM
@@ -312,7 +312,7 @@ module GeoRuby
             Point.from_x_y_m(xys[i][0],xys[i][1],ms[i])
           end
 
-          geometry = GeoRuby::Base::MultiPoint.from_points(points,GeoRuby::Base::default_srid,false,true)
+          geometry = GeoRuby::SimpleFeatures::MultiPoint.from_points(points,GeoRuby::SimpleFeatures::default_srid,false,true)
         else
           geometry = nil
         end
@@ -402,17 +402,17 @@ module GeoRuby
       private
 
       def to_shp_type(geom)
-        root = if geom.is_a? GeoRuby::Base::Point
+        root = if geom.is_a? GeoRuby::SimpleFeatures::Point
                  "POINT"
-               elsif geom.is_a? GeoRuby::Base::LineString
+               elsif geom.is_a? GeoRuby::SimpleFeatures::LineString
                  "POLYLINE"
-               elsif geom.is_a?  GeoRuby::Base::Polygon
+               elsif geom.is_a?  GeoRuby::SimpleFeatures::Polygon
                  "POLYGON"
-               elsif geom.is_a?  GeoRuby::Base::MultiPoint
+               elsif geom.is_a?  GeoRuby::SimpleFeatures::MultiPoint
                  "MULTIPOINT"
-               elsif geom.is_a?  GeoRuby::Base::MultiLineString
+               elsif geom.is_a?  GeoRuby::SimpleFeatures::MultiLineString
                  "POLYLINE"
-               elsif geom.is_a?  GeoRuby::Base::MultiPolygon
+               elsif geom.is_a?  GeoRuby::SimpleFeatures::MultiPolygon
                  "POLYGON"
                else
                  false
@@ -589,7 +589,7 @@ module GeoRuby
       end
 
       def build_polyline(geometry,str)
-        if geometry.is_a? GeoRuby::Base::LineString
+        if geometry.is_a? GeoRuby::SimpleFeatures::LineString
           str << [1,geometry.length,0].pack("V3")
           geometry.each do |point|
               str << [point.x,point.y].pack("E2")
@@ -609,7 +609,7 @@ module GeoRuby
 
       def build_polyline_zm(geometry,zm,range,str)
         str << range.pack("E2")
-        if geometry.is_a? GeoRuby::Base::LineString
+        if geometry.is_a? GeoRuby::SimpleFeatures::LineString
           geometry.each do |point|
             str << [point.instance_variable_get(zm)].pack("E")
           end
@@ -625,7 +625,7 @@ module GeoRuby
       end
 
       def build_polygon(geometry,str)
-        if geometry.is_a? GeoRuby::Base::Polygon
+        if geometry.is_a? GeoRuby::SimpleFeatures::Polygon
           str << [geometry.length,geometry.inject(0) {|l, lr| l + lr.length}].pack("V2")
           str << geometry.inject([0]) {|a,lr| a << (a.last + lr.length)}.pack("V#{geometry.length}") #last element of the previous array is dropped
           geometry.each do |lr|
@@ -651,7 +651,7 @@ module GeoRuby
 
       def build_polygon_zm(geometry,zm,range,str)
         str << range.pack("E2")
-        if geometry.is_a? GeoRuby::Base::Polygon
+        if geometry.is_a? GeoRuby::SimpleFeatures::Polygon
           geometry.each do |lr|
             lr.each do |point|
               str << [point.instance_variable_get(zm)].pack("E")

data/lib/geo_ruby/{base → simple_features}/envelope.rb

@@ -1,5 +1,5 @@
 module GeoRuby
-  module Base
+  module SimpleFeatures
 
     #Contains the bounding box of a geometry
     class Envelope

data/lib/geo_ruby/{base → simple_features}/ewkb_parser.rb

@@ -1,14 +1,14 @@
-require 'geo_ruby/base/point'
-require 'geo_ruby/base/line_string'
-require 'geo_ruby/base/linear_ring'
-require 'geo_ruby/base/polygon'
-require 'geo_ruby/base/multi_point'
-require 'geo_ruby/base/multi_line_string'
-require 'geo_ruby/base/multi_polygon'
-require 'geo_ruby/base/geometry_collection'
+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 Base
+  module SimpleFeatures
 
     #Raised when an error in the EWKB string is detected
     class EWKBFormatError < StandardError

data/lib/geo_ruby/{base → simple_features}/ewkt_parser.rb

@@ -1,16 +1,16 @@
-require 'geo_ruby/base/point'
-require 'geo_ruby/base/line_string'
-require 'geo_ruby/base/linear_ring'
-require 'geo_ruby/base/polygon'
-require 'geo_ruby/base/multi_point'
-require 'geo_ruby/base/multi_line_string'
-require 'geo_ruby/base/multi_polygon'
-require 'geo_ruby/base/geometry_collection'
+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'
 
 require 'strscan'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
 
     #Raised when an error in the EWKT string is detected
     class EWKTFormatError < StandardError

data/lib/geo_ruby/{base → simple_features}/geometry.rb

@@ -1,5 +1,5 @@
 module GeoRuby#:nodoc:
-  module Base
+  module SimpleFeatures
     #arbitrary default SRID
     @@default_srid = 4326
 
@@ -184,7 +184,7 @@ module GeoRuby#:nodoc:
       #Limitations : Only supports points, linestrings and polygons (no collection for now).
       #Addapted from Pramukta's code
       def self.from_kml(kml)
-        return GeoRuby::Base::Geometry.from_ewkt(kml_to_wkt(kml))
+        return GeoRuby::SimpleFeatures::Geometry.from_ewkt(kml_to_wkt(kml))
       end
 
       require 'rexml/document'

data/lib/geo_ruby/{base → simple_features}/geometry_collection.rb

@@ -1,7 +1,7 @@
-require 'geo_ruby/base/geometry'
+require 'geo_ruby/simple_features/geometry'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a collection of arbitrary geometries
     class GeometryCollection < Geometry
       attr_reader :geometries

data/lib/geo_ruby/{base → simple_features}/geometry_factory.rb

@@ -1,15 +1,15 @@
-require 'geo_ruby/base/point'
-require 'geo_ruby/base/line_string'
-require 'geo_ruby/base/linear_ring'
-require 'geo_ruby/base/polygon'
-require 'geo_ruby/base/multi_point'
-require 'geo_ruby/base/multi_line_string'
-require 'geo_ruby/base/multi_polygon'
-require 'geo_ruby/base/geometry_collection'
+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 Base
+  module SimpleFeatures
     #Creates a new geometry according to constructions received from a parser, for example EWKBParser.
     class GeometryFactory
       #the built geometry

data/lib/geo_ruby/{base → simple_features}/georss_parser.rb

@@ -1,15 +1,15 @@
-require 'geo_ruby/base/point'
-require 'geo_ruby/base/line_string'
-require 'geo_ruby/base/linear_ring'
-require 'geo_ruby/base/polygon'
-require 'geo_ruby/base/multi_point'
-require 'geo_ruby/base/multi_line_string'
-require 'geo_ruby/base/multi_polygon'
-require 'geo_ruby/base/geometry_collection'
-require 'geo_ruby/base/envelope'
+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'
+require 'geo_ruby/simple_features/envelope'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
 
     #Raised when an error in the GeoRSS string is detected
     class GeorssFormatError < StandardError

data/lib/geo_ruby/{base → simple_features}/helper.rb

@@ -1,5 +1,5 @@
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #indicates the presence of Z coordinates in EWKB strings
     Z_MASK=0x80000000
     #indicates the presence of M coordinates in EWKB strings.

data/lib/geo_ruby/{base → simple_features}/line_string.rb

@@ -1,7 +1,7 @@
-require "geo_ruby/base/geometry"
+require "geo_ruby/simple_features/geometry"
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a line string as an array of points (see Point).
     class LineString < Geometry
       #the list of points forming the line string

data/lib/geo_ruby/{base → simple_features}/linear_ring.rb

@@ -1,7 +1,7 @@
-require 'geo_ruby/base/line_string'
+require 'geo_ruby/simple_features/line_string'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a linear ring, which is a closed line string (see LineString). Currently, no check is performed to verify if the linear ring is really closed.
     class LinearRing < LineString
       def initialize(srid= @@default_srid,with_z=false,with_m=false)

data/lib/geo_ruby/{base → simple_features}/multi_line_string.rb

@@ -1,7 +1,7 @@
-require 'geo_ruby/base/geometry_collection'
+require 'geo_ruby/simple_features/geometry_collection'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a group of line strings (see LineString).
     class MultiLineString < GeometryCollection
       def initialize(srid = @@default_srid,with_z=false,with_m=false)

data/lib/geo_ruby/{base → simple_features}/multi_point.rb

@@ -1,7 +1,7 @@
-require 'geo_ruby/base/geometry_collection'
+require 'geo_ruby/simple_features/geometry_collection'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a group of points (see Point).
     class MultiPoint < GeometryCollection
 

data/lib/geo_ruby/{base → simple_features}/multi_polygon.rb

@@ -1,7 +1,7 @@
-require 'geo_ruby/base/geometry_collection'
+require 'geo_ruby/simple_features/geometry_collection'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a group of polygons (see Polygon).
    class MultiPolygon < GeometryCollection
       def initialize(srid = @@default_srid,with_z=false,with_m=false)

data/lib/geo_ruby/{base → simple_features}/point.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-require "geo_ruby/base/geometry"
+require "geo_ruby/simple_features/geometry"
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a point. It is in 3D if the Z coordinate is not +nil+.
     class Point < Geometry
       DEG2RAD = 0.0174532925199433
@@ -108,6 +108,30 @@ module GeoRuby
         b*a_bis*(sigma-deltaSigma)
       end
 
+      #Bearing from a point to another, in degrees.
+      def bearing_to(other)
+        return 0 if self == other
+        a,b =  other.x - self.x, other.y - self.y
+        res =  Math.acos(b / Math.sqrt(a*a+b*b)) / Math::PI * 180;
+        a < 0 ? 360 - res : res
+      end
+
+      #Bearing from a point to another as symbols. (:n, :s, :sw, :ne...)
+      def bearing_text(other)
+        case bearing_to(other)
+        when 1..22    then :n
+        when 23..66   then :ne
+        when 67..112  then :e
+        when 113..146 then :se
+        when 147..202 then :s
+        when 203..246 then :sw
+        when 247..292 then :w
+        when 293..336 then :nw
+        when 337..360 then :n
+        else nil
+        end
+      end
+
       #Bounding box in 2D/3D. Returns an array of 2 points
       def bounding_box
         unless with_z

data/lib/geo_ruby/{base → simple_features}/polygon.rb

@@ -1,7 +1,7 @@
-require 'geo_ruby/base/geometry'
+require 'geo_ruby/simple_features/geometry'
 
 module GeoRuby
-  module Base
+  module SimpleFeatures
     #Represents a polygon as an array of linear rings (see LinearRing). No check is performed regarding the validity of the geometries forming the polygon.
     class Polygon < Geometry
       #the list of rings forming the polygon

data/lib/geo_ruby.rb

@@ -1,21 +1,19 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'geo_ruby/base/helper'
-require 'geo_ruby/base/ewkt_parser'
-require 'geo_ruby/base/ewkb_parser'
-require 'geo_ruby/base/geometry'
-require 'geo_ruby/base/point'
-require 'geo_ruby/base/line_string'
-require 'geo_ruby/base/linear_ring'
-require 'geo_ruby/base/polygon'
-require 'geo_ruby/base/multi_point'
-require 'geo_ruby/base/multi_line_string'
-require 'geo_ruby/base/multi_polygon'
-require 'geo_ruby/base/geometry_collection'
-require 'geo_ruby/base/envelope'
-require 'geo_ruby/base/geometry_factory'
-require 'geo_ruby/base/georss_parser'
+require 'geo_ruby/simple_features/helper'
+require 'geo_ruby/simple_features/ewkt_parser'
+require 'geo_ruby/simple_features/ewkb_parser'
+require 'geo_ruby/simple_features/geometry'
+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'
+require 'geo_ruby/simple_features/envelope'
+require 'geo_ruby/simple_features/geometry_factory'
+require 'geo_ruby/simple_features/georss_parser'
 require 'geo_ruby/shp4r/shp'
-
-GeoRuby::SimpleFeatures = GeoRuby::Base

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs =  " -r irb/completion"
+# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/geo_ruby.rb'}"
+puts "Loading geo_ruby gem"
+exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::SimpleFeatures.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::SimpleFeatures.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+GEM_NAME = 'geo_ruby' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'geo_ruby'
+
+require 'rubygems'
+begin
+  require 'newgem'
+  require 'rubyforge'
+rescue LoadError
+  puts "\n\nGenerating the website requires the newgem RubyGem"
+  puts "Install: gem install newgem\n\n"
+  exit(1)
+end
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require File.dirname(__FILE__) + "/../lib/#{GEM_NAME}/version.rb"
+
+version  = GeoRuby::VERSION::STRING
+download = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+
+def rubyforge_project_id
+  RubyForge.new.autoconfig["group_ids"][RUBYFORGE_PROJECT]
+end
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text_template = fsrc.read
+  body_text = ERB.new(body_text_template).result(binding)
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/spec/geo_ruby/shp4r/shp_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 include GeoRuby::Shp4r
-include GeoRuby::Base
+include GeoRuby::SimpleFeatures
 
 describe Shp4r do
 

data/spec/geo_ruby/{base → simple_features}/point_spec.rb

@@ -185,7 +185,7 @@ describe Point do
 
   end
 
-  describe " > Distance" do
+  describe " > Distance & Bearing" do
 
     before(:each) do
       @p1 = Point.from_x_y(1,1)
@@ -207,6 +207,43 @@ describe Point do
         should be_close(156876.149400742, 0.00000001)
     end
 
+    it "should calculate the bearing from apoint to another in degrees" do
+      @p1.bearing_to(@p2).should be_close(45.0, 0.01)
+    end
+
+    it "should calculate the bearing from apoint to another in degrees" do
+      p3 = Point.from_x_y(1,-1)
+      @p1.bearing_to(p3).should be_close(180.0, 0.01)
+    end
+
+    it "should calculate the bearing from apoint to another in degrees" do
+      p3 = Point.from_x_y(-1,-1)
+      @p1.bearing_to(p3).should be_close(225.0, 0.01)
+    end
+
+    it "should calculate the bearing from apoint to another in degrees" do
+      p3 = Point.from_x_y(-1,1)
+      @p1.bearing_to(p3).should be_close(270.0, 0.01)
+    end
+
+    it "should calculate the bearing from apoint to another in degrees" do
+      p3 = Point.from_x_y(2,-1)
+      @p1.bearing_to(p3).should be_close(153.4349488, 0.0001)
+    end
+
+    it "should calculate a clone point bearing to 0" do
+      @p1.bearing_to(@p1).should eql(0)
+    end
+
+    it "should calculate the bearing from apoint to another in degrees" do
+      @p1.bearing_text(@p2).should eql(:ne)
+    end
+
+    it "should calculate the bearing from apoint to another in degrees" do
+      p3 = Point.from_x_y(-1,1)
+      @p1.bearing_text(p3).should eql(:w)
+    end
+
   end
 
   describe "> Export Formats" do

data/spec/geo_ruby_spec.rb

@@ -5,7 +5,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "GeoRuby Stuff" do
 
   it "should instantiate Geometry" do
-    @geo = GeoRuby::Base::Geometry.new
+    @geo = GeoRuby::SimpleFeatures::Geometry.new
     @geo.class.should eql(Geometry)
   end
 

data/spec/spec_helper.rb

@@ -9,4 +9,4 @@ end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'geo_ruby'
 include GeoRuby
-include Base
+include SimpleFeatures

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-georuby
 version: !ruby/object:Gem::Version 
-  version: 1.3.7
+  version: 1.3.9
 platform: ruby
 authors: 
 - Guilhem Vellut
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-02 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,29 +24,35 @@ extra_rdoc_files:
 - LICENSE
 - README.txt
 files: 
+- .gitignore
 - History.txt
 - LICENSE
 - README.txt
 - Rakefile
 - VERSION.yml
+- georuby.gemspec
 - lib/geo_ruby.rb
-- lib/geo_ruby/base/envelope.rb
-- lib/geo_ruby/base/ewkb_parser.rb
-- lib/geo_ruby/base/ewkt_parser.rb
-- lib/geo_ruby/base/geometry.rb
-- lib/geo_ruby/base/geometry_collection.rb
-- lib/geo_ruby/base/geometry_factory.rb
-- lib/geo_ruby/base/georss_parser.rb
-- lib/geo_ruby/base/helper.rb
-- lib/geo_ruby/base/line_string.rb
-- lib/geo_ruby/base/linear_ring.rb
-- lib/geo_ruby/base/multi_line_string.rb
-- lib/geo_ruby/base/multi_point.rb
-- lib/geo_ruby/base/multi_polygon.rb
-- lib/geo_ruby/base/point.rb
-- lib/geo_ruby/base/polygon.rb
 - lib/geo_ruby/shp4r/dbf.rb
 - lib/geo_ruby/shp4r/shp.rb
+- lib/geo_ruby/simple_features/envelope.rb
+- lib/geo_ruby/simple_features/ewkb_parser.rb
+- lib/geo_ruby/simple_features/ewkt_parser.rb
+- lib/geo_ruby/simple_features/geometry.rb
+- lib/geo_ruby/simple_features/geometry_collection.rb
+- 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/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
+- lib/geo_ruby/simple_features/point.rb
+- lib/geo_ruby/simple_features/polygon.rb
+- script/console
+- script/destroy
+- script/generate
+- script/txt2html
 - spec/data/multipoint.dbf
 - spec/data/multipoint.shp
 - spec/data/multipoint.shx
@@ -59,21 +65,21 @@ files:
 - spec/data/polyline.dbf
 - spec/data/polyline.shp
 - spec/data/polyline.shx
-- spec/geo_ruby/base/envelope_spec.rb
-- spec/geo_ruby/base/ewkb_parser_spec.rb
-- spec/geo_ruby/base/ewkt_parser_spec.rb
-- spec/geo_ruby/base/geometry_collection_spec.rb
-- spec/geo_ruby/base/geometry_factory_spec.rb
-- spec/geo_ruby/base/geometry_spec.rb
-- spec/geo_ruby/base/georss_parser_spec.rb
-- spec/geo_ruby/base/line_string_spec.rb
-- spec/geo_ruby/base/linear_ring_spec.rb
-- spec/geo_ruby/base/multi_line_string_spec.rb
-- spec/geo_ruby/base/multi_point_spec.rb
-- spec/geo_ruby/base/multi_polygon_spec.rb
-- spec/geo_ruby/base/point_spec.rb
-- spec/geo_ruby/base/polygon_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
+- spec/geo_ruby/simple_features/envelope_spec.rb
+- spec/geo_ruby/simple_features/ewkb_parser_spec.rb
+- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
+- spec/geo_ruby/simple_features/geometry_collection_spec.rb
+- spec/geo_ruby/simple_features/geometry_factory_spec.rb
+- spec/geo_ruby/simple_features/geometry_spec.rb
+- spec/geo_ruby/simple_features/georss_parser_spec.rb
+- spec/geo_ruby/simple_features/line_string_spec.rb
+- spec/geo_ruby/simple_features/linear_ring_spec.rb
+- spec/geo_ruby/simple_features/multi_line_string_spec.rb
+- spec/geo_ruby/simple_features/multi_point_spec.rb
+- spec/geo_ruby/simple_features/multi_polygon_spec.rb
+- spec/geo_ruby/simple_features/point_spec.rb
+- spec/geo_ruby/simple_features/polygon_spec.rb
 - spec/geo_ruby_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -105,19 +111,19 @@ specification_version: 3
 summary: Ruby data holder for OGC Simple Features
 test_files: 
 - spec/geo_ruby/shp4r/shp_spec.rb
-- spec/geo_ruby/base/polygon_spec.rb
-- spec/geo_ruby/base/linear_ring_spec.rb
-- spec/geo_ruby/base/geometry_factory_spec.rb
-- spec/geo_ruby/base/geometry_spec.rb
-- spec/geo_ruby/base/georss_parser_spec.rb
-- spec/geo_ruby/base/multi_point_spec.rb
-- spec/geo_ruby/base/ewkt_parser_spec.rb
-- spec/geo_ruby/base/line_string_spec.rb
-- spec/geo_ruby/base/multi_line_string_spec.rb
-- spec/geo_ruby/base/geometry_collection_spec.rb
-- spec/geo_ruby/base/ewkb_parser_spec.rb
-- spec/geo_ruby/base/multi_polygon_spec.rb
-- spec/geo_ruby/base/point_spec.rb
-- spec/geo_ruby/base/envelope_spec.rb
+- spec/geo_ruby/simple_features/polygon_spec.rb
+- spec/geo_ruby/simple_features/linear_ring_spec.rb
+- spec/geo_ruby/simple_features/geometry_factory_spec.rb
+- spec/geo_ruby/simple_features/geometry_spec.rb
+- spec/geo_ruby/simple_features/georss_parser_spec.rb
+- spec/geo_ruby/simple_features/multi_point_spec.rb
+- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
+- spec/geo_ruby/simple_features/line_string_spec.rb
+- spec/geo_ruby/simple_features/multi_line_string_spec.rb
+- spec/geo_ruby/simple_features/geometry_collection_spec.rb
+- spec/geo_ruby/simple_features/ewkb_parser_spec.rb
+- spec/geo_ruby/simple_features/multi_polygon_spec.rb
+- spec/geo_ruby/simple_features/point_spec.rb
+- spec/geo_ruby/simple_features/envelope_spec.rb
 - spec/geo_ruby_spec.rb
 - spec/spec_helper.rb