nbproject/project.properties
src/java/c/SqlGIS.java
@@ -298,6 +298,13 @@ |
} |
|
|
+ public boolean IsValidCMZCoord(double lat, double lon) throws SQLException { |
+ return isValidCoord("select count(1) where exists (select top 1 co_cmz " |
+ + "from r2gis.cmz_geom " |
+ + "WHERE geometry::STPointFromText('POINT(" + lon + " " + lat + ")',0).STWithin(geometry) = 1);"); |
+ } |
+ |
+ |
@Override |
public boolean IsValidGisCoord(double lat, double lon) throws SQLException { |
return isValidCoord("select count(1) where exists (select top 1 co_cmz " |
src/java/d/rusle2/CMZ1_1.java
@@ -36,13 +36,16 @@ |
protected void doProcess() throws Exception { |
double lat = getDoubleParam("latitude"); |
double lon = getDoubleParam("longitude"); |
- if (!inContinentalUS(lat, lon)) { |
- throw new ServiceException("Invalid lat/lon for Continental US: " + lat + "/" + lon); |
- } |
|
SqlGIS db = new SqlGIS(getResourceJDBC(DB)); |
try { |
+ if (!db.IsValidCMZCoord(lat, lon)) { |
+ throw new ServiceException("Invalid lat/lon for CONUS: " + lat + "/" + lon); |
+ } |
String cmz = db.findCmz(lat, lon); |
+ if ("0".equals(cmz)) { |
+ throw new ServiceException("no CMZ for lat/long :" + lat + "/" + lon); |
+ } |
putResult("cmz", cmz); |
LOG.info("CMZ found=" + cmz); |
} finally { |
src/java/d/rusle2/Climate1_0.java
@@ -5,7 +5,6 @@ |
package d.rusle2; |
|
import c.GIS_DB; |
-import c.PostGIS; |
import c.GIS_DB.FileQryResult; |
import c.GIS_DB_Factory; |
import java.sql.SQLException; |
src/java/m/ApplicationConfig.java
@@ -41,6 +41,7 @@ |
resources.add(d.rusle2.CMZ1_0.class); |
resources.add(d.rusle2.CMZ1_1.class); |
resources.add(d.rusle2.Climate1_0.class); |
+ resources.add(d.rusle2.Climate1_1.class); |
resources.add(d.rusle2.IsCoord.class); |
resources.add(d.rusle2.LanduseManagement.class); |
resources.add(d.rusle2.LanduseManagementFilter.class); |
src/java/m/weps/V1_3.java
@@ -65,7 +65,7 @@ |
|
// cligen |
@Resource(type = EXECUTABLE, file = "/bin/${arch}/cligen.exe", id = CLIGEN) |
-@Resource(type = FILE, file = "/bin/${arch}/upd_US_cligen_stations.par", id = STATION_PAR) |
+@Resource(type = FILE, file = "/data/upd_US_cligen_stations.par", id = STATION_PAR) |
|
// windgen |
@Resource(type = EXECUTABLE, file = "/bin/win-x86/wind_gen4.exe", wine = true, id = WINDGEN) |
web/META-INF/csip-conf.json
web/META-INF/csip-conf.json.orig
@@ -1,7 +1,14 @@ |
{ |
+<<<<<<< local |
"csip-erosion.version": "$version: 2.0.79 ca3a4b6a78ab 2017-03-14 Jakob23, built at 2017-04-05 14:56 by brad$", |
"lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements", |
"conservation_resources.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |
+======= |
+ "csip-erosion.version": "$version: 0.0.0 xxxxxxx date, built at 2016-12-05 10:09 by Lucas Yaege$", |
+ "weps.version" : "1.3.9", |
+ "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_temp;user=lmod-rw;password=managements", |
+ "conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |
+>>>>>>> other |
"conservation_resources.database": "mssql", |
"r2.db": "http://csip.engr.colostate.edu/r2", |
"csip.session.backend": "local", |