rp_clustering-rgeo-activerecord 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzliYTdiMDQyNjMxZmQ3NGM4NGQyNTZmMjgwYmY4NDUyMTk0NGFiYQ==
+    YzlmNTQwZDMwYzkxOGNkMDc5MzhhOTNiYWExYTQwNWJjODljODdiZA==
   data.tar.gz: !binary |-
-    YTRmZWE4M2Q5NDhkZDE0NWYwOTEyYzRkYzk5MDU3ZmVmZDVlMDk2Mg==
+    NzAyYzFmOGRmZjUxNzIwNjk0Yjg2YzRlY2Q2MmNkMWIyNGUwOTAzMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODEwOGZjNWVmZDg3ODFkNTU5YjZlODQ0OGM5NjlkZTU2NTNkZWU5Mjg3NGIy
-    YzcxOWY5OGJjMzg4ZjJmODhhZWNkNDM2MjIzMGU0NTk4ZmM1NDE0MDdjNWYz
-    NTAwMjllZTRjMTY1MzRjNjI3NWUyZDQ3ODUxNjFiMGU5MjBhYTk=
+    NmExOTU0ZTJjNGNmNTA0Nzg3ZTlmNDZhYjcwMmJlYTIwOGViOGFhMjY5YmM1
+    MjU3YmYzZGVlMTU0NGZkOTM2OTBlMmVlNzI0MjM3MjEzNTU3NzA1NzcyODJh
+    NGMxODQzMDQ3NzU5ZGE2ZmYyMzhjMDg5M2Y1NmZhOGY2ZWEwNzk=
   data.tar.gz: !binary |-
-    NzQ1OTU4MWE4MDM3OWJkNTJkYWI0ZWQ2ZTkxN2Q1NTBhNjU1NWJmYTFiNWRm
-    NWRlMjUyN2I1NjExZjJiOWVhZTY1MjllZmQ0ZmViN2E4MmZhMjViOWQzMzFh
-    ODAzMzZlNjA3OGQ0ZWQ1YzczOTg1OTMwZjFkZjU2ZmM3MTNhYzM=
+    NmRkNTM2NmNiNTZhYmM0MjU0OGQ4MzQwZGRlNmY1YmNkNmQ0NjMxMzU0Njc1
+    MGE3MDNmOTljYzhkNTljYmRkZThhMGJiYWQ1YzQ4MzljNzhjODYwMThlYzUw
+    MjNjYTk3NDZjNzQxMjcyMDE3NmQzMWQ0YmNjYmI1ZWNkMjJkZmQ=

data/README.md

@@ -34,7 +34,7 @@ Or install it yourself as:
 
 ## Usage
 
-### Added in Version 0.0.3
+### Added in Version 0.0.3 (Fixed in 0.0.4)
 
 This version allows for the "on the fly" use of a ST_SnapToGrid clustering function.
 The function is added to ActiveRecord::Base (Models). The function is:
@@ -53,7 +53,7 @@ The function is added to ActiveRecord::Base (Models). The function is:
 # Options:
 #
 # [:grid_size] if set, will be used to create the cluster. The clustering
-#     works rougly like this; all geometries within 'grid_size'
+#     works rougly like this; all geometries within 'grid_size' of each other
 #     will be pulled together to form a single cluster. For a detailed
 #     explanation, please see the PostGIS docs for ST_SnapToGrid.
 #
@@ -120,7 +120,7 @@ RGeo::GeoJSON.encode(feature_collection)
 # make outliers (small clusters) bright red, or you could vary the size of the
 # cluster centroid based on the size of cluster.
 #
-# Ideally, you could vary your +grid_size+ based on the user's view port.
+# Ideally, you would vary your +grid_size+ based on the user's view port.
 # For example, you could set it to fixed values based on the user's zoom level.
 # You could dynamically generate it based on some fraction of the user's view port bbox.
 

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

@@ -14,8 +14,7 @@ module RPClustering
 
         module ClassMethods
 
-          # Cluster using the PostGIS function ST_SnapToGrid
-          # -------------------------------------------------
+          # === Cluster using the PostGIS function ST_SnapToGrid
           #
           # attr_to_cluster is the name of attribute to be clustered (a symbol).
           # The attribute should be geometry attribute.
