Changeset 3580

Timestamp:

07/29/10 14:07:59 (6 weeks ago)

Author:

JO94

Message:

fixed numeric filtering for personal geodatabases

Location:

FalconView/trunk

Files:

• Test/GeodataDataSourcesTests/GeodataDataSourcesConsoleTester/GeodataDataSourcesConsoleTester.cpp (modified) (11 diffs)
• Test/GeodataDataSourcesTests/data/Personal Geodatabase.mdb (modified) (previous)
• public/fvw_core/GeodataDataSources/FVOGRFeature.cpp (modified) (1 diff)
• public/fvw_core/SLDLibrary/StyleRules.cs (modified) (1 diff)

FalconView/trunk/Test/GeodataDataSourcesTests/GeodataDataSourcesConsoleTester/GeodataDataSourcesConsoleTester.cpp

@@ -83 +83 @@
 
       WalkGeometry(feature->Geometry);
+   }
+}
+
+void WalkDataSet(IFvDataSet* dataSet)
+{
+   _bstr_t name = dataSet->Name;
+   _bstr_t description = dataSet->Description;
+
+   // test getting and setting visibility
+   IUIStatePtr uiState = dataSet;
+   bool visible = uiState->Visible ? true : false;
+   uiState->Visible = true;
+   ASSERT(uiState->Visible);
+   uiState->Visible = false;
+   ASSERT(!uiState->Visible);
+   uiState->Visible = visible;
+   ASSERT((uiState->Visible ? true : false) == visible);
+
+   // if this is a feature data set, walk it
+
+   IFeatureDataSetPtr featureDataSet = dataSet;
+   if (featureDataSet)
+      WalkFeatureDataSet(featureDataSet);
+
+   ILibkmlScreenOverlayPtr screenOverlay = dataSet;
+   if (screenOverlay)
+   {
+      double d = screenOverlay->OverlayX;
+      ScreenOverlayUnits units = screenOverlay->OverlayXUnits;
+      d = screenOverlay->OverlayY;
+      units = screenOverlay->OverlayYUnits;
+      //d = screenOverlay->Rotation;
+      //d = screenOverlay->RotationX;
+      //units = screenOverlay->RotationXUnits;
+      //d = screenOverlay->RotationY;
+      //units = screenOverlay->RotationYUnits;
+      screenOverlay->ScreenX;
+      units = screenOverlay->ScreenXUnits;
+      d = screenOverlay->ScreenY;
+      units = screenOverlay->ScreenYUnits;
+      d = screenOverlay->SizeX;
+      units = screenOverlay->SizeXUnits;
+      d = screenOverlay->SizeY;
+      units = screenOverlay->SizeYUnits;
    }
 }
@@ -117 +161 @@
    {
       IFvDataSetPtr dataSet = dataSource->GetDataSet(i);
-
-      name = dataSet->Name;
-      description = dataSet->Description;
-
-      // test getting and setting visibility
-      uiState = dataSet;
-      bool visible = uiState->Visible ? true : false;
-      uiState->Visible = true;
-      ASSERT(uiState->Visible);
-      uiState->Visible = false;
-      ASSERT(!uiState->Visible);
-      uiState->Visible = visible;
-      ASSERT((uiState->Visible ? true : false) == visible);
-
-      // if this is a feature data set, walk it
-
-      IFeatureDataSetPtr featureDataSet = dataSet;
-      if (featureDataSet)
-         WalkFeatureDataSet(featureDataSet);
-
-      ILibkmlScreenOverlayPtr screenOverlay = dataSet;
-      if (screenOverlay)
-      {
-         double d = screenOverlay->OverlayX;
-         ScreenOverlayUnits units = screenOverlay->OverlayXUnits;
-         d = screenOverlay->OverlayY;
-         units = screenOverlay->OverlayYUnits;
-         //d = screenOverlay->Rotation;
-         //d = screenOverlay->RotationX;
-         //units = screenOverlay->RotationXUnits;
-         //d = screenOverlay->RotationY;
-         //units = screenOverlay->RotationYUnits;
-         screenOverlay->ScreenX;
-         units = screenOverlay->ScreenXUnits;
-         d = screenOverlay->ScreenY;
-         units = screenOverlay->ScreenYUnits;
-         d = screenOverlay->SizeX;
-         units = screenOverlay->SizeXUnits;
-         d = screenOverlay->SizeY;
-         units = screenOverlay->SizeYUnits;
-      }
+      WalkDataSet(dataSet);
    }
 
