/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 32213

     package org.gvsig.fmap.dal.store.oracle;
     import java.awt.geom.Rectangle2D;
     import java.math.BigDecimal;
     import java.sql.Connection;
     import java.sql.ResultSet;
     import java.sql.ResultSetMetaData;
-...
     			} catch (SQLException e) {
     				throw new JDBCExecuteSQLException(sql, e);
+    			}
     			String srID;
     			EditableFeatureAttributeDescriptor auxdesc;
-...
     						if (sridobj == null) {
     							auxdesc.setSRS(null);
     						} else {
     							srID = (String) sridobj;
     							srID = sridobj.toString();
     							int epsg = OracleUtils.oracleSridToEpsg(srID);
     							String sepsg = "EPSG:" + Integer.toString(epsg);
     							auxdesc.setSRS(CRSFactory.getCRS(sepsg));

     import org.gvsig.fmap.geom.aggregate.impl.MultiPoint2DZ;
     import org.gvsig.fmap.geom.complex.Complex;
     import org.gvsig.fmap.geom.exception.CreateGeometryException;
     import org.gvsig.fmap.geom.impl.DefaultGeometryManager;
     import org.gvsig.fmap.geom.primitive.Curve;
     import org.gvsig.fmap.geom.primitive.GeneralPathX;
     import org.gvsig.fmap.geom.primitive.NullGeometry;
     import org.gvsig.fmap.geom.primitive.Point;
     import org.gvsig.fmap.geom.primitive.Primitive;
     import org.gvsig.fmap.geom.primitive.Surface;
     import org.gvsig.fmap.geom.primitive.impl.Circle2D;
     import org.gvsig.fmap.geom.primitive.impl.Curve2DZ;
     // import org.gvsig.fmap.geom.primitive.impl.DefaultNullGeometry;
     import org.gvsig.fmap.geom.primitive.impl.DefaultNullGeometry;
     import org.gvsig.fmap.geom.primitive.impl.Point2DZ;
     import org.gvsig.fmap.geom.primitive.impl.Surface2D;
     import org.gvsig.fmap.geom.primitive.impl.Surface2DZ;
     import org.gvsig.fmap.geom.type.GeometryType;
     import org.gvsig.fmap.geom.type.GeometryTypeNotSupportedException;
     import org.gvsig.oracle.utils.LineString3D;
     import org.gvsig.tools.ToolsLocator;
     import com.vividsolutions.jts.algorithm.CGAlgorithms;
     import com.vividsolutions.jts.geom.Coordinate;
-...
     			surface.setGeneralPath(gpx);
     			for (int i = 0; i < z.size(); i++) {
     				surface
     						.setCoordinateAt(i, 3, ((Double) z.get(i))
     						.setCoordinateAt(i, 2, ((Double) z.get(i))
     								.doubleValue());
+    			}
     			return surface;
-...
     					Geometry.SUBTYPES.GEOM2DZ);
     			curve.setGeneralPath(gpx);
     			for (int i = 0; i < z.size(); i++) {
     				curve.setCoordinateAt(i, 3, ((Double) z.get(i)).doubleValue());
     				curve.setCoordinateAt(i, 2, ((Double) z.get(i)).doubleValue());
+    			}
     			return curve;
+    		}
-...
     	/**
     	 * Utility method to deal with oracle coordinate arrays.
     	 */
     	public static ARRAY getDevelopedOrdsArray(ARRAY ords) {
     	public static ARRAY getDevelopedOrdsArray(ARRAY ords, int dim) {
     		ARRAY _resp = null;
     		try {
     			Datum[] resp = new Datum[10];
     			int n = 5*2; // dim = 2, ignored parameter dim
     			Datum[] resp = new Datum[n];
     			Datum[] corners = ords.getOracleArray();
     			// x
     			resp[0] = corners[0];
     			resp[2] = corners[2];
     			resp[4] = corners[2];
     			resp[6] = corners[0];
     			resp[8] = corners[0];
     			// y
     			resp[1] = corners[1];
     			resp[3] = corners[1];
     			resp[5] = corners[3];
     			resp[7] = corners[3];
     			resp[9] = corners[1];
     			for (int i=0; i<5; i++) {
     				resp[i*2] = ((i==2) || (i==3)) ? corners[dim] : corners[0];
+    			}
     			for (int i=0; i<5; i++) {
     				resp[1+i*2] = ((i==2) || (i==3)) ? corners[dim+1] : corners[1];
+    			}
     			_resp = new ARRAY(ords.getDescriptor(), ords
     					.getInternalConnection(), resp);
     		} catch (SQLException se) {
-...
     			infoARRAY = (ARRAY) aux[3];
     			ordsARRAY = (ARRAY) aux[4];
     			if (polStructIsRectStruct(infoARRAY, ordsARRAY)) {
     				infoARRAY = getDevelopedInfoArray(infoARRAY);
     				ordsARRAY = getDevelopedOrdsArray(ordsARRAY);
+    			}
     			dims = ((NUMBER) aux[0]).intValue() / 1000;
     			if (dims == 0) {
     				dims = 2;
+    			}
     			if (polStructIsRectStruct(infoARRAY, ordsARRAY)) {
     				infoARRAY = getDevelopedInfoArray(infoARRAY);
     				ordsARRAY = getDevelopedOrdsArray(ordsARRAY, dims);
     				// rect is always 2d
     				dims = 2;
+    			}
     			info_array = (Datum[]) infoARRAY.getOracleArray();
     			ords_array = (Datum[]) ordsARRAY.getOracleArray();
     			info_array_size = info_array.length / 3;
-...
     				geom = geomManager
     						.createSurface(gpx, Geometry.SUBTYPES.GEOM2DZ);
     				for (int i = 0; i < z.length; i++) {
     					((Surface2DZ) geom).setCoordinateAt(i, 3, z[i]);
     					((Surface2DZ) geom).setCoordinateAt(i, 2, z[i]);
+    				}
+    			}
+    		}
-...
     			double[] z = getIndBigDecimalModule(ords, 2, dim);
     			geom = geomManager.createCurve(gpx, Geometry.SUBTYPES.GEOM2DZ);
     			for (int i = 0; i < z.length; i++) {
     				((Curve2DZ) geom).setCoordinateAt(i, 3, z[i]);
     				((Curve2DZ) geom).setCoordinateAt(i, 2, z[i]);
+    			}
+    		}
-...
     			if (no_po == 1) {
     				geom = geomManager.createPoint(x[0], y[0],
     						Geometry.SUBTYPES.GEOM2DZ);
     				((Point2DZ) geom).setCoordinateAt(3, z[0]);
     				((Point2DZ) geom).setCoordinateAt(2, z[0]);
     			} else {
     				geom = geomManager.create(Geometry.TYPES.MULTIPOINT,
     						Geometry.SUBTYPES.GEOM2DZ);
-...
     							Geometry.SUBTYPES.GEOM2DZ);
     					pto.setX(x[i]);
     					pto.setY(y[i]);
     					pto.setCoordinateAt(3, z[i]);
     					pto.setCoordinateAt(2, z[i]);
     					((MultiPoint2DZ) geom).addPoint(pto);
