From a314ce445a615deb0072e18949e284b6929e84d2 Mon Sep 17 00:00:00 2001
From: rladines <rladines@eki-consulting.com>
Date: Thu, 8 Sep 2016 13:29:51 -0500
Subject: [PATCH] Applied changes for Milestone 1.2.0

Applied changes for Milestone 1.2.0
---
 lib/jquery-1.11.2/opengrid-query-builder.js | 49 ++++++++++----
 src/css/ogrid-theme-blue.css                | 71 +++++++++++++++++++--
 src/css/ogrid.css                           | 45 +++++++++++++
 src/index.html                              | 23 ++++---
 src/js/custom/Config.js                     | 64 +++++++++++++++++--
 src/js/custom/qsearch/FlexData.js           | 34 +++++++++-
 src/js/custom/qsearch/FlexSearchBuilder.js  |  3 +-
 src/js/ux/AdvancedSearch.js                 | 53 ++++++++++++---
 src/js/ux/CommandBar.js                     | 13 +++-
 src/js/ux/Map.js                            | 52 ++++++++++++++-
 src/js/ux/QSearch.js                        | 64 ++++++++++++++++---
 src/js/ux/TableView.js                      | 35 ++++++++--
 src/js/ux/geofilter/GeoFilter.js            |  2 +-
 13 files changed, 445 insertions(+), 63 deletions(-)

diff --git a/lib/jquery-1.11.2/opengrid-query-builder.js b/lib/jquery-1.11.2/opengrid-query-builder.js
index 28fee73..25c8cdf 100644
--- a/lib/jquery-1.11.2/opengrid-query-builder.js
+++ b/lib/jquery-1.11.2/opengrid-query-builder.js
@@ -238,7 +238,8 @@
             add_group: 'glyphicon glyphicon-plus-sign',
             add_rule: 'glyphicon glyphicon-plus',
             remove_group: 'glyphicon glyphicon-remove',
-            remove_rule: 'glyphicon glyphicon-remove',
+            //OpenGrid customization
+            remove_rule: 'glyphicon glyphicon-remove-circle',
             error: 'glyphicon glyphicon-warning-sign'
         }
     };
@@ -1355,6 +1356,20 @@
         return false;
     };
 
