clumpy 0.2.2 → 0.2.3

data/lib/clumpy/builder.rb

@@ -30,7 +30,7 @@ module Clumpy
       if parent_cluster
         parent_cluster.points << point
       else
-        clusters << cluster_class.new(point, cluster_distance, cluster_options)
+        clusters << cluster_class.new(point, cluster_options)
       end
     end
 
@@ -42,14 +42,20 @@ module Clumpy
       clusters.find { |c| c.contains?(point) }
     end
 
-    def cluster_distance
+    def cluster_latitude_distance
       latitude_distance / DISTANCE_MODIFIER
     end
 
+    def cluster_longitude_distance
+      longitude_distance / (DISTANCE_MODIFIER * 2)
+    end
+
     def cluster_options
       {
         values_threshold: options[:values_threshold],
-        include_values: options[:include_values]
+        include_values: options[:include_values],
+        latitude_distance: cluster_latitude_distance,
+        longitude_distance: cluster_longitude_distance
       }
     end
 
@@ -64,5 +70,13 @@ module Clumpy
         MAX_LATITUDE_DISTANCE
       end
     end
+
+    def longitude_distance
+      if options[:nelng] && options[:swlng]
+        (options[:nelng] - options[:swlng]).abs
+      else
+        MAX_LONGITUDE_DISTANCE
+      end
+    end
   end
 end

data/lib/clumpy/cluster_behavior.rb

@@ -2,14 +2,17 @@ module Clumpy
   module ClusterBehavior
     attr_accessor :latitude, :longitude, :points, :bounds
 
-    def initialize(point, distance, options = {})
+    def initialize(point, options = {})
       @latitude  = point.latitude
       @longitude = point.longitude
       @points    = [point]
       @options   = options
+
+      lat_dist   = options[:latitude_distance]  || 10
+      lng_dist   = options[:longitude_distance] || 10
       @bounds    = OpenStruct.new(
-        latitude: (latitude - distance)..(latitude + distance),
-        longitude: (longitude - distance)..(longitude + distance)
+        latitude: (latitude - lat_dist)..(latitude + lat_dist),
+        longitude: (longitude - lng_dist)..(longitude + lng_dist)
       )
     end
 
@@ -51,7 +54,7 @@ module Clumpy
         },
         southwest: {
           latitude: bounds.latitude.min,
-          longitude: bounds.longitude.max
+          longitude: bounds.longitude.min
         }
       }
     end

data/lib/clumpy/version.rb

@@ -1,3 +1,3 @@
 module Clumpy
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/builder_spec.rb

@@ -25,7 +25,7 @@ describe Clumpy::Builder do
 
   it "passes the values threshold through to the cluster" do
     builder = Clumpy::Builder.new([point1], values_threshold: 100, include_values: true)
-    builder.cluster_options.should eq({ values_threshold: 100, include_values: true })
+    builder.cluster_options.should eq({ values_threshold: 100, include_values: true, latitude_distance: 34.01023, longitude_distance: 36 })
     clusters = builder.cluster
     clusters.first.instance_variable_get(:@options).should eq builder.cluster_options
   end
@@ -44,7 +44,7 @@ describe Clumpy::Builder do
     end
 
     it "appends markers to a existing cluster if they match" do
-      builder.clusters << Clumpy::Cluster.new(point1, builder.cluster_distance)
+      builder.clusters << Clumpy::Cluster.new(point1, builder.cluster_options)
       builder.clusters.size.should eq 1
       builder.clusters.first.points.size.should eq 1
       builder.add_to_cluster(point2)

data/spec/cluster_behavior_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Clumpy::ClusterBehavior do
   let(:point)       { OpenStruct.new(latitude: 15, longitude: 20) }
   let(:other_point) { OpenStruct.new(latitude: 40, longitude: 40) }
-  let(:cluster)     { Clumpy::Cluster.new(point, 10) }
+  let(:cluster)     { Clumpy::Cluster.new(point, latitude_distance: 10, longitude_distance: 10) }
 
   it "has a nicish to_s representation" do
     cluster.to_s.should include '# size: 1'
@@ -27,23 +27,23 @@ describe Clumpy::ClusterBehavior do
 
   context "#value_list" do
     it "returns an empty array if threshold isn't reached" do
-      cluster = Clumpy::Cluster.new(point, 10, values_threshold: 1)
+      cluster = Clumpy::Cluster.new(point, values_threshold: 1)
       cluster.points << other_point
       cluster.value_list.should eq []
     end
 
     it "returns an array of json points if under threshold" do
-      cluster = Clumpy::Cluster.new(point, 10, values_threshold: 1)
+      cluster = Clumpy::Cluster.new(point, values_threshold: 1)
       cluster.value_list.should eq [point]
     end
 
     it "returns a list of values if include_values is true" do
-      cluster = Clumpy::Cluster.new(point, 10, values_threshold: 0, include_values: true)
+      cluster = Clumpy::Cluster.new(point, values_threshold: 0, include_values: true)
       cluster.value_list.should eq [point]
     end
 
     it "returns a empty list if include_values is false" do
-      cluster = Clumpy::Cluster.new(point, 10, values_threshold: 10, include_values: false)
+      cluster = Clumpy::Cluster.new(point, values_threshold: 10, include_values: false)
       cluster.value_list.should eq []
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clumpy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3119910671482455644
+      hash: -2427505316629763450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3119910671482455644
+      hash: -2427505316629763450
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25