nofxx-georuby 1.7.3 → 1.9.0

data/spec/geo_ruby/simple_features/geometry_spec.rb

@@ -21,7 +21,7 @@ describe Geometry do
   it "should instantiate from hex ewkb" do
     point = Geometry.from_hex_ewkb("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
     point.class.should == Point
-    point.x.should be_close(12.4, 0.1)
+    point.x.should be_within(0.1).of(12.4)
   end
 
   it "should output as_ewkb" do

data/spec/geo_ruby/simple_features/point_spec.rb

@@ -112,8 +112,8 @@ describe Point do
 
     it "should instantiate a point from polar coordinates" do
       point = Point.from_r_t(1.4142,45)
-      point.y.should be_close(1, 0.00001)
-      point.x.should be_close(1, 0.00001)
+      point.y.should be_within(0.1).of(1)
+      point.x.should be_within(0.1).of(1)
     end
 
     it "should instantiate from coordinates x,y" do
@@ -153,30 +153,30 @@ describe Point do
     end
 
     it "should parse lat long" do
-      Point.from_latlong("-20° 47' 26.37","-20° 47' 26.37").x.should be_close(-20.790658, 0.00001)
-      Point.from_latlong("20° 47' 26.378","20° 47' 26.378").y.should be_close(20.790658, 0.00001)
+      Point.from_latlong("-20° 47' 26.37","-20° 47' 26.37").x.should be_within(0.00001).of(-20.790658)
+      Point.from_latlong("20° 47' 26.378","20° 47' 26.378").y.should be_within(0.00001).of(20.790658)
     end
 
     it "should parse lat long w/o sec" do
-      Point.from_latlong("-20°47′26″","-20°47′26″").x.should be_close(-20.790555, 0.00001)
-      Point.from_latlong("20°47′26″","20°47′26″").y.should be_close(20.790555, 0.00001)
+      Point.from_latlong("-20°47′26″","-20°47′26″").x.should be_within(0.00001).of(-20.790555)
+      Point.from_latlong("20°47′26″","20°47′26″").y.should be_within(0.00001).of(20.790555)
     end
 
     it "should accept with W or S notation" do
-      Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").x.should be_close(-20.790658, 0.00001)
-      Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").y.should be_close(-20.790658, 0.00001)
+      Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").x.should be_within(0.00001).of(-20.790658)
+      Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").y.should be_within(0.00001).of(-20.790658)
     end
 
     it "should instantiate a point from positive degrees" do
       point = Point.from_latlong('47`20 06.09E','22`50 77.35N')
-      point.y.should be_close(22.8548194, 0.000001)
-      point.x.should be_close(47.335025, 0.000001)
+      point.y.should be_within(0.000001).of(22.8548194)
+      point.x.should be_within(0.000001).of(47.335025)
     end
 
     it "should instantiate a point from negative degrees" do
       point = Point.from_latlong('47`20 06.09W','22`50 77.35S')
-      point.y.should be_close(-22.8548194, 0.000001)
-      point.x.should be_close(-47.335025, 0.000001)
+      point.y.should be_within(0.000001).of(-22.8548194)
+      point.x.should be_within(0.000001).of(-47.335025)
     end
 
     it "should print out nicely" do
@@ -210,17 +210,17 @@ describe Point do
 
     it "and a 3th grade child should calculate euclidian distance" do
       @p1.euclidian_distance(@p2).
-        should be_close(1.4142135623731, 0.00000001)
+        should be_within(0.00000001).of(1.4142135623731)
     end
 
     it "should calculate spherical distance" do
       @p1.spherical_distance(@p2).
-        should be_close(157225.358003181,0.00000001)
+        should be_within(0.00000001).of(157225.358003181)
     end
 
     it "should calculate ellipsoidal distance" do
       @p1.ellipsoidal_distance(@p2).
-        should be_close(156876.149400742, 0.00000001)
+        should be_within(0.00000001).of(156876.149400742)
     end
 
     describe "Orthogonal Distance" do
@@ -230,7 +230,7 @@ describe Point do
       end
 
       it "should calcula orthogonal distance from a line (90 deg)" do
-        @p1.orthogonal_distance(@line).should be_close(1.414, 0.001)
+        @p1.orthogonal_distance(@line).should be_within(0.001).of(1.414)
       end
 
       it "should calcula orthogonal distance very close..." do
@@ -238,41 +238,41 @@ describe Point do
       end
 
       it "should calcula orthogonal distance from a line (90 deg)" do
-        @p2.orthogonal_distance(@line).should be_close(2.828, 0.001)
+        @p2.orthogonal_distance(@line).should be_within(0.001).of(2.828)
       end
 
       it "should calcula orthogonal distance from a line (0 deg)" do
-        @p2.orthogonal_distance(@line2).should be_close(1.0, 0.1)
+        @p2.orthogonal_distance(@line2).should be_within(0.1).of(1.0)
       end
 
       it "should calcula orthogonal distance from a line (0 deg)" do
-        @p2.orthogonal_distance(@line2).should be_close(1.0, 0.1)
+        @p2.orthogonal_distance(@line2).should be_within(0.1).of(1.0)
       end
 
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      @p1.bearing_to(@p2).should be_close(45.0, 0.01)
+      @p1.bearing_to(@p2).should be_within(0.01).of(45.0)
     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)
+      @p1.bearing_to(p3).should be_within(0.01).of(180.0)
     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)
+      @p1.bearing_to(p3).should be_within(0.01).of(225.0)
     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)
+      @p1.bearing_to(p3).should be_within(0.01).of(270.0)
     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)
