feature class works without specified schema

Author: geographist

.gitignore

@@ -2,5 +2,6 @@
 .bundle
 Gemfile.lock
 .rbenv-version
+.rvmrc
 .DS_Store
 target/

lib/geoscript/feature/feature.rb

@@ -2,52 +2,50 @@
 ogFeature = org.opengis.feature.Feature
 
 module GeoScript
-  module Feature
-    class Feature
-      def initialize(attrs = nil, id = nil, schema = nil, feature = nil)
-        if attrs
-          unless schema
-            if attrs.instance_of? Hash
-              schema_attrs = []
-              attrs.each do |k, v|
-                schema_attrs << {name: k, type: v.to_java.java_class}
-              end
-              @schema = Schema.new('feature', schema_attrs)
-            elsif attrs.instance_of? Array
-              raise 'Attributes may only be given as Array if schema is specified'
+  class Feature
+    def initialize(attrs = nil, id = nil, schema = nil, feature = nil)
+      if attrs
+        unless schema
+          if attrs.instance_of? Hash
+            schema_attrs = []
+            attrs.each do |k, v|
+              schema_attrs << {name: k, type: v.to_java.java_class}
             end
-          else
-            @schema = schema
+            @schema = GeoScript::Schema.new('feature', schema_attrs)
+          elsif attrs.instance_of? Array
+            raise 'Attributes may only be given as Array if schema is specified'
           end
-
-          if attrs.instance_of? Array
-            attrs_hash = {}
-            attrs.each_with_index {|v, i| attrs_hash[@schema.fields[i].name] = v}
-            attrs = attrs_hash
-          end
-
-          sfb = SimpleFeatureBuilder.new @schema.feature_type
-          attrs.each {|k, v| sfb.set(k, v)}
-          @feature = sfb.build_feature id
-        elsif feature
-          @feature = feature
-          @schema = schema ? schema : GeoScript::Feature::Schema.new(feature.feature_type)
         else
-          raise 'No attributes specified for feature'
+          @schema = schema
         end
-      end
 
-      def get_id
-        @feature.identifier.to_s
-      end
+        if attrs.instance_of? Array
+          attrs_hash = {}
+          attrs.each_with_index {|v, i| attrs_hash[@schema.fields[i].name] = v}
+          attrs = attrs_hash
+        end
 
-      def get_geom
-        @feature.default_geometry
+        sfb = SimpleFeatureBuilder.new @schema.feature_type
+        attrs.each {|k, v| sfb.set(k, v)}
+        @feature = sfb.build_feature id
+      elsif feature
+        @feature = feature
+        @schema = schema ? schema : GeoScript::Schema.new(feature.feature_type)
+      else
+        raise 'No attributes specified for feature'
       end
+    end
 
-      def set_geom(geom)
-        @feature.default_geometry = geom
-      end
+    def id
+      @feature.identifier.to_s
+    end
+
+    def geom
+      @feature.default_geometry
+    end
+
+    def set_geom(geom)
+      @feature.default_geometry = geom
     end
   end
 end

lib/geoscript/feature/field.rb

@@ -1,5 +1,3 @@
 module GeoScript
-  module Feature
-    Field = Struct.new(:name, :type, :proj)
-  end
+  Field = Struct.new(:name, :type, :proj)
 end

lib/geoscript/feature/schema.rb

@@ -4,79 +4,74 @@
 java_import org.geotools.feature.simple.SimpleFeatureTypeBuilder
 
 module GeoScript
-  module Feature
-    class Schema
-      include GeoScript::Feature
+  class Schema
+    attr_accessor :feature_type
 
-      attr_accessor :feature_type
-
-      def initialize(name = nil, fields = [], type = nil, uri = 'http://geoscript.org/feature')
-        if name && !fields.empty?
-          type_builder = SimpleFeatureTypeBuilder.new
-          type_builder.set_name NameImpl.new(name)
-          type_builder.setNamespaceURI uri
-          fields.each do |field|
-            if field.instance_of? GeoScript::Feature::Field
-              name, type, proj = field.name, field.type, field.proj
-            elsif field.instance_of? Hash
-              if field[:name] && field[:type]
-                name, type = field[:name], field[:type]
-              else
-                name, type = field.keys.first, field.values.first
-              end
+    def initialize(name = nil, fields = [], type = nil, uri = 'http://geoscript.org/feature')
+      if name && !fields.empty?
+        type_builder = SimpleFeatureTypeBuilder.new
+        type_builder.set_name NameImpl.new(name)
+        type_builder.setNamespaceURI uri
+        fields.each do |field|
+          if field.instance_of? GeoScript::Field
+            name, type, proj = field.name, field.type, field.proj
+          elsif field.instance_of? Hash
+            if field[:name] && field[:type]
+              name, type = field[:name], field[:type]
+            else
+              name, type = field.keys.first, field.values.first
+            end
 
-              if type.name.match /GeoScript::Geom/
-                proj = GeoScript::Projection.new(field[:proj]) if field[:proj]
-              end
-            elsif field.instance_of? Array
-              name, type = field[0], field[1]
+            if type.name.match /GeoScript::Geom/
+              proj = GeoScript::Projection.new(field[:proj]) if field[:proj]
+            end
+          elsif field.instance_of? Array
+            name, type = field[0], field[1]
 
-              if type.name.match /GeoScript::Geom/
-                proj = GeoScript::Projection.new(field[2]) if field[2]
-              end
+            if type.name.match /GeoScript::Geom/
+              proj = GeoScript::Projection.new(field[2]) if field[2]
             end
-            type_builder.crs proj if proj
-            type_builder.add name, type.to_java.java_class
-            p type_builder.attributes
-          end
-          @feature_type = type_builder.build_feature_type
-        else
-          if !name && fields.empty?
-            raise "No name specified & No fields specified for type: #{type}"
-          elsif fields.empty?
-            raise "No fields specified for type: #{type}" if fields.empty?
-          elsif !name
-            raise 'No name specified'
           end
+          type_builder.crs proj if proj
+          type_builder.add name, type.to_java.java_class
+        end
+        @feature_type = type_builder.build_feature_type
+      else
+        if !name && fields.empty?
+          raise "No name specified & No fields specified for type: #{type}"
+        elsif fields.empty?
+          raise "No fields specified for type: #{type}" if fields.empty?
+        elsif !name
+          raise 'No name specified'
         end
       end
+    end
 
-      def name
-        @feature_type.name.local_part
-      end
-
-      def uri
-        @feature_type.name.namespaceURI
-      end
+    def name
+      @feature_type.name.local_part
+    end
 
-      def proj
-        crs = @feature_type.coordinate_reference_system
-        GeoScript::Projection.new crs if crs
-      end
+    def uri
+      @feature_type.name.namespaceURI
+    end
 
-      def fields
-        fields = []
+    def proj
+      crs = @feature_type.coordinate_reference_system
+      GeoScript::Projection.new crs if crs
+    end
 
-        @feature_type.attribute_descriptors.each do |ad|
-          fields << self.get(ad.local_name)
-        end
+    def fields
+      fields = []
 
-        fields
+      @feature_type.attribute_descriptors.each do |ad|
+        fields << self.get(ad.local_name)
       end
 
-      def get(name)
-        @feature_type.get_descriptor name
-      end
+      fields
+    end
+
+    def get(name)
+      @feature_type.get_descriptor name
     end
   end
 end