Revision 19794
| trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/dxf/DXFFeaturesReader.java | ||
|---|---|---|
| 56 | 56 |
if (featureManager == null || !featureManager.isDeleted(feature)){
|
| 57 | 57 |
try {
|
| 58 | 58 |
MemoryFeature auxfeature=new MemoryFeature(type,false); |
| 59 |
auxfeature.setDefaultGeometry(feature.getDefaultGeometry()); |
|
| 59 |
// auxfeature.setDefaultGeometry(feature.getDefaultGeometry());
|
|
| 60 | 60 |
for (Iterator iter = type.iterator(); iter |
| 61 | 61 |
.hasNext();) {
|
| 62 | 62 |
IFeatureAttributeDescriptor fad = (IFeatureAttributeDescriptor) iter.next(); |
| trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/dxf/DXFStore.java | ||
|---|---|---|
| 415 | 415 |
} |
| 416 | 416 |
IGeometry geom=ShapeFactory.createPoint2D(new FPoint2D(pto.getX(), pto.getY())); |
| 417 | 417 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 418 |
feature.setDefaultGeometry(geom); |
|
| 418 |
// feature.setDefaultGeometry(geom);
|
|
| 419 | 419 |
addFeature(feature); |
| 420 | 420 |
|
| 421 | 421 |
// addShape(nuevoShp, auxRow); |
| ... | ... | |
| 457 | 457 |
} |
| 458 | 458 |
IGeometry geom=ShapeFactory.createPoint2D(new FPoint2D(pto.getX(), pto.getY())); |
| 459 | 459 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 460 |
feature.setDefaultGeometry(geom); |
|
| 460 |
// feature.setDefaultGeometry(geom);
|
|
| 461 | 461 |
addFeature(feature); |
| 462 | 462 |
// addShape(nuevoShp, auxRow); |
| 463 | 463 |
} |
| ... | ... | |
| 517 | 517 |
} |
| 518 | 518 |
IGeometry geom=ShapeFactory.createPoint3D(pto.getX(), pto.getY(), pto.getZ()); |
| 519 | 519 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 520 |
feature.setDefaultGeometry(geom); |
|
| 520 |
// feature.setDefaultGeometry(geom);
|
|
| 521 | 521 |
addFeature(feature); |
| 522 | 522 |
// addShape(nuevoShp, auxRow); |
| 523 | 523 |
} else {
|
| ... | ... | |
| 559 | 559 |
} |
| 560 | 560 |
IGeometry geom=ShapeFactory.createPoint3D(pto.getX(), pto.getY(), pto.getZ()); |
| 561 | 561 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 562 |
feature.setDefaultGeometry(geom); |
|
| 562 |
// feature.setDefaultGeometry(geom);
|
|
| 563 | 563 |
addFeature(feature); |
| 564 | 564 |
// addShape(nuevoShp, auxRow); |
| 565 | 565 |
} |
| ... | ... | |
| 609 | 609 |
} |
| 610 | 610 |
IGeometry geom=ShapeFactory.createPolyline2D(genPathX); |
| 611 | 611 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 612 |
feature.setDefaultGeometry(geom); |
|
| 612 |
// feature.setDefaultGeometry(geom);
|
|
| 613 | 613 |
addFeature(feature); |
| 614 | 614 |
// addShape(nuevoShp, auxRow); |
| 615 | 615 |
} else if (fea.getGeometry() instanceof LineString3D) {
|
| ... | ... | |
| 663 | 663 |
} |
| 664 | 664 |
IGeometry geom=ShapeFactory.createPolyline3D(genPathX,elevations); |
| 665 | 665 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 666 |
feature.setDefaultGeometry(geom); |
|
| 666 |
// feature.setDefaultGeometry(geom);
|
|
| 667 | 667 |
addFeature(feature); |
| 668 | 668 |
// addShape(nuevoShp, auxRow); |
| 669 | 669 |
} else if (fea.getGeometry() instanceof Polygon |
| ... | ... | |
| 719 | 719 |
} |
| 720 | 720 |
IGeometry geom=ShapeFactory.createPolygon2D(genPathX); |
| 721 | 721 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 722 |
feature.setDefaultGeometry(geom); |
|
| 722 |
// feature.setDefaultGeometry(geom);
|
|
| 723 | 723 |
addFeature(feature); |
| 724 | 724 |
// addShape(nuevoShp, auxRow); |
| 725 | 725 |
} else if (fea.getGeometry() instanceof Polygon3D) {
|
| ... | ... | |
| 782 | 782 |
} |
| 783 | 783 |
IGeometry geom=ShapeFactory.createPolygon3D(genPathX,elevations); |
| 784 | 784 |
feature.set(ID_FIELD_FSHAPE,geom); |
| 785 |
feature.setDefaultGeometry(geom); |
|
| 785 |
// feature.setDefaultGeometry(geom);
|
|
| 786 | 786 |
addFeature(feature); |
| 787 | 787 |
// addShape(nuevoShp, auxRow); |
| 788 | 788 |
} else {
|
| trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/dgn/DGNFeaturesReader.java | ||
|---|---|---|
| 56 | 56 |
|
| 57 | 57 |
DGNFeature auxfeature=new DGNFeature(feature); |
| 58 | 58 |
if (filter==null || parser.match(auxfeature)){
|
| 59 |
System.err.println(i); |
|
| 60 |
j++; |
|
| 61 |
System.err.println("j= "+j);
|
|
| 59 |
// System.err.println(i);
|
|
| 60 |
// j++;
|
|
| 61 |
// System.err.println("j= "+j);
|
|
| 62 | 62 |
if (!allFeatures.add(auxfeature)){
|
| 63 |
System.err.println("Fallo " +auxfeature);
|
|
| 63 |
// System.err.println("Fallo " +auxfeature);
|
|
| 64 | 64 |
}else{
|
| 65 | 65 |
System.out.println("Correcto " +auxfeature);
|
| 66 | 66 |
} |
| trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/dgn/DGNStore.java | ||
|---|---|---|
| 268 | 268 |
GeneralPathX elementoCompuesto = new GeneralPathX(GeneralPathX.WIND_EVEN_ODD); |
| 269 | 269 |
|
| 270 | 270 |
for (int id = 0; id < m_DgnReader.getNumEntities(); id++) {
|
| 271 |
auxFeature=new DGNFeature(featureType,true); |
|
| 272 |
cellFeature=new DGNFeature(featureType,false); |
|
| 273 |
complexFeature=new DGNFeature(featureType,false); |
|
| 271 | 274 |
// System.out.println("Elemento " + id + " de " + m_DgnReader.getNumEntities());
|
| 272 | 275 |
m_DgnReader.DGNGotoElement(id); |
| 273 | 276 |
|
| ... | ... | |
| 307 | 310 |
// System.err.println("Entidad compuesta. bInsideCell = " + bInsideCell + " auxRow = " + auxRow[ID_FIELD_ENTITY]);
|
| 308 | 311 |
IGeometry geom=ShapeFactory.createPolyline2D(elementoCompuesto); |
| 309 | 312 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 310 |
auxFeature.setDefaultGeometry(geom); |
|
| 313 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 311 | 314 |
addFeature(auxFeature); |
| 312 | 315 |
// addShape(new FPolyline2D(elementoCompuesto), auxRow); |
| 313 | 316 |
|
| ... | ... | |
| 318 | 321 |
} |
| 319 | 322 |
geom=ShapeFactory.createPolygon2D(elementoCompuesto); |
| 320 | 323 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 321 |
auxFeature.setDefaultGeometry(geom); |
|
| 324 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 322 | 325 |
addFeature(auxFeature); |
| 323 | 326 |
// addShape(new FPolygon2D(elementoCompuesto), auxRow); |
| 324 | 327 |
} |
| ... | ... | |
| 440 | 443 |
IGeometry geom=ShapeFactory.createPoint3D(psLine.vertices[0].x, |
| 441 | 444 |
psLine.vertices[0].y, psLine.vertices[0].z); |
| 442 | 445 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 443 |
auxFeature.setDefaultGeometry(geom); |
|
| 446 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 444 | 447 |
addFeature(auxFeature); |
| 445 | 448 |
|
| 446 | 449 |
// addShape(new FPoint3D(psLine.vertices[0].x, |
| ... | ... | |
| 500 | 503 |
if (elemento.complex == 0) {
|
| 501 | 504 |
IGeometry geom=ShapeFactory.createPolygon2D(elShape); |
| 502 | 505 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 503 |
auxFeature.setDefaultGeometry(geom); |
|
| 506 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 504 | 507 |
addFeature(auxFeature); |
| 505 | 508 |
// addShape(new FPolygon2D(elShape), auxRow); |
| 506 | 509 |
} |
| ... | ... | |
| 520 | 523 |
} else {
|
| 521 | 524 |
IGeometry geom=ShapeFactory.createPolyline2D(elShape); |
| 522 | 525 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 523 |
auxFeature.setDefaultGeometry(geom); |
|
| 526 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 524 | 527 |
addFeature(auxFeature); |
| 525 | 528 |
// addShape(new FPolyline2D(elShape), auxRow); |
| 526 | 529 |
} |
| ... | ... | |
| 606 | 609 |
} else {
|
| 607 | 610 |
IGeometry geom=ShapeFactory.createPolyline2D(elShapeArc); |
| 608 | 611 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 609 |
auxFeature.setDefaultGeometry(geom); |
|
| 612 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 610 | 613 |
addFeature(auxFeature); |
| 611 | 614 |
|
| 612 | 615 |
// addShape(new FPolyline2D(elShapeArc), auxRow); |
| ... | ... | |
| 614 | 617 |
if (psArc.type == DGNFileHeader.DGNT_ELLIPSE) {
|
| 615 | 618 |
geom=ShapeFactory.createPolygon2D(elShapeArc); |
| 616 | 619 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 617 |
auxFeature.setDefaultGeometry(geom); |
|
| 620 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 618 | 621 |
addFeature(auxFeature); |
| 619 | 622 |
// addShape(new FPolygon2D(elShapeArc), auxRow); |
| 620 | 623 |
} |
| ... | ... | |
| 648 | 651 |
IGeometry geom=ShapeFactory.createPoint3D(psText.origin.x, |
| 649 | 652 |
psText.origin.y, psText.origin.z); |
| 650 | 653 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 651 |
auxFeature.setDefaultGeometry(geom); |
|
| 654 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 652 | 655 |
addFeature(auxFeature); |
| 653 | 656 |
|
| 654 | 657 |
// addShape(elShapeTxt, auxRow); |
| ... | ... | |
| 685 | 688 |
// System.err.println("Entidad compuesta. bInsideCell = " + bInsideCell + " auxRow = " + auxRow[ID_FIELD_ENTITY]);
|
| 686 | 689 |
IGeometry geom=ShapeFactory.createPolyline2D(elementoCompuesto); |
| 687 | 690 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 688 |
auxFeature.setDefaultGeometry(geom); |
|
| 691 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 689 | 692 |
addFeature(auxFeature); |
| 690 | 693 |
|
| 691 | 694 |
// addShape(new FPolyline2D(elementoCompuesto), auxRow); |
| ... | ... | |
| 697 | 700 |
} |
| 698 | 701 |
geom=ShapeFactory.createPolygon2D(elementoCompuesto); |
| 699 | 702 |
auxFeature.set(ID_FIELD_GEOMETRY,geom); |
| 700 |
auxFeature.setDefaultGeometry(geom); |
|
| 703 |
// auxFeature.setDefaultGeometry(geom);
|
|
| 701 | 704 |
addFeature(auxFeature); |
| 702 | 705 |
// addShape(new FPolygon2D(elementoCompuesto), auxRow); |
| 703 | 706 |
} |
| trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/base/MemoryFeature.java | ||
|---|---|---|
| 1 |
package org.gvsig.data.datastores.vectorial.driver.base; |
|
| 2 |
|
|
| 3 |
import java.text.ParseException; |
|
| 4 |
import java.util.Iterator; |
|
| 5 |
import java.util.List; |
|
| 6 |
|
|
| 7 |
import org.gvsig.data.spatialprovisional.IExtent; |
|
| 8 |
import org.gvsig.data.vectorial.Feature; |
|
| 9 |
import org.gvsig.data.vectorial.IFeature; |
|
| 10 |
import org.gvsig.data.vectorial.IFeatureAttributeDescriptor; |
|
| 11 |
import org.gvsig.data.vectorial.IFeatureID; |
|
| 12 |
import org.gvsig.data.vectorial.IFeatureType; |
|
| 13 |
import org.gvsig.data.vectorial.MemoryFeatureID; |
|
| 14 |
|
|
| 15 |
public class MemoryFeature extends Feature implements IFeature {
|
|
| 16 |
|
|
| 17 |
/** |
|
| 18 |
* |
|
| 19 |
*/ |
|
| 20 |
private static final long serialVersionUID = 5866395773511247527L; |
|
| 21 |
|
|
| 22 |
public MemoryFeature(IFeature feature) {
|
|
| 23 |
super(feature.getType()); |
|
| 24 |
|
|
| 25 |
Iterator iterator=this.featureType.iterator(); |
|
| 26 |
|
|
| 27 |
Object value; |
|
| 28 |
IFeatureAttributeDescriptor featureAttribute; |
|
| 29 |
int column; |
|
| 30 |
while(iterator.hasNext()){
|
|
| 31 |
featureAttribute=(IFeatureAttributeDescriptor)iterator.next(); |
|
| 32 |
column=featureAttribute.ordinal(); |
|
| 33 |
value=feature.get(column); |
|
| 34 |
this.set(column, value); |
|
| 35 |
} |
|
| 36 |
this.setDefaultGeometry(feature.getDefaultGeometry()); |
|
| 37 |
|
|
| 38 |
|
|
| 39 |
} |
|
| 40 |
|
|
| 41 |
public MemoryFeature(IFeatureType type,boolean defaultValues) {
|
|
| 42 |
super(type); |
|
| 43 |
if (defaultValues){
|
|
| 44 |
Iterator iterator=type.iterator(); |
|
| 45 |
int i=0; |
|
| 46 |
while(iterator.hasNext()){
|
|
| 47 |
IFeatureAttributeDescriptor featureAttribute=(IFeatureAttributeDescriptor)iterator.next(); |
|
| 48 |
String attributeType=featureAttribute.getDataType(); |
|
| 49 |
Object defaultValue=featureAttribute.getDefaultValue(); |
|
| 50 |
if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_BYTE)){
|
|
| 51 |
set(i,Byte.parseByte((String)defaultValue)); |
|
| 52 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_DATE)){
|
|
| 53 |
try {
|
|
| 54 |
set(i,type.getDateFormat().parse((String)defaultValue)); |
|
| 55 |
} catch (ParseException e) {
|
|
| 56 |
// TODO Auto-generated catch block |
|
| 57 |
e.printStackTrace(); |
|
| 58 |
} |
|
| 59 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_DOUBLE)){
|
|
| 60 |
set(i,defaultValue); |
|
| 61 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_FLOAT)){
|
|
| 62 |
set(i,defaultValue); |
|
| 63 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_GEOMETRY)){
|
|
| 64 |
set(i,defaultValue); |
|
| 65 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_INT)){
|
|
| 66 |
set(i,defaultValue); |
|
| 67 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_LONG)){
|
|
| 68 |
set(i,defaultValue); |
|
| 69 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_OBJECT)){
|
|
| 70 |
set(i,defaultValue); |
|
| 71 |
}else if (attributeType.equals(IFeatureAttributeDescriptor.TYPE_STRING)){
|
|
| 72 |
set(i,defaultValue); |
|
| 73 |
} |
|
| 74 |
i++; |
|
| 75 |
} |
|
| 76 |
} |
|
| 77 |
} |
|
| 78 |
|
|
| 79 |
public IFeatureID getID() {
|
|
| 80 |
return new MemoryFeatureID(this); |
|
| 81 |
} |
|
| 82 |
|
|
| 83 |
public IExtent getExtent() {
|
|
| 84 |
String geomColumn=featureType.getDefaultGeometry(); |
|
| 85 |
Object geometry=getGeometry(geomColumn); |
|
| 86 |
// return geometry.getExtent(); |
|
| 87 |
return null; |
|
| 88 |
} |
|
| 89 |
|
|
| 90 |
public List getAllSRS() {
|
|
| 91 |
// TODO Auto-generated method stub |
|
| 92 |
return null; |
|
| 93 |
} |
|
| 94 |
|
|
| 95 |
public String getDefaultSRS() {
|
|
| 96 |
// TODO Auto-generated method stub |
|
| 97 |
return null; |
|
| 98 |
} |
|
| 99 |
|
|
| 100 |
} |
|
| trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/driver/shp/SHPStore.java | ||
|---|---|---|
| 340 | 340 |
if (fieldType.equals(IFeatureAttributeDescriptor.TYPE_GEOMETRY)){
|
| 341 | 341 |
IGeometry geometry=getGeometry(position); |
| 342 | 342 |
feature.set(i,geometry); |
| 343 |
feature.setDefaultGeometry(geometry); |
|
| 343 |
// feature.setDefaultGeometry(geometry);
|
|
| 344 | 344 |
|
| 345 | 345 |
} |
| 346 | 346 |
if (dbf.getFieldCount()<=i) |
Also available in: Unified diff