[mapguide-commits] r9269 - in sandbox/jng/cmake_v2: . Desktop Desktop/MgDesktop/Services Desktop/MgDesktop/Services/Feature Desktop/MgDesktop/Services/Rendering Desktop/MgDesktop/Services/Resource
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Dec 26 05:05:45 PST 2017
Author: jng
Date: 2017-12-26 05:05:45 -0800 (Tue, 26 Dec 2017)
New Revision: 9269
Modified:
sandbox/jng/cmake_v2/
sandbox/jng/cmake_v2/Desktop/
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/RenderingService.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.cpp
sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.h
Log:
Merged revision(s) 9268 from trunk/MgDev:
Fix up mg-desktop build post-sandbox-merge.
........
Property changes on: sandbox/jng/cmake_v2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/clean_json:8818-9180
/sandbox/jng/cmdline:9199-9217
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/coordsys_mapagent:9231-9254
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geoprocessing:9205-9229
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/ogc:9240-9255
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/utfgrid:9179-9212
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/clean_json:8818-9180
/sandbox/jng/cmdline:9199-9217
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/coordsys_mapagent:9231-9254
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geoprocessing:9205-9229
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/ogc:9240-9255
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/utfgrid:9179-9212
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:9268
Property changes on: sandbox/jng/cmake_v2/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/clean_json/Desktop:8818-9180
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/clean_json/Desktop:8818-9180
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
/trunk/MgDev/Desktop:9268
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -685,6 +685,8 @@
void MgdDataReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::CurrentToStringUtf8"); }
+void MgdDataReader::CurrentToStringUtf8(string& str, MgTransform* xform) { NOT_IMPLEMENTED(L"MgdDataReader::CurrentToStringUtf8"); }
+
void MgdDataReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdDataReader::HeaderToStringUtf8"); }
const wchar_t* MgdDataReader::GetString(CREFSTRING propertyName, INT32& length)
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/DataReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -175,6 +175,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual void Serialize(MgStream* stream);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -169,10 +169,10 @@
void MgdFdoConnectionUtil::PerformTagSubstitution(MgdResourceService* resSvc, REFSTRING str, MgResourceIdentifier* resource, CREFSTRING username, CREFSTRING password)
{
- const int dataTokenPos = str.find(MgResourceTag::DataFilePath);
- const int dataAliasPos = str.find(MgResourceTag::DataPathAliasBegin);
- const int usernamePos = str.find(MgResourceTag::Username);
- const int passwordPos = str.find(MgResourceTag::Password);
+ const STRING::size_type dataTokenPos = str.find(MgResourceTag::DataFilePath);
+ const STRING::size_type dataAliasPos = str.find(MgResourceTag::DataPathAliasBegin);
+ const STRING::size_type usernamePos = str.find(MgResourceTag::Username);
+ const STRING::size_type passwordPos = str.find(MgResourceTag::Password);
if (dataTokenPos != STRING::npos)
{
STRING dataPath = resSvc->ResolveDataPath(resource);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -791,6 +791,11 @@
void MgdFeatureSetReader::CurrentToStringUtf8(string& str)
{
+ CurrentToStringUtf8(str, NULL);
+}
+
+void MgdFeatureSetReader::CurrentToStringUtf8(string& str, MgTransform* xform)
+{
if (NULL != (MgFeatureSet*)m_set)
{
Ptr<MgPropertyCollection> propCol = m_set->GetFeatureAt(m_currRecord-1);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FeatureSetReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -161,6 +161,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual const wchar_t* GetString(INT32 index, INT32& length);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -1266,16 +1266,18 @@
string MgdGwsFeatureReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
-void MgdGwsFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+void MgdGwsFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::ResponseStartUtf8"); }
-void MgdGwsFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+void MgdGwsFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::ResponseEndUtf8"); }
-void MgdGwsFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+void MgdGwsFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::BodyStartUtf8"); }
-void MgdGwsFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::GetResponseElementName"); }
+void MgdGwsFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::BodyEndUtf8"); }
void MgdGwsFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::CurrentToStringUtf8"); }
+void MgdGwsFeatureReader::CurrentToStringUtf8(string& str, MgTransform* xform) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::CurrentToStringUtf8"); }
+
void MgdGwsFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdGwsFeatureReader::HeaderToStringUtf8"); }
//////////////////////////////////////////////////////////////////
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/GwsFeatureReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -490,6 +490,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
//////////////////////////////////////////////////////////////////
/// <summary>
/// Gets the definition of the object currently being read. If the user
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -335,16 +335,18 @@
string MgdProjectedFeatureReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
-void MgdProjectedFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+void MgdProjectedFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::ResponseStartUtf8"); }
-void MgdProjectedFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+void MgdProjectedFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::ResponseEndUtf8"); }
-void MgdProjectedFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+void MgdProjectedFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::BodyStartUtf8"); }
-void MgdProjectedFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::GetResponseElementName"); }
+void MgdProjectedFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::BodyEndUtf8"); }
void MgdProjectedFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::CurrentToStringUtf8"); }
+void MgdProjectedFeatureReader::CurrentToStringUtf8(string& str, MgTransform* xform) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::CurrentToStringUtf8"); }
+
void MgdProjectedFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdProjectedFeatureReader::HeaderToStringUtf8"); }
const wchar_t* MgdProjectedFeatureReader::GetString(CREFSTRING propertyName, INT32& length)
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProjectedFeatureReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -159,6 +159,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual void Serialize(MgStream* stream);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -750,6 +750,11 @@
void MgdProxyDataReader::CurrentToStringUtf8(string& str)
{
+ CurrentToStringUtf8(str, NULL);
+}
+
+void MgdProxyDataReader::CurrentToStringUtf8(string& str, MgTransform* xform)
+{
if (NULL != (MgBatchPropertyCollection*)m_set)
{
Ptr<MgPropertyCollection> propCol = m_set->GetItem(m_currRecord-1);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/ProxyDataReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -596,6 +596,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
//////////////////////////////////////////////////////////////////
/// \brief
/// Gets the string value of the specified property. No conversion is
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -246,4 +246,9 @@
bool MgdRasterHelper::RollbackSavePoint(CREFSTRING transactionId, CREFSTRING savePointName) { NOT_IMPLEMENTED(L"MgdRasterHelper::RollbackSavePoint"); }
//Release a save point
-bool MgdRasterHelper::ReleaseSavePoint(CREFSTRING transactionId, CREFSTRING savePointName) { NOT_IMPLEMENTED(L"MgdRasterHelper::ReleaseSavePoint"); }
\ No newline at end of file
+bool MgdRasterHelper::ReleaseSavePoint(CREFSTRING transactionId, CREFSTRING savePointName) { NOT_IMPLEMENTED(L"MgdRasterHelper::ReleaseSavePoint"); }
+
+MgFeatureReader *MgdRasterHelper::GetWfsReader(MgResourceIdentifier *, CREFSTRING, MgStringCollection *, CREFSTRING, CREFSTRING, CREFSTRING)
+{
+ NOT_IMPLEMENTED(L"MgdRasterHelper::DeleteFeatures");
+}
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/RasterHelper.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -150,6 +150,7 @@
virtual INT32 UpdateMatchingFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ virtual MgFeatureReader* GetWfsReader(MgResourceIdentifier *, CREFSTRING, MgStringCollection *, CREFSTRING, CREFSTRING, CREFSTRING);
INTERNAL_API:
MgdRasterHelper(MgdFeatureReader* reader);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -652,18 +652,20 @@
string MgdFeatureReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
-void MgdFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+void MgdFeatureReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::ResponseStartUtf8"); }
-void MgdFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+void MgdFeatureReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::ResponseEndUtf8"); }
-void MgdFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+void MgdFeatureReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::BodyStartUtf8"); }
-void MgdFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+void MgdFeatureReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::BodyEndUtf8"); }
-void MgdFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+void MgdFeatureReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::HeaderToStringUtf8"); }
-void MgdFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::GetResponseElementName"); }
+void MgdFeatureReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdFeatureReader::CurrentToStringUtf8"); }
+void MgdFeatureReader::CurrentToStringUtf8(string& str, MgTransform* xform) { NOT_IMPLEMENTED(L"MgdFeatureReader::CurrentToStringUtf8"); }
+
const wchar_t* MgdFeatureReader::GetString(CREFSTRING propertyName, INT32& length)
{
CHECKNULL(m_reader, L"MgdFeatureReader::GetString");
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -168,6 +168,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
virtual void Serialize(MgStream* stream);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -2417,4 +2417,9 @@
bool MgdFeatureService::RollbackSavePoint(CREFSTRING transactionId, CREFSTRING savePointName) { NOT_IMPLEMENTED(L"MgdFeatureService::RollbackSavePoint"); }
//Release a save point
-bool MgdFeatureService::ReleaseSavePoint(CREFSTRING transactionId, CREFSTRING savePointName) { NOT_IMPLEMENTED(L"MgdFeatureService::ReleaseSavePoint"); }
\ No newline at end of file
+bool MgdFeatureService::ReleaseSavePoint(CREFSTRING transactionId, CREFSTRING savePointName) { NOT_IMPLEMENTED(L"MgdFeatureService::ReleaseSavePoint"); }
+
+MgFeatureReader *MgdFeatureService::GetWfsReader(MgResourceIdentifier *, CREFSTRING, MgStringCollection *, CREFSTRING, CREFSTRING, CREFSTRING)
+{
+ NOT_IMPLEMENTED(L"MgdFeatureService::GetWfsReader");
+}
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -196,6 +196,8 @@
void UnregisterProvider(CREFSTRING providerName);
+ MgFeatureReader *MgFeatureService::GetWfsReader(MgResourceIdentifier *, CREFSTRING, MgStringCollection *, CREFSTRING, CREFSTRING, CREFSTRING);
+
EXTERNAL_API:
void PurgeCache(MgResourceIdentifier* resource);
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -530,7 +530,7 @@
//string the viewer should be displaying as the name of each
//feature property
// TODO: check to see if name is FeatureClass or Extension name
- RS_FeatureClassInfo fcinfo(vl->GetFeatureName(), vl->GetResourceID());
+ RS_FeatureClassInfo fcinfo(vl->GetFeatureName(), vl->GetResourceID(), vl->GetGeometry());
MdfModel::NameStringPairCollection* pmappings = vl->GetPropertyMappings();
for (int j=0; j<pmappings->GetCount(); j++)
@@ -642,7 +642,7 @@
//string the viewer should be displaying as the name of each
//feature property
// TODO: check to see if name is FeatureClass or Extension name
- RS_FeatureClassInfo fcinfo(gl->GetFeatureName(), gl->GetResourceID());
+ RS_FeatureClassInfo fcinfo(gl->GetFeatureName(), gl->GetResourceID(), gl->GetGeometry());
//check for overridden feature query filter and remember it.
//we will use this when making feature queries
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/RenderingService.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/RenderingService.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/RenderingService.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -2267,7 +2267,7 @@
//string the viewer should be displaying as the name of each
//feature property
// TODO: can FeatureName be an extension name rather than a FeatureClass?
- RS_FeatureClassInfo fcinfo(vl->GetFeatureName(), vl->GetResourceID());
+ RS_FeatureClassInfo fcinfo(vl->GetFeatureName(), vl->GetResourceID(), vl->GetGeometry());
MdfModel::NameStringPairCollection* pmappings = vl->GetPropertyMappings();
for (int i=0; i<pmappings->GetCount(); i++)
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -43,7 +43,7 @@
INT32 MgdResourceContentCache::GetCacheSize()
{
ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, 0));
- return m_resourceContentCacheEntries.size();
+ return (INT32)m_resourceContentCacheEntries.size();
}
void MgdResourceContentCache::Clear()
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -1546,14 +1546,14 @@
//Stash it for future calls
cache->PutContentEntry(resource, resContent);
- Ptr<MgByteSource> source2 = new MgByteSource((BYTE_ARRAY_IN)mbXml.c_str(), mbXml.length());
+ Ptr<MgByteSource> source2 = new MgByteSource((BYTE_ARRAY_IN)mbXml.c_str(), (INT32)mbXml.length());
source2->SetMimeType(MgMimeType::Xml);
content = source2->GetReader();
}
else
{
std::string mbXml = MgUtil::WideCharToMultiByte(resContent);
- Ptr<MgByteSource> source = new MgByteSource((BYTE_ARRAY_IN)mbXml.c_str(), mbXml.length());
+ Ptr<MgByteSource> source = new MgByteSource((BYTE_ARRAY_IN)mbXml.c_str(), (INT32)mbXml.length());
source->SetMimeType(MgMimeType::Xml);
content = source->GetReader();
}
@@ -1619,7 +1619,7 @@
source = NULL;
reader = NULL;
- source = new MgByteSource((BYTE_ARRAY_IN)mbUsername.c_str(), mbUsername.length());
+ source = new MgByteSource((BYTE_ARRAY_IN)mbUsername.c_str(), (INT32)mbUsername.length());
reader = source->GetReader();
}
else
@@ -1637,7 +1637,7 @@
std::string mbXml = MgUtil::WideCharToMultiByte(resContent);
- Ptr<MgByteSource> source2 = new MgByteSource((BYTE_ARRAY_IN)mbXml.c_str(), mbXml.length());
+ Ptr<MgByteSource> source2 = new MgByteSource((BYTE_ARRAY_IN)mbXml.c_str(), (INT32)mbXml.length());
source2->SetMimeType(MgMimeType::Xml);
reader = NULL; //Un-ref the old one
@@ -1793,7 +1793,7 @@
MgCryptographyUtil crypto;
crypto.EncryptCredentials(mgUsername, mgPassword, data);
- Ptr<MgByteSource> bs = new MgByteSource((BYTE_ARRAY_IN)data.c_str(), data.length());
+ Ptr<MgByteSource> bs = new MgByteSource((BYTE_ARRAY_IN)data.c_str(), (INT32)data.length());
Ptr<MgByteReader> br = bs->GetReader();
//Invalidate any cached connections as they may use old credentials
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.cpp 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.cpp 2017-12-26 13:05:45 UTC (rev 9269)
@@ -562,16 +562,18 @@
string MgdSqlDataReader::GetBodyElementName() { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
-void MgdSqlDataReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+void MgdSqlDataReader::ResponseStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::ResponseStartUtf8"); }
-void MgdSqlDataReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+void MgdSqlDataReader::ResponseEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::ResponseEndUtf8"); }
-void MgdSqlDataReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+void MgdSqlDataReader::BodyStartUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::BodyStartUtf8"); }
-void MgdSqlDataReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::GetResponseElementName"); }
+void MgdSqlDataReader::BodyEndUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::BodyEndUtf8"); }
void MgdSqlDataReader::CurrentToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::CurrentToStringUtf8"); }
+void MgdSqlDataReader::CurrentToStringUtf8(string& str, MgTransform* xform) { NOT_IMPLEMENTED(L"MgdSqlDataReader::CurrentToStringUtf8"); }
+
void MgdSqlDataReader::HeaderToStringUtf8(string& str) { NOT_IMPLEMENTED(L"MgdSqlDataReader::HeaderToStringUtf8"); }
MgByteReader* MgdSqlDataReader::GetLOB(CREFSTRING propertyName)
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.h 2017-12-26 12:57:14 UTC (rev 9268)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/SqlReader.h 2017-12-26 13:05:45 UTC (rev 9269)
@@ -174,6 +174,8 @@
///
virtual void CurrentToStringUtf8(string& str);
+ virtual void CurrentToStringUtf8(string& str, MgTransform* xform);
+
MgByteReader* GetLOB(CREFSTRING propertyName);
virtual const wchar_t* GetString(CREFSTRING propertyName, INT32& length);
More information about the mapguide-commits
mailing list