ffi-ogr 0.1.0.pre3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b41cc924b4743e41c0150552df569562607f64
-  data.tar.gz: e182a8233fc3a02461b9ea28ad71c5f1de7e8d5f
+  metadata.gz: 8a3a8d64038c8ee681dc456b3639a3ba21d4fe2b
+  data.tar.gz: 5363e299ae53a198be3772c21742b63b6707a534
 SHA512:
-  metadata.gz: 5fbd885e368f57a20b2cad4d0c6739c33e573de7ef118895a67fb5be6e09586124829dcb892ec0af4c5da31aa8c7464eafb9cfcbc256f6ba9a8cbb5337a590ee
-  data.tar.gz: 23f45a8bd769c8a5b5c7c0df527f9316bff65aa679c02665f4f5f8c89c3b3afe6dc390d13aad91bc0a090a7dee787c1f88f13c1fce524203813ebc50a0e2792e
+  metadata.gz: d91119cd6f24f8a516fa8b47728328a8b8d8310c48ab277669c713a23346e36cc96ff0e31a242039f78f85520acff23d2d32ac8584a0607114678ffd6b5d49a2
+  data.tar.gz: fe146c60301d9555e9b004968d5d176f050d4cfe7384a722253794c720d51cd8cb3d5711a2ac9becd238a3afffce4484510eb8f8d224fc2d6963563b7d59ac65

data/README.md

@@ -4,8 +4,9 @@
 GDAL must be installed:
 
 Mac:
+NOTE: Add other flags, e.g. --with-postgresql, as desired
 ```
-brew install gdal
+brew install gdal --complete --enable-unsupported --with-libkml
 ```
 
 Ubuntu:
@@ -59,8 +60,8 @@ shp.to_json
 shp.to_json true
 # => Output GeoJSON string (pretty print)
 
-# from_epsg(integer), from_proj4(string), from_wkt(string)
-new_sr = OGR::SpatialReference.from_epsg 3857
+# epsg => import_sr(integer) or import_sr(integer, 'epsg'), proj4 => import_sr(string, 'proj4'), wkt => import_sr(string, 'wkt'), esri => import_sr(string, 'esri')
+new_sr = OGR.import_sr 3857
 # => #<OGR::SpatialReference:0x007fd859a0e6f8 @ptr=#<FFI::AutoPointer address=0x007fd85a11c100>>
 
 shp.to_shp '~/Desktop/reprojected_shp.shp', {spatial_ref: new_sr}
@@ -78,8 +79,8 @@ shp = writer.ptr
 # currently does not handle spatial reference, will automatically be nil
 layer = shp.add_layer 'first_layer', :point
 
-# add field to layer : add_field(name, field_type, width) NOTE: width defaults to 32
-layer.add_field 'name', :string
+# add field to layer : add_field(name, field_type, options) NOTE: options are width and precision, defaulting to 32 and 1 respectively.
+layer.add_field 'name', :string, width: 255
 
 # create feature on layer
 feature = layer.create_feature

data/lib/ffi-ogr.rb

@@ -10,7 +10,8 @@ module OGR
     'geojson' => 'GeoJSON',
     'json' => 'GeoJSON',
     'csv' => 'CSV',
-    'kml' => 'KML'
+    'kml' => 'LIBKML',
+    'kml_lite' => 'KML'
   }
 
   autoload :Reader, File.join(OGR_BASE, 'reader')
@@ -76,8 +77,6 @@ module OGR
 
     extend ::FFI::Library
 
-    ffi_lib(gdal_library_path)
-
     enum :ogr_field_type, [
       :integer, 0,
       :integer_list, 1,
@@ -119,197 +118,211 @@ module OGR
       :right, 2
     ]
 
