terragona 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacfcba592bdf78f9891f8065d8f9e8172fe049c
-  data.tar.gz: 9c8baebb11ad0b66b27635bab3c1c2bd918e4902
+  metadata.gz: 8960cea1763219e0706e07cd4f972d62c57a87ff
+  data.tar.gz: 0377f3156e42d39426927b353aaf68bade666536
 SHA512:
-  metadata.gz: 21c854dbc451bf049243d910ee0276c4214583a1f97695f81bd7ec522058c53fe0577a284c3fe3f0c7740442f795702181d77acd5f7d9690d3adb90f02a54c3d
-  data.tar.gz: b693d2a52d5481d861fe279b158b41b9d31da88cde5a4155053146d743697c96bcc1f2b1cda3c6c1f949c8d67668cea3685bc3be0ad7d76d7627dbcfbe348fc6
+  metadata.gz: a841fbf0d6f63e54492ed030388d85075a5e92199cf44a3443e89c39db13b4d8b076ae478fff06d6e0fcbdfd4681710006e66953794e4127729ca360a69ccbec
+  data.tar.gz: 523101fea46f423189c81b62cabc80ef3fd46ba30a414547542b662c909e283cf733450db0494f3d7845eef549e4aa70b677859b9ced0cd7dc8123231923ad05

data/README.md

@@ -153,6 +153,9 @@ allow_holes             Can the polygons have holes? Default: false.
 max_distance_ratio      Points distant more than this ratio times from the average 
                         distance between points are not considered. Default: 1.6.
 minimal_polygon_points  Minimal number of points to build a polygon.
+force_homogeneity       Uses max_distance_ratio also to compare with the avg distance
+                        between points of all the other polygons of the same family level.
+                        This helps to discard outliers. The result are homogeneous polygons. 
 dont_create_polygons    (boolean) Default: false.
 table                   Table where polygons are saved. This option is overriden 
                         by args of create_polygons_family method.

data/lib/terragona/concave_hull.rb

@@ -1,5 +1,6 @@
 require 'geokit'
 require 'sequel'
+require_relative 'stats'
 
 module Terragona
   class ConcaveHull
@@ -10,6 +11,7 @@ module Terragona
       @allow_holes = options[:allow_holes]
       @allow_holes = false if @allow_holes.nil?
       @max_distance_ratio = options[:max_distance_ratio] || 1.6
+      @force_homogeneity = options[:force_homogeneity]
 
       db_options={
           :database=> options[:db_name],
@@ -21,7 +23,7 @@ module Terragona
       }
 
       @db = Sequel.postgres(db_options)
-
+      @all_means = []
       create_table
     end
 
@@ -45,10 +47,11 @@ module Terragona
     end
     
     private
+
     def create_table
       @db << "DROP TABLE IF EXISTS #{@table};"
       @db << "CREATE TABLE #{@table} (id BIGINT PRIMARY KEY, name TEXT, count INT);"
-      @db << "SELECT AddGeometryColumn('#{@table}', 'geometry',#{@projection}, 'POLYGON', 2);"
+      @db << "SELECT AddGeometryColumn('#{@table}', 'geometry', #{@projection}, 'POLYGON', 2);"
     end
 
     def create_concave_hull(query, tags, count, id)
@@ -60,20 +63,27 @@ module Terragona
       end
     end
 
-    def filter_points_by_distance(points)     
+    def filter_points_by_distance(points)
       random_points = points.count > 200 ? (0..200).map {|e|
         points[rand(points.count)]
       }.uniq : points
-            
+
       distances = points.map {|p0|
         sum = random_points.map {|pf|
-          Geokit::LatLng.new(p0[:y],p0[:x]).distance_to(Geokit::LatLng.new(pf[:y],pf[:x]))
-        }
-        {:y=>p0[:y],:x=>p0[:x],:average=>average(sum)}
+          if p0[:y] != pf[:y] and p0[:x] != pf[:x]
+            Geokit::LatLng.new(p0[:y],p0[:x]).distance_to(Geokit::LatLng.new(pf[:y],pf[:x]))
+          end
+        }.compact
+        {:y=>p0[:y],:x=>p0[:x],:mean=> sum.mean}
       }
-      average_distance=average(distances.map{|d| d[:average]})
+
+      mean = distances.map{|d| d[:mean]}.compact.mean
+      @all_means.push mean
+      mean_of_means =  @force_homogeneity ? @all_means.compact.mean : nil
+
       distances.map {|d|
-        d if d[:average] <= average_distance * @max_distance_ratio
+        next unless d[:mean]
+        d if (d[:mean]/[mean,mean_of_means].compact.min) < @max_distance_ratio
       }.compact
     end
 
@@ -83,10 +93,6 @@ module Terragona
       }.join(',')
     end
 
-    def average(arr)
-      arr.inject{ |sum, el| sum + el }.to_f / arr.size
-    end
-
     def clean_str(str)
       str.to_s.gsub("'",' ')
     end

data/lib/terragona/stats.rb

@@ -0,0 +1,25 @@
+# Taken from:
+# http://stackoverflow.com/questions/7749568/how-can-i-do-standard-deviation-in-ruby
+
+module Enumerable
+
+  def sum
+    return self.inject(0){|accum, i| accum + i }
+  end
+
+  def mean
+    return if self.empty?
+    return self.sum / self.length.to_f
+  end
+
+  def sample_variance
+    m = self.mean
+    sum = self.inject(0){|accum, i| accum + (i - m) ** 2 }
+    return sum / (self.length - 1).to_f
+  end
+
+  def standard_deviation
+    return Math.sqrt(self.sample_variance)
+  end
+
+end

data/lib/terragona/version.rb

@@ -1,3 +1,3 @@
 module Terragona
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/terragona.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Terragona::VERSION
   spec.authors       = ["Bruno Salerno"]
   spec.email         = ["br.salerno@gmail.com"]
-  spec.description   = %q{Create polygons for geonames places}
-  spec.summary       = %q{Use API or dumps as input, draw polygons, and store them in a Postgres/Postgis db}
+  spec.description   = %q{Create polygons from geonames places and other sources}
+  spec.summary       = %q{Use API, Dumps or a CSV file as input, draw polygons, and store them in a Postgres/Postgis db}
   spec.homepage      = "https://github.com/BrunoSalerno/terragona"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terragona
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bruno Salerno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Create polygons for geonames places
+description: Create polygons from geonames places and other sources
 email:
 - br.salerno@gmail.com
 executables: []
@@ -153,6 +153,7 @@ files:
 - lib/terragona/concave_hull.rb
 - lib/terragona/generic.rb
 - lib/terragona/geonames.rb
+- lib/terragona/stats.rb
 - lib/terragona/version.rb
 - terragona.gemspec
 homepage: https://github.com/BrunoSalerno/terragona
@@ -178,6 +179,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Use API or dumps as input, draw polygons, and store them in a Postgres/Postgis
-  db
+summary: Use API, Dumps or a CSV file as input, draw polygons, and store them in a
+  Postgres/Postgis db
 test_files: []