georuby 2.0.0 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 18405683e03e3da7a272be360c5bb5c8bff05a25
+  data.tar.gz: 5ceefaf8c76fdf9f8d9b47b54ec1530b8eb485b4
+SHA512:
+  metadata.gz: c4a344a8b430b5bdf67e3f90c5f4b9327d53a69eb23ef87b3bdebfe97bf65c7ab4ebee285f970e5b1ae61896a7622f2c0deb237d268a3c54b2a4f39d1d0a7ed3
+  data.tar.gz: bbd50a644084b9f1e60cd128438cd7f33b88e9de603263553be23a47528f917b0e7d2c1de8f0d3d3588d08515a16aeeca6cd925fa03d065f06dea9ddad437730

data/{README.rdoc → README.md}

@@ -1,20 +1,25 @@
-= GeoRuby
+GeoRuby
+=======
 
-
-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).
+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...).
 It also supports various output and input formats (GeoRSS, KML, Shapefile).
+GeoRuby is written in pure Ruby.
 
 OGC:"http://www.opengis.org/docs/99-049.pdf"
 
-GeoRuby is written in pure Ruby.
-If you are looking for Proj/Geos/ext C rubygem checkout:
+If you are looking for Proj/Geos (geometric operators or reprojections) rubygem checkout: (C extension)
 rgeo:"https://github.com/dazuma/rgeo"
 
