Revision 11212

View differences:

branches/F2/libraries/libJCRS/src/org/gvsig/crs/Proj4.java
254 254
			addProjectionParameterDefaultValue(count,"0.0");
255 255

  
256 256
			String[] parameterMaxValue={"90.0"};
257
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
257
			projectionParameterMaxValueList.add(count,parameterMaxValue);
258 258
			addProjectionParameterMaxValue(count,"90.0");
259 259
			addProjectionParameterMaxValue(count,"90.0");
260 260
			addProjectionParameterMaxValue(count,"360.0");
......
262 262
			addProjectionParameterMaxValue(count,"100000000.0");
263 263

  
264 264
			String[] parameterMinValue={"-90.0"};
265
			projectionParameterDefaultValueList.add(count,parameterMinValue);
265
			projectionParameterMinValueList.add(count,parameterMinValue);
266 266
			addProjectionParameterMinValue(count,"-90.0");
267 267
			addProjectionParameterMinValue(count,"-90.0");
268 268
			addProjectionParameterMinValue(count,"-360.0");
......
298 298
			addProjectionParameterDefaultValue(count,"0.0");
299 299

  
300 300
			String[] parameterMaxValue={"90.0"};
301
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
301
			projectionParameterMaxValueList.add(count,parameterMaxValue);
302 302
			addProjectionParameterMaxValue(count,"360.0");
303 303
			addProjectionParameterMaxValue(count,"100000000.0");
304 304
			addProjectionParameterMaxValue(count,"100000000.0");
305 305

  
306 306
			String[] parameterMinValue={"-90.0"};
307
			projectionParameterDefaultValueList.add(count,parameterMinValue);
307
			projectionParameterMinValueList.add(count,parameterMinValue);
308 308
			addProjectionParameterMinValue(count,"-360.0");
309 309
			addProjectionParameterMinValue(count,"-100000000.0");
310 310
			addProjectionParameterMinValue(count,"-100000000.0");
......
338 338
			addProjectionParameterDefaultValue(count,"0.0");
339 339

  
340 340
			String[] parameterMaxValue={"360.0"};
341
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
341
			projectionParameterMaxValueList.add(count,parameterMaxValue);
342 342
			addProjectionParameterMaxValue(count,"90.0");
343 343
			addProjectionParameterMaxValue(count,"100000000.0");
344 344
			addProjectionParameterMaxValue(count,"100000000.0");
345 345

  
346 346
			String[] parameterMinValue={"-360.0"};
347
			projectionParameterDefaultValueList.add(count,parameterMinValue);
347
			projectionParameterMinValueList.add(count,parameterMinValue);
348 348
			addProjectionParameterMinValue(count,"-90.0");
349 349
			addProjectionParameterMinValue(count,"-100000000.0");
350 350
			addProjectionParameterMinValue(count,"-100000000.0");
......
379 379
			addProjectionParameterDefaultValue(count,"0.0");
380 380

  
381 381
			String[] parameterMaxValue={"90.0"};
382
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
382
			projectionParameterMaxValueList.add(count,parameterMaxValue);
383 383
			addProjectionParameterMaxValue(count,"360.0");
384 384
			addProjectionParameterMaxValue(count,"100000000.0");
385 385
			addProjectionParameterMaxValue(count,"100000000.0");
386 386

  
387 387
			String[] parameterMinValue={"-90.0"};
388
			projectionParameterDefaultValueList.add(count,parameterMinValue);
388
			projectionParameterMinValueList.add(count,parameterMinValue);
389 389
			addProjectionParameterMinValue(count,"-360.0");
390 390
			addProjectionParameterMinValue(count,"-100000000.0");
391 391
			addProjectionParameterMinValue(count,"-100000000.0");
......
424 424
			addProjectionParameterDefaultValue(count,"0.0");
425 425

  
426 426
			String[] parameterMaxValue={"360.0"};
427
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
427
			projectionParameterMaxValueList.add(count,parameterMaxValue);
428 428
			addProjectionParameterMaxValue(count,"90.0");
429 429
			addProjectionParameterMaxValue(count,"100000000.0");
430 430
			addProjectionParameterMaxValue(count,"100000000.0");
431 431

  
432 432
			String[] parameterMinValue={"-360.0"};
433
			projectionParameterDefaultValueList.add(count,parameterMinValue);
433
			projectionParameterMinValueList.add(count,parameterMinValue);
434 434
			addProjectionParameterMinValue(count,"-90.0");
435 435
			addProjectionParameterMinValue(count,"-100000000.0");
436 436
			addProjectionParameterMinValue(count,"-100000000.0");
......
461 461
			addProjectionParameterDefaultValue(count,"0.0");
462 462

  
463 463
			String[] parameterMaxValue={"360.0"};
464
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
464
			projectionParameterMaxValueList.add(count,parameterMaxValue);
465 465
			addProjectionParameterMaxValue(count,"100000000.0");
466 466
			addProjectionParameterMaxValue(count,"100000000.0");
467 467

  
468 468
			String[] parameterMinValue={"-360.0"};
469
			projectionParameterDefaultValueList.add(count,parameterMinValue);
469
			projectionParameterMinValueList.add(count,parameterMinValue);
470 470
			addProjectionParameterMinValue(count,"-100000000.0");
471 471
			addProjectionParameterMinValue(count,"-100000000.0");
472 472

  
......
496 496
			addProjectionParameterDefaultValue(count,"0.0");
497 497

  
498 498
			String[] parameterMaxValue={"360.0"};
499
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
499
			projectionParameterMaxValueList.add(count,parameterMaxValue);
500 500
			addProjectionParameterMaxValue(count,"100000000.0");
501 501
			addProjectionParameterMaxValue(count,"100000000.0");
502 502

  
503 503
			String[] parameterMinValue={"-360.0"};
504
			projectionParameterDefaultValueList.add(count,parameterMinValue);
504
			projectionParameterMinValueList.add(count,parameterMinValue);
505 505
			addProjectionParameterMinValue(count,"-100000000.0");
506 506
			addProjectionParameterMinValue(count,"-100000000.0");
507 507

  
......
540 540
			addProjectionParameterDefaultValue(count,"0.0");
541 541

  
542 542
			String[] parameterMaxValue={"90.0"};
543
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
543
			projectionParameterMaxValueList.add(count,parameterMaxValue);
544 544
			addProjectionParameterMaxValue(count,"360.0");
545 545
			addProjectionParameterMaxValue(count,"90.0");
546 546
			addProjectionParameterMaxValue(count,"90.0");
......
548 548
			addProjectionParameterMaxValue(count,"100000000.0");
549 549

  
550 550
			String[] parameterMinValue={"-90.0"};
551
			projectionParameterDefaultValueList.add(count,parameterMinValue);
551
			projectionParameterMinValueList.add(count,parameterMinValue);
552 552
			addProjectionParameterMinValue(count,"-360.0");
553 553
			addProjectionParameterMinValue(count,"-90.0");
554 554
			addProjectionParameterMinValue(count,"-90.0");
......
586 586
			addProjectionParameterDefaultValue(count,"0.0");
587 587

  
588 588
			String[] parameterMaxValue={"90.0"};
589
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
589
			projectionParameterMaxValueList.add(count,parameterMaxValue);
590 590
			addProjectionParameterMaxValue(count,"360.0");
591 591
			addProjectionParameterMaxValue(count,"100000000.0");
592 592
			addProjectionParameterMaxValue(count,"100000000.0");
593 593

  
594 594
			String[] parameterMinValue={"-90.0"};
595
			projectionParameterDefaultValueList.add(count,parameterMinValue);
595
			projectionParameterMinValueList.add(count,parameterMinValue);
596 596
			addProjectionParameterMinValue(count,"-360.0");
597 597
			addProjectionParameterMinValue(count,"-100000000.0");
598 598
			addProjectionParameterMinValue(count,"-100000000.0");
......
624 624
			addProjectionParameterDefaultValue(count,"0.0");
625 625

  
626 626
			String[] parameterMaxValue={"360.0"};
627
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
627
			projectionParameterMaxValueList.add(count,parameterMaxValue);
628 628
			addProjectionParameterMaxValue(count,"100000000.0");
629 629
			addProjectionParameterMaxValue(count,"100000000.0");
630 630

  
631 631
			String[] parameterMinValue={"-360.0"};
632
			projectionParameterDefaultValueList.add(count,parameterMinValue);
632
			projectionParameterMinValueList.add(count,parameterMinValue);
633 633
			addProjectionParameterMinValue(count,"-100000000.0");
634 634
			addProjectionParameterMinValue(count,"-100000000.0");
635 635

  
......
662 662
			addProjectionParameterDefaultValue(count,"0.0");
663 663

  
664 664
			String[] parameterMaxValue={"360.0"};
665
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
665
			projectionParameterMaxValueList.add(count,parameterMaxValue);
666 666
			addProjectionParameterMaxValue(count,"100000000.0");
667 667
			addProjectionParameterMaxValue(count,"100000000.0");
668 668
			addProjectionParameterMaxValue(count,"100000000.0");
669 669

  
670 670
			String[] parameterMinValue={"-360.0"};
671
			projectionParameterDefaultValueList.add(count,parameterMinValue);
671
			projectionParameterMinValueList.add(count,parameterMinValue);
672 672
			addProjectionParameterMinValue(count,"-100000000.0");
673 673
			addProjectionParameterMinValue(count,"-100000000.0");
674 674
			addProjectionParameterMinValue(count,"-100000000.0");
......
702 702
			addProjectionParameterDefaultValue(count,"0.0");
703 703

  
704 704
			String[] parameterMaxValue={"90.0"};
705
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
705
			projectionParameterMaxValueList.add(count,parameterMaxValue);
706 706
			addProjectionParameterMaxValue(count,"360.0");
707 707
			addProjectionParameterMaxValue(count,"100000000.0");
708 708
			addProjectionParameterMaxValue(count,"100000000.0");
709 709

  
710 710
			String[] parameterMinValue={"-90.0"};
