xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grib wizard cleanup

Browse source
This commit is contained in:
mjames-upc 2018-12-21 13:31:31 -07:00
parent 458f37654f
commit 3d8cf5e249
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.grib/src/com/raytheon/uf/viz/grib/wizard/save/GribWizardSave.java
View file

@ -61,7 +61,9 @@ public abstract class GribWizardSave {
GridModel model = data.getOrCreateModel();
String centerName = GribTableLookup.getInstance()
.getTableValue(-1, -1, "0", model.getCenter()).toString();
.getTableValue(model.getCenter(), Integer.parseInt(model.getSubCenter()),
"0", model.getCenter()).toString();
if (centerName == null || centerName.isEmpty()) {
centerName = "UNK";
} else {

18
edexOsgi/com.raytheon.uf.common.grib/src/com/raytheon/uf/common/grib/tables/GribTableLookup.java
View file

@ -195,7 +195,7 @@ public class GribTableLookup {
/**
* Initializes predefined tables. The predefined tables are stored as flat
* files in the utility directy to be access by the localization service
* files in the utility directory to be accessed by the localization service
* <p>
* The localization service reads in all files and populates the cached
* tables accordingly
@ -209,13 +209,7 @@ public class GribTableLookup {
LocalizationLevel.BASE), "/grib/tables")
.getPath();
String sitePath = pm
.getFile(pm.getContext(LocalizationType.COMMON_STATIC,
LocalizationLevel.SITE), "/grib/tables")
.getPath();
initTablesFromPath(commonPath);
initTablesFromPath(sitePath);
}
@ -427,14 +421,14 @@ public class GribTableLookup {
private final int centerid;
private final int subcenteris;
private final int subcenterid;
private final int hashcode;
public TableMapKey(int centerid, int subcenteris) {
public TableMapKey(int centerid, int subcenterid) {
this.centerid = centerid;
this.subcenteris = subcenteris;
this.hashcode = 31 * (31 + centerid) + subcenteris;
this.subcenterid = subcenterid;
this.hashcode = 31 * (31 + centerid) + subcenterid;
}
@Override
@ -457,7 +451,7 @@ public class GribTableLookup {
if (centerid != other.centerid) {
return false;
}
if (subcenteris != other.subcenteris) {
if (subcenterid != other.subcenterid) {
return false;
}
return true;