[#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!)
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
1733
test/qunit/qunit.js
1733
test/qunit/qunit.js
File diff suppressed because it is too large
Load Diff
@@ -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,
|
||||
|
||||
@@ -105,21 +105,25 @@ test('GeoJSON geom field', function () {
|
||||
view.remove();
|
||||
});
|
||||
|
||||
test('geom field non-GeoJSON', function () {
|
||||
var data = [{
|
||||
location: { lon: 47, lat: 53},
|
||||
title: 'abc'
|
||||
}];
|
||||
var dataset = recline.Backend.Memory.createDataset(data);
|
||||
test('_getGeometryFromRecord non-GeoJSON', function () {
|
||||
var test = [
|
||||
[{ lon: 47, lat: 53}, [47,53]],
|
||||
["53.3,47.32", [47.32, 53.3]],
|
||||
["53.3, 47.32", [47.32, 53.3]],
|
||||
["(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 () {
|
||||
|
||||
Reference in New Issue
Block a user