GeoRuby 1.1.1 → 1.1.2

data/README

@@ -21,7 +21,7 @@ These geometries can be input and output in WKB/EWKB/WKT/EWKT format (as well as
 
 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). 
 
-On top of that, there is now support for KML output. 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>clampedToGround</tt>, the altitude data will not be output even if present. Envelopes output a LatLonAltBox instead of a geometry.
+On top of that, there is now support for KML output. 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.
 
 ===Installation
 To install the latest version, just type :

data/lib/geo_ruby/simple_features/envelope.rb

@@ -46,7 +46,7 @@ module GeoRuby
 
       #georss serialization: Dialect can be passed as option <tt>:dialect</tt> and set to <tt>:simple</tt> (default)
       #<tt>:w3cgeo</tt> or <tt>:gml</tt>. Options <tt>:featuretypetag
-      def as_georss(options)
+      def as_georss(options = {})
         dialect= options[:dialect] || :simple
         case(dialect)
         when :simple
@@ -66,21 +66,21 @@ module GeoRuby
       end
       
        #georss simple representation
-      def georss_simple_representation(options) #:nodoc:
+      def georss_simple_representation(options = {}) #:nodoc:
         georss_ns = options[:georss_ns] || "georss"
         geom_attr = options[:geom_attr]
         "<#{georss_ns}:box#{geom_attr}>#{lower_corner.y} #{lower_corner.x} #{upper_corner.y} #{upper_corner.x}</#{georss_ns}:box>\n"
       end
 
       #georss w3c representation : outputs the first point of the line
-      def georss_w3cgeo_representation(options) #:nodoc:
+      def georss_w3cgeo_representation(options = {}) #:nodoc:
         w3cgeo_ns = options[:w3cgeo_ns] || "geo"
         point = self.center
         "<#{w3cgeo_ns}:lat>#{point.y}</#{w3cgeo_ns}:lat>\n<#{w3cgeo_ns}:long>#{point.x}</#{w3cgeo_ns}:long>\n"
       end
 
       #georss gml representation
-      def georss_gml_representation(options) #:nodoc:
+      def georss_gml_representation(options = {}) #:nodoc:
         georss_ns = options[:georss_ns] || "georss"
         gml_ns = options[:gml_ns] || "gml"
         result = "<#{georss_ns}:where>\n<#{gml_ns}:Envelope>\n"

data/lib/geo_ruby/simple_features/geometry.rb

@@ -2,14 +2,7 @@ module GeoRuby#:nodoc:
   module SimpleFeatures
     #arbitrary default SRID
     DEFAULT_SRID=-1
-    #indicates the presence of Z coordinates in EWKB strings
-    Z_MASK=0x80000000
-    #indicates the presence of M coordinates in EWKB strings.
-    M_MASK=0x40000000
-    #indicate the presence of a SRID in EWKB strings.
-    SRID_MASK=0x20000000
-    
-    
+        
     #Root of all geometric data classes.
     #Objects of class Geometry should not be instantiated.
     class Geometry
@@ -125,9 +118,10 @@ module GeoRuby#:nodoc:
         geom_data += "<tesselate>#{options[:tesselate]}</tesselate>\n" if options[:tesselate]
         geom_data += "<altitudeMode>#{options[:altitude_mode]}</altitudeMode>\n" if options[:altitude_mode]
         
-        allow_z = with_z && (!options[:altitude_mode].nil?) && options[:atitude_mode] != "clampToGround"
+        allow_z = (with_z || !options[:altitude].nil? )&& (!options[:altitude_mode].nil?) && options[:atitude_mode] != "clampToGround"
+        fixed_z = options[:altitude]
         
-        kml_representation(options.merge(:id_attr => id_attr, :geom_data => geom_data, :allow_z => allow_z))
+        kml_representation(options.merge(:id_attr => id_attr, :geom_data => geom_data, :allow_z => allow_z, :fixed_z => fixed_z))
       end
       
       #Creates a geometry based on a EWKB string. The actual class returned depends of the content of the string passed as argument. Since WKB strings are a subset of EWKB, they are also valid.

