nofxx-georuby 1.7.3 → 1.9.0

data/lib/geo_ruby/simple_features/multi_line_string.rb

@@ -32,7 +32,19 @@ module GeoRuby
       def to_line_string(join = true)
         LineString.from_points(points)
       end
+      
+      def to_coordinates
+        geometries.map{|ls| ls.to_coordinates}
+      end
 
+      # simple geojson representation
+      # TODO add CRS / SRID support?
+      def to_json(options = {})
+        {:type => 'MultiLineString',
+         :coordinates => self.to_coordinates}.to_json(options)
+      end
+      alias :as_geojson :to_json
+      
       #Creates a new multi line string from an array of line strings
       def self.from_line_strings(line_strings,srid=DEFAULT_SRID,with_z=false,with_m=false)
         multi_line_string = new(srid,with_z,with_m)

data/lib/geo_ruby/simple_features/multi_point.rb

@@ -27,6 +27,18 @@ module GeoRuby
         "MULTIPOINT"
       end
 
+      def to_coordinates
+        points.map{|p| p.to_coordinates }
+      end
+
+      # simple geojson representation
+      # TODO add CRS / SRID support?
+      def to_json(options = {})
+        {:type => 'MultiPoint',
+         :coordinates => self.to_coordinates}.to_json(options)
+      end
+      alias :as_geojson :to_json
+
       #Creates a new multi point from an array of points
       def self.from_points(points,srid= DEFAULT_SRID,with_z=false,with_m=false)
         multi_point= new(srid,with_z,with_m)

data/lib/geo_ruby/simple_features/multi_polygon.rb

@@ -31,6 +31,18 @@ module GeoRuby
         "MULTIPOLYGON"
       end
 
+      def to_coordinates
+        geometries.map{|polygon| polygon.to_coordinates}
+      end
+
+      # simple geojson representation
+      # TODO add CRS / SRID support?
+      def to_json(options = {})
+        {:type => 'MultiPolygon',
+         :coordinates => self.to_coordinates}.to_json(options)
+      end
+      alias :as_geojson :to_json
+
       #Creates a multi polygon from an array of polygons
       def self.from_polygons(polygons,srid=DEFAULT_SRID,with_z=false,with_m=false)
         multi_polygon = new(srid,with_z,with_m)

data/lib/geo_ruby/simple_features/point.rb

@@ -287,6 +287,23 @@ module GeoRuby
         set_x_y_z(-@x, -@y, -@z)
       end
 
+      # TODO Perhaps should support with_m analogous to from_coordinates?
+      def to_coordinates
+        if with_z
+          [x,y,z]
+        else
+          [x,y]
+        end
+      end
+
+      # simple geojson representation
+      # TODO add CRS / SRID support?
+      def to_json(options = {})
+        {:type => 'Point',
+         :coordinates => self.to_coordinates}.to_json(options)
+      end
+      alias :as_geojson :to_json
+    
       #creates a point from an array of coordinates
       def self.from_coordinates(coords,srid=DEFAULT_SRID,with_z=false,with_m=false)
         if ! (with_z or with_m)

data/lib/geo_ruby/simple_features/polygon.rb

@@ -128,6 +128,18 @@ module GeoRuby
         end
         result += "</Polygon>\n"
       end
+      
+      def to_coordinates
+        rings.map{|lr| lr.to_coordinates}
+      end
+
+      # simple geojson representation
+      # TODO add CRS / SRID support?
+      def to_json(options = {})
+        {:type => 'Polygon',
+         :coordinates => self.to_coordinates}.to_json(options)
+      end
+      alias :as_geojson :to_json
 
       #creates a new polygon. Accepts an array of linear strings as argument
       def self.from_linear_rings(linear_rings,srid = DEFAULT_SRID,with_z=false,with_m=false)

data/marcusmateus-georuby.gemspec

