Merge pull request #17 from cloudspace/development

[#63313086] Make minor crossfiltering improvements

Author: Nicholas Thomson

app/scripts/controllers/crunchinator.js

@@ -21,9 +21,6 @@ angular.module('crunchinatorApp.controllers')
     $scope.filteredCompaniesList = [];
     $scope.filteredCategoriesList = [];
     $scope.filteredInvestorsList = [];
-    $scope.mapboundary = 'Hello';
-    $scope.$watch('mapBoundary', function(){
-    });
 
     $scope.geoJsonData = _.memoize(function(filteredCompanies) {
         var geojson = {
@@ -72,9 +69,15 @@ angular.module('crunchinatorApp.controllers')
         $scope.selectedCompanies = [];
         $scope.selectedCategories = [];
         $scope.selectedInvestors = [];
+
+        $scope.filteredCompanies();
+        $scope.filteredCategories();
+        $scope.filteredInvestors();
     };
-    $scope.resetSelection();
 
+    var cat_ids = [];
+    var company_ids = [];
+    var inv_ids = [];
     $scope.toggleSelected = function(selectedItems, item) {
         $scope.selectedItem = item;
         var ind = selectedItems.indexOf(item);
@@ -86,78 +89,53 @@ angular.module('crunchinatorApp.controllers')
             selectedItems.push(item);
         }
 
+        cat_ids = _.pluck($scope.selectedCategories, 'id');
+        company_ids = _.pluck($scope.selectedCompanies, 'id');
+        inv_ids = _.pluck($scope.selectedInvestors, 'id');
+
+        $scope.filteredCompanies();
+        $scope.filteredCategories();
+        $scope.filteredInvestors();
+
         $scope.selectedCompanies = _.intersection($scope.selectedCompanies, $scope.filteredCompaniesList);
         $scope.selectedCategories = _.intersection($scope.selectedCategories, $scope.filteredCategoriesList);
         $scope.selectedInvestors = _.intersection($scope.selectedInvestors, $scope.filteredInvestorsList);
     };
 
     var crossCompanies;
-    var companiesByCategory;
-    var companiesByInvestors;
+    var companiesDimension;
     var companiesById;
     $scope.filteredCompanies = function() {
-        if(crossCompanies && companiesByCategory) {
-            var cat_ids = _.pluck($scope.selectedCategories, 'id');
-            var inv_ids = _.pluck($scope.selectedInvestors, 'id');
-            companiesByCategory.filterAll(); //clear filter
-            companiesByInvestors.filterAll(); //clear filter
-            if(cat_ids.length > 0) {
-                companiesByCategory.filter(function(c) { return cat_ids.indexOf(c) > -1; });
-            }
-            if(inv_ids.length > 0) {
-                companiesByInvestors.filter(function(invs) { return _.intersection(invs, inv_ids).length > 0;});
-            }
+        if(crossCompanies) {
+            companiesDimension.filterAll(); //clear filter
+            companiesDimension.filter(function(c){ return ( cat_ids.length === 0 || cat_ids.indexOf(c.category_id) > -1) && (inv_ids.length === 0 || _.intersection(c.investor_ids, inv_ids).length > 0); });
 
-            $scope.filteredCompaniesList = companiesById.bottom(Infinity);
+            $scope.filteredCompaniesList = companiesById.bottom(100);
         }
-
-        return $scope.filteredCompaniesList;
     };
 
     var crossInvestors;
-    var investorsByCategories;
-    var investorsByCompanies;
+    var investorsDimension;
     var investorsById;
     $scope.filteredInvestors = function() {
         if(crossInvestors) {
-            var cat_ids = _.pluck($scope.selectedCategories, 'id');
-            var company_ids = _.pluck($scope.selectedCompanies, 'id');
-
-            investorsByCategories.filterAll();
-            investorsByCompanies.filterAll();
+            investorsDimension.filterAll();
+            investorsDimension.filter(function(i){ return (cat_ids.length === 0 || _.intersection(i.invested_category_ids, cat_ids).length > 0) && (company_ids.length === 0 || _.intersection(i.invested_company_ids, company_ids).length > 0); });
 
-            if(cat_ids.length > 0) {
-                investorsByCategories.filter(function(d){ return _.intersection(d, cat_ids).length > 0;});
-            }
-            if(company_ids.length > 0) {
-                investorsByCompanies.filter(function(d){ return _.intersection(d, company_ids).length > 0;});
-            }
-            $scope.filteredInvestorsList = investorsById.bottom(Infinity);
+            $scope.filteredInvestorsList = investorsById.bottom(100);
         }
-        return $scope.filteredInvestorsList;
     };
 
     var crossCategories;
-    var categoriesByInvestors;
-    var categoriesByCompanies;
+    var categoriesDimension;
     var categoriesById;
     $scope.filteredCategories = function() {
         if(crossCategories) {
-            var company_ids = _.pluck($scope.selectedCompanies, 'id');
-            var inv_ids = _.pluck($scope.selectedInvestors, 'id');
+            categoriesDimension.filterAll();
+            categoriesDimension.filter(function(c){ return (company_ids.length === 0 || _.intersection(company_ids, c.company_ids).length > 0) && (inv_ids.length === 0 || _.intersection(inv_ids, c.investor_ids).length > 0); });
 
-            categoriesByInvestors.filterAll();
-            categoriesByCompanies.filterAll();
-
-            if(company_ids.length > 0) {
-                categoriesByCompanies.filter(function(d){ return _.intersection(d, company_ids).length > 0;});
-            }
-            if(inv_ids.length > 0) {
-                categoriesByInvestors.filter(function(invs) { return _.intersection(invs, inv_ids).length > 0;});
-            }
-            $scope.filteredCategoriesList = categoriesById.bottom(Infinity);
+            $scope.filteredCategoriesList = categoriesById.bottom(100);
         }
-        return $scope.filteredCategoriesList;
     };
 
     $scope.companies = CompanyModel;
@@ -166,20 +144,23 @@ angular.module('crunchinatorApp.controllers')
 
     CompanyModel.fetch().then(function(){
         crossCompanies = crossfilter(CompanyModel.all());
-        companiesByCategory = crossCompanies.dimension(function(company) { return company.category_id; });
-        companiesByInvestors = crossCompanies.dimension(function(company) { return company.investor_ids; });
+        companiesDimension = crossCompanies.dimension(function(company) { return company; });
         companiesById = crossCompanies.dimension(function(company) {return company.id;});
+        $scope.filteredCompanies();
     });
     InvestorModel.fetch().then(function(){
         crossInvestors = crossfilter(InvestorModel.all());
-        investorsByCategories = crossInvestors.dimension(function(investor) { return investor.invested_category_ids; });
-        investorsByCompanies = crossInvestors.dimension(function(investor) { return investor.invested_company_ids; });
+        investorsDimension = crossInvestors.dimension(function(investor) { return investor; });
         investorsById = crossInvestors.dimension(function(investor) {return investor.id;});
+        $scope.filteredInvestors();
     });
     CategoryModel.fetch().then(function(){
         crossCategories = crossfilter(CategoryModel.all());
-        categoriesByInvestors = crossCategories.dimension(function(category) { return category.investor_ids; });
-        categoriesByCompanies = crossCategories.dimension(function(category) { return category.company_ids; });
+        categoriesDimension = crossCategories.dimension(function(category) { return category; });
         categoriesById = crossCategories.dimension(function(category) {return category.id;});
+        $scope.filteredCategories();
     });
+
+    $scope.resetSelection();
+
 });

app/scripts/directives/leafCluster.js

@@ -23,10 +23,6 @@ angular.module('crunchinatorApp.directives').directive('leafCluster', function()
                 return scope.render(newval);
             }, true);
 