+[![Gem Version](https://badge.fury.io/rb/georuby.png)](http://badge.fury.io/rb/georuby)
+[![Code Climate](https://codeclimate.com/github/nofxx/georuby.png)](https://codeclimate.com/github/nofxx/georuby)
+[![Build Status](https://travis-ci.org/nofxx/georuby.png?branch=master)](https://travis-ci.org/nofxx/georuby)
+[![Coverage Status](https://coveralls.io/repos/nofxx/georuby/badge.png)](https://coveralls.io/r/nofxx/georuby)
 
-== Available data types
+
+Available data types
+--------------------
 
 The following geometric data types are provided :
 - Point
@@ -31,7 +36,8 @@ 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.
 
 
-== Installation
+Installation
+------------
 
 To install the latest version, just type:
 
@@ -43,19 +49,21 @@ Or include on your projects`s Gemfile:
     gem 'georuby'
 
 
-Optional, require if you need support to:
+Optional, require if you need the functionality:
 
-    require 'geo_ruby/shp4r/shp'
-    require 'geo_ruby/gpx4r/gpx'
-    require 'geo_ruby/geojson'
-    require 'geo_ruby/georss'
-    require 'geo_ruby/kml'
 
+    require 'geo_ruby/shp4r/shp'    # Shapefile
+    require 'geo_ruby/gpx4r/gpx'    # GPX data
+    require 'geo_ruby/geojson'      # GeoJSON
+    require 'geo_ruby/georss'       # GeoRSS
+    require 'geo_ruby/kml'          # KML data
 
-== Use
 
+Use
+===
 
-=== Simple Examples
+Simple Examples
+----------------
 
 Creating a 3D Point:
 
@@ -67,7 +75,8 @@ Creating a LineString:
      LineString.from_coordinates([[1,1],[2,2]],4326))
 
 
-=== Input and output
+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
@@ -92,7 +101,8 @@ the altitude data will not be output even if present. Envelopes output a LatLonA
 For the output, the following geometric types are supported : Point, LineString, Polygon.
 
 
-=== SHP reading et writing
+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
@@ -144,15 +154,19 @@ 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
+GPX Reading
+---
 
 You can read and convert GPX Files to LineString/Polygon:
 
-     gpxfile = GpxFile.open(tour.gpx')
+     gpxfile = GpxFile.open('tour.gpx')
      gpxfile.as_line_string
      => GeoRuby::SimpleFeatures::LineString..
 
-=== GeoJSON Support
+
+GeoJSON Support
+-------
+
 Basic GeoJSON support has been implemented per v1.0 of the {spec}[http://geojson.org/geojson-spec.html].
 
 USAGE:
@@ -169,15 +183,19 @@ TODO:
 
 GeoJSON support implemented by {Marcus Mateus}[http://github.com/marcusmateus] and released courtesy {SimpliTex}[http://simplitex.com].
 
+
+=== Extra Features
+
+- Writing of ESRI shapefiles
+- Reading of ESRI shapefiles
+- Tool to import spatial features in MySQL and PostGIS from a SHP file
+
+
 === 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 (Original GeoRuby gem)
 
@@ -185,13 +203,6 @@ Any questions, enhancement proposals, bug notifications or corrections
 can be sent to mailto:guilhem.vellut@gmail.com.
 
 
-=== 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

data/lib/geo_ruby/simple_features.rb

@@ -1,6 +1,6 @@
 module GeoRuby
   module SimpleFeatures
-    
+
     %w[
       geometry
       circle
@@ -20,6 +20,6 @@ module GeoRuby
     ].each do |rel_file|
       require File.join(File.dirname(__FILE__), 'simple_features', rel_file)
     end
-    
+
   end
 end

data/lib/geo_ruby/simple_features/geometry.rb

@@ -1,8 +1,8 @@
 module GeoRuby#:nodoc:
   module SimpleFeatures
-    #arbitrary default SRID
-    DEFAULT_SRID = 4326 unless defined? DEFAULT_SRID
 
+    # Default SRID
+    DEFAULT_SRID = 4326 unless defined? DEFAULT_SRID
 
     #Root of all geometric data classes.
     #Objects of class Geometry should not be instantiated.
@@ -16,7 +16,7 @@ module GeoRuby#:nodoc:
       attr_accessor :with_m
       alias :with_m? :with_m
 
-      def initialize(srid=DEFAULT_SRID,with_z=false,with_m=false)
+      def initialize(srid=DEFAULT_SRID, with_z=false, with_m=false)
         @srid=srid
         @with_z=with_z
         @with_m=with_m
@@ -31,59 +31,73 @@ module GeoRuby#:nodoc:
         end
       end
 
-      #to be implemented in subclasses
+      # to be implemented in subclasses
       def bounding_box
       end
 
-      #to be implemented in subclasses
+      # to be implemented in subclasses
       def m_range
       end
 
-      #Returns an Envelope object for the geometry
+      #
+      # Returns an Envelope object for the geometry
+      #
       def envelope
-        Envelope.from_points(bounding_box,srid,with_z)
+        Envelope.from_points(bounding_box, srid,with_z)
       end
 
-      #Outputs the geometry as an EWKB string.
-      #The +allow_srid+, +allow_z+ and +allow_m+ arguments allow the output to include srid, z and m respectively if they are present in the geometry. If these arguments are set to false, srid, z and m are not included, even if they are present in the geometry. By default, the output string contains all the information in the object.
-      def as_ewkb(allow_srid=true,allow_z=true,allow_m=true)
-        ewkb="";
+      #
+      # Outputs the geometry as an EWKB string.
+      #
+      # The +allow_srid+, +allow_z+ and +allow_m+ arguments allow the output
+      # to include srid, z and m respectively if they are present in the geometry.
+      # If these arguments are set to false, srid, z and m are not included,
+      # even if they are present in the geometry.
+      # By default, the output string contains all the information in the object.
+      #
+      def as_ewkb(allow_srid=true, allow_z=true, allow_m=true)
+        ewkb = 1.chr #little_endian by default
 
-        ewkb << 1.chr #little_endian by default
+        type = binary_geometry_type
+        type = type | Z_MASK if @with_z and allow_z
+        type = type | M_MASK if @with_m and allow_m
 
-        type= binary_geometry_type
-        if @with_z and allow_z
-          type = type | Z_MASK
-        end
-        if @with_m and allow_m
-          type = type | M_MASK
-        end
         if allow_srid
           type = type | SRID_MASK
-          ewkb << [type,@srid].pack("VV")
+          ewkb << [type, @srid].pack("VV")
         else
           ewkb << [type].pack("V")
         end
 
-        ewkb << binary_representation(allow_z,allow_m)
+        ewkb  << binary_representation(allow_z, allow_m)
       end
 
-      #Outputs the geometry as a strict WKB string.
+      #
+      # Outputs the geometry as a strict WKB string.
+      #
       def as_wkb
-        as_ewkb(false,false,false)
+        as_ewkb(false, false, false)
       end
 
-      #Outputs the geometry as a HexEWKB string. It is almost the same as a WKB string, except that each byte of a WKB string is replaced by its hexadecimal 2-character representation in a HexEWKB string.
-      def as_hex_ewkb(allow_srid=true,allow_z=true,allow_m=true)
+      #
+      # Outputs the geometry as a HexEWKB string.
+      # It is almost the same as a WKB string, except that each byte of a WKB
+      # string is replaced by its hexadecimal 2-character representation in a HexEWKB string.
+      #
+      def as_hex_ewkb(allow_srid=true, allow_z=true, allow_m=true)
         as_ewkb(allow_srid, allow_z, allow_m).unpack('H*').join('').upcase
       end
 
-      #Outputs the geometry as a strict HexWKB string
+      #
+      # Outputs the geometry as a strict HexWKB string
+      #
       def as_hex_wkb
         as_hex_ewkb(false,false,false)
       end
 
-      #Outputs the geometry as an EWKT string.
+      #
+      # Outputs the geometry as an EWKT string.
+      #
       def as_ewkt(allow_srid=true,allow_z=true,allow_m=true)
         if allow_srid
           ewkt="SRID=#{@srid};"
@@ -95,14 +109,16 @@ module GeoRuby#:nodoc:
         ewkt << "(" << text_representation(allow_z,allow_m) << ")"
       end
 
-      #Outputs the geometry as strict WKT string.
+      #
+      # Outputs the geometry as strict WKT string.
+      #
       def as_wkt
-        as_ewkt(false,false,false)
+        as_ewkt(false, false, false)
       end
 
-      #Outputs the geometry in georss format.
-      #Assumes the geometries are in latlon format, with x as lon and y as lat.
-      #Pass the <tt>:dialect</tt> option to swhit format. Possible values are: <tt>:simple</tt> (default), <tt>:w3cgeo</tt> and <tt>:gml</tt>.
+      # Outputs the geometry in georss format.
+      # Assumes the geometries are in latlon format, with x as lon and y as lat.
+      # Pass the <tt>:dialect</tt> option to swhit format. Possible values are: <tt>:simple</tt> (default), <tt>:w3cgeo</tt> and <tt>:gml</tt>.
       def as_georss(options = {})
         dialect= options[:dialect] || :simple
         case(dialect)
@@ -121,9 +137,9 @@ module GeoRuby#:nodoc:
         end
       end
 
-      #Iutputs the geometry in kml format : options are <tt>:id</tt>, <tt>:tesselate</tt>, <tt>:extrude</tt>,
-      #<tt>:altitude_mode</tt>. If the altitude_mode option is not present, the Z (if present) will not be output (since
-      #it won't be used by GE anyway: clampToGround is the default)
+      # Iutputs the geometry in kml format : options are <tt>:id</tt>, <tt>:tesselate</tt>, <tt>:extrude</tt>,
+      # <tt>:altitude_mode</tt>. If the altitude_mode option is not present, the Z (if present) will not be output (since
+      # it won't be used by GE anyway: clampToGround is the default)
       def as_kml(options = {})
         id_attr = ""
         id_attr = " id=\"#{options[:id]}\"" if options[:id]
@@ -139,21 +155,23 @@ module GeoRuby#:nodoc:
         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.
+      # 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.
       def self.from_ewkb(ewkb)
         factory = GeometryFactory::new
-        ewkb_parser= EWKBParser::new(factory)
+        ewkb_parser = EWKBParser::new(factory)
         ewkb_parser.parse(ewkb)
         factory.geometry
       end
-      #Creates a geometry based on a HexEWKB string
+
+      # Creates a geometry based on a HexEWKB string given.
       def self.from_hex_ewkb(hexewkb)
         factory = GeometryFactory::new
-        hexewkb_parser= HexEWKBParser::new(factory)
+        hexewkb_parser = HexEWKBParser::new(factory)
         hexewkb_parser.parse(hexewkb)
         factory.geometry
       end
-      #Creates a geometry based on a EWKT string. Since WKT strings are a subset of EWKT, they are also valid.
+
+      # Creates a geometry based on a EWKT string. Since WKT strings are a subset of EWKT, they are also valid.
       def self.from_ewkt(ewkt)
         factory = GeometryFactory::new
         ewkt_parser= EWKTParser::new(factory)
@@ -161,13 +179,14 @@ module GeoRuby#:nodoc:
         factory.geometry
       end
 
-      #sends back a geometry based on the GeoRSS string passed as argument
+      # Creates a geometry based on the GeoRSS string given.
       def self.from_georss(georss)
         georss_parser= GeorssParser::new
         georss_parser.parse(georss)
         georss_parser.geometry
       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)
+
+      # 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
         georss_parser.parse(georss,true)
@@ -180,7 +199,7 @@ module GeoRuby#:nodoc:
         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/line_string.rb

@@ -63,8 +63,8 @@ module GeoRuby
         if with_m
           max_m, min_m = -Float::MAX, Float::MAX
           each do |point|
-            max_m = point.m if point.m > max_m
-            min_m = point.m if point.m < min_m
+            max_m = point.m if point.m.to_f > max_m
+            min_m = point.m if point.m.to_f < min_m
           end
           [min_m,max_m]
         else

data/lib/geo_ruby/simple_features/point.rb

@@ -3,14 +3,14 @@ require "geo_ruby/simple_features/geometry"
 
 module GeoRuby
   module SimpleFeatures
-    #Represents a point. It is in 3D if the Z coordinate is not +nil+.
+    # Represents a point. It is in 3D if the Z coordinate is not +nil+.
     class Point < Geometry
       DEG2RAD = 0.0174532925199433
       HALFPI  = 1.5707963267948966
       attr_accessor :x,:y,:z,:m
       attr_reader :r, :t # radium and theta
 
-      #if you prefer calling the coordinates lat and lon (or lng, for GeoKit compatibility)
+      # if you prefer calling the coordinates lat and lon (or lng, for GeoKit compatibility)
       alias :lon :x
       alias :lng :x
       alias :lat :y
@@ -18,31 +18,31 @@ module GeoRuby
       alias :tet :t
       alias :tetha :t
 
-      def initialize(srid=DEFAULT_SRID,with_z=false,with_m=false)
-        super(srid,with_z,with_m)
+      def initialize(srid = DEFAULT_SRID, with_z = false, with_m = false)
+        super(srid, with_z, with_m)
         @x = @y = 0.0
         @z=0.0 #default value : meaningful if with_z
         @m=0.0 #default value : meaningful if with_m
       end
       #sets all coordinates in one call. Use the +m+ accessor to set the m.
-      def set_x_y_z(x,y,z)
-        @x=x
-        @y=y
-        @z=z
+      def set_x_y_z(x, y, z)
+        @x = x && !x.is_a?(Numeric) ? x.to_f : x
+        @y = y && !y.is_a?(Numeric) ? y.to_f : y
+        @z = z && !z.is_a?(Numeric) ? z.to_f : z
         self
       end
       alias :set_lon_lat_z :set_x_y_z
 
       #sets all coordinates of a 2D point in one call
-      def set_x_y(x,y)
-        @x=x
-        @y=y
+      def set_x_y(x, y)
+        @x = x && !x.is_a?(Numeric) ? x.to_f : x
+        @y = y && !y.is_a?(Numeric) ? y.to_f : y
         self
       end
       alias :set_lon_lat :set_x_y
 
-      #Return the distance between the 2D points (ie taking care only of the x and y coordinates), assuming
-      #the points are in projected coordinates. Euclidian distance in whatever unit the x and y ordinates are.
+      # Return the distance between the 2D points (ie taking care only of the x and y coordinates), assuming
+      # the points are in projected coordinates. Euclidian distance in whatever unit the x and y ordinates are.
       def euclidian_distance(point)
         Math.sqrt((point.x - x)**2 + (point.y - y)**2)
       end
@@ -51,7 +51,7 @@ module GeoRuby
       # with a radius of 6471000m
       # Assumes x is the lon and y the lat, in degrees (Changed in version 1.1).
       # The user has to make sure using this distance makes sense (ie she should be in latlon coordinates)
-      def spherical_distance(point,r=6370997.0)
+      def spherical_distance(point, r = 6370997.0)
         dlat = (point.lat - lat) * DEG2RAD / 2
         dlon = (point.lon - lon) * DEG2RAD / 2
 
@@ -60,10 +60,10 @@ module GeoRuby
         r * c
       end
 
-      #Ellipsoidal distance in m using Vincenty's formula. Lifted entirely from Chris Veness's code at http://www.movable-type.co.uk/scripts/LatLongVincenty.html and adapted for Ruby. Assumes the x and y are the lon and lat in degrees.
-      #a is the semi-major axis (equatorial radius) of the ellipsoid
-      #b is the semi-minor axis (polar radius) of the ellipsoid
-      #Their values by default are set to the ones of the WGS84 ellipsoid
+      # Ellipsoidal distance in m using Vincenty's formula. Lifted entirely from Chris Veness's code at http://www.movable-type.co.uk/scripts/LatLongVincenty.html and adapted for Ruby. Assumes the x and y are the lon and lat in degrees.
+      # a is the semi-major axis (equatorial radius) of the ellipsoid
+      # b is the semi-minor axis (polar radius) of the ellipsoid
+      # Their values by default are set to the ones of the WGS84 ellipsoid
       def ellipsoidal_distance(point, a = 6378137.0, b = 6356752.3142)
         f = (a-b) / a
         l = (point.lon - lon) * DEG2RAD
@@ -132,7 +132,7 @@ module GeoRuby
         Math.sqrt((@x - xx) ** 2 + (@y - yy) ** 2)
       end
 
-      #Bearing from a point to another, in degrees.
+      # Bearing from a point to another, in degrees.
       def bearing_to(other)
         return 0 if self == other
         a,b =  other.x - self.x, other.y - self.y
@@ -140,7 +140,7 @@ module GeoRuby
         a < 0 ? 360 - res : res
       end
 
-      #Bearing from a point to another as symbols. (:n, :s, :sw, :ne...)
+      # Bearing from a point to another as symbols. (:n, :s, :sw, :ne...)
       def bearing_text(other)
         case bearing_to(other)
         when 1..22    then :n
@@ -156,7 +156,7 @@ module GeoRuby
         end
       end
 
-      #Bounding box in 2D/3D. Returns an array of 2 points
+      # Bounding box in 2D/3D. Returns an array of 2 points
       def bounding_box
         unless with_z
           [Point.from_x_y(@x,@y),Point.from_x_y(@x,@y)]
@@ -169,13 +169,13 @@ module GeoRuby
         [@m,@m]
       end
 
-      #tests the equality of the position of points + m
+      # Tests the equality of the position of points + m
       def ==(other)
         return false unless other.kind_of?(Point)
         @x == other.x and @y == other.y and @z == other.z and @m == other.m
       end
 
-      #binary representation of a point. It lacks some headers to be a valid EWKB representation.
+      # Binary representation of a point. It lacks some headers to be a valid EWKB representation.
       def binary_representation(allow_z=true,allow_m=true) #:nodoc:
         bin_rep = [@x.to_f,@y.to_f].pack("EE")
         bin_rep += [@z.to_f].pack("E") if @with_z and allow_z #Default value so no crash
@@ -183,12 +183,12 @@ module GeoRuby
         bin_rep
       end
 
-      #WKB geometry type of a point
+      # WKB geometry type of a point
       def binary_geometry_type#:nodoc:
         1
       end
 
-      #text representation of a point
+      # Text representation of a point
       def text_representation(allow_z=true,allow_m=true) #:nodoc:
         tex_rep = "#{@x} #{@y}"
         tex_rep += " #{@z}" if @with_z and allow_z
@@ -196,70 +196,91 @@ module GeoRuby
         tex_rep
       end
 
-      #WKT geometry type of a point
+      # WKT geometry type of a point
       def text_geometry_type #:nodoc:
         "POINT"
       end
 
-      #georss simple representation
+      # georss simple representation
       def georss_simple_representation(options) #:nodoc:
         georss_ns = options[:georss_ns] || "georss"
         geom_attr = options[:geom_attr]
         "<#{georss_ns}:point#{geom_attr}>#{y} #{x}</#{georss_ns}:point>\n"
       end
 
-      #georss w3c representation
+      # georss w3c representation
       def georss_w3cgeo_representation(options) #:nodoc:
         w3cgeo_ns = options[:w3cgeo_ns] || "geo"
         "<#{w3cgeo_ns}:lat>#{y}</#{w3cgeo_ns}:lat>\n<#{w3cgeo_ns}:long>#{x}</#{w3cgeo_ns}:long>\n"
       end
 
-      #georss gml representation
+      # georss gml representation
       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}:Point>\n<#{gml_ns}:pos>"
-        result += "#{y} #{x}"
-        result += "</#{gml_ns}:pos>\n</#{gml_ns}:Point>\n</#{georss_ns}:where>\n"
+        out = "<#{georss_ns}:where>\n<#{gml_ns}:Point>\n<#{gml_ns}:pos>"
+        out += "#{y} #{x}"
+        out += "</#{gml_ns}:pos>\n</#{gml_ns}:Point>\n</#{georss_ns}:where>\n"
       end
 
-      #outputs the geometry in kml format : options are <tt>:id</tt>, <tt>:tesselate</tt>, <tt>:extrude</tt>,
-      #<tt>:altitude_mode</tt>. If the altitude_mode option is not present, the Z (if present) will not be output (since
-      #it won't be used by GE anyway: clampToGround is the default)
+      # outputs the geometry in kml format : options are <tt>:id</tt>, <tt>:tesselate</tt>, <tt>:extrude</tt>,
+      # <tt>:altitude_mode</tt>. If the altitude_mode option is not present, the Z (if present) will not be output (since
+      # it won't be used by GE anyway: clampToGround is the default)
       def kml_representation(options = {}) #:nodoc:
-        result = "<Point#{options[:id_attr]}>\n"
-        result += options[:geom_data] if options[:geom_data]
-        result += "<coordinates>#{x},#{y}"
-        result += ",#{options[:fixed_z] || z ||0}" if options[:allow_z]
-        result += "</coordinates>\n"
-        result += "</Point>\n"
-      end
-
-      # Outputs the geometry in coordinates format:
-      # 47°52′48″, -20°06′00″
-      def as_latlong(opts = { })
-        val = []
-        [x,y].each_with_index do |l,i|
-          deg = l.to_i.abs
-          min = (60 * (l.abs - deg)).to_i
-          labs = (l * 1000000).abs / 1000000
+        out = "<Point#{options[:id_attr]}>\n"
+        out += options[:geom_data] if options[:geom_data]
+        out += "<coordinates>#{x},#{y}"
+        out += ",#{options[:fixed_z] || z ||0}" if options[:allow_z]
+        out += "</coordinates>\n"
+        out += "</Point>\n"
+      end
+
+      def html_representation(options = {})
+        options[:coord] = true if options[:coord].nil?
+        out =  "<span class='geo'>"
+        out += "<abbr class='latitude' title='#{x}'>#{as_lat(options)}</abbr>"
+        out += "<abbr class='longitude' title='#{y}'>#{as_long(options)}</abbr>"
+        out += "</span>"
+      end
+
+      # Human representation of the geom, don't use directly, use:
+      # #as_lat, #as_long, #as_latlong
+      def human_representation(options = { }, g = { :x => x, :y => y })
+        g.map do |k, v|
+          deg = v.to_i.abs
+          min = (60 * (v.abs - deg)).to_i
+          labs = (v * 1000000).abs / 1000000
           sec = ((((labs - labs.to_i) * 60) - ((labs - labs.to_i) * 60).to_i) * 100000) * 60 / 100000
-          str = opts[:full] ? "%.i°%.2i′%05.2f″" :  "%.i°%.2i′%02.0f″"
-          if opts[:coord]
+          str = options[:full] ? "%.i°%.2i′%05.2f″" :  "%.i°%.2i′%02.0f″"
+          if options[:coord]
             out = str % [deg,min,sec]
-            if i == 0
-              out += l > 0 ? "N" : "S"
-            else
-              out += l > 0 ? "E" : "W"
-            end
-            val << out
+            out += k == :x ? v > 0 ? "N" : "S" : v > 0 ? "E" : "W"
           else
-            val << str % [l.to_i, min, sec]
+            str % [v.to_i, min, sec]
           end
         end
-        val.join(", ")
       end
 
+      # Outputs the geometry coordinate in human format:
+      # 47°52′48″N
+      def as_lat(options = {})
+        human_representation(options, { x: x }).join
+      end
+
+      # Outputs the geometry coordinate in human format:
+      # -20°06′00W″
+      def as_long(options = {})
+        human_representation(options, { y: y }).join
+      end
+      alias :as_lng :as_long
+
+      # Outputs the geometry in coordinates format:
+      # 47°52′48″, -20°06′00″
+      def as_latlong(options = {})
+        human_representation(options).join(", ")
+      end
+      alias :as_ll :as_latlong
+
       # Polar stuff
       #
       # http://www.engineeringtoolbox.com/converting-cartesian-polar-coordinates-d_1347.html

data/lib/geo_ruby/version.rb

@@ -1,3 +1,3 @@
 module GeoRuby
-  VERSION = '2.0.0'
+  VERSION = '2.2.0'
 end

data/lib/georuby.rb

@@ -0,0 +1,2 @@
+# include it by 'geo_ruby' or 'georuby'!
+require 'geo_ruby/simple_features'

data/spec/geo_ruby/georss_spec.rb

@@ -151,7 +151,7 @@ describe GeoRuby::GeorssParser do
     geom.should == e
   end
 
-  it "test_kml_read" do
+  it "reads KML" do
     g = GeoRuby::SimpleFeatures::Geometry.from_kml("<Point><coordinates>45,12,25</coordinates></Point>")
     g.should be_a GeoRuby::SimpleFeatures::Point
     g.should == GeoRuby::SimpleFeatures::Point.from_x_y_z('45','12','25')
@@ -208,19 +208,19 @@ describe GeoRuby::GeorssParser do
     g.length.should eql(3)
   end
 
-  it "test_to_kml_for_point_does_not_raise_type_error_if_geom_data_not_provided" do
+  it "does not raise type error if point geom data not provided" do
     point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8],123)
-    lambda { point.kml_representation }.should_not raise_error(TypeError)
+    lambda { point.kml_representation }.should_not raise_error
   end
 
-  it "test_to_kml_for_polygon_does_not_raise_type_error_if_geom_data_not_provided" do
+  it "does not raise type error if polygon geom data not provided" do
     polygon =  GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256)
-    lambda { polygon.kml_representation }.should_not raise_error(TypeError)
+    lambda { polygon.kml_representation }.should_not raise_error
   end
 
-  it "test_to_kml_for_line_string_does_not_raise_type_error_if_geom_data_not_provided" do
+  it "does not raise type error if linestring geom data not provided" do
     ls = GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
-    lambda { ls.kml_representation }.should_not raise_error(TypeError)
+    lambda { ls.kml_representation }.should_not raise_error
   end
 
 end

data/spec/geo_ruby/kml_spec.rb

@@ -6,9 +6,8 @@ describe GeoRuby::KmlParser do
     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>"
+    COMPLEX_POLYGON = "<Polygon><outerBoundaryIs><LinearRing><coordinates>-122.366278,37.818844 -122.365248,37.819267 -122.36564,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
@@ -76,4 +75,24 @@ describe GeoRuby::KmlParser do
     g.with_z.should eql(true)
     # g.as_kml(:altitude_mode => "clampToGround").gsub(/\n/,'').should eql(LINESTRING3D)
   end
-end
+
+  it "should yield a geometries with functional bounding boxes" do
+    [LINESTRING, LINEARRING, POLYGON, COMPLEX_POLYGON, MULTIGEOMETRY, LINESTRING3D].each do |kml|
+      @kml_parser.parse(kml)
+      g = @factory.geometry
+      lambda {
+        g.bounding_box
+      }.should_not raise_error
+    end
+  end
+
+  it "should yield a geometries with functional envelopes" do
+    [LINESTRING, LINEARRING, POLYGON, COMPLEX_POLYGON, MULTIGEOMETRY, LINESTRING3D].each do |kml|
+      @kml_parser.parse(kml)
+      g = @factory.geometry
+      lambda {
+        g.envelope.center
+      }.should_not raise_error
+    end
+  end
+end

data/spec/geo_ruby/simple_features/geometry_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: binary -*-
+
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe GeoRuby::SimpleFeatures::Geometry do
@@ -22,8 +24,14 @@ describe GeoRuby::SimpleFeatures::Geometry do
   end
 
   it "should output as_ewkb" do
-    subject.stub!(:binary_geometry_type).and_return(1)
-    subject.stub!(:binary_representation).and_return(1)
+    subject.stub(:binary_geometry_type).and_return(1)
+    subject.stub(:binary_representation).and_return(1)
     subject.as_ewkb.should eql("\001\001\000\000 \346\020\000\000\001")
   end
+
+  it "should output as_ewkb (utf8 issue)" do
+    subject.stub(:binary_geometry_type).and_return(1)
+    subject.stub(:binary_representation).and_return(1)
+    subject.as_ewkb.should eql("\x01\x01\x00\x00 \xE6\x10\x00\x00\x01")
+  end
 end

data/spec/geo_ruby/simple_features/line_string_spec.rb

@@ -7,7 +7,7 @@ module LineSpecHelper
   end
 
   def mock_point(x=1,y=2)
-    mock(GeoRuby::SimpleFeatures::Point, :x => x, :y => y, :text_representation => "#{x} #{y}")
+    double(GeoRuby::SimpleFeatures::Point, :x => x, :y => y, :text_representation => "#{x} #{y}")
   end
 end
 
@@ -17,7 +17,7 @@ describe GeoRuby::SimpleFeatures::LineString do
 
   describe "Instance Methods" do
 
-    let(:line) { GeoRuby::SimpleFeatures::LineString.from_points([mock(GeoRuby::SimpleFeatures::Point)]) }
+    let(:line) { GeoRuby::SimpleFeatures::LineString.from_points([double(GeoRuby::SimpleFeatures::Point)]) }
 
     it "should instantiate" do
       violated unless line
@@ -203,9 +203,9 @@ describe GeoRuby::SimpleFeatures::LineString do
 
   describe "> Distances..." do
     before(:each) do
-      @p1 = mock(GeoRuby::SimpleFeatures::Point)
-      @p2 = mock(GeoRuby::SimpleFeatures::Point)
-      @p3 = mock(GeoRuby::SimpleFeatures::Point)
+      @p1 = double(GeoRuby::SimpleFeatures::Point)
+      @p2 = double(GeoRuby::SimpleFeatures::Point)
+      @p3 = double(GeoRuby::SimpleFeatures::Point)
       @line = GeoRuby::SimpleFeatures::LineString.from_points([@p1,@p2,@p3])
     end
 

data/spec/geo_ruby/simple_features/point_spec.rb

@@ -13,6 +13,10 @@ describe GeoRuby::SimpleFeatures::Point do
     point.should be_a_point
   end
 
+  it "should have a text geometry type" do
+    point.text_geometry_type.should eq("POINT")
+  end
+
   it "should have a very nice matcher" do
     point.should be_a_point(0.0, 0.0)
   end
@@ -98,6 +102,11 @@ describe GeoRuby::SimpleFeatures::Point do
       point.z.should eql(-30)
     end
 
+    it "should store correctly a 3d point" do
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_z(-10,-20,-30)
+      point.to_coordinates.should eq([-10, -20, -30])
+    end
+
     it "should instantiate a 3d(m) point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y_m(10,20,30)
       point.x.should eql(10)
@@ -115,6 +124,12 @@ describe GeoRuby::SimpleFeatures::Point do
       point.srid.should eql(123)
     end
 
+    it "should store correctly a 4d point" do
+      point = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(-10,-20,-30, 1)
+      point.m.should eql(1)
+      point.to_coordinates.should eq([-10, -20, -30])
+    end
+
     it "should instantiate a point from polar coordinates" do
       point = GeoRuby::SimpleFeatures::Point.from_r_t(1.4142,45)
       point.y.should be_within(0.1).of(1)
@@ -188,22 +203,46 @@ describe GeoRuby::SimpleFeatures::Point do
       GeoRuby::SimpleFeatures::Point.from_x_y(47.88, -20.1).as_latlong.should eql("47°52′48″, -20°06′00″")
     end
 
-    it "should print out nicely" do
+    it "should print out nicely latlong" do
       GeoRuby::SimpleFeatures::Point.from_x_y(-20.78, 20.78).as_latlong(:full => true).should eql("-20°46′48.00″, 20°46′48.00″")
     end
 
-    it "should print out nicely" do
+    it "should print out nicely latlong" do
       GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:full => true).should eql("47°06′36.00″, -20°11′60.00″")
     end
 
-    it "should print out nicely" do
+    it "should print out nicely latlong" do
       GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:coord => true).should eql("47°06′36″N, 20°11′60″W")
     end
 
-    it "should print out nicely" do
+    it "should print out nicely latlong" do
       GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_latlong(:full => true,:coord => true).should eql("47°06′36.00″S, 20°11′60.00″E")
     end
 
+    it "should print out nicely lat" do
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat.should eql("-47°06′36″")
+    end
+
+    it "should print out nicely lat with opts" do
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat(:full => true).should eql("-47°06′36.00″")
+    end
+
+    it "should print out nicely lat with opts" do
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat(:full => true,:coord => true).should eql("47°06′36.00″S")
+    end
+
+    it "should print out nicely long" do
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long.should eql("20°11′60″")
+    end
+
+    it "should print out nicely long with opts" do
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long(:full => true).should eql("20°11′60.00″")
+    end
+
+    it "should print out nicely long with opts" do
+      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long(:full => true,:coord => true).should eql("20°11′60.00″E")
+    end
+
   end
 
   describe " > Distance & Bearing" do
@@ -333,6 +372,18 @@ describe GeoRuby::SimpleFeatures::Point do
       point.kml_representation.should eql("<Point>\n<coordinates>-11.2431,32.3141</coordinates>\n</Point>\n")
     end
 
+    it "should print as html too" do
+      point.html_representation.should eql("<span class='geo'><abbr class='latitude' title='-11.2431'>11°14′35″S</abbr><abbr class='longitude' title='32.3141'>32°18′51″E</abbr></span>")
+    end
+
+    it "should print as html too with opts" do
+      point.html_representation(coord: false).should eql("<span class='geo'><abbr class='latitude' title='-11.2431'>-11°14′35″</abbr><abbr class='longitude' title='32.3141'>32°18′51″</abbr></span>")
+    end
+
+    it "should print as html too with opts" do
+      point.html_representation(full: true).should eql("<span class='geo'><abbr class='latitude' title='-11.2431'>11°14′35.16″S</abbr><abbr class='longitude' title='32.3141'>32°18′50.76″E</abbr></span>")
+    end
+
     it "should print as georss" do
       point.georss_simple_representation(:georss_ns => 'hey').should eql("<hey:point>32.3141 -11.2431</hey:point>\n")
     end
@@ -349,6 +400,16 @@ describe GeoRuby::SimpleFeatures::Point do
       point.theta_rad.should be_within(0.0001).of(5.04722003626982)
     end
 
+    it "should print theta when x is zero y > 0" do
+      pt = GeoRuby::SimpleFeatures::Point.from_x_y(0.0, 32.3141)
+      pt.theta_rad.should be_within(0.0001).of(1.5707963267948966)
+    end
+
+    it "should print theta when x is zero y < 0" do
+      pt = GeoRuby::SimpleFeatures::Point.from_x_y(0.0, -32.3141)
+      pt.theta_rad.should be_within(0.0001).of(4.71238898038469)
+    end
+
     it "should output as polar" do
       point.as_polar.should be_instance_of(Array)
       point.should have(2).as_polar #.length.should eql(2)

data/spec/spec_helper.rb

@@ -15,6 +15,11 @@ require 'geo_ruby/geojson'
 require 'geo_ruby/georss'
 require 'geo_ruby/kml'
 
+if ENV["CI"]
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 module GeorubyMatchers
 
   class BeGeometric
@@ -63,4 +68,3 @@ end
 RSpec.configure do |config|
   config.include GeorubyMatchers
 end
-

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georuby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.2.0
 platform: ruby
 authors:
 - Guilhem Vellut
@@ -12,88 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-- !ruby/object:Gem::Dependency
-  name: dbf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-11-06 00:00:00.000000000 Z
+dependencies: []
 description: GeoRuby provides geometric data types from the OGC 'Simple Features'
   specification.
 email: x@nofxx.com
@@ -102,6 +21,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/geo_ruby.rb
+- lib/georuby.rb
 - lib/geo_ruby/geojson.rb
 - lib/geo_ruby/gpx4r/gpx.rb
 - lib/geo_ruby/gpx.rb
@@ -171,36 +91,30 @@ files:
 - spec/geo_ruby/simple_features/linear_ring_spec.rb
 - spec/geo_ruby/georss_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
-- README.rdoc
+- README.md
 - Rakefile
 homepage: http://github.com/nofxx/georuby
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4371088518288572487
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4371088518288572487
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby data holder for OGC Simple Features
 test_files: []