+      @p1.bearing_to(p3).should be_within(0.0001).of(153.4349488)
     end
 
     it "should calculate a clone point bearing to 0" do
@@ -335,15 +335,15 @@ describe Point do
     end
 
     it "should print r (polar coords)" do
-      @point.r.should be_close(34.214154, 0.00001)
+      @point.r.should be_within(0.000001).of(34.214154)
     end
 
     it "should print theta as degrees" do
-      @point.theta_deg.should be_close(289.184406352127, 0.0001)
+      @point.theta_deg.should be_within(0.0001).of(289.184406352127)
     end
 
     it "should print theta as radians" do
-      @point.theta_rad.should be_close(5.04722003626982, 0.0001)
+      @point.theta_rad.should be_within(0.0001).of(5.04722003626982)
     end
 
     it "should output as polar" do

data/spec/spec_helper.rb

@@ -1,9 +1,16 @@
-begin
-  require 'rubygems'
-  require 'spec'
-rescue LoadError
+require 'rubygems'
+
+# Must require active_spport/core_ext/object and then json/pure
+# or the json module gets clobbered and geojson output
+# becomes invalid... ie. it never calls class specific to_json
+#require 'active_support/core_ext/object'
+#require 'json/pure'
+
+# begin
+#   require 'spec'
+# rescue LoadError
   require 'rspec'
-end
+#end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'geo_ruby'
@@ -36,7 +43,7 @@ module GeorubyMatchers
         [:x, :y, :z, :m].each_with_index do |c, i|
           next unless val = @expect[i]
           if val.kind_of? Numeric
-            actual.send(c).should be_close(val, 0.1)
+            actual.send(c).should be_within(0.1).of(val)
           else
             actual.send(c).should eql(val)
           end

metadata

@@ -4,22 +4,24 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 3
-  version: 1.7.3
+  - 9
+  - 0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Guilhem Vellut
 - Marcos Piccinini
+- Marcus Mateus
+- Doug Cole
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -03:00
+date: 2011-01-14 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json_pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -28,40 +30,54 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dbf
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
         - 2
-        version: 1.1.2
+        - 9
+        version: 1.2.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: GeoRuby provides geometric data types from the OGC 'Simple Features' specification.
-email: x@nofxx.com
+email: georuby@simplitex.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.txt
+- README.rdoc
 files: 
-- .gitignore
 - History.txt
 - LICENSE
-- README.txt
+- README.rdoc
 - Rakefile
 - VERSION
 - lib/geo_ruby.rb
@@ -73,6 +89,7 @@ files:
 - 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/geojson_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
@@ -85,11 +102,12 @@ files:
 - lib/geo_ruby/simple_features/multi_polygon.rb
 - lib/geo_ruby/simple_features/point.rb
 - lib/geo_ruby/simple_features/polygon.rb
-- nofxx-georuby.gemspec
+- marcusmateus-georuby.gemspec
 - script/console
 - script/destroy
 - script/generate
 - script/txt2html
+- spec/data/geojson/feature_collection.json
 - spec/data/gpx/fells_loop.gpx
 - spec/data/gpx/long.gpx
 - spec/data/gpx/long.kml
@@ -114,6 +132,7 @@ files:
 - 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/geojson_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
@@ -132,8 +151,8 @@ homepage: http://github.com/nofxx/georuby
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -160,21 +179,22 @@ signing_key:
 specification_version: 3
 summary: Ruby data holder for OGC Simple Features
 test_files: 
-- spec/geo_ruby_spec.rb
-- spec/spec_helper.rb
 - spec/geo_ruby/gpx4r/gpx_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
-- spec/geo_ruby/simple_features/point_spec.rb
-- spec/geo_ruby/simple_features/geometry_factory_spec.rb
 - spec/geo_ruby/simple_features/envelope_spec.rb
-- spec/geo_ruby/simple_features/polygon_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/ewkt_parser_spec.rb
 - spec/geo_ruby/simple_features/ewkb_parser_spec.rb
-- spec/geo_ruby/simple_features/linear_ring_spec.rb
+- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
+- spec/geo_ruby/simple_features/geojson_parser_spec.rb
 - spec/geo_ruby/simple_features/geometry_collection_spec.rb
-- spec/geo_ruby/simple_features/multi_polygon_spec.rb
-- spec/geo_ruby/simple_features/multi_point_spec.rb
-- spec/geo_ruby/simple_features/georss_parser_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_helper.rb

data/.gitignore

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

data/README.txt

@@ -1,118 +0,0 @@
-= GeoRuby
-
-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
-- Polygon
-- Multi point
-- Multi line string
-- Multi polygon
-- Geometry collection
-
-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.
-
-Here is an example of Shapefile reading, that goes through all the geometries in a file and disaply the values of the attributes :
-
-      require 'geo_ruby/shp'
-																	 
-      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
-
-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).
-
-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.
-
-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
-																	 
-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.
-
-Also currently, error reporting is minimal and it has not been tested that thoroughly so caveat emptor and backup before performing any destructive operation.
-
-
-=== GPX Reading
-
-You can read and convert GPX Files to LineString/Polygon:
-
-     gpxfile = GpxFile.open(tour.gpx')
-     gpxfile.as_line_string
-     => GeoRuby::SimpleFeatures::LineString..
-
-
-=== Installation
-
-To install the latest version, just type :
-
-      gem install nofxx-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 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.
-
-=== Support
-
-Any questions, enhancement proposals, bug notifications or corrections
-can be sent to mailto:guilhem.vellut@gmail.com.