snapa 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a443e13cbefe386b96caeec8c81e195de7a37fec
-  data.tar.gz: 5f0b8d512eaa7b8673fe7063af3d6a59b248ea1d
+  metadata.gz: e782328109d352dfaddf33fb93c7896200058afd
+  data.tar.gz: f8ece8508d685e8e59782c90bb5a9fa4e0fb98be
 SHA512:
-  metadata.gz: 5c383eac3a661731254b0328fa1c51fe1648ef56f71f1ffb8965896f572a190c1afc00ae310031f164e1ce74a0559ec84e846d81d55296184e50a40183f5da6e
-  data.tar.gz: 5ed9aed27c694ce74da3e59d0b1c8755a13f4b37061cbe2bd98dcb7d4ff6a4f5d36bd378443b33ab44b7c13ba5c76462ed251edd9095e9c812279154c910773d
+  metadata.gz: a3955e764eb1e524191beac8b5eb1bb89277ec71a3b4cbfa7431bc65b0d154e2bb02861047c4e3f59d217d7a7ce9b7897f1c8d95e83721fa21395923bdb7bfeb
+  data.tar.gz: f3820c4d9e0a72ddd15525b4541c52da8a63dcf1ac47f1f88f0c601e4ff0fd1a9119c0a8599491b11a1245ee29e0e2fc28add8d294c709c60633cd691d38278c

data/lib/snapa.rb

@@ -1,5 +1,6 @@
 require 'snapa/version'
 require 'rack/file'
+require 'digest'
 
 module Snapa
   class File < Rack::File
@@ -21,7 +22,7 @@ module Snapa
     end
 
     def path(request)
-      @path ||= F.join('/tmp/snapa', request.query_string + '.png')
+      @path ||= F.join('/tmp/snapa', ::Digest.hexencode(request.query_string) + '.png')
     end
 
     def _call(env)

data/lib/snapa/version.rb

@@ -1,3 +1,3 @@
 module Snapa
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/public/map.html

@@ -44,9 +44,8 @@ var svg = d3.select("body").append("svg")
     .attr("width", width)
     .attr("height", height);
 
-var projection = d3.geo.mercator()
-    .scale(1)
-    .translate([width / 2, height / 2]);
+window.projection = d3.geo.mercator()
+    .scale(1);
 
 var path = d3.geo.path()
     .projection(projection);
@@ -64,22 +63,30 @@ d3.json("countries.json", function(error, world) {
     }
   }
 
-  if (rotation[0] === '') {
+  if (highlight === undefined) {
+    projection
+        .scale(50)
+        .translate([width / 2], [height / 2]);
+
+  } else {
     var centroid = d3.geo.centroid(highlight);
-    rotation = [-centroid[0], -centroid[1], 0];
-  }
+    if (rotation[0] === '') {
+      rotation = [-centroid[0], 0, 0];
+    }
 
-  projection
-      .rotate(rotation);
+    projection
+        .rotate(rotation);
 
-  if (scale === '') {
     var bounds = path.bounds(highlight);
-    scale = percent / Math.max((bounds[1][0] - bounds[0][0]) / width, (bounds[1][1] - bounds[0][1]) / height);
-    scale = Math.min(scale, 1000);
-  }
+    if (scale === '') {
+      scale = percent / Math.max((bounds[1][0] - bounds[0][0]) / width, (bounds[1][1] - bounds[0][1]) / height);
+      scale = Math.min(scale, 300);
+    }
 
-  projection
-      .scale(scale);
+    projection
+        .scale(scale)
+        .translate([width / 2, (height / 2) + centroid[1] * 2.77]);
+  }
 
   svg.selectAll("path")
       .data(features)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapa
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Tillman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack