rgeo 0.2.0 → 0.2.1

data/ext/geos_c_impl/point.c

@@ -52,9 +52,9 @@ RGEO_BEGIN_C
 static VALUE method_point_geometry_type(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
-  if (self_geom) {
-    result = rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->features_module, rb_intern("Point"));
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  if (self_data->geom) {
+    result = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->feature_point;
   }
   return result;
 }
@@ -63,12 +63,14 @@ static VALUE method_point_geometry_type(VALUE self)
 static VALUE method_point_x(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom);
+    GEOSContextHandle_t self_context = self_data->geos_context;
+    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
     if (coord_seq) {
       double val;
-      if (GEOSCoordSeq_getX_r(RGEO_CONTEXT_FROM_GEOMETRY(self), coord_seq, 0, &val)) {
+      if (GEOSCoordSeq_getX_r(self_context, coord_seq, 0, &val)) {
         result = rb_float_new(val);
       }
     }
@@ -80,12 +82,14 @@ static VALUE method_point_x(VALUE self)
 static VALUE method_point_y(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom);
+    GEOSContextHandle_t self_context = self_data->geos_context;
+    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
     if (coord_seq) {
       double val;
-      if (GEOSCoordSeq_getY_r(RGEO_CONTEXT_FROM_GEOMETRY(self), coord_seq, 0, &val)) {
+      if (GEOSCoordSeq_getY_r(self_context, coord_seq, 0, &val)) {
         result = rb_float_new(val);
       }
     }
@@ -97,13 +101,17 @@ static VALUE method_point_y(VALUE self)
 static VALUE get_3d_point(VALUE self, int flag)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
-  if (self_geom && RGEO_FACTORY_DATA_FROM_GEOMETRY(self)->flags & flag) {
-    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom);
-    if (coord_seq) {
-      double val;
-      if (GEOSCoordSeq_getZ_r(RGEO_CONTEXT_FROM_GEOMETRY(self), coord_seq, 0, &val)) {
-        result = rb_float_new(val);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
+  if (self_geom) {
+    if (RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & flag) {
+      GEOSContextHandle_t self_context = self_data->geos_context;
+      const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+      if (coord_seq) {
+        double val;
+        if (GEOSCoordSeq_getZ_r(self_context, coord_seq, 0, &val)) {
+          result = rb_float_new(val);
+        }
       }
     }
   }
@@ -127,7 +135,8 @@ static VALUE method_point_eql(VALUE self, VALUE rhs)
 {
   VALUE result = rgeo_geos_klasses_and_factories_eql(self, rhs);
   if (RTEST(result)) {
-    result = rgeo_geos_coordseqs_eql(RGEO_CONTEXT_FROM_GEOMETRY(self), RGEO_GET_GEOS_GEOMETRY(self), RGEO_GET_GEOS_GEOMETRY(rhs), RGEO_FACTORY_DATA_FROM_GEOMETRY(self)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
+    RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+    result = rgeo_geos_coordseqs_eql(self_data->geos_context, self_data->geom, RGEO_GEOMETRY_DATA_PTR(rhs)->geom, RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
   }
   return result;
 }
@@ -142,7 +151,9 @@ static VALUE cmethod_create(VALUE module, VALUE factory, VALUE x, VALUE y, VALUE
 
 void rgeo_init_geos_point(RGeo_Globals* globals)
 {
-  VALUE geos_point_class = rb_define_class_under(globals->geos_module, "PointImpl", rb_const_get_at(globals->geos_module, rb_intern("GeometryImpl")));
+  VALUE geos_point_class = rb_define_class_under(globals->geos_module, "PointImpl", globals->geos_geometry);
+  globals->geos_point = geos_point_class;
+  globals->feature_point = rb_const_get_at(globals->feature_module, rb_intern("Point"));
   
   rb_define_module_function(geos_point_class, "create", cmethod_create, 4);
   
@@ -158,14 +169,16 @@ void rgeo_init_geos_point(RGeo_Globals* globals)
 VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z)
 {
   VALUE result = Qnil;
-  GEOSCoordSequence* coord_seq = GEOSCoordSeq_create_r(RGEO_CONTEXT_FROM_FACTORY(factory), 1, 3);
+  RGeo_FactoryData* factory_data = RGEO_FACTORY_DATA_PTR(factory);
+  GEOSContextHandle_t context = factory_data->geos_context;
+  GEOSCoordSequence* coord_seq = GEOSCoordSeq_create_r(context, 1, 3);
   if (coord_seq) {
-    if (GEOSCoordSeq_setX_r(RGEO_CONTEXT_FROM_FACTORY(factory), coord_seq, 0, x)) {
-      if (GEOSCoordSeq_setY_r(RGEO_CONTEXT_FROM_FACTORY(factory), coord_seq, 0, y)) {
-        if (GEOSCoordSeq_setZ_r(RGEO_CONTEXT_FROM_FACTORY(factory), coord_seq, 0, z)) {
-          GEOSGeometry* geom = GEOSGeom_createPoint_r(RGEO_CONTEXT_FROM_FACTORY(factory), coord_seq);
+    if (GEOSCoordSeq_setX_r(context, coord_seq, 0, x)) {
+      if (GEOSCoordSeq_setY_r(context, coord_seq, 0, y)) {
+        if (GEOSCoordSeq_setZ_r(context, coord_seq, 0, z)) {
+          GEOSGeometry* geom = GEOSGeom_createPoint_r(context, coord_seq);
           if (geom) {
-            result = rgeo_wrap_geos_geometry(factory, geom, rb_const_get_at(RGEO_GLOBALS_FROM_FACTORY(factory)->geos_module, rb_intern("PointImpl")));
+            result = rgeo_wrap_geos_geometry(factory, geom, factory_data->globals->geos_point);
           }
         }
       }

data/ext/geos_c_impl/polygon.c

@@ -54,7 +54,8 @@ static VALUE method_polygon_eql(VALUE self, VALUE rhs)
 {
   VALUE result = rgeo_geos_klasses_and_factories_eql(self, rhs);
   if (RTEST(result)) {
-    result = rgeo_geos_polygons_eql(RGEO_CONTEXT_FROM_GEOMETRY(self), RGEO_GET_GEOS_GEOMETRY(self), RGEO_GET_GEOS_GEOMETRY(rhs), RGEO_FACTORY_DATA_FROM_GEOMETRY(self)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
+    RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+    result = rgeo_geos_polygons_eql(self_data->geos_context, self_data->geom, RGEO_GEOMETRY_DATA_PTR(rhs)->geom, RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
   }
   return result;
 }
@@ -63,9 +64,9 @@ static VALUE method_polygon_eql(VALUE self, VALUE rhs)
 static VALUE method_polygon_geometry_type(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
-  if (self_geom) {
-    result = rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->features_module, rb_intern("Polygon"));
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  if (self_data->geom) {
+    result = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->feature_polygon;
   }
   return result;
 }
@@ -74,10 +75,11 @@ static VALUE method_polygon_geometry_type(VALUE self)
 static VALUE method_polygon_area(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
     double area;
-    if (GEOSArea_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom, &area)) {
+    if (GEOSArea_r(self_data->geos_context, self_geom, &area)) {
       result = rb_float_new(area);
     }
   }
@@ -88,9 +90,10 @@ static VALUE method_polygon_area(VALUE self)
 static VALUE method_polygon_centroid(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    result = rgeo_wrap_geos_geometry(RGEO_FACTORY_FROM_GEOMETRY(self), GEOSGetCentroid_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom), rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->geos_module, rb_intern("PointImpl")));
+    result = rgeo_wrap_geos_geometry(self_data->factory, GEOSGetCentroid_r(self_data->geos_context, self_geom), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_point);
   }
   return result;
 }
@@ -99,9 +102,10 @@ static VALUE method_polygon_centroid(VALUE self)
 static VALUE method_polygon_point_on_surface(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    result = rgeo_wrap_geos_geometry(RGEO_FACTORY_FROM_GEOMETRY(self), GEOSPointOnSurface_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom), rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->geos_module, rb_intern("PointImpl")));
+    result = rgeo_wrap_geos_geometry(self_data->factory, GEOSPointOnSurface_r(self_data->geos_context, self_geom), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_point);
   }
   return result;
 }
@@ -110,9 +114,10 @@ static VALUE method_polygon_point_on_surface(VALUE self)
 static VALUE method_polygon_exterior_ring(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    result = rgeo_wrap_geos_geometry_clone(RGEO_FACTORY_FROM_GEOMETRY(self), GEOSGetExteriorRing_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom), rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->geos_module, rb_intern("LinearRingImpl")));
+    result = rgeo_wrap_geos_geometry_clone(self_data->factory, GEOSGetExteriorRing_r(self_data->geos_context, self_geom), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_linear_ring);
   }
   return result;
 }
@@ -121,9 +126,10 @@ static VALUE method_polygon_exterior_ring(VALUE self)
 static VALUE method_polygon_num_interior_rings(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    int num = GEOSGetNumInteriorRings_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom);
+    int num = GEOSGetNumInteriorRings_r(self_data->geos_context, self_geom);
     if (num >= 0) {
       result = INT2NUM(num);
     }
@@ -135,9 +141,10 @@ static VALUE method_polygon_num_interior_rings(VALUE self)
 static VALUE method_polygon_interior_ring_n(VALUE self, VALUE n)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    result = rgeo_wrap_geos_geometry_clone(RGEO_FACTORY_FROM_GEOMETRY(self), GEOSGetInteriorRingN_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom, NUM2INT(n)), rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->geos_module, rb_intern("LinearRingImpl")));
+    result = rgeo_wrap_geos_geometry_clone(self_data->factory, GEOSGetInteriorRingN_r(self_data->geos_context, self_geom, NUM2INT(n)), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_linear_ring);
   }
   return result;
 }
@@ -146,14 +153,18 @@ static VALUE method_polygon_interior_ring_n(VALUE self, VALUE n)
 static VALUE method_polygon_interior_rings(VALUE self)
 {
   VALUE result = Qnil;
-  const GEOSGeometry* self_geom = RGEO_GET_GEOS_GEOMETRY(self);
+  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  const GEOSGeometry* self_geom = self_data->geom;
   if (self_geom) {
-    int count = GEOSGetNumInteriorRings_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom);
+    GEOSContextHandle_t self_context = self_data->geos_context;
+    int count = GEOSGetNumInteriorRings_r(self_context, self_geom);
     if (count >= 0) {
       result = rb_ary_new2(count);
+      VALUE factory = self_data->factory;
+      VALUE linear_ring_class = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_linear_ring;
       int i;
       for (i=0; i<count; ++i) {
-        rb_ary_store(result, i, rgeo_wrap_geos_geometry_clone(RGEO_FACTORY_FROM_GEOMETRY(self), GEOSGetInteriorRingN_r(RGEO_CONTEXT_FROM_GEOMETRY(self), self_geom, i), rb_const_get_at(RGEO_GLOBALS_FROM_GEOMETRY(self)->geos_module, rb_intern("LinearRingImpl"))));
+        rb_ary_store(result, i, rgeo_wrap_geos_geometry_clone(factory, GEOSGetInteriorRingN_r(self_context, self_geom, i), linear_ring_class));
       }
     }
   }
@@ -164,9 +175,11 @@ static VALUE method_polygon_interior_rings(VALUE self)
 static VALUE cmethod_create(VALUE module, VALUE factory, VALUE exterior, VALUE interior_array)
 {
   Check_Type(interior_array, T_ARRAY);
-  VALUE linear_ring_type = rb_const_get_at(RGEO_GLOBALS_FROM_FACTORY(factory)->features_module, rb_intern("LinearRing"));
+  RGeo_FactoryData* factory_data = RGEO_FACTORY_DATA_PTR(factory);
+  VALUE linear_ring_type = factory_data->globals->feature_linear_ring;
   GEOSGeometry* exterior_geom = rgeo_convert_to_detached_geos_geometry(exterior, factory, linear_ring_type, NULL);
   if (exterior_geom) {
+    GEOSContextHandle_t context = factory_data->geos_context;
     unsigned int len = (unsigned int)RARRAY_LEN(interior_array);
     GEOSGeometry** interior_geoms = ALLOC_N(GEOSGeometry*, len == 0 ? 1 : len);
     if (interior_geoms) {
@@ -179,18 +192,18 @@ static VALUE cmethod_create(VALUE module, VALUE factory, VALUE exterior, VALUE i
         }
       }
       if (len == actual_len) {
-        GEOSGeometry* polygon = GEOSGeom_createPolygon_r(RGEO_CONTEXT_FROM_FACTORY(factory), exterior_geom, interior_geoms, actual_len);
+        GEOSGeometry* polygon = GEOSGeom_createPolygon_r(context, exterior_geom, interior_geoms, actual_len);
         if (polygon) {
           free(interior_geoms);
-          return rgeo_wrap_geos_geometry(factory, polygon, rb_const_get_at(RGEO_GLOBALS_FROM_FACTORY(factory)->geos_module, rb_intern("PolygonImpl")));
+          return rgeo_wrap_geos_geometry(factory, polygon, factory_data->globals->geos_polygon);
         }
       }
       for (i=0; i<actual_len; ++i) {
-        GEOSGeom_destroy_r(RGEO_CONTEXT_FROM_FACTORY(factory), interior_geoms[i]);
+        GEOSGeom_destroy_r(context, interior_geoms[i]);
       }
       free(interior_geoms);
     }
-    GEOSGeom_destroy_r(RGEO_CONTEXT_FROM_FACTORY(factory), exterior_geom);
+    GEOSGeom_destroy_r(context, exterior_geom);
   }
   return Qnil;
 }
@@ -198,7 +211,9 @@ static VALUE cmethod_create(VALUE module, VALUE factory, VALUE exterior, VALUE i
 
 void rgeo_init_geos_polygon(RGeo_Globals* globals)
 {
-  VALUE geos_polygon_class = rb_define_class_under(globals->geos_module, "PolygonImpl", rb_const_get_at(globals->geos_module, rb_intern("GeometryImpl")));
+  VALUE geos_polygon_class = rb_define_class_under(globals->geos_module, "PolygonImpl", globals->geos_geometry);
+  globals->geos_polygon = geos_polygon_class;
+  globals->feature_polygon = rb_const_get_at(globals->feature_module, rb_intern("Polygon"));
   
   rb_define_module_function(geos_polygon_class, "create", cmethod_create, 3);
   

data/ext/proj4_c_impl/extconf.rb

@@ -34,41 +34,49 @@
 ;
 
 
-require 'mkmf'
-
-header_dirs_ =
-  [
-   '/usr/local/include',
-   '/usr/local/proj/include',
-   '/usr/local/proj4/include',
-   '/opt/local/include',
-   ::Config::CONFIG['includedir'],
-   '/usr/include',
-  ]
-lib_dirs_ =
-  [
-   '/usr/local/lib',
-   '/usr/local/proj/lib',
-   '/usr/local/proj4/lib',
-   '/opt/local/lib',
-   ::Config::CONFIG['libdir'],
-   '/usr/lib',
-  ]
-header_dirs_.delete_if{ |path_| !::File.directory?(path_) }
-lib_dirs_.delete_if{ |path_| !::File.directory?(path_) }
-
-found_proj_ = false
-header_dirs_, lib_dirs_ = dir_config('proj', header_dirs_, lib_dirs_)
-if have_header('proj_api.h')
-  $libs << ' -lproj'
-  if have_func('pj_init_plus', 'proj_api.h')
-    found_proj_ = true
-  else
-    $libs.gsub!(' -lproj', '')
+if ::RUBY_DESCRIPTION =~ /^jruby\s/
+  
+  ::File.open('Makefile', 'w'){ |f_| f_.write(".PHONY: install\ninstall:\n") }
+  
+else
+  
+  require 'mkmf'
+  
+  header_dirs_ =
+    [
+     '/usr/local/include',
+     '/usr/local/proj/include',
+     '/usr/local/proj4/include',
+     '/opt/local/include',
+     ::Config::CONFIG['includedir'],
+     '/usr/include',
+    ]
+  lib_dirs_ =
+    [
+     '/usr/local/lib',
+     '/usr/local/proj/lib',
+     '/usr/local/proj4/lib',
+     '/opt/local/lib',
+     ::Config::CONFIG['libdir'],
+     '/usr/lib',
+    ]
+  header_dirs_.delete_if{ |path_| !::File.directory?(path_) }
+  lib_dirs_.delete_if{ |path_| !::File.directory?(path_) }
+  
+  found_proj_ = false
+  header_dirs_, lib_dirs_ = dir_config('proj', header_dirs_, lib_dirs_)
+  if have_header('proj_api.h')
+    $libs << ' -lproj'
+    if have_func('pj_init_plus', 'proj_api.h')
+      found_proj_ = true
+    else
+      $libs.gsub!(' -lproj', '')
+    end
   end
+  unless found_proj_
+    puts "**** WARNING: Unable to find Proj headers or Proj version is too old."
+    puts "**** Compiling without Proj support."
+  end
+  create_makefile('rgeo/coord_sys/proj4_c_impl')
+  
 end
-unless found_proj_
-  puts "**** WARNING: Unable to find Proj headers or Proj version is too old."
-  puts "**** Compiling without Proj support."
-end
-create_makefile('rgeo/coord_sys/proj4_c_impl')

data/lib/rgeo/coord_sys.rb

@@ -54,5 +54,7 @@ end
 
 
 # Implementation files
-require 'rgeo/coord_sys/proj4_c_impl'
+begin
+  require 'rgeo/coord_sys/proj4_c_impl'
+rescue ::LoadError; end
 require 'rgeo/coord_sys/proj4'

data/lib/rgeo/geos.rb

@@ -64,7 +64,9 @@ end
 # Implementation files
 require 'rgeo/geos/factory'
 require 'rgeo/geos/interface'
-require 'rgeo/geos/geos_c_impl'
+begin
+  require 'rgeo/geos/geos_c_impl'
+rescue ::LoadError; end
 require 'rgeo/geos/impl_additions'
 require 'rgeo/geos/zm_factory'
 require 'rgeo/geos/zm_impl'

data/lib/rgeo/geos/impl_additions.rb

@@ -53,16 +53,18 @@ module RGeo
       
       
       # :stopdoc:
-      IMPL_CLASSES = {
-        Feature::Point => PointImpl,
-        Feature::LineString => LineStringImpl,
-        Feature::LinearRing => LinearRingImpl,
-        Feature::Line => LineImpl,
-        Feature::GeometryCollection => GeometryCollectionImpl,
-        Feature::MultiPoint => MultiPointImpl,
-        Feature::MultiLineString => MultiLineStringImpl,
-        Feature::MultiPolygon => MultiPolygonImpl,
-      }
+      if ::RGeo::Geos.supported?
+        IMPL_CLASSES = {
+          Feature::Point => PointImpl,
+          Feature::LineString => LineStringImpl,
+          Feature::LinearRing => LinearRingImpl,
+          Feature::Line => LineImpl,
+          Feature::GeometryCollection => GeometryCollectionImpl,
+          Feature::MultiPoint => MultiPointImpl,
+          Feature::MultiLineString => MultiLineStringImpl,
+          Feature::MultiPolygon => MultiPolygonImpl,
+        }
+      end
       # :startdoc:
       
       

data/test/coord_sys/tc_proj4.rb

@@ -115,4 +115,4 @@ module RGeo
       
     end
   end
-end
+end if ::RGeo::CoordSys::Proj4.supported?

data/test/geos/tc_factory.rb

@@ -88,4 +88,4 @@ module RGeo
       
     end
   end
-end
+end if ::RGeo::Geos.supported?

data/test/geos/tc_geometry_collection.rb

@@ -59,4 +59,4 @@ module RGeo
       
     end
   end
-end
+end if ::RGeo::Geos.supported?

data/test/geos/tc_line_string.rb

@@ -59,4 +59,4 @@ module RGeo
       
     end
   end
-end
+end if ::RGeo::Geos.supported?