Revision 38083
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/shp/Bug15617Test.java | ||
---|---|---|
41 | 41 |
import org.gvsig.fmap.geom.operation.GeometryOperation; |
42 | 42 |
import org.gvsig.fmap.geom.operation.GeometryOperationContext; |
43 | 43 |
import org.gvsig.fmap.geom.operation.fromjts.FromJTS; |
44 |
import org.gvsig.fmap.geom.type.GeometryType; |
|
44 | 45 |
import org.gvsig.tools.exception.BaseException; |
45 | 46 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
46 | 47 |
import org.gvsig.tools.visitor.VisitCanceledException; |
... | ... | |
57 | 58 |
public void testBug15617() throws Exception { |
58 | 59 |
new DefaultLibrariesInitializer().fullInitialize(); |
59 | 60 |
DataManager manager = DALLocator.getDataManager(); |
61 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
60 | 62 |
|
61 | 63 |
EditableFeatureType type = new DefaultEditableFeatureType(); |
64 |
GeometryType geometryType = |
|
65 |
geometryManager.getGeometryType(Geometry.TYPES.POINT, |
|
66 |
Geometry.SUBTYPES.GEOM2D); |
|
62 | 67 |
type.add("geom", org.gvsig.fmap.geom.DataTypes.GEOMETRY) |
63 |
.setGeometryType(Geometry.TYPES.POINT) |
|
64 |
.setGeometrySubType(Geometry.SUBTYPES.GEOM2D); |
|
68 |
.setGeometryType(geometryType); |
|
65 | 69 |
type.setDefaultGeometryAttributeName("geom"); |
66 | 70 |
// type.add("float", DataTypes.FLOAT).setSize(5); |
67 | 71 |
// type.add("double", DataTypes.DOUBLE).setSize(5); |
... | ... | |
87 | 91 |
com.vividsolutions.jts.geom.Geometry g = |
88 | 92 |
new GeometryFactory().createPoint(new Coordinate(0, 0)); |
89 | 93 |
|
90 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
91 | 94 |
int opCode = geometryManager.getGeometryOperationCode(FromJTS.NAME); |
92 | 95 |
GeometryOperation converter = |
93 | 96 |
geometryManager.getGeometryOperation(opCode, Geometry.TYPES.POINT, |
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/shp/Bug15671Test.java | ||
---|---|---|
36 | 36 |
import org.gvsig.fmap.geom.GeometryLocator; |
37 | 37 |
import org.gvsig.fmap.geom.GeometryManager; |
38 | 38 |
import org.gvsig.fmap.geom.primitive.NullGeometry; |
39 |
import org.gvsig.fmap.geom.type.GeometryType; |
|
39 | 40 |
import org.gvsig.tools.exception.BaseException; |
40 | 41 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
41 | 42 |
import org.gvsig.tools.visitor.VisitCanceledException; |
... | ... | |
53 | 54 |
public void testBug15671() throws Exception { |
54 | 55 |
new DefaultLibrariesInitializer().fullInitialize(); |
55 | 56 |
DataManager manager = DALLocator.getDataManager(); |
57 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
56 | 58 |
|
57 | 59 |
EditableFeatureType type = new DefaultEditableFeatureType(); |
58 |
type.add("GEOMETRY", DataTypes.GEOMETRY) |
|
59 |
.setGeometryType(Geometry.TYPES.POINT) |
|
60 |
.setGeometrySubType(Geometry.SUBTYPES.GEOM2D); |
|
60 |
GeometryType geometryType = |
|
61 |
geometryManager.getGeometryType(Geometry.TYPES.POINT, |
|
62 |
Geometry.SUBTYPES.GEOM2D); |
|
63 |
type.add("geom", org.gvsig.fmap.geom.DataTypes.GEOMETRY) |
|
64 |
.setGeometryType(geometryType); |
|
61 | 65 |
type.setDefaultGeometryAttributeName("GEOMETRY"); |
62 | 66 |
type.add("double", DataTypes.DOUBLE); |
63 | 67 |
|
... | ... | |
76 | 80 |
|
77 | 81 |
store.edit(); |
78 | 82 |
EditableFeature feature = store.createNewFeature().getEditable(); |
79 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
80 | 83 |
NullGeometry geom = |
81 | 84 |
geometryManager.createNullGeometry(Geometry.SUBTYPES.GEOM2D); |
82 | 85 |
feature.setGeometry("GEOMETRY", geom); |
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/shp/Bug15597Test.java | ||
---|---|---|
39 | 39 |
import org.gvsig.fmap.geom.Geometry.SUBTYPES; |
40 | 40 |
import org.gvsig.fmap.geom.GeometryLocator; |
41 | 41 |
import org.gvsig.fmap.geom.GeometryManager; |
42 |
import org.gvsig.fmap.geom.type.GeometryType; |
|
42 | 43 |
import org.gvsig.tools.dispose.DisposableIterator; |
43 | 44 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
44 | 45 |
|
... | ... | |
55 | 56 |
public void testBug15642() throws Exception { |
56 | 57 |
new DefaultLibrariesInitializer().fullInitialize(); |
57 | 58 |
DataManager manager = DALLocator.getDataManager(); |
59 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
58 | 60 |
|
59 | 61 |
//Create a feature type with two fields: "geom" and "field1" |
60 | 62 |
EditableFeatureType type = new DefaultEditableFeatureType(); |
63 |
GeometryType geometryType = |
|
64 |
geometryManager.getGeometryType(Geometry.TYPES.POINT, |
|
65 |
Geometry.SUBTYPES.GEOM2D); |
|
61 | 66 |
type.add("geom", org.gvsig.fmap.geom.DataTypes.GEOMETRY) |
62 |
.setGeometryType(Geometry.TYPES.POINT) |
|
63 |
.setGeometrySubType(Geometry.SUBTYPES.GEOM2D); |
|
67 |
.setGeometryType(geometryType); |
|
64 | 68 |
type.setDefaultGeometryAttributeName("geom"); |
65 | 69 |
type.add("field1", DataTypes.STRING).setSize(2); |
66 | 70 |
|
... | ... | |
80 | 84 |
//Edit the store and add a new Feature. |
81 | 85 |
store.edit(); |
82 | 86 |
|
83 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
84 |
|
|
85 | 87 |
EditableFeature feature1 = store.createNewFeature().getEditable(); |
86 | 88 |
feature1.setGeometry(type.getDefaultGeometryAttributeIndex(), |
87 | 89 |
geometryManager.createPoint(0, 0, SUBTYPES.GEOM2D)); |
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/shp/Bug15642Test.java | ||
---|---|---|
41 | 41 |
import org.gvsig.fmap.geom.operation.GeometryOperation; |
42 | 42 |
import org.gvsig.fmap.geom.operation.GeometryOperationContext; |
43 | 43 |
import org.gvsig.fmap.geom.operation.fromjts.FromJTS; |
44 |
import org.gvsig.fmap.geom.type.GeometryType; |
|
44 | 45 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
45 | 46 |
|
46 | 47 |
/** |
... | ... | |
55 | 56 |
public void testBug15642() throws Exception { |
56 | 57 |
new DefaultLibrariesInitializer().fullInitialize(); |
57 | 58 |
DataManager manager = DALLocator.getDataManager(); |
59 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
58 | 60 |
|
59 | 61 |
EditableFeatureType type = new DefaultEditableFeatureType(); |
62 |
GeometryType geometryType = |
|
63 |
geometryManager.getGeometryType(Geometry.TYPES.POINT, |
|
64 |
Geometry.SUBTYPES.GEOM2D); |
|
60 | 65 |
type.add("geom", org.gvsig.fmap.geom.DataTypes.GEOMETRY) |
61 |
.setGeometryType(Geometry.TYPES.POINT) |
|
62 |
.setGeometrySubType(Geometry.SUBTYPES.GEOM2D); |
|
66 |
.setGeometryType(geometryType); |
|
63 | 67 |
type.setDefaultGeometryAttributeName("geom"); |
64 | 68 |
type.add("float", DataTypes.FLOAT).setSize(5); |
65 | 69 |
type.add("long", DataTypes.LONG).setSize(5); |
... | ... | |
82 | 86 |
com.vividsolutions.jts.geom.Geometry g = |
83 | 87 |
new GeometryFactory().createPoint(new Coordinate(0, 0)); |
84 | 88 |
|
85 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
86 | 89 |
int opCode = geometryManager.getGeometryOperationCode(FromJTS.NAME); |
87 | 90 |
GeometryOperation converter = |
88 | 91 |
geometryManager.getGeometryOperation(opCode, Geometry.TYPES.POINT, |
... | ... | |
100 | 103 |
FeatureAttributeDescriptor defaultGeometryAttribute = |
101 | 104 |
store.getDefaultFeatureType().getDefaultGeometryAttribute(); |
102 | 105 |
|
103 |
assertEquals(Geometry.TYPES.POINT, |
|
104 |
defaultGeometryAttribute.getGeometryType()); |
|
105 |
assertEquals(Geometry.SUBTYPES.GEOM2D, |
|
106 |
defaultGeometryAttribute.getGeometrySubType()); |
|
106 |
geometryType = defaultGeometryAttribute.getGeomType(); |
|
107 |
assertEquals(Geometry.TYPES.POINT, geometryType.getType()); |
|
108 |
assertEquals(Geometry.SUBTYPES.GEOM2D, geometryType.getSubType()); |
|
107 | 109 |
|
108 | 110 |
store.dispose(); |
109 | 111 |
} |
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/shp/Bug15643Test.java | ||
---|---|---|
41 | 41 |
import org.gvsig.fmap.geom.operation.GeometryOperation; |
42 | 42 |
import org.gvsig.fmap.geom.operation.GeometryOperationContext; |
43 | 43 |
import org.gvsig.fmap.geom.operation.fromjts.FromJTS; |
44 |
import org.gvsig.fmap.geom.type.GeometryType; |
|
44 | 45 |
import org.gvsig.tools.exception.BaseException; |
45 | 46 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
46 | 47 |
import org.gvsig.tools.visitor.VisitCanceledException; |
... | ... | |
58 | 59 |
public void testBug15643() throws Exception { |
59 | 60 |
new DefaultLibrariesInitializer().fullInitialize(); |
60 | 61 |
DataManager manager = DALLocator.getDataManager(); |
62 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
61 | 63 |
|
62 | 64 |
EditableFeatureType type = new DefaultEditableFeatureType(); |
65 |
GeometryType geometryType = |
|
66 |
geometryManager.getGeometryType(Geometry.TYPES.POINT, |
|
67 |
Geometry.SUBTYPES.GEOM2D); |
|
63 | 68 |
type.add("geom", org.gvsig.fmap.geom.DataTypes.GEOMETRY) |
64 |
.setGeometryType(Geometry.TYPES.POINT) |
|
65 |
.setGeometrySubType(Geometry.SUBTYPES.GEOM2D); |
|
69 |
.setGeometryType(geometryType); |
|
66 | 70 |
type.setDefaultGeometryAttributeName("geom"); |
67 | 71 |
type.add("float", DataTypes.FLOAT).setSize(5); |
68 | 72 |
type.add("double", DataTypes.DOUBLE).setSize(5); |
... | ... | |
87 | 91 |
com.vividsolutions.jts.geom.Geometry g = |
88 | 92 |
new GeometryFactory().createPoint(new Coordinate(0, 0)); |
89 | 93 |
|
90 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
91 | 94 |
int opCode = geometryManager.getGeometryOperationCode(FromJTS.NAME); |
92 | 95 |
GeometryOperation converter = |
93 | 96 |
geometryManager.getGeometryOperation(opCode, Geometry.TYPES.POINT, |
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/shp/Bug15670Test.java | ||
---|---|---|
25 | 25 |
|
26 | 26 |
import org.gvsig.fmap.dal.DALLocator; |
27 | 27 |
import org.gvsig.fmap.dal.DataManager; |
28 |
import org.gvsig.fmap.dal.DataTypes; |
|
29 | 28 |
import org.gvsig.fmap.dal.feature.EditableFeature; |
30 | 29 |
import org.gvsig.fmap.dal.feature.EditableFeatureType; |
31 | 30 |
import org.gvsig.fmap.dal.feature.Feature; |
... | ... | |
34 | 33 |
import org.gvsig.fmap.dal.feature.impl.DefaultEditableFeatureType; |
35 | 34 |
import org.gvsig.fmap.geom.Geometry; |
36 | 35 |
import org.gvsig.fmap.geom.GeometryLocator; |
36 |
import org.gvsig.fmap.geom.GeometryManager; |
|
37 | 37 |
import org.gvsig.fmap.geom.primitive.Point; |
38 |
import org.gvsig.fmap.geom.type.GeometryType; |
|
38 | 39 |
import org.gvsig.tools.exception.BaseException; |
39 | 40 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
40 | 41 |
import org.gvsig.tools.visitor.VisitCanceledException; |
... | ... | |
52 | 53 |
public void testBug15670() throws Exception { |
53 | 54 |
new DefaultLibrariesInitializer().fullInitialize(); |
54 | 55 |
DataManager manager = DALLocator.getDataManager(); |
56 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
|
55 | 57 |
|
56 | 58 |
EditableFeatureType type = new DefaultEditableFeatureType(); |
57 |
type.add("GEOMETRY", DataTypes.GEOMETRY) |
|
58 |
.setGeometryType(Geometry.TYPES.POINT) |
|
59 |
.setGeometrySubType(Geometry.SUBTYPES.GEOM2D); |
|
59 |
GeometryType geometryType = |
|
60 |
geometryManager.getGeometryType(Geometry.TYPES.POINT, |
|
61 |
Geometry.SUBTYPES.GEOM2D); |
|
62 |
type.add("geom", org.gvsig.fmap.geom.DataTypes.GEOMETRY) |
|
63 |
.setGeometryType(geometryType); |
|
60 | 64 |
type.setDefaultGeometryAttributeName("GEOMETRY"); |
61 | 65 |
|
62 | 66 |
NewFeatureStoreParameters destParams = |
... | ... | |
75 | 79 |
store.edit(); |
76 | 80 |
EditableFeature feature = store.createNewFeature().getEditable(); |
77 | 81 |
final Point geom = |
78 |
GeometryLocator.getGeometryManager().createPoint(10.0, 10.0, |
|
79 |
Geometry.SUBTYPES.GEOM2D); |
|
82 |
geometryManager.createPoint(10.0, 10.0, Geometry.SUBTYPES.GEOM2D); |
|
80 | 83 |
feature.setGeometry("GEOMETRY", geom); |
81 | 84 |
store.insert(feature); |
82 | 85 |
store.finishEditing(); |
Also available in: Unified diff