rp_clustering-rgeo-activerecord 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjAzODU1ZmI0ZjZlMDdlODlmYjA0NTBiOGRmMjQyMDViZGNjZDAzMw==
+    MmJmOWM2NjZhMmMzODM1M2EyZDhkNjUyMzJjOGU1M2NlZTQ5N2IzOQ==
   data.tar.gz: !binary |-
-    ZTk2ZTk4NTc4YjU3M2MxZjc5ZDdlMjdhNzk1NjBhMGJjM2I4MTRjMg==
+    NjZlZjdkMWNhNGYwOTdiMDU4YTdlNTIzODA2OGFmMDNhYjUyOTdkYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTQ0OGI2Y2I0NWEyMGVlN2FlZmQ0Mzc4ZDc0N2FhMjMwNGQwNjNjZDI5NzZl
-    ZjNhNWNmNjc5YjY4ODJjMmZkZmYwOTYwN2EzNTU5NTU3YjRlNmQ2NmUwYjkw
-    YTc3ZDc5NGVjNzAyMjM3MDEzNGRhNWM5ZGZjZDhiNDRmZTk5Mzc=
+    Y2I1NTBjYzEyMTZmN2FjYTlmMDhjZDFlNGMxYjM0NWQxOTQ0ODUxMTYxMjBl
+    YmI4MTgyNzAzYzhiMTYzZDFlYzAwZTgxNWQ2ZTJkN2RkNjg2NmYzN2M2ZWJh
+    ODIyYTE0OTM0NzFlMzJkNTZhM2MxODc0ODZiOTNkNWFlYTNiYWU=
   data.tar.gz: !binary |-
-    OTcxZjBjYTViYjU2ZTdjMjIwZjdkNGRjN2NiODFjOWM4ZjRiNjIzOWIyMTc5
-    YzE1ZWUwOTllZjUzNjcxYjg4YzA3MzU5ZDVkNWY0YjBlOGVhMmEzYzRiNWE3
-    NTJiYTVmZGMzNjVhMTkxNGZkY2U4NzljMzYyNzc3Nzc5MThiMTA=
+    NWFlODJlYWQ1Mzg2MjRmNTVlYzM0NTk0YmI3ZTQwMmY3MTlhNjE4NGVlNzQx
+    YTZmZGJkMWFkOGVkM2Y5M2I4YzVlZDhhNDhiMjdhOGM4ZTEwNDdmNzUzYzEx
+    ZDI2NDgyNTFjZmNjZTc5MjMyNDFlNTI2NjIxZjAxZDBjOWY4YzE=

data/README.md

@@ -5,6 +5,9 @@ A RGeo PostGIS extension to provide Active Record (Model) clustering functionali
 The intention is that this Gem will eventually provide abstracted methods for
 both "on the fly" clustering, as well as cached clustering (including associated generators).
 
+This Gem is currently in early development, so expect changes. On this note, if you'd like a specific clustering
+algorithm or feature added, please ask.
+
 If you find a problem with this Gem, please don't hesitate to raise an [issue](https://github.com/robertpyke/rp_clustering-rgeo-activerecord/issues).
 
 ## Installation
@@ -53,9 +56,9 @@ e.g.
 
     query = MyModel.select(
       arel_table.st_astext(
-        arel_table.st_centroid(arel_table.st_collect(attr))
+        arel_table.st_centroid(arel_table.st_collect(arel_table[:latlon]))
       ).as("cluster_centroid")
-    ).group(arel_table[:latlon].st_snaptogrid(0.1))
+    ).group(arel_table[:latlon].st_snaptogrid(grid_size))
 
     # Iterate over our clusters
     query.all.each do |cluster|

data/lib/rp_clustering-rgeo-activerecord/arel_attribute_spatial_expressions.rb

@@ -57,6 +57,29 @@ module RPClustering
 
         end
 
+        # ST_MinimumBoundingCircle: http://www.postgis.org/docs/ST_MinimumBoundingCircle.html
+        #
+        # Implements postgis function variant:
+        #
+        #   geometry ST_MinimumBoundingCircle(geometry geomA, integer num_segs_per_qt_circ=48);
+        #
+        # Returns a geometry
+
+        def st_minimumboundingcircle(num_segs=nil)
+          args = [self]
+          if num_segs
+            args << num_segs.to_s
+
+            ::RGeo::ActiveRecord::SpatialNamedFunction.new(
+              'ST_MinimumBoundingCircle', args, [true, true, false]
+            )
+          else
+            ::RGeo::ActiveRecord::SpatialNamedFunction.new(
+              'ST_MinimumBoundingCircle', args, [true, true]
+            )
+          end
+        end
+
       end
 
     end

