Changeset 11251

Show
Ignore:
Timestamp:
04/13/07 12:37:07 (1 year ago)
Author:
pka
Message:

Applying filters in GetNextFeature?() and GetExtents?() fixed. (Ticket #1535).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/ogr/ogrsf_frmts/ili/ogrili1layer.cpp

    r11177 r11251  
    120120 
    121121OGRFeature *OGRILI1Layer::GetNextFeature() { 
     122    OGRFeature *poFeature = NULL; 
    122123    if (nFeatureIdx < nFeatures) 
    123124    { 
    124       return papoFeatures[nFeatureIdx++]->Clone(); 
     125      poFeature = papoFeatures[nFeatureIdx++]; 
     126      //apply filters 
     127      if( (m_poFilterGeom == NULL 
     128           || FilterGeometry( poFeature->GetGeometryRef() ) ) 
     129          && (m_poAttrQuery == NULL 
     130              || m_poAttrQuery->Evaluate( poFeature )) ) 
     131          return poFeature->Clone(); 
    125132    } 
    126133    return NULL; 
    …… 
    140147 
    141148OGRErr OGRILI1Layer::GetExtent(OGREnvelope *psExtent, int bForce ) { 
    142   return OGRERR_NONE; 
     149  return OGRLayer::GetExtent( psExtent, bForce ); 
    143150} 
    144151 

  • trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2layer.cpp

    r11177 r11251  
    116116 
    117117OGRFeature *OGRILI2Layer::GetNextFeature() { 
     118    OGRFeature *poFeature = NULL; 
    118119    if (listFeatureIt != listFeature.end()) 
    119         return (*(listFeatureIt++))->Clone(); 
     120    { 
     121      poFeature = *(listFeatureIt++); 
     122      //apply filters 
     123      if( (m_poFilterGeom == NULL 
     124           || FilterGeometry( poFeature->GetGeometryRef() ) ) 
     125          && (m_poAttrQuery == NULL 
     126              || m_poAttrQuery->Evaluate( poFeature )) ) 
     127          return poFeature->Clone(); 
     128    } 
    120129    return NULL; 
    121130} 
    …… 
    134143 
    135144OGRErr OGRILI2Layer::GetExtent(OGREnvelope *psExtent, int bForce ) { 
    136   return OGRERR_NONE; 
     145  return OGRLayer::GetExtent( psExtent, bForce ); 
    137146} 
    138147