/ - Diff - gvSIG data providers based on gdal - gvSIG

     import org.gdal.ogr.Layer;
     import org.gdal.ogr.ogr;
     import org.gdal.ogr.ogrConstants;
     import org.gvsig.fmap.dal.DataStore;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.DataTypes;
-...
     import org.gvsig.tools.dynobject.DynObject;
     import org.gvsig.tools.evaluator.Evaluator;
     import org.gvsig.tools.exception.BaseException;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
+     *
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
-...
         private static final Logger LOG = LoggerFactory.getLogger(OGRDataStoreProvider.class);
         /**
+         *
+         *
          */
         public static final String METADATA_DEFINITION_NAME = "OGRDataStoreProvider";
         /**
+         *
+         *
          */
         public static final String NAME = "OGRDataStoreProvider";
         /**
+         *
+         *
          */
         public static final String DESCRIPTION = "OGR provider to open vectorial resources";
-...
                     @Override
                     public Object run() throws Exception {
                         double[] extent = getLayer().GetExtent(true);
                         Layer layer = getLayer();
                         double[] extent = layer.GetExtent(true);
                         if (extent != null) {
                             return GeometryLocator.getGeometryManager().createEnvelope(extent[0],
                                 extent[2], extent[1], extent[3], SUBTYPES.GEOM2D);
-...
                             Envelope tmpEnvelope =
                                 GeometryLocator.getGeometryManager().createEnvelope(SUBTYPES.GEOM2D);
                             FeatureType featureType = getStoreServices().getDefaultFeatureType();
                             int index = 0;
                             while (index < getLayer().GetFeatureCount()) {
                             layer.ResetReading();
                             Feature feature = layer.GetNextFeature();
                             while (feature!=null) {
                                 double[] envelope = new double[4];
                                 Feature feature = getLayer().GetNextFeature();
                                 int geomFieldIndex =
                                     getLayer().GetLayerDefn().GetGeomFieldIndex(
                                     layer.GetLayerDefn().GetGeomFieldIndex(
                                         featureType.getDefaultGeometryAttributeName());
                                 Geometry ogrGeometry = feature.GetGeomFieldRef(geomFieldIndex);
                                 ogrGeometry.GetEnvelope(envelope);
                                 tmpEnvelope.add(GeometryLocator.getGeometryManager()
                                     .createEnvelope(envelope[0], envelope[2], envelope[1], envelope[3],
                                         SUBTYPES.GEOM2D));
                                 index++;
                                 feature = layer.GetNextFeature();
+                            }
                             return tmpEnvelope;
-...
                 @Override
                 public Object run() throws Exception {
                     return getLayer().GetFeatureCount();
                     return getLayer().GetFeatureCount(0);
+                }
             })).longValue();
+        }
-...
             FeatureReferenceProviderServices providerServices, FeatureType featureType)
             throws DataException {
             Feature ogrFeature = getLayer().GetFeature((int) providerServices.getOID());
             int oid = (int)providerServices.getOID();
             // Parece que hay un bug en el proveedor de SQLite para gdal.
             // Cuando se lee la capa, el m?todo GetFID est? indexado empezando por 0,
             // pero cuando se busca una ogrFeature a partir de dicho FID
             // el m?todo GetFeature(fid) est? indexado empezando por 1.
             // Esto es para rodear el problema.
             if(this.dataSource.GetDriver().getName().equalsIgnoreCase("SQLite")){
                 oid++;
+            }
             Feature ogrFeature = getLayer().GetFeature(oid);
             int fid = ogrFeature.GetFID();
             FeatureProvider featureProvider =
                 new DefaultFeatureProvider(featureType, ogrFeature.GetFID());
                 new DefaultFeatureProvider(featureType, fid);
             OGRConverter converter = new OGRConverter();
             featureProvider = converter.convert(featureProvider, featureType, ogrFeature);
             return featureProvider;

     import org.slf4j.LoggerFactory;
     /**
+     *
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
-...
             LOG.debug("Running query {} over {}", new Object[] { sql, dataSource.getName() });
             Layer layer = null;
             if (getOGRStoreProvider().getLayer().TestCapability(ogrConstants.OLCFastSpatialFilter)
             boolean ignoreSpatialFilter = (boolean) getStore().getParameters().getDynValue(OGRDataStoreParameters.IGNORE_SPATIAL_FILTER);
             if (!ignoreSpatialFilter && getOGRStoreProvider().getLayer().TestCapability(ogrConstants.OLCFastSpatialFilter)
                 && getQuery().hasFilter()) {
                 String evaluatorSQL = getQuery().getFilter().getSQL();
-...
             } else {
                 layer = dataSource.ExecuteSQL(sql);
+            }
             if(layer == null){
                 LOG.warn("The result of query is null. SQL {} FeatureType {}", sql, getFeatureType());
                 LOG.warn("Getting data without SQL filter");
                 OGRDataStoreParameters ogrParameters = (OGRDataStoreParameters) getOGRStoreProvider().getParameters();
                 layer = dataSource.ExecuteSQL("SELECT * FROM ".concat(ogrParameters.getLayerName()));
+            }
             return new OGRFastIterator(getStore(), layer, index);
+        }
-...
             private FeatureProvider featureProvider;
             private Feature currentOgrFeature;
             private Feature nextOgrFeature;
             public OGRFastIterator(FeatureStoreProvider storeProvider, Layer layer, long index)
                 throws OGRUnsupportedFormatException {
                 super(storeProvider);
-...
                 this.converter = new OGRConverter();
                 this.index = index;
                 this.layer = layer;
                 this.layer.SetNextByIndex((int) index);
                 this.layer.GetFeatureCount();
                 this.layer.ResetReading();
                 if(index!=0){
                     this.layer.SetNextByIndex((int) index);
+                }
                 this.currentOgrFeature = null;
                 this.nextOgrFeature =  this.layer.GetNextFeature();
+            }
             @Override
             public void remove() {
                 Feature ogrFeature;
                 ogrFeature = this.layer.GetNextFeature();
                 this.layer.DeleteFeature(ogrFeature.GetFID());
                 index++;
                 if (currentOgrFeature != null) {
                     this.layer.DeleteFeature(currentOgrFeature.GetFID());
                     currentOgrFeature=null;
+                }
+            }
             @Override
             protected Object internalNext() {
                 Feature ogrFeature = this.layer.GetNextFeature();
                 this.featureProvider = converter.convert(featureProvider, getFeatureType(), ogrFeature);
                 index++;
                 this.currentOgrFeature = this.nextOgrFeature;
                 this.featureProvider = null;
                 this.featureProvider = converter.convert(featureProvider, getFeatureType(), this.nextOgrFeature);
                 this.nextOgrFeature =  this.layer.GetNextFeature();
                 return this.featureProvider;
+            }
             @Override
             protected boolean internalHasNext() {
                 return index < this.layer.GetFeatureCount() ? true : false;
                 return nextOgrFeature!=null;
+            }
             @Override

     /**
      * Converter class used to parse OGR layer defn, feature, types... to gvSIG
      * objects and constant.
+     *
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
-...
         private static final Logger LOG = LoggerFactory.getLogger(OGRConverter.class);
         /**
+         *
+         *
          */
         public OGRConverter() {
-...
         /**
          * Converts {@link FeatureDefn} to {@link FeatureType} and sets
          * default geometry field to created {@link FeatureType}.
+         *
+         *
          * @param featureDefn
          *            OGR definition to be converted
          * @param defaultGeometryField
-...
         /**
          * Converts {@link FeatureAttributeDescriptor} of {@link FeatureType} to
          * {@link FieldDefn}
+         *
+         *
          * @param featureType
          *            Fields to be converted
          * @return FieldDefn list OGR fields
-...
         /**
          * Converts {@link FeatureAttributeDescriptor} to {@link FieldDefn}
+         *
+         *
          * @param attDescriptor
          * @return FieldDefn
          */
-...
         /**
          * Converts geometry {@link FeatureAttributeDescriptor} of
          * {@link FeatureType} to {@link GeomFieldDefn}
+         *
+         *
          * @param featureType
          *            Geometry fields to be converted
          * @param convertDefaultGeometryColumn
-...
         /**
          * Converts {@link FeatureAttributeDescriptor} to {@link GeomFieldDefn}
+         *
+         *
          * @param attDescriptor
          *            Attribute to be converted
          * @return GeomFieldDefn OGR Geometry field
-...
          * Converts {@link Feature} to {@link FeatureProvider}. If
          * {@link FeatureProvider} is null, it will be instantiated. This method
          * only takes into account the fields of received {@link FeatureType}.
+         *
+         *
          * @param featureProvider
+         *
+         *
          * @param featureType
          *            Type of feature provider
          * @param ogrFeature
-...
         public FeatureProvider convert(FeatureProvider featureProvider, FeatureType featureType,
             Feature ogrFeature) {
             int fid = ogrFeature.GetFID();
             if (featureProvider == null) {
                 featureProvider = new DefaultFeatureProvider(featureType, ogrFeature.GetFID());
                 featureProvider = new DefaultFeatureProvider(featureType, fid);
             } else {
                 featureProvider.setOID(ogrFeature.GetFID());
                 featureProvider.setOID(fid);
+            }
             FeatureDefn defnRef = ogrFeature.GetDefnRef();
-...
         /**
          * Converts {@link FeatureProvider} to {@link Feature}.
+         *
+         *
          * @param featureProvider
          *            Feature provider to be converted
          * @return Feature OGR Feature with feature provider values.
-...
         /**
          * Convert gvSIG geometry type to OGR geometry type. See
          * {@link ogrConstants}.
+         *
+         *
          * @param type
          *            A type of {@link TYPES}
          * @return int Equivalent type of {@link ogrConstants}
-...
         /**
          * Convert OGR geometry type to gvSIG geometry type. See {@link TYPES}.
+         *
+         *
          * @param type
          *            A type of {@link ogrConstants}
          * @return int Equivalent type of {@link TYPES}
-...
         /**
          * Convert gvSIG type to OGR type. See {@link ogrConstants}.
+         *
+         *
          * @param type
          *            A type of {@link DataTypes}
          * @return int Equivalent type of {@link ogrConstants}
-...
         /**
          * Convert OGR type to gvSIG type. See {@link DataTypes}.
+         *
+         *
          * @param type
          *            A type of {@link ogrConstants}
          * @return int Equivalent type of {@link DataTypes}
-...
          * Convert OGR Feature to another OGR Feature. This method take into account
          * only {@link FeatureDefn} fields to create new feature. This method is
          * useful when OGR {@link Layer} is copied to new {@link DataSource}.
+         *
+         *
          * @param layerDefn
          *            Definition of new feature
          * @param feature

     import org.gvsig.tools.dynobject.DelegatedDynObject;
     /**
+     *
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
-...
         FilesystemStoreParameters {
         /**
+         *
+         *
          */
         public static final String PARAMETERS_DEFINITION_NAME = "OGRDataStoreParameters";
         /**
+         *
+         *
          */
         public static final String FILE_PARAMTER_NAME = "file";
         /**
+         *
+         *
          */
         public static final String LAYER_NAME_PARAMTER_NAME = "layerName";
         /**
+         *
+         *
          */
         public static final String CONNECTION_STRING_PARAMETER_NAME = "connectionString";
         /**
+         *
+         *
          */
         public static final String DEFAULT_GEOMETRY_PARAMETER_NAME = "defaultGeometryField";
         /**
+         *
+         *
          */
         public static final String CRS_PARAMETER_NAME = "crs";
         /**
+         *
          */
         public static final String IGNORE_SPATIAL_FILTER = "ignoreSpatialFilter";
         protected DelegatedDynObject parameters;
         /**
+         *
+         *
          */
         public OGRDataStoreParameters() {
             this.parameters =
-...
+        }
         /**
+         *
+         *
          * @return String
          */
         public IProjection getCRS() {
-...
+        }
         /**
+         *
+         *
          * @param crs
          */
         public void setCRS(IProjection crs) {

     					group="Basic">
     					<description>Name of default geometry field</description>
     				</field>
             <field name="ignoreSpatialFilter" type="boolean" mandatory="false"
               group="Advanced" defaultValue="true">
               <description>Ignore spatial filter</description>
             </field>
     			</fields>
     		</class>
     	</classes>
     </definitions>
     </definitions>

         private static final Logger LOG = LoggerFactory.getLogger(GMLDataStoreProvider.class);
         /**
+         *
+         *
          */
         public static final String NAME = "GMLDataStoreProvider";
         /**
+         *
+         *
          */
         public static final String DESCRIPTION = "GML provider to open vectorial resources";
-...
+                }
                 List<org.gdal.ogr.Feature> ogrFeatures = new ArrayList<org.gdal.ogr.Feature>();
                 for (int j = 0; j < tmpLayer.GetFeatureCount(); j++) {
                     ogrFeatures.add(tmpLayer.GetFeature(j));
                 org.gdal.ogr.Feature feature = tmpLayer.GetNextFeature();
                 while(feature!=null){
                     ogrFeatures.add(feature);
+                }
                 createLayer(newDataSource, tmpLayer.GetName(), srs, ogrGeomType, fields, geomFields,
                     ogrFeatures);
+            }

Application: gvSIG desktop » gvSIG data providers based on gdal

Revision 209