Merge pull request #6 from Chicago/master

OG 1.4.1

CONTRIBUTING.md

@@ -50,6 +50,7 @@ When you are ready to submit a pull request, please following these instructions
   	git push origin my-fix-branch
   	```
 
+  * Sign the [Contributor License Agreement](https://www.clahub.com/agreements/Chicago/opengrid). If you have any questions or issues, please visit the [license agreement's repository](https://github.com/Chicago/contributor-license-agreement).
   * In GitHub, send a pull request to `opengrid:dev`. Please add a descriptive title and description of the changes. Please reference issues or prior conversations, if applicable.
   * Interact with the development team as questions and conversation arises.
 

README.md

@@ -48,7 +48,7 @@ After the release package has been built deploy the files under the ./dist folde
 
 ## Submit a bug
 
-We would like to hear about any bugs or odd behavior that you uncover. Use the [issue tracker](../../../issues/) to open a new item. When describing the issue, we recommend that you discuss the following items:
+We would like to hear about any bugs or odd behavior that you uncover. Use the [issue tracker](../../issues/) to open a new item. When describing the issue, we recommend that you discuss the following items:
 
   * Describe the bug
   * Describe the steps you did to discover the bug

mkdocs.yml

@@ -4,6 +4,7 @@ site_description: Explore your space with OpenGrid
 site_author: City of Chicago
 
 repo_url: https://github.com/Chicago/opengrid
+theme: readthedocs
 
 pages:
 - Home: index.md

src/js/custom/Config.js

@@ -105,7 +105,7 @@ ogrid.Config = {
         overlayLayers: [{
             groupName: 'Open Weather Layers',
             name: 'Cloud Cover',
-            url: 'http://{s}.tile.openweathermap.org/clouds/precipitation/{z}/{x}/{y}.png',
+            url: 'http://{s}.tile.openweathermap.org/clouds/{z}/{x}/{y}.png?APPID=8e0f9d1de886ff78c6bab40f2e6d1afe',
             useEsri: false,
             options: {
                 attribution: 'Map data (c) OpenWeatherMap',
@@ -115,7 +115,7 @@ ogrid.Config = {
         },{
             groupName: 'Open Weather Layers',
             name: 'Quantity of Precipitation',
-            url: 'http://{s}.tile.openweathermap.org/map/precipitation/{z}/{x}/{y}.png',
+            url: 'http://{s}.tile.openweathermap.org/map/precipitation/{z}/{x}/{y}.png?APPID=8e0f9d1de886ff78c6bab40f2e6d1afe',
             useEsri: false,
             options: {
                 attribution: 'Map data (c) OpenWeatherMap',
@@ -125,7 +125,7 @@ ogrid.Config = {
         }, {
             groupName: 'Open Weather Layers',
             name: 'Sea Level Pressure',
-            url: 'http://{s}.tile.openweathermap.org/map/pressure_cntr/{z}/{x}/{y}.png',
+            url: 'http://{s}.tile.openweathermap.org/map/pressure_cntr/{z}/{x}/{y}.png?APPID=8e0f9d1de886ff78c6bab40f2e6d1afe',
             useEsri: false,
             options: {
                 attribution: 'Map data (c) OpenWeatherMap',
@@ -135,7 +135,7 @@ ogrid.Config = {
         }, {
             groupName: 'Open Weather Layers',
             name: 'Temperature',
-            url: 'http://{s}.tile.openweathermap.org/map/temp/{z}/{x}/{y}.png',
+            url: 'http://{s}.tile.openweathermap.org/map/temp/{z}/{x}/{y}.png?APPID=8e0f9d1de886ff78c6bab40f2e6d1afe',
             useEsri: false,
             options: {
                 attribution: 'Map data (c) OpenWeatherMap',
@@ -264,4 +264,4 @@ ogrid.Config = {
         url: 'http://opengrid.readthedocs.org/en/latest/User%20Documentation',
         type: 'icon' //valid values are 'button' or 'icon'
     }
-};
+};

src/js/ux/AdvancedSearch.js

@@ -749,9 +749,9 @@ ogrid.AdvancedSearch = ogrid.Class.extend({
 
         //register with browser history
         if (query.geoFilter && query.geoFilter.boundary === '_map-extent') {
-            hasher.setHash("query?q=" + JSON.stringify(query).replace('#', encodeURIComponent('#')) + "&loc=" + this._getMapLocation() + "&run=" + autoexec + randomData);
+            hasher.setHash("query?q=" + JSON.stringify(query).replace(/#/g, encodeURIComponent('#')) + "&loc=" + this._getMapLocation() + "&run=" + autoexec + randomData);
         } else {
-            hasher.setHash("query?q=" + JSON.stringify(query).replace('#', encodeURIComponent('#')) + "&run=" + autoexec + randomData);
+            hasher.setHash("query?q=" + JSON.stringify(query).replace(/#/g, encodeURIComponent('#')) + "&run=" + autoexec + randomData);
         }
     },
 

src/js/ux/Main.js

@@ -75,8 +75,10 @@ ogrid.Main = ogrid.Class.extend({
             }
             console.log(o);
 
-	    //#issue 115; replace hash here or we'll get an error
-            o.q = o.q.replace(encodeURIComponent('#'), "#");
+	    var regex = new RegExp(encodeURIComponent('#'),'g');
+
+            //#issue 115; replace hash here or we'll get an error
+            o.q = o.q.replace(regex, '#');
 
             me._loadQuery(
                 o.q,

src/js/ux/TableView.js

@@ -232,6 +232,7 @@ ogrid.TableView = ogrid.Class.extend({
         //events to handle re-activation of popovers (for now, use the same event handler)
         $t.on('page-change.bs.table', $.proxy(this._onPageChange, this));
         $t.on('sort.bs.table', $.proxy(this._onPageChange, this));
+        $t.on('column-switch.bs.table', $.proxy(this._onPageChange, this));
 
         //highlight of clicked row
         $t.on('click', 'tbody tr', function(e) {
@@ -679,4 +680,4 @@ ogrid.TableView = ogrid.Class.extend({
         //$t.bootstrapTable('resetView');
 
     }
-});
+});