[#141,view/map][s]: support for all of elasticsearch geo_point / location objects - fixes #141.

* [lon, lat]
* "lat,lon"
* Bonus (non-ES): "(lat,lon)"

Also (accidentally included):

* upgrade to qunit 1.5.0 (much better stack traces!)

src/view.map.js

@@ -227,38 +227,55 @@ my.Map = Backbone.View.extend({
   // Private: Return a GeoJSON geomtry extracted from the record fields
   //
   _getGeometryFromRecord: function(doc){
-    if (this._geomReady()){
+    if (this.state.get('geomField')){
-      if (this.state.get('geomField')){
+      var value = doc.get(this.state.get('geomField'));
-        var value = doc.get(this.state.get('geomField'));
+      if (typeof(value) === 'string'){
-        if (typeof(value) === 'string'){
+        // We *may* have a GeoJSON string representation
-          // We *may* have a GeoJSON string representation
+        try {
-          try {
+          value = $.parseJSON(value);
-            value = $.parseJSON(value);
+        } catch(e) {}
-          } catch(e) {
+      }
-          }
+
-        }
+      if (typeof(value) === 'string') {
-        if (value && value.lat) {
+        value = value.replace('(', '').replace(')', '');
-          // not yet geojson so convert
+        var parts = value.split(',');
-          value = {
+        var lat = parseFloat(parts[0]);
-            "type": "Point",
+        var lon = parseFloat(parts[1]);
-            "coordinates": [value.lon || value.lng, value.lat]
+        if (!isNaN(lon) && !isNaN(parseFloat(lat))) {
-          };
+          return {
-        }
+            "type": "Point",
-        // We now assume that contents of the field are a valid GeoJSON object
+            "coordinates": [lon, lat]
-        return value;
+          };
-      } else if (this.state.get('lonField') && this.state.get('latField')){
+        } else {
-        // We'll create a GeoJSON like point object from the two lat/lon fields
+          return null;
-        var lon = doc.get(this.state.get('lonField'));
+        }
-        var lat = doc.get(this.state.get('latField'));
+      } else if (value && value.slice) {
-        if (!isNaN(parseFloat(lon)) && !isNaN(parseFloat(lat))) {
+        // [ lon, lat ]
-          return {
+        return {
-            type: 'Point',
+          "type": "Point",
-            coordinates: [lon,lat]
+          "coordinates": [value[0], value[1]]
-          };
+        };
-        }
+      } else if (value && value.lat) {
+        // of form { lat: ..., lon: ...}
+        return {
+          "type": "Point",
+          "coordinates": [value.lon || value.lng, value.lat]
+        };
+      }
+      // We o/w assume that contents of the field are a valid GeoJSON object
+      return value;
+    } else if (this.state.get('lonField') && this.state.get('latField')){
+      // We'll create a GeoJSON like point object from the two lat/lon fields
+      var lon = doc.get(this.state.get('lonField'));
+      var lat = doc.get(this.state.get('latField'));
+      if (!isNaN(parseFloat(lon)) && !isNaN(parseFloat(lat))) {
+        return {
+          type: 'Point',
+          coordinates: [lon,lat]
+        };
       }
-      return null;
     }
+    return null;
   },
 
   // Private: Check if there is a field with GeoJSON geometries or alternatively,

test/qunit/qunit.css

@@ -1,9 +1,9 @@
 /**
- * QUnit - A JavaScript Unit Testing Framework
+ * QUnit v1.6.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -54,6 +54,11 @@
 	color: #fff;
 }
 
+#qunit-header label {
+	display: inline-block;
+	padding-left: 0.5em;
+}
+
 #qunit-banner {
 	height: 5px;
 }
@@ -186,6 +191,7 @@
 	color: #710909;
 	background-color: #fff;
 	border-left: 26px solid #EE5757;
+	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
@@ -215,6 +221,9 @@
 
 	border-bottom: 1px solid white;
 }
+#qunit-testresult .module-name {
+	font-weight: bold;
+}
 
 /** Fixture */
 
@@ -222,4 +231,6 @@
 	position: absolute;
 	top: -10000px;
 	left: -10000px;
+	width: 1000px;
+	height: 1000px;
 }

test/view.graph.test.js

@@ -38,6 +38,7 @@ test('initialize', function () {
 });
 
 test('dates in graph view', function () {
+  expect(0);
   var dataset = Fixture.getDataset();
   var view = new recline.View.Graph({
     model: dataset,

test/view.map.test.js

@@ -105,21 +105,25 @@ test('GeoJSON geom field', function () {
   view.remove();
 });
 
-test('geom field non-GeoJSON', function () {
+test('_getGeometryFromRecord non-GeoJSON', function () {
-  var data = [{
+  var test = [
-    location: { lon: 47, lat: 53},
+    [{ lon: 47, lat: 53}, [47,53]],
-    title: 'abc'
+    ["53.3,47.32", [47.32, 53.3]],
-  }];
+    ["53.3, 47.32", [47.32, 53.3]],
-  var dataset = recline.Backend.Memory.createDataset(data);
+    ["(53.3,47.32)", [47.32, 53.3]],
+    [[53.3,47.32], [53.3, 47.32]]
+  ];
   var view = new recline.View.Map({
-    model: dataset
+    model: recline.Backend.Memory.createDataset([{a: 1}]),
+    state: {
+      geomField: 'location'
+    }
+  });
+  _.each(test, function(item) {
+    var record = new recline.Model.Record({location: item[0]});
+    var out = view._getGeometryFromRecord(record);
+    deepEqual(out.coordinates, item[1]);
   });
-
-  //Fire query, otherwise the map won't be initialized
-  dataset.query();
-
-  // Check that all features were created
-  equal(_getFeaturesCount(view.features), 1);
 });
 
 test('Popup', function () {