Merge pull request #2 from Chicago/master

Merge CoC 1.3.0 Changes
Chicago · Jan 3, 2017 · 1efca5d · 1efca5d
2 parents 8bea277 + f66f1a2
commit 1efca5d
Show file tree

Hide file tree

Showing 140 changed files with 17,802 additions and 11,157 deletions.
diff --git a/config/EnvSettings.js b/config/EnvSettings.js
@@ -2,14 +2,12 @@
 //Defaults are still held in Config.js
 
 ogrid.Config.service.endpoint = 'http://localhost:8080/opengridservice/rest';
+//ogrid.Config.service.endpoint = 'http://opengrid-service-dev-1134290206.us-west-2.elb.amazonaws.com/opengrid-service/rest';
 
 //http://chicago.opengrid.io/opengrid-service/rest
 //ogrid.Config.service.endpoint = 'http://chicago.opengrid.io/opengrid-service/rest';
 //ogrid.Config.service.autologin = true;
 //ogrid.Config.map.mapLibraryOptions.center = [40.7127, -74.0059];
 
-ogrid.Config.tileMapHide = false;
-
-ogrid.Config.helpButtonHide = true;
-ogrid.Config.help.configSectionTitle = 'Open Section';
-ogrid.Config.help.configSectionText = 'To be Configured';
+//ogrid.Config.help.configSectionTitle = 'Open Section';
+//ogrid.Config.help.configSectionText = 'To be Configured';
diff --git a/docs/OpenGrid API.md b/docs/OpenGrid API.md
@@ -1,5 +1,5 @@
 <h1 align="center">OpenGrid REST Service <br> Application Programming Interface (API)</h1>
-<h4 align="center">Version 1.1.0</h4>
+<h4 align="center">Version 1.3.0</h4>
 
 <!--
 ## Table of Contents