711
			projectionParameterDefaultValueList.add(count,parameterMinValue);
711
			projectionParameterMinValueList.add(count,parameterMinValue);
712 712
			addProjectionParameterMinValue(count,"-360.0");
713 713
			addProjectionParameterMinValue(count,"-100000000.0");
714 714
			addProjectionParameterMinValue(count,"-100000000.0");
......
738 738
			addProjectionParameterDefaultValue(count,"0.0");
739 739

  
740 740
			String[] parameterMaxValue={"360.0"};
741
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
741
			projectionParameterMaxValueList.add(count,parameterMaxValue);
742 742
			addProjectionParameterMaxValue(count,"100000000.0");
743 743
			addProjectionParameterMaxValue(count,"100000000.0");
744 744

  
745 745
			String[] parameterMinValue={"-360.0"};
746
			projectionParameterDefaultValueList.add(count,parameterMinValue);
746
			projectionParameterMinValueList.add(count,parameterMinValue);
747 747
			addProjectionParameterMinValue(count,"-100000000.0");
748 748
			addProjectionParameterMinValue(count,"-100000000.0");
749 749

  
......
783 783
			addProjectionParameterDefaultValue(count,"0.0");
784 784

  
785 785
			String[] parameterMaxValue={"90.0"};
786
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
786
			projectionParameterMaxValueList.add(count,parameterMaxValue);
787 787
			addProjectionParameterMaxValue(count,"360.0");
788 788
			addProjectionParameterMaxValue(count,"360.0");
789 789
			addProjectionParameterMaxValue(count,"10.0");
......
791 791
			addProjectionParameterMaxValue(count,"100000000.0");
792 792

  
793 793
			String[] parameterMinValue={"-90.0"};
794
			projectionParameterDefaultValueList.add(count,parameterMinValue);
794
			projectionParameterMinValueList.add(count,parameterMinValue);
795 795
			addProjectionParameterMinValue(count,"-360.0");
796 796
			addProjectionParameterMinValue(count,"-360.0");
797 797
			addProjectionParameterMinValue(count,"0.0");
......
834 834
			addProjectionParameterDefaultValue(count,"0.0");
835 835

  
836 836
			String[] parameterMaxValue={"90.0"};
837
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
837
			projectionParameterMaxValueList.add(count,parameterMaxValue);
838 838
			addProjectionParameterMaxValue(count,"360.0");
839 839
			addProjectionParameterMaxValue(count,"360.0");
840 840
			addProjectionParameterMaxValue(count,"10.0");
......
842 842
			addProjectionParameterMaxValue(count,"100000000.0");
843 843

  
844 844
			String[] parameterMinValue={"-90.0"};
845
			projectionParameterDefaultValueList.add(count,parameterMinValue);
845
			projectionParameterMinValueList.add(count,parameterMinValue);
846 846
			addProjectionParameterMinValue(count,"-360.0");
847 847
			addProjectionParameterMinValue(count,"-360.0");
848 848
			addProjectionParameterMinValue(count,"0.0");
......
881 881
			addProjectionParameterDefaultValue(count,"0.0");
882 882

  
883 883
			String[] parameterMaxValue={"90.0"};
884
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
884
			projectionParameterMaxValueList.add(count,parameterMaxValue);
885 885
			addProjectionParameterMaxValue(count,"360.0");
886 886
			addProjectionParameterMaxValue(count,"100000000.0");
887 887
			addProjectionParameterMaxValue(count,"100000000.0");
888 888

  
889 889
			String[] parameterMinValue={"-90.0"};
890
			projectionParameterDefaultValueList.add(count,parameterMinValue);
890
			projectionParameterMinValueList.add(count,parameterMinValue);
891 891
			addProjectionParameterMinValue(count,"-360.0");
892 892
			addProjectionParameterMinValue(count,"-100000000.0");
893 893
			addProjectionParameterMinValue(count,"-100000000.0");
......
928 928
			addProjectionParameterDefaultValue(count,"0.0");
929 929

  
930 930
			String[] parameterMaxValue={"90.0"};
931
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
931
			projectionParameterMaxValueList.add(count,parameterMaxValue);
932 932
			addProjectionParameterMaxValue(count,"90.0");
933 933
			addProjectionParameterMaxValue(count,"360.0");
934 934
			addProjectionParameterMaxValue(count,"10.0");
......
936 936
			addProjectionParameterMaxValue(count,"100000000.0");
937 937

  
938 938
			String[] parameterMinValue={"-90.0"};
939
			projectionParameterDefaultValueList.add(count,parameterMinValue);
939
			projectionParameterMinValueList.add(count,parameterMinValue);
940 940
			addProjectionParameterMinValue(count,"-90.0");
941 941
			addProjectionParameterMinValue(count,"-360.0");
942 942
			addProjectionParameterMinValue(count,"0.0");
......
979 979
			addProjectionParameterDefaultValue(count,"0.0");
980 980

  
981 981
			String[] parameterMaxValue={"90.0"};
982
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
982
			projectionParameterMaxValueList.add(count,parameterMaxValue);
