pippa 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTRlZmYwYjQzOTAyZTg2NTZlY2MxYjUwZDFkODcwNDg4YmU4MWVhZQ==
+  data.tar.gz: !binary |-
+    OWI2Zjk5YmQ0MWI0NWI5OGZhOWMwZTQwYTVlMTg5MzkwOTk4NzY3Nw==
+SHA512:
+  metadata.gz: !binary |-
+    NWJiNDhkZGM3M2M5MDY2ODI0NGY1M2MyNDE1Y2UzMmJlMzAyZTY3Njg4MDNh
+    MTdiODY3MzNmNWVjNjIxOTNiZThjNjZiNzI5OWMyOTQ2MzJjMTc3MTAzYmNk
+    OTExYmVmMjljYmFiZGMwNWJjOGIxMzYzZTc3ZTVkYjUyMzYxMGY=
+  data.tar.gz: !binary |-
+    MTk1NmZlODNjNmRlNDZkZTRiNjhlZGI0OWIwM2RlNGIwZGFkYWI4YWNmMTEx
+    MTg3OWM0YWI2OGJmMzE5YjRmMTkwZTg4ZWVhMWNmNGQzNjAzNDM1MjNjNTUy
+    ZTY1YjU1ZmY0ZGQ1ZGYzOTZmNThmYzRiZTJmMDFhMDgxY2U1NjI=

data/lib/pippa.rb

@@ -70,6 +70,12 @@ module Pippa
   class Map
     include Magick
 
+    # Dot shape. Either :square (default) or :circle
+    attr_accessor :dot_kind
+
+    # Boolean saying whether to merge markers to eliminate overlaps during rendering.
+    attr_accessor :merge
+
     # Width of the map image in pixels
     attr_reader :width
 
@@ -112,7 +118,8 @@ module Pippa
 
     # Render if we're making a change and then set a flag indicating
     # whether anti-aliasing will be performed in next render.
-    # Default is false.
+    # Default is false.  We don't handle this in method_missing because
+    # we need to detect boolean equivalence, not equality.
     def anti_alias=(val) # :nodoc:
       val = !!val
       return val if val == @anti_alias
@@ -142,6 +149,8 @@ module Pippa
       @fill_opacity = 0.85
       @stroke_width = 1
       @anti_alias = false
+      @dot_kind = :square
+      @merge = false
       @dots = []
 
       # Look up global info or return if none.
@@ -230,35 +239,41 @@ module Pippa
     end
     alias_method :add_dot_at_zip, :add_at_zip
 
+    TWO_SQRT_1_PI = 2 * Math.sqrt(1 / Math::PI)
+
+    def merged_dots
+      require 'lulu'
+      list = Lulu::MarkerList.new
+      list.set_info(@dot_kind, @point_size)
+      @dots.each {|dot| list.add(*dot) }
+      list.merge
+      list.markers
+    end
+
     # Force rendering of all dots added so far onto the map.
     # Then forget them so they're never rendered again.
     def render
       return if @image.nil? || @dots.empty?
-      @dots.sort! {|a, b| b[2] <=> a[2] } # by area, smallest last
-      gc = new_gc
-      if @anti_alias
-        @dots.each do |x, y, area|
-          side = @point_size * Math.sqrt(area)
-          if side <= 1
-            gc.point(x, y)
-          else
-            h = 0.5 * side
-            x1 = x - h
-            y1 = y - h
-            gc.rectangle(x1, y1, x1 + side, y1 + side)
-          end
-        end
+      if @merge
+        @dots = merged_dots
       else
-        @dots.each do |x, y, area|
-          side = @point_size * Math.sqrt(area)
-          x, y, side = x.round, y.round, side.round
-          if side <= 1
-            gc.point(x, y)
+        @dots.sort! {|a, b| b[2] <=> a[2] } # by area, smallest last
+      end
+      gc = new_gc
+      @dots.each do |x, y, area|
+        diam = @point_size * Math.sqrt(area)
+        diam *= TWO_SQRT_1_PI if @dot_kind == :circle
+        x, y, diam = x.round, y.round, diam.round unless @anti_alias
+        if diam <= 1
+          gc.point(x, y)
+        else
+          if @dot_kind == :circle
+            gc.circle(x, y, x + diam / 2, y)
           else
-            h = side / 2
+            h = diam / 2
             x1 = x - h
             y1 = y - h
-            gc.rectangle(x1, y1, x1 + side, y1 + side)
+            gc.rectangle(x1, y1, x1 + diam, y1 + diam)
           end
         end
       end
@@ -266,7 +281,6 @@ module Pippa
       @dots = []
     end
 
-
     # Return true iff we respond to given method. Takes care of to_???
     # and write_???? converters and writers of graphic formats.
     def respond_to? (sym, include_private = false)
@@ -321,12 +335,15 @@ module Pippa
     end
 
     # Make a map showing all the zip codes in the USA with
-    # dots of random size. Also a couple of additional dots.
-    def self.zipcode_map
+    # dots of fixed area. Also a couple of additional dots.
+    def self.zipcode_map(dot_kind = :circle)
       generator = Random.new(42) # Force same on every run for testing.
       m = Map.new('USA')
+      m.point_size = 1.5
+      m.dot_kind = dot_kind
+      m.merge = true
       Pippa.zips.each_key.each do |zip|
-        m.add_at_zip(zip, generator.rand(4) ** 2)
+        m.add_at_zip(zip, 1)
       end
       m.fill = 'red'
       m.fill_opacity = 1
@@ -336,8 +353,8 @@ module Pippa
     end
 
     # Write the test map produced by +zipcode_map+ as png and jpg files.
-    def self.write_zipcode_maps
-      m = zipcode_map
+    def self.write_zipcode_maps(dot_kind = :circle)
+      m = zipcode_map(dot_kind)
       File.open('spec/data/zipcodes.png', 'wb') { |f| f.write(m.to_png) }
       m.write_jpg('spec/data/zipcodes.jpg')
     end
@@ -354,6 +371,7 @@ module Pippa
       gc.stroke(@stroke)
       gc.fill_opacity(@fill_opacity)
       gc.stroke_width(@stroke_width)
+      gc.stroke_antialias(@anti_alias)
       gc
     end
 

data/lib/pippa/version.rb

@@ -1,5 +1,5 @@
 # Bundler auto-generated mixin for gem version.
 module Pippa
   # Current version of Pippa
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/pippa.gemspec

@@ -25,7 +25,7 @@ and writes files in any supported ImageMagick graphic format.}
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  # Make work on earlier versions, but this is where testing has been performed.
+  # May work on earlier versions, but this is where testing has been performed.
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rspec", "~> 2.14"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: pippa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Gene Ressler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,27 +146,26 @@ homepage: https://github.com/gene-ressler/pippa/wiki
 licenses:
 - GPL-3.0
 - RUC
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Reimplements some parts of the plot-latlon utility from CAIDA (http://www.caida.org).
 test_files:
 - spec/data/zipcodes.jpg