🐛 👕 fix nested geo fields, eslint cleanup

Author: rueckstiess

package.json

@@ -92,6 +92,7 @@
     "ampersand-sync-localforage": "^0.1.1",
     "ampersand-view": "^9.0.0",
     "ampersand-view-switcher": "^2.0.0",
+    "async": "^1.5.0",
     "backoff": "^2.4.1",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
     "browserify": "^12.0.1",

src/field-list/index.js

@@ -147,9 +147,9 @@ FieldListView = View.extend({
   },
   makeFieldVisible: function() {
     var views = this.fieldCollectionView.views;
-    _.each(views, function(field_view) {
+    _.each(views, function(fieldView) {
       raf(function() {
-        field_view.visible = true;
+        fieldView.visible = true;
       });
     });
   },

src/minicharts/d3fns/geo.js

@@ -195,7 +195,7 @@ var minicharts_d3fns_geo = function() {
       var el = d3.select(this);
 
       if (!singleton.google) {
-        parallel({ timeoutMS: 3000 }, [  // 10 second timeout
+        parallel({ timeoutMS: 5000 }, [  // 5 second timeout
           // tasks
           function(done) {
             GoogleMapsLoader.KEY = 'AIzaSyDrhE1qbcnNIh4sK3t7GEcbLRdCNKWjlt0';
@@ -321,10 +321,28 @@ var minicharts_d3fns_geo = function() {
         });
       }
 
-      _.defer(function() {
-        google.maps.event.trigger(googleMap, 'resize');
-        googleMap.fitBounds(bounds);
-      }, 100);
+      // need to fit the map bounds after view became visible
+      var fieldView = options.view.parent.parent;
+      if (fieldView.parent.parent.modelType === 'FieldView') {
+        debug('we are in a nested field, wait until it expands...');
+        // we're inside a nested list, wait until expanded
+        var parentFieldView = fieldView.parent.parent;
+        parentFieldView.on('change:expanded', function(view, value) {
+          if (value) {
+            debug('field %s expanded. fitting map.', view.model.name);
+            _.defer(function() {
+              google.maps.event.trigger(googleMap, 'resize');
+              googleMap.fitBounds(bounds);
+            });
+          }
+        });
+      } else {
+        debug('toplevel location field. fitting map.');
+        _.defer(function() {
+          google.maps.event.trigger(googleMap, 'resize');
+          googleMap.fitBounds(bounds);
+        });
+      }
     }); // end selection.each()
   }
 

src/minicharts/index.js

@@ -8,9 +8,10 @@ var DocumentRootMinichartView = require('./document-root');
 var ArrayRootMinichartView = require('./array-root');
 var vizFns = require('./d3fns');
 var QueryBuilderMixin = require('./querybuilder');
-var debug = require('debug')('scout:minicharts:index');
 var Collection = require('ampersand-collection');
 
+// var debug = require('debug')('scout:minicharts:index');
+
 var ArrayCollection = Collection.extend({
   model: Array
 });
@@ -57,7 +58,11 @@ module.exports = AmpersandView.extend(QueryBuilderMixin, {
     }
     return false;
   },
+  /* eslint complexity: 0 */
   render: function() {
+    var isGeo = false;
+    var coords;
+
     this.renderWithTemplate(this);
 
     if (['String', 'Number'].indexOf(this.model.name) !== -1
@@ -70,7 +75,6 @@ module.exports = AmpersandView.extend(QueryBuilderMixin, {
     } else if (this.model.name === 'Document') {
       // are these coordinates? Do a basic check for now, until we support semantic schema types
       // here we check for GeoJSON form: { loc: {type: "Point", "coordinates": [47.80, 9.63] } }
-      var isGeo = false;
       if (app.isFeatureEnabled('Geo Minicharts')) {
         if (this.model.fields.length === 2
           && this.model.fields.get('type')
@@ -81,7 +85,7 @@ module.exports = AmpersandView.extend(QueryBuilderMixin, {
              === this.model.fields.get('coordinates').count
           && this.model.fields.get('coordinates').types.get('Array').average_length === 2
         ) {
-          var coords =this._mangleGeoCoordinates(
+          coords = this._mangleGeoCoordinates(
             this.model.fields.get('coordinates').types.get('Array')
             .types.get('Number').values.serialize());
           if (coords) {
@@ -103,13 +107,13 @@ module.exports = AmpersandView.extend(QueryBuilderMixin, {
         this.subview = new DocumentRootMinichartView(this.viewOptions);
       }
     } else if (this.model.name === 'Array') {
-      var isGeo = false;
+      isGeo = false;
       if (app.isFeatureEnabled('Geo Minicharts')) {
         // are these coordinates? Do a basic check for now, until we support semantic schema types
         // here we check for legacy coordinates in array form: { loc: [47.80, 9.63] }
         var lengths = this.model.lengths;
         if (_.min(lengths) === 2 && _.max(lengths) === 2) {
-          var coords = this._mangleGeoCoordinates(
+          coords = this._mangleGeoCoordinates(
             this.model.types.get('Number').values.serialize());
           if (coords) {
             this.model.values = coords;

src/minicharts/querybuilder.js

@@ -8,7 +8,8 @@ var LeafClause = require('mongodb-language-model').LeafClause;
 var ListOperator = require('mongodb-language-model').ListOperator;
 var GeoOperator = require('mongodb-language-model').GeoOperator;
 var Range = require('mongodb-language-model').helpers.Range;
-var debug = require('debug')('scout:minicharts:querybuilder');
+
+// var debug = require('debug')('scout:minicharts:querybuilder');
 
 var MODIFIERKEY = 'shiftKey';
 var checkBounds = {
@@ -48,6 +49,7 @@ module.exports = {
    * }
    *
    */
+  /* eslint complexity: 0 */
   handleQueryBuilderEvent: function(data) {
     var queryType;