Added missing NAD83(2011)-based projected coordinate systems

data/CRS/pcs.csv

@@ -2093,6 +2093,12 @@ NAD83(2011) / UTM zone 17N,6346,6318,16017
 NAD83(2011) / UTM zone 18N,6347,6318,16018
 NAD83(2011) / UTM zone 19N,6348,6318,16019
 NAD83(2011) / Conus Albers,6350,6318,5068
+NAD83(2011) / EPSG Arctic zone 5-29,6351,6318,6029
+NAD83(2011) / EPSG Arctic zone 5-31,6352,6318,6030
+NAD83(2011) / EPSG Arctic zone 6-14,6353,6318,6039
+NAD83(2011) / EPSG Arctic zone 6-16,6354,6318,6040
+NAD83(2011) / Alabama East,6355,6318,10131
+NAD83(2011) / Alabama West,6356,6318,10132
 Mexico ITRF92 / LCC,6362,4483,6361
 Mexico ITRF2008 / UTM zone 11N,6366,6365,16011
 Mexico ITRF2008 / UTM zone 12N,6367,6365,16012
@@ -2109,11 +2115,241 @@ UCS-2000 / Ukraine TM zone 11,6385,5561,6378
 UCS-2000 / Ukraine TM zone 12,6386,5561,6379
 UCS-2000 / Ukraine TM zone 13,6387,5561,6380
 Cayman Islands National Grid 2011,6391,6135,6390
+NAD83(2011) / Alaska Albers,6393,6318,15021
+NAD83(2011) / Alaska zone 1,6394,6318,15031
+NAD83(2011) / Alaska zone 2,6395,6318,15032
+NAD83(2011) / Alaska zone 3,6396,6318,15033
+NAD83(2011) / Alaska zone 4,6397,6318,15034
+NAD83(2011) / Alaska zone 5,6398,6318,15035
+NAD83(2011) / Alaska zone 6,6399,6318,15036
+NAD83(2011) / Alaska zone 7,6400,6318,15037
+NAD83(2011) / Alaska zone 8,6401,6318,15038
+NAD83(2011) / Alaska zone 9,6402,6318,15039
+NAD83(2011) / Alaska zone 10,6403,6318,15040
+NAD83(2011) / Arizona Central,6404,6318,10232
+NAD83(2011) / Arizona Central (ft),6405,6318,15305
+NAD83(2011) / Arizona East,6406,6318,10231
+NAD83(2011) / Arizona East (ft),6407,6318,15304
+NAD83(2011) / Arizona West,6408,6318,10233
+NAD83(2011) / Arizona West (ft),6409,6318,15306
+NAD83(2011) / Arkansas North,6410,6318,10331
+NAD83(2011) / Arkansas North (ftUS),6411,6318,15385
+NAD83(2011) / Arkansas South,6412,6318,10332
+NAD83(2011) / Arkansas South (ftUS),6413,6318,15386
+NAD83(2011) / California Albers,6414,6318,10420
+NAD83(2011) / California zone 1,6415,6318,10431
+NAD83(2011) / California zone 1 (ftUS),6416,6318,15307
+NAD83(2011) / California zone 2,6417,6318,10432
+NAD83(2011) / California zone 2 (ftUS),6418,6318,15308
+NAD83(2011) / California zone 3,6419,6318,10433
+NAD83(2011) / California zone 3 (ftUS),6420,6318,15309
+NAD83(2011) / California zone 4,6421,6318,10434
+NAD83(2011) / California zone 4 (ftUS),6422,6318,15310
+NAD83(2011) / California zone 5,6423,6318,10435
+NAD83(2011) / California zone 5 (ftUS),6424,6318,15311
+NAD83(2011) / California zone 6,6425,6318,10436
+NAD83(2011) / California zone 6 (ftUS),6426,6318,15312
+NAD83(2011) / Colorado Central,6427,6318,10532
+NAD83(2011) / Colorado Central (ftUS),6428,6318,15314
+NAD83(2011) / Colorado North,6429,6318,10531
+NAD83(2011) / Colorado North (ftUS),6430,6318,15313
+NAD83(2011) / Colorado South,6431,6318,10533
+NAD83(2011) / Colorado South (ftUS),6432,6318,15315
+NAD83(2011) / Connecticut,6433,6318,10630
+NAD83(2011) / Connecticut (ftUS),6434,6318,15316
+NAD83(2011) / Delaware,6435,6318,10730
+NAD83(2011) / Delaware (ftUS),6436,6318,15317
+NAD83(2011) / Florida East,6437,6318,10931
+NAD83(2011) / Florida East (ftUS),6438,6318,15318
+NAD83(2011) / Florida GDL Albers,6439,6318,10934
+NAD83(2011) / Florida North,6440,6318,10933
+NAD83(2011) / Florida North (ftUS),6441,6318,15320
+NAD83(2011) / Florida West,6442,6318,10932
+NAD83(2011) / Florida West (ftUS),6443,6318,15319
+NAD83(2011) / Georgia East,6444,6318,11031
+NAD83(2011) / Georgia East (ftUS),6445,6318,15321
+NAD83(2011) / Georgia West,6446,6318,11032
+NAD83(2011) / Georgia West (ftUS),6447,6318,15322
+NAD83(2011) / Idaho Central,6448,6318,11132
+NAD83(2011) / Idaho Central (ftUS),6449,6318,15324
+NAD83(2011) / Idaho East,6450,6318,11131
+NAD83(2011) / Idaho East (ftUS),6451,6318,15323
+NAD83(2011) / Idaho West,6452,6318,11133
+NAD83(2011) / Idaho West (ftUS),6453,6318,15325
+NAD83(2011) / Illinois East,6454,6318,11231
+NAD83(2011) / Illinois East (ftUS),6455,6318,15387
+NAD83(2011) / Illinois West,6456,6318,11232
+NAD83(2011) / Illinois West (ftUS),6457,6318,15388
+NAD83(2011) / Indiana East,6458,6318,11331
+NAD83(2011) / Indiana East (ftUS),6459,6318,15372
+NAD83(2011) / Indiana West,6460,6318,11332
+NAD83(2011) / Indiana West (ftUS),6461,6318,15373
+NAD83(2011) / Iowa North,6462,6318,11431
+NAD83(2011) / Iowa North (ftUS),6463,6318,15377
+NAD83(2011) / Iowa South,6464,6318,11432
+NAD83(2011) / Iowa South (ftUS),6465,6318,15378
+NAD83(2011) / Kansas North,6466,6318,11531
+NAD83(2011) / Kansas North (ftUS),6467,6318,15379
+NAD83(2011) / Kansas South,6468,6318,11532
+NAD83(2011) / Kansas South (ftUS),6469,6318,15380
+NAD83(2011) / Kentucky North,6470,6318,15303
+NAD83(2011) / Kentucky North (ftUS),6471,6318,15328
+NAD83(2011) / Kentucky Single Zone,6472,6318,11630
+NAD83(2011) / Kentucky Single Zone (ftUS),6473,6318,15375
+NAD83(2011) / Kentucky South,6474,6318,11632
+NAD83(2011) / Kentucky South (ftUS),6475,6318,15329
+NAD83(2011) / Louisiana North,6476,6318,11731
+NAD83(2011) / Louisiana North (ftUS),6477,6318,15391
+NAD83(2011) / Louisiana South,6478,6318,11732
+NAD83(2011) / Louisiana South (ftUS),6479,6318,15392
+NAD83(2011) / Maine CS2000 Central,6480,6318,11854
+NAD83(2011) / Maine CS2000 East,6481,6318,11851
+NAD83(2011) / Maine CS2000 West,6482,6318,11853
+NAD83(2011) / Maine East,6483,6318,11831
+NAD83(2011) / Maine East (ftUS),6484,6318,11833
+NAD83(2011) / Maine West,6485,6318,11832
+NAD83(2011) / Maine West (ftUS),6486,6318,11834
+NAD83(2011) / Maryland,6487,6318,11930
+NAD83(2011) / Maryland (ftUS),6488,6318,15330
+NAD83(2011) / Massachusetts Island,6489,6318,12032
+NAD83(2011) / Massachusetts Island (ftUS),6490,6318,15332
+NAD83(2011) / Massachusetts Mainland,6491,6318,12031
+NAD83(2011) / Massachusetts Mainland (ftUS),6492,6318,15331
+NAD83(2011) / Michigan Central,6493,6318,12142
+NAD83(2011) / Michigan Central (ft),6494,6318,15334
+NAD83(2011) / Michigan North,6495,6318,12141
+NAD83(2011) / Michigan North (ft),6496,6318,15333
+NAD83(2011) / Michigan Oblique Mercator,6497,6318,12150
+NAD83(2011) / Michigan South,6498,6318,12143
+NAD83(2011) / Michigan South (ft),6499,6318,15335
+NAD83(2011) / Minnesota Central,6500,6318,12232
+NAD83(2011) / Minnesota Central (ftUS),6501,6318,12235
+NAD83(2011) / Minnesota North,6502,6318,12231
+NAD83(2011) / Minnesota North (ftUS),6503,6318,12234
+NAD83(2011) / Minnesota South,6504,6318,12233
+NAD83(2011) / Minnesota South (ftUS),6505,6318,12236
+NAD83(2011) / Mississippi East,6506,6318,12331
+NAD83(2011) / Mississippi East (ftUS),6507,6318,15336
+NAD83(2011) / Mississippi TM,6508,6318,3813
+NAD83(2011) / Mississippi West,6509,6318,12332
+NAD83(2011) / Mississippi West (ftUS),6510,6318,15337
+NAD83(2011) / Missouri Central,6511,6318,12432
+NAD83(2011) / Missouri East,6512,6318,12431
+NAD83(2011) / Missouri West,6513,6318,12433
+NAD83(2011) / Montana,6514,6318,12530
+NAD83(2011) / Montana (ft),6515,6318,15338
+NAD83(2011) / Nebraska,6516,6318,12630
 NAD83(2011) / Nebraska (ftUS),6517,4759,15396
+NAD83(2011) / Nevada Central,6518,6318,12732
+NAD83(2011) / Nevada Central (ftUS),6519,6318,15382
+NAD83(2011) / Nevada East,6520,6318,12731
+NAD83(2011) / Nevada East (ftUS),6521,6318,15381
+NAD83(2011) / Nevada West,6522,6318,12733
+NAD83(2011) / Nevada West (ftUS),6523,6318,15383
+NAD83(2011) / New Hampshire,6524,6318,12830
+NAD83(2011) / New Hampshire (ftUS),6525,6318,15389
+NAD83(2011) / New Jersey,6526,6318,12930
+NAD83(2011) / New Jersey (ftUS),6527,6318,15384
+NAD83(2011) / New Mexico Central,6528,6318,13032
+NAD83(2011) / New Mexico Central (ftUS),6529,6318,15340
+NAD83(2011) / New Mexico East,6530,6318,13031
+NAD83(2011) / New Mexico East (ftUS),6531,6318,15339
+NAD83(2011) / New Mexico West,6532,6318,13033
+NAD83(2011) / New Mexico West (ftUS),6533,6318,15341
+NAD83(2011) / New York Central,6534,6318,13132
+NAD83(2011) / New York Central (ftUS),6535,6318,15343
+NAD83(2011) / New York East,6536,6318,13131
+NAD83(2011) / New York East (ftUS),6537,6318,15342
+NAD83(2011) / New York Long Island,6538,6318,13134
+NAD83(2011) / New York Long Island (ftUS),6539,6318,15345
+NAD83(2011) / New York West,6540,6318,13133
+NAD83(2011) / New York West (ftUS),6541,6318,15344
+NAD83(2011) / North Carolina,6542,6318,13230
+NAD83(2011) / North Carolina (ftUS),6543,6318,15346
+NAD83(2011) / North Dakota North,6544,6318,13331
+NAD83(2011) / North Dakota North (ft),6545,6318,15347
+NAD83(2011) / North Dakota South,6546,6318,13332
+NAD83(2011) / North Dakota South (ft),6547,6318,15348
+NAD83(2011) / Ohio North,6548,6318,13431
+NAD83(2011) / Ohio North (ftUS),6549,6318,13433
+NAD83(2011) / Ohio South,6550,6318,13432
+NAD83(2011) / Ohio South (ftUS),6551,6318,13434
+NAD83(2011) / Oklahoma North,6552,6318,13531
+NAD83(2011) / Oklahoma North (ftUS),6553,6318,15349
+NAD83(2011) / Oklahoma South,6554,6318,13532
+NAD83(2011) / Oklahoma South (ftUS),6555,6318,15350
+NAD83(2011) / Oregon LCC (m),6556,6318,13633
+NAD83(2011) / Oregon GIC Lambert (ft),6557,6318,15374
+NAD83(2011) / Oregon North,6558,6318,13631
+NAD83(2011) / Oregon North (ft),6559,6318,15351
+NAD83(2011) / Oregon South,6560,6318,13632
+NAD83(2011) / Oregon South (ft),6561,6318,15352
+NAD83(2011) / Pennsylvania North,6562,6318,13731
+NAD83(2011) / Pennsylvania North (ftUS),6563,6318,15353
+NAD83(2011) / Pennsylvania South,6564,6318,13732
+NAD83(2011) / Pennsylvania South (ftUS),6565,6318,15354
+NAD83(2011) / Puerto Rico and Virgin Is.,6566,6318,15230
+NAD83(2011) / Rhode Island,6567,6318,13830
+NAD83(2011) / Rhode Island (ftUS),6568,6318,15390
+NAD83(2011) / South Carolina,6569,6318,13930
+NAD83(2011) / South Carolina (ft),6570,6318,15355
+NAD83(2011) / South Dakota North,6571,6318,14031
+NAD83(2011) / South Dakota North (ftUS),6572,6318,15394
+NAD83(2011) / South Dakota South,6573,6318,14032
+NAD83(2011) / South Dakota South (ftUS),6574,6318,15395
+NAD83(2011) / Tennessee,6575,6318,14130
+NAD83(2011) / Tennessee (ftUS),6576,6318,15356
+NAD83(2011) / Texas Central,6577,6318,14233
+NAD83(2011) / Texas Central (ftUS),6578,6318,15359
+NAD83(2011) / Texas Centric Albers Equal Area,6579,6318,14254
+NAD83(2011) / Texas Centric Lambert Conformal,6580,6318,14253
+NAD83(2011) / Texas North,6581,6318,14231
+NAD83(2011) / Texas North (ftUS),6582,6318,15357
+NAD83(2011) / Texas North Central,6583,6318,14232
+NAD83(2011) / Texas North Central (ftUS),6584,6318,15358
+NAD83(2011) / Texas South,6585,6318,14235
+NAD83(2011) / Texas South (ftUS),6586,6318,15361
+NAD83(2011) / Texas South Central,6587,6318,14234
+NAD83(2011) / Texas South Central (ftUS),6588,6318,15360
+NAD83(2011) / Vermont,6589,6318,14430
+NAD83(2011) / Vermont (ftUS),6590,6318,5645
+NAD83(2011) / Virginia Lambert,6591,6318,3967
+NAD83(2011) / Virginia North,6592,6318,14531
+NAD83(2011) / Virginia North (ftUS),6593,6318,15365
+NAD83(2011) / Virginia South,6594,6318,14532
+NAD83(2011) / Virginia South (ftUS),6595,6318,15366
+NAD83(2011) / Washington North,6596,6318,14631
+NAD83(2011) / Washington North (ftUS),6597,6318,15367
+NAD83(2011) / Washington South,6598,6318,14632
+NAD83(2011) / Washington South (ftUS),6599,6318,15368
+NAD83(2011) / West Virginia North,6600,6318,14731
+NAD83(2011) / West Virginia North (ftUS),6601,6318,14735
+NAD83(2011) / West Virginia South,6602,6318,14732
+NAD83(2011) / West Virginia South (ftUS),6603,6318,14736
 NAD83(2011) / Wisconsin Central,6604,4759,14832
+NAD83(2011) / Wisconsin Central (ftUS),6605,6318,15370
+NAD83(2011) / Wisconsin North,6606,6318,14831
+NAD83(2011) / Wisconsin North (ftUS),6607,6318,15369
+NAD83(2011) / Wisconsin South,6608,6318,14833
+NAD83(2011) / Wisconsin South (ftUS),6609,6318,15371
+NAD83(2011) / Wisconsin Transverse Mercator,6610,6318,14841
+NAD83(2011) / Wyoming East,6611,6318,14931
+NAD83(2011) / Wyoming East (ftUS),6612,6318,14935
+NAD83(2011) / Wyoming East Central,6613,6318,14932
+NAD83(2011) / Wyoming East Central (ftUS),6614,6318,14936
+NAD83(2011) / Wyoming West,6615,6318,14934
+NAD83(2011) / Wyoming West (ftUS),6616,6318,14938
+NAD83(2011) / Wyoming West Central,6617,6318,14933
+NAD83(2011) / Wyoming West Central (ftUS),6618,6318,14937
+NAD83(2011) / Utah Central,6619,6318,14332
+NAD83(2011) / Utah North,6620,6318,14331
+NAD83(2011) / Utah South,6621,6318,14333
 NAD83(CSRS) / Quebec Lambert,6622,4617,19944
 NAD83 / Quebec Albers,6623,4269,6645
 NAD83(CSRS) / Quebec Albers,6624,4617,6645
+NAD83(2011) / Utah Central (ftUS),6625,6318,15298
+NAD83(2011) / Utah North (ftUS),6626,6318,15297
+NAD83(2011) / Utah South (ftUS),6627,6318,15299
 Karbala 1979 / Iraq National Grid,6646,4743,19907
 WGS 84 / TM 60 SW,6703,4326,6702
 RDN2008 / UTM zone 32N (N-E),6707,6706,16032
@@ -2130,12 +2366,56 @@ GDA94 / MGA zone 44,6735,4283,6728
 GDA94 / MGA zone 46,6736,4283,6729
 GDA94 / MGA zone 47,6737,4283,6730
 GDA94 / MGA zone 59,6738,4283,6731
+NAD83(2011) / Oregon Baker zone (m),6786,6318,6741
+NAD83(2011) / Oregon Baker zone (ft),6787,6318,6742
+NAD83(2011) / Oregon Bend-Klamath Falls zone (m),6790,6318,6743
+NAD83(2011) / Oregon Bend-Klamath Falls zone (ft),6791,6318,6744
+NAD83(2011) / Oregon Bend-Redmond-Prineville zone (m),6794,6318,6745
+NAD83(2011) / Oregon Bend-Redmond-Prineville zone (ft),6795,6318,6746
+NAD83(2011) / Oregon Bend-Burns zone (m),6798,6318,6747
+NAD83(2011) / Oregon Bend-Burns zone (ft),6799,6318,6748
+NAD83(2011) / Oregon Canyonville-Grants Pass zone (m),6802,6318,6749
+NAD83(2011) / Oregon Canyonville-Grants Pass zone (ft),6803,6318,6750
+NAD83(2011) / Oregon Columbia River East zone (m),6806,6318,6751
+NAD83(2011) / Oregon Columbia River East zone (ft),6807,6318,6752
+NAD83(2011) / Oregon Columbia River West zone (m),6810,6318,6753
+NAD83(2011) / Oregon Columbia River West zone (ft),6811,6318,6754
+NAD83(2011) / Oregon Cottage Grove-Canyonville zone (m),6814,6318,6755
+NAD83(2011) / Oregon Cottage Grove-Canyonville zone (ft),6815,6318,6756
+NAD83(2011) / Oregon Dufur-Madras zone (m),6818,6318,6757
+NAD83(2011) / Oregon Dufur-Madras zone (ft),6819,6318,6758
+NAD83(2011) / Oregon Eugene zone (m),6822,6318,6759
+NAD83(2011) / Oregon Eugene zone (ft),6823,6318,6760
+NAD83(2011) / Oregon Grants Pass-Ashland zone (m),6826,6318,6761
+NAD83(2011) / Oregon Grants Pass-Ashland zone (ft),6827,6318,6762
+NAD83(2011) / Oregon Gresham-Warm Springs zone (m),6830,6318,6763
+NAD83(2011) / Oregon Gresham-Warm Springs zone (ft),6831,6318,6764
+NAD83(2011) / Oregon La Grande zone (m),6834,6318,6765
+NAD83(2011) / Oregon La Grande zone (ft),6835,6318,6766
+NAD83(2011) / Oregon Ontario zone (m),6838,6318,6767
+NAD83(2011) / Oregon Ontario zone (ft),6839,6318,6768
+NAD83(2011) / Oregon Coast zone (m),6842,6318,6769
+NAD83(2011) / Oregon Coast zone (ft),6843,6318,6770
+NAD83(2011) / Oregon Pendleton zone (m),6846,6318,6771
+NAD83(2011) / Oregon Pendleton zone (ft),6847,6318,6772
+NAD83(2011) / Oregon Pendleton-La Grande zone (m),6850,6318,6773
+NAD83(2011) / Oregon Pendleton-La Grande zone (ft),6851,6318,6774
+NAD83(2011) / Oregon Portland zone (m),6854,6318,6775
+NAD83(2011) / Oregon Portland zone (ft),6855,6318,6776
+NAD83(2011) / Oregon Salem zone (m),6858,6318,6777
+NAD83(2011) / Oregon Salem zone (ft),6859,6318,6778
+NAD83(2011) / Oregon Santiam Pass zone (m),6862,6318,6779
+NAD83(2011) / Oregon Santiam Pass zone (ft),6863,6318,6780
 ETRS89 / Albania TM 2010,6870,4258,6869
 RDN2008 / Italy zone (N-E),6875,6706,6877
 RDN2008 / Zone 12 (N-E),6876,6706,6878
+NAD83(2011) / Wisconsin Central,6879,6318,14832
+NAD83(2011) / Nebraska (ftUS),6880,6318,15396
 South East Island 1943 / UTM zone 40N,6915,6892,16040
 NAD83 / Kansas LCC,6922,4269,6920
 NAD83 / Kansas LCC (ftUS),6923,4269,6921
+NAD83(2011) / Kansas LCC,6924,6318,6920
+NAD83(2011) / Kansas LCC (ftUS),6925,6318,6921
 WGS 84 / NSIDC EASE-Grid 2.0 North,6931,4326,6929
 WGS 84 / NSIDC EASE-Grid 2.0 South,6932,4326,6930
 VN-2000 / TM-3 zone 481,6956,4756,6952
@@ -2143,13 +2423,283 @@ VN-2000 / TM-3 zone 482,6957,4756,6953
 VN-2000 / TM-3 zone 491,6958,4756,6954
 VN-2000 / TM-3 Da Nang zone,6959,4756,6955
 ETRS89 / Albania LCC 2010,6962,4258,6961
+NAD83(2011) / San Francisco CS13,6996,6318,6994
+NAD83(2011) / San Francisco CS13 (ftUS),6997,6318,6995
 Nahrwan 1934 / UTM zone 37N,7005,4744,16037
 Nahrwan 1934 / UTM zone 38N,7006,4744,16038
 Nahrwan 1934 / UTM zone 39N,7007,4744,16039
+NAD83(2011) / IaRCS zone 1,7057,6318,7043
+NAD83(2011) / IaRCS zone 2,7058,6318,7044
+NAD83(2011) / IaRCS zone 3,7059,6318,7045
+NAD83(2011) / IaRCS zone 4,7060,6318,7046
+NAD83(2011) / IaRCS zone 5,7061,6318,7047
+NAD83(2011) / IaRCS zone 6,7062,6318,7048
+NAD83(2011) / IaRCS zone 7,7063,6318,7049
+NAD83(2011) / IaRCS zone 8,7064,6318,7050
+NAD83(2011) / IaRCS zone 9,7065,6318,7051
+NAD83(2011) / IaRCS zone 10,7066,6318,7052
+NAD83(2011) / IaRCS zone 11,7067,6318,7053
+NAD83(2011) / IaRCS zone 12,7068,6318,7054
+NAD83(2011) / IaRCS zone 13,7069,6318,7055
+NAD83(2011) / IaRCS zone 14,7070,6318,7056
+NAD83(2011) / RMTCRS St Mary (m),7109,6318,7089
+NAD83(2011) / RMTCRS Blackfeet (m),7110,6318,7091
+NAD83(2011) / RMTCRS Milk River (m),7111,6318,7093
+NAD83(2011) / RMTCRS Fort Belknap (m),7112,6318,7095
+NAD83(2011) / RMTCRS Fort Peck Assiniboine (m),7113,6318,7097
+NAD83(2011) / RMTCRS Fort Peck Sioux (m),7114,6318,7099
+NAD83(2011) / RMTCRS Crow (m),7115,6318,7101
+NAD83(2011) / RMTCRS Bobcat (m),7116,6318,7103
+NAD83(2011) / RMTCRS Billings (m),7117,6318,7105
+NAD83(2011) / RMTCRS Wind River (m),7118,6318,7107
+NAD83(2011) / RMTCRS St Mary (ft),7119,6318,7090
+NAD83(2011) / RMTCRS Blackfeet (ft),7120,6318,7092
+NAD83(2011) / RMTCRS Milk River (ft),7121,6318,7094
+NAD83(2011) / RMTCRS Fort Belknap (ft),7122,6318,7096
+NAD83(2011) / RMTCRS Fort Peck Assiniboine (ft),7123,6318,7098
+NAD83(2011) / RMTCRS Fort Peck Sioux (ft),7124,6318,7100
+NAD83(2011) / RMTCRS Crow (ft),7125,6318,7102
+NAD83(2011) / RMTCRS Bobcat (ft),7126,6318,7104
+NAD83(2011) / RMTCRS Billings (ft),7127,6318,7106
+NAD83(2011) / RMTCRS Wind River (ftUS),7128,6318,7108
+NAD83(2011) / San Francisco CS13,7131,6318,7129
+NAD83(2011) / San Francisco CS13 (ftUS),7132,6318,7130
 Palestine 1923 / Palestine Grid modified,7142,4281,7141
+NAD83(2011) / InGCS Adams (m),7257,6318,7143
+NAD83(2011) / InGCS Adams (ftUS),7258,6318,7144
+NAD83(2011) / InGCS Allen (m),7259,6318,7145
+NAD83(2011) / InGCS Allen (ftUS),7260,6318,7146
+NAD83(2011) / InGCS Bartholomew (m),7261,6318,7147
+NAD83(2011) / InGCS Bartholomew (ftUS),7262,6318,7148
+NAD83(2011) / InGCS Benton (m),7263,6318,7149
+NAD83(2011) / InGCS Benton (ftUS),7264,6318,7150
+NAD83(2011) / InGCS Blackford-Delaware (m),7265,6318,7151
+NAD83(2011) / InGCS Blackford-Delaware (ftUS),7266,6318,7152
+NAD83(2011) / InGCS Boone-Hendricks (m),7267,6318,7153
+NAD83(2011) / InGCS Boone-Hendricks (ftUS),7268,6318,7154
+NAD83(2011) / InGCS Brown (m),7269,6318,7155
+NAD83(2011) / InGCS Brown (ftUS),7270,6318,7156
+NAD83(2011) / InGCS Carroll (m),7271,6318,7157
+NAD83(2011) / InGCS Carroll (ftUS),7272,6318,7158
+NAD83(2011) / InGCS Cass (m),7273,6318,7159
+NAD83(2011) / InGCS Cass (ftUS),7274,6318,7160
+NAD83(2011) / InGCS Clark-Floyd-Scott (m),7275,6318,7161
+NAD83(2011) / InGCS Clark-Floyd-Scott (ftUS),7276,6318,7162
+NAD83(2011) / InGCS Clay (m),7277,6318,7163
+NAD83(2011) / InGCS Clay (ftUS),7278,6318,7164
+NAD83(2011) / InGCS Clinton (m),7279,6318,7165
+NAD83(2011) / InGCS Clinton (ftUS),7280,6318,7166
+NAD83(2011) / InGCS Crawford-Lawrence-Orange (m),7281,6318,7167
+NAD83(2011) / InGCS Crawford-Lawrence-Orange (ftUS),7282,6318,7168
+NAD83(2011) / InGCS Daviess-Greene (m),7283,6318,7169
+NAD83(2011) / InGCS Daviess-Greene (ftUS),7284,6318,7170
+NAD83(2011) / InGCS Dearborn-Ohio-Switzerland (m),7285,6318,7171
+NAD83(2011) / InGCS Dearborn-Ohio-Switzerland (ftUS),7286,6318,7172
+NAD83(2011) / InGCS Decatur-Rush (m),7287,6318,7173
+NAD83(2011) / InGCS Decatur-Rush (ftUS),7288,6318,7174
+NAD83(2011) / InGCS DeKalb (m),7289,6318,7175
+NAD83(2011) / InGCS DeKalb (ftUS),7290,6318,7176
+NAD83(2011) / InGCS Dubois-Martin (m),7291,6318,7177
+NAD83(2011) / InGCS Dubois-Martin (ftUS),7292,6318,7178
+NAD83(2011) / InGCS Elkhart-Kosciusko-Wabash (m),7293,6318,7179
+NAD83(2011) / InGCS Elkhart-Kosciusko-Wabash (ftUS),7294,6318,7180
+NAD83(2011) / InGCS Fayette-Franklin-Union (m),7295,6318,7181
+NAD83(2011) / InGCS Fayette-Franklin-Union (ftUS),7296,6318,7182
+NAD83(2011) / InGCS Fountain-Warren (m),7297,6318,7183
+NAD83(2011) / InGCS Fountain-Warren (ftUS),7298,6318,7184
+NAD83(2011) / InGCS Fulton-Marshall-St. Joseph (m),7299,6318,7185
+NAD83(2011) / InGCS Fulton-Marshall-St. Joseph (ftUS),7300,6318,7186
+NAD83(2011) / InGCS Gibson (m),7301,6318,7187
+NAD83(2011) / InGCS Gibson (ftUS),7302,6318,7188
+NAD83(2011) / InGCS Grant (m),7303,6318,7189
+NAD83(2011) / InGCS Grant (ftUS),7304,6318,7190
+NAD83(2011) / InGCS Hamilton-Tipton (m),7305,6318,7191
+NAD83(2011) / InGCS Hamilton-Tipton (ftUS),7306,6318,7192
+NAD83(2011) / InGCS Hancock-Madison (m),7307,6318,7193
+NAD83(2011) / InGCS Hancock-Madison (ftUS),7308,6318,7194
+NAD83(2011) / InGCS Harrison-Washington (m),7309,6318,7195
+NAD83(2011) / InGCS Harrison-Washington (ftUS),7310,6318,7196
+NAD83(2011) / InGCS Henry (m),7311,6318,7197
+NAD83(2011) / InGCS Henry (ftUS),7312,6318,7198
+NAD83(2011) / InGCS Howard-Miami (m),7313,6318,7199
+NAD83(2011) / InGCS Howard-Miami (ftUS),7314,6318,7200
+NAD83(2011) / InGCS Huntington-Whitley (m),7315,6318,7201
+NAD83(2011) / InGCS Huntington-Whitley (ftUS),7316,6318,7202
+NAD83(2011) / InGCS Jackson (m),7317,6318,7203
+NAD83(2011) / InGCS Jackson (ftUS),7318,6318,7204
+NAD83(2011) / InGCS Jasper-Porter (m),7319,6318,7205
+NAD83(2011) / InGCS Jasper-Porter (ftUS),7320,6318,7206
+NAD83(2011) / InGCS Jay (m),7321,6318,7207
+NAD83(2011) / InGCS Jay (ftUS),7322,6318,7208
+NAD83(2011) / InGCS Jefferson (m),7323,6318,7209
+NAD83(2011) / InGCS Jefferson (ftUS),7324,6318,7210
+NAD83(2011) / InGCS Jennings (m),7325,6318,7211
+NAD83(2011) / InGCS Jennings (ftUS),7326,6318,7212
+NAD83(2011) / InGCS Johnson-Marion (m),7327,6318,7213
+NAD83(2011) / InGCS Johnson-Marion (ftUS),7328,6318,7214
+NAD83(2011) / InGCS Knox (m),7329,6318,7215
+NAD83(2011) / InGCS Knox (ftUS),7330,6318,7216
+NAD83(2011) / InGCS LaGrange-Noble (m),7331,6318,7217
+NAD83(2011) / InGCS LaGrange-Noble (ftUS),7332,6318,7218
+NAD83(2011) / InGCS Lake-Newton (m),7333,6318,7219
+NAD83(2011) / InGCS Lake-Newton (ftUS),7334,6318,7220
+NAD83(2011) / InGCS LaPorte-Pulaski-Starke (m),7335,6318,7221
+NAD83(2011) / InGCS LaPorte-Pulaski-Starke (ftUS),7336,6318,7222
+NAD83(2011) / InGCS Monroe-Morgan (m),7337,6318,7223
+NAD83(2011) / InGCS Monroe-Morgan (ftUS),7338,6318,7224
+NAD83(2011) / InGCS Montgomery-Putnam (m),7339,6318,7225
+NAD83(2011) / InGCS Montgomery-Putnam (ftUS),7340,6318,7226
+NAD83(2011) / InGCS Owen (m),7341,6318,7227
+NAD83(2011) / InGCS Owen (ftUS),7342,6318,7228
+NAD83(2011) / InGCS Parke-Vermillion (m),7343,6318,7229
+NAD83(2011) / InGCS Parke-Vermillion (ftUS),7344,6318,7230
+NAD83(2011) / InGCS Perry (m),7345,6318,7231
+NAD83(2011) / InGCS Perry (ftUS),7346,6318,7232
+NAD83(2011) / InGCS Pike-Warrick (m),7347,6318,7233
+NAD83(2011) / InGCS Pike-Warrick (ftUS),7348,6318,7234
+NAD83(2011) / InGCS Posey (m),7349,6318,7235
+NAD83(2011) / InGCS Posey (ftUS),7350,6318,7236
+NAD83(2011) / InGCS Randolph-Wayne (m),7351,6318,7237
+NAD83(2011) / InGCS Randolph-Wayne (ftUS),7352,6318,7238
+NAD83(2011) / InGCS Ripley (m),7353,6318,7239
+NAD83(2011) / InGCS Ripley (ftUS),7354,6318,7240
+NAD83(2011) / InGCS Shelby (m),7355,6318,7241
+NAD83(2011) / InGCS Shelby (ftUS),7356,6318,7242
+NAD83(2011) / InGCS Spencer (m),7357,6318,7243
+NAD83(2011) / InGCS Spencer (ftUS),7358,6318,7244
+NAD83(2011) / InGCS Steuben (m),7359,6318,7245
+NAD83(2011) / InGCS Steuben (ftUS),7360,6318,7246
+NAD83(2011) / InGCS Sullivan (m),7361,6318,7247
+NAD83(2011) / InGCS Sullivan (ftUS),7362,6318,7248
+NAD83(2011) / InGCS Tippecanoe-White (m),7363,6318,7249
+NAD83(2011) / InGCS Tippecanoe-White (ftUS),7364,6318,7250
+NAD83(2011) / InGCS Vanderburgh (m),7365,6318,7251
+NAD83(2011) / InGCS Vanderburgh (ftUS),7366,6318,7252
+NAD83(2011) / InGCS Vigo (m),7367,6318,7253
+NAD83(2011) / InGCS Vigo (ftUS),7368,6318,7254
+NAD83(2011) / InGCS Wells (m),7369,6318,7255
+NAD83(2011) / InGCS Wells (ftUS),7370,6318,7256
 ONGD14 / UTM zone 39N,7374,7373,16039
 ONGD14 / UTM zone 40N,7375,7373,16040
 ONGD14 / UTM zone 41N,7376,7373,16041
+NAD83(2011) / WISCRS Adams and Juneau (m),7528,6318,7484
+NAD83(2011) / WISCRS Ashland (m),7529,6318,7378
+NAD83(2011) / WISCRS Barron (m),7530,6318,7426
+NAD83(2011) / WISCRS Bayfield (m),7531,6318,7380
+NAD83(2011) / WISCRS Brown (m),7532,6318,7428
+NAD83(2011) / WISCRS Buffalo (m),7533,6318,7430
+NAD83(2011) / WISCRS Burnett (m),7534,6318,7382
+"NAD83(2011) / WISCRS Calumet, Fond du Lac, Outagamie and Winnebago (m)",7535,6318,7486
+NAD83(2011) / WISCRS Chippewa (m),7536,6318,7432
+NAD83(2011) / WISCRS Clark (m),7537,6318,7434
+NAD83(2011) / WISCRS Columbia (m),7538,6318,7488
+NAD83(2011) / WISCRS Crawford (m),7539,6318,7490
+NAD83(2011) / WISCRS Dane (m),7540,6318,7492
+NAD83(2011) / WISCRS Dodge and Jefferson (m),7541,6318,7494
+NAD83(2011) / WISCRS Door (m),7542,6318,7436
+NAD83(2011) / WISCRS Douglas (m),7543,6318,7384
+NAD83(2011) / WISCRS Dunn (m),7544,6318,7438
+NAD83(2011) / WISCRS Eau Claire (m),7545,6318,7440
+NAD83(2011) / WISCRS Florence (m),7546,6318,7386
+NAD83(2011) / WISCRS Forest (m),7547,6318,7388
+NAD83(2011) / WISCRS Grant (m),7548,6318,7496
+NAD83(2011) / WISCRS Green and Lafayette (m),7549,6318,7498
+NAD83(2011) / WISCRS Green Lake and Marquette (m),7550,6318,7500
+NAD83(2011) / WISCRS Iowa (m),7551,6318,7502
+NAD83(2011) / WISCRS Iron (m),7552,6318,7390
+NAD83(2011) / WISCRS Jackson (m),7553,6318,7450
+"NAD83(2011) / WISCRS Kenosha, Milwaukee, Ozaukee and Racine (m)",7554,6318,7504
+"NAD83(2011) / WISCRS Kewaunee, Manitowoc and Sheboygan (m)",7555,6318,7506
+NAD83(2011) / WISCRS La Crosse (m),7556,6318,7508
+NAD83(2011) / WISCRS Langlade (m),7557,6318,7452
+NAD83(2011) / WISCRS Lincoln (m),7558,6318,7454
+NAD83(2011) / WISCRS Marathon (m),7559,6318,7456
+NAD83(2011) / WISCRS Marinette (m),7560,6318,7458
+NAD83(2011) / WISCRS Menominee (m),7561,6318,7460
+NAD83(2011) / WISCRS Monroe (m),7562,6318,7510
+NAD83(2011) / WISCRS Oconto (m),7563,6318,7462
+NAD83(2011) / WISCRS Oneida (m),7564,6318,7392
+NAD83(2011) / WISCRS Pepin and Pierce (m),7565,6318,7464
+NAD83(2011) / WISCRS Polk (m),7566,6318,7466
+NAD83(2011) / WISCRS Portage (m),7567,6318,7468
+NAD83(2011) / WISCRS Price (m),7568,6318,7394
+NAD83(2011) / WISCRS Richland (m),7569,6318,7512
+NAD83(2011) / WISCRS Rock (m),7570,6318,7514
+NAD83(2011) / WISCRS Rusk (m),7571,6318,7470
+NAD83(2011) / WISCRS Sauk (m),7572,6318,7516
+NAD83(2011) / WISCRS Sawyer (m),7573,6318,7396
+NAD83(2011) / WISCRS Shawano (m),7574,6318,7472
+NAD83(2011) / WISCRS St. Croix (m),7575,6318,7474
+NAD83(2011) / WISCRS Taylor (m),7576,6318,7476
+NAD83(2011) / WISCRS Trempealeau (m),7577,6318,7478
+NAD83(2011) / WISCRS Vernon (m),7578,6318,7518
+NAD83(2011) / WISCRS Vilas (m),7579,6318,7398
+NAD83(2011) / WISCRS Walworth (m),7580,6318,7520
+NAD83(2011) / WISCRS Washburn (m),7581,6318,7424
+NAD83(2011) / WISCRS Washington (m),7582,6318,7522
+NAD83(2011) / WISCRS Waukesha (m),7583,6318,7524
+NAD83(2011) / WISCRS Waupaca (m),7584,6318,7480
+NAD83(2011) / WISCRS Waushara (m),7585,6318,7526
+NAD83(2011) / WISCRS Wood (m),7586,6318,7482
+NAD83(2011) / WISCRS Adams and Juneau (ftUS),7587,6318,7485
+NAD83(2011) / WISCRS Ashland (ftUS),7588,6318,7379
+NAD83(2011) / WISCRS Barron (ftUS),7589,6318,7427
+NAD83(2011) / WISCRS Bayfield (ftUS),7590,6318,7381
+NAD83(2011) / WISCRS Brown (ftUS),7591,6318,7429
+NAD83(2011) / WISCRS Buffalo (ftUS),7592,6318,7431
+NAD83(2011) / WISCRS Burnett (ftUS),7593,6318,7383
+"NAD83(2011) / WISCRS Calumet, Fond du Lac, Outagamie and Winnebago (ftUS)",7594,6318,7487
+NAD83(2011) / WISCRS Chippewa (ftUS),7595,6318,7433
+NAD83(2011) / WISCRS Clark (ftUS),7596,6318,7435
+NAD83(2011) / WISCRS Columbia (ftUS),7597,6318,7489
+NAD83(2011) / WISCRS Crawford (ftUS),7598,6318,7491
+NAD83(2011) / WISCRS Dane (ftUS),7599,6318,7493
+NAD83(2011) / WISCRS Dodge and Jefferson (ftUS),7600,6318,7495
+NAD83(2011) / WISCRS Door (ftUS),7601,6318,7437
+NAD83(2011) / WISCRS Douglas (ftUS),7602,6318,7385
+NAD83(2011) / WISCRS Dunn (ftUS),7603,6318,7439
+NAD83(2011) / WISCRS Eau Claire (ftUS),7604,6318,7441
+NAD83(2011) / WISCRS Florence (ftUS),7605,6318,7387
+NAD83(2011) / WISCRS Forest (ftUS),7606,6318,7389
+NAD83(2011) / WISCRS Grant (ftUS),7607,6318,7497
+NAD83(2011) / WISCRS Green and Lafayette (ftUS),7608,6318,7499
+NAD83(2011) / WISCRS Green Lake and Marquette (ftUS),7609,6318,7501
+NAD83(2011) / WISCRS Iowa (ftUS),7610,6318,7503
+NAD83(2011) / WISCRS Iron (ftUS),7611,6318,7391
+NAD83(2011) / WISCRS Jackson (ftUS),7612,6318,7451
+"NAD83(2011) / WISCRS Kenosha, Milwaukee, Ozaukee and Racine (ftUS)",7613,6318,7505
+"NAD83(2011) / WISCRS Kewaunee, Manitowoc and Sheboygan (ftUS)",7614,6318,7507
+NAD83(2011) / WISCRS La Crosse (ftUS),7615,6318,7509
+NAD83(2011) / WISCRS Langlade (ftUS),7616,6318,7453
+NAD83(2011) / WISCRS Lincoln (ftUS),7617,6318,7455
+NAD83(2011) / WISCRS Marathon (ftUS),7618,6318,7457
+NAD83(2011) / WISCRS Marinette (ftUS),7619,6318,7459
+NAD83(2011) / WISCRS Menominee (ftUS),7620,6318,7461
+NAD83(2011) / WISCRS Monroe (ftUS),7621,6318,7511
+NAD83(2011) / WISCRS Oconto (ftUS),7622,6318,7463
+NAD83(2011) / WISCRS Oneida (ftUS),7623,6318,7393
+NAD83(2011) / WISCRS Pepin and Pierce (ftUS),7624,6318,7465
+NAD83(2011) / WISCRS Polk (ftUS),7625,6318,7467
+NAD83(2011) / WISCRS Portage (ftUS),7626,6318,7469
+NAD83(2011) / WISCRS Price (ftUS),7627,6318,7395
+NAD83(2011) / WISCRS Richland (ftUS),7628,6318,7513
+NAD83(2011) / WISCRS Rock (ftUS),7629,6318,7515
+NAD83(2011) / WISCRS Rusk (ftUS),7630,6318,7471
+NAD83(2011) / WISCRS Sauk (ftUS),7631,6318,7517
+NAD83(2011) / WISCRS Sawyer (ftUS),7632,6318,7397
+NAD83(2011) / WISCRS Shawano (ftUS),7633,6318,7473
+NAD83(2011) / WISCRS St. Croix (ftUS),7634,6318,7475
+NAD83(2011) / WISCRS Taylor (ftUS),7635,6318,7477
+NAD83(2011) / WISCRS Trempealeau (ftUS),7636,6318,7479
+NAD83(2011) / WISCRS Vernon (ftUS),7637,6318,7519
+NAD83(2011) / WISCRS Vilas (ftUS),7638,6318,7399
+NAD83(2011) / WISCRS Walworth (ftUS),7639,6318,7521
+NAD83(2011) / WISCRS Washburn (ftUS),7640,6318,7425
+NAD83(2011) / WISCRS Washington (ftUS),7641,6318,7523
+NAD83(2011) / WISCRS Waukesha (ftUS),7642,6318,7525
+NAD83(2011) / WISCRS Waupaca (ftUS),7643,6318,7481
+NAD83(2011) / WISCRS Waushara (ftUS),7644,6318,7527
+NAD83(2011) / WISCRS Wood (ftUS),7645,6318,7483
 WGS 84 / India NSF LCC,7755,4326,7722
 WGS 84 / Andhra Pradesh,7756,4326,7723
 WGS 84 / Arunachal Pradesh,7757,4326,7724
