fix formatting
This commit is contained in:
Kajari Ghosh
parent
e0bbaa08ec
commit
5621e555b7
@ -5,260 +5,260 @@ var mld_data_path = require('./constants').mld_data_path;
|
||||
var three_test_coordinates = require('./constants').three_test_coordinates;
|
||||
var two_test_coordinates = require('./constants').two_test_coordinates;
|
||||
|
||||
// test('table: test annotations paramater combination', function(assert) {
|
||||
// assert.plan(12);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
// annotations: ['distance']
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(table['distances'], 'distances table result should exist');
|
||||
// assert.notOk(table['durations'], 'durations table result should not exist');
|
||||
// });
|
||||
test('table: test annotations paramater combination', function(assert) {
|
||||
assert.plan(12);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
annotations: ['distance']
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(table['distances'], 'distances table result should exist');
|
||||
assert.notOk(table['durations'], 'durations table result should not exist');
|
||||
});
|
||||
|
||||
// options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
// annotations: ['duration']
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(table['durations'], 'durations table result should exist');
|
||||
// assert.notOk(table['distances'], 'distances table result should not exist');
|
||||
// });
|
||||
options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
annotations: ['duration']
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(table['durations'], 'durations table result should exist');
|
||||
assert.notOk(table['distances'], 'distances table result should not exist');
|
||||
});
|
||||
|
||||
// options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
// annotations: ['duration', 'distance']
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(table['durations'], 'durations table result should exist');
|
||||
// assert.ok(table['distances'], 'distances table result should exist');
|
||||
// });
|
||||
options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
annotations: ['duration', 'distance']
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(table['durations'], 'durations table result should exist');
|
||||
assert.ok(table['distances'], 'distances table result should exist');
|
||||
});
|
||||
|
||||
// options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]]
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(table['durations'], 'durations table result should exist');
|
||||
// assert.notOk(table['distances'], 'distances table result should not exist');
|
||||
// });
|
||||
// });
|
||||
options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]]
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(table['durations'], 'durations table result should exist');
|
||||
assert.notOk(table['distances'], 'distances table result should not exist');
|
||||
});
|
||||
});
|
||||
|
||||
// test('table: returns buffer', function(assert) {
|
||||
// assert.plan(3);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
// };
|
||||
// osrm.table(options, { format: 'json_buffer' }, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(table instanceof Buffer);
|
||||
// table = JSON.parse(table);
|
||||
// assert.ok(table['durations'], 'distances table result should exist');
|
||||
// });
|
||||
// });
|
||||
test('table: returns buffer', function(assert) {
|
||||
assert.plan(3);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
};
|
||||
osrm.table(options, { format: 'json_buffer' }, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(table instanceof Buffer);
|
||||
table = JSON.parse(table);
|
||||
assert.ok(table['durations'], 'distances table result should exist');
|
||||
});
|
||||
});
|
||||
|
||||
var tables = ['distances', 'durations'];
|
||||
|
||||
tables.forEach(function(annotation) {
|
||||
// test('table: ' + annotation + ' table in Monaco', function(assert) {
|
||||
// assert.plan(11);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
// annotations: [annotation.slice(0,-1)]
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(Array.isArray(table[annotation]), 'result must be an array');
|
||||
// var row_count = table[annotation].length;
|
||||
// for (var i = 0; i < row_count; ++i) {
|
||||
// var column = table[annotation][i];
|
||||
// var column_count = column.length;
|
||||
// assert.equal(row_count, column_count);
|
||||
// for (var j = 0; j < column_count; ++j) {
|
||||
// if (i == j) {
|
||||
// // check that diagonal is zero
|
||||
// assert.equal(0, column[j], 'diagonal must be zero');
|
||||
// } else {
|
||||
// // everything else is non-zero
|
||||
// assert.notEqual(0, column[j], 'other entries must be non-zero');
|
||||
// // and finite (not nan, inf etc.)
|
||||
// assert.ok(Number.isFinite(column[j]), 'distance is finite number');
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// assert.equal(options.coordinates.length, row_count);
|
||||
// });
|
||||
// });
|
||||
test('table: ' + annotation + ' table in Monaco', function(assert) {
|
||||
assert.plan(11);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
annotations: [annotation.slice(0,-1)]
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(Array.isArray(table[annotation]), 'result must be an array');
|
||||
var row_count = table[annotation].length;
|
||||
for (var i = 0; i < row_count; ++i) {
|
||||
var column = table[annotation][i];
|
||||
var column_count = column.length;
|
||||
assert.equal(row_count, column_count);
|
||||
for (var j = 0; j < column_count; ++j) {
|
||||
if (i == j) {
|
||||
// check that diagonal is zero
|
||||
assert.equal(0, column[j], 'diagonal must be zero');
|
||||
} else {
|
||||
// everything else is non-zero
|
||||
assert.notEqual(0, column[j], 'other entries must be non-zero');
|
||||
// and finite (not nan, inf etc.)
|
||||
assert.ok(Number.isFinite(column[j]), 'distance is finite number');
|
||||
}
|
||||
}
|
||||
}
|
||||
assert.equal(options.coordinates.length, row_count);
|
||||
});
|
||||
});
|
||||
|
||||
// test('table: ' + annotation + ' table in Monaco with sources/destinations', function(assert) {
|
||||
// assert.plan(7);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {
|
||||
// coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
// sources: [0],
|
||||
// destinations: [0,1],
|
||||
// annotations: [annotation.slice(0,-1)]
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
// assert.ok(Array.isArray(table[annotation]), 'result must be an array');
|
||||
// var row_count = table[annotation].length;
|
||||
// for (var i = 0; i < row_count; ++i) {
|
||||
// var column = table[annotation][i];
|
||||
// var column_count = column.length;
|
||||
// assert.equal(options.destinations.length, column_count);
|
||||
// for (var j = 0; j < column_count; ++j) {
|
||||
// if (i == j) {
|
||||
// // check that diagonal is zero
|
||||
// assert.equal(0, column[j], 'diagonal must be zero');
|
||||
// } else {
|
||||
// // everything else is non-zero
|
||||
// assert.notEqual(0, column[j], 'other entries must be non-zero');
|
||||
// // and finite (not nan, inf etc.)
|
||||
// assert.ok(Number.isFinite(column[j]), 'distance is finite number');
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// assert.equal(options.sources.length, row_count);
|
||||
// });
|
||||
// });
|
||||
test('table: ' + annotation + ' table in Monaco with sources/destinations', function(assert) {
|
||||
assert.plan(7);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {
|
||||
coordinates: [three_test_coordinates[0], three_test_coordinates[1]],
|
||||
sources: [0],
|
||||
destinations: [0,1],
|
||||
annotations: [annotation.slice(0,-1)]
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
assert.ok(Array.isArray(table[annotation]), 'result must be an array');
|
||||
var row_count = table[annotation].length;
|
||||
for (var i = 0; i < row_count; ++i) {
|
||||
var column = table[annotation][i];
|
||||
var column_count = column.length;
|
||||
assert.equal(options.destinations.length, column_count);
|
||||
for (var j = 0; j < column_count; ++j) {
|
||||
if (i == j) {
|
||||
// check that diagonal is zero
|
||||
assert.equal(0, column[j], 'diagonal must be zero');
|
||||
} else {
|
||||
// everything else is non-zero
|
||||
assert.notEqual(0, column[j], 'other entries must be non-zero');
|
||||
// and finite (not nan, inf etc.)
|
||||
assert.ok(Number.isFinite(column[j]), 'distance is finite number');
|
||||
}
|
||||
}
|
||||
}
|
||||
assert.equal(options.sources.length, row_count);
|
||||
});
|
||||
});
|
||||
|
||||
// test('table: ' + annotation + ' throws on invalid arguments', function(assert) {
|
||||
// assert.plan(15);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {annotations: [annotation.slice(0,-1)]};
|
||||
// assert.throws(function() { osrm.table(options); },
|
||||
// /Two arguments required/);
|
||||
// options.coordinates = null;
|
||||
// assert.throws(function() { osrm.table(options, function() {}); },
|
||||
// /Coordinates must be an array of \(lon\/lat\) pairs/);
|
||||
// options.coordinates = [three_test_coordinates[0]];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /At least two coordinates must be provided/);
|
||||
// options.coordinates = three_test_coordinates[0];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Coordinates must be an array of \(lon\/lat\) pairs/);
|
||||
// options.coordinates = [three_test_coordinates[0][0], three_test_coordinates[0][1]];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Coordinates must be an array of \(lon\/lat\) pairs/);
|
||||
test('table: ' + annotation + ' throws on invalid arguments', function(assert) {
|
||||
assert.plan(15);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {annotations: [annotation.slice(0,-1)]};
|
||||
assert.throws(function() { osrm.table(options); },
|
||||
/Two arguments required/);
|
||||
options.coordinates = null;
|
||||
assert.throws(function() { osrm.table(options, function() {}); },
|
||||
/Coordinates must be an array of \(lon\/lat\) pairs/);
|
||||
options.coordinates = [three_test_coordinates[0]];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/At least two coordinates must be provided/);
|
||||
options.coordinates = three_test_coordinates[0];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Coordinates must be an array of \(lon\/lat\) pairs/);
|
||||
options.coordinates = [three_test_coordinates[0][0], three_test_coordinates[0][1]];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Coordinates must be an array of \(lon\/lat\) pairs/);
|
||||
|
||||
// options.coordinates = two_test_coordinates;
|
||||
// assert.throws(function() { osrm.table(options, { format: 'invalid' }, function(err, response) {}) },
|
||||
// /format must be a string:/);
|
||||
options.coordinates = two_test_coordinates;
|
||||
assert.throws(function() { osrm.table(options, { format: 'invalid' }, function(err, response) {}) },
|
||||
/format must be a string:/);
|
||||
|
||||
// options.sources = true;
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Sources must be an array of indices \(or undefined\)/);
|
||||
// options.sources = [0, 4];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Source indices must be less than or equal to the number of coordinates/);
|
||||
// options.sources = [0.3, 1.1];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Source must be an integer/);
|
||||
options.sources = true;
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Sources must be an array of indices \(or undefined\)/);
|
||||
options.sources = [0, 4];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Source indices must be less than or equal to the number of coordinates/);
|
||||
options.sources = [0.3, 1.1];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Source must be an integer/);
|
||||
|
||||
// options.destinations = true;
|
||||
// delete options.sources;
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Destinations must be an array of indices \(or undefined\)/);
|
||||
// options.destinations = [0, 4];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Destination indices must be less than or equal to the number of coordinates/);
|
||||
// options.destinations = [0.3, 1.1];
|
||||
// assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Destination must be an integer/);
|
||||
options.destinations = true;
|
||||
delete options.sources;
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Destinations must be an array of indices \(or undefined\)/);
|
||||
options.destinations = [0, 4];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Destination indices must be less than or equal to the number of coordinates/);
|
||||
options.destinations = [0.3, 1.1];
|
||||
assert.throws(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Destination must be an integer/);
|
||||
|
||||
// // does not throw: the following two have been changed in OSRM v5
|
||||
// options.sources = [0, 1];
|
||||
// delete options.destinations;
|
||||
// assert.doesNotThrow(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /Both sources and destinations need to be specified/);
|
||||
// options.destinations = [0, 1];
|
||||
// assert.doesNotThrow(function() { osrm.table(options, function(err, response) {}) },
|
||||
// /You can either specify sources and destinations, or coordinates/);
|
||||
// does not throw: the following two have been changed in OSRM v5
|
||||
options.sources = [0, 1];
|
||||
delete options.destinations;
|
||||
assert.doesNotThrow(function() { osrm.table(options, function(err, response) {}) },
|
||||
/Both sources and destinations need to be specified/);
|
||||
options.destinations = [0, 1];
|
||||
assert.doesNotThrow(function() { osrm.table(options, function(err, response) {}) },
|
||||
/You can either specify sources and destinations, or coordinates/);
|
||||
|
||||
// assert.throws(function() { osrm.route({coordinates: two_test_coordinates, generate_hints: null}, function(err, route) {}) },
|
||||
// /generate_hints must be of type Boolean/);
|
||||
// });
|
||||
assert.throws(function() { osrm.route({coordinates: two_test_coordinates, generate_hints: null}, function(err, route) {}) },
|
||||
/generate_hints must be of type Boolean/);
|
||||
});
|
||||
|
||||
// test('table: throws on invalid arguments', function(assert) {
|
||||
// assert.plan(1);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// assert.throws(function() { osrm.table(null, function() {}); },
|
||||
// /First arg must be an object/);
|
||||
// });
|
||||
test('table: throws on invalid arguments', function(assert) {
|
||||
assert.plan(1);
|
||||
var osrm = new OSRM(data_path);
|
||||
assert.throws(function() { osrm.table(null, function() {}); },
|
||||
/First arg must be an object/);
|
||||
});
|
||||
|
||||
// test('table: ' + annotation + ' table in Monaco with hints', function(assert) {
|
||||
// assert.plan(5);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {
|
||||
// coordinates: two_test_coordinates,
|
||||
// generate_hints: true, // true is default but be explicit here
|
||||
// annotations: [annotation.slice(0,-1)]
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
test('table: ' + annotation + ' table in Monaco with hints', function(assert) {
|
||||
assert.plan(5);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {
|
||||
coordinates: two_test_coordinates,
|
||||
generate_hints: true, // true is default but be explicit here
|
||||
annotations: [annotation.slice(0,-1)]
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
|
||||
// function assertHasHints(waypoint) {
|
||||
// assert.notStrictEqual(waypoint.hint, undefined);
|
||||
// }
|
||||
function assertHasHints(waypoint) {
|
||||
assert.notStrictEqual(waypoint.hint, undefined);
|
||||
}
|
||||
|
||||
// table.sources.map(assertHasHints);
|
||||
// table.destinations.map(assertHasHints);
|
||||
// });
|
||||
// });
|
||||
table.sources.map(assertHasHints);
|
||||
table.destinations.map(assertHasHints);
|
||||
});
|
||||
});
|
||||
|
||||
// test('table: ' + annotation + ' table in Monaco without hints', function(assert) {
|
||||
// assert.plan(5);
|
||||
// var osrm = new OSRM(data_path);
|
||||
// var options = {
|
||||
// coordinates: two_test_coordinates,
|
||||
// generate_hints: false, // true is default
|
||||
// annotations: [annotation.slice(0,-1)]
|
||||
// };
|
||||
// osrm.table(options, function(err, table) {
|
||||
// assert.ifError(err);
|
||||
test('table: ' + annotation + ' table in Monaco without hints', function(assert) {
|
||||
assert.plan(5);
|
||||
var osrm = new OSRM(data_path);
|
||||
var options = {
|
||||
coordinates: two_test_coordinates,
|
||||
generate_hints: false, // true is default
|
||||
annotations: [annotation.slice(0,-1)]
|
||||
};
|
||||
osrm.table(options, function(err, table) {
|
||||
assert.ifError(err);
|
||||
|
||||
// function assertHasNoHints(waypoint) {
|
||||
// assert.strictEqual(waypoint.hint, undefined);
|
||||
// }
|
||||
function assertHasNoHints(waypoint) {
|
||||
assert.strictEqual(waypoint.hint, undefined);
|
||||
}
|
||||
|
||||
// table.sources.map(assertHasNoHints);
|
||||
// table.destinations.map(assertHasNoHints);
|
||||
// });
|
||||
// });
|
||||
table.sources.map(assertHasNoHints);
|
||||
table.destinations.map(assertHasNoHints);
|
||||
});
|
||||
});
|
||||
|
||||
// test('table: ' + annotation + ' table in Monaco without motorways', function(assert) {
|
||||
// assert.plan(1);
|
||||
// var osrm = new OSRM({path: mld_data_path, algorithm: 'MLD'});
|
||||
// var options = {
|
||||
// coordinates: two_test_coordinates,
|
||||
// exclude: ['motorway'],
|
||||
// annotations: [annotation.slice(0,-1)]
|
||||
// };
|
||||
// osrm.table(options, function(err, response) {
|
||||
// assert.equal(response[annotation].length, 2);
|
||||
// });
|
||||
// });
|
||||
test('table: ' + annotation + ' table in Monaco without motorways', function(assert) {
|
||||
assert.plan(1);
|
||||
var osrm = new OSRM({path: mld_data_path, algorithm: 'MLD'});
|
||||
var options = {
|
||||
coordinates: two_test_coordinates,
|
||||
exclude: ['motorway'],
|
||||
annotations: [annotation.slice(0,-1)]
|
||||
};
|
||||
osrm.table(options, function(err, response) {
|
||||
assert.equal(response[annotation].length, 2);
|
||||
});
|
||||
});
|
||||
|
||||
// test('table: ' + annotation + ' table in Monaco with fallback speeds', function(assert) {
|
||||
// assert.plan(1);
|
||||
// var osrm = new OSRM({path: mld_data_path, algorithm: 'MLD'});
|
||||
// var options = {
|
||||
// coordinates: two_test_coordinates,
|
||||
// annotations: [annotation.slice(0,-1)],
|
||||
// fallback_speed: 1,
|
||||
// fallback_coordinate: 'input'
|
||||
// };
|
||||
// osrm.table(options, function(err, response) {
|
||||
// assert.equal(response[annotation].length, 2);
|
||||
// });
|
||||
// });
|
||||
test('table: ' + annotation + ' table in Monaco with fallback speeds', function(assert) {
|
||||
assert.plan(1);
|
||||
var osrm = new OSRM({path: mld_data_path, algorithm: 'MLD'});
|
||||
var options = {
|
||||
coordinates: two_test_coordinates,
|
||||
annotations: [annotation.slice(0,-1)],
|
||||
fallback_speed: 1,
|
||||
fallback_coordinate: 'input'
|
||||
};
|
||||
osrm.table(options, function(err, response) {
|
||||
assert.equal(response[annotation].length, 2);
|
||||
});
|
||||
});
|
||||
|
||||
test('table: ' + annotation + ' table in Monaco with invalid fallback speeds and fallback coordinates', function(assert) {
|
||||
assert.plan(4);
|
||||
|
||||
@ -99,6 +99,12 @@ BOOST_AUTO_TEST_CASE(invalid_table_urls)
|
||||
28UL);
|
||||
BOOST_CHECK_EQUAL(testInvalidOptions<TableParameters>("1,2;3,4?annotations=durations&fallback_speed=-1"),
|
||||
28UL);
|
||||
BOOST_CHECK_EQUAL(
|
||||
testInvalidOptions<TableParameters>("1,2;3,4?annotations=durations&fallback_speed=0"),
|
||||
28UL);
|
||||
BOOST_CHECK_EQUAL(
|
||||
testInvalidOptions<TableParameters>("1,2;3,4?annotations=durations&fallback_speed=-1"),
|
||||
28UL);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(valid_route_hint)
|
||||
@ -574,9 +580,16 @@ BOOST_AUTO_TEST_CASE(valid_table_urls)
|
||||
CHECK_EQUAL_RANGE(reference_7.sources, result_7->sources);
|
||||
CHECK_EQUAL_RANGE(reference_7.destinations, result_7->destinations);
|
||||
|
||||
<<<<<<< HEAD
|
||||
auto result_8 = parseParameters<TableParameters>("1,2;3,4?sources=all&destinations=all&"
|
||||
"annotations=duration&fallback_speed=1&"
|
||||
"fallback_coordinate=snapped&scale_factor=2");
|
||||
=======
|
||||
TableParameters reference_8{};
|
||||
reference_8.coordinates = coords_1;
|
||||
auto result_8 =
|
||||
parseParameters<TableParameters>("1,2;3,4?annotations=distance&fallback_speed=2.5");
|
||||
>>>>>>> fix formatting
|
||||
BOOST_CHECK(result_8);
|
||||
CHECK_EQUAL_RANGE(reference_1.sources, result_3->sources);
|
||||
CHECK_EQUAL_RANGE(reference_1.destinations, result_3->destinations);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user