GeoRuby 1.2.1 → 1.2.2

data/lib/geo_ruby/shp4r/shp.rb

@@ -25,6 +25,8 @@ module GeoRuby
     class ShpFile
       attr_reader :shp_type, :record_count, :xmin, :ymin, :xmax, :ymax, :zmin, :zmax, :mmin, :mmax
 
+      include Enumerable
+
       #Opens a SHP file. Both "abc.shp" and "abc" are accepted. The files "abc.shp", "abc.shx" and "abc.dbf" must be present
       def initialize(file, access = "r")
         #strip the shp out of the file if present

data/lib/geo_ruby/simple_features/geometry.rb

@@ -152,8 +152,7 @@ module GeoRuby#:nodoc:
         georss_parser= GeorssParser::new
         georss_parser.parse(georss)
         georss_parser.geometry
-      end
-      
+      end      
       #sends back an array: The first element is the goemetry based on the GeoRSS string passed as argument. The second one is the GeoRSSTags (found only with the Simple format)
       def self.from_georss_with_tags(georss)
         georss_parser= GeorssParser::new
@@ -161,6 +160,55 @@ module GeoRuby#:nodoc:
         [georss_parser.geometry, georss_parser.georss_tags]
       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 
+      end
+
+      private
+
+      def self.split_coords(coords)
+        coords.split(" ").collect { |coord|
+          coord.gsub(","," ")
+        }
+      end
     end
   end
 end

data/rakefile.rb

@@ -24,7 +24,7 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'GeoRuby'
-  s.version = "1.2.1"
+  s.version = "1.2.2"
   s.summary = "Ruby data holder for OGC Simple Features"
   s.description = <<EOF
 GeoRuby is intended as a holder for data returned from PostGIS and MySQL Spatial queries. The data model roughly follows the OGC "Simple Features for SQL" specification (see www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections)

data/test/test_georss_kml.rb

@@ -153,5 +153,63 @@ class TestGeorssKml < Test::Unit::TestCase
 
   end
 
+  def test_kml_read
+    g = Geometry.from_kml("<Point><coordinates>45,12,25</coordinates></Point>")
+    assert(g.is_a?(Point))
+    assert_equal(g,Point.from_x_y_z(45,12,25))
+    
+    g = Geometry.from_kml("<LineString>
+      <extrude>1</extrude>
+      <tessellate>1</tessellate>
+      <coordinates>
+        -122.364383,37.824664,0 -122.364152,37.824322,0 
+      </coordinates>
+    </LineString>")
+    assert(g.is_a?(LineString))
+    assert(2,g.length)
+    assert_equal(LineString.from_points([Point.from_x_y_z(-122.364383,37.824664,0),Point.from_x_y_z(-122.364152,37.824322,0)],DEFAULT_SRID,true),g)
+                          
+    g = Geometry.from_kml("<Polygon>
+      <extrude>1</extrude>
+      <altitudeMode>relativeToGround</altitudeMode>
+      <outerBoundaryIs>
+        <LinearRing>
+          <coordinates>
+            -122.366278,37.818844,30
+            -122.365248,37.819267,30
+            -122.365640,37.819861,30
+            -122.366669,37.819429,30
+            -122.366278,37.818844,30
+          </coordinates>
+        </LinearRing>
+      </outerBoundaryIs>
+      <innerBoundaryIs>
+        <LinearRing>
+          <coordinates>
+            -122.366212,37.818977,30
+            -122.365424,37.819294,30
+            -122.365704,37.819731,30
+            -122.366488,37.819402,30
+            -122.366212,37.818977,30
+          </coordinates>
+        </LinearRing>
+      </innerBoundaryIs>
+      <innerBoundaryIs>
+        <LinearRing>
+          <coordinates>
+            -122.366212,37.818977,30
+            -122.365424,37.819294,30
+            -122.365704,37.819731,30
+            -122.366488,37.819402,30
+            -122.366212,37.818977,30
+          </coordinates>
+        </LinearRing>
+      </innerBoundaryIs>
+    </Polygon>")
+    assert(g.is_a?(Polygon))
+    assert_equal(3,g.length)
+
+  end
+
 
 end

data/test/test_shp.rb

@@ -73,5 +73,4 @@ class TestShp < Test::Unit::TestCase
     
     shpfile.close
   end
-
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2007-02-20 00:00:00 +01:00
+  version: 1.2.2
+date: 2007-03-24 00:00:00 +01:00
 summary: Ruby data holder for OGC Simple Features
 require_paths: 
 - lib