Merge branch 'feature_io'

Author: geographist

lib/geoscript/io/feature/json.rb

@@ -0,0 +1,15 @@
+java_import org.geotools.geojson.feature.FeatureJSON
+
+module GeoScript
+  module IO
+    module Feature
+      def self.write_json(feature)
+        FeatureJSON.new.to_string feature
+      end
+
+      def self.read_json(json)
+        GeoScript::Feature.new(FeatureJSON.new.read_feature(json))
+      end
+    end
+  end
+end

lib/geoscript/geom/io/json.rb lib/geoscript/io/geom/json.rblib/geoscript/geom/io/json.rb renamed to lib/geoscript/io/geom/json.rb

@@ -1,8 +1,8 @@
 java_import org.geotools.geojson.geom.GeometryJSON
 
 module GeoScript
-  module Geom
-    module IO
+  module IO
+    module Geom
       def self.write_json(geom)
         GeometryJSON.new.to_string geom
       end

lib/geoscript/geom/io/wkb.rb lib/geoscript/io/geom/wkb.rblib/geoscript/geom/io/wkb.rb renamed to lib/geoscript/io/geom/wkb.rb

@@ -2,8 +2,8 @@
 java_import com.vividsolutions.jts.io.WKBWriter
 
 module GeoScript
-  module Geom
-    module IO
+  module IO
+    module Geom
       include GeoScript::Util
 
       def self.write_wkb(geom)

lib/geoscript/geom/io/wkt.rb lib/geoscript/io/geom/wkt.rblib/geoscript/geom/io/wkt.rb renamed to lib/geoscript/io/geom/wkt.rb

@@ -2,8 +2,8 @@
 java_import com.vividsolutions.jts.io.WKTWriter
 
 module GeoScript
-  module Geom
-    module IO
+  module IO
+    module Geom
       def self.read_wkt(wkt)
         WKTReader.new.read wkt
       end