Fixing isValidGpsInputNew Logic to fix error notification for invalid…

… Meters, and adapting MapCalibrationInfoDisplayComponents

src/client/app/components/maps/MapCalibrationInfoDisplayComponent.tsx

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import * as React from 'react';
-import {GPSPoint, isValidGPSInput} from '../../utils/calibration';
+import {GPSPoint, isValidGPSInputNew} from '../../utils/calibration';
 import {ChangeEvent, FormEvent} from 'react';
 import {FormattedMessage} from 'react-intl';
 
@@ -88,7 +88,8 @@ export default class MapCalibrationInfoDisplayComponent extends React.Component<
 		const longitudeIndex = 1;
 		if (this.props.currentCartesianDisplay === 'x: undefined, y: undefined') { return; }
 		const input = this.state.value;
-		if (isValidGPSInput(input)) {
+		const {validGps} = isValidGPSInputNew(input);
+		if (validGps) {
 			const array = input.split(',').map((value: string) => parseFloat(value));
 			const gps: GPSPoint = {
 				longitude: array[longitudeIndex],

src/client/app/utils/calibration.ts

@@ -139,24 +139,26 @@ export function isValidGPSInputNew(input: string){
 	let validGps = true;
 	if (input.indexOf(',') === -1) { // if there is no comma
 		// TODO It would be nice to tell user that comma is missing but need to check all uses to be sure don't get ''.
-		message = 'Input is missing a comma'; //Translate later
+		message = 'GPS Input is missing a comma'; //Translate later
 		validGps = false;
 	} else if (input.indexOf(',') !== input.lastIndexOf(',')) { // if there are multiple commas
-		message = 'Input has too many commas'; //Translate later
+		message = 'GPS Input has too many commas'; //Translate later
 		validGps = false;
 	}
-	// Works if value is not a number since parseFloat returns a NaN so treated as invalid later.
-	const array = input.split(',').map((value: string) => parseFloat(value));
-	const latitudeIndex = 0;
-	const longitudeIndex = 1;
-	const latitudeConstraint = array[latitudeIndex] >= -90 && array[latitudeIndex] <= 90;
-	const longitudeConstraint = array[longitudeIndex] >= -180 && array[longitudeIndex] <= 180;
-	const result = latitudeConstraint && longitudeConstraint;
-	if (!result) {
-		// TODO It would be nice to return the error and then notify as desired.
-		//showErrorNotification(translate('input.gps.range') + input);
-		validGps = false;
-		message = translate('input.gps.range') + input;
+	if(validGps){
+		// Works if value is not a number since parseFloat returns a NaN so treated as invalid later.
+		const array = input.split(',').map((value: string) => parseFloat(value));
+		const latitudeIndex = 0;
+		const longitudeIndex = 1;
+		const latitudeConstraint = array[latitudeIndex] >= -90 && array[latitudeIndex] <= 90;
+		const longitudeConstraint = array[longitudeIndex] >= -180 && array[longitudeIndex] <= 180;
+		const result = latitudeConstraint && longitudeConstraint;
+		if (!result) {
+			// TODO It would be nice to return the error and then notify as desired.
+			//showErrorNotification(translate('input.gps.range') + input);
+			validGps = false;
+			message = translate('input.gps.range') + input;
+		}
 	}
 	return {validGps,message};
 }