+    				}
+    			}
-...
     					Geometry.TYPES.POINT, Geometry.SUBTYPES.GEOM2DZ);
     			point.setX(x);
     			point.setY(y);
     			point.setCoordinateAt(3, z);
     			point.setCoordinateAt(2, z);
     			geom = point;
+    		}
-...
         		String __tablesrid,
         		Connection _conn) {
         	GeometryManager gm = GeometryLocator.getGeometryManager();
         	if (st == null) {
         		Geometry aux = null;
         		try {
     				aux = gm.createNullGeometry(SUBTYPES.GEOM2D);
     			} catch (CreateGeometryException e) {
     				logger.error("While creating null Geometry: " + e.getMessage());
+    			}
         		aux = createNullGeometry(SUBTYPES.GEOM2D);
         		return aux;
+        	}
-...
+                }
                 int subty = getSubTypeFromDims(dim);
                 Geometry ig = gm.createNullGeometry(subty);
                 Geometry ig = createNullGeometry(subty);
                 if (isActuallyACollection(the_data)) {
                     jgtype = TYPES.AGGREGATE;
-...
     					Iterator<Feature> it = set.iterator();
     					while (it.hasNext()) {
     						Feature feat = it.next();
     						isrs = new Integer(feat.getInt("EPSG"));
     						isrs = new Integer(Math.round((float) feat.getDouble("EPSG")));
+    					}
+    				}
     			} catch (DataException e) {
-...
     		return resp;
+    	}
     	public static Geometry createNullGeometry(int stype) {
             Geometry ig = null;
             GeometryType nullgt = null;;
     		try {
     			GeometryManager gm = GeometryLocator.getGeometryManager();
     			nullgt = ((DefaultGeometryManager) gm).getGeometryType(DefaultNullGeometry.class.getName());
     	        ig = new DefaultNullGeometry(nullgt);
     		} catch (GeometryTypeNotSupportedException e) {
     			logger.error("While creating null geom: " + e.getMessage());
     			return null;
+    		}
             return ig;
+    	}
+    }

     import org.gvsig.fmap.dal.store.jdbc.JDBCStoreProviderWriter;
     import org.gvsig.fmap.dal.store.jdbc.exception.JDBCSQLException;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynClass;
     import org.gvsig.tools.dynobject.DynObjectManager;
-...
     			try {
     				Object geo_str_obj = rs.getObject(attr.getIndex() + 1);
     				if (geo_str_obj == null) {
     					data.set(attr.getIndex(), null);
     					data.set(attr.getIndex(), OracleUtils.createNullGeometry(SUBTYPES.GEOM2D));
     				} else {
     					STRUCT geo_str = (STRUCT) geo_str_obj;
-...
     					Geometry geom = OracleUtils.getGeometry(
     							geo_str,
     							false,
     							true,
     							"88888",
     							false,
     							"",
     							helper.getConnection());
     					data.set(attr.getIndex(), geom);
+    				}

Also available in: Unified diff