add lib to search path; require geoscript/feature

Author: geographist

Diff for: lib/geoscript.rb

@@ -1,4 +1,5 @@
-$:.push File.expand_path(File.join(File.dirname(__FILE__), 'geoscript'))
+$: << File.expand_path(File.dirname(__FILE__))
+$: << File.expand_path(File.join(File.dirname(__FILE__), 'geoscript'))
 
 if defined?(JRUBY_VERSION)
   require 'java'
@@ -13,6 +14,7 @@
   require 'geoscript/util'
   require 'geoscript/projection'
   require 'geoscript/geom'
+  require 'geoscript/feature'
 else
   warn "GeoScript requires JRuby (http://jruby.org)"
 end

Diff for: lib/geoscript/feature.rb

@@ -0,0 +1 @@
+require 'feature/field'

Diff for: lib/geoscript/feature/field.rb

@@ -0,0 +1,5 @@
+module GeoScript
+  module Feature
+    class Field < Struct.new(:name, :type, :proj);end
+  end
+end

Diff for: lib/geoscript/util/bytes.rb

@@ -3,30 +3,17 @@
 module GeoScript
   module Util
     class Bytes
-      def self.decode(str, base) # str.to_java_bytes
-        #n = Math.log(256, base).ceil
-        #bytes = []
-        #(0...str.size).step(n) do |i|
-        #  bytes << string_to_byte(str[i...(i + n)].join(''), base)
-        #end
-        #bytes.to_java java.lang.Byte
+      def self.decode(str, base)
         str.to_java_bytes
       end
 
-      def self.encode(bytes, base) # bytes.from_java_bytes
-        #bytes_array = []
-        #
-        #bytes.each do |byte|
-        #  bytes_array << byte_to_string(byte, base)
-        #end
-        #
-        #bytes_array.join ''
+      def self.encode(bytes, base)
         bytes.from_java_bytes
       end
 
       def self.byte_to_string(byte, base)
         n = Math.log(256, base).ceil
-        s = byte < 0 ? JInt.to_string(((b.abs ^ 0xff) + 0x01), base) : JInt.to_string(b, base)
+        s = byte < 0 ? java.lang.Integer.to_string(((b.abs ^ 0xff) + 0x01), base) : java.lang.Integer.to_string(b, base)
         "%0#{n}d" % s
       end