Test new municipalities projected and fix small error with the height…

… calc
newsappsio · Jan 31, 2017 · 48b0daf · 48b0daf
1 parent ae7cb25
commit 48b0daf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/spam.js b/spam.js
@@ -251,8 +251,10 @@
             settings.height = settings.height || Math.ceil(dy * settings.width / dx)
             settings.projection.scale(0.9 * (settings.width / dx))
                 .translate([settings.width / 2, settings.height / 2])
+        } else if (!settings.projected) {
+            settings.height = Math.ceil(b[1][1] * settings.projectedScale)
         } else if (!settings.height) {
-            settings.height = Math.ceil(dy / 0.9) * settings.projectedScale
+            settings.height = Math.ceil(dy / 0.9)
         }
         d3.select(settings.parameters).attr("height", settings.height)
 

diff --git a/test/index.html b/test/index.html
@@ -31,7 +31,7 @@
         }
         */
             // TODO queue.js
-            d3.json("bcn.json", function(error, d) {
+            d3.json("municipalities.json", function(error, d) {
                 d3.json("roads.json", function(error, roads) {
                     topojson.presimplify(d)
                     topojson.presimplify(roads)
@@ -43,7 +43,7 @@
                         element: ".js-map",
                         projection: null, // TODO how to automagically detect this?
                         data: [{
-                            features: topojson.feature(d, d.objects["seccio-censal"]),
+                            features: topojson.feature(d, d.objects["municipalities"]),
                             static: {
                                 prepaint: function(parameters) {
                                     console.log("PRE")

diff --git a/test/municipalities.json b/test/municipalities.json
diff --git a/test/provinces.json b/test/provinces.json