diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d7d9c75..57c4c3c 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/README.md b/README.md index 7ec4cfd..1877279 100644 --- a/README.md +++ b/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 diff --git a/docs/User Documentation.md b/docs/User Documentation.md index 64ae959..423ed45 100644 --- a/docs/User Documentation.md +++ b/docs/User Documentation.md @@ -149,7 +149,7 @@ User Manual Icon – Link to accessing the user manual.
  • -Zoom In and Zoom Out Icon +Zoom In and Zoom Out Icon @@ -160,7 +160,7 @@ Zoom In and Zoom Out Icon +Reset Map View and Area Zoom Icon @@ -194,7 +194,7 @@ Zoom specification Icon
    Consist of a list of grid views and weather layers. +Layers Icon
    Consist of list of grid views and weather layers.

    @@ -397,6 +397,7 @@ Tweet dataset provides real-time data and automatically refreshes with new data

    Figure 8. Quick Search on Tweets


    + ### Find Data Panel Note: Manage Queries, Load Saved Query and Save Query As seen in the image below are configurations that can be enabled and disabled within the application. These attributes does not appear in opengrid.io. diff --git a/docs/media/ADDRESSSRCH_001.png b/docs/media/ADDRESSSRCH_001.png new file mode 100644 index 0000000..3d278ad Binary files /dev/null and b/docs/media/ADDRESSSRCH_001.png differ diff --git a/docs/media/OR.jpg b/docs/media/OR.jpg new file mode 100644 index 0000000..70fe2f9 Binary files /dev/null and b/docs/media/OR.jpg differ diff --git a/docs/media/Thumbs.db b/docs/media/Thumbs.db index e163d51..6da3649 100644 Binary files a/docs/media/Thumbs.db and b/docs/media/Thumbs.db differ diff --git a/docs/media/and.jpg b/docs/media/and.jpg new file mode 100644 index 0000000..00eec75 Binary files /dev/null and b/docs/media/and.jpg differ diff --git a/docs/media/andoper.jpg b/docs/media/andoper.jpg new file mode 100644 index 0000000..67cd33d Binary files /dev/null and b/docs/media/andoper.jpg differ diff --git a/docs/media/barg.jpg b/docs/media/barg.jpg new file mode 100644 index 0000000..71f876c Binary files /dev/null and b/docs/media/barg.jpg differ diff --git a/docs/media/heat.jpg b/docs/media/heat.jpg new file mode 100644 index 0000000..b5e1069 Binary files /dev/null and b/docs/media/heat.jpg differ diff --git a/docs/media/linegraph.jpg b/docs/media/linegraph.jpg new file mode 100644 index 0000000..d77953e Binary files /dev/null and b/docs/media/linegraph.jpg differ diff --git a/docs/media/mltisng.png b/docs/media/mltisng.png new file mode 100644 index 0000000..4e581ef Binary files /dev/null and b/docs/media/mltisng.png differ diff --git a/docs/media/mpkey.jpg b/docs/media/mpkey.jpg new file mode 100644 index 0000000..f749e52 Binary files /dev/null and b/docs/media/mpkey.jpg differ diff --git a/docs/media/nofilter.jpg b/docs/media/nofilter.jpg new file mode 100644 index 0000000..2506cb1 Binary files /dev/null and b/docs/media/nofilter.jpg differ diff --git a/docs/media/notes1.jpg b/docs/media/notes1.jpg new file mode 100644 index 0000000..28ba133 Binary files /dev/null and b/docs/media/notes1.jpg differ diff --git a/docs/media/orexp.jpg b/docs/media/orexp.jpg new file mode 100644 index 0000000..a29f0e2 Binary files /dev/null and b/docs/media/orexp.jpg differ diff --git a/docs/media/piech.jpg b/docs/media/piech.jpg new file mode 100644 index 0000000..2453560 Binary files /dev/null and b/docs/media/piech.jpg differ diff --git a/docs/media/remarks.jpg b/docs/media/remarks.jpg new file mode 100644 index 0000000..e759440 Binary files /dev/null and b/docs/media/remarks.jpg differ diff --git a/docs/media/rtime.png b/docs/media/rtime.png new file mode 100644 index 0000000..f24bd13 Binary files /dev/null and b/docs/media/rtime.png differ diff --git a/docs/media/status.jpg b/docs/media/status.jpg new file mode 100644 index 0000000..415c830 Binary files /dev/null and b/docs/media/status.jpg differ diff --git a/docs/media/tile1.jpg b/docs/media/tile1.jpg new file mode 100644 index 0000000..e26fdd8 Binary files /dev/null and b/docs/media/tile1.jpg differ diff --git a/src/js/custom/Config.js b/src/js/custom/Config.js index 6aa5a5c..8782953 100644 --- a/src/js/custom/Config.js +++ b/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' } -}; \ No newline at end of file +}; diff --git a/src/js/ux/AdvancedSearch.js b/src/js/ux/AdvancedSearch.js index 99ef32a..c785835 100644 --- a/src/js/ux/AdvancedSearch.js +++ b/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); } }, diff --git a/src/js/ux/Main.js b/src/js/ux/Main.js index 0060af1..bfc3803 100644 --- a/src/js/ux/Main.js +++ b/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, diff --git a/src/js/ux/TableView.js b/src/js/ux/TableView.js index b6dc811..63cc1fb 100644 --- a/src/js/ux/TableView.js +++ b/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'); } -}); \ No newline at end of file +});