fix geometry object creation from {wkt, wkb, json}

Author: geographist

Rakefile

@@ -1,6 +1,17 @@
-task :geoscript do
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'geoscript/version'
+
+task :build do
+  system 'gem build geoscript.gemspec'
+end
+
+task :release => :build do
+  system "gem push geoscript-#{GeoScript::VERSION}.gem"
+end
+
+task :console do
   ARGV.clear
   require File.expand_path(File.join(File.dirname(__FILE__), 'lib', 'geoscript'))
   require 'irb'
   IRB.start
-end
+end

geoscript.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'geoscript/version'
 
 Gem::Specification.new do |gem|
-  gem.name = 'geoscript-ruby'
+  gem.name = 'geoscript'
   gem.version = GeoScript::VERSION
   gem.summary = 'GeoScript is a library for making use of GeoTools from JRuby easier and more fun.'
   gem.description = 'GeoScript for JRuby - makes using GeoTools from JRuby easier and more fun.'
@@ -13,11 +13,11 @@ Gem::Specification.new do |gem|
   gem.authors = ['Scooter Wadsworth']
   gem.email = ['scooterwadsworth@gmail.com']
   gem.homepage = 'https://github.com/scooterw/geoscript-ruby'
-  
+
   gem.files = Dir['README.md', 'lib/**/*', 'spec/support/**/*']
   gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'guard-rspec'
-end
+end

lib/geoscript/geom/geom.rb

@@ -34,15 +34,23 @@ def self.get_bounds(geom)
     end
 
     def self.enhance(geom)
-      geom.bounds = Geom.get_bounds geom
+      geom.bounds = get_bounds(geom)
     end
 
-    def self.to_wkt(geom)
-      GeoScript::IO::Geom.write_wkt geom
+    def self.to_geoscript_geom(geom)
+      const_get(geom.geometry_type).new(geom)
+    end
+
+    def self.from_json(json)
+      to_geoscript_geom(GeoScript::IO::Geom.read_json(json))
     end
 
     def self.from_wkt(wkt)
-      GeoScript::IO::Geom.read_wkt wkt
+      to_geoscript_geom(GeoScript::IO::Geom.read_wkt(wkt))
+    end
+
+    def self.from_wkb(wkb)
+      to_geoscript_geom(GeoScript::IO::Geom.read_wkb(wkb))
     end
   end
-end
+end

lib/geoscript/geom/linestring.rb

@@ -11,6 +11,7 @@ class LineString < JTSLineString
       def initialize(*coords)
         if coords.size == 1
           if coords.first.kind_of? JTSLineString
+            ls = coords.first
           elsif coords.kind_of? Array
             if coords.first.kind_of? Array
               l = []
@@ -58,4 +59,4 @@ def to_json
       end
     end
   end
-end
+end

lib/geoscript/geom/multilinestring.rb

@@ -12,7 +12,8 @@ def initialize(*line_strings)
 
         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)
+
+          for i in (0...multi_line_string_geom.num_geometries)
             strings << multi_line_string_geom.get_geometry_n(i)
           end
         else
@@ -45,4 +46,4 @@ def to_json
       end
     end
   end
-end
+end

lib/geoscript/geom/multipoint.rb

@@ -11,9 +11,10 @@ def initialize(*points)
         feature_points = []
 
         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)
+          mp_geom = points.first
+
+          for i in (0...mp_geom.num_geometries)
+            feature_points << mp_geom.get_geometry_n(i)
           end
         else
           points.each do |point|
@@ -45,4 +46,4 @@ def to_json
       end
     end
   end
-end
+end

lib/geoscript/io/geom/json.rb

@@ -12,4 +12,4 @@ def self.read_json(json)
       end
     end
   end
-end
+end