| @@ -106,7 +106,7 @@ |
| |
| ArrayList<Component> componentList = new ArrayList<>(); |
| query = "SELECT cokey, compname, comppct_r, slope_l, slope_r, " |
| - + "slope_h, slopelenusle_l, slopelenusle_r, slopelenusle_h " |
| + + "slope_h "//slopelenusle_l, slopelenusle_r, slopelenusle_h " |
| + "FROM ssurgo.component " |
| + "WHERE mukey ='" + mukey + "' ORDER BY comppct_r DESC;"; |
| try (ResultSet resultSet = statement.executeQuery(query)) { |
| @@ -116,10 +116,10 @@ |
| resultSet.getInt("comppct_r"), |
| resultSet.getInt("slope_l"), |
| resultSet.getInt("slope_r"), |
| - resultSet.getInt("slope_h"), |
| - resultSet.getDouble("slopelenusle_l"), |
| - resultSet.getDouble("slopelenusle_r"), |
| - resultSet.getDouble("slopelenusle_h"))); |
| + resultSet.getInt("slope_h"))); |
| +// resultSet.getDouble("slopelenusle_l"), |
| +// resultSet.getDouble("slopelenusle_r"), |
| +// resultSet.getDouble("slopelenusle_h") |
| } |
| } |
| mapunitList.add(new Mapuint(musym, muname, componentList)); |
| @@ -236,12 +236,12 @@ |
| componentArr.put(JSONUtils.dataDesc("slopepct_l", component.getSlopePctL(), "Slope Percent – Low Value")); |
| componentArr.put(JSONUtils.dataDesc("slopepct_r", component.getSlopePctR(), "Slope Percent – Representative Value")); |
| componentArr.put(JSONUtils.dataDesc("slopepct_h", component.getSlopePctH(), "Slope Percent – High Value")); |
| - componentArr.put(JSONUtils.dataDesc("slopelen_l", Math.round(component.getSlopeLenL()), "Slope Length (meters) – Low Value")); |
| - componentArr.put(JSONUtils.dataDesc("slopelen_r", Math.round(component.getSlopeLenR()), "Slope Length (meters) – Representative Value")); |
| - componentArr.put(JSONUtils.dataDesc("slopelen_h", Math.round(component.getSlopeLenH()), "Slope Length (meters) – High Value")); |
| - componentArr.put(JSONUtils.dataDesc("slopelen_ft_l", Math.round(component.getSlopeLenFtL()), "Slope Length (feet) – Low Value")); |
| - componentArr.put(JSONUtils.dataDesc("slopelen_ft_r", Math.round(component.getSlopeLenFtR()), "Slope Length (feet) – Representative Value")); |
| - componentArr.put(JSONUtils.dataDesc("slopelen_ft_h", Math.round(component.getSlopeLenFtH()), "Slope Length (feet) – High Value")); |
| +// componentArr.put(JSONUtils.dataDesc("slopelen_l", Math.round(component.getSlopeLenL()), "Slope Length (meters) – Low Value")); |
| +// componentArr.put(JSONUtils.dataDesc("slopelen_r", Math.round(component.getSlopeLenR()), "Slope Length (meters) – Representative Value")); |
| +// componentArr.put(JSONUtils.dataDesc("slopelen_h", Math.round(component.getSlopeLenH()), "Slope Length (meters) – High Value")); |
| +// componentArr.put(JSONUtils.dataDesc("slopelen_ft_l", Math.round(component.getSlopeLenFtL()), "Slope Length (feet) – Low Value")); |
| +// componentArr.put(JSONUtils.dataDesc("slopelen_ft_r", Math.round(component.getSlopeLenFtR()), "Slope Length (feet) – Representative Value")); |
| +// componentArr.put(JSONUtils.dataDesc("slopelen_ft_h", Math.round(component.getSlopeLenFtH()), "Slope Length (feet) – High Value")); |
| |
| JSONArray ecoSiteArray = new JSONArray(); |
| for (EcologicalSite ecoSite : component.getEcoSiteList()) { |
| @@ -324,32 +324,32 @@ |
| protected int slopePctL; |
| protected int slopePctR; |
| protected int slopePctH; |
| - protected double slopeLenL; |
| - protected double slopeLenR; |
| - protected double slopeLenH; |
| - protected double slopeLenFtL; |
| - protected double slopeLenFtR; |
| - protected double slopeLenFtH; |
| +// protected double slopeLenL; |
| +// protected double slopeLenR; |
| +// protected double slopeLenH; |
| +// protected double slopeLenFtL; |
| +// protected double slopeLenFtR; |
| +// protected double slopeLenFtH; |
| |
| protected ArrayList<EcologicalSite> ecoSiteList; |
| protected ArrayList<SurfaceTexture> surfaceTextureList; |
| |
| public Component(String cokey, String compName, int comppctR, |
| - int slopePctL, int slopePctR, int slopePctH, |
| - double slopeLenL, double slopeLenR, |
| - double slopeLenH) { |
| + int slopePctL, int slopePctR, int slopePctH) { |
| +// double slopeLenL, double slopeLenR, |
| +// double slopeLenH) { |
| this.cokey = cokey; |
| this.compName = compName; |
| this.comppctR = comppctR; |
| this.slopePctL = slopePctL; |
| this.slopePctR = slopePctR; |
| this.slopePctH = slopePctH; |
| - this.slopeLenL = slopeLenL; |
| - this.slopeLenR = slopeLenR; |
| - this.slopeLenH = slopeLenH; |
| - this.slopeLenFtL = 3.28084 * slopeLenL; |
| - this.slopeLenFtR = 3.28084 * slopeLenR; |
| - this.slopeLenFtH = 3.28084 * slopeLenH; |
| +// this.slopeLenL = slopeLenL; |
| +// this.slopeLenR = slopeLenR; |
| +// this.slopeLenH = slopeLenH; |
| +// this.slopeLenFtL = 3.28084 * slopeLenL; |
| +// this.slopeLenFtR = 3.28084 * slopeLenR; |
| +// this.slopeLenFtH = 3.28084 * slopeLenH; |
| } |
| |
| public String getCokey() { |
| @@ -376,30 +376,29 @@ |
| return this.slopePctH; |
| } |
| |
| - public double getSlopeLenL() { |
| - return this.slopeLenL; |
| - } |
| - |
| - public double getSlopeLenR() { |
| - return this.slopeLenR; |
| - } |
| - |
| - public double getSlopeLenH() { |
| - return this.slopeLenH; |
| - } |
| - |
| - public double getSlopeLenFtL() { |
| - return this.slopeLenFtL; |
| - } |
| - |
| - public double getSlopeLenFtR() { |
| - return this.slopeLenFtR; |
| - } |
| - |
| - public double getSlopeLenFtH() { |
| - return this.slopeLenFtH; |
| - } |
| - |
| +// public double getSlopeLenL() { |
| +// return this.slopeLenL; |
| +// } |
| +// |
| +// public double getSlopeLenR() { |
| +// return this.slopeLenR; |
| +// } |
| +// |
| +// public double getSlopeLenH() { |
| +// return this.slopeLenH; |
| +// } |
| +// |
| +// public double getSlopeLenFtL() { |
| +// return this.slopeLenFtL; |
| +// } |
| +// |
| +// public double getSlopeLenFtR() { |
| +// return this.slopeLenFtR; |
| +// } |
| +// |
| +// public double getSlopeLenFtH() { |
| +// return this.slopeLenFtH; |
| +// } |
| public ArrayList<EcologicalSite> getEcoSiteList() { |
| return this.ecoSiteList; |
| } |