-    attach_function :GDALVersionInfo, [:string], :string
+    OGR_FUNCTIONS = {
+      GDALVersionInfo: [[:string], :string],
+      CPLSetConfigOption: [[:string, :string], :void],
+      CPLSetThreadLocalConfigOption: [[:string, :string], :void],
+
+      OGRRegisterAll: [[], :void],
+      OGR_Dr_GetName: [[:pointer], :string],
+      OGR_Dr_Open: [[:pointer, :string, :int], :pointer],
+      OGR_Dr_TestCapability: [[:pointer, :string], :int],
+      OGR_Dr_CreateDataSource: [[:pointer, :string, :pointer], :pointer],
+      OGR_Dr_CopyDataSource: [[:pointer, :pointer, :string, :pointer], :pointer],
+      OGR_Dr_DeleteDataSource: [[:pointer, :string], :pointer],
+      OGRGetDriverCount: [[], :int],
+      OGRGetDriver: [[:int], :pointer],
+      OGRGetDriverByName: [[:string], :pointer],
+      OGROpen: [[:string, :int, :pointer], :pointer],
+      OGR_DS_Destroy: [[:pointer], :void],
+      OGR_DS_GetName: [[:pointer], :string],
+      OGR_DS_GetLayerCount: [[:pointer], :int],
+      OGR_DS_GetLayer: [[:pointer, :int], :pointer],
+      OGR_DS_GetLayerByName: [[:pointer, :string], :pointer],
+      OGR_DS_DeleteLayer: [[:pointer, :int], :pointer],
+      OGR_DS_GetDriver: [[:pointer], :pointer],
+      OGR_DS_CreateLayer: [[:pointer, :string, :pointer, :ogr_geometry_type, :pointer], :pointer],
+      OGR_DS_CopyLayer: [[:pointer, :pointer, :string, :string], :pointer],
+      OGR_DS_TestCapability: [[:pointer, :string], :int],
+      OGR_DS_ExecuteSQL: [[:pointer, :string, :pointer, :string], :pointer],
+      OGR_DS_ReleaseResultSet: [[:pointer, :pointer], :void],
+      OGR_DS_SyncToDisk: [[:pointer], :pointer],
+      OGR_L_GetGeomType: [[:pointer], :ogr_geometry_type],
+      OGR_L_GetName: [[:pointer], :string],
+      OGR_L_GetSpatialFilter: [[:pointer], :pointer],
+      OGR_L_SetSpatialFilter: [[:pointer, :pointer], :void],
+      OGR_L_SetSpatialFilterRect: [[:pointer, :double, :double, :double, :double], :void],
+      OGR_L_SetAttributeFilter: [[:pointer, :string], :pointer],
+      OGR_L_ResetReading: [[:pointer], :void],
+      OGR_L_GetNextFeature: [[:pointer], :pointer],
+      OGR_L_SetNextByIndex: [[:pointer, :long], :pointer],
+      OGR_L_GetFeature: [[:pointer, :long], :pointer],
+      OGR_L_SetFeature: [[:pointer, :pointer], :pointer],
+      OGR_L_CreateFeature: [[:pointer, :pointer], :pointer],
+      OGR_L_DeleteFeature: [[:pointer, :long], :pointer],
+      OGR_L_GetLayerDefn: [[:pointer], :pointer],
+      OGR_L_GetSpatialRef: [[:pointer], :pointer],
+      OGR_L_GetFeatureCount: [[:pointer, :int], :int],
+      OGR_L_GetExtent: [[:pointer, :pointer, :int], :pointer],
+      OGR_L_CreateField: [[:pointer, :pointer, :int], :pointer],
+      OGR_L_SyncToDisk: [[:pointer], :pointer],
+      OGR_FD_GetFieldCount: [[:pointer], :int],
+      OGR_FD_GetFieldDefn: [[:pointer, :int], :pointer],
+      OGR_Fld_Create: [[:string, :ogr_field_type], :pointer],
+      OGR_Fld_Destroy: [[:pointer], :void],
+      OGR_Fld_SetName: [[:pointer, :string], :void],
+      OGR_Fld_GetNameRef: [[:pointer], :string],
+      OGR_Fld_GetType: [[:pointer], :ogr_field_type],
+      OGR_Fld_SetType: [[:pointer, :ogr_field_type], :void],
+      OGR_Fld_GetJustify: [[:pointer], :ogr_justification],
+      OGR_Fld_SetJustify: [[:pointer, :ogr_justification], :void],
+      OGR_Fld_GetWidth: [[:pointer], :int],
+      OGR_Fld_SetWidth: [[:pointer, :int], :void],
+      OGR_Fld_GetPrecision: [[:pointer], :int],
+      OGR_Fld_SetPrecision: [[:pointer, :int], :void],
+      OGR_Fld_Set: [[:pointer, :string, :ogr_field_type, :int, :int, :ogr_justification], :void],
+      OGR_Fld_IsIgnored: [[:pointer], :int],
+      OGR_Fld_SetIgnored: [[:pointer, :int], :void],
+      OGR_F_Create: [[:pointer], :pointer],
+      OGR_F_GetFieldAsInteger: [[:pointer, :int], :int],
+      OGR_F_GetFieldAsDouble: [[:pointer, :int], :double],
+      OGR_F_GetFieldAsString: [[:pointer, :int], :string],
+      OGR_F_GetFieldAsIntegerList: [[:pointer, :int, :pointer], :pointer],
+      OGR_F_GetFieldAsDoubleList: [[:pointer, :int, :pointer], :pointer],
+      OGR_F_GetFieldAsStringList: [[:pointer, :int], :pointer],
+      OGR_F_GetFieldAsBinary: [[:pointer, :int, :pointer], :pointer],
+      OGR_F_GetFieldAsDateTime: [[:pointer, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :pointer],
+      OGR_F_SetFieldInteger: [[:pointer, :int, :int], :void],
+      OGR_F_SetFieldDouble: [[:pointer, :int, :double], :void],
+      OGR_F_SetFieldString: [[:pointer, :int, :string], :void],
+      OGR_F_SetFieldIntegerList: [[:pointer, :int, :int, :pointer], :void],
+      OGR_F_SetFieldDoubleList: [[:pointer, :int, :int, :pointer], :void],
+      OGR_F_SetFieldStringList: [[:pointer, :int, :int, :pointer], :void],
+      OGR_F_SetFieldRaw: [[:pointer, :int, :pointer], :void],
+      OGR_F_SetFieldBinary: [[:pointer, :int, :int, :pointer], :void],
+      OGR_F_SetFieldDateTime: [[:pointer, :int, :int, :int, :int, :int, :int, :int, :int], :void],
+      OGR_F_GetDefnRef: [[:pointer], :pointer],
+      OGR_F_GetFieldCount: [[:pointer], :int],
+      OGR_F_GetFieldDefnRef: [[:pointer, :int], :pointer],
+      OGR_F_GetFieldIndex: [[:pointer, :string], :int],
+      OGR_F_IsFieldSet: [[:pointer, :int], :int],
+      OGR_F_GetGeometryRef: [[:pointer], :pointer],
+      OGR_F_GetFID: [[:pointer], :long],
+      OGR_F_SetFID: [[:pointer, :long], :pointer],
+      OGR_F_StealGeometry: [[:pointer], :pointer],
+      OGR_F_SetGeometry: [[:pointer, :pointer], :pointer],
+      OGR_F_SetGeometryDirectly: [[:pointer, :pointer], :pointer],
+      OGR_G_CreateFromWkb: [[:pointer, :pointer, :pointer, :int], :pointer],
+      OGR_G_CreateFromWkt: [[:pointer, :pointer, :pointer], :pointer],
+      OGR_G_DestroyGeometry: [[:pointer], :void],
+      OGR_G_CreateGeometry: [[:ogr_geometry_type], :pointer],
+      OGR_G_ApproximateArcAngles: [[:double, :double, :double, :double, :double, :double, :double, :double, :double], :pointer],
+      OGR_G_ForceToPolygon: [[:pointer], :pointer],
+      #OGR_G_ForceToLineString: [[:pointer], :pointer],
+      OGR_G_ForceToMultiPolygon: [[:pointer], :pointer],
+      OGR_G_ForceToMultiPoint: [[:pointer], :pointer],
+      OGR_G_ForceToMultiLineString: [[:pointer], :pointer],
+      OGR_G_GetDimension: [[:pointer], :int],
+      OGR_G_GetCoordinateDimension: [[:pointer], :int],
+      OGR_G_SetCoordinateDimension: [[:pointer, :int], :void],
+      OGR_G_Clone: [[:pointer], :pointer],
+      OGR_G_GetEnvelope: [[:pointer, :pointer], :void],
+      OGR_G_GetEnvelope3D: [[:pointer, :pointer], :void],
+      OGR_G_ImportFromWkb: [[:pointer, :pointer, :int], :pointer],
+      OGR_G_ExportToWkb: [[:pointer, :pointer, :pointer], :pointer],
+      OGR_G_WkbSize: [[:pointer], :int],
+      OGR_G_ImportFromWkt: [[:pointer, :string], :pointer],
+      OGR_G_ExportToWkt: [[:pointer, :pointer], :pointer],
+      OGR_G_GetGeometryType: [[:pointer], :ogr_geometry_type],
+      OGR_G_GetGeometryName: [[:pointer], :string],
+      OGR_G_DumpReadable: [[:pointer, :pointer, :string], :void],
+      OGR_G_FlattenTo2D: [[:pointer], :void],
+      OGR_G_CloseRings: [[:pointer], :void],
+      OGR_G_CreateFromGML: [[:string], :pointer],
+      OGR_G_ExportToGML: [[:pointer], :string],
+      #OGR_G_ExportToGMLEx: [[:pointer, :pointer], :string],
+      OGR_G_ExportToKML: [[:pointer, :string], :string],
+      OGR_G_ExportToJson: [[:pointer], :string],
+      OGR_G_ExportToJsonEx: [[:pointer, :string], :string],
+      OGR_G_AssignSpatialReference: [[:pointer, :pointer], :void],
+      OGR_G_GetSpatialReference: [[:pointer], :pointer],
+      OGR_G_Transform: [[:pointer, :pointer], :pointer],
+      OGR_G_TransformTo: [[:pointer, :pointer], :pointer],
+      OGR_G_Simplify: [[:pointer, :double], :pointer],
+      OGR_G_SimplifyPreserveTopology: [[:pointer, :double], :pointer],
+      OGR_G_Segmentize: [[:pointer, :double], :pointer],
+      OGR_G_Intersects: [[:pointer, :pointer], :int],
+      OGR_G_Equals: [[:pointer, :pointer], :int],
+      OGR_G_Disjoint: [[:pointer, :pointer], :int],
+      OGR_G_Touches: [[:pointer, :pointer], :int],
+      OGR_G_Crosses: [[:pointer, :pointer], :int],
+      OGR_G_Within: [[:pointer, :pointer], :int],
+      OGR_G_Contains: [[:pointer, :pointer], :int],
+      OGR_G_Overlaps: [[:pointer, :pointer], :int],
+      OGR_G_Boundary: [[:pointer], :pointer],
+      OGR_G_ConvexHull: [[:pointer], :pointer],
+      OGR_G_Buffer: [[:pointer, :double, :int], :pointer],
+      OGR_G_Intersection: [[:pointer, :pointer], :pointer],
+      OGR_G_Union: [[:pointer, :pointer], :pointer],
+      OGR_G_UnionCascaded: [[:pointer], :pointer],
+      #OGR_G_PointOnSurface: [[:pointer], :pointer],
+      OGR_G_Difference: [[:pointer, :pointer], :pointer],
+      OGR_G_SymDifference: [[:pointer, :pointer], :pointer],
+      OGR_G_Distance: [[:pointer, :pointer], :double],
+      OGR_G_Length: [[:pointer], :double],
+      OGR_G_Area: [[:pointer], :double],
+      OGR_G_Centroid: [[:pointer, :pointer], :int],
+      OGR_G_Empty: [[:pointer], :void],
+      OGR_G_IsEmpty: [[:pointer], :int],
+      OGR_G_IsValid: [[:pointer], :int],
+      OGR_G_IsSimple: [[:pointer], :int],
+      OGR_G_IsRing: [[:pointer], :int],
+      OGR_G_Polygonize: [[:pointer], :pointer],
+      OGR_G_GetPointCount: [[:pointer], :int],
+      OGR_G_GetPoints: [[:pointer, :pointer, :int, :pointer, :int, :pointer, :int], :int],
+      OGR_G_GetX: [[:pointer, :int], :double],
+      OGR_G_GetY: [[:pointer, :int], :double],
+      OGR_G_GetZ: [[:pointer, :int], :double],
+      OGR_G_GetPoint: [[:pointer, :int, :pointer, :pointer, :pointer], :void],
+      OGR_G_SetPoint: [[:pointer, :int, :double, :double, :double], :void],
+      OGR_G_SetPoint_2D: [[:pointer, :int, :double, :double], :void],
+      OGR_G_AddPoint: [[:pointer, :double, :double, :double], :void],
+      OGR_G_AddPoint_2D: [[:pointer, :double, :double], :void],
+      OGR_G_GetGeometryCount: [[:pointer], :int],
+      OGR_G_GetGeometryRef: [[:pointer, :int], :pointer],
+      OGR_G_AddGeometry: [[:pointer, :pointer], :pointer],
+      OGR_G_AddGeometryDirectly: [[:pointer, :pointer], :pointer],
+      OGR_G_RemoveGeometry: [[:pointer, :int, :int], :pointer],
+      OGR_F_Destroy: [[:pointer], :void],
 
-    attach_function :CPLSetConfigOption, [:string, :string], :void
-    attach_function :CPLSetThreadLocalConfigOption, [:string, :string], :void
+      #SRS Functions
 
-    attach_function :OGRRegisterAll, [], :void
-    attach_function :OGR_Dr_GetName, [:pointer], :string
-    attach_function :OGR_Dr_Open, [:pointer, :string, :int], :pointer
-    attach_function :OGR_Dr_TestCapability, [:pointer, :string], :int
-    attach_function :OGR_Dr_CreateDataSource, [:pointer, :string, :pointer], :pointer
-    attach_function :OGR_Dr_CopyDataSource, [:pointer, :pointer, :string, :pointer], :pointer
-    attach_function :OGR_Dr_DeleteDataSource, [:pointer, :string], :pointer
-    attach_function :OGRGetDriverCount, [], :int
-    attach_function :OGRGetDriver, [:int], :pointer
-    attach_function :OGRGetDriverByName, [:string], :pointer
-    attach_function :OGROpen, [:string, :int, :pointer], :pointer
-    attach_function :OGR_DS_Destroy, [:pointer], :void
-    attach_function :OGR_DS_GetName, [:pointer], :string
-    attach_function :OGR_DS_GetLayerCount, [:pointer], :int
-    attach_function :OGR_DS_GetLayer, [:pointer, :int], :pointer
-    attach_function :OGR_DS_GetLayerByName, [:pointer, :string], :pointer
-    attach_function :OGR_DS_DeleteLayer, [:pointer, :int], :pointer
-    attach_function :OGR_DS_GetDriver, [:pointer], :pointer
-    attach_function :OGR_DS_CreateLayer, [:pointer, :string, :pointer, :ogr_geometry_type, :pointer], :pointer
-    attach_function :OGR_DS_CopyLayer, [:pointer, :pointer, :string, :string], :pointer
-    attach_function :OGR_DS_TestCapability, [:pointer, :string], :int
-    attach_function :OGR_DS_ExecuteSQL, [:pointer, :string, :pointer, :string], :pointer
-    attach_function :OGR_DS_ReleaseResultSet, [:pointer, :pointer], :void
-    attach_function :OGR_DS_SyncToDisk, [:pointer], :pointer
-    attach_function :OGR_L_GetGeomType, [:pointer], :ogr_geometry_type
-    attach_function :OGR_L_GetName, [:pointer], :string
-    attach_function :OGR_L_GetSpatialFilter, [:pointer], :pointer
-    attach_function :OGR_L_SetSpatialFilter, [:pointer, :pointer], :void
-    attach_function :OGR_L_SetSpatialFilterRect, [:pointer, :double, :double, :double, :double], :void
-    attach_function :OGR_L_SetAttributeFilter, [:pointer, :string], :pointer
-    attach_function :OGR_L_ResetReading, [:pointer], :void
-    attach_function :OGR_L_GetNextFeature, [:pointer], :pointer
-    attach_function :OGR_L_SetNextByIndex, [:pointer, :long], :pointer
-    attach_function :OGR_L_GetFeature, [:pointer, :long], :pointer
-    attach_function :OGR_L_SetFeature, [:pointer, :pointer], :pointer
-    attach_function :OGR_L_CreateFeature, [:pointer, :pointer], :pointer
-    attach_function :OGR_L_DeleteFeature, [:pointer, :long], :pointer
-    attach_function :OGR_L_GetLayerDefn, [:pointer], :pointer
-    attach_function :OGR_L_GetSpatialRef, [:pointer], :pointer
-    attach_function :OGR_L_GetFeatureCount, [:pointer, :int], :int
-    attach_function :OGR_L_GetExtent, [:pointer, :pointer, :int], :pointer
-    attach_function :OGR_L_CreateField, [:pointer, :pointer, :int], :pointer
-    attach_function :OGR_L_SyncToDisk, [:pointer], :pointer
-    attach_function :OGR_FD_GetFieldCount, [:pointer], :int
-    attach_function :OGR_FD_GetFieldDefn, [:pointer, :int], :pointer
-    attach_function :OGR_Fld_Create, [:string, :ogr_field_type], :pointer
-    attach_function :OGR_Fld_Destroy, [:pointer], :void
-    attach_function :OGR_Fld_SetName, [:pointer, :string], :void
-    attach_function :OGR_Fld_GetNameRef, [:pointer], :string
-    attach_function :OGR_Fld_GetType, [:pointer], :ogr_field_type
-    attach_function :OGR_Fld_SetType, [:pointer, :ogr_field_type], :void
-    attach_function :OGR_Fld_GetJustify, [:pointer], :ogr_justification
-    attach_function :OGR_Fld_SetJustify, [:pointer, :ogr_justification], :void
-    attach_function :OGR_Fld_GetWidth, [:pointer], :int
-    attach_function :OGR_Fld_SetWidth, [:pointer, :int], :void
-    attach_function :OGR_Fld_GetPrecision, [:pointer], :int
-    attach_function :OGR_Fld_SetPrecision, [:pointer, :int], :void
-    attach_function :OGR_Fld_Set, [:pointer, :string, :ogr_field_type, :int, :int, :ogr_justification], :void
-    attach_function :OGR_Fld_IsIgnored, [:pointer], :int
-    attach_function :OGR_Fld_SetIgnored, [:pointer, :int], :void
-    attach_function :OGR_F_Create, [:pointer], :pointer
-    attach_function :OGR_F_GetFieldAsInteger, [:pointer, :int], :int
-    attach_function :OGR_F_GetFieldAsDouble, [:pointer, :int], :double
-    attach_function :OGR_F_GetFieldAsString, [:pointer, :int], :string
-    attach_function :OGR_F_GetFieldAsIntegerList, [:pointer, :int, :pointer], :pointer
-    attach_function :OGR_F_GetFieldAsDoubleList, [:pointer, :int, :pointer], :pointer
-    attach_function :OGR_F_GetFieldAsStringList, [:pointer, :int], :pointer
-    attach_function :OGR_F_GetFieldAsBinary, [:pointer, :int, :pointer], :pointer
-    attach_function :OGR_F_GetFieldAsDateTime, [:pointer, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :pointer
-    attach_function :OGR_F_SetFieldInteger, [:pointer, :int, :int], :void
-    attach_function :OGR_F_SetFieldDouble, [:pointer, :int, :double], :void
-    attach_function :OGR_F_SetFieldString, [:pointer, :int, :string], :void
-    attach_function :OGR_F_SetFieldIntegerList, [:pointer, :int, :int, :pointer], :void
-    attach_function :OGR_F_SetFieldDoubleList, [:pointer, :int, :int, :pointer], :void
-    attach_function :OGR_F_SetFieldStringList, [:pointer, :int, :int, :pointer], :void
-    attach_function :OGR_F_SetFieldRaw, [:pointer, :int, :pointer], :void
-    attach_function :OGR_F_SetFieldBinary, [:pointer, :int, :int, :pointer], :void
-    attach_function :OGR_F_SetFieldDateTime, [:pointer, :int, :int, :int, :int, :int, :int, :int, :int], :void
-    attach_function :OGR_F_GetDefnRef, [:pointer], :pointer
-    attach_function :OGR_F_GetFieldCount, [:pointer], :int
-    attach_function :OGR_F_GetFieldDefnRef, [:pointer, :int], :pointer
-    attach_function :OGR_F_GetFieldIndex, [:pointer, :string], :int
-    attach_function :OGR_F_IsFieldSet, [:pointer, :int], :int
-    attach_function :OGR_F_GetGeometryRef, [:pointer], :pointer
-    attach_function :OGR_F_GetFID, [:pointer], :long
-    attach_function :OGR_F_SetFID, [:pointer, :long], :pointer
-    attach_function :OGR_F_StealGeometry, [:pointer], :pointer
-    attach_function :OGR_F_SetGeometry, [:pointer, :pointer], :pointer
-    attach_function :OGR_F_SetGeometryDirectly, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_CreateFromWkb, [:pointer, :pointer, :pointer, :int], :pointer
-    attach_function :OGR_G_CreateFromWkt, [:pointer, :pointer, :pointer], :pointer
-    attach_function :OGR_G_DestroyGeometry, [:pointer], :void
-    attach_function :OGR_G_CreateGeometry, [:ogr_geometry_type], :pointer
-    attach_function :OGR_G_ApproximateArcAngles, [:double, :double, :double, :double, :double, :double, :double, :double, :double], :pointer
-    attach_function :OGR_G_ForceToPolygon, [:pointer], :pointer
-    #attach_function :OGR_G_ForceToLineString, [:pointer], :pointer
-    attach_function :OGR_G_ForceToMultiPolygon, [:pointer], :pointer
-    attach_function :OGR_G_ForceToMultiPoint, [:pointer], :pointer
-    attach_function :OGR_G_ForceToMultiLineString, [:pointer], :pointer
-    attach_function :OGR_G_GetDimension, [:pointer], :int
-    attach_function :OGR_G_GetCoordinateDimension, [:pointer], :int
-    attach_function :OGR_G_SetCoordinateDimension, [:pointer, :int], :void
-    attach_function :OGR_G_Clone, [:pointer], :pointer
-    attach_function :OGR_G_GetEnvelope, [:pointer, :pointer], :void
-    attach_function :OGR_G_GetEnvelope3D, [:pointer, :pointer], :void
-    attach_function :OGR_G_ImportFromWkb, [:pointer, :pointer, :int], :pointer
-    attach_function :OGR_G_ExportToWkb, [:pointer, :pointer, :pointer], :pointer
-    attach_function :OGR_G_WkbSize, [:pointer], :int
-    attach_function :OGR_G_ImportFromWkt, [:pointer, :string], :pointer
-    attach_function :OGR_G_ExportToWkt, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_GetGeometryType, [:pointer], :ogr_geometry_type
-    attach_function :OGR_G_GetGeometryName, [:pointer], :string
-    attach_function :OGR_G_DumpReadable, [:pointer, :pointer, :string], :void
-    attach_function :OGR_G_FlattenTo2D, [:pointer], :void
-    attach_function :OGR_G_CloseRings, [:pointer], :void
-    attach_function :OGR_G_CreateFromGML, [:string], :pointer
-    attach_function :OGR_G_ExportToGML, [:pointer], :string
-    #attach_function :OGR_G_ExportToGMLEx, [:pointer, :pointer], :string
-    attach_function :OGR_G_ExportToKML, [:pointer, :string], :string
-    attach_function :OGR_G_ExportToJson, [:pointer], :string
-    attach_function :OGR_G_ExportToJsonEx, [:pointer, :string], :string
-    attach_function :OGR_G_AssignSpatialReference, [:pointer, :pointer], :void
-    attach_function :OGR_G_GetSpatialReference, [:pointer], :pointer
-    attach_function :OGR_G_Transform, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_TransformTo, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_Simplify, [:pointer, :double], :pointer
-    attach_function :OGR_G_SimplifyPreserveTopology, [:pointer, :double], :pointer
-    attach_function :OGR_G_Segmentize, [:pointer, :double], :pointer
-    attach_function :OGR_G_Intersects, [:pointer, :pointer], :int
-    attach_function :OGR_G_Equals, [:pointer, :pointer], :int
-    attach_function :OGR_G_Disjoint, [:pointer, :pointer], :int
-    attach_function :OGR_G_Touches, [:pointer, :pointer], :int
-    attach_function :OGR_G_Crosses, [:pointer, :pointer], :int
-    attach_function :OGR_G_Within, [:pointer, :pointer], :int
-    attach_function :OGR_G_Contains, [:pointer, :pointer], :int
-    attach_function :OGR_G_Overlaps, [:pointer, :pointer], :int
-    attach_function :OGR_G_Boundary, [:pointer], :pointer
-    attach_function :OGR_G_ConvexHull, [:pointer], :pointer
-    attach_function :OGR_G_Buffer, [:pointer, :double, :int], :pointer
-    attach_function :OGR_G_Intersection, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_Union, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_UnionCascaded, [:pointer], :pointer
-    #attach_function :OGR_G_PointOnSurface, [:pointer], :pointer
-    attach_function :OGR_G_Difference, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_SymDifference, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_Distance, [:pointer, :pointer], :double
-    attach_function :OGR_G_Length, [:pointer], :double
-    attach_function :OGR_G_Area, [:pointer], :double
-    attach_function :OGR_G_Centroid, [:pointer, :pointer], :int
-    attach_function :OGR_G_Empty, [:pointer], :void
-    attach_function :OGR_G_IsEmpty, [:pointer], :int
-    attach_function :OGR_G_IsValid, [:pointer], :int
-    attach_function :OGR_G_IsSimple, [:pointer], :int
-    attach_function :OGR_G_IsRing, [:pointer], :int
-    attach_function :OGR_G_Polygonize, [:pointer], :pointer
-    attach_function :OGR_G_GetPointCount, [:pointer], :int
-    attach_function :OGR_G_GetPoints, [:pointer, :pointer, :int, :pointer, :int, :pointer, :int], :int
-    attach_function :OGR_G_GetX, [:pointer, :int], :double
-    attach_function :OGR_G_GetY, [:pointer, :int], :double
-    attach_function :OGR_G_GetZ, [:pointer, :int], :double
-    attach_function :OGR_G_GetPoint, [:pointer, :int, :pointer, :pointer, :pointer], :void
-    attach_function :OGR_G_SetPoint, [:pointer, :int, :double, :double, :double], :void
-    attach_function :OGR_G_SetPoint_2D, [:pointer, :int, :double, :double], :void
-    attach_function :OGR_G_AddPoint, [:pointer, :double, :double, :double], :void
-    attach_function :OGR_G_AddPoint_2D, [:pointer, :double, :double], :void
-    attach_function :OGR_G_GetGeometryCount, [:pointer], :int
-    attach_function :OGR_G_GetGeometryRef, [:pointer, :int], :pointer
-    attach_function :OGR_G_AddGeometry, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_AddGeometryDirectly, [:pointer, :pointer], :pointer
-    attach_function :OGR_G_RemoveGeometry, [:pointer, :int, :int], :pointer
-    attach_function :OGR_F_Destroy, [:pointer], :void
+      OSRNewSpatialReference: [[:pointer], :pointer],
+      OSRImportFromWkt: [[:pointer, :pointer], :pointer],
+      OSRImportFromProj4: [[:pointer, :string], :pointer],
+      OSRImportFromEPSG: [[:pointer, :int], :pointer],
+      OSRImportFromESRI: [[:pointer, :pointer], :pointer],
+      OSRExportToWkt: [[:pointer, :pointer], :pointer],
+      OSRExportToPrettyWkt: [[:pointer, :pointer, :int], :pointer],
+      OSRExportToProj4: [[:pointer, :pointer], :pointer],
+      OSRDestroySpatialReference: [[:pointer], :void],
+      OCTNewCoordinateTransformation: [[:pointer, :pointer], :pointer],
+      OCTDestroyCoordinateTransformation: [[:pointer], :void]
+    }
 
-    # SRS Functions
+    begin
+      ffi_lib gdal_library_path
 
-    attach_function :OSRNewSpatialReference, [:pointer], :pointer
-    attach_function :OSRImportFromWkt, [:pointer, :pointer], :pointer
-    attach_function :OSRImportFromProj4, [:pointer, :string], :pointer
-    attach_function :OSRImportFromEPSG, [:pointer, :int], :pointer
-    attach_function :OSRExportToWkt, [:pointer, :pointer], :pointer
-    attach_function :OSRExportToPrettyWkt, [:pointer, :pointer, :int], :pointer
-    attach_function :OSRExportToProj4, [:pointer, :pointer], :pointer
-    attach_function :OSRDestroySpatialReference, [:pointer], :void
-    attach_function :OCTNewCoordinateTransformation, [:pointer, :pointer], :pointer
-    attach_function :OCTDestroyCoordinateTransformation, [:pointer], :void
+      OGR_FUNCTIONS.each do |func, params|
+        attach_function func, params.first, params.last
+      end
 
-    OGRRegisterAll() # register all available OGR drivers
+      # register all available OGR drivers
+      # also verifies library is loaded
+      OGRRegisterAll()
+    rescue LoadError, NoMethodError
+      raise LoadError.new('Could not load GDAL library')
+    end
   end
 
   class << self
@@ -318,14 +331,11 @@ module OGR
     end
     
     def get_available_drivers
-      drivers = []
-      count = FFIOGR.OGRGetDriverCount
-
-      for i in 0...count
-        drivers << FFIOGR.OGR_Dr_GetName(FFIOGR.OGRGetDriver(i))
+      [].tap do |drivers|
+        for i in 0...FFIOGR.OGRGetDriverCount
+          drivers << FFIOGR.OGR_Dr_GetName(FFIOGR.OGRGetDriver(i))
+        end
       end
-
-      drivers
     end
     alias_method :drivers, :get_available_drivers
 
@@ -341,10 +351,7 @@ module OGR
 
     def get_writer(source)
       extension = source.split('.').last
-      driver = DRIVER_TYPES[extension]
-
-      raise RuntimeError.new "Could not find appropriate driver" if driver.nil?
-
+      driver = get_driver_by_extension extension
       Writer.new(driver)
     end
 
@@ -356,19 +363,33 @@ module OGR
       writer
     end
 
+    def get_driver_by_extension(extension)
+      driver = unless extension == 'kml'
+        DRIVER_TYPES[extension]
+      else
+        drivers.include?('LIBKML') ? 'LIBKML' : 'KML'
+      end
+
+      raise RuntimeError.new "Could not find appropriate driver" if driver.nil?
+
+      driver
+    end
+
     def read(source)
       case source
       when /http:|https:/
         HttpReader.new.read source
       else
-        extension = source.split('.').last
-        driver = DRIVER_TYPES[extension]
-
+        driver = get_driver_by_extension source.split('.').last
         raise RuntimeError.new "Could not determine file type" if driver.nil?
-
         Reader.new(driver).read source
       end
     end
+
+    def import_spatial_ref(sr_import, format = 'epsg')
+      OGR::SpatialReference.import(sr_import, format)
+    end
+    alias_method :import_sr, :import_spatial_ref
   end
 end
 

data/lib/ffi-ogr/data_source.rb

@@ -15,14 +15,14 @@ module OGR
       FFIOGR.OGR_DS_Destroy(@ptr)
     end
 
-    def copy(output_type, output_path, driver_options=nil)
-      driver = OGRGetDriverByName(OGR::DRIVER_TYPES[output_type.downcase])
+    def copy(driver_name, output_path, driver_options=nil)
+      driver = OGRGetDriverByName driver_name
       new_ds = FFIOGR.OGR_Dr_CopyDataSource(driver, @ptr, File.expand_path(output_path), driver_options)
       FFIOGR.OGR_DS_Destroy(new_ds)
     end
 
-    def copy_with_transform(output_type, output_path, spatial_ref=nil, driver_options=nil)
-      writer = OGR::GenericWriter.new(OGR::DRIVER_TYPES[output_type.downcase])
+    def copy_with_transform(driver_name, output_path, spatial_ref=nil, driver_options=nil)
+      writer = OGR::Writer.new driver_name
       writer.set_output(output_path)
       out = writer.ptr
 
@@ -47,12 +47,16 @@ module OGR
           name = FFIOGR.OGR_Fld_GetNameRef(fd)
           type = FFIOGR.OGR_Fld_GetType(fd)
 
-          opts = {}
-
-          opts[:precision] = FFIOGR.OGR_Fld_GetPrecision(fd) if type == :real
-          opts[:width] = FFIOGR.OGR_Fld_GetWidth(fd) if type == :string
+          opts = {}.tap do |o|
+            case type
+            when :real
+              o[:precision] = FFIOGR.OGR_Fld_GetPrecision fd
+            when :string
+              o[:width] = FFIOGR.OGR_Fld_GetWidth fd
+            end
+          end
 
-          new_layer.add_field name, type
+          new_layer.add_field name, type, opts
         end
 
         layer.features.each do |feature|
@@ -129,75 +133,85 @@ module OGR
     end
     alias_method :fields, :get_fields
 
-    def to_format(format, output_path, spatial_ref=nil)
+    def to_format(format, output_path, options={})
       raise RuntimeError.new("Output path not specified.") if output_path.nil?
 
-      # TODO: handle parsing of spatial_ref -> copy options
+      spatial_ref = options.delete :spatial_ref
+
+      driver_options = parse_driver_options options
+
+      driver_name = OGR::DRIVER_TYPES[format]
 
       unless spatial_ref
-        copy format, output_path, spatial_ref
+        copy driver_name, output_path, driver_options
       else
-        if spatial_ref[:spatial_ref].instance_of? OGR::SpatialReference
-          copy_with_transform format, output_path, spatial_ref[:spatial_ref]
+        if spatial_ref.instance_of? OGR::SpatialReference
+          copy_with_transform driver_name, output_path, spatial_ref, driver_options
         else
           raise RuntimeError.new("Invalid spatial reference specified.")
         end
       end
     end
 
-    def to_shp(output_path, spatial_ref=nil)
-      to_format('shapefile', output_path, spatial_ref)
+    def to_shp(output_path, options={})
+      to_format('shapefile', output_path)
     end
 
-    def to_csv(output_path, spatial_ref=nil)
-      to_format('csv', output_path, spatial_ref)
+    def to_csv(output_path, options={})
+      to_format('csv', output_path)
     end
 
-    def to_kml(output_path, spatial_ref=nil)
-      warn "KML output will always be in EPSG:4326" unless spatial_ref.nil?
-      to_format('kml', output_path, spatial_ref)
+    def to_kml(output_path, options={})
+      format = OGR.drivers.include?('LIBKML') ? 'kml' : 'kml_lite'
+
+      warn "GDAL is compiled without LIBKML support. Without LIBKML support KML output will always be in EPSG:4326" if format == 'kml_lite'
+
+      to_format(format, output_path, options)
     end
 
-    def to_geojson(output_path, options=nil)
-      raise RuntimeError.new("Output path not specified.") if output_path.nil?
+    def to_geojson(output_path, options={})
+      to_format('geojson', output_path, options)
+    end
 
-      unless options.nil?
-        spatial_ref = options[:spatial_ref] ? options[:spatial_ref] : nil
+    def parse_driver_options(options)
+      tf_values = {
+        true => "YES",
+        false => "NO"
+      }
 
-        if options[:bbox]
-          # this segfaults -- working on solution
-          bbox = FFI::MemoryPointer.from_string "WRITE_BBOX=YES"
-          driver_options = FFI::MemoryPointer.new :pointer, 1
-          driver_options[0].put_pointer 0, bbox
-        else
-          driver_options = nil
+      pointers = [].tap do |ptrs|
+        options.each do |k,v|
+          tf_value = tf_values[v] || v
+          ptrs << FFI::MemoryPointer.from_string("#{k.to_s.upcase}=#{tf_value.upcase}")
         end
+      end
 
-        if spatial_ref
-          copy_with_transform('geojson', output_path, spatial_ref, driver_options)
-        else
-          copy('geojson', output_path, driver_options)
-        end
-      else
-        copy('geojson', output_path, nil)
+      pointers << nil
+
+      driver_options = FFI::MemoryPointer.new :pointer, pointers.size
+
+      pointers.each_with_index do |ptr, i|
+        driver_options[i].put_pointer 0, ptr
       end
+
+      driver_options
     end
 
     def to_json(pretty=false)
       h = {
         type: 'FeatureCollection',
-        bbox: nil,
         features: []
       }
 
       layers.each do |layer|
-        h[:bbox] = layer.envelope.to_a true
-        geometry_type = layer.geometry_type.to_s.capitalize
-
-        layer.features.each do |feature|
-          properties = feature.fields
-          geometry = OGR::Tools.cast_geometry(feature.geometry).to_geojson
-          h[:features] << {type: geometry_type, geometry: geometry, properties: properties}
+        h[:features].tap do |features|
+          layer.features.each do |feature|
+            features << {
+              type: 'Feature',
+              geometry: OGR::Tools.cast_geometry(feature.geometry).to_geojson,
+              properties: feature.fields
+            }
+          end
         end
       end
 
@@ -209,3 +223,4 @@ module OGR
     end
   end
 end
+

data/lib/ffi-ogr/http_reader.rb

@@ -4,6 +4,14 @@ require 'faraday'
 
 module OGR
   class HttpReader
+
+    TF_MAP = {
+      true => 1,
+      false => 0,
+      1 => true,
+      0 => false
+    }
+
     def read(url, writeable=false)
       file_extension = url.split('.').last
       driver = OGR::DRIVER_TYPES[file_extension]
@@ -18,19 +26,10 @@ module OGR
         end
       end
 
-      file_name = "#{SecureRandom.urlsafe_base64}.#{file_extension}"
-
-      http_resource = Faraday.get(url).body
-
-      File.open(file_name, 'wb') do |f|
-        f.write http_resource
-      end
-
-      ds = Reader.new(driver).read(file_name, writeable)
-
-      FileUtils.rm file_name
-
-      ds
+      http_data = Faraday.get(url).body
+      ogr_driver = OGR::FFIOGR::OGRGetDriverByName driver
+      data_source = OGR::FFIOGR::OGR_Dr_Open ogr_driver, http_data, TF_MAP[writeable]
+      OGR::Tools.cast_data_source data_source
     end
   end
 end

data/lib/ffi-ogr/spatial_reference.rb

@@ -13,41 +13,62 @@ module OGR
       FFIOGR.OSRDestroySpatialReference(@ptr)
     end
 
-    def self.create
-      OGR::Tools.cast_spatial_reference(FFIOGR.OSRNewSpatialReference(nil))
+    def check_int(sr_import, format = 'epsg')
+      begin
+        Integer(sr_import)
+      rescue => ex
+        raise RuntimeError.new "Format: #{format} requires an integer value"
+      end
     end
 
-    def self.from_wkt(wkt)
-      sr = OGR::Tools.cast_spatial_reference(FFIOGR.OSRNewSpatialReference(nil))
-      sr.import_wkt(wkt)
-      sr
+    def check_string(sr_import, format)
+      raise RuntimeError.new "Format: #{format} requires a string value" unless sr_import.instance_of? String
     end
 
-    def self.from_proj4(proj4)
+    def self.import(sr_import, format = 'epsg')
       sr = OGR::Tools.cast_spatial_reference(FFIOGR.OSRNewSpatialReference(nil))
-      sr.import_proj4(proj4)
-      sr
-    end
 
-    def self.from_epsg(epsg_code)
-      sr = OGR::Tools.cast_spatial_reference(FFIOGR.OSRNewSpatialReference(nil))
-      sr.import_epsg(epsg_code)
+      case format
+      when 'epsg'
+        sr.import_epsg sr_import
+      when 'wkt'
+        sr.import_wkt sr_import
+      when 'proj4'
+        sr.import_proj4 sr_import
+      when 'esri'
+        sr.import_esri sr_import
+      else
+        raise RuntimeError.new "Format: #{format} is not currently supported"
+      end
+
       sr
     end
 
     def import_wkt(wkt)
+      check_string wkt, 'wkt'
       wkt_ptr = FFI::MemoryPointer.from_string wkt
       wkt_ptr_ptr = FFI::MemoryPointer.new :pointer
       wkt_ptr_ptr.put_pointer 0, wkt_ptr
-      FFIOGR.OSRImportFromWkt(@ptr, wkt_ptr_ptr)
+      FFIOGR.OSRImportFromWkt @ptr, wkt_ptr_ptr
     end
 
-    def import_proj4(proj4)
-      FFIOGR.OSRImportFromProj4(@ptr, proj4)
+    def import_proj4(proj4_string)
+      check_string proj4_string, 'proj4'
+      FFIOGR.OSRImportFromProj4 @ptr, proj4_string
     end
 
     def import_epsg(epsg_code)
-      FFIOGR.OSRImportFromEPSG(@ptr, epsg_code)
+      epsg_code = check_int epsg_code, 'epsg'
+      FFIOGR.OSRImportFromEPSG @ptr, epsg_code
+    end
+
+    def import_esri(esri_string)
+      check_string esri_string, 'esri'
+      esri_ptr = FFI::MemoryPointer.from_string esri_string
+      esri_ptr_ptr = FFI::MemoryPointer.new :pointer, 2
+      esri_ptr_ptr[0].put_pointer 0, esri_ptr
+      esri_ptr_ptr[1].put_pointer 0, nil
+      FFIOGR.OSRImportFromESRI @ptr, esri_ptr_ptr
     end
 
     def to_wkt(pretty=false)
@@ -79,3 +100,4 @@ module OGR
     end
   end
 end
+

data/lib/ffi-ogr/version.rb

@@ -1,3 +1,3 @@
 module OGR
-  VERSION = '0.1.0.pre3'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ffi-ogr
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0
 platform: ruby
 authors:
 - Scooter Wadsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: FFI wrapper for OGR
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/ogr_console
+- lib/ffi-ogr.rb
 - lib/ffi-ogr/coordinate_transformation.rb
 - lib/ffi-ogr/csv.rb
 - lib/ffi-ogr/data_source.rb
@@ -136,7 +137,6 @@ files:
 - lib/ffi-ogr/tools.rb
 - lib/ffi-ogr/version.rb
 - lib/ffi-ogr/writer.rb
-- lib/ffi-ogr.rb
 homepage: https://github.com/scooterw/ffi-ogr
 licenses:
 - MIT
@@ -147,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Convenient access to OGR functionality from Ruby