@@ -2204,6 +2754,10 @@ NAD27 / MTM zone 10,7991,4267,17710
 Malongo 1987 / UTM zone 33S,7992,4259,16133
 WGS 84 / TM Zone 20N (ftUS),8035,4326,8033
 WGS 84 / TM Zone 21N (ftUS),8036,4326,8034
+NAD83(2011) / PCCS zone 1 (ft),8065,6318,8061
+NAD83(2011) / PCCS zone 2 (ft),8066,6318,8062
+NAD83(2011) / PCCS zone 3 (ft),8067,6318,8063
+NAD83(2011) / PCCS zone 4 (ft),8068,6318,8064
 NAD83(HARN) / WISCRS Florence (m),8090,4152,7386
 NAD83(HARN) / WISCRS Florence (ftUS),8091,4152,7387
 NAD83(HARN) / WISCRS Eau Claire (m),8092,4152,7440
@@ -2316,6 +2870,70 @@ NAD83(HARN) / WISCRS Ashland (m),8222,4152,7378
 NAD83(HARN) / WISCRS Ashland (ftUS),8224,4152,7379
 NAD83(HARN) / WISCRS Adams and Juneau (m),8225,4152,7484
 NAD83(HARN) / WISCRS Adams and Juneau (ftUS),8226,4152,7485
+NAD83(2011) / Oregon Burns-Harper zone (m),8311,6318,8273
+NAD83(2011) / Oregon Burns-Harper zone (ft),8312,6318,8274
+NAD83(2011) / Oregon Canyon City-Burns zone (m),8313,6318,8275
+NAD83(2011) / Oregon Canyon City-Burns zone (ft),8314,6318,8276
+NAD83(2011) / Oregon Coast Range North zone (m),8315,6318,8277
+NAD83(2011) / Oregon Coast Range North zone (ft),8316,6318,8278
+NAD83(2011) / Oregon Dayville-Prairie City zone (m),8317,6318,8279
+NAD83(2011) / Oregon Dayville-Prairie City zone (ft),8318,6318,8280
+NAD83(2011) / Oregon Denio-Burns zone (m),8319,6318,8281
+NAD83(2011) / Oregon Denio-Burns zone (ft),8320,6318,8282
+NAD83(2011) / Oregon Halfway zone (m),8321,6318,8283
+NAD83(2011) / Oregon Halfway zone (ft),8322,6318,8284
+NAD83(2011) / Oregon Medford-Diamond Lake zone (m),8323,6318,8285
+NAD83(2011) / Oregon Medford-Diamond Lake zone (ft),8324,6318,8286
+NAD83(2011) / Oregon Mitchell zone (m),8325,6318,8287
+NAD83(2011) / Oregon Mitchell zone (ft),8326,6318,8288
+NAD83(2011) / Oregon North Central zone (m),8327,6318,8289
+NAD83(2011) / Oregon North Central zone (ft),8328,6318,8290
+NAD83(2011) / Oregon Ochoco Summit zone (m),8329,6318,8291
+NAD83(2011) / Oregon Ochoco Summit zone (ft),8330,6318,8292
+NAD83(2011) / Oregon Owyhee zone (m),8331,6318,8293
+NAD83(2011) / Oregon Owyhee zone (ft),8332,6318,8294
+NAD83(2011) / Oregon Pilot Rock-Ukiah zone (m),8333,6318,8295
+NAD83(2011) / Oregon Pilot Rock-Ukiah zone (ft),8334,6318,8296
+NAD83(2011) / Oregon Prairie City-Brogan zone (m),8335,6318,8297
+NAD83(2011) / Oregon Prairie City-Brogan zone (ft),8336,6318,8298
+NAD83(2011) / Oregon Riley-Lakeview zone (m),8337,6318,8299
+NAD83(2011) / Oregon Riley-Lakeview zone (ft),8338,6318,8300
+NAD83(2011) / Oregon Siskiyou Pass zone (m),8339,6318,8301
+NAD83(2011) / Oregon Siskiyou Pass zone (ft),8340,6318,8302
+NAD83(2011) / Oregon Ukiah-Fox zone (m),8341,6318,8303
+NAD83(2011) / Oregon Ukiah-Fox zone (ft),8342,6318,8304
+NAD83(2011) / Oregon Wallowa zone (m),8343,6318,8305
+NAD83(2011) / Oregon Wallowa zone (ft),8344,6318,8306
+NAD83(2011) / Oregon Warner Highway zone (m),8345,6318,8307
+NAD83(2011) / Oregon Warner Highway zone (ft),8346,6318,8308
+NAD83(2011) / Oregon Willamette Pass zone (m),8347,6318,8309
+NAD83(2011) / Oregon Willamette Pass zone (ft),8348,6318,8310
+NAD83(2011) / NCRS Las Vegas (m),8383,6318,8373
+NAD83(2011) / NCRS Las Vegas (ftUS),8384,6318,8374
+NAD83(2011) / NCRS Las Vegas high (m),8385,6318,8375
+NAD83(2011) / NCRS Las Vegas high (ftUS),8387,6318,8376
+NAD83(2011) / KS RCS zone 1,8518,6318,8458
+NAD83(2011) / KS RCS zone 2,8519,6318,8459
+NAD83(2011) / KS RCS zone 3,8520,6318,8490
+NAD83(2011) / KS RCS zone 4,8521,6318,8491
+NAD83(2011) / KS RCS zone 5,8522,6318,8492
+NAD83(2011) / KS RCS zone 6,8523,6318,8493
+NAD83(2011) / KS RCS zone 7,8524,6318,8494
+NAD83(2011) / KS RCS zone 8,8525,6318,8495
+NAD83(2011) / KS RCS zone 9,8526,6318,8498
+NAD83(2011) / KS RCS zone 10,8527,6318,8499
+NAD83(2011) / KS RCS zone 11,8528,6318,8500
+NAD83(2011) / KS RCS zone 12,8529,6318,8501
+NAD83(2011) / KS RCS zone 13,8531,6318,8502
+NAD83(2011) / KS RCS zone 14,8533,6318,8503
+NAD83(2011) / KS RCS zone 15,8534,6318,8504
+NAD83(2011) / KS RCS zone 16,8535,6318,8505
+NAD83(2011) / KS RCS zone 17,8536,6318,8506
+NAD83(2011) / KS RCS zone 18,8538,6318,8507
+NAD83(2011) / KS RCS zone 19,8539,6318,8515
+NAD83(2011) / KS RCS zone 20,8540,6318,8516
+NAD83(2011) / Alabama East (ftUS),9748,6318,9746
+NAD83(2011) / Alabama West (ftUS),9749,6318,9747
 Pulkovo 1995 / Gauss-Kruger zone 4,20004,4200,16204
 Pulkovo 1995 / Gauss-Kruger zone 5,20005,4200,16205
 Pulkovo 1995 / Gauss-Kruger zone 6,20006,4200,16206
