From 3076443ce1cd0d5abf2fe820540d9af383468e59 Mon Sep 17 00:00:00 2001
From: btskinner <btskinner@virginia.edu>
Date: Wed, 13 Dec 2017 14:00:09 -0500
Subject: [PATCH] college toggle button still in progress

---
 js/index.map.js | 84 +++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 31 deletions(-)

diff --git a/js/index.map.js b/js/index.map.js
index 740f2be..b501a93 100755
--- a/js/index.map.js
+++ b/js/index.map.js
@@ -94,6 +94,9 @@ function popupText(hs, schname, sect, schenroltot, schfrpl, schcsr,
 // init structure to hold visible points
 var visible = [];
 
+// init variable to hold input (filtering) text
+var inputText;
+
 // init message variable
 var messages = ['Zoom or drag the map to populate results',
 		'Check spelling or drag the map to re-populate results'];
@@ -111,6 +114,10 @@ filterEl.parentNode.style.display = 'none';
 var filterSwitch = false;
 var noFilterMatch = false;
 
+// GENERAL EVENTS ----------------------------------------------------
+
+var keyUpEvent = new Event('keyup');
+
 // GENERAL FUNCTIONS -------------------------------------------------
 
 // adds .remove() function if using old browser 
@@ -306,6 +313,35 @@ function addToVisible() {
     }
 }
 
+// check input text
+function checkInput(text) {
+    return (text === '' ? false : true);
+}
+
+
+// function to filter schools with text input
+function textFilter(e) {
+    
+    filterSwitch = true;
+    
+    inputText = normalize(e.target.value);
+    
+    // remove visible features that don't match the input value.
+    var filtered = visible.filter(function(feature) {
+        var name = normalize(s[feature.id].a);
+        return name.indexOf(inputText) > -1;
+    });
+    
+    // populate the sidebar with filtered results
+    renderListings(filtered);
+    
+    // set the filter to populate features into the layer
+    map.setFilter('schools', ['in', '$id'].concat(filtered.map(function(feature) {
+        return feature.id;
+    })));
+    popup.remove();  
+}
+
 // load data into memory
 var data = (function() {
     var data = null;
@@ -421,28 +457,7 @@ map.on('load', function () {
     // CONTROLS ------------------------------------------------------
 
     // filter box
-    filterEl.addEventListener('keyup', function(e) {
-
-	filterSwitch = true;
-	
-        var value = normalize(e.target.value);
-	
-        // remove visible features that don't match the input value.
-        var filtered = visible.filter(function(feature) {
-            var name = normalize(s[feature.id].a);
-            return name.indexOf(value) > -1;
-        });
-	
-        // populate the sidebar with filtered results
-        renderListings(filtered);
-	
-        // set the filter to populate features into the layer
-        map.setFilter('schools', ['in', '$id'].concat(filtered.map(function(feature) {
-            return feature.id;
-        })));
-	popup.remove();
-	
-    });
+    filterEl.addEventListener('keyup', textFilter);
 
     // add geocoder
     map.addControl(new MapboxGeocoder({
@@ -474,20 +489,27 @@ map.on('load', function () {
 	if (this.className === '') {
 	    this.className = 'active';
 	    this.textContent = 'hide colleges';
-	    map.setFilter('schools', ['has', '$id']);
-	    // addToVisible();
+	    if (checkInput(inputText)) {
+		filterEl.dispatchEvent(keyUpEvent);
+	    } else {
+		map.setFilter('schools', ['has', '$id']);
+	    	addToVisible();
+	    }
 	} else {
 	    this.className = '';
 	    this.textContent = 'show colleges';
 	    var filtered = visible.filter(function(feature) {
-		var name = normalize(s[feature.id].a);
-		var coll = s[feature.id].m;
-		return name.indexOf(coll) !== '1';
+		return s[feature.id].m !== 1;
             });
-            renderListings(filtered);
-	    map.setFilter('schools', ['in', '$id'].concat(filtered.map(function(feature) {
-		return feature.id;
-            })));
+	    renderListings(filtered);
+	    map.setFilter('schools', ['in', '$id']
+	    		  .concat(filtered.map(function(feature) {
+	    		      return feature.id;
+	    		  }))
+	    		 );
+	    if (checkInput(inputText)) {
+		filterEl.dispatchEvent(keyUpEvent);
+	    }
 	}
     };