[Hamlib-cvs-digest] CVS: hamlib/tests testloc.c,1.5,1.6

[Nate B. <n0...@us...>]

Update of /cvsroot/hamlib/hamlib/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv8931/tests

Modified Files:
	testloc.c 
Log Message:
2003-08-21

	Update:
		locator.c -- added argument int pair_count to 
		longlat2locator() and changed longlat2locator() from
		void to type int return.  Changed *seconds argument in
		dms2dec() and dec2dms() from type int to type double.

		rotator.h -- function prototypes to match above.

		testloc.c -- modified to support changes in locator.c
		Added additional command line parameter, locator-length
		which is expected after the first locator and before the
		optional second locator.



Index: testloc.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/testloc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** testloc.c	21 Aug 2003 03:11:27 -0000	1.5
--- testloc.c	21 Aug 2003 20:22:06 -0000	1.6
***************
*** 16,30 ****
  	char recodedloc[13], *loc1, *loc2;
  	double lon1 = 0, lat1, lon2, lat2;
! 	double distance, az;
! 	int deg, min, sec;
! 	int retcode;
  
! 	if (argc < 2) {
! 		fprintf(stderr, "Usage: %s <locator1> [<locator2>]\n", argv[0]);
  		exit(1);
  	}
  
  	loc1 = argv[1];
! 	loc2 = argc > 2 ? argv[2] : NULL;
  
  	printf("Locator1: %s\n", loc1);
--- 16,31 ----
  	char recodedloc[13], *loc1, *loc2;
  	double lon1 = 0, lat1, lon2, lat2;
! 	double distance, az, sec;
! 	int deg, min;
! 	int retcode, locator_length;
  
! 	if (argc < 3) {
! 		fprintf(stderr, "Usage: %s <locator1> <precision> [<locator2>]\n", argv[0]);
  		exit(1);
  	}
  
  	loc1 = argv[1];
!         locator_length = atoi(argv[2]);
! 	loc2 = argc > 3 ? argv[3] : NULL;
  
  	printf("Locator1: %s\n", loc1);
***************
*** 36,54 ****
  
  	dec2dms(lon1, &deg, &min, &sec);
! 	printf("  Longitude:   %f, %d° %d' %d\"\n", lon1, deg, min, sec);
  	lon1 = dms2dec(deg, min, sec);
  	printf("  Recoded lon: %f\n", lon1);
  
  	dec2dms(lat1, &deg, &min, &sec);
! 	printf("  Latitude:    %f, %d° %d' %d\"\n", lat1, deg, min, sec);
  	lat1 = dms2dec(deg, min, sec);
  	printf("  Recoded lat: %f\n", lat1);
  
! 	longlat2locator(lon1, lat1, recodedloc);
! //	recodedloc[6] = '\0';
  	printf("  Recoded: %s\n", recodedloc);
  
  	if (loc2 == NULL)
! 			exit(0);
  
  	printf("\nLocator2: %s\n", loc2);
--- 37,54 ----
  
  	dec2dms(lon1, &deg, &min, &sec);
! 	printf("  Longitude:   %f, %d° %d' %.2f\"\n", lon1, deg, min, sec);
  	lon1 = dms2dec(deg, min, sec);
  	printf("  Recoded lon: %f\n", lon1);
  
  	dec2dms(lat1, &deg, &min, &sec);
! 	printf("  Latitude:    %f, %d° %d' %.2f\"\n", lat1, deg, min, sec);
  	lat1 = dms2dec(deg, min, sec);
  	printf("  Recoded lat: %f\n", lat1);
  
! 	longlat2locator(lon1, lat1, recodedloc, locator_length);
  	printf("  Recoded: %s\n", recodedloc);
  
  	if (loc2 == NULL)
! 		exit(0);
  
  	printf("\nLocator2: %s\n", loc2);
***************
*** 60,74 ****
  
  	dec2dms(lon2, &deg, &min, &sec);
! 	printf("  Longitude:   %f, %d° %d' %d\"\n", lon2, deg, min, sec);
  	lon2 = dms2dec(deg, min, sec);
  	printf("  Recoded lon: %f\n", lon2);
  
  	dec2dms(lat2, &deg, &min, &sec);
! 	printf("  Latitude:    %f, %d° %d' %d\"\n", lat2, deg, min, sec);
  	lat2 = dms2dec(deg, min, sec);
  	printf("  Recoded lat: %f\n", lat2);
  
! 	longlat2locator(lon2, lat2, recodedloc);
! //	recodedloc[6] = '\0';
  	printf("  Recoded: %s\n", recodedloc);
  
--- 60,73 ----
  
  	dec2dms(lon2, &deg, &min, &sec);
! 	printf("  Longitude:   %f, %d° %d' %.2f\"\n", lon2, deg, min, sec);
  	lon2 = dms2dec(deg, min, sec);
  	printf("  Recoded lon: %f\n", lon2);
  
  	dec2dms(lat2, &deg, &min, &sec);
! 	printf("  Latitude:    %f, %d° %d' %.2f\"\n", lat2, deg, min, sec);
  	lat2 = dms2dec(deg, min, sec);
  	printf("  Recoded lat: %f\n", lat2);
  
! 	longlat2locator(lon2, lat2, recodedloc, locator_length);
  	printf("  Recoded: %s\n", recodedloc);
  
***************
*** 80,84 ****
  	dec2dms(az, &deg, &min, &sec);
  	printf("\nDistance: %.2fkm\n", distance);
! 	printf("Bearing: %f, %d° %d' %d\"\n", az, deg, min, sec);
  
  	return 0;
--- 79,83 ----
  	dec2dms(az, &deg, &min, &sec);
  	printf("\nDistance: %.2fkm\n", distance);
! 	printf("Bearing: %f, %d° %d' %.2f\"\n", az, deg, min, sec);
  
  	return 0;