Merge "Issue #2055 Remove modelName from sounding pointName. Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b" into omaha_13.4.1

Former-commit-id: 1ea89c8f0f [formerly 1ea89c8f0f [formerly b5657bb2156ade929296f5d748616afd246d8321]]
Former-commit-id: 35a2a44ccd
Former-commit-id: 21d261d8be
This commit is contained in:
Nate Jensen 2013-05-30 16:15:27 -05:00 committed by Gerrit Code Review
commit daf8bdc47a

View file

@ -78,10 +78,12 @@ import com.vividsolutions.jts.geom.LineString;
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* May 27, 2009 #2161 lvenable Initial creation * May 27, 2009 2161 lvenable Initial creation
* 10-21-09 #1711 bsteffen Updated Baseline and Points to use new ToolsDataManager * Oct 21, 2009 1711 bsteffen Updated Baseline and Points to use new
* 11/17/2009 #3120 rjpeter Updated to use LevelMappingFactory. * ToolsDataManager
* 07/31/2012 #875 rferrel Now uses points. * Nov 17, 2009 3120 rjpeter Updated to use LevelMappingFactory.
* Jul 31, 2012 875 rferrel Now uses points.
* May 30, 2013 2055 bsteffen Remove modelName from sounding pointName.
* *
* </pre> * </pre>
* *
@ -277,8 +279,7 @@ public class GridDataCatalog extends AbstractInventoryDataCatalog {
D2DNSharpResourceData tmpData = new GribNSharpResourceData( D2DNSharpResourceData tmpData = new GribNSharpResourceData(
catalogEntry.getSelectedData().getSourcesKey()); catalogEntry.getSelectedData().getSourcesKey());
tmpData.setCoordinate(getPointCoordinate(catalogEntry)); tmpData.setCoordinate(getPointCoordinate(catalogEntry));
String pointName = catalogEntry.getSelectedData().getSourcesText() String pointName = catalogEntry.getSelectedData().getPlanesKey();
+ "-" + catalogEntry.getSelectedData().getPlanesKey();
tmpData.setPointName(pointName); tmpData.setPointName(pointName);
rscData = tmpData; rscData = tmpData;
break; break;