data/lib/geo_ruby/simple_features/helper.rb

@@ -0,0 +1,18 @@
+module GeoRuby
+  module SimpleFeatures
+    #indicates the presence of Z coordinates in EWKB strings
+    Z_MASK=0x80000000
+    #indicates the presence of M coordinates in EWKB strings.
+    M_MASK=0x40000000
+    #indicate the presence of a SRID in EWKB strings.
+    SRID_MASK=0x20000000
+    #GeoRSS namespace
+    GEORSS_NS = "http://www.georss.org/georss"
+    #GML Namespace
+    GML_NS = "http://www.opengis.net/gml"
+    #W3CGeo Namespace
+    W3CGEO_NS = "http://www.w3.org/2003/01/geo/wgs84_pos#"
+    #KML Namespace
+    KML_NS = "http://earth.google.com/kml/2.1"
+  end
+end

data/lib/geo_ruby/simple_features/line_string.rb

@@ -116,14 +116,14 @@ module GeoRuby
         result = "<LineString#{options[:id_attr]}>\n"
         result += options[:geom_data]
         result += "<coordinates>"
-        result += kml_poslist(options[:allow_z])
+        result += kml_poslist(options)
         result += "</coordinates>\n"
         result += "</LineString>\n"
       end
       
-      def kml_poslist(allow_z) #:nodoc: 
-        if allow_z
-          map {|point| "#{point.x},#{point.y},#{point.z || 0}" }.join(" ")
+      def kml_poslist(options) #:nodoc: 
+        if options[:allow_z]
+          map {|point| "#{point.x},#{point.y},#{options[:fixed_z] || point.z || 0}" }.join(" ")
         else
           map {|point| "#{point.x},#{point.y}" }.join(" ")
         end

data/lib/geo_ruby/simple_features/point.rb

@@ -173,7 +173,7 @@ module GeoRuby
         result = "<Point#{options[:id_attr]}>\n"
         result += options[:geom_data]
         result += "<coordinates>#{x},#{y}"
-        result += ",#{z || 0}" if options[:allow_z]
+        result += ",#{options[:fixed_z] || z ||0}" if options[:allow_z]
         result += "</coordinates>\n"
         result += "</Point>\n"
       end

data/lib/geo_ruby/simple_features/polygon.rb

@@ -103,7 +103,7 @@ module GeoRuby
             boundary = "innerBoundaryIs"
           end
           result += "<#{boundary}><LinearRing><coordinates>\n"
-          result += ring.kml_poslist(options[:allow_z])
+          result += ring.kml_poslist(options)
           result += "\n</coordinates></LinearRing></#{boundary}>\n"
         end
         result += "</Polygon>\n"

data/lib/geo_ruby.rb

@@ -1,3 +1,4 @@
+require 'geo_ruby/simple_features/helper'
 require 'geo_ruby/simple_features/geometry'
 require 'geo_ruby/simple_features/point'
 require 'geo_ruby/simple_features/line_string'
@@ -8,8 +9,8 @@ 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/ewkb_parser'
 require 'geo_ruby/simple_features/ewkt_parser'
-require 'geo_ruby/simple_features/geometry_factory'
 require 'geo_ruby/simple_features/georss_parser'
 

data/rakefile.rb

@@ -24,7 +24,7 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'GeoRuby'
-  s.version = "1.1.1"
+  s.version = "1.1.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)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-01-02 00:00:00 +01:00
+  version: 1.1.2
+date: 2007-01-05 00:00:00 +01:00
 summary: Ruby data holder for OGC Simple Features
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - 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/linear_ring.rb
 - lib/geo_ruby/simple_features/line_string.rb
 - lib/geo_ruby/simple_features/multi_line_string.rb