-            map.on('zoomend', function(){
-                scope.mapBoundary = map.getBounds();
-            });
-
 
             scope.$watch(function() {
                 return angular.element(window)[0].innerWidth;

app/views/main.tpl.html

@@ -6,7 +6,7 @@ <h4 class="pull-left">Environment: {{environment}}</h4>
     <div class="row clear-both">
         <div class='col-sm-4 spacing-med'>
             <h3 class="pull-left">Companies</h3>
-            <p class="pull-right count">Count: {{f = filteredCompanies(); f.length}}</p>
+            <p class="pull-right count">Count: {{filteredCompaniesList.length}}</p>
             <div id="companies" class="textlist clear-both">
                 <div class="form-group">
                     <div class="controls">
@@ -18,7 +18,7 @@ <h3 class="pull-left">Companies</h3>
                 </div>
                 <div class="dataset">
                     <table class="table">
-                      <tbody><tr ng-class="{success: selectedCompanies.indexOf(company) &gt; -1}" ng-repeat="company in filteredCompanies()">
+                      <tbody><tr ng-class="{success: selectedCompanies.indexOf(company) &gt; -1}" ng-repeat="company in filteredCompaniesList">
                         <td ng-click="toggleSelected(selectedCompanies, company)">{{company.name}}</td>
                         </tr>
                     </tbody></table>
@@ -28,7 +28,7 @@ <h3 class="pull-left">Companies</h3>
 
         <div class='col-sm-4 spacing-med'>
             <h3 class="pull-left">Categories</h3>
-            <p class="pull-right count">Count: {{f = filteredCategories(); f.length}}</p>
+            <p class="pull-right count">Count: {{filteredCategoriesList.length}}</p>
             <div id="categories" class="textlist clear-both">
                 <div class="form-group">
                     <div class="controls">
@@ -40,7 +40,7 @@ <h3 class="pull-left">Categories</h3>
                 </div>
                 <div class="dataset">
                     <table class="table">
-                      <tbody><tr ng-class="{success: selectedCategories.indexOf(category) &gt; -1}" ng-repeat="category in filteredCategories()">
+                      <tbody><tr ng-class="{success: selectedCategories.indexOf(category) &gt; -1}" ng-repeat="category in filteredCategoriesList">
                         <td ng-click="toggleSelected(selectedCategories, category)">{{category.name}}</td>
                         </tr>
                     </tbody></table>
@@ -50,7 +50,7 @@ <h3 class="pull-left">Categories</h3>
 
         <div class='col-sm-4 spacing-med'>
             <h3 class="pull-left">Investors</h3>
-            <p class="pull-right count">Count: {{f = filteredInvestors(); f.length}}</p>
+            <p class="pull-right count">Count: {{filteredInvestorsList.length}}</p>
             <div id="investors" class="textlist clear-both">
                 <div class="form-group">
                     <div class="controls">
@@ -62,7 +62,7 @@ <h3 class="pull-left">Investors</h3>
                 </div>
                 <div class="dataset">
                     <table class="table">
-                      <tbody><tr ng-class="{success: selectedInvestors.indexOf(investor) &gt; -1}" ng-repeat="investor in filteredInvestors()">
+                      <tbody><tr ng-class="{success: selectedInvestors.indexOf(investor) &gt; -1}" ng-repeat="investor in filteredInvestorsList">
                         <td ng-click="toggleSelected(selectedInvestors, investor)">{{investor.name}}</td>
                         </tr>
                     </tbody></table>