From 6d2edcc80c543290a1695e1eb364ba4ac6c0df1f Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 30 Apr 2010 18:21:18 +0800
Subject: [PATCH]
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
index 86f3fc9..d941a3f 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
@@ -11,6 +11,7 @@
import java.util.StringTokenizer;
import java.util.TreeMap;
+import com.ximple.eofms.util.FeatureTypeBuilderUtil;
import org.apache.commons.logging.Log;
import org.geotools.data.DataStore;
import org.geotools.data.oracle.OracleDataStore;
@@ -54,7 +55,7 @@
private static final String TESTCOUNT = "TESTCOUNT";
private static final String COPYCONNECTIVITYMODE = "COPYCONNECTIVITYMODE";
private static final String PROFILEMODE = "PROFILEMODE";
- private static final String USEEPSG3826 = "USEEPSG3826";
+ private static final String USEZONE121 = "USEZONE121";
protected static OracleDataStoreFactory dataStoreFactory = new OracleDataStoreFactory();
@@ -74,7 +75,7 @@
protected boolean _testMode = false;
protected boolean _copyConnectivityMode = false;
protected boolean _profileMode = false;
- protected boolean _useEPSG3826 = true;
+ protected boolean _useZone121 = true;
protected boolean _useTransform = true;
protected int _testCount = -1;
@@ -140,7 +141,12 @@
_testCount = dataMap.getIntFromString(TESTCOUNT);
_copyConnectivityMode = dataMap.getBooleanFromString(COPYCONNECTIVITYMODE);
_profileMode = dataMap.getBooleanFromString(PROFILEMODE);
- _useEPSG3826 = dataMap.getBooleanFromString(USEEPSG3826);
+ _useZone121 = dataMap.getBooleanFromString(USEZONE121);
+ if (_useZone121) {
+ FeatureTypeBuilderUtil.setDefaultFeatureSRID(3826);
+ } else {
+ FeatureTypeBuilderUtil.setDefaultFeatureSRID(3825);
+ }
// Validate the required input
if (_dataPath == null) {
@@ -183,8 +189,7 @@
}
protected abstract AbstractOracleJobContext prepareJobContext(String targetSchemaName, String filterPath,
- boolean profileMode,
- boolean useTransform, boolean useEPSG3826);
+ boolean profileMode, boolean useTransform);
protected byte[] getBytesFromBLOB(BLOB blob) throws SQLException, BufferOverflowException {
byte[] raw = null;
@@ -340,8 +345,8 @@
return _useTransform;
}
- public boolean isEPSG3826() {
- return _useEPSG3826;
+ public boolean isZone121() {
+ return _useZone121;
}
public DataStore getSourceDataStore() {
--
Gitblit v0.0.0-SNAPSHOT