geoscript 0.0.1.pre → 0.0.1

data/README.md

@@ -8,20 +8,18 @@ require 'geoscript'
 include GeoScript::Geom
 # => Object
 
-p = Point.create -111.0, 45.7
-# => #<GeoScript::Geom::Point:0x7f4d4b79 @bounds=#<GeoScript::Geom::Bounds:0x50ecb7c8>>
+p = Point.new -111.0, 45.7
+# => #<GeoScript::Geom::Point:0x636c4fcb>
 p.to_wkt
-# => "POINT (-111.0 45.7)"
+# => "POINT (-111 45.7)"
 
 p2 = GeoScript::Projection.reproject p, 'epsg:4326', 'epsg:26912'
-# => #<Java::ComVividsolutionsJtsGeom::Point:0x2d547681>
-p2.x
-# => 500000.0
-p2.y
-# => 5060716.313515949
+# => #<GeoScript::Geom::Point:0x6a55c240>
+p2.to_wkt
+# => "POINT (500000 5060716.313515949)"
 
 poly = p2.buffer 100
-# => #<Java::ComVividsolutionsJtsGeom::Polygon:0x157106f7>
+# => #<GeoScript::Geom::Polygon:0x7b32aba9>
 poly.get_area
 # => 31214.451522458345
 ```

data/lib/geoscript/geom/bounds.rb

@@ -6,42 +6,38 @@ module GeoScript
     class Bounds < ReferencedEnvelope
       include GeoScript::Geom
 
-      def initialize(*args);end
-
-      def self.create(env, proj = nil)
+      def initialize(env, proj = nil)
         projection = GeoScript::Projection.new proj if proj
 
         if env.kind_of? Envelope
           if projection
-            bounds = Bounds.new env, projection
+            super(env, projection)
           elsif env.respond_to? :crs
             if env.crs
-              bounds = Bounds.new env, env.crs
+              super(env, env.crs)
             else
-              bounds = Bounds.new env, nil
+              super(env, nil)
             end
           else
-            bounds = Bounds.new env, nil
+            super(env, nil)
           end
         else
           if env.kind_of? Hash
             if projection
-              bounds = Bounds.new env[:x_min], env[:x_max], env[:y_min], env[:y_max], projection
+              super(env[:x_min], env[:x_max], env[:y_min], env[:y_max], projection)
             else
-              bounds = Bounds.new env[:x_min], env[:x_max], env[:y_min], env[:y_max], nil
+              super(env[:x_min], env[:x_max], env[:y_min], env[:y_max], nil)
             end
           elsif env.kind_of? Array
             if projection
-              bounds = Bounds.new env[0], env[1], env[2], env[3], projection
+              super(env[0], env[1], env[2], env[3], projection)
             else
-              bounds = Bounds.new env[0], env[1], env[2], env[3]
+              super(env[0], env[1], env[2], env[3])
             end
           else
-            bounds = Bounds.new
+            super()
           end
         end
-        
-        bounds
       end
 
       def get_west

data/lib/geoscript/geom/geom.rb

@@ -30,7 +30,7 @@ module GeoScript
     end
 
     def self.get_bounds(geom)
-      Bounds.create geom.get_envelope_internal
+      Bounds.new geom.get_envelope_internal
     end
 
     def self.enhance(geom)

data/lib/geoscript/geom/linearring.rb

@@ -8,17 +8,17 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def initialize(*args);end
-
-      def self.create(*coords)
+      def initialize(*coords)
         if coords.size == 1
-          linear_ring = LinearRing.new coords.first.coordinate_sequence if coords.first.kind_of? LinearRing
+          super(coords.first.coordinate_sequence) if coords.first.kind_of? LinearRing
         else
-          line_string = LineString.create *coords
-          linear_ring = LinearRing.new line_string.coordinate_sequence, GEOM_FACTORY
+          line_string = LineString.new *coords
+          super(line_string.coordinate_sequence, GEOM_FACTORY)
         end
-        GeoScript::Geom.enhance linear_ring
-        linear_ring
+      end
+
+      def buffer(dist)
+        Polygon.new super
       end
 
       def to_wkt

data/lib/geoscript/geom/linestring.rb

@@ -8,12 +8,9 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def initialize(*args);end
-
-      def self.create(*coords)
+      def initialize(*coords)
         if coords.size == 1
-          if coords.first.kind_of? LineString
-            ls = coords.first
+          if coords.first.kind_of? JTSLineString
           elsif coords.kind_of? Array
             if coords.first.kind_of? Array
               l = []
@@ -36,16 +33,18 @@ module GeoScript
             ls = GEOM_FACTORY.create_line_string l.to_java(com.vividsolutions.jts.geom.Coordinate)
           end
         end
-        
+
         if ls
-          line_string = LineString.new ls.coordinate_sequence, GEOM_FACTORY
-          GeoScript::Geom.enhance line_string
-          line_string
+          super(ls.coordinate_sequence, GEOM_FACTORY)
         else
           raise 'LineString could not be created. Check inputs.'
         end
       end
 
+      def buffer(dist)
+        Polygon.new super
+      end
+
       def to_wkt
         IO.write_wkt self
       end

data/lib/geoscript/geom/multilinestring.rb

@@ -7,12 +7,10 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def initialize(*args);end
-
-      def self.create(*line_strings)
+      def initialize(*line_strings)
         strings = []
 
-        if line_strings.first.kind_of? MultiLineString
+        if line_strings.first.kind_of? JTSMultiLineString
           multi_line_string_geom = line_strings.first
           for i in range(0...multi_line_string_geom.num_geometries)
             strings << multi_line_string_geom.get_geometry_n(i)
@@ -22,14 +20,16 @@ module GeoScript
             if line_string.kind_of? LineString
               strings << line_string
             else
-              strings << LineString.create(*line_string)
+              strings << LineString.new(*line_string)
             end
           end
         end
 
-        multi_line_string = MultiLineString.new strings.to_java(com.vividsolutions.jts.geom.LineString), GEOM_FACTORY
-        GeoScript::Geom.enhance multi_line_string
-        multi_line_string
+        super(strings.to_java(com.vividsolutions.jts.geom.LineString), GEOM_FACTORY)
+      end
+
+      def buffer(dist)
+        Polygon.new super
       end
 
       def to_wkt

data/lib/geoscript/geom/multipoint.rb

@@ -7,14 +7,11 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def intitialize(*args);end
-
-      def self.create(*points)
+      def initialize(*points)
         feature_points = []
 
-        if points.first.kind_of? MultiPoint
-          multi_point_geom = points.first
-
+        if points.first.kind_of? JTSMultiPoint
+          multi_point_geom = point.first
           for i in (0...multi_point_geom.num_geometries)
             feature_points << multi_point_geom.get_geometry_n(i)
           end
@@ -23,14 +20,16 @@ module GeoScript
             if point.kind_of? Point
               feature_points << point
             else
-              feature_points << Point.create(*point)
+              feature_points << Point.new(*point)
             end
           end
         end
 
-        multi_point = MultiPoint.new feature_points.to_java(com.vividsolutions.jts.geom.Point), GEOM_FACTORY
-        GeoScript::Geom.enhance multi_point
-        multi_point
+        super(feature_points.to_java(com.vividsolutions.jts.geom.Point), GEOM_FACTORY)
+      end
+
+      def buffer(dist)
+        Polygon.new super
       end
 
       def to_wkt

data/lib/geoscript/geom/multipolygon.rb

@@ -7,29 +7,28 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def initialize(*args);end
-
-      def self.create(*polygons)
+      def initialize(*polygons)
         polys = []
 
-        if polygons.first.kind_of? MultiPolygon
+        if polygons.first.kind_of? JTSMultiPolygon
           multi_polygon = polygons.first
           for i in range(0...multi_polygon.num_geometries)
             polys << multi_polygon.get_geometry_n(i)
           end
         else
           polygons.each do |polygon|
-            if polygon.kind_of? Polygon
+            if polygon.kind_of? Java::ComVividsolutionsJtsGeom::Polygon
               polys << polygon
             else
-              polys << Polygon.create(*polygon)
+              polys << Polygon.new(*polygon)
             end
           end
         end
+        super(polys.to_java(com.vividsolutions.jts.geom.Polygon), GEOM_FACTORY)
+      end
 
-        multi_poly = MultiPolygon.new polys.to_java(com.vividsolutions.jts.geom.Polygon), GEOM_FACTORY
-        GeoScript::Geom.enhance multi_poly
-        multi_poly
+      def buffer(dist)
+        Polygon.new super
       end
 
       def to_wkt

data/lib/geoscript/geom/point.rb

@@ -8,14 +8,19 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def initialize(*args);end
+      def initialize(*coords)
+        if coords.first.kind_of? JTSPoint
+          p = coords.first
+        else
+          c = Coordinate.new coords[0], coords[1]
+          c.z = coords[2] if coords[2]
+          p = GEOM_FACTORY.create_point c
+        end
+        super p.coordinate_sequence, GEOM_FACTORY
+      end
 
-      def self.create(x, y = nil, z = nil)
-        c = Coordinate.new x, y
-        p = GEOM_FACTORY.create_point c
-        point = Point.new p.coordinate_sequence, GEOM_FACTORY
-        GeoScript::Geom.enhance point
-        point
+      def buffer(dist)
+        Polygon.new super
       end
 
       def to_wkt

data/lib/geoscript/geom/polygon.rb

@@ -7,32 +7,33 @@ module GeoScript
 
       attr_accessor :bounds
 
-      def initialize(*args);end
-
-      def self.create(*rings)
-        if rings.first.kind_of? Polygon
+      def initialize(*rings)
+        if rings.first.kind_of? JTSPolygon
           interior_rings = []
           num_rings = rings.first.num_interior_ring
           for i in (0...num_rings)
             interior_rings << rings.first.get_interior_ring_n(i)
           end
-          poly = Polygon.new rings.first.exterior_ring, interior_rings, GEOM_FACTORY
+          shell = rings.first.exterior_ring
+          holes = interior_rings.to_java(com.vividsolutions.jts.geom.LinearRing)
         else
           linear_rings = []
           rings.each do |ring|
             if ring.kind_of? LinearRing
               linear_rings << ring
             else
-              linear_rings << LinearRing.create(*ring)
+              linear_rings << LinearRing.new(*ring)
             end
           end
           
           shell = linear_rings.first
           holes = linear_rings[1..linear_rings.size].to_java(com.vividsolutions.jts.geom.LinearRing)
-          poly = Polygon.new shell, holes, GEOM_FACTORY
         end
-        GeoScript::Geom.enhance poly
-        poly
+        super(shell, holes, GEOM_FACTORY)
+      end
+
+      def buffer(dist)
+        Polygon.new super
       end
 
       def to_wkt

data/lib/geoscript/projection.rb

@@ -58,7 +58,24 @@ module GeoScript
       else
         geometry_transform = GeometryCoordinateSequenceTransformer.new
         geometry_transform.math_transform = transform
-        geometry_transform.transform obj
+        new_geom = geometry_transform.transform obj
+        # not entirely comfortable with this
+        case new_geom.class.to_s
+        when 'Java::ComVividsolutionsJtsGeom::Point'
+          GeoScript::Geom::Point.new new_geom
+        when 'Java::ComVividsolutionsJtsGeom::Polygon'
+          GeoScript::Geom::Polygon.new new_geom
+        when 'Java::ComVividsolutionsJtsGeom::MultiPoint'
+          GeoScript::Geom::MultiPoint.create new_geom
+        when 'Java::ComVividsolutionsJtsGeom::MultiPolygon'
+          GeoScript::Geom::MultiPolygon.create new_geom
+        when 'Java::ComVividsolutionsJtsGeom::LineString'
+          GeoScript::Geom::LineString.create new_geom
+        when 'Java::ComVividsolutionsJtsGeom::MultiLineString'
+          GeoScript::Geom::MultiLineString.create new_geom
+        when 'Java::ComVividsolutionsJtsGeom::LinearRing'
+          GeoScript::Geom::LinearRing.create new_geom
+        end  
       end
     end
 

data/lib/geoscript/version.rb

@@ -1,3 +1,3 @@
 module GeoScript
-  VERSION = '0.0.1.pre'
+  VERSION = '0.0.1'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: geoscript
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 0.0.1.pre
+  prerelease:
+  version: 0.0.1
 platform: ruby
 authors:
 - Scooter Wadsworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: