Displaying differences for changeset
 
display as  

nbproject/build-impl.xml

@@ -1011,7 +1011,7 @@
         <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.csip-gis-objects-2.0.17.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.SDMDriver-1.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.csip-soilsdb-2.10.71.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.csip-soilsdb-2.10.76.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
@@ -1021,7 +1021,7 @@
         <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.csip-gis-objects-2.0.17.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.SDMDriver-1.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.csip-soilsdb-2.10.71.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.csip-soilsdb-2.10.76.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

nbproject/project.properties

@@ -1,5 +1,5 @@
 file.reference.csip-gis-objects-2.0.17.jar=lib/csip-gis-objects-2.0.17.jar
-file.reference.csip-soilsdb-2.10.71.jar=lib/csip-soilsdb-2.10.71.jar
+file.reference.csip-soilsdb-2.10.76.jar=lib/csip-soilsdb-2.10.76.jar
 file.reference.SDMDriver-1.0.4.jar=lib/SDMDriver-1.0.4.jar
 j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/sqljdbc42.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
 #Thu Dec 17 13:44:22 MST 2015
@@ -58,7 +58,7 @@
     ${libs.CSIP-Jersey-2.16.classpath}:\
     ${file.reference.csip-gis-objects-2.0.17.jar}:\
     ${file.reference.SDMDriver-1.0.4.jar}:\
-    ${file.reference.csip-soilsdb-2.10.71.jar}
+    ${file.reference.csip-soilsdb-2.10.76.jar}
 javadoc.noindex=false
 webinf.dir=web/WEB-INF
 annotation.processing.enabled.in.editor=true

nbproject/project.xml

@@ -32,7 +32,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.csip-soilsdb-2.10.71.jar}</file>
+                    <file>${file.reference.csip-soilsdb-2.10.76.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>

src/java/m/rhem/rhem03_compEsd/V2_0.java

@@ -29,7 +29,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.HashMap;
 import javax.ws.rs.Path;
 import oms3.annotations.Description;
 import oms3.annotations.Name;
@@ -85,9 +84,6 @@
 
                 aoa = new AoA(soilsDb, geometry, LOG);
                 aoa.findIntersectedMapUnits();
-//                for (MapUnit mapunit : aoa.getMapUnits().values()) {
-//                    aoa.findComponentsByMapunit(mapunit.mukey());
-//                }
                 aoa.findAllComponentsData_Basic();
                 aoa.findEcoClasses();
                 aoa.findAllTextureData();
@@ -164,9 +160,9 @@
                 componentArr.put(JSONUtils.dataDesc("cokey", component.getCokey(), "Soil Component Key"));
                 componentArr.put(JSONUtils.dataDesc("compname", component.getCompName(), "Soil Component Name"));
                 componentArr.put(JSONUtils.dataDesc("comppct_r", component.getComppctR(), "Soil Component Percentage Relative Value"));
-                componentArr.put(JSONUtils.dataDesc("slopepct_l", Double.isFinite(component.getSlopePctL()) ? component.getSlopePctL() : null, "Slope Percent – Low Value"));
-                componentArr.put(JSONUtils.dataDesc("slopepct_r", Double.isFinite(component.getSlopePctR()) ? component.getSlopePctR() : null, "Slope Percent – Representative Value"));
-                componentArr.put(JSONUtils.dataDesc("slopepct_h", Double.isFinite(component.getSlopePctH()) ? component.getSlopePctH() : null, "Slope Percent – High Value"));
+                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"));
                 JSONArray ecoSiteArray = new JSONArray();
                 for (EcologicalSite ecoSite : component.getEcoSiteList()) {
                     JSONArray ecoSiteArr = new JSONArray();