clumpy 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9b3590d403a8d17022234a9c010d77afb868ba
-  data.tar.gz: 2c6c5d30ecaab4b5e7b9860da3503a26cd7e4376
+  metadata.gz: ba05344e6017c1ab80f749529bb6b1c3264b1e9f
+  data.tar.gz: f56e44bb1c4a19e0beb59afb8ab74476e0e7bec9
 SHA512:
-  metadata.gz: aa62267024945a10872876e7051bc1c7d5323c7fcb0434cb05255366e59e8ba639e5a96845c090106475f90bd576c584728c5641c5d9a6cc479ff15cd13b6d51
-  data.tar.gz: 86aab5b639351c14244a2ec557e5f387efabbbefeff727131c615035e6290284ce9e9bcaf93c8cc9a7f1b6475807ff37bbcb4b0b1bdc317b29db19209d977de1
+  metadata.gz: bf0193a876462ba874e89549716e8b075fa76b0054041ce6d74b943790d54885d47a2de028d585ed7bc400f071269065acf379dfceeb49bc72fbfc1f8d5f160f
+  data.tar.gz: cc23d1a5f7cb5455d2d86e3f6649b3b99814858ae81976bce2f0d514b0fe5f182de82fa0f838474ea9d8c464076d0a9fd63f45605ef29e17b6254e0dbefa234b

data/lib/clumpy/builder.rb

@@ -8,7 +8,7 @@ module Clumpy
     def initialize(points, options = {})
       @points            = points
       @options           = options || {}
-      @distance_modifier = options.fetch(:distance_modifier) { 5 }
+      @distance_modifier = options.fetch(:distance_modifier) { 16 }
       @clusters          = []
     end
 
@@ -42,20 +42,15 @@ module Clumpy
       clusters.find { |c| c.contains?(point) }
     end
 
-    def cluster_latitude_distance
-      latitude_distance / @distance_modifier
-    end
-
-    def cluster_longitude_distance
-      longitude_distance / (@distance_modifier * 2)
+    def cluster_side_length
+      @cluster_size ||= (latitude_distance + longitude_distance) / @distance_modifier
     end
 
     def cluster_options
       {
         values_threshold: options[:values_threshold],
         include_values: options[:include_values],
-        latitude_distance: cluster_latitude_distance,
-        longitude_distance: cluster_longitude_distance
+        side_length: cluster_side_length
       }
     end
 

data/lib/clumpy/cluster_behavior.rb

@@ -8,11 +8,10 @@ module Clumpy
       @points    = [point]
       @options   = options
 
-      lat_dist   = options[:latitude_distance]  || 10
-      lng_dist   = options[:longitude_distance] || 10
+      side_length = options.fetch(:side_length) { 10 }
       @bounds    = OpenStruct.new(
-        latitude: (latitude - lat_dist)..(latitude + lat_dist),
-        longitude: (longitude - lng_dist)..(longitude + lng_dist)
+        latitude: (latitude - side_length)..(latitude + side_length),
+        longitude: (longitude - side_length)..(longitude + side_length)
       )
     end
 

data/lib/clumpy/version.rb

@@ -1,3 +1,3 @@
 module Clumpy
-  VERSION = "0.2.4"
+  VERSION = '0.2.5'
 end

data/spec/builder_spec.rb

@@ -35,7 +35,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, latitude_distance: 34.01023, longitude_distance: 36 })
+    builder.cluster_options.should eq({ values_threshold: 100, include_values: true, side_length: 33.128196875 })
     clusters = builder.cluster
     clusters.first.instance_variable_get(:@options).should eq builder.cluster_options
   end

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, latitude_distance: 10, longitude_distance: 10) }
+  let(:cluster)     { Clumpy::Cluster.new(point, side_length: 10) }
 
   it "has a nicish to_s representation" do
     cluster.to_s.should include '# size: 1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clumpy
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Johannes Opper