knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#429,map,bugfix][s]: parse negative lat/lon strings correctly - fixes #429.

Browse Source
This commit is contained in:
Rufus Pollock
2014-06-01 19:58:45 +01:00
parent 01741bcc17
commit ae8f51bf05
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/view.map.js
View File

@@ -334,7 +334,7 @@ my.Map = Backbone.View.extend({
if (typeof(coord) != 'string') { if (typeof(coord) != 'string') {
return(parseFloat(coord)); return(parseFloat(coord));
} }
var dms = coord.split(/[^\.\d\w]+/); var dms = coord.split(/[^-?\.\d\w]+/);
var deg = 0; var m = 0; var deg = 0; var m = 0;
var toDeg = [1, 60, 3600]; // conversion factors for Deg, min, sec var toDeg = [1, 60, 3600]; // conversion factors for Deg, min, sec
var i; var i;

3
test/view.map.test.js
View File

@@ -112,7 +112,10 @@ test('_getGeometryFromRecord non-GeoJSON', function () {
[{ lon: 47, lat: 53}, [47,53]], [{ lon: 47, lat: 53}, [47,53]],
[{ lon: -47, lat: 53}, [-47,53]], [{ 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", [47.32, 53.3]], ["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)", [47.32, 53.3]], ["(53.3,47.32)", [47.32, 53.3]],
[[53.3,47.32], [53.3, 47.32]], [[53.3,47.32], [53.3, 47.32]],
["53.3 N, 113.5 W", [-113.5, 53.3]], ["53.3 N, 113.5 W", [-113.5, 53.3]],