@@ -569 +573 @@
    WalkDataSource(dataSource);
 
-   { // test circular filtering on points
+   { // test circular and attribute filtering on points
       IFeatureDataSetPtr points = dataSource->GetDataSetByName("points");
       IFvDataSetPtr dataSet = points;
       long lFeatureCount = points->FeatureCount;
-      ASSERT(lFeatureCount == 6);
-
-      // the location below (-89.06, 36.43) is about 531 meters from one of the points
+      ASSERT(lFeatureCount == 7);
 
       { // test with a rectangle created by CreateByRectangle (just to make sure it works)
@@ -598 +600 @@
             dataSet->Filter = NULL;
             lFeatureCount = points->FeatureCount;
-            ASSERT(lFeatureCount == 6);
+            ASSERT(lFeatureCount == 7);
          }
       }
@@ -648 +650 @@
       }
 
+      { // test an attribute filter
+         IAttributeFilterPtr attributeFilter(CLSID_AttributeFilter);
+         attributeFilter->WhereClause = "Joel > 3";
+         IFilterPtr filter = attributeFilter;
+         dataSet->Filter = filter;
+         lFeatureCount = points->FeatureCount;
+         ASSERT(lFeatureCount == 3);
+      }
+
       dataSet->Filter = NULL; // a technicality in this case
    }
@@ -655 +666 @@
       IFvDataSetPtr dataSet = lines;
       long lFeatureCount = lines->FeatureCount;
-      ASSERT(lFeatureCount == 1);
-
-      // the location below (-89.06, 36.43) is about 221 km from one of the endpoints
+      ASSERT(lFeatureCount == 2);
 
       { // test 10 meter radius
@@ -674 +683 @@
          dataSet->Filter = filter;
          lFeatureCount = lines->FeatureCount;
-         ASSERT(lFeatureCount == 1);
+         ASSERT(lFeatureCount == 2);
       }
 
@@ -684 +693 @@
       IFvDataSetPtr dataSet = polygons;
       long lFeatureCount = polygons->FeatureCount;
-      ASSERT(lFeatureCount == 1);
-
-      // the location below (-89.06, 36.43) is about 234 km from one of the verticies
+      ASSERT(lFeatureCount == 2);
 
       { // test 10 meter radius
@@ -703 +710 @@
          dataSet->Filter = filter;
          lFeatureCount = polygons->FeatureCount;
-         ASSERT(lFeatureCount == 1);
+         ASSERT(lFeatureCount == 2);
       }
 
@@ -814 +821 @@
    // change around the #if as necessary.
 
+   TestPersonalGeodatabase();
+
+#if 0
+
    TestKMLExport();
 
-#if 1
-
    TestKML();
 
@@ -825 +834 @@
 
    //WalkDAFIF(); // takes a very long time
-
-   TestPersonalGeodatabase();
 
    TestFilters();

FalconView/trunk/public/fvw_core/GeodataDataSources/FVOGRFeature.cpp