data/lib/rp_clustering-rgeo-activerecord/arel_table_spatial_expressions.rb

@@ -73,6 +73,29 @@ module RPClustering
           )
         end
 
+        # ST_MinimumBoundingCircle: http://www.postgis.org/docs/ST_MinimumBoundingCircle.html
+        #
+        # Implements postgis function variant:
+        #
+        #   geometry ST_MinimumBoundingCircle(geometry geomA, integer num_segs_per_qt_circ=48);
+        #
+        # Returns a geometry
+
+        def st_minimumboundingcircle(g, num_segs=nil)
+          args = [g]
+          if num_segs
+            args << num_segs.to_s
+
+            ::RGeo::ActiveRecord::SpatialNamedFunction.new(
+              'ST_MinimumBoundingCircle', args, [true, true, false]
+            )
+          else
+            ::RGeo::ActiveRecord::SpatialNamedFunction.new(
+              'ST_MinimumBoundingCircle', args, [true, true]
+            )
+          end
+        end
+
       end
 
     end

data/lib/rp_clustering-rgeo-activerecord/version.rb

@@ -1,7 +1,7 @@
 module RPClustering
   module RGeo
     module ActiveRecord
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/rp_clustering-rgeo-activerecord.gemspec

@@ -25,12 +25,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('pg')
+  gem.add_development_dependency('squeel', '~> 1.0.16')
 
   # Deployed Gem Dependencies
   gem.add_dependency('activerecord', '~> 3.0')
   gem.add_dependency('arel', '~> 3.0.2')
   gem.add_dependency('rgeo', '~> 0.3.20')
   gem.add_dependency('rgeo-activerecord', '~> 0.4.6')
+
   # This Gem is specific to postgis
-  gem.add_dependency('activerecord-postgis-adapter')
+  gem.add_dependency('activerecord-postgis-adapter', '~> 0.5.1')
 end

data/test/test_unit.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'rgeo/active_record/adapter_test_helper'
 require 'rp_clustering-rgeo-activerecord'
+require 'squeel'
 
 module RPClustering
   module RGeo
@@ -99,6 +100,46 @@ module RPClustering
 
             end
 
+            # Confirm that the st_minimumboundingcircle function is producing the 
+            # expected results
+
+            def test_st_minimumboundingcircle
+              arel_klass = populate_ar_class(:latlon_point)
+
+              points_generated = 0
+              (-5..5).each do |lng|
+                (-5..5).each do |lat|
+                  obj = arel_klass.new
+                  obj.latlon = @geographic_factory.point(lng, lat)
+                  obj.save!
+                  points_generated+=1
+                end
+              end
+
+              # Sanity check, confirm that we have all the points we created.
+              count_res = arel_klass.count()
+              assert_equal(
+                points_generated,
+                count_res,
+                "The number of points generated doesn't match the number in the DB"
+              )
+
+              attr = arel_klass.arel_table[:latlon]
+              t = arel_klass.arel_table
+
+              q1 = arel_klass.select(t.st_astext(t.st_minimumboundingcircle(attr.st_collect())).as("min_bound_circle"))
+
+              assert_equal(1, q1.all.count(), "We should get a single bounding circle covering all points")
+
+              value = q1.first["min_bound_circle"]
+              circle = @geographic_factory.parse_wkt(value)
+              assert(circle.is_a?(::RGeo::Feature::Polygon), "the min_bound_circle should be a polygon")
+
+              q2 = arel_klass.where{latlon.op('&&', circle)}
+              assert_equal(points_generated, q2.count(), "the min_bound_circle should contain all our generated poits")
+
+            end
+
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rp_clustering-rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Robert Pyke
@@ -80,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.16
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.16
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +154,16 @@ dependencies:
   name: activerecord-postgis-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 description: A RGeo PostGIS extension to provide Active Record (Model) clustering
   functionality
 email: