rclusters 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1746690c3d66ea1c1addace4ced13de169e837f6
-  data.tar.gz: fd7e9628708141a43da2dba11f311e1677169622
+  metadata.gz: 5fa133b5d8a4fdd1dbbdad1260f858c7804fa8dd
+  data.tar.gz: d31afcd9af0e01bc4c103b9b4de654ebe97c22e0
 SHA512:
-  metadata.gz: 3df198e536e2f89e86fa732979ef3e1cf48d3b10d078aa914d0145165245f16fa95e193ca7ae798c442cb72105d95d8f8edf435f5122be7f894a961060584f01
-  data.tar.gz: 92a991153f4d407b78b870ffd232e225418d0e9e4fdece0f8867a382b058118673010b48776964f1575168ac04d1b5cc5deafad420a482b25b307c279e5e9500
+  metadata.gz: c515d4561ce56e4eff6874751b11ae2a47a813840bade276f8506aed8f8f7df3e5c5c5c33793b732297c934c296729748a9b655b222c9fbaccc445df61863ff0
+  data.tar.gz: db559fef721f115822e0d618ce445791432a991ff1f533562b4fb77539e09d23245b4e9f5675d4e3c56a1125e265260901a916346bf1a99149c69daa2d8f609c

data/README.md

@@ -1,9 +1,9 @@
-# Rclusters
+# RClusters
 
-RClusters is a Ruby gem that creates clusters from a points hash using either pixel or surface distance calculations.
+RClusters is a Ruby gem that creates clusters from a geographic points hash using either pixel or surface distance calculations.
 The input is a hash and the output is another hash. Right now, **a max_distance value has to be provided**.
 
-Inspired by [this post](http://www.appelsiini.net/2008/introduction-to-marker-clustering-with-google-maps).
+Based on [this post](http://www.appelsiini.net/2008/introduction-to-marker-clustering-with-google-maps).
 
 ## Installation
 
@@ -29,9 +29,10 @@ require 'rclusters'
 
 opts = {}
 
-rcluster = RClusters::PixelDistance.new(opts)
+rcluster = RClusters::ScreenDistance.new(opts)
 
-data = [{:lat=>-23.607581, :lon=>-46.630046,...},{:lat=>-23.511634, :lon=>-46.71541,...},...]
+data = [{:lat=>-23.607581, :lon=>-46.630046,...},
+        {:lat=>-23.511634, :lon=>-46.71541,...},...]
 
 clusters = rcluster.calculate(data,2000) # 2000px as max_distance
 ```
@@ -44,7 +45,8 @@ opts = {}
 
 rcluster = RClusters::SurfaceDistance.new(opts)
 
-data = [{:lat=>-23.607581, :lon=>-46.630046,...},{:lat=>-23.511634, :lon=>-46.71541,...},...]
+data = [{:lat=>-23.607581, :lon=>-46.630046,...},
+        {:lat=>-23.511634, :lon=>-46.71541,...},...]
 
 clusters = rcluster.calculate(data,200) # 200 mts as max_distance
 ```
@@ -84,15 +86,13 @@ Either in instantiation or in the `calculate` method.
 | Option        | Info       | Values |      
 ---------|-------|------
 | `points`| Points to be clustered |Array of points [hashes]|
-| `max_distance`  | Maximum distance between points in order to cluster them | Integer. Unit `px` using de `PixelDistance` class or the one matching `default_units` option if using `SurfaceDistance`  |
+| `max_distance`  | Maximum distance between points in order to cluster them | Integer. Unit `px` using de `ScreenDistance` class or the one matching `default_units` option if using `SurfaceDistance`  |
 
-#### PixelDistance
+#### ScreenDistance
 
 | Option        | Info       | Values |      
 ---------|-------|------
 | `zoom`  | Distance is processed by a Google Maps type zoom scale | Integer . Default: `12` | 
-| `offset` | Used for translation to projected coordinates | Default: `268435456`|
-| `radius` | Earth radius | Default: `85445659.4471`|
 
 #### SurfaceDistance
 

data/lib/rclusters.rb

@@ -1,4 +1,4 @@
 require_relative 'rclusters/base'
-require_relative 'rclusters/pixel_distance'
+require_relative 'rclusters/screen_distance'
 require_relative 'rclusters/surface_distance'
 require_relative 'rclusters/version'

data/lib/rclusters/screen_distance.rb

@@ -0,0 +1,19 @@
+require 'pixeldistance'
+
+module RClusters
+  class ScreenDistance < Base
+    ZOOM = 12
+
+    def initialize(opts = {})
+      super
+      @zoom = opts[:zoom] || ZOOM
+    end
+
+    private
+
+    def distance(lat1,lon1,lat2,lon2,opts={})
+      zoom = opts[:zoom] || @zoom
+      PixelDistance::from_coords(lat1,lon1,lat2,lon2,zoom)
+    end
+  end
+end

data/lib/rclusters/version.rb

@@ -1,3 +1,3 @@
 module RClusters
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/rclusters.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "geokit", "~> 1.9"
+  spec.add_runtime_dependency "pixeldistance", "~> 0.2.1"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rclusters
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bruno Salerno
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: pixeldistance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +84,7 @@ files:
 - bin/setup
 - lib/rclusters.rb
 - lib/rclusters/base.rb
-- lib/rclusters/pixel_distance.rb
+- lib/rclusters/screen_distance.rb
 - lib/rclusters/surface_distance.rb
 - lib/rclusters/version.rb
 - rclusters.gemspec

data/lib/rclusters/pixel_distance.rb

@@ -1,37 +0,0 @@
-module RClusters
-  class PixelDistance < Base
-    OFFSET = 268435456
-    RADIUS = 85445659.4471
-    ZOOM = 12
-
-    def initialize(opts = {})
-      super
-      @offset = opts[:offset] || OFFSET
-      @radius = opts[:radius] || RADIUS
-      @zoom = opts[:zoom] || ZOOM
-    end
-
-    private
-
-    def distance(lat1,lon1,lat2,lon2,opts={})
-      zoom = opts[:zoom] || @zoom
-
-      x1 = lon_to_x(lon1)
-      y1 = lat_to_y(lat1)
-      x2 = lon_to_x(lon2)
-      y2 = lat_to_y(lat2)
-
-      Math.sqrt((x1-x2)**2 + (y1-y2)**2).to_i >> (21 - zoom)
-    end
-
-    def lon_to_x(lon)
-      (@offset + @radius * lon * Math::PI / 180).to_i
-    end
-
-    def lat_to_y(lat)
-      (@offset + @radius *
-          Math.log((1 + Math.sin(lat * Math::PI / 180)) /
-                       (1 - Math.sin(lat * Math::PI / 180))) / 2)
-    end
-  end
-end