@@ -1049,6 +1049,32 @@ It is recommended that this value be URL encoded.
 	}
 
 ```
+**Method**
+<p><b>POST</b>/datasets/{dataset_id}/query</p>
+
+<p>Execute a query against a specific dataset. The POST method is now supported to accomodate bigger request payloads primarily due to geo-spatial filters (for OpenGrid services that support geo-spatial filtering)</p>
+
+<p><b>Request Parameters</b></p>
+The parameter names are the same as the ones on the GET method above except that they should be passed as form data. See Sample request payload below.
+
+<p><b>Sample Request Payload</b></p>
+```
+------WebKitFormBoundaryOvluSdchMLVGg7rd
+Content-Disposition: form-data; name="q"
+
+{}
+------WebKitFormBoundaryOvluSdchMLVGg7rd
+Content-Disposition: form-data; name="n"
+
+6000
+------WebKitFormBoundaryOvluSdchMLVGg7rd
+Content-Disposition: form-data; name="opts"
+
+{"geoFilter":{"type":"MultiPolygon","coordinates":[[[[-87.65630722045898,41.89850786255543],[-87.60510921478273,41.89850786255543],[-87.60510921478273,41.87588812018588],[-87.65630722045898,41.87588812018588],[-87.65630722045898,41.89850786255543]]]]}}
+------WebKitFormBoundaryOvluSdchMLVGg7rd--
+```
+<p><b>Sample Response</b></p>
+See sample response for the GET method above.
 
 ## 1.1.10 /queries
 

diff --git a/docs/media/dec01.jpg b/docs/media/dec01.jpg
diff --git a/docs/media/dec02.jpg b/docs/media/dec02.jpg
diff --git a/docs/media/dec03.jpg b/docs/media/dec03.jpg
diff --git a/docs/media/dec04.jpg b/docs/media/dec04.jpg
diff --git a/docs/media/dec05.jpg b/docs/media/dec05.jpg
diff --git a/docs/media/dec06.jpg b/docs/media/dec06.jpg
diff --git a/docs/media/dec07.jpg b/docs/media/dec07.jpg
diff --git a/docs/media/dec08.jpg b/docs/media/dec08.jpg
diff --git a/docs/media/dec09.jpg b/docs/media/dec09.jpg
diff --git a/docs/media/dec10.jpg b/docs/media/dec10.jpg
diff --git a/docs/media/dec11.jpg b/docs/media/dec11.jpg
diff --git a/docs/media/dec12.jpg b/docs/media/dec12.jpg
diff --git a/docs/media/dec13.jpg b/docs/media/dec13.jpg
diff --git a/docs/media/dec14.jpg b/docs/media/dec14.jpg
diff --git a/docs/media/dec15.jpg b/docs/media/dec15.jpg
diff --git a/docs/media/dec16.jpg b/docs/media/dec16.jpg
diff --git a/docs/media/dec17.jpg b/docs/media/dec17.jpg
diff --git a/docs/media/dec18.jpg b/docs/media/dec18.jpg
diff --git a/docs/media/dec19.jpg b/docs/media/dec19.jpg
diff --git a/docs/media/dec20.jpg b/docs/media/dec20.jpg
diff --git a/docs/media/dec21.jpg b/docs/media/dec21.jpg
diff --git a/docs/media/dec22.jpg b/docs/media/dec22.jpg
diff --git a/docs/media/dec23.jpg b/docs/media/dec23.jpg
diff --git a/docs/media/dec24.jpg b/docs/media/dec24.jpg
diff --git a/docs/media/dec25.jpg b/docs/media/dec25.jpg
diff --git a/docs/media/dec26.jpg b/docs/media/dec26.jpg
diff --git a/docs/media/dec27.jpg b/docs/media/dec27.jpg
diff --git a/docs/media/dec28.jpg b/docs/media/dec28.jpg
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,7 +1,7 @@
 // core Gulp
 var gulp = require('gulp'),
 
-    // Gulp plugins
+// Gulp plugins
     rimraf = require('rimraf'),
     jshint = require('gulp-jshint'),
     sass = require('gulp-sass'),
@@ -64,7 +64,7 @@ var third_party_sources = [
     'lib/bootstrap-3.3.5/js/bootstrap.js',
     'lib/bootstrap-3.3.5/js/moment-with-locales.js',
     'lib/bootstrap-table-1.8.1/js/bootstrap-table.js',
-    'lib/leaflet-0.7.3/js/leaflet-src.js',
+    'lib/leaflet-1.0.1/js/leaflet-src.js',
     'lib/jspdf-1.1.135/js/jspdf.js',
     'lib/**/*.js'
 ];
@@ -84,12 +84,6 @@ gulp.task('templates-debug', function () {
         .pipe(gulp.dest('./debug/templates'));
 });
 
-//need to copy help html file
-gulp.task('copy-help-html', function () {
-    return gulp.src('./src/help.html')
-        .pipe(gulp.dest('./dist'));
-});
-
 gulp.task('html-debug', function(){
     return gulp.src('./src/index.html')
         .pipe(inject(
@@ -107,7 +101,7 @@ gulp.task('html-debug', function(){
                         return '!' + v;
                     })
                 ), {read: false}),
-                gulp.src(injectLastCss, {read: false})
+            gulp.src(injectLastCss, {read: false})
             ),
             { relative: false, addRootSlash: false, addPrefix: '..' }
         ))
@@ -116,7 +110,7 @@ gulp.task('html-debug', function(){
 
 gulp.task('leaflet-images-debug', function () {
     return gulp.src([
-        './lib/leaflet*/js/images/*.png'
+            './lib/leaflet*/js/images/*.png'
         ])
         .pipe(flatten())
         .pipe(gulp.dest('debug/images'));
@@ -141,12 +135,12 @@ gulp.task('clean', function (cb) {
 gulp.task('css-app', function() {
     //minify except for injectLastCss files
     return gulp.src([
-        'src/css/*.css'
+            'src/css/*.css'
         ].concat(
-            //negate/exclude our injectLastCss files
-            injectLastCss.map(function(v){
+        //negate/exclude our injectLastCss files
+        injectLastCss.map(function(v){
             return '!' + v;
-            })
+        })
         ))
         .pipe(minifyCss({compatibility: 'ie8'}))
         .pipe(concat('app.css'))
@@ -180,24 +174,24 @@ gulp.task('css', ['css-app', 'css-lib' ]);
 //some leaflet components expect their images on a specific folder
 gulp.task('images-leaflet1', function () {
     return gulp.src([
-        './lib/leaflet*/css/images/*',
-    ])
+            './lib/leaflet*/css/images/*',
+        ])
         .pipe(flatten())
         .pipe(gulp.dest('dist/css/images'));
 });
 
 gulp.task('images-leaflet2', function () {
     return gulp.src([
-        './lib/leaflet*/css/fullscreen*.png',
-    ])
+            './lib/leaflet*/css/fullscreen*.png',
+        ])
         .pipe(flatten())
         .pipe(gulp.dest('dist/css'));
 });
 
 gulp.task('images-all', function () {
     return gulp.src([
-        './lib/**/*.png'
-    ])
+            './lib/**/*.png'
+        ])
         .pipe(flatten())
         .pipe(gulp.dest('dist/images'));
 });
@@ -213,8 +207,8 @@ gulp.task('images', ['images-leaflet1', 'images-leaflet2', 'images-all', 'images
 
 gulp.task('fonts', function () {
     return gulp.src([
-        './lib/**/fonts/*'
-    ])
+            './lib/**/fonts/*'
+        ])
         .pipe(flatten())
         .pipe(gulp.dest('dist/fonts'));
 });
@@ -256,7 +250,7 @@ gulp.task('env-settings',  function(cb) {
 
 gulp.task('env-settings-indiv', function () {
     return gulp.src([
-        './config/**/*', '!./config/EnvSettings*.js'
+            './config/**/*', '!./config/EnvSettings*.js'
         ])
         //use straight rename based on common hash
         .pipe(rename(function (filename) {
@@ -271,7 +265,7 @@ gulp.task('env-settings-indiv', function () {
 
 gulp.task('env-settings-root', function () {
     return gulp.src([
-        './config/EnvSettings.js'
+            './config/EnvSettings.js'
         ])
         .pipe(rev())
         .pipe(gulp.dest('dist/config'))
@@ -320,16 +314,16 @@ gulp.task('html-release', function(){
             addRootSlash: false
         }))
         .pipe(inject(gulp.src(
-                ['./dist/**/app*', '!./dist/**/app.js', './dist/config/EnvSettings*'].concat(
-                    //add our injectLastCss files from dist folder
-                    injectLastCss.map(function(v){
-                        var a = v.split('/');
-                        return './dist/css/' + revManifest[a[a.length-1]];
-                    })
-                ),
-                {read: false}
-                ),
-                {ignorePath: '/dist/', addRootSlash: false}
+            ['./dist/**/app*', '!./dist/**/app.js', './dist/config/EnvSettings*'].concat(
+                //add our injectLastCss files from dist folder
+                injectLastCss.map(function(v){
+                    var a = v.split('/');
+                    return './dist/css/' + revManifest[a[a.length-1]];
+                })
+            ),
+            {read: false}
+            ),
+            {ignorePath: '/dist/', addRootSlash: false}
             )
         )
         .pipe(gulp.dest('./dist'))
@@ -392,7 +386,6 @@ gulp.task('release',  function(cb) {
         'scripts',
         'env-settings',
         'html-release',
-        'copy-help-html',
         cb
     );
 });

diff --git a/lib/leaflet-0.7.3/css/L.Control.Locate.css b/lib/leaflet-0.7.3/css/L.Control.Locate.css
diff --git a/lib/leaflet-0.7.3/css/fullscreen.png b/lib/leaflet-0.7.3/css/fullscreen.png
diff --git a/lib/leaflet-0.7.3/css/[email protected] b/lib/leaflet-0.7.3/css/[email protected]