snapa 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e782328109d352dfaddf33fb93c7896200058afd
-  data.tar.gz: f8ece8508d685e8e59782c90bb5a9fa4e0fb98be
+  metadata.gz: 4b1a3768a78b868e91084f933b59e48436ff6c91
+  data.tar.gz: f44e8582e8efb09956c0bd184c52ed19b1917c3b
 SHA512:
-  metadata.gz: a3955e764eb1e524191beac8b5eb1bb89277ec71a3b4cbfa7431bc65b0d154e2bb02861047c4e3f59d217d7a7ce9b7897f1c8d95e83721fa21395923bdb7bfeb
-  data.tar.gz: f3820c4d9e0a72ddd15525b4541c52da8a63dcf1ac47f1f88f0c601e4ff0fd1a9119c0a8599491b11a1245ee29e0e2fc28add8d294c709c60633cd691d38278c
+  metadata.gz: 87d9d709b8338f8a604c06d4ab4bb7b2f600a4d7f3f9ef9974791fafcaa3f918c44d5c97541af51a848ccefe107a798066e8729c5358733dc98ba68d6058989d
+  data.tar.gz: a9b9818d79b03e81dfbbd9e5d6c936281fe47b7a7081308ba136eb74022dd0a1c0fb8b499a3a9cab1a8184684e5b82011754216f8565ef0c589855884a9fc561

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snapa (0.0.2)
+    snapa (0.0.6)
       rack
 
 GEM

data/lib/snapa.rb

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

data/lib/snapa/version.rb

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

data/public/map.html

@@ -32,6 +32,14 @@ function getParameterByName(name) {
     return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
 }
 
+function mergeGeometry(a, b) {
+    if (b.type === 'MultiPolygon') {
+        a.coordinates = a.coordinates.concat(b.coordinates)
+    } else {
+        a.coordinates.push(b.coordinates)
+    }
+}
+
 var countries = (getParameterByName('c') || 'TZ').toUpperCase().split(','),
     width = getParameterByName('w') || 400,
     height = getParameterByName('h') || 230,
@@ -51,25 +59,17 @@ var path = d3.geo.path()
     .projection(projection);
 
 d3.json("countries.json", function(error, world) {
-  var features = topojson.feature(world, world.objects.countries).features;
+  var features = topojson.feature(world, world.objects.countries).features,
+      highlight = {type: 'Feature', geometry: {type: 'MultiPolygon', coordinates: []}};
 
   for (var i = 0; i < features.length; i++) {
     if (countries.indexOf(features[i].id) !== -1) {
-      if (highlight === undefined) {
-        highlight = JSON.parse(JSON.stringify(features[i]));
-      } else {
-        highlight.geometry.coordinates = d3.merge([highlight.geometry.coordinates, features[i].geometry.coordinates])
-      }
+      mergeGeometry(highlight.geometry, features[i].geometry)
     }
   }
 
-  if (highlight === undefined) {
-    projection
-        .scale(50)
-        .translate([width / 2], [height / 2]);
-
-  } else {
-    var centroid = d3.geo.centroid(highlight);
+  var centroid = d3.geo.centroid(highlight);
+  if (!isNaN(centroid[0])) {
     if (rotation[0] === '') {
       rotation = [-centroid[0], 0, 0];
     }
@@ -86,6 +86,12 @@ d3.json("countries.json", function(error, world) {
     projection
         .scale(scale)
         .translate([width / 2, (height / 2) + centroid[1] * 2.77]);
+
+  } else {
+
+    projection
+        .scale(50)
+        .translate([width / 2, height / 2]);
   }
 
   svg.selectAll("path")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapa
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Ben Tillman