add basic feature object

Author: geographist

lib/geoscript/feature.rb

@@ -1,2 +1,3 @@
 require 'feature/field'
-require 'feature/schema'
+require 'feature/schema'
+require 'feature/feature'

lib/geoscript/feature/feature.rb

@@ -1,7 +1,53 @@
+java_import org.geotools.feature.simple.SimpleFeatureBuilder
+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'
+            end
+          else
+            @schema = schema
+          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'
+        end
+      end
+
+      def get_id
+        @feature.identifier.to_s
+      end
+
+      def get_geom
+        @feature.default_geometry
+      end
+
+      def set_geom(geom)
+        @feature.default_geometry = geom
+      end
     end
   end
 end

lib/geoscript/feature/schema.rb

@@ -18,43 +18,64 @@ def initialize(name = nil, fields = [], type = nil, uri = 'http://geoscript.org/
           fields.each do |field|
             if field.instance_of? GeoScript::Feature::Field
               name, type, proj = field.name, field.type, field.proj
-            else
-              if field.instance_of? Hash
+            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
-              elsif field.instance_of? Array
-                name, type = field[0], field[1]
-
-                if type.kind_of? GeoScript::Geom
-                  proj = GeoScript::Projection.new(field[2]) if field[2]
-                else
-                  raise 'Invalid type specified. Must be of type GeoScript::Geom::*'
-                end
+              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[2]) if field[2]
               end
             end
             type_builder.crs proj if proj
-            type_builder.add name, type.java_class
-            @feature_type = type_builder.build_feature_type
+            type_builder.add name, type.to_java.java_class
+            p type_builder.attributes
           end
+          @feature_type = type_builder.build_feature_type
         else
-          raise "No fields specified for feature type: #{type}"
+          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 get_name
+      def name
         @feature_type.name.local_part
       end
 
-      def get_uri
+      def uri
         @feature_type.name.namespaceURI
       end
 
-      def get_proj
+      def proj
         crs = @feature_type.coordinate_reference_system
         GeoScript::Projection.new crs if crs
       end
 
+      def fields
+        fields = []
+
+        @feature_type.attribute_descriptors.each do |ad|
+          fields << self.get(ad.local_name)
+        end
+
+        fields
+      end
+
       def get(name)
-        ad = @feature_type.get_descriptor name
+        @feature_type.get_descriptor name
       end
     end
   end