Revision 1772 branches/FMap_SLD/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/VectorialDBAdapter.java

View differences:

VectorialDBAdapter.java
46 46
import java.sql.SQLException;
47 47
import java.sql.Statement;
48 48

  
49
import org.postgis.Geometry;
50
import org.postgis.PGbox3d;
51
import org.postgis.Point;
52

  
53 49
import com.hardcode.driverManager.DriverLoadException;
54 50
import com.hardcode.gdbms.engine.data.DataSource;
55 51
import com.hardcode.gdbms.engine.data.DataSourceFactory;
......
59 55
import com.iver.cit.gvsig.fmap.core.FShape;
60 56
import com.iver.cit.gvsig.fmap.core.IGeometry;
61 57
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
58
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
62 59
import com.iver.cit.gvsig.fmap.drivers.VectorialDatabaseDriver;
63
import com.iver.cit.gvsig.fmap.drivers.jdbc.GeometryIterator;
64
import com.iver.cit.gvsig.fmap.drivers.jdbc.postgis.WKTParser;
65
import com.vividsolutions.jts.io.ParseException;
66 60

  
67 61

  
68 62

  
......
102 96
	{
103 97
	    return ((VectorialDatabaseDriver)driver).getConnection();
104 98
	}
105
	public GeometryIterator getGeometryIterator(String sql) throws DriverException
99
	public IFeatureIterator getFeatureIterator(String sql) throws DriverException
106 100
	{
107
	    return ((VectorialDatabaseDriver)driver).getGeometryIterator(sql);
101
	    return ((VectorialDatabaseDriver)driver).getFeatureIterator(sql);
108 102
	}
109
	public GeometryIterator getGeometryIterator(Rectangle2D r, String strEPSG) throws DriverException
103
	public IFeatureIterator getFeatureIterator(Rectangle2D r, String strEPSG) throws DriverException
110 104
	{
111
	    return ((VectorialDatabaseDriver)driver).getGeometryIterator(r, strEPSG);
105
	    return ((VectorialDatabaseDriver)driver).getFeatureIterator(r, strEPSG);
112 106
	}
113 107
	
114 108
	public String getFields()

Also available in: Unified diff