983 983
			addProjectionParameterMaxValue(count,"90.0");
984 984
			addProjectionParameterMaxValue(count,"90.0");
985 985
			addProjectionParameterMaxValue(count,"360.0");
......
987 987
			addProjectionParameterMaxValue(count,"100000000.0");
988 988

  
989 989
			String[] parameterMinValue={"-90.0"};
990
			projectionParameterDefaultValueList.add(count,parameterMinValue);
990
			projectionParameterMinValueList.add(count,parameterMinValue);
991 991
			addProjectionParameterMinValue(count,"-90.0");
992 992
			addProjectionParameterMinValue(count,"-90.0");
993 993
			addProjectionParameterMinValue(count,"-360.0");
......
1030 1030
			addProjectionParameterDefaultValue(count,"0.0");
1031 1031

  
1032 1032
			String[] parameterMaxValue={"90.0"};
1033
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1033
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1034 1034
			addProjectionParameterMaxValue(count,"90.0");
1035 1035
			addProjectionParameterMaxValue(count,"90.0");
1036 1036
			addProjectionParameterMaxValue(count,"360.0");
......
1038 1038
			addProjectionParameterMaxValue(count,"100000000.0");
1039 1039

  
1040 1040
			String[] parameterMinValue={"-90.0"};
1041
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1041
			projectionParameterMinValueList.add(count,parameterMinValue);
1042 1042
			addProjectionParameterMinValue(count,"-90.0");
1043 1043
			addProjectionParameterMinValue(count,"-90.0");
1044 1044
			addProjectionParameterMinValue(count,"-360.0");
......
1075 1075
			addProjectionParameterDefaultValue(count,"0.0");
1076 1076

  
1077 1077
			String[] parameterMaxValue={"360.0"};
1078
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1078
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1079 1079
			addProjectionParameterMaxValue(count,"10.0");
1080 1080
			addProjectionParameterMaxValue(count,"100000000.0");
1081 1081
			addProjectionParameterMaxValue(count,"100000000.0");
1082 1082

  
1083 1083
			String[] parameterMinValue={"-360.0"};
1084
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1084
			projectionParameterMinValueList.add(count,parameterMinValue);
1085 1085
			addProjectionParameterMinValue(count,"0.0");
1086 1086
			addProjectionParameterMinValue(count,"-100000000.0");
1087 1087
			addProjectionParameterMinValue(count,"-100000000.0");
......
1116 1116
			addProjectionParameterDefaultValue(count,"0.0");
1117 1117

  
1118 1118
			String[] parameterMaxValue={"360.0"};
1119
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1119
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1120 1120
			addProjectionParameterMaxValue(count,"90.0");
1121 1121
			addProjectionParameterMaxValue(count,"100000000.0");
1122 1122
			addProjectionParameterMaxValue(count,"100000000.0");
1123 1123

  
1124 1124
			String[] parameterMinValue={"-360.0"};
1125
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1125
			projectionParameterMinValueList.add(count,parameterMinValue);
1126 1126
			addProjectionParameterMinValue(count,"-90.0");
1127 1127
			addProjectionParameterMinValue(count,"-100000000.0");
1128 1128
			addProjectionParameterMinValue(count,"-100000000.0");
......
1156 1156
			addProjectionParameterDefaultValue(count,"0.0");
1157 1157

  
1158 1158
			String[] parameterMaxValue={"90.0"};
1159
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1159
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1160 1160
			addProjectionParameterMaxValue(count,"360.0");
1161 1161
			addProjectionParameterMaxValue(count,"100000000.0");
1162 1162
			addProjectionParameterMaxValue(count,"100000000.0");
1163 1163

  
1164 1164
			String[] parameterMinValue={"-90.0"};
1165
			projectionParameterMinValueList.add(count,parameterMinValue);
1165 1166
			addProjectionParameterMinValue(count,"-360.0");
1166 1167
			addProjectionParameterMinValue(count,"-100000000.0");
1167 1168
			addProjectionParameterMinValue(count,"-100000000.0");
......
1194 1195
			addProjectionParameterDefaultValue(count,"0.0");
1195 1196

  
1196 1197
			String[] parameterMaxValue={"360.0"};
1197
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1198
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1198 1199
			addProjectionParameterMaxValue(count,"100000000.0");
1199 1200
			addProjectionParameterMaxValue(count,"100000000.0");
1200 1201

  
1201 1202
			String[] parameterMinValue={"-360.0"};
1202
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1203
			projectionParameterMinValueList.add(count,parameterMinValue);
1203 1204
			addProjectionParameterMinValue(count,"-100000000.0");
1204 1205
			addProjectionParameterMinValue(count,"-100000000.0");
1205 1206

  
......
1218 1219
			projectionParameterList.add(count,parameterName);
1219 1220
			addProjectionParameter(count,"central_meridian");
1220 1221
			addProjectionParameter(count,"false_easting");
1221
			addProjectionParameter(count,"fase_northing");
1222
			addProjectionParameter(count,"false_northing");
1222 1223

  
1223 1224
			String[] parameterAcronym={"lat_0"};
