Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2

Former-commit-id: 931e6e1efef98da9345955ec8e0fb5bdca4e3837
This commit is contained in:
Shawn.Hooper 2016-02-19 11:04:06 -05:00
commit a97905ec41

View file

@ -79,6 +79,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 29 June 2015 14630 xwei Fixed : Not able to import basins.dat with apostrophe and incorrect data posted * 29 June 2015 14630 xwei Fixed : Not able to import basins.dat with apostrophe and incorrect data posted
* 30 June 2015 17360 xwei Fixed : basins.dat import failed if the first line does not have Lat Lon * 30 June 2015 17360 xwei Fixed : basins.dat import failed if the first line does not have Lat Lon
* Dec 18, 2015 5217 mduff Changes to fix importing geo files. * Dec 18, 2015 5217 mduff Changes to fix importing geo files.
* Feb 15, 2016 5217 mduff convert longitude back to hydro's "View value" of being positive
* *
* </pre> * </pre>
* *
@ -835,7 +836,8 @@ public class ArealDefinitionsDlg extends CaveSWTDialog {
geoData.setBoundaryType(HydroConstants.GEOAREA_DATANAMES[listCbo geoData.setBoundaryType(HydroConstants.GEOAREA_DATANAMES[listCbo
.getSelectionIndex()]); .getSelectionIndex()]);
geoData.setInteriorLat(intLat); geoData.setInteriorLat(intLat);
geoData.setInteriorLon(intLon); // Convert back to hydro format of positive longitude values
geoData.setInteriorLon(intLon * -1);
geoData.setLon(lonPoints); geoData.setLon(lonPoints);
geoData.setLat(latPoints); geoData.setLat(latPoints);
geoData.setNumberPoints(nPts); geoData.setNumberPoints(nPts);