+	 QueryBuilder.prototype.isNaturalLangChronoTimeValue = function(value) {
+        var o = chrono.parse(value);
+        if (o.length > 0) {
+            var v = o[0];
+            if (v.tags) {
+                if (v.tags.ENTimeAgoFormatParser)
+                    return true;
+                else
+                    return false;
+            }
+        }
+        return false;
+    };
+	
 
     /**
      * Returns an incremented group ID
@@ -2726,20 +2741,23 @@
 
 
         _getRuleValue: function(rule) {
+           
             //OpenGrid extension, translate system rule value
             if (rule.type === 'date') {
                 //OpenGrid extension, translate system rule value
                 if (this.isNaturalLangChronoValue(rule.value) ) {
-                    //map to Mongo's current date time token
-                    //this does not work for datetime values stored as numeric
-                    //rule.value = '$currentDate';
-
                     //assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
-                    return moment(chrono.parseDate(rule.value)).startOf('day').valueOf();
+                    if (this.isNaturalLangChronoTimeValue(rule.value))
+                        //include time value
+                        return moment(chrono.parseDate(rule.value)).valueOf();
+                    else
+                        //start of day (assume > to be only operator)
+                        return moment(chrono.parseDate(rule.value)).startOf('day').valueOf();
                 } else
                     return moment(rule.value, "MM/DD/YYYY hh:mm:ss a").valueOf();
             } else
                 return rule.value;
+        
         },
 
         //assume only 'between' operator can be applied
@@ -2748,10 +2766,18 @@
                 //map to Mongo's current date time token
 
                 //assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
-                if (i==1)
-                    value = moment(chrono.parseDate(value)).endOf('day').valueOf();
-                else
-                    value = moment(chrono.parseDate(value)).startOf('day').valueOf();
+                if (this.isNaturalLangChronoTimeValue(value)) {
+                    //include time value, e.g. 5 hours ago, 30 minutes ago, etc
+                    value =  moment(chrono.parseDate(value)).valueOf();
+                } else {
+                    //between operation
+                    if (i==1)
+                        //2nd argument, use end of day time
+                        value = moment(chrono.parseDate(value)).startOf('day').add(1, 'day').valueOf();
+                    else
+                        //1st argument, use start of day time
+                        value = moment(chrono.parseDate(value)).startOf('day').valueOf();
+                }
                 return value;
             } else {
                 //assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
@@ -3527,7 +3553,8 @@
         "__author": "Damien \"Mistic\" Sorel, http://www.strangeplanet.fr",
         "add_rule": "Add rule",
         "add_group": "Add group",
-        "delete_rule": "Delete",
+       //OpenGrid customization: removed Delete text
+        "delete_rule": "",
         "delete_group": "Delete",
         "conditions": {
             "AND": "AND",
diff --git a/src/css/ogrid-theme-blue.css b/src/css/ogrid-theme-blue.css
index 88f524f..13ede6a 100644
--- a/src/css/ogrid-theme-blue.css
+++ b/src/css/ogrid-theme-blue.css
@@ -65,14 +65,17 @@ html, body {
 
 
 .query-builder .rules-group-container {
-    padding: 10px 10px 6px;
+   padding: 5px 5px 0px 0px;
+
     border:none !important;
     background: none !important;
 }
 .query-builder .rules-group-container .btn-success {background-color: #28303D !important; border-color:#73C4E1 !important;}
 #ogrid-ds-tabs .regtab a {background-color:transparent !important; border:1px #FFFFFF solid !important; border-radius: 10px; }
-.query-builder .rules-group-container .btn-danger {color: #28303D; background-color:transparent !important; border-color: #28303D;}
+.query-builder .rules-group-container .btn-danger {color: #28303D; background-color:transparent !important; border: none;
+    font-size: 1.5em;}
 #advSearchSave {color:#fff !important; background-color:#28303D !important; border-color:#2E6DA4 !important;}
+.query-builder .rules-group-container .btn-danger:hover {opacity: 0.6; }
 
 	::-webkit-scrollbar-button:start:decrement,
     ::-webkit-scrollbar-button:end:increment { height: 0px; display: block; background-color: black;}
@@ -181,13 +184,25 @@ html, body {
 }
 
 #advSearchSubmit, #advSearchReset, #advSearchSave {
-    width: 100px;
+    width: 120px;
 }
 
+
 #advSearchSubmit {
-    margin-left: 10px;
+    margin-left: 35px;
+	position: fixed;
+	bottom: 35px;
+}
+
+ #advSearchReset {
+	position: fixed;
+	bottom: 35px;
+	margin-left: 165px;
 }
 
+.ogrid-color-panel {
+    padding: 0px 10px 0px 10px !important;
+}
 
 
 #autorefresh-panel .control-label {
@@ -258,7 +273,10 @@ html, body {
 .ogrid-task-pane .rule-value-container .form-control {
     font-weight: 300;
 }
-
+.ogrid-color-options {
+    font-size: 12px !important;
+    text-decoration: underline;
+}
 
 div#ogrid-dataset-filters.panel-body,  div#ogrid-geo-filters.panel-body {
     padding-left: 0px;
@@ -276,6 +294,17 @@ div#ogrid-dataset-filters.panel-body,  div#ogrid-geo-filters.panel-body {
     font-size: 152%;
 }
 
+.adv-bottom-commandbar {
+    background-color: #2480a0;
+    margin-left: -25px;
+    position: fixed;
+    bottom: 0px;
+    height: 80px;
+    width: 100%;
+    opacity: 1.0;
+    z-index: 8000;
+}
+
 /* Size when the advanced tabs header breaks */
 @media (max-width: 342px) {
     #ogrid-adv-tabs a {
@@ -315,4 +344,36 @@ div#ogrid-dataset-filters.panel-body,  div#ogrid-geo-filters.panel-body {
         padding-left: 10px;
         font-size: 1.5em;
     }
+}
+
+.header-center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 25px;
+    margin-right: 0 !important;
+    margin-top: 0 !important;
+}
+
+#ogrid-footer .panel-title a {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
+.ogrid-footer-panel {
+    border-width: 0;
+}
+
+.ogrid-footer-panel-heading, .ogrid-footer-panel-heading .panel-title {
+    color: #fff !important;
+    background-color: #292e35 !important;
+    border-width: 0 !important;
+}
+.ogrid-nav-btn .active {
+    background-color: rgba(129, 131, 132, 0.97) !important;
+}
+
+.leaflet-control-attribution {
+    /* adjusted due to increase in search results panel height */
+    margin-bottom: 4px !important;
 }