1224 1225
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1233 1234
			addProjectionParameterDefaultValue(count,"0.0");
1234 1235

  
1235 1236
			String[] parameterMaxValue={"90.0"};
1236
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1237
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1237 1238
			addProjectionParameterMaxValue(count,"360.0");
1238 1239
			addProjectionParameterMaxValue(count,"100000000.0");
1239 1240
			addProjectionParameterMaxValue(count,"100000000.0");
1240 1241

  
1241 1242
			String[] parameterMinValue={"-90.0"};
1242
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1243
			projectionParameterMinValueList.add(count,parameterMinValue);
1243 1244
			addProjectionParameterMinValue(count,"-360.0");
1244 1245
			addProjectionParameterMinValue(count,"-100000000.0");
1245 1246
			addProjectionParameterMinValue(count,"-100000000.0");
......
1262 1263
			//addProjectionParameter(count,"rectified_grid_angle");
1263 1264
			addProjectionParameter(count,"scale_factor");
1264 1265
			addProjectionParameter(count,"false_easting");
1265
			addProjectionParameter(count,"fase_northing");
1266
			addProjectionParameter(count,"false_northing");
1266 1267

  
1267 1268
			String[] parameterAcronym={"lat_0"};
1268 1269
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1280 1281
			addProjectionParameterDefaultValue(count,"0.0");
1281 1282

  
1282 1283
			String[] parameterMaxValue={"90.0"};
1283
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1284
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1284 1285
			addProjectionParameterMaxValue(count,"360.0");
1285 1286
			addProjectionParameterMaxValue(count,"360.0");
1286 1287
			addProjectionParameterMaxValue(count,"10.0");
......
1288 1289
			addProjectionParameterMaxValue(count,"100000000.0");
1289 1290

  
1290 1291
			String[] parameterMinValue={"-90.0"};
1291
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1292
			projectionParameterMinValueList.add(count,parameterMinValue);
1292 1293
			addProjectionParameterMinValue(count,"-360.0");
1293 1294
			addProjectionParameterMinValue(count,"-360.0");
1294 1295
			addProjectionParameterMinValue(count,"0.0");
......
1311 1312
			addProjectionParameter(count,"central_meridian");
1312 1313
			addProjectionParameter(count,"scale_factor");
1313 1314
			addProjectionParameter(count,"false_easting");
1314
			addProjectionParameter(count,"fase_northing");
1315
			addProjectionParameter(count,"false_northing");
1315 1316

  
1316 1317
			String[] parameterAcronym={"lat_0"};
1317 1318
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1328 1329
			addProjectionParameterDefaultValue(count,"0.0");
1329 1330

  
1330 1331
			String[] parameterMaxValue={"90.0"};
1331
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1332
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1332 1333
			addProjectionParameterMaxValue(count,"360.0");
1333 1334
			addProjectionParameterMaxValue(count,"10.0");
1334 1335
			addProjectionParameterMaxValue(count,"100000000.0");
1335 1336
			addProjectionParameterMaxValue(count,"100000000.0");
1336 1337

  
1337 1338
			String[] parameterMinValue={"-90.0"};
1338
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1339
			projectionParameterMinValueList.add(count,parameterMinValue);
1339 1340
			addProjectionParameterMinValue(count,"-360.0");
1340 1341
			addProjectionParameterMinValue(count,"0.0");
1341 1342
			addProjectionParameterMinValue(count,"-100000000.0");
......
1354 1355
			projectionParameterList.add(count,parameterName);
1355 1356
			addProjectionParameter(count,"central_meridian");
1356 1357
			addProjectionParameter(count,"false_easting");
1357
			addProjectionParameter(count,"fase_northing");
1358
			addProjectionParameter(count,"false_northing");
1358 1359

  
1359 1360
			String[] parameterAcronym={"lat_0"};
1360 1361
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1369 1370
			addProjectionParameterDefaultValue(count,"0.0");
1370 1371

  
1371 1372
			String[] parameterMaxValue={"90.0"};
1372
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1373
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1373 1374
			addProjectionParameterMaxValue(count,"360.0");
1374 1375
			addProjectionParameterMaxValue(count,"100000000.0");
1375 1376
			addProjectionParameterMaxValue(count,"100000000.0");
1376 1377

  
1377 1378
			String[] parameterMinValue={"-90.0"};
1378
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1379
			projectionParameterMinValueList.add(count,parameterMinValue);
1379 1380
			addProjectionParameterMinValue(count,"-360.0");
1380 1381
			addProjectionParameterMinValue(count,"-100000000.0");
1381 1382
			addProjectionParameterMinValue(count,"-100000000.0");
......
1397 1398
			addProjectionParameter(count,"central_meridian");
1398 1399
			addProjectionParameter(count,"scale_factor");
1399 1400
			addProjectionParameter(count,"false_easting");
1400
			addProjectionParameter(count,"fase_northing");
1401
			addProjectionParameter(count,"false_northing");
1401 1402

  
1402 1403
			String[] parameterAcronym={"lat_0"};
1403 1404
			//lat_0=90 o lat_0=-90
