rgeo 0.2.2 → 0.2.3

data/lib/rgeo/geographic/proj4_projector.rb

@@ -82,7 +82,7 @@ module RGeo
         
         
         def create_from_proj4(geography_factory_, proj4_, opts_={})
-          projection_factory_ = Cartesian.preferred_factory(:proj4 => proj4_, :srid => opts_[:srid], :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
+          projection_factory_ = Cartesian.preferred_factory(:proj4 => proj4_, :coord_sys => opts_[:coord_sys], :srid => opts_[:srid], :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
           new(geography_factory_, projection_factory_)
         end
         

data/lib/rgeo/geographic/simple_mercator_projector.rb

@@ -46,7 +46,7 @@ module RGeo
       
       def initialize(geography_factory_, opts_={})
         @geography_factory = geography_factory_
-        @projection_factory = Cartesian.preferred_factory(:srid => 3857, :proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
+        @projection_factory = Cartesian.preferred_factory(:srid => 3785, :proj4 => SimpleMercatorProjector._proj4_3785, :coord_sys => SimpleMercatorProjector._coordsys_3785, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
       end
       
       
@@ -125,6 +125,22 @@ module RGeo
       end
       
       
+      def self._proj4_3785  # :nodoc:
+        unless defined?(@proj4_3785)
+          @proj4_3785 = CoordSys::Proj4.create('+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs')
+        end
+        @proj4_3785
+      end
+      
+      
+      def self._coordsys_3785  # :nodoc:
+        unless defined?(@coordsys_3785)
+          @coordsys_3785 = CoordSys::CS.create_from_wkt('PROJCS["Popular Visualisation CRS / Mercator",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]')
+        end
+        @coordsys_3785
+      end
+      
+      
     end
     
     

data/lib/rgeo/geos/factory.rb

@@ -66,6 +66,7 @@ module RGeo
           end
           buffer_resolution_ = opts_[:buffer_resolution].to_i
           buffer_resolution_ = 1 if buffer_resolution_ < 1
+          srid_ = opts_[:srid]
           proj4_ = opts_[:proj4]
           if CoordSys::Proj4.supported?
             if proj4_.kind_of?(::String) || proj4_.kind_of?(::Hash)
@@ -78,7 +79,15 @@ module RGeo
           if coord_sys_.kind_of?(::String)
             coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_) rescue nil
           end
-          result_ = _create(flags_, opts_[:srid].to_i, buffer_resolution_)
+          if (!proj4_ || !coord_sys_) && srid_ && (db_ = opts_[:srs_database])
+            entry_ = db_.get(srid_.to_i)
+            if entry_
+              proj4_ ||= entry_.proj4
+              coord_sys_ ||= entry_.coord_sys
+            end
+          end
+          srid_ ||= coord_sys_.authority_code if coord_sys_
+          result_ = _create(flags_, srid_.to_i, buffer_resolution_)
           result_.instance_variable_set(:@proj4, proj4_)
           result_.instance_variable_set(:@coord_sys, coord_sys_)
           result_

data/lib/rgeo/geos/interface.rb

@@ -88,6 +88,19 @@ module RGeo
       # <tt>:srid</tt>::
       #   Set the SRID returned by geometries created by this factory.
       #   Default is 0.
+      # <tt>:proj4</tt>::
+      #   The coordinate system in Proj4 format, either as a
+      #   CoordSys::Proj4 object or as a string or hash representing the
+      #   proj4 format. Optional.
+      # <tt>:coord_sys</tt>::
+      #   The coordinate system in OGC form, either as a subclass of
+      #   CoordSys::CS::CoordinateSystem, or as a string in WKT format.
+      #   Optional.
+      # <tt>:srs_database</tt>::
+      #   Optional. If provided, the value should be an implementation of
+      #   CoordSys::SRSDatabase::Interface. If both this and an SRID are
+      #   provided, they are used to look up the proj4 and coord_sys
+      #   objects from a spatial reference system database.
       # <tt>:has_z_coordinate</tt>::
       #   Support <tt>z_coordinate</tt>. Default is false.
       # <tt>:has_m_coordinate</tt>::
@@ -106,6 +119,19 @@ module RGeo
       end
       
       
+      # Returns a Feature::FactoryGenerator that creates Geos-backed
+      # factories. The given options are used as the default options.
+      # 
+      # A common case for this is to provide the <tt>:srs_database</tt>
+      # as a default. Then, the factory generator need only be passed
+      # an SRID and it will automatically fetch the appropriate Proj4
+      # and CoordSys objects.
+      
+      def factory_generator(defaults_={})
+        ::Proc.new{ |c_| factory(defaults_.merge(c_)) }
+      end
+      
+      
     end
     
   end

data/lib/rgeo/geos/zm_factory.rb

@@ -62,8 +62,24 @@ module RGeo
       
       
       def initialize(opts_={})  # :nodoc:
-        @zfactory = Factory.create(:has_z_coordinate => true, :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :buffer_resolution => opts_[:buffer_resolution], :srid => opts_[:srid], :proj4 => opts_[:proj4])
-        @mfactory = Factory.create(:has_m_coordinate => true, :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :buffer_resolution => opts_[:buffer_resolution], :srid => opts_[:srid], :proj4 => opts_[:proj4])
+        proj4_ = opts_[:proj4]
+        coord_sys_ = opts_[:coord_sys]
+        srid_ = opts_[:srid]
+        if (!proj4_ || !coord_sys_) && srid_ && (db_ = opts_[:srs_database])
+          entry_ = db_.get(srid_.to_i)
+          if entry_
+            proj4_ ||= entry_.proj4
+            coord_sys_ ||= entry_.coord_sys
+          end
+        end
+        srid_ ||= coord_sys_.authority_code if coord_sys_
+        config_ = {
+          :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+          :buffer_resolution => opts_[:buffer_resolution],
+          :srid => srid_.to_i, :proj4 => proj4_, :coord_sys => coord_sys_,
+        }
+        @zfactory = Factory.create(config_.merge(:has_z_coordinate => true))
+        @mfactory = Factory.create(config_.merge(:has_m_coordinate => true))
       end
       
       

data/test/coord_sys/tc_active_record_table.rb

@@ -45,11 +45,16 @@ module RGeo
       module ActiveRecordTableTests  # :nodoc:
         
         database_configs_ = ::YAML.load_file(::File.dirname(__FILE__)+'/database.yml') rescue nil
+        if database_configs_
+          begin
+            require 'active_record'
+          rescue ::LoadError
+            database_configs_ = nil
+          end
+        end
         
         if database_configs_
           
-          require 'active_record'
-          
           PostGIS_CONFIG = database_configs_['postgis'] rescue nil
           
           
@@ -88,7 +93,7 @@ module RGeo
           
         
         else
-          puts "WARNING: Couldn't find database.yml; skipping ActiveRecord tests."
+          puts "WARNING: Couldn't find database.yml or ActiveRecord gem is not present; skipping ActiveRecord tests."
         end
         
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -08:00
+date: 2010-12-19 00:00:00 -08:00
 default_executable: 
 dependencies: []