\ No newline at end of file
diff --git a/src/css/ogrid.css b/src/css/ogrid.css
index 1a0e410..be06dc8 100644
--- a/src/css/ogrid.css
+++ b/src/css/ogrid.css
@@ -430,6 +430,39 @@ h6 > a {
 .bootstrap-table .fixed-table-toolbar .columns div[title='Heat Map'] .dropdown-menu {
   width: 165px;
 }
+.map-info {
+  padding: 6px 8px;
+  font: 14px/16px Arial, Helvetica, sans-serif;
+  background: white;
+  background: rgba(255,255,255,0.8);
+  box-shadow: 0 0 15px rgba(0,0,0,0.2);
+  border-radius: 5px;
+}
+.map-info h4 {
+  margin: 0 0 5px;
+  color: #777;
+}
+
+.legend {
+  text-align: left;
+  line-height: 18px;
+  color: #555;
+}
+
+.legend i {
+  width: 18px;
+  height: 18px;
+  float: left;
+  margin-right: 8px;
+  opacity: 0.7;
+}
+
+.legend .ogrid-legend-circle {
+  border-radius: 50%;
+  width: 10px;
+  height: 10px;
+  margin-top: 4px;
+}
 
 .ogrid-logo-small {
   width: 32px;
@@ -437,4 +470,16 @@ h6 > a {
   /*padding-top: 9px;*/
   margin-top: 10px;
   margin-left: 10px;
+}
+
+.glyphicon {
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-family: 'Glyphicons Halflings';
+    font-style: normal;
+    font-weight: 400;
+    line-height: 1;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index f58b016..edf9b9e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -54,7 +54,7 @@
             <div id="ogrid-search" class="pull-left">
                 <form class="navbar-form " role="search">
                     <div class="form-group has-feedback input-group" id="qsearch">
-                        <input autocapitalize="off" type="text" class="form-control" id="qsearch-input" placeholder="Quick search" />
+                        <input autocapitalize="off" type="text" class="form-control" id="qsearch-input" placeholder="Find Places, Businesses, etc." />
                         <span id="ogrid-qsearch-hint" class="glyphicon glyphicon-question-sign" data-toggle="popover" tabindex="0" data-placement="bottom" title="Quick Search Help"></span>
                         <span class="input-group-addon" id="qsearch-button">
                             <i class="fa fa-search"></i>
@@ -67,7 +67,7 @@
           <ul class="nav navbar-nav navbar-right">
             <li>
               <p class="navbar-btn ogrid-nav-btn">
-                <a id="ogrid-advanced-btn" href="#" class="btn btn-default hide">Advanced Search</a>
+                <a id="ogrid-advanced-btn" href="#" class="btn btn-default hide">Find Data</a>
               </p>
             </li>
             <li>
@@ -146,7 +146,7 @@
                   </div>
                 </div>
                 <div class="panel panel-default">
-                  <div class="panel-heading panel-collapsed">Datasets and Standard Filters <span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
+                  <div id="ogrid-select-data-pane"class="panel-heading panel-collapsed">Select Data<span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
                   <div id="ogrid-dataset-filters" class="panel-body" style="display:none">
                     <ul id="ogrid-ds-tabs" class="nav nav-tabs nav-pills" role="tablist">
                       <!-- JQuery template -->
@@ -173,7 +173,9 @@
                                     <div class="tab-pane active" id="${tabName}">
                                         <div id="builder_${tabName}"></div>
                                         <div class="row">
-                                            <div class="panel panel-default col-xs-12">
+                                            <div class="panel panel-default col-xs-12 ogrid-color-panel">
+                                                <div id="colorOptions_${tabName}" class="panel-heading ogrid-color-options">Color Options <span class="clickable"></span></div>
+                                                <div class="panel-body ogrid-color-options-panel-body" style="display:none">
                                                 <form class="form-inline form-in-panel">
                                                     <div class="form-group">
                                                         <label for="colorPicker" class="control-label">Color</label>
@@ -222,6 +224,7 @@
                                                         </div>
                                                     </div>
                                                 </form>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -230,7 +233,7 @@
                   </div>
                 </div>
                 <div class="panel panel-default">
-                  <div class="panel-heading panel-collapsed">Additional/Geo-spatial Filters <span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
+                  <div class="panel-heading panel-collapsed">Select Location <span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
                   <div id="ogrid-geo-filters" class="panel-body" style="display:none">
                     <div id="geo-filter"></div>
                   </div>
@@ -266,9 +269,9 @@
                   </div>
                 </div>
               </div>
-              <div class="pull-left">
-                <button id="advSearchSubmit" type="button" class="btn btn-primary">Submit</button>
-                <button id="advSearchReset" type="button" class="btn btn-default">Reset</button>
+              <div class="pull-left adv-bottom-commandbar">
+                <button id="advSearchSubmit" type="button" class="btn btn-primary">Get Data</button>
+                <button id="advSearchReset" type="button" class="btn btn-default">Clear Search</button>
               </div>
             </div>
             <div class="tab-pane" id="save-queries">
@@ -279,9 +282,9 @@
       </div>
     </div>
     <div id="ogrid-footer" class="panel-group">
-      <div class="panel panel-default ogrid-footer-panel ogrid-footer-panel-default">
+      <div class="panel panel-default ogrid-footer-panel ogrid-footer-panel-default" data-toggle="tooltip" data-placement="top" title="Search results">
         <div class="panel-heading ogrid-footer-panel-heading">
-          <i id="ogrid-panel-caret" class="glyphicon glyphicon-chevron-up pull-right"></i>
+          <i id="ogrid-panel-caret" class="fa fa-chevron-circle-up fa-lg header-center"></i>
           <h6 class="panel-title">
             <a data-toggle="collapse" data-parent="#accordion" href="#tableview"></a>
           </h6>
diff --git a/src/js/custom/Config.js b/src/js/custom/Config.js
index 5cb2acd..2d198c3 100644
--- a/src/js/custom/Config.js
+++ b/src/js/custom/Config.js
@@ -66,15 +66,27 @@ ogrid.Config = {
 
     map: {
         //first base layer becomes base layer selected by default
-        baseLayers:[{
+       baseLayers:[{
             name: 'Streets',
-            url:'https://server.arcgisonline.com/arcgis/rest/services/World_Street_Map/MapServer',
+           // url:'https://server.arcgisonline.com/arcgis/rest/services/World_Street_Map/MapServer',
             //flag to indicate whether Esri's tiledMapLayer plug-in class will be used
-            useEsri: true,
+           url:'https://{s}.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFub2puZWxha3VydGhpIiwiYSI6ImNpcTJmcW96MDAxNDJmdG00MDV4dms1M2QifQ.Gac-ef2dr0xsmgkMbgD9zw',
+			useEsri: false,
             options: {
-                attribution: 'City of Chicago, Esri, HERE, DeLorme, METI/NASA, USGS, USDA, EPA'
+                attribution: 'Imagery from <a href="http://mapbox.com/about/maps/">MapBox</a> &mdash; Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+            }}
+        , 
+		{
+            name: 'Black and White',
+           
+           url:'http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png',
+            useEsri: false,
+            options: {
+                attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
             }
-        }, {
+        }, 
+		
+		{
             name: 'Aerial',
             url:'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
             useEsri: false,
@@ -83,6 +95,8 @@ ogrid.Config = {
             }
         }
         ],
+		
+		
         //additional layers
         //can be a service URL or an object with the same structure as the base layer objects
         overlayLayers: [{
@@ -139,7 +153,9 @@ ogrid.Config = {
 
         measureOptions: {
             activeColor: '#fc9272',
-            completedColor: '#fc9272'
+            completedColor: '#fc9272',
+			position: 'bottomleft'
+			
         },
 
         tileMapOptions: {
@@ -191,7 +207,41 @@ ogrid.Config = {
             {id:'citywide', displayName:'Citywide', data:ogrid.chicagoCityShapeMap().getData()},
             {id:'zip-code', displayName:'Zip Code', data: ogrid.chicagoZipShapeMap().getData()},
             {id:'ward', displayName:'Ward', data: ogrid.chicagoWardsShapeMap().getData()}
-        ]
+        ], 
+		
+		autoLoadQuery: {
+              //_id:  "5797b9ad40c6662c52dca26f",
+            spec: [{
+                  "dataSetId" : "weather",
+                  "filters" : { },
+                  "rendition" : {
+                    "color" : "#FFD700",
+                    "opacity" : "85",
+                    "size" : "6"
+                  }
+                }, {
+                  "dataSetId" : "twitter",
+                  "filters" : { },
+                  "rendition" : {
+                    "color" : "#C71585",
+                    "opacity" : "85",
+                    "size" : "6"
+                  }
+                }],
+            sharedWith : {
+               "users" : [],
+               "groups" : []
+            },
+            owner: "system",
+            name: "New search",
+            geoFilter: {
+                "boundaryType" : "within",
+                "boundary" : "_map-extent"
+            },
+            isCommon: false,
+            autoRefresh: false,
+            refreshInterval: "30"
+          },
     },
 
 
diff --git a/src/js/custom/qsearch/FlexData.js b/src/js/custom/qsearch/FlexData.js
index 3c8c162..c90c3ab 100644
--- a/src/js/custom/qsearch/FlexData.js
+++ b/src/js/custom/qsearch/FlexData.js
@@ -49,7 +49,8 @@ ogrid.QSearchProcessor.FlexData = ogrid.QSearchProcessor.extend({
         var ds = null;
         $.each(this._options.datasets, function(i, v) {
             if (v.quickSearch && v.quickSearch.enable) {
-                if (v.quickSearch.triggerWord === trigger || v.quickSearch.triggerAlias === trigger) {
+                //use case insensitive search
+                if (v.quickSearch.triggerWord.toUpperCase() === trigger.toUpperCase() || v.quickSearch.triggerAlias.toUpperCase() === trigger.toUpperCase()) {
                     ds = v;
                     return false; //break
                 }
@@ -128,6 +129,32 @@ ogrid.QSearchProcessor.FlexData = ogrid.QSearchProcessor.extend({
         });
     },
 
+
+    _getGeoFilterWidget: function() {
+        var fakeContainer = $();
+        var o =  ogrid.geoFilter(fakeContainer, {
+                bounds: ogrid.Config.advancedSearch.geoFilterBoundaries,
+
+                //no additional near refs aside from _map-click
+                nearReferences: null,
+
+                //pass the true map object
+                map: ogrid.App.map().getMap(),
+                geoLocationControl: ogrid.App.map().getGeoLocationControl()
+            }
+        );
+        //this makes it map-extent by default
+        o.reset();
+        return o;
+    },
+
+    _getMapExtentGeoFilter:function() {
+        if ( !this._geoFilter ) {
+            this._geoFilter = this._getGeoFilterWidget();
+        }
+        return this._geoFilter.getGeoFilter();
+    },
+
     //public methods
     test: function(input) {
         //dynamically determine pattern based on available datasets
@@ -181,6 +208,11 @@ ogrid.QSearchProcessor.FlexData = ogrid.QSearchProcessor.extend({
             //max if specified on input, else dstaset default max, else service default max
             request.maxResults = this._flexBuilder.getLimit() || ds.quickSearch.defaultMax ||  ogrid.Config.service.maxresults;
             request.sort = ds.quickSearch.defaultSort || null;
+
+            //if geoSpatial filtering is supported by service, send geoSpatial filters
+            if ( ogrid.App.serviceCapabilities && ogrid.App.serviceCapabilities().geoSpatialFiltering ) {
+                request.geoFilter = this._getMapExtentGeoFilter();
+            }
             ogrid.Search.exec( request, {origin: 'qsearchFlex'});
 
         } catch (ex) {
diff --git a/src/js/custom/qsearch/FlexSearchBuilder.js b/src/js/custom/qsearch/FlexSearchBuilder.js
index 190595f..a027e1d 100644
--- a/src/js/custom/qsearch/FlexSearchBuilder.js
+++ b/src/js/custom/qsearch/FlexSearchBuilder.js
@@ -245,7 +245,8 @@ ogrid.FlexSearchBuilder = ogrid.Class.extend({
 
             //matches only if trigger word is on the list
             $.each(triggers, function(i,v){
-                if (trigger === v) {
+                //use case-insensitive comparison
+                if (trigger.toUpperCase() === v.toUpperCase()) {
                     t = true;
                     return false; //break
                 }
diff --git a/src/js/ux/AdvancedSearch.js b/src/js/ux/AdvancedSearch.js
index 090a326..80ff9e8 100644
--- a/src/js/ux/AdvancedSearch.js
+++ b/src/js/ux/AdvancedSearch.js
@@ -208,15 +208,15 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
         $('#endDate').datetimepicker();
 
         $('.panel-heading span.clickable, #ogrid-adv-content .panel-heading').on("click", function (e) {
-            if ($(this).hasClass('panel-collapsed')) {
-                // expand the panel
-                $(this).parents('.panel').find('.panel-body').slideDown();
+             if ($(this).hasClass('panel-collapsed')) {
+                // expand the panel, excluding color options which is independently controlled
+                $(this).parents('.panel').find('.panel-body').not('.ogrid-color-options-panel-body').slideDown();
                 $(this).removeClass('panel-collapsed');
                 $(this).find('i').removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
             }
             else {
-                // collapse the panel
-                $(this).parents('.panel').find('.panel-body').slideUp();
+                // collapse the panel, excluding color options which is independently controlled
+                $(this).parents('.panel').find('.panel-body').not('.ogrid-color-options-panel-body').slideUp();
                 $(this).addClass('panel-collapsed');
                 $(this).find('i').removeClass('glyphicon-chevron-up').addClass('glyphicon-chevron-down');
             }
@@ -248,6 +248,12 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
         ogrid.Event.on(ogrid.Event.types.LOGGED_IN, $.proxy(this._onLoggedIn, this));
     },
 
+	_expandPane: function(pane) {
+        //exclude color options which is independently controlled
+        pane.parents('.panel').find('.panel-body').not('.ogrid-color-options-panel-body').slideDown();
+        pane.removeClass('panel-collapsed');
+        pane.find('i').removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
+    },
 
     _onLoggedIn: function(e) {
         //refresh available queries as logged user might have changed
@@ -260,6 +266,14 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
         //refvresh query list
         this._queryAdmin.setUser(e.message);
         this._queryAdmin.refreshQueries();
+		
+		// load auto-load query if option is set
+		if (ogrid.Config.advancedSearch.autoLoadQuery) {
+			this._loadQuery(ogrid.Config.advancedSearch.autoLoadQuery);
+			
+			//auto-open Select Data pane
+            this._expandPane($("#ogrid-select-data-pane"));
+			}
     },
 
 
@@ -664,10 +678,8 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
                 ogrid.Search.exec(search, {origin: 'advancedSearch', search: search});
             });
 
-            //on a mobile device, auto-hide advanced search pane
-            if (ogrid.App.mobileView()) {
-                me._hideMe();
-            }
+             //auto-hide Advanced Search pane after Submit (no longer done in mobile mode only)
+            me._hideMe();
 
         } catch (ex) {
             ogrid.Alert.error(ex.message);
@@ -908,7 +920,21 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
         });
         return a;
     },
-
+	
+ _onColorOptionsClick: function(e) {
+        if ($(e.target).hasClass('panel-collapsed')) {
+            // expand the panel
+            $(e.target).parent().find('.panel-body').slideDown();
+            $(e.target).removeClass('panel-collapsed');
+            $(e.target).find('i').removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
+        }
+        else {
+            // collapse the panel
+            $(e.target).parent().find('.panel-body').slideUp();
+            $(e.target).addClass('panel-collapsed');
+            $(e.target).find('i').removeClass('glyphicon-chevron-up').addClass('glyphicon-chevron-down');
+        }
+    },
 
     _loadNewTab: function(qspec) {
         $('#ogrid-ds-tabs').find('li').removeClass('active');
@@ -963,6 +989,13 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
         //set values
         $('#sizeSpin_' + tabId).val(qspec.rendition.size);
         $('#opacitySpin_' + tabId).val(qspec.rendition.opacity);
+		
+		//assign click handler for this clickable link
+        $("#colorOptions_" + tabId).click(this._onColorOptionsClick);
+
+        //hide color options explicitly
+        $("#colorOptions_" + tabId).addClass("panel-collapsed");
+        $("#colorOptions_" + tabId).parent().find('.panel-body').css("display", "none!important");
 
         //$('#saveQueryAs').val(qspec.name);
     },
diff --git a/src/js/ux/CommandBar.js b/src/js/ux/CommandBar.js
index f3454ee..348b01a 100644
--- a/src/js/ux/CommandBar.js
+++ b/src/js/ux/CommandBar.js
@@ -147,6 +147,12 @@ ogrid.CommandBar = ogrid.Class.extend({
                 me,
                 me._getRequiredAccess(ogrid.SecuredFunctions.ADVANCED_SEARCH),
                 '#ogrid-advanced-btn', accessList);
+				
+				// show Advanced Search button on logged in and if not on mobile
+            if (!ogrid.App.mobileView()) {
+                me.toggleAdvancedSearchPane();
+            }
+
 
             //initialize Admin UI if not initialized and user is an admin
             if (me._noAdminUI() && !$('#ogrid-manage-btn').hasClass('hide')) {
@@ -231,8 +237,11 @@ ogrid.CommandBar = ogrid.Class.extend({
         if (ogrid.App.mobileView()) {
             this._hideMenu();
         }
-    }
+    },
 
     //public methods
-
+toggleAdvancedSearchPane: function() {
+        this._onAdvancedSearchClick();
+    }
+	
 });
\ No newline at end of file
diff --git a/src/js/ux/Map.js b/src/js/ux/Map.js
index b9b49b0..5752ba5 100644
--- a/src/js/ux/Map.js
+++ b/src/js/ux/Map.js
@@ -13,6 +13,7 @@ ogrid.Map = ogrid.Class.extend({
     _baseMapLayer: null,
     _markers: {},
     _locateControl: null,
+	 _legend: null,
 
     _options: {
         //lime
@@ -121,7 +122,20 @@ ogrid.Map = ogrid.Class.extend({
         this._locateControl =  L.control.locate();
         this._locateControl.options.strings.title = 'Show current location';
         this._locateControl.addTo(this._map);
+		
+		 //create legend
+        this._legend = L.control({position: 'bottomright'});
+
+        this._legend.onAdd = function (map) {
+            //hidden initially
+            var div = L.DomUtil.create('div', 'map-info legend hide');
+            return div;
+        };
+        this._legend.addTo(this._map);
+
     },
+	
+	
 
     _resetZoom: function() {
         //this._map.setZoom(this._options.mapLibraryOptions.zoom);
@@ -159,14 +173,21 @@ ogrid.Map = ogrid.Class.extend({
     _initLayerControl: function() {
         //populate our base layers from the options
         var bl = this._getGroupedLayer(this._options.baseLayers, true);
+		var options = {
+            container_width 	: "250px",
+            group_maxHeight     : "1000px",
+            //container_maxHeight : "800px",
+			position			: 'bottomleft',
+            exclusive       	: false,
+        };
 
         //No support for service URL overlays yet
         if (this._options.overlayLayers && ( typeof this._options.overlayLayers==='object') ) {
             var ol = this._getGroupedLayer(this._options.overlayLayers, false);
-            this._layerControl = L.control.groupedLayers(bl, ol);
+            this._layerControl = L.control.groupedLayers(bl, ol, options);
         } else {
             //no overlays
-            this._layerControl = L.control.groupedLayers(bl);
+            this._layerControl = L.control.groupedLayers(bl, null, options);
         }
 
         this._map.addControl(this._layerControl);
@@ -432,7 +453,15 @@ ogrid.Map = ogrid.Class.extend({
         }
         throw ogrid.error('Data Error', 'GeoJson data is not formatted properly. Unable to find meta/view attributes for column \'' + p + '\'.');
     },
+	
+_clearLegend: function() {
+        var legendDiv = this._legend.getContainer();
+        legendDiv.innerHTML = '';
 
+        //hide, since we have nothing to show
+        $(legendDiv).addClass('hide');
+    },
+	
     _clear: function() {
         var me = this;
         this._map.eachLayer(function (layer) {
@@ -453,6 +482,10 @@ ogrid.Map = ogrid.Class.extend({
 
         //clear any remaining generated layers
         me._clearOwnLayersFromLayerControl();
+		
+		 //clear legend
+        me._clearLegend();
+		
     },
 
     //clear our own generated layers if any remains (usually unchecked ones that do not appear as a layer on the map)
@@ -568,6 +601,21 @@ ogrid.Map = ogrid.Class.extend({
         }
         var sp = '<i class="fa fa-circle-o" style="color:' + c + '"></i>&nbsp';
         this._layerControl.addOverlay(layer, sp + name, group);
+		
+		//add to legend as well
+        //console.log(this._legend.getContainer());
+        var legendElem = this._legend.getContainer();
+        if ($(legendElem).hasClass('hide')) {
+            //show legend, if hidden
+            $(legendElem).removeClass('hide');
+        }
+
+        //only add if not already there
+        var item = '<i class="ogrid-legend-circle" style="background:' + c + '"></i> ' +
+            (dataView.displayName ? dataView.displayName + '<br>' : '+');
+        if (legendElem.innerHTML.indexOf(item) == -1) {
+            legendElem.innerHTML += item;
+        }
     },
 
     _onOverlayAdd: function(e) {
diff --git a/src/js/ux/QSearch.js b/src/js/ux/QSearch.js
index 8e6dcdd..eed121a 100644
--- a/src/js/ux/QSearch.js
+++ b/src/js/ux/QSearch.js
@@ -13,6 +13,7 @@ ogrid.QSearch = ogrid.Class.extend({
     _qsContainer: null,
     _input: null,
     _qsbutton: null,
+    _geoFilter: null,
 
     //public attributes
 
@@ -32,11 +33,16 @@ ogrid.QSearch = ogrid.Class.extend({
 
         //hint icon
         $.get(ogrid.Config.quickSearch.helpFile, function(data) {
-            $("[data-toggle=popover]").popover({
+            var $o = $("[data-toggle=popover]").popover({
                 html: true,
-                content: data
-                }
-            );
+                content: data,
+                container: 'body'
+                //title: 'Quick Search Help <a href="#" class="close" data-dismiss="alert">X</a>'
+            });
+
+            /*$(document).on("click", ".popover .close" , function(){
+                $(this).parents(".popover").popover('hide');
+            });*/
         });
 
         this._input = qsinput;
@@ -80,11 +86,11 @@ ogrid.QSearch = ogrid.Class.extend({
             if (o) {
                 //var dsCall = $.ajax(ogrid.Config.service.endpoint + '/datasets');
                 //dsCall.then(function (dataTypes) {
-                o.setOptions({datasets: this._options.datasets});
-                me._input.prop('disabled', false);
+                    o.setOptions({datasets: this._options.datasets});
+                    me._input.prop('disabled', false);
 
-                //avoid annoying keyboard popup when on mobile mode
-                if (!ogrid.App.mobileView()) me._input.focus();
+                    //avoid annoying keyboard popup when on mobile mode
+                    if (!ogrid.App.mobileView()) me._input.focus();
                 //});
             }
         } catch (ex) {
@@ -116,14 +122,54 @@ ogrid.QSearch = ogrid.Class.extend({
 
         try {
             //parse and exec async
-            ogrid.QSearchFactory.parse(searchInput).exec(searchInput, this._onExecDone, this._onExecError);
+            ogrid.QSearchFactory.parse(searchInput).exec(searchInput, this._onExecDone.bind(this), this._onExecError);
         } catch (e) {
             //ogrid.Alert.modal('OpenGrid Error', e.message);
             ogrid.Alert.error(e.message);
         }
     },
 
+    _getGeoFilterWidget: function() {
+        var fakeContainer = $();
+        var o =  ogrid.geoFilter(fakeContainer, {
+                bounds: ogrid.Config.advancedSearch.geoFilterBoundaries,
+
+                //no additional near refs aside from _map-click
+                nearReferences: null,
+
+                //pass the true map object
+                map: ogrid.App.map().getMap(),
+                geoLocationControl: ogrid.App.map().getGeoLocationControl()
+            }
+        );
+        //this makes it map-extent by default
+        o.reset();
+        return o;
+    },
+
+    _isGeoFilterableData: function(data) {
+        //we are using this indicator for data to be geo-Filter in quick search; might change in the future
+        return (data.meta.view.options.rendition.icon !== "marker");
+    },
+
     _onExecDone: function (results) {
+        //if geoSpatial filtering is not supported by service, implement filtering locally
+        if ( !ogrid.App.serviceCapabilities().geoSpatialFiltering && this._isGeoFilterableData(results)) {
+            if ( !this._geoFilter ) {
+                this._geoFilter = this._getGeoFilterWidget();
+            }
+            //apply additional geo-spatial filter, within map extent
+            results = this._geoFilter.filterData(results);
+        }
+
+        //fix fillColor of points to make it consistent with Advanced Search
+        if (this._isGeoFilterableData(results)) {
+            var c = results.meta.view.options.rendition.color;
+            results.meta.view.options.rendition.fillColor =  chroma.scale(['white', c])(0.5).hex();
+        }
+
+        //we're no longer sending clear flag after a quick search is executed
+        //"no clear" disabled temporarily as of 08/19
         ogrid.Event.raise(ogrid.Event.types.REFRESH_DATA, {resultSetId:ogrid.guid(), data: results, options: {clear:true}} );
     },
 
diff --git a/src/js/ux/TableView.js b/src/js/ux/TableView.js
index d8d8355..bfd9316 100644
--- a/src/js/ux/TableView.js
+++ b/src/js/ux/TableView.js
@@ -46,24 +46,24 @@ ogrid.TableView = ogrid.Class.extend({
 
     //private methods
     _toggleTablePanelCollapse: function() {
-        if ($('#ogrid-panel-caret').hasClass('glyphicon-chevron-up')) {
+        if ($('#ogrid-panel-caret').hasClass('fa-chevron-circle-up')) {
             $('.ogrid-footer-panel-heading').animate({
                 backgroundColor: "#E8E8E8"
             }, 500);
             //$('#panel-caret').removeClass('fa-caret-square-o-up').addClass('fa-caret-square-o-down');
             //glyphicon glyphicon-chevron-down
-            $('#ogrid-panel-caret').removeClass('glyphicon-chevron-up').addClass('glyphicon-chevron-down');
+            $('#ogrid-panel-caret').removeClass('fa-chevron-circle-up').addClass('fa-chevron-circle-down');
         } else {
             $('.ogrid-footer-panel-heading').animate({
                 backgroundColor: "#E8E8E8"
             }, 500);
-            $('#ogrid-panel-caret').removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
+            $('#ogrid-panel-caret').removeClass('fa-chevron-circle-down').addClass('fa-chevron-circle-up');
         }
     },
 
     _onTableViewCaretClick: function(e) {
         //this._toggleTablePanelCollapse();
-        if ($('#ogrid-panel-caret').hasClass('glyphicon-chevron-up')) {
+        if ($('#ogrid-panel-caret').hasClass('fa-chevron-circle-up')) {
             $('#tableview').collapse('show');
         } else {
             $('#tableview').collapse('hide');
@@ -228,6 +228,19 @@ ogrid.TableView = ogrid.Class.extend({
         //workaround the table export limitation (Bootstrap table widget can only export one page at a time)
         //  by overriding existing event handler on export
         this._overrideExportBehavior($t);
+
+        //make sure height attribute is reflected, not doing it on init population
+        //fix unaligned headers and columns on data update
+        //$t.bootstrapTable('resetView');
+
+        /*$t.on('all.bs.table', function (e, name, args) {
+            console.log(name, args);
+            if (name === 'post-header.bs.table') {
+                setTimeout(function() {
+                    $t.bootstrapTable('resetView');
+                }, 500);
+            }
+        });*/
     },
 
 
@@ -411,6 +424,15 @@ ogrid.TableView = ogrid.Class.extend({
 
         $('#' + tableId).data('latestDataTs', this._getLatestDataTs( currentOptions.origData ));
 
+        //create clone to force a refresh since the component checks for equality before refreshing
+        /*var o = $.extend(true, {}, currentOptions);
+
+        //update options with new data
+        o.origData = data;
+        o.data = data.features;
+        o.height = this._getTableHeight();
+        o.showAutorefresh = showAutorefresh;*/
+
         var $t = $('#' + tableId).bootstrapTable('refreshOptions', {
             origData: data,
             data: data.features,
@@ -420,6 +442,11 @@ ogrid.TableView = ogrid.Class.extend({
 
         if (showAutorefresh) {
             $('div.autorefresh').attr('title', 'Last auto-refreshed: ' + lastRefreshed.format('MM/DD/YYYY hh:mm:ss a'));
+
         }
+
+        //fix unalighed headers and columns on data update
+        //$t.bootstrapTable('resetView');
+
     }
 });
\ No newline at end of file
diff --git a/src/js/ux/geofilter/GeoFilter.js b/src/js/ux/geofilter/GeoFilter.js
index ccdfac6..3f73d43 100644
--- a/src/js/ux/geofilter/GeoFilter.js
+++ b/src/js/ux/geofilter/GeoFilter.js
@@ -411,7 +411,7 @@ ogrid.GeoFilter = ogrid.Class.extend({
         //clear Within option
         this.setBoundaryType('within');
 
-        this.setWithinBoundaryOption('');
+        this.setWithinBoundaryOption('_map-extent');
 
         //manually trigger event on change in option value
         this._onBoundaryChange({target: $('#geofilter-within-bounds')});