......
1417 1418
			addProjectionParameterDefaultValue(count,"0.0");
1418 1419

  
1419 1420
			String[] parameterMaxValue={"90.0"};
1420
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1421
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1421 1422
			addProjectionParameterMaxValue(count,"90.0");
1422 1423
			addProjectionParameterMaxValue(count,"360.0");
1423 1424
			addProjectionParameterMaxValue(count,"10.0");
......
1425 1426
			addProjectionParameterMaxValue(count,"100000000.0");
1426 1427

  
1427 1428
			String[] parameterMinValue={"-90.0"};
1428
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1429
			projectionParameterMinValueList.add(count,parameterMinValue);
1429 1430
			addProjectionParameterMinValue(count,"-90.0");
1430 1431
			addProjectionParameterMinValue(count,"-360.0");
1431 1432
			addProjectionParameterMinValue(count,"0.0");
......
1445 1446
			projectionParameterList.add(count,parameterName);
1446 1447
			addProjectionParameter(count,"central_meridian");
1447 1448
			addProjectionParameter(count,"false_easting");
1448
			addProjectionParameter(count,"fase_northing");
1449
			addProjectionParameter(count,"false_northing");
1449 1450

  
1450 1451
			String[] parameterAcronym={"lat_0"};
1451 1452
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1460 1461
			addProjectionParameterDefaultValue(count,"0.0");
1461 1462

  
1462 1463
			String[] parameterMaxValue={"90.0"};
1463
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1464
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1464 1465
			addProjectionParameterMaxValue(count,"360.0");
1465 1466
			addProjectionParameterMaxValue(count,"100000000.0");
1466 1467
			addProjectionParameterMaxValue(count,"100000000.0");
1467 1468

  
1468 1469
			String[] parameterMinValue={"-90.0"};
1469
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1470
			projectionParameterMinValueList.add(count,parameterMinValue);
1470 1471
			addProjectionParameterMinValue(count,"-360.0");
1471 1472
			addProjectionParameterMinValue(count,"-100000000.0");
1472 1473
			addProjectionParameterMinValue(count,"-100000000.0");
......
1483 1484
			String[] parameterName={"longitude_of_center"};
1484 1485
			projectionParameterList.add(count,parameterName);
1485 1486
			addProjectionParameter(count,"false_easting");
1486
			addProjectionParameter(count,"fase_northing");
1487
			addProjectionParameter(count,"false_northing");
1487 1488

  
1488 1489
			String[] parameterAcronym={"lon_0"};
1489 1490
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1496 1497
			addProjectionParameterDefaultValue(count,"0.0");
1497 1498

  
1498 1499
			String[] parameterMaxValue={"360.0"};
1499
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1500
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1500 1501
			addProjectionParameterMaxValue(count,"100000000.0");
1501 1502
			addProjectionParameterMaxValue(count,"100000000.0");
1502 1503

  
1503 1504
			String[] parameterMinValue={"-360.0"};
1504
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1505
			projectionParameterMinValueList.add(count,parameterMinValue);
1505 1506
			addProjectionParameterMinValue(count,"-100000000.0");
1506 1507
			addProjectionParameterMinValue(count,"-100000000.0");
1507 1508

  
......
1519 1520
			String[] parameterName={"longitude_of_center"};
1520 1521
			projectionParameterList.add(count,parameterName);
1521 1522
			addProjectionParameter(count,"false_easting");
1522
			addProjectionParameter(count,"fase_northing");
1523
			addProjectionParameter(count,"false_northing");
1523 1524

  
1524 1525
			String[] parameterAcronym={"lon_0"};
1525 1526
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1532 1533
			addProjectionParameterDefaultValue(count,"0.0");
1533 1534

  
1534 1535
			String[] parameterMaxValue={"360.0"};
1535
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1536
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1536 1537
			addProjectionParameterMaxValue(count,"100000000.0");
1537 1538
			addProjectionParameterMaxValue(count,"100000000.0");
1538 1539

  
1539 1540
			String[] parameterMinValue={"-360.0"};
1540
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1541
			projectionParameterMinValueList.add(count,parameterMinValue);
1541 1542
			addProjectionParameterMinValue(count,"-100000000.0");
1542 1543
			addProjectionParameterMinValue(count,"-100000000.0");
1543 1544

  
......
1557 1558
			projectionParameterList.add(count,parameterName);
1558 1559
			addProjectionParameter(count,"central_meridian");
1559 1560
			addProjectionParameter(count,"false_easting");
1560
			addProjectionParameter(count,"fase_northing");
1561
			addProjectionParameter(count,"false_northing");
1561 1562

  
1562 1563
			String[] parameterAcronym={"lat_0"};
1563 1564
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1572 1573
			addProjectionParameterDefaultValue(count,"0.0");
1573 1574

  
1574 1575
			String[] parameterMaxValue={"90.0"};
1575
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1576
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1576 1577
			addProjectionParameterMaxValue(count,"360.0");
1577 1578
			addProjectionParameterMaxValue(count,"100000000.0");
1578 1579
			addProjectionParameterMaxValue(count,"100000000.0");
