correct test value conversion and codes (#724)

Author: drinckes

test_data/encoding.csv

@@ -30,22 +30,22 @@
 # Special cases over 90 latitude
 #
 ################################################################################
-90,1,4500000000,1482752000,4,CFX30000+
-92,1,4550000000,1482752000,4,CFX30000+
-90,1,4500000000,1482752000,10,CFX3X2X2+X2
+90,1,4499999999,1482752000,4,CFX30000+
+92,1,4499999999,1482752000,4,CFX30000+
+90,1,4499999999,1482752000,10,CFX3X2X2+X2
 ################################################################################
 #
 # Special cases with longitude needing normalization (<< -180 or >> +180)
 #
 ################################################################################
-1,180,2275000000,2949120000,4,62H20000+
-1,181,2275000000,2957312000,4,62H30000+
-20.3701135,362.78223535156,2759252837,4446472071,13,7FG49QCJ+2VXGJ
-47.0000625,728.0000625,3425001562,7438336512,10,8FVC2222+22
--41.2730625,1254.7859375,1218173437,11753766400,10,4VCPPQGP+Q9
-20.3701135,-357.217764648,2759252837,-1451767928,13,7FG49QCJ+2VXGJ
-47.0000625,-711.9999375,3425001562,-4358143488,10,8FVC2222+22
--41.2730625,-905.2140625,1218173437,-5940953600,10,4VCPPQGP+Q9
+1,180,2275000000,0,4,62H20000+
+1,181,2275000000,8192000,4,62H30000+
+20.3701135,362.78223535156,2759252837,1497352071,13,7FG49QCJ+2VXGJ
+47.0000625,728.0000625,3425001562,1540096512,10,8FVC2222+22
+-41.2730625,1254.7859375,1218173437,2906406400,10,4VCPPQGP+Q9
+20.3701135,-357.217764648,2759252837,1497352072,13,7FG49QCJ+2VXGJ
+47.0000625,-711.9999375,3425001562,1540096512,10,8FVC2222+22
+-41.2730625,-905.2140625,1218173437,2906406400,10,4VCPPQGP+Q9
 ################################################################################
 #
 # Test non-precise latitude/longitude value
@@ -58,9 +58,9 @@
 # return a 15-digit code
 #
 ################################################################################
-37.539669125,-122.375069724,3188491728,472063428,15,849VGJQF+VX7QR3M
-37.539669125,-122.375069724,3188491728,472063428,16,849VGJQF+VX7QR3M
-37.539669125,-122.375069724,3188491728,472063428,100,849VGJQF+VX7QR3M
+37.539669125,-122.375069724,3188491728,472063428,15,849VGJQF+VX7QR3J
+37.539669125,-122.375069724,3188491728,472063428,16,849VGJQF+VX7QR3J
+37.539669125,-122.375069724,3188491728,472063428,100,849VGJQF+VX7QR3J
 ################################################################################
 #
 # Test floating point representation/rounding errors.
@@ -147,10 +147,10 @@
 # Add a few other examples.
 #
 ################################################################################
-47.000000080000000,8.00022229,3425000002,1540097820,15,8FVC2222+235235F
-68.3500147997595,113.625636875353,3958750369,2405381217,15,9PWM9J2G+272FWR3
-38.1176000887231,165.441989844555,3202940002,2829860780,15,8VC74C9R+2QX445F
--28.1217794010122,-154.066811473758,1546955514,212444680,15,5337VWHM+77PR2P2
+47.000000080000000,8.00022229,3425000002,1540097820,15,8FVC2222+235235C
+68.3500147997595,113.625636875353,3958750369,2405381217,15,9PWM9J2G+272FWJV
+38.1176000887231,165.441989844555,3202940002,2829860780,15,8VC74C9R+2QX445C
+-28.1217794010122,-154.066811473758,1546955514,212444680,15,5337VWHM+77PR2GR
 ################################################################################
 #
 # Test short length.
@@ -165,122 +165,122 @@
 # valid lengths (2, 4, 6, 8, 10, 11, 12, 13, 14, 15).
 #
 ################################################################################
-51.1276857,-184.2279861,3528192142,-34635663,11,9V3Q4QHC+3RC
--93.84140,-162.06820,-96035000,146897305,10,222V2W2J+2P
--25.1585965,-176.4414937,1621035087,29151283,14,5265RHR5+HC62QF
+51.1276857,-184.2279861,3528192142,2914484337,11,9V3Q4QHC+3RC
+-93.84140,-162.06820,0,146897305,10,222V2W2J+2P
+-25.1585965,-176.4414937,1621035087,29151283,14,5265RHR5+HC62QC
 82.806550,30.229187,4320163750,1722197499,13,CGJGR64H+JMF55
 52.67256,-4.55204,3566814000,1437269688,13,9C4QMCFX+25GG5
 14.9420223132,-24.1698775963,2623550557,1276560362,2,79000000+
 50.46,112.02,3511500000,2392227840,12,9P2JF26C+2222
 -72.929463,42.000964,426763425,1818631897,4,2HV40000+
 76.091456,-125.608062,4152286400,445578756,8,C48P39RR+
--94.103,-38.308,-102575000,1160740864,14,29232M2R+2R2222
+-94.103,-38.308,0,1160740864,14,29232M2R+2R2222
 88.1,86.0,4452500000,2179072000,4,CMW80000+
 -44.545247,-40.700335,1136368825,1141142855,10,487XF73X+WV
 20.67,-133.40,2766750000,381747200,8,74G8MJC2+
-91.37590,-96.45974,4534397500,684361809,10,C6X5XGXR+X4
-64.61,-192.97,3865250000,-106250240,12,9VP9J26J+2222
+91.37590,-96.45974,4499999999,684361809,10,C6X5XGXR+X4
+64.61,-192.97,3865250000,2842869760,12,9VP9J26J+2222
 -19.427,-156.355,1764325000,193699840,12,53G5HJFW+6222
 -77.172610657,-122.783537134,320684733,468717263,8,24JVR6G8+
 -48,-141,1050000000,319488000,10,434X2222+22
 -48,-111,1050000000,565248000,2,45000000+
-34.59271625,33.43832676,3114817906,1748486772,15,8G6MHCVQ+38PM977
+34.59271625,33.43832676,3114817906,1748486772,15,8G6MHCVQ+38PM976
 -18.70036,-9.64681,1782491000,1395533332,6,5CHG7900+
-82.14,194.83,4303500000,3070607360,6,C2JP4R00+
+82.14,194.83,4303500000,121487360,6,C2JP4R00+
 -83.0611,-53.5201,173472500,1036123340,6,2888WF00+
--90.5,-61.8,-12500000,968294400,14,272W2622+222222
+-90.5,-61.8,0,968294400,14,272W2622+222222
 23.857492947,-38.922971931,2846437323,1155703013,8,79M3V34G+
 71.301289,-127.202151,4032532225,432519979,15,C43J8Q2X+G49CW45
 22.613410,-65.531218,2815335250,937728262,2,77000000+
 -59.5,100.8,762500000,2300313600,2,3P000000+
-87.021195762,-199.388732204,4425529894,-158832495,15,CVV22JC6+FGCW3JW
+87.021195762,-199.388732204,4425529894,2790287505,15,CVV22JC6+FGCW3JV
 58.5932701,172.4650093,3714831752,2887393356,12,9VCJHFV8+822V
 -31.17610,41.37565,1470597500,1813509324,8,4HW3R9FG+
 44,58,3350000000,1949696000,6,8HPW2200+
 -4.0070,154.7493,2149825000,2742266265,6,6R7PXP00+
 2.8,-119.9,2320000000,492339200,12,65J2R422+2222
 77.296962202,-118.449652886,4182424055,504220443,4,C5930000+
-35.48003,96.52265,3137000750,2265273548,15,8M7RFGJF+2369253
+35.48003,96.52265,3137000750,2265273548,15,8M7RFGJF+2369252
 52.42264,60.49549,3560566000,1970139054,8,9J42CFFW+
 29.096,166.130,2977400000,2835496960,10,7VX834WJ+C2
 67.496291,38.248585,3937407275,1787892408,10,9GVWF6WX+GC
-69.298163526,-181.784436557,3982454088,-14618105,11,9VXW76X8+768
-48.44527393761,195.13608085747,3461131848,3073114774,8,82WQC4WP+
+69.298163526,-181.784436557,3982454088,2934501895,11,9VXW76X8+768
+48.44527393761,195.13608085747,3461131848,123994774,8,82WQC4WP+
 -28.8394,166.9146,1529015000,2841924403,6,5V385W00+
 46.01263,109.23175,3400315750,2369386496,15,8PRF267J+3P26222
 -61.385416741,-100.103564052,715364581,654511603,8,35CXJV7W+
-85.6301065,194.7590568,4390752662,3070026193,8,C2QPJQJ5+
--74.602,189.932,384950000,3030482944,8,22QF9WXJ+
--90.930,-145.371,-23250000,283680768,11,232P2J2H+2J2
+85.6301065,194.7590568,4390752662,120906193,8,C2QPJQJ5+
+-74.602,189.932,384950000,81362944,8,22QF9WXJ+
+-90.930,-145.371,0,283680768,11,232P2J2H+2J2
 -58.618133,64.746630,784546675,2004964392,4,3JH60000+
 66.1423,-96.6000,3903557500,683212800,10,96R54CR2+W2
 -39.962,168.233,1250950000,2852724736,4,4VGC0000+
-98.31,86.17,4707750000,2180464640,11,CMX8X5XC+X2R
+98.31,86.17,4499999999,2180464640,11,CMX8X5XC+X2R
 47.858925,-75.223290,3446473125,858330808,14,87V6VQ5G+HMG454
 -17.150,-84.306,1821250000,783925248,12,56JQVM2V+2J22
--95.31345221,-172.90260796,-132836306,58141835,15,2229232W+2X24252
+-95.31345221,-172.90260796,0,58141835,15,2229232W+2X24245
 -79.859625,177.096808,253509375,2925337051,14,2VGV43RW+5P3534
-88.265429,-198.447568,4456635725,-151122478,14,CVW37H82+5XF5V2
+88.265429,-198.447568,4456635725,2797997522,14,CVW37H82+5XF5V2
 13.325,34.920,2583125000,1760624640,2,7G000000+
 -63.6,-145.4,660000000,283443200,2,33000000+
--54.4872370910,-142.4976735090,887819072,307219058,15,33QVGG72+4W4FHRQ
+-54.4872370910,-142.4976735090,887819072,307219058,15,33QVGG72+4W4FHRG
 89.796622,61.685912,4494915550,1979890991,6,CJX3QM00+
 -25.2,50.7,1620000000,1889894400,8,5H6GRP22+
 -78.7376,66.6281,281560000,2020377395,6,2JH87J00+
 -83.5768747454,-84.1155546149,160578131,785485376,10,268QCVFM+7Q
 87.1741743283,-98.9097172279,4429354358,664291596,10,C6V353FR+M4
--92.1234,147.2214,-53085000,2680597708,6,2R292600+
--96.081,30.930,-152025000,1727938560,14,2G2G2W2J+222222
+-92.1234,147.2214,0,2680597708,6,2R292600+
+-96.081,30.930,0,1727938560,14,2G2G2W2J+222222
 58.544790,0.954987,3713619750,1482383253,4,9FC20000+
 85.223791,166.317567,4380594775,2837033508,8,CVQ868F9+
-22.4144501873,161.5737330425,2810361254,2798172021,15,7VJ3CH7F+QFQ3573
--81,-189,225000000,-73728000,4,2VFH0000+
+22.4144501873,161.5737330425,2810361254,2798172021,15,7VJ3CH7F+QFQ353V
+-81,-189,225000000,2875392000,4,2VFH0000+
 -3.87,106.31,2153250000,2345451520,6,6P884800+
 -86.07687005,17.43081941,98078248,1617353272,14,2F5VWCFJ+7842XW
 4.00247742,-147.71777983,2350061935,264455947,6,63PJ2700+
 -34.13283986879,143.93778642288,1396679003,2653698346,2,4R000000+
--42.77927502,197.58056291,1180518124,3093139971,13,429V6HCJ+76PRR
-71.797168141,116.102605255,4044929203,2425672542,15,CP3RQ4W3+V29MM5W
+-42.77927502,197.58056291,1180518124,144019971,13,429V6HCJ+76PRR
+71.797168141,116.102605255,4044929203,2425672542,15,CP3RQ4W3+V29MM5P
 -14.52796652,-19.29446968,1886800837,1316499704,13,5CQ2FPC4+R669Q
 -46.42436011120,-134.97185393078,1089390997,368870572,11,4457H2GH+772
 -83.95,57.33,151250000,1944207360,12,2H8V382J+2222
 -81.15680196,116.13215255,221079951,2425914593,12,2PCRR4VJ+7VCX
 -69.8553608,38.5416297,503615980,1790293030,10,3G2W4GVR+VM
 70.06392017,142.68513577,4001598004,2643436632,8,CR243M7P+
--37.87035641911,31.45160895416,1303241089,1732211580,15,4GJH4FH2+VJ5MQQ3
+-37.87035641911,31.45160895416,1303241089,1732211580,15,4GJH4FH2+VJ5MQHR
 -3.31237547,55.93515507,2167190613,1932780790,15,6H8QMWQP+23RXXFP
 -36.7954655,151.3817689,1330113362,2714679450,14,4RMH693J+RP68VG
-95.854385181,79.466306447,4646359629,2125547982,10,CJXXXFX8+XG
+95.854385181,79.466306447,4499999999,2125547982,10,CJXXXFX8+XG
 31.53982775,98.72663309,3038495693,2283328578,11,8M3WGPQG+WMJ
-25.5118795897,57.7948659543,2887796989,1948015541,14,7HQVGQ6V+QW54XM
+25.5118795897,57.7948659543,2887796989,1948015541,14,7HQVGQ6V+QW54XF
 71,121,4025000000,2465792000,2,CQ000000+
 -82,-9,200000000,1400832000,2,2C000000+
 -76.08163425,173.15964020,347959143,2893083772,6,2VMMW500+
 40.53562804190,-79.76323109809,3263390701,821139610,2,87000000+
 -61.40656,-81.69399,714836000,805322833,6,36CWH800+
 27.8722,-178.2141,2946805000,14630092,10,72V3VQCP+V9
--92.2718492,40.5508329,-56796230,1806752423,11,2H222H22+284
+-92.2718492,40.5508329,0,1806752423,11,2H222H22+284
 70.3331,-67.4144,4008327500,922301235,15,C72J8HMP+66X2525
 -63.163054,106.207383,670923650,2344610881,6,3P88R600+
 57.234,92.971,3680850000,2236178432,15,9M9J6XMC+JC22222
-37.1,-195.4,3177500000,-126156800,12,8V964J22+2222
+37.1,-195.4,3177500000,2822963200,12,8V964J22+2222
 31.197,9.919,3029925000,1555816448,8,8F3F5WW9+
-85.557757154,-182.229592353,4388943928,-18264821,12,CVQVHQ5C+4536
+85.557757154,-182.229592353,4388943928,2930855179,12,CVQVHQ5C+4536
 1.50383657,-69.55623429,2287595914,904755328,4,67HG0000+
 50.409,7.402,3510225000,1535197184,15,9F29CC52+JR22222
 -88,30,50000000,1720320000,11,2G4G2222+222
--98,139,-200000000,2613248000,10,2Q2X2222+22
+-98,139,0,2613248000,10,2Q2X2222+22
 11.4,150.4,2535000000,2706636800,4,7R3G0000+
 -88.504244,67.742247,37393900,2029504487,4,2J390000+
 -84.13904,-22.90719,146524000,1286904299,8,297VV36V+
 -12.874997750,-26.081150643,1928125056,1260903213,12,59VM4WG9+2G52
--95.978240742,83.957497847,-149456019,2162339822,15,2M252X24+2X55454
+-95.978240742,83.957497847,0,2162339822,15,2M252X24+2X55454
 52.797623,55.332651,3569940575,1927845076,2,9H000000+
 -25.57754103,-60.87933236,1610561474,975836509,15,576XC4CC+X7M7MXV
 57.1960,82.5535,3679900000,2150838272,14,9M945HW3+CC2222
 -26,27,1600000000,1695744000,8,5G692222+
 -27.0,-122.3,1575000000,472678400,11,545V2P22+222
--99.118211,34.329996,-227955275,1755791327,8,2G2P282H+
+-99.118211,34.329996,0,1755791327,8,2G2P282H+
 25.33671,8.65920,2883417750,1545496166,8,7FQC8MP5+
 -77.54,110.22,311500000,2377482240,11,2PJGF66C+222
 -55.69363663291,-8.13133426255,857659084,1407948109,8,3CPH8V49+
@@ -289,11 +289,11 @@
 -67.52,-133.23,562000000,383139840,13,3448FQJC+22222
 -41.5789128,-76.9932090,1210527180,843831631,12,47C5C2C4+CPMF
 63.50396935,144.75232815,3837599233,2660371072,6,9RM6GQ00+
--99.10,-77.98,-227500000,835747840,11,2724222C+222
+-99.10,-77.98,0,835747840,11,2724222C+222
 -13.502,122.955,1912450000,2481807360,13,5QR4FXX4+62222
-99.595382598,-71.110954356,4739884564,892019061,12,C7XCXVXQ+XJVV
-8.68,180.22,2467000000,2950922240,13,62W2M6JC+22222
-96.0835607732,-29.0019350420,4652089019,1236976148,10,C9XGXXXX+X6
+99.595382598,-71.110954356,4499999999,892019061,12,C7XCXVXQ+XJVV
+8.68,180.22,2467000000,1802240,13,62W2M6JC+22222
+96.0835607732,-29.0019350420,4499999999,1236976148,10,C9XGXXXX+X6
 26.4022965,-31.1647767,2910057412,1219258149,11,79RCCR2P+W39
 80.99,-174.37,4274750000,46120960,4,C2G70000+
 68.0,-35.1,3950000000,1187020800,15,99W62W22+2222222
@@ -304,10 +304,10 @@
 -55.7416641607,136.4834168428,856458395,2592632150,11,3QPR7F5M+89M
 -55.80137,105.59937,854965750,2339630039,2,3P000000+
 70.49,104.87,4012250000,2333655040,2,CP000000+
-1.6479856942,181.1761286225,2291199642,2958754845,14,62H3J5XG+5FRC3Q
--94.2098,53.1707,-105245000,1910134374,14,2H2M252C+274343
-96.6461284508,37.5309875240,4666153211,1782013849,4,CGXV0000+
-13.403331980,132.878412474,2585083299,2563099954,13,7Q5JCV3H+89M6H
+1.6479856942,181.1761286225,2291199642,9634845,14,62H3J5XG+5FRC3Q
+-94.2098,53.1707,0,1910134374,14,2H2M252C+274343
+96.6461284508,37.5309875240,4499999999,1782013849,4,CGXV0000+
+13.403331980,132.878412474,2585083299,2563099954,13,7Q5JCV3H+89M69
 23.01778459,-75.75490333,2825444614,853975831,10,77M6269W+42
 -48.4381338,140.8468367,1039046655,2628377286,6,4R32HR00+
 -38.2448857266,-111.9149619865,1293877856,557752631,10,45HCQ34P+22
@@ -320,11 +320,11 @@
 -15.10033816850,99.53259414053,1872491545,2289931011,11,5MPXVGXM+V29
 -69.4546558690,97.3697260830,513633603,2272212796,6,3M2VG900+
 47.6915368,-109.0087879,3442288420,581560009,6,85VGMX00+
-99.2751473,147.8120144,4731878682,2685436021,10,CRX9XRX6+XR
+99.2751473,147.8120144,4499999999,2685436021,10,CRX9XRX6+XR
 27.6309,-98.7061,2940772500,665959628,2,76000000+
 27.24379,92.39247,2931094750,2231439114,12,7MVJ69VR+GX9J
 -79.78071,133.66290,255482250,2569526476,10,2QGM6M97+P5
--94.55098016,-95.68553772,-113774504,690704074,11,26262827+2Q4
+-94.55098016,-95.68553772,0,690704074,11,26262827+2Q4
 -18.100,-83.091,1797500000,793878528,13,56HRWW25+2J222
 -35.015055,73.717570,1374623625,2078454333,12,4JPMXPM9+X2GR
 -87.7171,177.5628,57072500,2929154457,13,2V4V7HM7+54743
@@ -339,7 +339,7 @@
 -24.8,-7.1,1630000000,1416396800,4,5C7J0000+
 41.5,0.4,3287500000,1477836800,8,8FH2GC22+
 -58.89638156814,-177.07241353875,777590460,23982788,8,32H44W3H+
-99.9924124,168.8859945,4749810310,2858074066,13,CVXCXVXP+X9XXV
+99.9924124,168.8859945,4499999999,2858074066,13,CVXCXVXP+X9XXV
 -81.83814,13.38568,204046500,1584215490,10,2FCM596P+P7
 -81.641294,-26.677758,208967650,1256015806,12,29CM985C+FVQ8
 -38.1,-34.8,1297500000,1189478400,6,49H7W600+
@@ -362,6 +362,6 @@
 66,-15,3900000000,1351680000,14,9CR72222+222222
 82.988994321,-114.039676643,4324724858,540346968,2,C5000000+
 -32.04,-9.54,1449000000,1396408320,11,4CVGXF66+222
-98.43557,-184.42545,4710889250,-36253287,12,CVXQXHXF+XRVW
+98.43557,-184.42545,4499999999,2912866713,12,CVXQXHXF+XRVW
 71.75744246,-62.00099498,4043936061,966647849,2,C7000000+
-51.089925,72.339482,3527248125,2067165036,15,9J3J38QQ+XQH3453
+51.089925,72.339482,3527248125,2067165036,15,9J3J38QQ+XQH3452