@@ -2345,6 +2963,7 @@ Pulkovo 1995 / Gauss-Kruger zone 29,20029,4200,16229
 Pulkovo 1995 / Gauss-Kruger zone 30,20030,4200,16230
 Pulkovo 1995 / Gauss-Kruger zone 31,20031,4200,16231
 Pulkovo 1995 / Gauss-Kruger zone 32,20032,4200,16232
+NAD83(2011) / Amtrak NECCS21 (ft),20050,6318,10148
 Pulkovo 1995 / Gauss-Kruger 4N,20064,4200,16304
 Pulkovo 1995 / Gauss-Kruger 5N,20065,4200,16305
 Pulkovo 1995 / Gauss-Kruger 6N,20066,4200,16306
@@ -2531,6 +3150,39 @@ ED50 / TM 0 N,23090,4230,16400
 ED50 / TM 5 NE,23095,4230,16405
 Fahud / UTM zone 39N,23239,4232,16039
 Fahud / UTM zone 40N,23240,4232,16040
+NAD83(2011) / ICS83-Freeport (ftUS),23301,6318,11264
+NAD83(2011) / ICS83-Rockford (ftUS),23302,6318,11265
+NAD83(2011) / ICS83-Aurora (ftUS),23303,6318,11233
+NAD83(2011) / ICS83-Chicago (ftUS),23304,6318,11234
+NAD83(2011) / ICS83-Moline (ftUS),23305,6318,11235
+NAD83(2011) / ICS83-Sterling (ftUS),23306,6318,11236
+NAD83(2011) / ICS83-Ottawa (ftUS),23307,6318,11237
+NAD83(2011) / ICS83-Joliet (ftUS),23308,6318,11238
+NAD83(2011) / ICS83-Monmouth (ftUS),23309,6318,11239
+NAD83(2011) / ICS83-Galesburg (ftUS),23310,6318,11240
+NAD83(2011) / ICS83-Peoria (ftUS),23311,6318,11241
+NAD83(2011) / ICS83-Eureka (ftUS),23312,6318,11242
+NAD83(2011) / ICS83-Bloomington (ftUS),23313,6318,11243
+NAD83(2011) / ICS83-Pontiac (ftUS),23314,6318,11244
+NAD83(2011) / ICS83-Watseka (ftUS),23315,6318,11245
+NAD83(2011) / ICS83-Quincy (ftUS),23316,6318,11246
+NAD83(2011) / ICS83-Macomb (ftUS),23317,6318,11247
+NAD83(2011) / ICS83-Lincoln (ftUS),23318,6318,11248
+NAD83(2011) / ICS83-Decatur (ftUS),23319,6318,11249
+NAD83(2011) / ICS83-Champaign (ftUS),23320,6318,11250
+NAD83(2011) / ICS83-Jacksonville (ftUS),23321,6318,11251
+NAD83(2011) / ICS83-Springfield (ftUS),23322,6318,11252
+NAD83(2011) / ICS83-Charleston (ftUS),23323,6318,11253
+NAD83(2011) / ICS83-Jerseyville (ftUS),23324,6318,11254
+NAD83(2011) / ICS83-Carlinville (ftUS),23325,6318,11255
+NAD83(2011) / ICS83-Taylorville (ftUS),23326,6318,11256
+NAD83(2011) / ICS83-Effingham (ftUS),23327,6318,11257
+NAD83(2011) / ICS83-Robinson (ftUS),23328,6318,11258
+NAD83(2011) / ICS83-Belleville (ftUS),23329,6318,11259
+NAD83(2011) / ICS83-Mount Vernon (ftUS),23330,6318,11260
+NAD83(2011) / ICS83-Olney (ftUS),23331,6318,11261
+NAD83(2011) / ICS83-Carbondale (ftUS),23332,6318,11262
+NAD83(2011) / ICS83-Metropolis (ftUS),23333,6318,11263
 HD72 / EOV,23700,4237,19931
 DGN95 / Indonesia TM-3 zone 46.2,23830,4755,17432
 DGN95 / Indonesia TM-3 zone 47.1,23831,4755,17433
@@ -2899,70 +3551,37 @@ Nahrwan 1967 / UTM zone 39N,27039,4270,16039
 Nahrwan 1967 / UTM zone 40N,27040,4270,16040
 Naparima 1972 / UTM zone 20N,27120,4271,16020
 NZGD49 / Mount Eden Circuit,27205,4272,17901
-NZGD49 / Mount Eden Circuit,27205,4272,17901
-NZGD49 / Bay of Plenty Circuit,27206,4272,17902
 NZGD49 / Bay of Plenty Circuit,27206,4272,17902
 NZGD49 / Poverty Bay Circuit,27207,4272,17903
-NZGD49 / Poverty Bay Circuit,27207,4272,17903
-NZGD49 / Hawkes Bay Circuit,27208,4272,17904
 NZGD49 / Hawkes Bay Circuit,27208,4272,17904
 NZGD49 / Taranaki Circuit,27209,4272,17905
-NZGD49 / Taranaki Circuit,27209,4272,17905
-NZGD49 / Tuhirangi Circuit,27210,4272,17906
 NZGD49 / Tuhirangi Circuit,27210,4272,17906
 NZGD49 / Wanganui Circuit,27211,4272,17907
-NZGD49 / Wanganui Circuit,27211,4272,17907
-NZGD49 / Wairarapa Circuit,27212,4272,17908
 NZGD49 / Wairarapa Circuit,27212,4272,17908
 NZGD49 / Wellington Circuit,27213,4272,17909
-NZGD49 / Wellington Circuit,27213,4272,17909
-NZGD49 / Collingwood Circuit,27214,4272,17910
 NZGD49 / Collingwood Circuit,27214,4272,17910
 NZGD49 / Nelson Circuit,27215,4272,17911
-NZGD49 / Nelson Circuit,27215,4272,17911
-NZGD49 / Karamea Circuit,27216,4272,17912
 NZGD49 / Karamea Circuit,27216,4272,17912
 NZGD49 / Buller Circuit,27217,4272,17913
-NZGD49 / Buller Circuit,27217,4272,17913
-NZGD49 / Grey Circuit,27218,4272,17914
 NZGD49 / Grey Circuit,27218,4272,17914
 NZGD49 / Amuri Circuit,27219,4272,17915
-NZGD49 / Amuri Circuit,27219,4272,17915
-NZGD49 / Marlborough Circuit,27220,4272,17916
 NZGD49 / Marlborough Circuit,27220,4272,17916
 NZGD49 / Hokitika Circuit,27221,4272,17917
-NZGD49 / Hokitika Circuit,27221,4272,17917
-NZGD49 / Okarito Circuit,27222,4272,17918
 NZGD49 / Okarito Circuit,27222,4272,17918
 NZGD49 / Jacksons Bay Circuit,27223,4272,17919
-NZGD49 / Jacksons Bay Circuit,27223,4272,17919
-NZGD49 / Mount Pleasant Circuit,27224,4272,17920
 NZGD49 / Mount Pleasant Circuit,27224,4272,17920
 NZGD49 / Gawler Circuit,27225,4272,17921
-NZGD49 / Gawler Circuit,27225,4272,17921
-NZGD49 / Timaru Circuit,27226,4272,17922
 NZGD49 / Timaru Circuit,27226,4272,17922
 NZGD49 / Lindis Peak Circuit,27227,4272,17923
-NZGD49 / Lindis Peak Circuit,27227,4272,17923
-NZGD49 / Mount Nicholas Circuit,27228,4272,17924
 NZGD49 / Mount Nicholas Circuit,27228,4272,17924
 NZGD49 / Mount York Circuit,27229,4272,17925
-NZGD49 / Mount York Circuit,27229,4272,17925
-NZGD49 / Observation Point Circuit,27230,4272,17926
 NZGD49 / Observation Point Circuit,27230,4272,17926
 NZGD49 / North Taieri Circuit,27231,4272,17927
-NZGD49 / North Taieri Circuit,27231,4272,17927
-NZGD49 / Bluff Circuit,27232,4272,17928
 NZGD49 / Bluff Circuit,27232,4272,17928
 NZGD49 / UTM zone 58S,27258,4272,16158
-NZGD49 / UTM zone 58S,27258,4272,16158
-NZGD49 / UTM zone 59S,27259,4272,16159
 NZGD49 / UTM zone 59S,27259,4272,16159
 NZGD49 / UTM zone 60S,27260,4272,16160
-NZGD49 / UTM zone 60S,27260,4272,16160
 NZGD49 / North Island Grid,27291,4272,18141
-NZGD49 / North Island Grid,27291,4272,18141
-NZGD49 / South Island Grid,27292,4272,18142
 NZGD49 / South Island Grid,27292,4272,18142
 NGO 1948 (Oslo) / NGO zone I,27391,4817,18221
 NGO 1948 (Oslo) / NGO zone II,27392,4817,18222

gpxsee.pro

@@ -45,6 +45,7 @@ HEADERS += src/common/config.h \
     src/common/downloader.h \
     src/common/polygon.h \
     src/common/color.h \
+    src/common/csv.h \
     src/GUI/authenticationwidget.h \
     src/GUI/axislabelitem.h \
     src/GUI/dirselectwidget.h \
@@ -253,7 +254,6 @@ HEADERS += src/common/config.h \
     src/data/demloader.h \
     src/data/area.h \
     src/data/exifparser.h \
-    src/data/csv.h \
     src/data/cupparser.h \
     src/data/gpiparser.h \
     src/data/address.h \
@@ -274,6 +274,7 @@ SOURCES += src/main.cpp \
     src/common/programpaths.cpp \
     src/common/tifffile.cpp \
     src/common/downloader.cpp \
+    src/common/csv.cpp \
     src/GUI/authenticationwidget.cpp \
     src/GUI/axislabelitem.cpp \
     src/GUI/dirselectwidget.cpp \
@@ -448,7 +449,6 @@ SOURCES += src/main.cpp \
     src/data/dem.cpp \
     src/data/demloader.cpp \
     src/data/exifparser.cpp \
-    src/data/csv.cpp \
     src/data/cupparser.cpp \
     src/data/gpiparser.cpp \
     src/data/smlparser.cpp \

src/common/csv.cpp

@@ -1,4 +1,4 @@
-#include <QStringList>
+#include <QByteArrayList>
 #include "csv.h"
 
 /*
@@ -7,12 +7,14 @@ RFC 4180 parser with the following enchancements:
  - allows LF line ends in addition to CRLF line ends
 */
 
