BI-2127 Position Information missing from exp download file

[davedrp]

Description

BI-2127 Position Information missing from exp download file

There were 2 separate problems:

1. The row and column fields would only populate if there was data for both rowandcolumn. If a record only had data for row but not column or If a record only had data for column but not row, then the data for neither row or columnwould appear for that record.
2. The data for Lat, 'Long, Elevation, and RTK` was not being added to the download spreadsheet.

Testing

1. Import an experiment with row data but not column data.
2. Import an experiment with column data but not row data.
3. In the above two import files, include data for Lat, 'Long, Elevation, and RTK`
4. Download the experiments

EXPECTED RESULTS
The download data should match the import data.

Checklist:

• I have performed a self-review of my own code
• I have tested my code and ensured it meets the acceptance criteria of the story
• I have tested that my code works with both the brapi-java-server and BreedBase
• I have create/modified unit tests to cover this change
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to documentation
• I have run TAF: <please include a link to TAF run>

[davedrp]

Sample file for testing
short_noCol_exp.xlsx
short_noRow_exp.xlsx
short_noRowOrCol_exp.xlsx
short_RowAndCol_exp.xlsx

[mlm483]

Is it allowed to upload a file that has row but not column data or vice versa? I think this change makes sense regardless.

[mlm483]

Nice.

[dmeidlin]

Looks good! Refactoring using Optionals here might help the readability.

Suggested change

	// Lat, Long, Elevation
	Coordinatescoordinates = extractCoordinates(ou);
	row.put( ExperimentObservation.Columns.LAT, coordinates==null? null : doubleToString(coordinates.getLat()) );
	row.put( ExperimentObservation.Columns.LONG, coordinates==null? null : doubleToString(coordinates.getLon()) );
	row.put( ExperimentObservation.Columns.ELEVATION, coordinates==null? null : doubleToString(coordinates.getAlt()) );
	// Lat, Long, Elevation
	Coordinatescoordinates = extractCoordinates(ou);
	Optional.ofNullable(coordinates)
	.map(c -> doubleToString(c.getLat()))
	.ifPresent(lat -> row.put(ExperimentObservation.Columns.LAT, lat));
	Optional.ofNullable(coordinates)
	.map(c -> doubleToString(c.getLon()))
	.ifPresent(lon -> row.put(ExperimentObservation.Columns.LONG, lon));
	Optional.ofNullable(coordinates)
	.map(c -> doubleToString(c.getAlt()))
	.ifPresent(elevation -> row.put(ExperimentObservation.Columns.ELEVATION, elevation));