Revision 22125
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src-test/org/gvsig/data/datastores/vectorial/file/DataStoreTest.java | ||
---|---|---|
5 | 5 |
|
6 | 6 |
import junit.framework.TestCase; |
7 | 7 |
|
8 |
import org.cresques.cts.IProjection; |
|
9 | 8 |
import org.gvsig.data.CloseException; |
10 | 9 |
import org.gvsig.data.DataCollection; |
11 |
import org.gvsig.data.DataException; |
|
12 | 10 |
import org.gvsig.data.DataManager; |
13 | 11 |
import org.gvsig.data.DataStoreParameters; |
14 | 12 |
import org.gvsig.data.InitializeException; |
15 |
import org.gvsig.data.OpenException; |
|
16 | 13 |
import org.gvsig.data.ReadException; |
17 | 14 |
import org.gvsig.data.Resource; |
18 | 15 |
import org.gvsig.data.ResourceManager; |
19 | 16 |
import org.gvsig.data.WriteException; |
20 |
import org.gvsig.data.datastores.vectorial.file.dbf.DBFStore; |
|
21 |
import org.gvsig.data.datastores.vectorial.file.dbf.DBFStoreParameters; |
|
22 |
import org.gvsig.data.datastores.vectorial.file.dgn.DGNStore; |
|
23 |
import org.gvsig.data.datastores.vectorial.file.dgn.DGNStoreParameters; |
|
24 |
import org.gvsig.data.datastores.vectorial.file.dxf.DXFStore; |
|
25 |
import org.gvsig.data.datastores.vectorial.file.dxf.DXFStoreParameters; |
|
26 |
import org.gvsig.data.datastores.vectorial.file.shp.SHPStore; |
|
27 |
import org.gvsig.data.datastores.vectorial.file.shp.SHPStoreParameters; |
|
28 | 17 |
import org.gvsig.data.vectorial.AbstractFeatureStore; |
29 |
import org.gvsig.data.vectorial.AttributeDescriptor; |
|
30 |
import org.gvsig.data.vectorial.Feature; |
|
31 |
import org.gvsig.data.vectorial.FeatureAttributeDescriptor; |
|
32 |
import org.gvsig.data.vectorial.FeatureCollection; |
|
33 |
import org.gvsig.data.vectorial.FeatureStore; |
|
34 |
import org.gvsig.data.vectorial.FeatureType; |
|
35 |
import org.gvsig.data.vectorial.MemoryFeature; |
|
36 |
import org.gvsig.data.vectorial.visitor.PrintlnFeaturesVisitor; |
|
37 |
import org.gvsig.exceptions.BaseException; |
|
38 |
import org.gvsig.fmap.crs.CRSFactory; |
|
39 | 18 |
import org.gvsig.util.observer.Observer; |
40 | 19 |
|
41 | 20 |
public class DataStoreTest extends TestCase { |
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src-test/org/gvsig/data/datastores/vectorial/file/dxf/DXFTest.java | ||
---|---|---|
5 | 5 |
|
6 | 6 |
import junit.framework.TestCase; |
7 | 7 |
|
8 |
import org.cresques.cts.IProjection;
|
|
8 |
import org.gvsig.projection.cts.IProjection;
|
|
9 | 9 |
import org.gvsig.data.CloseException; |
10 | 10 |
import org.gvsig.data.DataManager; |
11 | 11 |
import org.gvsig.data.InitializeException; |
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src/org/gvsig/data/datastores/vectorial/file/dxf/DXFFeaturesWriter.java | ||
---|---|---|
7 | 7 |
import java.util.Iterator; |
8 | 8 |
import java.util.Vector; |
9 | 9 |
|
10 |
import org.cresques.cts.IProjection; |
|
11 |
import org.cresques.geo.Point3D; |
|
10 |
import org.gvsig.projection.cts.IProjection; |
|
12 | 11 |
import org.cresques.io.DxfFile; |
13 | 12 |
import org.cresques.io.DxfGroup; |
14 | 13 |
import org.cresques.io.DxfGroupVector; |
... | ... | |
361 | 360 |
point = new Point2DZ(pointCoords[0], pointCoords[1], pointCoords[2]); |
362 | 361 |
pointIt.next(); |
363 | 362 |
} |
364 |
Point3D pto = new Point3D(point.getX(), point.getY(), point.getZs()[0]);
|
|
363 |
org.cresques.geo.Point2DZ pto = new org.cresques.geo.Point2DZ(point.getX(), point.getY(), point.getZs()[0]);
|
|
365 | 364 |
// DxfGroup pointLayer = new DxfGroup(8, "default"); |
366 | 365 |
// DxfGroup handleGroup = new DxfGroup(); |
367 | 366 |
// handleGroup.setCode(5); |
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src/org/gvsig/data/datastores/vectorial/file/dxf/DXFStoreParameters.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import java.io.File; |
4 | 4 |
|
5 |
import org.cresques.cts.IProjection;
|
|
5 |
import org.gvsig.projection.cts.IProjection;
|
|
6 | 6 |
import org.gvsig.data.datastores.vectorial.file.FileStoreParameters; |
7 | 7 |
|
8 | 8 |
|
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src/org/gvsig/data/datastores/vectorial/file/dxf/DXFResource.java | ||
---|---|---|
32 | 32 |
|
33 | 33 |
import java.awt.Color; |
34 | 34 |
import java.awt.geom.Point2D; |
35 |
import java.sql.Types; |
|
36 | 35 |
import java.util.logging.Logger; |
37 | 36 |
|
38 |
import org.cresques.geo.Point3D;
|
|
37 |
import org.cresques.geo.Point2DZ;
|
|
39 | 38 |
import org.cresques.io.DxfFile; |
40 |
import org.cresques.px.IObjList; |
|
41 | 39 |
import org.cresques.px.dxf.DxfFeatureMaker; |
42 | 40 |
import org.cresques.px.dxf.DxfHeaderManager; |
43 | 41 |
import org.cresques.px.gml.Feature; |
44 | 42 |
import org.cresques.px.gml.LineString; |
45 | 43 |
import org.cresques.px.gml.LineString3D; |
46 | 44 |
import org.cresques.px.gml.Point; |
45 |
import org.cresques.px.gml.Point3D; |
|
47 | 46 |
import org.cresques.px.gml.Polygon; |
48 | 47 |
import org.cresques.px.gml.Polygon3D; |
49 | 48 |
import org.gvsig.data.DataException; |
... | ... | |
67 | 66 |
import org.gvsig.fmap.mapcontext.rendering.legend.styling.AttrInTableLabelingStrategy; |
68 | 67 |
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol; |
69 | 68 |
import org.gvsig.fmap.mapcontext.rendering.symbols.SymbologyFactory; |
69 |
import org.gvsig.projection.cts.IProjection; |
|
70 |
import org.gvsig.projection.px.IObjList; |
|
70 | 71 |
|
71 | 72 |
/** |
72 | 73 |
* @author jmvivo |
... | ... | |
148 | 149 |
protected void load() throws DataException { |
149 | 150 |
float heightText = 10; |
150 | 151 |
DxfFile dxfFeatureFile; |
151 |
DxfFile.EntityFactory featureMaker = new DxfFeatureMaker(((DXFStoreParameters)this.params).getProjection()); |
|
152 |
DxfFile.EntityFactory featureMaker = new DxfFeatureMaker((IProjection)((DXFStoreParameters)this.params).getProjection());
|
|
152 | 153 |
DxfFile.VarSettings headerManager = new DxfHeaderManager(); |
153 | 154 |
dxfFeatureFile = new DxfFile(((DXFStoreParameters)this.params).getProjection(), this.getFile().getAbsolutePath(), |
154 | 155 |
featureMaker, headerManager); |
... | ... | |
382 | 383 |
} else if (fea.getGeometry() instanceof org.cresques.px.gml.Point3D) { |
383 | 384 |
org.cresques.px.gml.Point3D point = (org.cresques.px.gml.Point3D) fea |
384 | 385 |
.getGeometry(); |
385 |
Point3D pto = new Point3D();
|
|
386 |
pto = point.getPoint3D(0);
|
|
386 |
Point2DZ pto = new Point2DZ();
|
|
387 |
pto = ((Point3D) point).getPoint2DZ(0);
|
|
387 | 388 |
// FShape nuevoShp; |
388 | 389 |
if (point.isTextPoint()) { |
389 | 390 |
feature.set(ID_FIELD_ID,i); |
... | ... | |
532 | 533 |
// addShape(nuevoShp, auxRow); |
533 | 534 |
} else if (fea.getGeometry() instanceof LineString3D) { |
534 | 535 |
GeneralPathX genPathX = new GeneralPathX(); |
535 |
Point3D[] pts = new Point3D[fea.getGeometry().pointNr()];
|
|
536 |
Point2DZ[] pts = new Point2DZ[fea.getGeometry().pointNr()];
|
|
536 | 537 |
for (int j = 0; j < fea.getGeometry().pointNr(); j++) { |
537 | 538 |
pts[j] = ((LineString3D) fea.getGeometry()).getPoint3D(j); |
538 | 539 |
} |
... | ... | |
644 | 645 |
GeneralPathX genPathX = new GeneralPathX(); |
645 | 646 |
// 050112: A?ado una posici?n m?s para el punto que cierra y |
646 | 647 |
// creo el objeto firstPt. |
647 |
Point3D firstPt = new Point3D(); |
|
648 |
firstPt = ((Polygon3D) fea.getGeometry()) |
|
649 |
.getPoint3D(0); |
|
650 |
Point3D[] pts = new Point3D[fea.getGeometry().pointNr() + 1]; |
|
648 |
Point2DZ firstPt = new Point2DZ(); |
|
649 |
firstPt = ((Polygon3D) fea.getGeometry()).getPoint2DZ(0); |
|
650 |
Point2DZ[] pts = new Point2DZ[fea.getGeometry().pointNr() + 1]; |
|
651 | 651 |
for (int j = 0; j < fea.getGeometry().pointNr(); j++) { |
652 |
pts[j] = ((Polygon3D) fea.getGeometry()) |
|
653 |
.getPoint3D(j); |
|
652 |
pts[j] = ((Polygon3D) fea.getGeometry()).getPoint2DZ(j); |
|
654 | 653 |
} |
655 | 654 |
// 050112: A?ado el primer punto al final para cerrar los |
656 | 655 |
// pol?gonos. |
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src/org/gvsig/data/datastores/vectorial/file/shp/utils/SHP.java | ||
---|---|---|
154 | 154 |
if (directory!=null){ |
155 | 155 |
MyFileFilter myFileFilter = new MyFileFilter(str); |
156 | 156 |
files=directory.listFiles(myFileFilter); |
157 |
|
|
157 | 158 |
} |
158 | 159 |
String[] ends=new String[] {"dbf","DBF","Dbf","dBf","DBf","dbF","DbF","dBF"}; |
159 | 160 |
File dbfFile=findEnd(str,files,ends); |
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/src/org/gvsig/data/datastores/vectorial/file/dbf/DBFFeature.java | ||
---|---|---|
7 | 7 |
import java.util.List; |
8 | 8 |
import java.util.Locale; |
9 | 9 |
|
10 |
import org.gvsig.compatible.ConversionUtil; |
|
10 | 11 |
import org.gvsig.data.DataException; |
11 | 12 |
import org.gvsig.data.ReadException; |
12 | 13 |
import org.gvsig.data.vectorial.AttributeDescriptor; |
... | ... | |
90 | 91 |
}else if (fieldType.equals(FeatureAttributeDescriptor.TYPE_LONG)){ |
91 | 92 |
this.set(i,Long.parseLong(value)); |
92 | 93 |
}else if (fieldType.equals(FeatureAttributeDescriptor.TYPE_BOOLEAN)){ |
93 |
this.set(i,Boolean.parseBoolean(value));
|
|
94 |
this.set(i,ConversionUtil.getBooleanValue(value));
|
|
94 | 95 |
}else if (fieldType.equals(FeatureAttributeDescriptor.TYPE_BYTE)){ |
95 | 96 |
this.set(i,Byte.parseByte(value)); |
96 | 97 |
}else if (fieldType.equals(FeatureAttributeDescriptor.TYPE_DATE)){ |
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/build.xml | ||
---|---|---|
19 | 19 |
<property name="gvsigJar" location="${extensionsDir}/com.iver.cit.gvsig/lib/com.iver.cit.gvsig.jar"/> |
20 | 20 |
<property name="andamiLibs" location="${andami}/lib"/> |
21 | 21 |
<property name="fmapLibs" location="../libFMap/lib" /> |
22 |
<import file="../binaries/ant/utilities.xml"/>
|
|
22 |
<!--<import file="../binaries/ant/utilities.xml"/>-->
|
|
23 | 23 |
|
24 | 24 |
|
25 | 25 |
<target name="init"> |
... | ... | |
101 | 101 |
</target> |
102 | 102 |
|
103 | 103 |
|
104 |
<target name="run-tests" depends="batch-build,compile-tests"> |
|
104 |
<!--<target name="run-tests" depends="batch-build,compile-tests">
|
|
105 | 105 |
<antcall target="generic-run-tests"> |
106 | 106 |
<param name="TestSuite.Name" value="org.gvsig.data.datastores.vectorial.driver.AllTests"/> |
107 | 107 |
</antcall> |
108 |
</target>
|
|
108 |
</target>-->
|
|
109 | 109 |
</project> |
110 | 110 |
|
branches/Mobile_Compatible_Hito_1/libFMap_dataFile/.classpath | ||
---|---|---|
2 | 2 |
<classpath> |
3 | 3 |
<classpathentry kind="src" path="src"/> |
4 | 4 |
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> |
5 |
<classpathentry kind="src" path="/libFMap_data"/> |
|
6 | 5 |
<classpathentry kind="src" output="bin-test" path="src-test"/> |
7 | 6 |
<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.1/src/org.junit_3.8.1/junitsrc.zip"/> |
8 |
<classpathentry combineaccessrules="false" kind="src" path="/libMetadata"/> |
|
9 |
<classpathentry kind="lib" path="/libFMap_data/lib/org.gvsig.exceptions.jar" sourcepath="/libExceptions"/> |
|
10 |
<classpathentry kind="lib" path="/libFMap_data/lib/sqljep-0.2.jar" sourcepath="/SQLJEP"/> |
|
11 |
<classpathentry combineaccessrules="false" kind="src" path="/libFMap_mapcontext"/> |
|
12 |
<classpathentry combineaccessrules="false" kind="src" path="/libFMap_Geometries"/> |
|
13 |
<classpathentry kind="lib" path="D:/PROYECTOS/gvsigtrunk/libFMap/lib/org.cresques.dxf.jar"/> |
|
14 |
<classpathentry kind="lib" path="D:/PROYECTOS/gvsigtrunk/libFMap/lib/org.cresques.cts.jar"/> |
|
15 |
<classpathentry kind="lib" path="D:/PROYECTOS/gvsigtrunk/_fwAndami/lib/iver-utiles.jar"/> |
|
16 |
<classpathentry kind="lib" path="D:/PROYECTOS/gvsigtrunk/libFMap/lib/gt2-main.jar"/> |
|
17 |
<classpathentry kind="lib" path="D:/PROYECTOS/gvsigtrunk/libFMap/lib/gt2-legacy.jar"/> |
|
18 |
<classpathentry kind="lib" path="D:/PROYECTOS/gvsigtrunk/libFMap/lib/units-0.01.jar"/> |
|
19 |
<classpathentry kind="lib" path="/libFMap_data/lib/geoapi-nogenerics-2.1.0.jar"/> |
|
7 |
<classpathentry kind="lib" path="lib/geoapi-nogenerics-2.1.0.jar"/> |
|
8 |
<classpathentry kind="lib" path="lib/gt2-legacy.jar"/> |
|
9 |
<classpathentry kind="lib" path="lib/gt2-main.jar"/> |
|
10 |
<classpathentry kind="lib" path="lib/iver-utiles.jar"/> |
|
11 |
<classpathentry kind="lib" path="lib/org.cresques.dxf.jar"/> |
|
12 |
<classpathentry kind="lib" path="lib/org.gvsig.compat-desktop.jar"/> |
|
13 |
<classpathentry kind="lib" path="lib/org.gvsig.compat-mobile.jar"/> |
|
14 |
<classpathentry kind="lib" path="lib/org.gvsig.exceptions.jar"/> |
|
15 |
<classpathentry kind="lib" path="lib/org.gvsig.fmap.data.jar"/> |
|
16 |
<classpathentry kind="lib" path="lib/org.gvsig.fmap.geometries.jar"/> |
|
17 |
<classpathentry kind="lib" path="lib/org.gvsig.fmap.geometries.operations.jar"/> |
|
18 |
<classpathentry kind="lib" path="lib/org.gvsig.fmap.mapcontext.jar"/> |
|
19 |
<classpathentry kind="lib" path="lib/org.gvsig.metadata.jar"/> |
|
20 |
<classpathentry kind="lib" path="lib/org.gvsig.projection.api.jar"/> |
|
21 |
<classpathentry kind="lib" path="lib/sqljep-0.2.jar"/> |
|
22 |
<classpathentry kind="lib" path="lib/units-0.01.jar"/> |
|
20 | 23 |
<classpathentry kind="output" path="bin"/> |
21 | 24 |
</classpath> |
Also available in: Unified diff