georuby 1.9.7 → 1.9.8

data/README.rdoc

@@ -1,9 +1,7 @@
 = GeoRuby
 
 
-This is a fork of GeoRuby with some updates and extra funcionality.
-
-It is intended as a holder for geometric data. The data model roughly
+This is intended as a holder for geometric data. The data model roughly
 follows the OGC "Simple Features for SQL" specification, so it should
 play nice with data returned from PostGIS or any Spatial Extensions (MongoDB, MySQL...).
 Although without any kind of advanced functionalities (such as geometric operators or reprojections).
@@ -12,7 +10,7 @@ It also supports various output and input formats (GeoRSS, KML, Shapefile).
 OGC:"http://www.opengis.org/docs/99-049.pdf"
 
 GeoRuby is written in pure Ruby.
-If you are looking for Proj/Geos/ext rubygem checkout:
+If you are looking for Proj/Geos/ext C rubygem checkout:
 rgeo:"https://github.com/dazuma/rgeo"
 
 
@@ -36,7 +34,11 @@ On top of this an Envelope class is available, to contain the bounding box of a
 
 To install the latest version, just type:
 
-      gem install nofxx-georuby
+      gem install georuby
+
+Or include on your projects`s Gemfile:
+
+      gem 'georuby'
 
 
 == Use

data/lib/geo_ruby.rb

@@ -17,7 +17,8 @@ require 'geo_ruby/simple_features/envelope'
 require 'geo_ruby/simple_features/geometry_factory'
 
 # Require if you need
-# require 'geo_ruby/shp4r/shp'
-# require 'geo_ruby/gpx4r/gpx'
-# require 'geo_ruby/geojson'
-# require 'geo_ruby/georss'
+require 'geo_ruby/shp4r/shp'
+require 'geo_ruby/gpx4r/gpx'
+require 'geo_ruby/geojson'
+require 'geo_ruby/georss'
+require 'geo_ruby/kml'

data/lib/geo_ruby/kml.rb

@@ -0,0 +1,84 @@
+require 'rexml/parsers/pullparser'
+module GeoRuby
+  class KmlParser
+    ELEMENT_MAP = {
+      # "Point" => SimpleFeatures::Point, # we don't need to map points.  they are done automatically by the coordinate parsing
+      "LineString" => SimpleFeatures::LineString,
+      "LinearRing" => SimpleFeatures::LinearRing,
+      "Polygon" => SimpleFeatures::Polygon,
+      "MultiGeometry" => SimpleFeatures::GeometryCollection
+    }
+    def initialize(factory)
+      @factory = factory
+      @buffer = ""
+      @with_z = false
+    end
+    # argument should be a valid kml geometry fragment ie. <Point> .... </Point>
+    # returns the GeoRuby geometry object back
+    def parse(kml)
+      @factory.reset
+      @with_z = false
+      @parser = REXML::Parsers::PullParser.new(kml)
+      while @parser.has_next?
+        e = @parser.pull
+        if e.start_element?
+          if(type = ELEMENT_MAP[e[0]])
+            @factory.begin_geometry(type)
+          else
+            @buffer = "" if(e[0] == "coordinates") # clear the buffer
+            accumulate_start(e)
+          end
+        elsif e.end_element?
+          if(ELEMENT_MAP[e[0]])
+            @factory.end_geometry(@with_z)
+            @buffer = "" # clear the buffer
+          else
+            accumulate_end(e)
+            if(e[0] == "coordinates")
+              parse_coordinates(@buffer)
+              @buffer = "" # clear the buffer
+            end
+          end
+        elsif e.text? 
+          accumulate_text(e)
+        elsif e.cdata?
+          accumulate_cdata(e)
+        end
+      end
+      @factory.geometry.dup
+    end
+    
+    private      
+    def accumulate_text(e); @buffer << e[0]; end
+    def accumulate_cdata(e); @buffer << "<![CDATA[#{e[0]}]]>"; end
+    def accumulate_start(e)
+      @buffer << "<#{e[0]}"
+      if(e[1].class == Hash)
+        e[1].each_pair {|k,v| @buffer << " #{k}='#{v}'" }
+      end
+      @buffer << ">"
+    end
+    def accumulate_end(e); @buffer << "</#{e[0]}>"; end
+    
+    def parse_coordinates(buffer)
+      if(buffer =~ /<coordinates>(.+)<\/coordinates>/)
+        $1.gsub(/\n/, " ").strip.split(/\s+/).each do |coord|
+          x,y,z = coord.split(',')
+          if(x.nil? || y.nil?) 
+            raise StandardError, "coordinates must have at least x and y elements"
+          end
+          @factory.begin_geometry(SimpleFeatures::Point)
+          if(z.nil?)
+            @factory.add_point_x_y(x,y)
+          else
+            @factory.add_point_x_y_z(x,y,z)
+            @with_z = true unless @with_z # is the conditional even necessary
+          end
+          @factory.end_geometry(@with_z)
+        end
+      end
+    rescue
+      raise StandardError, "error parsing coordinates: check your kml for errors"
+    end
+  end
+end

data/lib/geo_ruby/simple_features/geometry.rb

@@ -175,47 +175,12 @@ module GeoRuby#:nodoc:
       end
 
       #Sends back a geometry from a KML encoded geometry string.
-      #Limitations : Only supports points, linestrings and polygons (no collection for now).
-      #Addapted from Pramukta's code
       def self.from_kml(kml)
-        return GeoRuby::SimpleFeatures::Geometry.from_ewkt(kml_to_wkt(kml))
-      end
-
-      require 'rexml/document'
-      def self.kml_to_wkt(kml)
-        doc = REXML::Document.new(kml)
-        wkt = ""
-        if ["Point", "LineString", "Polygon" ].include?(doc.root.name)
-          case doc.root.name
-          when "Point" then
-            coords = doc.elements["/Point/coordinates"].text.gsub(/\n/," ")
-            wkt = doc.root.name.upcase + "(" + split_coords(coords).join(' ') + ")"
-          when "LineString" then
-            coords = doc.elements["/LineString/coordinates"].text.gsub(/\n/," ")
-            coords = split_coords(coords)
-            wkt = doc.root.name.upcase + "(" + coords.join(",") + ")"
-          when "Polygon" then
-            # polygons have one outer ring and zero or more inner rings
-            bounds = []
-            bounds << doc.elements["/Polygon/outerBoundaryIs/LinearRing/coordinates"].text
-            inner_coords_elements = doc.elements.each("/Polygon/innerBoundaryIs/LinearRing/coordinates") do |inner_coords|
-              inner_coords = inner_coords.text
-              bounds << inner_coords
-            end
-
-            wkt = doc.root.name.upcase + "(" + bounds.map do |bound|
-              bound.gsub!(/\n/, " ")
-              bound = split_coords(bound)
-              if bound.first != bound.last
-                bound.push bound.first
-              end
-              "(" + bound.join(",") + ")"
-            end.join(",") + ")"
-          end
-        end
-        return wkt
+        factory = GeometryFactory.new
+        parser = KmlParser.new(factory)
+        parser.parse(kml)
       end
-      
+            
       # Some GeoJSON files do not include srid info, so
       # we provide an optional parameter
       def self.from_geojson(geojson, srid=DEFAULT_SRID)

data/lib/geo_ruby/simple_features/linear_ring.rb

@@ -12,21 +12,26 @@ module GeoRuby
         super(srid,with_z,with_m)
       end
 
+      # fix kml export
+      alias_method :orig_kml_representation, :kml_representation
+      def kml_representation(options = {})
+        orig_kml_representation(options).gsub('LineString', 'LinearRing')
+      end
 
-    # Does this linear string contain the given point?  We use the
-    # algorithm described here:
-    #
-    # http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
-    def contains_point?(point)
-      x, y = point.x, point.y
-      tuples = @points.zip(@points[1..-1] + [@points[0]])
-      crossings =
-        tuples.select do |a, b|
-          (b.y > y != a.y > y) && (x < (a.x - b.x) * (y - b.y) / (a.y - b.y) + b.x)
-        end
-
-      crossings.size % 2 == 1
-    end
+      # Does this linear string contain the given point?  We use the
+      # algorithm described here:
+      #
+      # http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
+      def contains_point?(point)
+        x, y = point.x, point.y
+        tuples = @points.zip(@points[1..-1] + [@points[0]])
+        crossings =
+          tuples.select do |a, b|
+            (b.y > y != a.y > y) && (x < (a.x - b.x) * (y - b.y) / (a.y - b.y) + b.x)
+          end
+
+        crossings.size % 2 == 1
+      end
     end
 
   end

data/lib/geo_ruby/version.rb

@@ -1,3 +1,3 @@
 module GeoRuby
-  VERSION = '1.9.7'
+  VERSION = '1.9.8'
 end

data/spec/geo_ruby/kml_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe KmlParser do
+  before(:all) do
+    POINT = "<Point><coordinates>-82.4898187291883,34.2473206042649</coordinates></Point>"
+    LINESTRING = "<LineString><coordinates>-122.365662,37.826988 -122.365202,37.826302 -122.364581,37.82655 -122.365038,37.827237</coordinates></LineString>"
+    LINEARRING = "<LinearRing><coordinates>-122.365662,37.826988 -122.365202,37.826302 -122.364581,37.82655 -122.365038,37.827237 -122.365662,37.826988</coordinates></LinearRing>"
+    POLYGON = "<Polygon><outerBoundaryIs><LinearRing><coordinates>-82.5961385808407,34.0134202383713 -82.6029437979289,34.0346366848087 -82.6603553035687,34.1083560439036 -82.7357807829899,34.1697961502507 -82.7425935601244,34.2055536194311 -82.3145921793097,34.4812209701586 -82.2758648198483,34.4347213073308 -82.2405017851073,34.4067761024174 -82.3327002190662,34.3417863447576 -82.2910826671599,34.2708004396966 -82.2497468801283,34.2261551348023 -82.2370438982521,34.1709424545969 -82.2569955519648,34.1119142196088 -82.3237086862075,34.0601294413679 -82.368425596693,34.0533120146082 -82.4455985300521,34.0562556252352 -82.4806178108032,34.0759686807282 -82.5334224196077,34.0620944842448 -82.5961385808407,34.0134202383713</coordinates></LinearRing></outerBoundaryIs></Polygon>"
+    COMPLEX_POLYGON = "<Polygon><outerBoundaryIs><LinearRing><coordinates>-122.366278,37.818844 -122.365248,37.819267 -122.365640,37.819861 -122.366669,37.819429 -122.366278,37.818844</coordinates></LinearRing></outerBoundaryIs><innerBoundaryIs><LinearRing><coordinates>-122.366212,37.818977 -122.365424,37.819294 -122.365704,37.819731 -122.366488,37.819402 -122.366212,37.818977</coordinates></LinearRing></innerBoundaryIs></Polygon>"
+    MULTIGEOMETRY = "<MultiGeometry><Polygon><outerBoundaryIs><LinearRing><coordinates>-82.5961385808407,34.0134202383713 -82.6029437979289,34.0346366848087 -82.6603553035687,34.1083560439036 -82.7357807829899,34.1697961502507 -82.7425935601244,34.2055536194311 -82.3145921793097,34.4812209701586 -82.2758648198483,34.4347213073308 -82.2405017851073,34.4067761024174 -82.3327002190662,34.3417863447576 -82.2910826671599,34.2708004396966 -82.2497468801283,34.2261551348023 -82.2370438982521,34.1709424545969 -82.2569955519648,34.1119142196088 -82.3237086862075,34.0601294413679 -82.368425596693,34.0533120146082 -82.4455985300521,34.0562556252352 -82.4806178108032,34.0759686807282 -82.5334224196077,34.0620944842448 -82.5961385808407,34.0134202383713</coordinates></LinearRing></outerBoundaryIs></Polygon><Point><coordinates>-82.4898187291883,34.2473206042649</coordinates></Point></MultiGeometry>"
+
+    POINT3D = "<Point><coordinates>-82.4898187291883,34.2473206042649,5</coordinates></Point>"
+    LINESTRING3D = "<LineString><coordinates>-122.365662,37.826988,1 -122.365202,37.826302,2 -122.364581,37.82655,3 -122.365038,37.827237,4</coordinates></LineString>"
+  end
+  
+  before(:each) do
+    @factory = GeometryFactory.new
+    @kml_parser = KmlParser.new(@factory)
+  end
+  
+  it "should parse a Point correctly" do
+    @kml_parser.parse(POINT)
+    g = @factory.geometry
+    g.should_not eql(nil)
+    g.should be_an_instance_of(GeoRuby::SimpleFeatures::Point)
+    g.as_kml.gsub(/\n/,'').should eql(POINT) 
+  end
+  
+  it "should parse a LineString correctly" do
+    @kml_parser.parse(LINESTRING)
+    g = @factory.geometry
+    g.should_not eql(nil)
+    g.should be_an_instance_of(GeoRuby::SimpleFeatures::LineString)
+    g.as_kml.gsub(/\n/,'').should eql(LINESTRING)
+
+    @kml_parser.parse(LINEARRING)
+    g = @factory.geometry
+    g.should_not eql(nil)
+    g.should be_an_instance_of(GeoRuby::SimpleFeatures::LinearRing)
+    g.as_kml.gsub(/\n/,'').should eql(LINEARRING)
+  end
+  
+  it "should parse a Polygon correctly" do
+    @kml_parser.parse(POLYGON)
+    g = @factory.geometry
+    g.should_not eql(nil)
+    g.should be_an_instance_of(GeoRuby::SimpleFeatures::Polygon)
+    g.as_kml.gsub(/\n/,'').should eql(POLYGON)
+
+    @kml_parser.parse(COMPLEX_POLYGON)
+    g = @factory.geometry
+    g.should_not eql(nil)
+    g.should be_an_instance_of(GeoRuby::SimpleFeatures::Polygon)
+    g.as_kml.gsub(/\n/,'').should eql(COMPLEX_POLYGON)
+  end
+  
+  it "should parse a MultiGeometry correctly" do
+    @kml_parser.parse(MULTIGEOMETRY)
+    g = @factory.geometry
+    g.should_not eql(nil)
+    g.geometries.length.should eql(2)
+    g.should be_an_instance_of(GeoRuby::SimpleFeatures::GeometryCollection)
+    g.as_kml.gsub(/\n/,'').should eql(MULTIGEOMETRY)
+  end
+  
+  it "should parse 3D geometries correctly" do
+    # not testing generation because GeoRuby kml generation logic currently requires additional
+    # XML nodes to actually output 3D coordinate information.  I might modify that behavior
+    g = @kml_parser.parse(POINT3D)
+    g.should_not eql(nil)
+    g.with_z.should eql(true)
+    # g.as_kml(:altitude_mode => "clampToGround").gsub(/\n/,'').should eql(POINT3D)
+
+    g = @kml_parser.parse(LINESTRING3D)
+    g.should_not eql(nil)
+    g.with_z.should eql(true)
+    # g.as_kml(:altitude_mode => "clampToGround").gsub(/\n/,'').should eql(LINESTRING3D)
+  end
+end

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ require 'geo_ruby/shp'
 require 'geo_ruby/gpx'
 require 'geo_ruby/geojson'
 require 'geo_ruby/georss'
+require 'geo_ruby/kml'
 
 include GeoRuby
 include SimpleFeatures

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georuby
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &15986320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *15986320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15998420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +40,12 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *15998420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: GeoRuby provides geometric data types from the OGC 'Simple Features'
   specification.
 email: x@nofxx.com
@@ -66,6 +76,7 @@ files:
 - lib/geo_ruby/simple_features/ewkb_parser.rb
 - lib/geo_ruby/shp4r/shp.rb
 - lib/geo_ruby/shp4r/dbf.rb
+- lib/geo_ruby/kml.rb
 - lib/geo_ruby/georss.rb
 - spec/geo_ruby_spec.rb
 - spec/data/point.dbf
@@ -92,6 +103,7 @@ files:
 - spec/data/polygon.shx
 - spec/data/polygon.shp
 - spec/spec_helper.rb
+- spec/geo_ruby/kml_spec.rb
 - spec/geo_ruby/gpx4r/gpx_spec.rb
 - spec/geo_ruby/geojson_spec.rb
 - spec/geo_ruby/simple_features/multi_line_string_spec.rb
@@ -126,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4339575636019116239
+      hash: 3326906326237505079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby data holder for OGC Simple Features