lib/rgeo/geos/ffi_factory.rb in rgeo-0.6.0 vs lib/rgeo/geos/ffi_factory.rb in rgeo-1.0.0.rc1

@@ -57,11 +57,11 @@
         end
 
         # Coordinate system (srid, proj4, and coord_sys)
         @srid = opts_[:srid]
         @proj4 = opts_[:proj4]
-        if CoordSys::Proj4.supported?
+        if @proj4 && CoordSys.check!(:proj4)
           if @proj4.is_a?(::String) || @proj4.is_a?(::Hash)
             @proj4 = CoordSys::Proj4.create(@proj4)
           end
         else
           @proj4 = nil
@@ -153,11 +153,11 @@
         hash_["cs"] = @coord_sys.to_wkt if @coord_sys
         hash_
       end
 
       def marshal_load(data_) # :nodoc:
-        if CoordSys::Proj4.supported? && (proj4_data_ = data_["proj4"])
+        if (proj4_data_ = data_["proj4"]) && CoordSys.check!(:proj4)
           proj4_ = CoordSys::Proj4.allocate
           proj4_.marshal_load(proj4_data_)
         else
           proj4_ = nil
         end
@@ -202,9 +202,10 @@
         coder_["coord_sys"] = @coord_sys.to_wkt if @coord_sys
       end
 
       def init_with(coder_) # :nodoc:
         if (proj4_data_ = coder_["proj4"])
+          CoordSys.check!(:proj4)
           if proj4_data_.is_a?(::Hash)
             proj4_ = CoordSys::Proj4.create(proj4_data_["proj4"], radians: proj4_data_["radians"])
           else
             proj4_ = CoordSys::Proj4.create(proj4_data_.to_s)
           end