@@ -23,39 +22,45 @@ module RPClustering
           # Use the options Hash to define what cluster properties you would
           # like returned.
           #
-          # Options:
+          # == Options:
           #
           # [:grid_size] if set, will be used to create the cluster. The clustering
-          #     works rougly like this; all geometries within 'grid_size'
-          #     will be pulled together to form a single cluster. For a detailed
-          #     explanation, please see the PostGIS docs for ST_SnapToGrid.
+          #              works rougly like this; all geometries within 'grid_size' of each other
+          #              will be pulled together to form a single cluster. For a detailed
+          #              explanation, please see the PostGIS docs for ST_SnapToGrid.
           #
-          #     If no +:grid_size+ is given, clusters will consist of all 'equal'
-          #     geometries. E.g. all points at the same 
-          #     position (x,y) will be pulled together to form a single cluster.
-          #     This is actually just a Group By of your +attr_to_cluster+.
+          #              If no +:grid_size+ is given, clusters will consist of all 'equal'
+          #              geometries. E.g. all points at the same 
+          #              position (x,y) will be pulled together to form a single cluster.
+          #              This is actually just a Group By of your +attr_to_cluster+.
           #
           # [:cluster_geometry_count] if set to true, the query will select, for
-          #     each cluster, the number of geometries in the cluster.
+          #                           each cluster, the number of geometries in the cluster.
           #
           # [:cluster_geometry_count_as] the name to select the
-          #     cluster_geometry_count as, defaults to "cluster_geometry_count".
+          #                              cluster_geometry_count as, defaults 
+          #                              to "cluster_geometry_count".
           #
           # [:cluster_centroid] if set to true, the query will select, for
-          #     each cluster, the cluster centroid. The cluster_centroid returned
-          #     will be a WKT string.
+          #                     each cluster, the cluster centroid. The 
+          #                     cluster_centroid returned will be a WKT string.
           #
-          # [:cluster_centroid_as] the name to select the 
-          #     cluster_centroid as, defaults to "cluster_centroid".
+          # [:cluster_centroid_as] the name to select the cluster_centroid
+          #                        as, defaults to "cluster_centroid".
           #
           # [:cluster_minimum_bounding_circle] if set to true, the query will select,
-          #     for each cluster, the minimum bouding circle. The cluster_minimum_bounding_circle
-          #     will be a WKT string.
+          #                                    for each cluster, the minimum
+          #                                    bouding circle. The
+          #                                    cluster_minimum_bounding_circle
+          #                                    will be a WKT string.
           #
           # [:cluster_minimum_bounding_circle_as] the name to select the
-          #     cluster_minimum_bounding_circle as, defaults to "cluster_minimum_bounding_circle"
+          #                                       cluster_minimum_bounding_circle as,
+          #                                       defaults to "cluster_minimum_bounding_circle"
           #
-          # Note: Using the options hash, you must 'select' at least one attribute,
+          # == Note
+          #
+          # Using the options hash, you must 'select' at least one attribute,
           # else this method will raise an ArgumentError.
           #
 
@@ -129,7 +134,7 @@ module RPClustering
 
             select(
               arel_table.st_astext(
-                arel_attr.st_collect
+                arel_table.st_centroid(arel_attr.st_collect)
               ).as(as)
             )
           end

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

@@ -1,7 +1,7 @@
 module RPClustering
   module RGeo
     module ActiveRecord
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/test/test_clustering.rb

@@ -103,6 +103,32 @@ module RPClustering
 
           end
 
+          def test_cluster_centroid_location_is_where_we_expect_it
+              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
+
+              res = arel_klass.cluster_by_st_snap_to_grid(:latlon, grid_size: 100, cluster_geometry_count: true, cluster_centroid: true)
+              clusters = res.all
+              total_clusters = clusters.count()
+
+              # We should have one cluster.
+              assert_equal(1, total_clusters, "we should have one cluster with such a large grid_size")
+
+              centroid_point = @geographic_factory.parse_wkt(clusters.first["cluster_centroid"])
+
+              assert_equal(0, centroid_point.x, "we expect the centroid to be at 0,0")
+              assert_equal(0, centroid_point.y, "we expect the centroid to be at 0,0")
+          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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Robert Pyke