1579 1580

  
1580 1581
			String[] parameterMinValue={"-90.0"};
1582
			projectionParameterMinValueList.add(count,parameterMinValue);
1581 1583
			addProjectionParameterMinValue(count,"-360.0");
1582 1584
			addProjectionParameterMinValue(count,"-100000000.0");
1583 1585
			addProjectionParameterMinValue(count,"-100000000.0");
......
1596 1598
			addProjectionParameter(count,"central_meridian");
1597 1599
			addProjectionParameter(count,"scale_factor");
1598 1600
			addProjectionParameter(count,"false_easting");
1599
			addProjectionParameter(count,"fase_northing");
1601
			addProjectionParameter(count,"false_northing");
1600 1602

  
1601 1603
			String[] parameterAcronym={"lat_0"};
1602 1604
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1613 1615
			addProjectionParameterDefaultValue(count,"0.0");
1614 1616

  
1615 1617
			String[] parameterMaxValue={"90.0"};
1616
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1618
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1617 1619
			addProjectionParameterMaxValue(count,"360.0");
1618 1620
			addProjectionParameterMaxValue(count,"10.0");
1619 1621
			addProjectionParameterMaxValue(count,"100000000.0");
1620 1622
			addProjectionParameterMaxValue(count,"100000000.0");
1621 1623

  
1622 1624
			String[] parameterMinValue={"-90.0"};
1623
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1625
			projectionParameterMinValueList.add(count,parameterMinValue);
1624 1626
			addProjectionParameterMinValue(count,"-360.0");
1625 1627
			addProjectionParameterMinValue(count,"0.0");
1626 1628
			addProjectionParameterMinValue(count,"-100000000.0");
......
1660 1662
			addProjectionParameterDefaultValue(count,"0.0");
1661 1663

  
1662 1664
			String[] parameterMaxValue={"90.0"};
1663
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1665
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1664 1666
			addProjectionParameterMaxValue(count,"360.0");
1665 1667
			addProjectionParameterMaxValue(count,"10.0");
1666 1668
			addProjectionParameterMaxValue(count,"100000000.0");
1667 1669
			addProjectionParameterMaxValue(count,"100000000.0");
1668 1670

  
1669 1671
			String[] parameterMinValue={"-90.0"};
1670
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1672
			projectionParameterMinValueList.add(count,parameterMinValue);
1671 1673
			addProjectionParameterMinValue(count,"-360.0");
1672 1674
			addProjectionParameterMinValue(count,"0.0");
1673 1675
			addProjectionParameterMinValue(count,"-100000000.0");
......
1684 1686
			String[] projectionName={"Transverse_Mercator_South_Orientated"};
1685 1687
			projectionNameList.add(count,projectionName);
1686 1688
			addProjectionName(count,"Transverse Mercator (South Oriented)");
1689
			addProjectionName(count,"Transverse Mercator (South Orientated)");			
1687 1690
			addProjectionName(count,"9808");
1688 1691

  
1689 1692
			String[] parameterName={"latitude_of_origin"};
......
1691 1694
			addProjectionParameter(count,"central_meridian");
1692 1695
			addProjectionParameter(count,"scale_factor");
1693 1696
			addProjectionParameter(count,"false_easting");
1694
			addProjectionParameter(count,"fase_northing");
1697
			addProjectionParameter(count,"false_northing");
1695 1698

  
1696 1699
			String[] parameterAcronym={"lat_0"};
1697 1700
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1708 1711
			addProjectionParameterDefaultValue(count,"0.0");
1709 1712

  
1710 1713
			String[] parameterMaxValue={"90.0"};
1711
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1714
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1712 1715
			addProjectionParameterMaxValue(count,"360.0");
1713 1716
			addProjectionParameterMaxValue(count,"10.0");
1714 1717
			addProjectionParameterMaxValue(count,"100000000.0");
1715 1718
			addProjectionParameterMaxValue(count,"100000000.0");
1716 1719

  
1717 1720
			String[] parameterMinValue={"-90.0"};
1718
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1721
			projectionParameterMinValueList.add(count,parameterMinValue);
1719 1722
			addProjectionParameterMinValue(count,"-360.0");
1720 1723
			addProjectionParameterMinValue(count,"0.0");
1721 1724
			addProjectionParameterMinValue(count,"-100000000.0");
......
1737 1740
			projectionParameterList.add(count,parameterName);
1738 1741
			addProjectionParameter(count,"central_meridian");
1739 1742
			addProjectionParameter(count,"false_easting");
1740
			addProjectionParameter(count,"fase_northing");
1743
			addProjectionParameter(count,"false_northing");
1741 1744
		}
1742 1745
		*/
1743 1746

  
......
1750 1753
			String[] parameterName={"central_meridian"};
1751 1754
			projectionParameterList.add(count,parameterName);
1752 1755
			addProjectionParameter(count,"false_easting");
1753
			addProjectionParameter(count,"fase_northing");
1756
			addProjectionParameter(count,"false_northing");
1754 1757

  
1755 1758
			String[] parameterAcronym={"lon_0"};