@@ -84 +84 @@
 STDMETHODIMP CFvOGRFeature::raw_GetFieldType(LONG index, FeatureFieldTypes* type)
 {
-    TRY_BLOCK
-    {
-        OGRFieldDefn def = m_OGR_feature->GetFieldDefnRef(index);
+   TRY_BLOCK
+   {
+      OGRFieldDefn def = m_OGR_feature->GetFieldDefnRef(index);
       OGRFieldType t = def.GetType();
-        switch(t)
-        {
-        case OFTInteger:
-            *type = FIELD_TYPE_LONG;
-            break;
-        case OFTReal:
-            *type = FIELD_TYPE_DOUBLE;
-            break;
+
+      switch(t)
+      {
+      case OFTInteger:
+         *type = FIELD_TYPE_LONG;
+         break;
+      case OFTReal:
+         *type = FIELD_TYPE_DOUBLE;
+         break;
+      case OFTString:
+      case OFTDate:
+      case OFTTime:
+      case OFTDateTime:
       default:
-        //case OFTString:
-        //case OFTDate:
-        //case OFTTime:
-        //case OFTDateTime:
-            *type = FIELD_TYPE_STRING;
-        }
-    }
-    CATCH_BLOCK_RET
+         *type = FIELD_TYPE_STRING;
+      }
+   }
+   CATCH_BLOCK_RET
 
-        return S_OK;
+   return S_OK;
 }
 
 STDMETHODIMP CFvOGRFeature::raw_GetFieldValue(LONG index, VARIANT* value)
 {
-    TRY_BLOCK
-    {
-        OGRFieldDefn def = m_OGR_feature->GetFieldDefnRef(index);
+   TRY_BLOCK
+   {
+      OGRFieldDefn def = m_OGR_feature->GetFieldDefnRef(index);
       OGRFieldType t = def.GetType();
-        switch(t)
-        {
-        case OFTInteger:
-            value->lVal = m_OGR_feature->GetFieldAsInteger(index);
-            value->vt = VT_I4;
-            break;
-        case OFTReal:
-            value->dblVal = m_OGR_feature->GetFieldAsDouble(index);
-            value->vt = VT_R8;
-            break;
+
+      switch(t)
+      {
+      case OFTInteger:
+         value->lVal = m_OGR_feature->GetFieldAsInteger(index);
+         value->vt = VT_I4;
+         break;
+      case OFTReal:
+         value->dblVal = m_OGR_feature->GetFieldAsDouble(index);
+         value->vt = VT_R8;
+         break;
+      case OFTString:
+      case OFTDate:
+      case OFTTime:
+      case OFTDateTime:
       default:
-        //case OFTString:
-        //case OFTDate:
-        //case OFTTime:
-        //case OFTDateTime:
-            value->bstrVal = _bstr_t(m_OGR_feature->GetFieldAsString(index)).Detach();
-            value->vt = VT_BSTR;
-        }
+         value->bstrVal = _bstr_t(m_OGR_feature->GetFieldAsString(index)).Detach();
+         value->vt = VT_BSTR;
+      }
+   }
+   CATCH_BLOCK_RET
 
-    }
-    CATCH_BLOCK_RET
-
-        return S_OK;
+   return S_OK;
 }
 
 STDMETHODIMP CFvOGRFeature::raw_GetFieldByName(BSTR FieldName, VARIANT* value)
 {
-    TRY_BLOCK
-    {
-        _bstr_t field_name(FieldName);
-        int index = m_OGR_feature->GetFieldIndex(field_name);
-        return raw_GetFieldValue((long)index, value);
-    }
-    CATCH_BLOCK_RET
+   TRY_BLOCK
+   {
+      _bstr_t field_name(FieldName);
+      int index = m_OGR_feature->GetFieldIndex(field_name);
+      return raw_GetFieldValue((long)index, value);
+   }
+   CATCH_BLOCK_RET
 
-    return E_FAIL;
+   return E_FAIL;
 }
 

FalconView/trunk/public/fvw_core/SLDLibrary/StyleRules.cs

@@ -2302 +2302 @@
             {
                LoggingUtils.Assert(BCOT.expression.Length == 2, "binary operations length should be two");
-               ret = ReadExpression(BCOT.expression[0]) + opString + "'" + ReadExpression(BCOT.expression[1]) + "'";
+
+               // add single quotes for non-numbers
+               string sLiteral = ReadExpression(BCOT.expression[1]);
+               long l;
+               double d;
+               bool bNumeric = long.TryParse(sLiteral, out l);
+               if (!bNumeric) bNumeric = double.TryParse(sLiteral, out d);
+               if (!bNumeric) sLiteral = "'" + sLiteral + "'";
+
+               ret = ReadExpression(BCOT.expression[0]) + opString + sLiteral;
             }
             else