Fixed back button loading

SimonbJohnson · Mar 31, 2016 · 830bf78 · 830bf78
1 parent 60bc0db
commit 830bf78
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/css/site.css b/css/site.css
@@ -10,10 +10,6 @@
     height:775px;
 }
 
-#wfp-viz-ind #wfp-viz-gridlayer {
-    display:none;
-}
-
 #wfp-viz-ind #wfp-viz-returnmap {
     background-color: #2A93FC;
     border-radius: 6px;

diff --git a/index.html b/index.html
@@ -19,14 +19,7 @@
     </head>
     <body>
         <div id="wfp-viz-ind" class="container">
-            <div id="wfp-viz-maplayer" class="row">
-                <!-- <div class="col-md-12 hdx-wfp-viz-header">
-                    <p>Click a country to explore WFP indicators for those countries</p>
-                </div>  -->               
-                <div id="wfp-viz-map" class="col-md-12"></div>
-            </div>
             <div id="wfp-viz-gridlayer" class="row">
-
                 <div class="row">
                     <div class="col-md-12"><h2>Yemen - mVAM Food Security Monitoring</h2></div>
                 </div>

diff --git a/js/indicators.js b/js/indicators.js
@@ -260,7 +260,6 @@ config.columns = [
 function initCountry(ADM0_CODE){
     $('#wfp-viz-maplayer').slideUp(function(){
         $('#wfp-viz-gridmap').html('<p id="wfp-viz-loading">Loading...</i>')
-        $('#wfp-viz-gridlayer').show();
     });
         //if(Number(feature.properties.ADM0_CODE)*1==Number(c.code)*1){
         //https://ds-ec2.scraperwiki.com/gfudhzb/r8kisejjlofexpc/sql?q=SELECT CASE WHEN StDev IS NULL OR (StDev IS NOT NULL AND Variable LIKE '%=%' AND (ifnull(CnfIntvHi,1)-ifnull(CnfIntvLo,0))/Mean<=0.12) OR (StDev IS NOT NULL AND Variable NOT LIKE '%=%' AND (ifnull(CnfIntvHi,Pctl95)-ifnull(CnfIntvLo,0))/Mean<=0.12) THEN Mean ELSE NULL END as MEAN, * FROM pblStatsSum4Maps WHERE ADM0_CODE='269' AND ADM1_CODE IS NOT NULL AND ADM2_CODE IS NULL AND ADM3_CODE IS NULL ORDER BY LENGTH(SvyYear), SvyYear,LENGTH(SvyMonthNum),SvyMonthNum
@@ -401,6 +400,7 @@ function initGrid(data,dates,geom,countryID){
     var grid = {}; 
 
     categories.forEach(function(cat){
+        console.log($('#wfp-viz-grid-'+cat.toLowerCase()).width());
         var columns = [];
         config.columns.forEach(function(c){
             if(c['group']==cat){
@@ -531,4 +531,6 @@ updateData = function(data){
 
 
 var bottommap;
-initCountry(269);
+$(document).ready(function(){
+    initCountry(269)
+});