1756 1759
			projectionParameterAcronymList.add(count,parameterAcronym);
......
1763 1766
			addProjectionParameterDefaultValue(count,"0.0");
1764 1767

  
1765 1768
			String[] parameterMaxValue={"360.0"};
1766
			projectionParameterDefaultValueList.add(count,parameterMaxValue);
1769
			projectionParameterMaxValueList.add(count,parameterMaxValue);
1767 1770
			addProjectionParameterMaxValue(count,"100000000.0");
1768 1771
			addProjectionParameterMaxValue(count,"100000000.0");
1769 1772

  
1770 1773
			String[] parameterMinValue={"-360.0"};
1771
			projectionParameterDefaultValueList.add(count,parameterMinValue);
1774
			projectionParameterMinValueList.add(count,parameterMinValue);
1772 1775
			addProjectionParameterMinValue(count,"-100000000.0");
1773 1776
			addProjectionParameterMinValue(count,"-100000000.0");
1774 1777

  
......
2062 2065
		String strProj=crs.getCrsWkt().getProjcs();
2063 2066
		if(strProj.equals(""))
2064 2067
		{
2065
			System.out.println("Projection Name = "+"Geodetic");
2068
			//System.out.println("Projection Name = "+"Geodetic");
2066 2069
			strProj4+="longlat ";
2067 2070
		}
2068 2071
		else
2069 2072
		{
2070
			System.out.println("Projection      = "+strProj);
2073
			//System.out.println("Projection      = "+strProj);
2071 2074
			String strProjName=crs.getCrsWkt().getProjection();
2072
			System.out.println("Projection Name = "+strProjName);
2075
			//System.out.println("Projection Name = "+strProjName);
2073 2076
			int indexProj=findProjection(strProjName);
2074 2077
			if(indexProj==-1)
2075 2078
			{
......
2082 2085
			ArrayList parameterValues=getProj4ProjectionParameterDefaultValues(indexProj);
2083 2086
			ArrayList parameterMaxValues=getProj4ProjectionParameterMaxValues(indexProj);
2084 2087
			ArrayList parameterMinValues=getProj4ProjectionParameterMinValues(indexProj);
2085
			System.out.println("Parametros:"+parameterNames);
2088
			//System.out.println("Parametros:"+parameterNames);
2086 2089
			String[] gtParameterValues=crs.getCrsWkt().getParam_value();
2087 2090
			String[] gtParameterNames=crs.getCrsWkt().getParam_name();
2088 2091
			for(int i=0;i<parameterNames.size();i++)
......
2099 2102
					if(((String)parameterNames.get(i)).trim().equals(gtParameterNames[j].trim()))
2100 2103
					{
2101 2104
						existsParameter=true;
2102
						double maxValue=Double.parseDouble((String)parameterMaxValues.get(j));
2103
						double minValue=Double.parseDouble((String)parameterMinValues.get(j));
2105
						double maxValue=Double.parseDouble((String)parameterMaxValues.get(i));
2106
						double minValue=Double.parseDouble((String)parameterMinValues.get(i));
2104 2107
						//parameterValue=Double.parseDouble(gtParameterValues[j]);
2105 2108
						parameterValue=gtParameterValues[j]; // Ojo unidades -> analizar
2106 2109
						double auxValue=Double.parseDouble(parameterValue);
......
2112 2115
							System.out.println(strError);
2113 2116
							throw new CrsException(new Exception());
2114 2117
						}
2118
						else if (((String)parameterNames.get(i)).trim().equals("scale_factor") && (auxValue==minValue)) {
2119
							String strError="El parametro ";
2120
							strError+=gtParameterName;
2121
							strError+=" esta fuera de dominio";
2122
							System.out.println(strError);
2123
							throw new CrsException(new Exception());
2124
						}
2115 2125
						break;
2116 2126
					}
2117 2127
				}
2118 2128
				if(existsParameter)
2119 2129
				{
2120 2130
					parameterValues.set(i,parameterValue);
2121
					System.out.println("- Parametro["+parameterNames.get(i)+"]="+parameterValue);
2131
					//System.out.println("- Parametro["+parameterNames.get(i)+"]="+parameterValue);
2122 2132
				}
2123 2133
				/*
2124 2134
				else
......
2258 2268
			strEllipse="+ellps="+strEllipseAcronym+" ";
2259 2269
		}
2260 2270
		strProj4+=strEllipse;
2261
		System.out.println("Elipsoide["+elipName+"]=("+a+","+inv_f+")");
2271
		//System.out.println("Elipsoide["+elipName+"]=("+a+","+inv_f+")");
2262 2272
		strProj4+=primeMeridianAcronym;
2263 2273
		String strWkt=crs.getWKT();
2264 2274
		
2265
		System.out.println("- Cadena proj4: "+strProj4);
2266
		return strWkt;		
2275
		//System.out.println("- Cadena proj4: "+strProj4);
2276
		return strProj4;		
2267 2277
	}
2268 2278

  
2269 2279
	private String[] primeMeridianToProj4(String pmName,double pmValue) throws CrsException

Also available in: Unified diff