@@ -0,0 +1,136 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{marcusmateus-georuby}
+  s.version = "1.8.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Guilhem Vellut", "Marcos Piccinini", "Marcus Mateus"]
+  s.date = %q{2010-12-19}
+  s.description = %q{GeoRuby provides geometric data types from the OGC 'Simple Features' specification.}
+  s.email = %q{georuby@simplitex.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    "History.txt",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/geo_ruby.rb",
+    "lib/geo_ruby/gpx.rb",
+    "lib/geo_ruby/gpx4r/gpx.rb",
+    "lib/geo_ruby/shp.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/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",
+    "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/geojson/feature_collection.json",
+    "spec/data/gpx/fells_loop.gpx",
+    "spec/data/gpx/long.gpx",
+    "spec/data/gpx/long.kml",
+    "spec/data/gpx/long.nmea",
+    "spec/data/gpx/short.gpx",
+    "spec/data/gpx/short.kml",
+    "spec/data/gpx/tracktreks.gpx",
+    "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/gpx4r/gpx_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/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",
+    "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"
+  ]
+  s.homepage = %q{http://github.com/marcusmateus/georuby}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Ruby data holder for OGC Simple Features}
+  s.test_files = [
+    "spec/geo_ruby/gpx4r/gpx_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/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",
+    "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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.4.6"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_development_dependency(%q<dbf>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<json_pure>, [">= 1.4.6"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_dependency(%q<dbf>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<json_pure>, [">= 1.4.6"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    s.add_dependency(%q<dbf>, [">= 1.2.9"])
+  end
+end
+

data/spec/data/geojson/feature_collection.json

@@ -0,0 +1,34 @@
+{ "type": "FeatureCollection",
+  "features": [
+    { "type": "Feature",
+      "geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
+      "properties": {"prop0": "value0"}
+      },
+    { "type": "Feature",
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
+          ]
+        },
+      "properties": {
+        "prop0": "value0",
+        "prop1": 0.0
+        }
+      },
+    { "type": "Feature",
+       "geometry": {
+         "type": "Polygon",
+         "coordinates": [
+           [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
+             [100.0, 1.0], [100.0, 0.0] ]
+           ]
+       },
+       "properties": {
+         "prop0": "value0",
+         "prop1": {"this": "that"}
+         }
+       }
+     ]
+   }
+

data/spec/geo_ruby/gpx4r/gpx_spec.rb

@@ -33,8 +33,8 @@ describe Gpx4r do
     end
 
     it "should read X and Y" do
-      @gpxfile[0].x.should be_close(9.093942, 0.0001)
-      @gpxfile[0].y.should be_close(48.731813, 0.0001)
+      @gpxfile[0].x.should be_within(0.0001).of(9.093942)
+      @gpxfile[0].y.should be_within(0.0001).of(48.731813)
     end
 
     it "should read Z and M" do
@@ -43,8 +43,8 @@ describe Gpx4r do
     end
 
     it "should read X and Y 2" do
-      @gpxfile2[0].x.should be_close(-71.119277, 0.0001)
-      @gpxfile2[0].y.should be_close(42.438878, 0.0001)
+      @gpxfile2[0].x.should be_within(0.0001).of(-71.119277)
+      @gpxfile2[0].y.should be_within(0.0001).of(42.438878)
     end
 
     it "should read Z and M 2" do
@@ -53,8 +53,8 @@ describe Gpx4r do
     end
 
     it "should read X and Y 3" do
-      @gpxfile3[0].x.should be_close(-149.8358011, 0.0001)
-      @gpxfile3[0].y.should be_close(-17.5326508, 0.0001)
+      @gpxfile3[0].x.should be_within(0.0001).of(-149.8358011)
+      @gpxfile3[0].y.should be_within(0.0001).of(-17.5326508)
     end
 
     it "should read Z and M 3" do
@@ -74,14 +74,14 @@ describe Gpx4r do
 
     it "should return a envelope" do
       @gpxfile.envelope.should be_instance_of Envelope
-      @gpxfile.envelope.lower_corner.x.should be_close(9.08128, 0.001)
-      @gpxfile.envelope.lower_corner.y.should be_close(48.7169, 0.001)
+      @gpxfile.envelope.lower_corner.x.should be_within(0.001).of(9.08128)
+      @gpxfile.envelope.lower_corner.y.should be_within(0.001).of(48.7169)
     end
 
     it "should return a envelope 3" do
       @gpxfile3.envelope.should be_instance_of Envelope
-      @gpxfile3.envelope.lower_corner.x.should be_close(-149.8422613, 0.001)
-      @gpxfile3.envelope.lower_corner.y.should be_close(-17.547636, 0.001)
+      @gpxfile3.envelope.lower_corner.x.should be_within(0.001).of(-149.8422613)
+      @gpxfile3.envelope.lower_corner.y.should be_within(0.001).of(-17.547636)
     end
 
     it "should return it as a polygon" do

data/spec/geo_ruby/shp4r/shp_spec.rb

@@ -25,16 +25,16 @@ describe Shp4r do
     it "should parse record 1" do
       rec = @shpfile[0]
       rec.geometry.should be_kind_of Point
-      rec.geometry.x.should be_close(-90.08375, 0.00001)
-      rec.geometry.y.should be_close(34.39996, 0.00001)
+      rec.geometry.x.should be_within(0.00001).of(-90.08375)
+      rec.geometry.y.should be_within(0.00001).of(34.39996)
       rec.data["Hoyoyo"].should eql(6)
     end
 
     it "should parse record 2" do
       rec = @shpfile[1]
       rec.geometry.should be_kind_of Point
-      rec.geometry.x.should be_close(-87.82580, 0.00001)
-      rec.geometry.y.should be_close(33.36416, 0.00001)
+      rec.geometry.x.should be_within(0.00001).of(-87.82580)
+      rec.geometry.y.should be_within(0.00001).of(33.36416)
       rec.data["Hoyoyo"].should eql(9)
     end
 

data/spec/geo_ruby/simple_features/envelope_spec.rb

@@ -2,7 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Envelope do
   before(:each) do
-    @env = Envelope.from_points([Point.from_x_y(10,20),Point.from_x_y(20,30)])
+    @srid = 4269
+    @env = Envelope.from_points([Point.from_x_y(10,20, @srid),Point.from_x_y(20,30, @srid)], @srid)
   end
 
   it "should initialize" do
@@ -36,6 +37,7 @@ describe Envelope do
   it "should have a center" do
     @env.center.x.should eql(15)
     @env.center.y.should eql(25)
+    @env.center.srid.should eql(@env.srid)
   end
 
   it "should print a kml_representation" do

data/spec/geo_ruby/simple_features/geojson_parser_spec.rb

@@ -0,0 +1,147 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+DATA_DIR = File.dirname(__FILE__) + '/../../data/geojson/'
+
+# All geojson test examples are from the GeoJSON spec unless otherwise
+# specified
+#
+# TODO Refactor comon test approaches into methods
+# TODO Add use of contexts?
+describe GeojsonParser do
+
+  it "should create a specified Point" do
+    point_json = %{ { "type": "Point", "coordinates": [100.0, 0.0] } }
+    point = Geometry.from_geojson(point_json)
+    point.class.should eql(Point)
+    point_hash = JSON.parse(point_json)
+    point.to_coordinates.should eql(point_hash['coordinates'])
+  end
+
+  it "should create a specified LineString" do
+    ls_json = %{ { "type": "LineString", "coordinates": [ [100.0, 0.0], [101.0, 1.0] ]} }
+    line_string = Geometry.from_geojson(ls_json)
+    line_string.class.should eql(LineString)
+    ls_hash = JSON.parse(ls_json)
+    line_string.to_coordinates.should eql(ls_hash['coordinates'])
+  end
+
+  it "should create a specified Polygon" do
+    poly_json = <<-EOJ
+      { "type": "Polygon",
+        "coordinates": [
+          [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ],
+          [ [100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2] ]
+          ]
+      }
+    EOJ
+    polygon = Geometry.from_geojson(poly_json)
+    polygon.class.should eql(Polygon)
+    polygon.rings.size.should eql(2)
+    poly_hash = JSON.parse(poly_json)
+    polygon.to_coordinates.should eql(poly_hash['coordinates'])
+  end
+
+  it "should create a specified MultiPoint" do
+    mp_json = <<-EOJ
+      { "type": "MultiPoint",
+        "coordinates": [ [100.0, 0.0], [101.0, 1.0] ]
+        }
+    EOJ
+    multi_point = Geometry.from_geojson(mp_json)
+    multi_point.class.should eql(MultiPoint)
+    mp_hash = JSON.parse(mp_json)
+    multi_point.to_coordinates.should eql(mp_hash['coordinates'])
+  end
+
+  it "should create a specified MultiLineString" do
+    mls_json = <<-EOJ
+      { "type": "MultiLineString",
+        "coordinates": [
+            [ [100.0, 0.0], [101.0, 1.0] ],
+            [ [102.0, 2.0], [103.0, 3.0] ]
+          ]
+      }
+    EOJ
+    multi_ls = Geometry.from_geojson(mls_json)
+    multi_ls.class.should eql(MultiLineString)
+    mls_hash = JSON.parse(mls_json)
+    multi_ls.to_coordinates.should eql(mls_hash['coordinates'])
+  end
+
+  it "should create a specifiead MultiPolygon" do
+    mpoly_json = <<-EOJ
+      { "type": "MultiPolygon",
+        "coordinates": [
+          [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+          [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+           [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+          ]
+        }
+    EOJ
+    mpoly = Geometry.from_geojson(mpoly_json)
+    mpoly.class.should eql(MultiPolygon)
+    mpoly_hash = JSON.parse(mpoly_json)
+    mpoly.to_coordinates.should eql(mpoly_hash['coordinates'])
+  end
+
+  it "should create a specified GeometryCollection" do
+    gcol_json = <<-EOJ
+      { "type": "GeometryCollection",
+        "geometries": [
+          { "type": "Point",
+            "coordinates": [100.0, 0.0]
+            },
+          { "type": "LineString",
+            "coordinates": [ [101.0, 0.0], [102.0, 1.0] ]
+            }
+        ]
+      }
+    EOJ
+    gcol = Geometry.from_geojson(gcol_json)
+    gcol.class.should eql(GeometryCollection)
+    gcol_hash = JSON.parse(gcol_json)
+    gcol.geometries.each_with_index do |g,i|
+      gh = gcol_hash['geometries'][i]
+      g.class.should eql(GeoRuby::SimpleFeatures.const_get(gh['type']))
+      g.to_coordinates.should eql(gh['coordinates'])
+    end
+  end
+
+  # Feature GeoJSON test example from wikipedia entry
+  it "should create a specified Feature" do
+    feature_json = <<-EOJ
+      {
+        "type":"Feature", 
+        "id":"OpenLayers.Feature.Vector_314", 
+        "properties":{"prop0": "value0"}, 
+        "geometry":{
+          "type":"Point", 
+          "coordinates":[97.03125, 39.7265625]
+        } 
+      }
+    EOJ
+    f = Geometry.from_geojson(feature_json)
+    f.class.should eql(GeojsonFeature)
+    feature_hash = JSON.parse(feature_json)
+    f.id.should eql(feature_hash['id'])
+    f.properties.should eql(feature_hash['properties'])
+    f.geometry.class.should eql(GeoRuby::SimpleFeatures.const_get(feature_hash['geometry']['type']))
+    f.geometry.to_coordinates.should eql(feature_hash['geometry']['coordinates'])
+  end
+
+  it "should create a specified FeatureCollection" do
+    fcol_json = File.read(DATA_DIR + 'feature_collection.json')
+    fcol = Geometry.from_geojson(fcol_json)
+    fcol.class.should eql(GeojsonFeatureCollection)
+    fcol_hash = JSON.parse(fcol_json)
+    fcol.features.each_with_index do |f,i|
+      fgh = fcol_hash['features'][i]['geometry']
+      fg = f.geometry
+      f.properties.should eql(fcol_hash['features'][i]['properties'])
+      fg.class.should eql(GeoRuby::SimpleFeatures.const_get(fgh['type']))
+      fg.to_coordinates.should eql(fgh['coordinates'])
+    end
+  end
+
+end
+