-bool CSV::readEntry(QStringList &list)
+bool CSV::readEntry(QByteArrayList &list)
 {
 	int state = 0;
 	char c;
 	QByteArray field;
 
+	list.clear();
+
 	while (_device->getChar(&c)) {
 		switch (state) {
 			case 0:

src/common/csv.h

@@ -9,7 +9,7 @@ public:
 	CSV(QIODevice *device, char delimiter = ',')
 	  : _device(device), _delimiter(delimiter), _line(1) {}
 
-	bool readEntry(QStringList &list);
+	bool readEntry(QByteArrayList &list);
 	bool atEnd() const {return _device->atEnd();}
 	int line() const {return _line;}
 

src/data/csvparser.cpp

@@ -1,5 +1,5 @@
-#include <QStringList>
-#include "csv.h"
+#include <QByteArrayList>
+#include "common/csv.h"
 #include "csvparser.h"
 
 bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
@@ -10,10 +10,9 @@ bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
 	Q_UNUSED(routes);
 	Q_UNUSED(polygons);
 	CSV csv(file);
-	QStringList entry;
+	QByteArrayList entry;
 	bool ok;
 
-
 	while (!csv.atEnd()) {
 		if (!csv.readEntry(entry) || entry.size() < 3) {
 			_errorString = "Parse error";
@@ -21,26 +20,24 @@ bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
 			return false;
 		}
 
-		double lon = entry.at(0).trimmed().toDouble(&ok);
+		double lon = entry.at(0).toDouble(&ok);
 		if (!ok || (lon < -180.0 || lon > 180.0)) {
 			_errorString = "Invalid longitude";
 			_errorLine = csv.line();
 			return false;
 		}
-		double lat = entry.at(1).trimmed().toDouble(&ok);
+		double lat = entry.at(1).toDouble(&ok);
 		if (!ok || (lat < -90.0 || lat > 90.0)) {
 			_errorString = "Invalid latitude";
 			_errorLine = csv.line();
 			return false;
 		}
 		Waypoint wp(Coordinates(lon, lat));
-		wp.setName(entry.at(2).trimmed());
+		wp.setName(entry.at(2));
 		if (entry.size() > 3)
-			wp.setDescription(entry.at(3).trimmed());
+			wp.setDescription(entry.at(3));
 
 		waypoints.append(wp);
-
-		entry.clear();
 	}
 
 	return true;

src/data/cupparser.cpp

@@ -1,6 +1,6 @@
 #include <cmath>
 #include <QStringList>
-#include "csv.h"
+#include "common/csv.h"
 #include "cupparser.h"
 
 
@@ -58,7 +58,8 @@ static double elevation(const QString &str)
 }
 
 
-bool CUPParser::waypoint(const QStringList &entry, QVector<Waypoint> &waypoints)
+bool CUPParser::waypoint(const QByteArrayList &entry,
+  QVector<Waypoint> &waypoints)
 {
 	if (entry.size() < 11) {
 		_errorString = "Invalid number of fields";
@@ -85,7 +86,7 @@ bool CUPParser::waypoint(const QStringList &entry, QVector<Waypoint> &waypoints)
 	return true;
 }
 
-bool CUPParser::task(const QStringList &entry,
+bool CUPParser::task(const QByteArrayList &entry,
   const QVector<Waypoint> &waypoints, QList<RouteData> &routes)
 {
 	if (entry.size() < 3) {
@@ -125,10 +126,9 @@ bool CUPParser::parse(QFile *file, QList<TrackData> &tracks,
 	Q_UNUSED(tracks);
 	Q_UNUSED(polygons);
 	CSV csv(file);
-	QStringList entry;
+	QByteArrayList entry;
 	SegmentType segment = Header;
 
-
 	while (!csv.atEnd()) {
 		if (!csv.readEntry(entry)) {
 			_errorString = "CSV parse error";
@@ -159,7 +159,6 @@ bool CUPParser::parse(QFile *file, QList<TrackData> &tracks,
 				return false;
 		}
 
-		entry.clear();
 		_errorLine = csv.line();
 	}
 

src/data/cupparser.h

@@ -14,8 +14,8 @@ public:
 	int errorLine() const {return _errorLine;}
 
 private:
-	bool waypoint(const QStringList &entry, QVector<Waypoint> &waypoints);
-	bool task(const QStringList &entry, const QVector<Waypoint> &waypoints,
+	bool waypoint(const QByteArrayList &entry, QVector<Waypoint> &waypoints);
+	bool task(const QByteArrayList &entry, const QVector<Waypoint> &waypoints,
 	  QList<RouteData> &routes);
 
 	QString _errorString;

src/map/conversion.cpp

@@ -1,4 +1,5 @@
 #include <QFile>
+#include "common/csv.h"
 #include "conversion.h"
 
 static bool parameter(int key, double val, int units, Projection::Setup &setup)
@@ -64,19 +65,18 @@ static bool parameter(int key, double val, int units, Projection::Setup &setup)
 	}
 }
 
-static int projectionSetup(const QList<QByteArray> &list,
-  Projection::Setup &setup)
+static int projectionSetup(const QByteArrayList &list, Projection::Setup &setup)
 {
 	bool r1, r2, r3;
 
 	for (int i = 5; i < 26; i += 3) {
-		QString ks = list[i].trimmed();
+		const QByteArray &ks = list.at(i);
 		if (ks.isEmpty())
 			break;
 
 		int key = ks.toInt(&r1);
-		double val = list[i+1].trimmed().toDouble(&r2);
-		int un = list[i+2].trimmed().toInt(&r3);
+		double val = list.at(i+1).toDouble(&r2);
+		int un = list.at(i+2).toInt(&r3);
 		if (!r1 || !r2 || !r3)
 			return (i - 5)/3 + 1;
 
@@ -109,77 +109,79 @@ Conversion Conversion::conversion(int id)
 	}
 }
 
-void Conversion::loadList(const QString &path)
+bool Conversion::loadList(const QString &path)
 {
 	QFile file(path);
+	CSV csv(&file);
+	QByteArrayList entry;
 	bool res;
-	int ln = 0, pn;
-
 
 	if (!file.open(QFile::ReadOnly)) {
 		qWarning("Error opening projections file: %s: %s", qPrintable(path),
 		  qPrintable(file.errorString()));
-		return;
+		return false;
 	}
 
-	while (!file.atEnd()) {
-		ln++;
-
-		QByteArray line = file.readLine(4096);
-		QList<QByteArray> list = line.split(',');
-		if (list.size() != 26) {
-			qWarning("%s:%d: Format error", qPrintable(path), ln);
-			continue;
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry) || entry.size() < 26) {
+			qWarning("%s:%d: Parse error", qPrintable(path), csv.line());
+			return false;
 		}
 
-		QString name(list.at(0).trimmed());
-		int proj = list.at(1).trimmed().toInt(&res);
+		QString name(entry.at(0));
+		int proj = entry.at(1).toInt(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid projection code", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid projection code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
-		int units = list.at(2).trimmed().toInt(&res);
+		int units = entry.at(2).toInt(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid linear units code", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid linear units code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
-		int transform = list.at(3).trimmed().toInt(&res);
+		int transform = entry.at(3).toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid coordinate transformation code",
-			  qPrintable(path), ln);
+			  qPrintable(path), csv.line());
 			continue;
 		}
-		int cs = list.at(4).trimmed().toInt(&res);
+		int cs = entry.at(4).toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid coordinate system code",
-			  qPrintable(path), ln);
+			  qPrintable(path), csv.line());
 			continue;
 		}
 
 		if (!LinearUnits(units).isValid()) {
-			qWarning("%s:%d: Unknown linear units code", qPrintable(path), ln);
+			qWarning("%s:%d: Unknown linear units code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
 		if (!Projection::Method(transform).isValid()) {
 			qWarning("%s:%d: Unknown coordinate transformation code",
-			  qPrintable(path), ln);
+			  qPrintable(path), csv.line());
 			continue;
 		}
 		if (!CoordinateSystem(cs).isValid()) {
 			qWarning("%s:%d: Unknown coordinate system code", qPrintable(path),
-			  ln);
+			  csv.line());
 			continue;
 		}
 
 		Projection::Setup setup;
-		if ((pn = projectionSetup(list, setup))) {
+		int pn = projectionSetup(entry, setup);
+		if (pn) {
 			qWarning("%s: %d: Invalid projection parameter #%d",
-			  qPrintable(path), ln, pn);
+			  qPrintable(path), csv.line(), pn);
 			continue;
 		}
 
 		_conversions.insert(proj, Entry(name, transform, setup, units, cs));
 	}
+
+	return true;
 }
 
 QList<KV<int, QString> > Conversion::list()

src/map/conversion.h

@@ -27,7 +27,7 @@ public:
 		return (_units.isValid() && _method.isValid());
 	}
 
-	static void loadList(const QString &path);
+	static bool loadList(const QString &path);
 	static Conversion conversion(int id);
 	static QList<KV<int, QString> > list();
 

src/map/ellipsoid.cpp

@@ -1,6 +1,7 @@
 #include <QFile>
 #include <QDebug>
 #include "common/wgs84.h"
+#include "common/csv.h"
 #include "ellipsoid.h"
 
 QMap<int, Ellipsoid> Ellipsoid::_ellipsoids = defaults();
@@ -29,48 +30,47 @@ const Ellipsoid &Ellipsoid::ellipsoid(int id)
 		return it.value();
 }
 
