add feature/field feature/schema

geographist · geographist · commit 855f54a544d9 · 2012-11-01T16:42:35.000-06:00
diff --git a/lib/geoscript/feature.rb b/lib/geoscript/feature.rb
@@ -1 +1,2 @@
-require 'feature/field'
+require 'feature/field'
+require 'feature/schema'
diff --git a/lib/geoscript/feature/feature.rb b/lib/geoscript/feature/feature.rb
@@ -1,6 +1,7 @@
 module GeoScript
   module Feature
     class Feature
+      
     end
   end
 end
diff --git a/lib/geoscript/feature/schema.rb b/lib/geoscript/feature/schema.rb
@@ -1,6 +1,61 @@
+java_import org.opengis.feature.type.FeatureType
+java_import org.opengis.feature.type.GeometryDescriptor
+java_import org.geotools.feature.NameImpl
+java_import org.geotools.feature.simple.SimpleFeatureTypeBuilder
+
 module GeoScript
   module Feature
     class Schema
+      include GeoScript::Feature
+
+      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
+            else
+              if field.instance_of? Hash
+                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
+            end
+            type_builder.crs proj if proj
+            type_builder.add name, type.java_class
+            @feature_type = type_builder.build_feature_type
+          end
+        else
+          raise "No fields specified for feature type: #{type}"
+        end
+      end
+
+      def get_name
+        @feature_type.name.local_part
+      end
+
+      def get_uri
+        @feature_type.name.namespaceURI
+      end
+
+      def get_proj
+        crs = @feature_type.coordinate_reference_system
+        GeoScript::Projection.new crs if crs
+      end
+
+      def get(name)
+        ad = @feature_type.get_descriptor name
+      end
     end
   end
 end
diff --git a/lib/geoscript/geom/point.rb b/lib/geoscript/geom/point.rb
@@ -12,8 +12,13 @@ def initialize(*coords)
         if coords.first.kind_of? JTSPoint
           p = coords.first
         else
-          c = Coordinate.new coords[0], coords[1]
-          c.z = coords[2] if coords[2]
+          if coords.empty?
+            c = Coordinate.new 0, 0
+          else
+            c = Coordinate.new coords[0], coords[1]
+            c.z = coords[2] if coords[2]
+          end
+          
           p = GEOM_FACTORY.create_point c
         end
         super p.coordinate_sequence, GEOM_FACTORY

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-require 'feature/field'`
	`1`	`+require 'feature/field'`
	`2`	`+require 'feature/schema'`