Module:Coordinates: Difference between revisions
Jump to navigation
Jump to search
Content added Content deleted
(simplify whitespace-trimming pattern per protected edit request by User:Jackmcbarn) |
(improve error handling per protected edit request by User:Jackmcbarn) |
||
Line 314: | Line 314: | ||
if long == "" or long == nil then |
if long == "" or long == nil then |
||
return nil, {{"parseDec", "Missing longitude"}} |
return nil, {{"parseDec", "Missing longitude"}} |
||
elseif not tonumber(long) then |
|||
return nil, {{"parseDec", "Longitude could not be parsed as a number: " .. long}} |
|||
end |
end |
||
Line 365: | Line 367: | ||
errors = validate( lat_d, lat_m, lat_s, long_d, long_m, long_s, 'parseDMS', true ); |
errors = validate( lat_d, lat_m, lat_s, long_d, long_m, long_s, 'parseDMS', true ); |
||
if long_d == nil or long_d == "" then |
if long_d == nil or long_d == "" then |
||
return nil, {{"parseDMS", "Missing longitude" }} |
|||
elseif not tonumber(long_d) then |
|||
return nil, {{"parseDMS", "Longitude could not be parsed as a number:" .. long_d }} |
|||
end |
end |
||
Line 406: | Line 410: | ||
-- no lat logic |
-- no lat logic |
||
return errorPrinter( {{"formatTest", "Missing latitude"}} ) |
return errorPrinter( {{"formatTest", "Missing latitude"}} ) |
||
elseif not tonumber(args[1]) then |
|||
-- bad lat logic |
|||
return errorPrinter( {{"formatTest", "Unable to parse latitude as a number:" .. args[1]}} ) |
|||
elseif args[4] == "" and args[5] == "" and args[6] == "" then |
elseif args[4] == "" and args[5] == "" and args[6] == "" then |
||
-- dec logic |
-- dec logic |
||
Line 417: | Line 424: | ||
result, errors = parseDMS( args[1], args[2], args[3], args[4], |
result, errors = parseDMS( args[1], args[2], args[3], args[4], |
||
args[5], args[6], args[7], args[8], args['format'] ) |
args[5], args[6], args[7], args[8], args['format'] ) |
||
⚫ | |||
⚫ | |||
if args[10] ~= '' then |
if args[10] ~= '' then |
||
table.insert( errors, { 'formatTest', 'Extra unexpected parameters' } ); |
table.insert( errors, { 'formatTest', 'Extra unexpected parameters' } ); |
||
end |
end |
||
if result == nil then |
|||
return errorPrinter( errors ); |
|||
end |
|||
⚫ | |||
⚫ | |||
elseif dmsTest(args[3], args[6]) then |
elseif dmsTest(args[3], args[6]) then |
||
-- dm logic |
-- dm logic |
||
result, errors = parseDMS( args[1], args[2], nil, args[3], |
result, errors = parseDMS( args[1], args[2], nil, args[3], |
||
args[4], args[5], nil, args[6], args['format'] ) |
args[4], args[5], nil, args[6], args['format'] ) |
||
⚫ | |||
⚫ | |||
if args[8] ~= '' then |
if args[8] ~= '' then |
||
table.insert( errors, { 'formatTest', 'Extra unexpected parameters' } ); |
table.insert( errors, { 'formatTest', 'Extra unexpected parameters' } ); |
||
end |
end |
||
if result == nil then |
|||
return errorPrinter( errors ); |
|||
end |
|||
⚫ | |||
⚫ | |||
elseif dmsTest(args[2], args[4]) then |
elseif dmsTest(args[2], args[4]) then |
||
-- d logic |
-- d logic |
||
result, errors = parseDMS( args[1], nil, nil, args[2], |
result, errors = parseDMS( args[1], nil, nil, args[2], |
||
args[3], nil, nil, args[4], args['format'] ) |
args[3], nil, nil, args[4], args['format'] ) |
||
⚫ | |||
if args[6] ~= '' then |
if args[6] ~= '' then |
||
table.insert( errors, { 'formatTest', 'Extra unexpected parameters' } ); |
table.insert( errors, { 'formatTest', 'Extra unexpected parameters' } ); |
||
end |
end |
||
if result == nil then |
|||
return errorPrinter( errors ); |
|||
end |
|||
⚫ | |||
else |
else |
||
-- Error |
-- Error |