-void Ellipsoid::loadList(const QString &path)
+bool Ellipsoid::loadList(const QString &path)
 {
 	QFile file(path);
+	CSV csv(&file);
+	QByteArrayList entry;
 	bool res;
-	int ln = 0;
-
 
 	if (!file.open(QFile::ReadOnly)) {
 		qWarning("Error opening ellipsoids file: %s: %s", qPrintable(path),
 		  qPrintable(file.errorString()));
-		return;
+		return false;
 	}
 
-	while (!file.atEnd()) {
-		ln++;
-
-		QByteArray line = file.readLine(4096);
-		QList<QByteArray> list = line.split(',');
-		if (list.size() != 4) {
-			qWarning("%s: %d: Format error", qPrintable(path), ln);
-			continue;
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry) || entry.size() < 4) {
+			qWarning("%s:%d: Parse error", qPrintable(path), csv.line());
+			return false;
 		}
 
-		int id = list.at(1).trimmed().toInt(&res);
+		int id = entry.at(1).toInt(&res);
 		if (!res) {
-			qWarning("%s: %d: Invalid ellipsoid code", qPrintable(path), ln);
+			qWarning("%s: %d: Invalid ellipsoid code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
-		double radius = list.at(2).trimmed().toDouble(&res);
+		double radius = entry.at(2).toDouble(&res);
 		if (!res) {
-			qWarning("%s: %d: Invalid radius", qPrintable(path), ln);
+			qWarning("%s: %d: Invalid radius", qPrintable(path), csv.line());
 			continue;
 		}
-		double flattening = list.at(3).trimmed().toDouble(&res);
+		double flattening = entry.at(3).toDouble(&res);
 		if (!res) {
-			qWarning("%s: %d: Invalid flattening", qPrintable(path), ln);
+			qWarning("%s: %d: Invalid flattening", qPrintable(path), csv.line());
 			continue;
 		}
 
 		Ellipsoid e(radius, 1.0/flattening);
 		_ellipsoids.insert(id, e);
 	}
+
+	return true;
 }
 
 Ellipsoid::Ellipsoid(double radius, double flattening)

src/map/ellipsoid.h

@@ -25,7 +25,7 @@ public:
 
 	static const Ellipsoid &WGS84();
 	static const Ellipsoid &ellipsoid(int id);
-	static void loadList(const QString &path);
+	static bool loadList(const QString &path);
 
 private:
 	double _radius;

src/map/gcs.cpp

@@ -1,5 +1,6 @@
 #include <QFile>
 #include "common/wgs84.h"
+#include "common/csv.h"
 #include "gcs.h"
 
 
@@ -19,26 +20,24 @@ private:
 	GCS _gcs;
 };
 
-static int parameter(const QString &str, bool *res)
+static int parameter(const QByteArray &str, bool *res)
 {
-	QString field = str.trimmed();
-	if (field.isEmpty()) {
+	if (str.isEmpty()) {
 		*res = true;
 		return 0;
 	}
 
-	return field.toInt(res);
+	return str.toInt(res);
 }
 
-static double parameterd(const QString &str, bool *res)
+static double parameterd(const QByteArray &str, bool *res)
 {
-	QString field = str.trimmed();
-	if (field.isEmpty()) {
+	if (str.isEmpty()) {
 		*res = true;
 		return NAN;
 	}
 
-	return field.toDouble(res);
+	return str.toDouble(res);
 }
 
 
@@ -89,102 +88,100 @@ GCS GCS::gcs(const QString &name)
 	return GCS();
 }
 
-void GCS::loadList(const QString &path)
+bool GCS::loadList(const QString &path)
 {
 	QFile file(path);
+	CSV csv(&file);
+	QByteArrayList entry;
 	bool res;
-	int ln = 0;
-
 
 	if (!file.open(QFile::ReadOnly)) {
-		qWarning("Error opening PCS file: %s: %s", qPrintable(path),
+		qWarning("Error opening GCS file: %s: %s", qPrintable(path),
 		  qPrintable(file.errorString()));
-		return;
+		return false;
 	}
 
-	while (!file.atEnd()) {
-		ln++;
-
-		QByteArray line = file.readLine(4096);
-		QList<QByteArray> list = line.split(',');
-		if (list.size() != 14) {
-			qWarning("%s:%d: Format error", qPrintable(path), ln);
-			continue;
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry) || entry.size() < 14) {
+			qWarning("%s:%d: Parse error", qPrintable(path), csv.line());
+			return false;
 		}
 
-		int id = parameter(list[1], &res);
+		int id = parameter(entry.at(1), &res);
 		if (!res) {
-			qWarning("%s:%d: Invalid GCS code", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid GCS code", qPrintable(path), csv.line());
 			continue;
 		}
-		int gd = parameter(list[2], &res);
+		int gd = parameter(entry.at(2), &res);
 		if (!res) {
 			qWarning("%s:%d: Invalid geodetic datum code", qPrintable(path),
-			  ln);
+			  csv.line());
 			continue;
 		}
-		int au = list[3].trimmed().toInt(&res);
+		int au = entry.at(3).toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid angular units code", qPrintable(path),
-			  ln);
+			  csv.line());
 			continue;
 		}
-		int el = list[4].trimmed().toInt(&res);
+		int el = entry.at(4).toInt(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid ellipsoid code", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid ellipsoid code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
-		int pm = list[5].trimmed().toInt(&res);
+		int pm = entry.at(5).toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid prime meridian code", qPrintable(path),
-			  ln);
+			  csv.line());
 			continue;
 		}
-		int ct = list[6].trimmed().toInt(&res);
+		int ct = entry.at(6).toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid coordinates transformation code",
-			  qPrintable(path), ln);
+			  qPrintable(path), csv.line());
 			continue;
 		}
-		double dx = list[7].trimmed().toDouble(&res);
+		double dx = entry.at(7).toDouble(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid dx", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid dx", qPrintable(path), csv.line());
 			continue;
 		}
-		double dy = list[8].trimmed().toDouble(&res);
+		double dy = entry.at(8).toDouble(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid dy", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid dy", qPrintable(path), csv.line());
 			continue;
 		}
-		double dz = list[9].trimmed().toDouble(&res);
+		double dz = entry.at(9).toDouble(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid dz", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid dz", qPrintable(path), csv.line());
 			continue;
 		}
-		double rx = parameterd(list[10], &res);
+		double rx = parameterd(entry.at(10), &res);
 		if (!res) {
-			qWarning("%s:%d: Invalid rx", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid rx", qPrintable(path), csv.line());
 			continue;
 		}
-		double ry = parameterd(list[11], &res);
+		double ry = parameterd(entry.at(11), &res);
 		if (!res) {
-			qWarning("%s:%d: Invalid ry", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid ry", qPrintable(path), csv.line());
 			continue;
 		}
-		double rz = parameterd(list[12], &res);
+		double rz = parameterd(entry.at(12), &res);
 		if (!res) {
-			qWarning("%s:%d: Invalid rz", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid rz", qPrintable(path), csv.line());
 			continue;
 		}
-		double ds = parameterd(list[13], &res);
+		double ds = parameterd(entry.at(13), &res);
 		if (!res) {
-			qWarning("%s:%d: Invalid ds", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid ds", qPrintable(path), csv.line());
 			continue;
 		}
 
 		const Ellipsoid &e = Ellipsoid::ellipsoid(el);
 		if (e.isNull()) {
-			qWarning("%s:%d: Unknown ellipsoid code", qPrintable(path), ln);
+			qWarning("%s:%d: Unknown ellipsoid code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
 
@@ -201,22 +198,24 @@ void GCS::loadList(const QString &path)
 				break;
 			default:
 				qWarning("%s:%d: Unknown coordinates transformation method",
-				  qPrintable(path), ln);
+				  qPrintable(path), csv.line());
 				continue;
 		}
 		if (!datum.isValid()) {
 			qWarning("%s:%d: Invalid coordinates transformation parameters",
-			  qPrintable(path), ln);
+			  qPrintable(path), csv.line());
 			continue;
 		}
 
 		GCS gcs(datum, pm, au);
 		if (gcs.isValid())
-			_gcss.append(Entry(id, gd, list[0].trimmed(), gcs));
+			_gcss.append(Entry(id, gd, entry.at(0), gcs));
 		else
 			qWarning("%s:%d: Unknown prime meridian/angular units code",
-			  qPrintable(path), ln);
+			  qPrintable(path), csv.line());
 	}
+
+	return true;
 }
 
 Coordinates GCS::toWGS84(const Coordinates &c) const

src/map/gcs.h

@@ -37,7 +37,7 @@ public:
 	static GCS gcs(const QString &name);
 	static const GCS &WGS84();
 
-	static void loadList(const QString &path);
+	static bool loadList(const QString &path);
 	static QList<KV<int, QString> > list();
 	static QList<KV<int, QString> > WGS84List();
 

src/map/pcs.cpp

@@ -1,4 +1,5 @@
 #include <QFile>
+#include "common/csv.h"
 #include "angularunits.h"
 #include "pcs.h"
 
@@ -23,52 +24,51 @@ PCS PCS::pcs(int id)
 	}
 }
 
-void PCS::loadList(const QString &path)
+bool PCS::loadList(const QString &path)
 {
 	QFile file(path);
+	CSV csv(&file);
+	QByteArrayList entry;
 	bool res;
-	int ln = 0;
 
 	if (!file.open(QFile::ReadOnly)) {
 		qWarning("Error opening PCS file: %s: %s", qPrintable(path),
 		  qPrintable(file.errorString()));
-		return;
+		return false;
 	}
 
-	while (!file.atEnd()) {
-		ln++;
-
-		QByteArray line = file.readLine(4096);
-		QList<QByteArray> list = line.split(',');
-		if (list.size() != 4) {
-			qWarning("%s:%d: Format error", qPrintable(path), ln);
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry) || entry.size() < 4) {
+			qWarning("%s:%d: Parse error", qPrintable(path), csv.line());
+			return false;
+		}
+		QString name(entry.at(0));
+		int id = entry.at(1).toInt(&res);
+		if (!res) {
+			qWarning("%s:%d: Invalid PCS code", qPrintable(path), csv.line());
 			continue;
 		}
-
-		QString name(list.at(0).trimmed());
-		int id = list.at(1).trimmed().toInt(&res);
+		int gcs = entry.at(2).toInt(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid PCS code", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid GCS code", qPrintable(path), csv.line());
 			continue;
 		}
-		int gcs = list.at(2).trimmed().toInt(&res);
+		int proj = entry.at(3).toInt(&res);
 		if (!res) {
-			qWarning("%s:%d: Invalid GCS code", qPrintable(path), ln);
-			continue;
-		}
-		int proj = list.at(3).trimmed().toInt(&res);
-		if (!res) {
-			qWarning("%s:%d: Invalid projection code", qPrintable(path), ln);
+			qWarning("%s:%d: Invalid projection code", qPrintable(path),
+			  csv.line());
 			continue;
 		}
 
 		if (GCS::gcs(gcs).isNull()) {
-			qWarning("%s:%d: Unknown GCS code", qPrintable(path), ln);
+			qWarning("%s:%d: Unknown GCS code", qPrintable(path), csv.line());
 			continue;
 		}
 
 		_pcss.insert(id, Entry(name, gcs, proj));
 	}
+
+	return true;
 }
 
 QList<KV<int, QString> > PCS::list()

src/map/pcs.h

@@ -22,7 +22,7 @@ public:
 	bool isNull() const {return (_gcs.isNull() && _conversion.isNull());}
 	bool isValid() const {return (_gcs.isValid() && _conversion.isValid());}
 
-	static void loadList(const QString &path);
+	static bool loadList(const QString &path);
 	static PCS pcs(int id);
 	static QList<KV<int, QString> > list();