Index: ExpressionProcessor.cpp
===================================================================
--- ExpressionProcessor.cpp	(revision 3180)
+++ ExpressionProcessor.cpp	(working copy)
@@ -431,29 +431,12 @@
     else
     {
         //
-        // Convert FGF geometry to OGC WKB stream
+        // Convert FGF geometry to OGC WKT string wrapped in GeomFromText
         //
-        FdoPtr<FdoFgfGeometryFactory> factory(FdoFgfGeometryFactory::GetInstance());
-        assert(NULL != factory);
+        FdoStringP value(expr.ToString());
+        mBuffer.append(static_cast<char const*>(value));
 
-        FdoPtr<FdoByteArray> fgfBytes(expr.GetGeometry());
-        assert(NULL != fgfBytes);
-
-        FdoPtr<FdoIGeometry> fdoGeom = factory->CreateGeometryFromFgf(fgfBytes);
-        assert(NULL != fdoGeom);
-
-        FDOLOG_WRITE(L"Geometry: %s\n\t", fdoGeom->GetText());
-
-        FdoPtr<FdoByteArray> wkbBytes(factory->GetWkb(fdoGeom));
-        FdoByte* const bytes = wkbBytes->GetData();
-
-        // Convert raw bytes to hex string
-        std::string hexWkb;
-        ewkb::ewkb_t wkb(bytes, bytes + wkbBytes->GetCount());
-        ewkb::bytes_to_hex(wkb, hexWkb);
-        mBuffer.append(hexWkb);
-
-        FDOLOG_WRITE("Geometry WKB HEX:\n\t%s", hexWkb.c_str());
+        FDOLOG_WRITE(L"Geometry: %s\n\t", value);
     }
 }