[mapguide-commits] r8218 - in sandbox/jng/v30: Common/PlatformBase Common/PlatformBase/Services Desktop/DesktopUnmanagedApi/JavaApiEx Desktop/DesktopUnmanagedApi/MapGuideApi Desktop/MapViewer Desktop/Samples/AdvancedSample Desktop/Samples/SampleExtension Desktop/UnitTest Doc/devguide/source Doc/samples/dotnetsamples/analyzing_features Doc/samples/dotnetsamples/digitizing_features Doc/samples/dotnetsamples/modifying_maps_and_layers Doc/samples/dotnetviewersample/findaddress Doc/samples/dotnetviewersample/query/classes Doc/samples/javaviewersample/findaddress Doc/samples/javaviewersample/query/classes Doc/samples/phpsamples/analyzing_features Doc/samples/phpsamples/digitizing_features Doc/samples/phpsamples/modifying_maps_and_layers Doc/samples/phpviewersample/findaddress Doc/samples/phpviewersample/query/classes Server/src/UnitTesting Web/src/DotNetUnmanagedApi/PlatformBase Web/src/JavaApi Web/src/JavaApiEx Web/src/MapGuideApi Web/src/PhpApi Web/src/mapviewerjava Web/src/mapviewernet We b/src/mapviewerphp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jun 14 12:39:39 PDT 2014
Author: jng
Date: 2014-06-14 12:39:39 -0700 (Sat, 14 Jun 2014)
New Revision: 8218
Removed:
sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.cpp
sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.h
Modified:
sandbox/jng/v30/Common/PlatformBase/Makefile.am
sandbox/jng/v30/Common/PlatformBase/PlatformBase.h
sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj
sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj.filters
sandbox/jng/v30/Common/PlatformBase/PlatformBaseBuild.cpp
sandbox/jng/v30/Common/PlatformBase/Services/FeatureService.h
sandbox/jng/v30/Common/PlatformBase/Services/FeatureSourceParams.h
sandbox/jng/v30/Common/PlatformBase/Services/PlatformBaseClassId.h
sandbox/jng/v30/Common/PlatformBase/Services/ServiceRegistry.cpp
sandbox/jng/v30/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
sandbox/jng/v30/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml
sandbox/jng/v30/Desktop/MapViewer/MgMapViewer.cs
sandbox/jng/v30/Desktop/Samples/AdvancedSample/MainForm.cs
sandbox/jng/v30/Desktop/Samples/SampleExtension/BufferHelper.cs
sandbox/jng/v30/Desktop/Samples/SampleExtension/DigitizingAndRedlining.cs
sandbox/jng/v30/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs
sandbox/jng/v30/Desktop/UnitTest/TestFeatureService.cpp
sandbox/jng/v30/Doc/devguide/source/analyzing_features.rst
sandbox/jng/v30/Doc/devguide/source/digitizing_and_redlining.rst
sandbox/jng/v30/Doc/samples/dotnetsamples/analyzing_features/bufferfunctions.aspx
sandbox/jng/v30/Doc/samples/dotnetsamples/digitizing_features/draw_line.aspx
sandbox/jng/v30/Doc/samples/dotnetsamples/modifying_maps_and_layers/create_new_point_layer_definition.aspx
sandbox/jng/v30/Doc/samples/dotnetviewersample/findaddress/findaddressfunctions.aspx
sandbox/jng/v30/Doc/samples/dotnetviewersample/query/classes/query.aspx
sandbox/jng/v30/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp
sandbox/jng/v30/Doc/samples/javaviewersample/query/classes/query.jsp
sandbox/jng/v30/Doc/samples/phpsamples/analyzing_features/bufferfunctions.php
sandbox/jng/v30/Doc/samples/phpsamples/digitizing_features/draw_line.php
sandbox/jng/v30/Doc/samples/phpsamples/modifying_maps_and_layers/create_new_point_layer_definition.php
sandbox/jng/v30/Doc/samples/phpviewersample/findaddress/findaddressfunctions.php
sandbox/jng/v30/Doc/samples/phpviewersample/query/classes/query.php
sandbox/jng/v30/Server/src/UnitTesting/TestFeatureService.cpp
sandbox/jng/v30/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
sandbox/jng/v30/Web/src/JavaApi/Makefile.am
sandbox/jng/v30/Web/src/JavaApiEx/Makefile.am
sandbox/jng/v30/Web/src/MapGuideApi/MapGuideApiGen.xml
sandbox/jng/v30/Web/src/PhpApi/Makefile.am
sandbox/jng/v30/Web/src/mapviewerjava/buffer.jsp
sandbox/jng/v30/Web/src/mapviewerjava/measure.jsp
sandbox/jng/v30/Web/src/mapviewernet/buffer.aspx
sandbox/jng/v30/Web/src/mapviewernet/measure.aspx
sandbox/jng/v30/Web/src/mapviewerphp/buffer.php
sandbox/jng/v30/Web/src/mapviewerphp/measure.php
Log:
First on the deprecated API hit-list: MgCreateSdfParams.
- Remove class from PlatformBase project
- Remove all references to CreateSdfParams.cpp and CreateSdfParams.h
- Replace all references to MgCreateSdfParams with MgFileFeatureSourceParams
Modified: sandbox/jng/v30/Common/PlatformBase/Makefile.am
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Makefile.am 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Makefile.am 2014-06-14 19:39:39 UTC (rev 8218)
@@ -62,7 +62,6 @@
Services/BaseServiceDefs.cpp \
Services/ClassDefinition.cpp \
Services/ClassDefinitionCollection.cpp \
- Services/CreateSdfParams.cpp \
Services/DataPropertyDefinition.cpp \
Services/DataReader.cpp \
Services/DeleteFeatures.cpp \
@@ -175,7 +174,6 @@
Services/BaseServiceDefs.h \
Services/ClassDefinition.h \
Services/ClassDefinitionCollection.h \
- Services/CreateSdfParams.h \
Services/DataPropertyDefinition.h \
Services/DataReader.h \
Services/DeleteFeatures.h \
Modified: sandbox/jng/v30/Common/PlatformBase/PlatformBase.h
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/PlatformBase.h 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/PlatformBase.h 2014-06-14 19:39:39 UTC (rev 8218)
@@ -100,7 +100,6 @@
#include "Services/ClassDefinition.h"
#include "Services/ClassDefinitionCollection.h"
#include "Services/FileFeatureSourceParams.h"
-#include "Services/CreateSdfParams.h"
#include "Services/DataPropertyDefinition.h"
#include "Services/DataReader.h"
#include "Services/DeleteFeatures.h"
Modified: sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj 2014-06-14 19:39:39 UTC (rev 8218)
@@ -466,12 +466,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="Services\CreateSdfParams.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="Services\DataPropertyDefinition.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -901,7 +895,6 @@
<ClInclude Include="Services\BaseServiceDefs.h" />
<ClInclude Include="Services\ClassDefinition.h" />
<ClInclude Include="Services\ClassDefinitionCollection.h" />
- <ClInclude Include="Services\CreateSdfParams.h" />
<ClInclude Include="Services\DataPropertyDefinition.h" />
<ClInclude Include="Services\DataReader.h" />
<ClInclude Include="Services\DeleteFeatures.h" />
Modified: sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj.filters
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj.filters 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/PlatformBase.vcxproj.filters 2014-06-14 19:39:39 UTC (rev 8218)
@@ -159,9 +159,6 @@
<ClCompile Include="Services\ClassDefinitionCollection.cpp">
<Filter>Services</Filter>
</ClCompile>
- <ClCompile Include="Services\CreateSdfParams.cpp">
- <Filter>Services</Filter>
- </ClCompile>
<ClCompile Include="Services\DataPropertyDefinition.cpp">
<Filter>Services</Filter>
</ClCompile>
@@ -498,9 +495,6 @@
<ClInclude Include="Services\ClassDefinitionCollection.h">
<Filter>Services</Filter>
</ClInclude>
- <ClInclude Include="Services\CreateSdfParams.h">
- <Filter>Services</Filter>
- </ClInclude>
<ClInclude Include="Services\DataPropertyDefinition.h">
<Filter>Services</Filter>
</ClInclude>
Modified: sandbox/jng/v30/Common/PlatformBase/PlatformBaseBuild.cpp
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/PlatformBaseBuild.cpp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/PlatformBaseBuild.cpp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -73,7 +73,6 @@
#include "Services/BaseServiceDefs.cpp"
#include "Services/ClassDefinition.cpp"
#include "Services/ClassDefinitionCollection.cpp"
-#include "Services/CreateSdfParams.cpp"
#include "Services/DataPropertyDefinition.cpp"
#include "Services/DataReader.cpp"
#include "Services/DeleteFeatures.cpp"
Deleted: sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.cpp
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.cpp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.cpp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -1,55 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "PlatformBase.h"
-
-#define SDF_PROVIDER_NAME L"OSGeo.SDF"
-
-MG_IMPL_DYNCREATE(MgCreateSdfParams);
-
-
-MgCreateSdfParams::MgCreateSdfParams()
-:
-MgFileFeatureSourceParams(SDF_PROVIDER_NAME)
-{
-}
-
-MgCreateSdfParams::MgCreateSdfParams(CREFSTRING spatialContextName, CREFSTRING srsWkt, MgFeatureSchema* featureSchema)
-:
-MgFileFeatureSourceParams(SDF_PROVIDER_NAME, spatialContextName, srsWkt, featureSchema)
-{
-}
-
-MgCreateSdfParams::~MgCreateSdfParams()
-{
-}
-
-void MgCreateSdfParams::SetProviderName(CREFSTRING name)
-{
- throw new MgInvalidOperationException(L"MgCreateSdfParams.SetProviderName",
- __LINE__, __WFILE__, NULL, L"", NULL);
-}
-
-INT32 MgCreateSdfParams::GetClassId()
-{
- return m_cls_id;
-}
-
-void MgCreateSdfParams::Dispose()
-{
- delete this;
-}
Deleted: sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.h
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.h 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Services/CreateSdfParams.h 2014-06-14 19:39:39 UTC (rev 8218)
@@ -1,158 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef _MG_CREATE_SDF_PARAMS_H
-#define _MG_CREATE_SDF_PARAMS_H
-
-/// \defgroup MgCreateSdfParams MgCreateSdfParams
-/// \ingroup Feature_Service_classes
-/// \{
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Contains the parameters used to create an SDF feature source.
-///
-/// \deprecated
-/// This is a deprecated class. Please use MgFileFeatureSourceParams
-/// to create the parameters used to an SDF feature source.
-///
-/// \remarks
-/// Use MgFeatureService::DescribeSchema and
-/// MgFeatureService::GetSpatialContexts to get the values needed
-/// to construct and configure the MgCreateSdfParams object.
-///
-/// <!-- Example (PHP) -->
-/// \htmlinclude PHPExampleTop.html
-/// \code
-/// $schemaCollection = $featureService->DescribeSchema($activeFeatSrcResId, $schemaName, NULL);
-/// $schema = $schemaCollection->GetItem(0);
-/// $activeOnly = true;
-/// $activeSpatialContextReader = $featureService->GetSpatialContexts($activeFeatSrcResId, $activeOnly);
-/// $activeSpatialContextReader->ReadNext();
-/// $spatialContextName = $activeSpatialContextReader->GetName();
-/// $coordSysWkt = $activeSpatialContextReader->GetCoordinateSystemWkt();
-/// $createSdfParams = new MgCreateSdfParams($spatialContextName, $coordSysWkt, $schema);
-/// $createSdfParams->SetSpatialContextDescription($activeSpatialContextReader->GetDescription());
-/// $createSdfParams->SetXYTolerance($activeSpatialContextReader->GetXYTolerance());
-/// $createSdfParams->SetZTolerance($activeSpatialContextReader->GetZTolerance());
-/// \endcode
-/// \htmlinclude ExampleBottom.html
-///
-class MG_PLATFORMBASE_API MgCreateSdfParams : public MgFileFeatureSourceParams
-{
- MG_DECL_DYNCREATE();
- DECLARE_CLASSNAME(MgCreateSdfParams)
-
-PUBLISHED_API:
- //////////////////////////////////////////////////
- /// \brief
- /// Constructs an empty MgCreateSdfParams object.
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// MgCreateSdfParams();
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// MgCreateSdfParams();
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// MgCreateSdfParams();
- /// \htmlinclude SyntaxBottom.html
- ///
- MgCreateSdfParams();
-
- /////////////////////////////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Constructs an MgCreateSdfParams object with the supplied
- /// parameters.
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// MgCreateSdfParams(string spatialContextName, string srsWkt, MgFeatureSchema featureSchema);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// MgCreateSdfParams(String spatialContextName, String srsWkt, MgFeatureSchema featureSchema);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// MgCreateSdfParams(string spatialContextName, string srsWkt, MgFeatureSchema featureSchema);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param spatialContextName (String/string)
- /// The name of the spatial context. This is
- /// a user defined spatial context for the
- /// SDF file. Only one spatial context is
- /// supported.
- /// \param srsWkt (String/string)
- /// An OGC WKT string representing the
- /// coordinate system for the SDF file.
- /// \param featureSchema (MgFeatureSchema)
- /// The schema definition for the SDF file.
- ///
- /// \return
- /// Returns nothing.
- ///
- MgCreateSdfParams(CREFSTRING spatialContextName, CREFSTRING srsWkt, MgFeatureSchema* featureSchema);
-
- ///////////////////////////////////////////////
- /// \brief
- /// Always throws an MgInvalidOperationException instance because we
- /// can't change FDO provider for MgCreateSdfParams.
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// string SetProviderName(string name);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// String SetProviderName(String name);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// string SetProviderName(string name);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param name (String/string)
- /// The FDO provider name of the feature source.
- ///
- /// \return
- /// Returns nothing.
- ///
- virtual void SetProviderName(CREFSTRING name);
-
-protected:
-
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Self destructing method.
- ///
- virtual void Dispose();
-
- virtual ~MgCreateSdfParams();
-
-CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_CreateSdfParams;
-};
-/// \}
-
-#endif
Modified: sandbox/jng/v30/Common/PlatformBase/Services/FeatureService.h
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Services/FeatureService.h 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Services/FeatureService.h 2014-06-14 19:39:39 UTC (rev 8218)
@@ -52,7 +52,6 @@
#include "FeatureSchemaCollection.h"
#include "ClassDefinitionCollection.h"
#include "FeatureSourceParams.h"
-#include "CreateSdfParams.h"
#include "GwsFeatureReader.h"
class MgIntCollection;
@@ -1493,9 +1492,8 @@
/// \note1
///
/// \remarks
- /// MgFeatureSourceParams is an abstract class. Currently there
- /// are two concrete classes MgFileFeatureSourceParams and
- /// MgCreateSdfParams and SDF, SHP and SQLite feature source can
+ /// MgFeatureSourceParams is an abstract class. MgFileFeatureSourceParams is the only
+ /// concrete class and SDF, SHP and SQLite feature source can
/// be created only. If no well-know text format coordinate
/// system is specified in argument sourceParams, this method
/// will not create spatial context for the feature source. For
Modified: sandbox/jng/v30/Common/PlatformBase/Services/FeatureSourceParams.h
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Services/FeatureSourceParams.h 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Services/FeatureSourceParams.h 2014-06-14 19:39:39 UTC (rev 8218)
@@ -28,8 +28,7 @@
/// with MgFeatureSource::CreateFeatureSource. This class cannot
/// be instantiated directly.
/// \remarks
-/// Currently there are two concrete classes: MgCreateSdfParams
-/// and MgFileFeatureSourceParams.
+/// There is only one concrete class: MgFileFeatureSourceParams
///
class MG_PLATFORMBASE_API MgFeatureSourceParams : public MgSerializable
{
Modified: sandbox/jng/v30/Common/PlatformBase/Services/PlatformBaseClassId.h
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Services/PlatformBaseClassId.h 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Services/PlatformBaseClassId.h 2014-06-14 19:39:39 UTC (rev 8218)
@@ -133,7 +133,6 @@
#define PlatformBase_FeatureService_FeatureSchema PLATFORMBASE_FEATURESERVICE_ID+28
#define PlatformBase_FeatureService_FeatureSchemaCollection PLATFORMBASE_FEATURESERVICE_ID+29
#define PlatformBase_FeatureService_ClassDefinitionCollection PLATFORMBASE_FEATURESERVICE_ID+30
-#define PlatformBase_FeatureService_CreateSdfParams PLATFORMBASE_FEATURESERVICE_ID+31
#define PlatformBase_FeatureService_GwsFeatureReader PLATFORMBASE_FEATURESERVICE_ID+32
#define PlatformBase_FeatureService_LockFeatures PLATFORMBASE_FEATURESERVICE_ID+33
#define PlatformBase_FeatureService_UnlockFeatures PLATFORMBASE_FEATURESERVICE_ID+34
Modified: sandbox/jng/v30/Common/PlatformBase/Services/ServiceRegistry.cpp
===================================================================
--- sandbox/jng/v30/Common/PlatformBase/Services/ServiceRegistry.cpp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Common/PlatformBase/Services/ServiceRegistry.cpp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -153,7 +153,6 @@
fact->Register(PlatformBase_FeatureService_FeatureSchema, MgFeatureSchema::CreateObject);
fact->Register(PlatformBase_FeatureService_FeatureSchemaCollection, MgFeatureSchemaCollection::CreateObject);
fact->Register(PlatformBase_FeatureService_ClassDefinitionCollection, MgClassDefinitionCollection::CreateObject);
- fact->Register(PlatformBase_FeatureService_CreateSdfParams, MgCreateSdfParams::CreateObject);
fact->Register(PlatformBase_FeatureService_FileFeatureSourceParams, MgFileFeatureSourceParams::CreateObject);
fact->Register(PlatformBase_ResourceService_ResourceIdentifier, MgResourceIdentifier::CreateObject);
Modified: sandbox/jng/v30/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/v30/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2014-06-14 19:39:39 UTC (rev 8218)
@@ -246,7 +246,7 @@
../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformationMethod.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h \
../../../Common/PlatformBase/Data/BlobProperty.h \
../../../Common/PlatformBase/Data/BooleanProperty.h \
@@ -293,7 +293,6 @@
../../../Common/PlatformBase/Services/ClassDefinition.h \
../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
- ../../../Common/PlatformBase/Services/CreateSdfParams.h \
../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
../../../Common/PlatformBase/Services/DataReader.h \
../../../Common/PlatformBase/Services/DeleteFeatures.h \
Modified: sandbox/jng/v30/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- sandbox/jng/v30/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml 2014-06-14 19:39:39 UTC (rev 8218)
@@ -303,7 +303,6 @@
<Header path="../../../Common/PlatformBase/Services/ClassDefinition.h" />
<Header path="../../../Common/PlatformBase/Services/ClassDefinitionCollection.h" />
<Header path="../../../Common/PlatformBase/Services/FileFeatureSourceParams.h" />
- <Header path="../../../Common/PlatformBase/Services/CreateSdfParams.h" />
<Header path="../../../Common/PlatformBase/Services/DataPropertyDefinition.h" />
<Header path="../../../Common/PlatformBase/Services/DataReader.h" />
<Header path="../../../Common/PlatformBase/Services/DeleteFeatures.h" />
Modified: sandbox/jng/v30/Desktop/MapViewer/MgMapViewer.cs
===================================================================
--- sandbox/jng/v30/Desktop/MapViewer/MgMapViewer.cs 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/MapViewer/MgMapViewer.cs 2014-06-14 19:39:39 UTC (rev 8218)
@@ -118,7 +118,7 @@
var sessionId = Guid.NewGuid().ToString();
var debugFsId = new MgResourceIdentifier("Session:" + sessionId + "//Debug" + Guid.NewGuid().ToString() + ".FeatureSource"); //NOXLATE
- var createSdf = new MgCreateSdfParams("MapCs", _map.GetMapSRS(), schema); //NOXLATE
+ var createSdf = new MgFileFeatureSourceParams("OSGeo.SDF", "MapCs", _map.GetMapSRS(), schema); //NOXLATE
var featureSvc = (MgdFeatureService)fact.CreateService(MgServiceType.FeatureService);
var resSvc = (MgResourceService)fact.CreateService(MgServiceType.ResourceService);
featureSvc.CreateFeatureSource(debugFsId, createSdf);
Modified: sandbox/jng/v30/Desktop/Samples/AdvancedSample/MainForm.cs
===================================================================
--- sandbox/jng/v30/Desktop/Samples/AdvancedSample/MainForm.cs 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/Samples/AdvancedSample/MainForm.cs 2014-06-14 19:39:39 UTC (rev 8218)
@@ -251,7 +251,7 @@
//Create the feature source with this schema. We use the map's
//coordinate system for the feature source to ensure features
//that we create, will line up with the map
- MgCreateSdfParams create = new MgCreateSdfParams("Default", map.GetMapSRS(), schema);
+ MgFileFeatureSourceParams create = new MgFileFeatureSourceParams("OSGeo.SDF", "Default", map.GetMapSRS(), schema);
featSvc.CreateFeatureSource(fsId, create);
//Then create the layer definition. RedlineLayer.xml contains the template
Modified: sandbox/jng/v30/Desktop/Samples/SampleExtension/BufferHelper.cs
===================================================================
--- sandbox/jng/v30/Desktop/Samples/SampleExtension/BufferHelper.cs 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/Samples/SampleExtension/BufferHelper.cs 2014-06-14 19:39:39 UTC (rev 8218)
@@ -38,7 +38,7 @@
MgFeatureSchema bufferSchema = new MgFeatureSchema("BufferLayerSchema", "temporary schema to hold a buffer");
bufferSchema.GetClasses().Add(bufferClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, bufferSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, bufferSchema);
featureService.CreateFeatureSource(bufferFeatureResId, sdfParams);
}
@@ -121,7 +121,7 @@
MgFeatureSchema parcelSchema = new MgFeatureSchema("ParcelLayerSchema", "temporary schema to hold parcel markers");
parcelSchema.GetClasses().Add(parcelClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, parcelSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, parcelSchema);
featureService.CreateFeatureSource(parcelMarkerDataResId, sdfParams);
}
Modified: sandbox/jng/v30/Desktop/Samples/SampleExtension/DigitizingAndRedlining.cs
===================================================================
--- sandbox/jng/v30/Desktop/Samples/SampleExtension/DigitizingAndRedlining.cs 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/Samples/SampleExtension/DigitizingAndRedlining.cs 2014-06-14 19:39:39 UTC (rev 8218)
@@ -108,7 +108,7 @@
classes.Add(cls);
//Create the feature source
- MgCreateSdfParams create = new MgCreateSdfParams("Default", map.GetMapSRS(), schema);
+ MgFileFeatureSourceParams create = new MgFileFeatureSourceParams("OSGeo.SDF", "Default", map.GetMapSRS(), schema);
featSvc.CreateFeatureSource(fsId, create);
//Then the layer definition
Modified: sandbox/jng/v30/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs
===================================================================
--- sandbox/jng/v30/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs 2014-06-14 19:39:39 UTC (rev 8218)
@@ -399,7 +399,7 @@
MgResourceIdentifier resourceIdentifier = new MgResourceIdentifier(featureSourceName);
//wkt = "LOCALCS[\"*XY-MT*\",LOCAL_DATUM[\"*X-Y*\",10000],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]";
String wkt = "GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137.000,298.25722293]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.01745329251994]]";
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("LatLong", wkt, featureSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", wkt, featureSchema);
featureService.CreateFeatureSource(resourceIdentifier, sdfParams);
// We need to add some data to the sdf before using it. The spatial context
Modified: sandbox/jng/v30/Desktop/UnitTest/TestFeatureService.cpp
===================================================================
--- sandbox/jng/v30/Desktop/UnitTest/TestFeatureService.cpp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Desktop/UnitTest/TestFeatureService.cpp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -1268,7 +1268,7 @@
Ptr<MgGeometryFactory> geomFact = new MgGeometryFactory();
Ptr<MgAgfReaderWriter> agfRw = new MgAgfReaderWriter();
- Ptr<MgCreateSdfParams> create = new MgCreateSdfParams(L"Default", srcWkt, fs);
+ Ptr<MgFileFeatureSourceParams> create = new MgFileFeatureSourceParams(L"OSGeo.SDF", L"Default", srcWkt, fs);
Ptr<MgResourceIdentifier> fsId = new MgResourceIdentifier(L"Library://UnitTests/Data/TransformTest.FeatureSource");
pService->CreateFeatureSource(fsId, create);
@@ -1655,7 +1655,7 @@
if (pResSvc->ResourceExists(fsId))
pResSvc->DeleteResource(fsId);
- Ptr<MgCreateSdfParams> create = new MgCreateSdfParams(L"Default", wkt, fs);
+ Ptr<MgFileFeatureSourceParams> create = new MgFileFeatureSourceParams(L"OSGeo.SDF", L"Default", wkt, fs);
pService->CreateFeatureSource(fsId, create);
Ptr<MgAgfReaderWriter> agfRW = new MgAgfReaderWriter();
@@ -3092,13 +3092,6 @@
Ptr<MgClassDefinitionCollection> schemaClasses = schema->GetClasses();
schemaClasses->Add(classDef);
- // Create SDF feature source using class MgCreateSdfParams
- Ptr<MgCreateSdfParams> params1 = new MgCreateSdfParams(L"ArbitraryXY", wkt, schema);
- Ptr<MgResourceIdentifier> resource1 = new MgResourceIdentifier(L"Library://UnitTests/Data/CreateFeatureSourceTest1.FeatureSource");
- pService->CreateFeatureSource(resource1, params1);
- // Delete the resource
- pResourceService->DeleteResource(resource1);
-
// Create SDF feature source using class MgFeatureSourceParams
Ptr<MgFileFeatureSourceParams> params2 = new MgFileFeatureSourceParams(L"OSGeo.SDF", L"ArbitraryXY", wkt, schema);
Ptr<MgResourceIdentifier> resource2 = new MgResourceIdentifier(L"Library://UnitTests/Data/CreateFeatureSourceTest2.FeatureSource");
Modified: sandbox/jng/v30/Doc/devguide/source/analyzing_features.rst
===================================================================
--- sandbox/jng/v30/Doc/devguide/source/analyzing_features.rst 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/devguide/source/analyzing_features.rst 2014-06-14 19:39:39 UTC (rev 8218)
@@ -443,7 +443,7 @@
$bufferClass->SetDefaultGeometryPropertyName('BufferGeometry');
$bufferSchema = new MgFeatureSchema('BufferLayerSchema', 'temporary schema to hold a buffer');
$bufferSchema->GetClasses()->Add($bufferClass);
- $sdfParams = new MgCreateSdfParams('defaultSrs', $wkt, $bufferSchema);
+ $sdfParams = new MgFileFeatureSourceParams('OSGeo.SDF', 'defaultSrs', $wkt, $bufferSchema);
$featureService->CreateFeatureSource($bufferFeatureResId, $sdfParams);
**.net (C#)**
@@ -477,7 +477,7 @@
bufferClass.SetDefaultGeometryPropertyName("BufferGeometry");
MgFeatureSchema bufferSchema = new MgFeatureSchema("BufferLayerSchema", "temporary schema to hold a buffer");
bufferSchema.GetClasses().Add(bufferClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, bufferSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, bufferSchema);
featureService.CreateFeatureSource(bufferFeatureResId, sdfParams);
**Java**
@@ -511,7 +511,7 @@
bufferClass.SetDefaultGeometryPropertyName("BufferGeometry");
MgFeatureSchema bufferSchema = new MgFeatureSchema("BufferLayerSchema", "temporary schema to hold a buffer");
bufferSchema.GetClasses().Add(bufferClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, bufferSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, bufferSchema);
featureService.CreateFeatureSource(bufferFeatureResId, sdfParams);
To display features from a temporary feature source in a map, create a layer
@@ -1140,7 +1140,7 @@
$bufferClass->SetDefaultGeometryPropertyName('BufferGeometry');
$bufferSchema = new MgFeatureSchema('BufferLayerSchema', 'temporary schema to hold a buffer');
$bufferSchema->GetClasses()->Add($bufferClass);
- $sdfParams = new MgCreateSdfParams('defaultSrs', $wkt, $bufferSchema);
+ $sdfParams = new MgFileFeatureSourceParams('OSGeo.SDF', 'defaultSrs', $wkt, $bufferSchema);
$featureService->CreateFeatureSource($bufferFeatureResId, $sdfParams);
}
@@ -1222,7 +1222,7 @@
MgFeatureSchema bufferSchema = new MgFeatureSchema("BufferLayerSchema", "temporary schema to hold a buffer");
bufferSchema.GetClasses().Add(bufferClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, bufferSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, bufferSchema);
featureService.CreateFeatureSource(bufferFeatureResId, sdfParams);
}
Modified: sandbox/jng/v30/Doc/devguide/source/digitizing_and_redlining.rst
===================================================================
--- sandbox/jng/v30/Doc/devguide/source/digitizing_and_redlining.rst 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/devguide/source/digitizing_and_redlining.rst 2014-06-14 19:39:39 UTC (rev 8218)
@@ -159,7 +159,7 @@
// Create the feature source
$wkt = $map->GetMapSRS();
- $sdfParams = new MgCreateSdfParams("spatial context", $wkt, $featureSchema);
+ $sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "spatial context", $wkt, $featureSchema);
$featureService->CreateFeatureSource($resourceIdentifier, $sdfParams);
**.net (C#)**
@@ -207,7 +207,7 @@
// Create the feature source
String wkt = map.GetMapSRS();
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("spatial context", wkt, featureSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "spatial context", wkt, featureSchema);
featureService.CreateFeatureSource(resourceIdentifier, sdfParams);
**Java**
@@ -255,7 +255,7 @@
// Create the feature source
String wkt = map.GetMapSRS();
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("spatial context", wkt, featureSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "spatial context", wkt, featureSchema);
featureService.CreateFeatureSource(resourceIdentifier, sdfParams);
.. index::
Modified: sandbox/jng/v30/Doc/samples/dotnetsamples/analyzing_features/bufferfunctions.aspx
===================================================================
--- sandbox/jng/v30/Doc/samples/dotnetsamples/analyzing_features/bufferfunctions.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/dotnetsamples/analyzing_features/bufferfunctions.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -59,7 +59,7 @@
MgFeatureSchema bufferSchema = new MgFeatureSchema("BufferLayerSchema", "temporary schema to hold a buffer");
bufferSchema.GetClasses().Add(bufferClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, bufferSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, bufferSchema);
featureService.CreateFeatureSource(bufferFeatureResId, sdfParams);
}
@@ -142,7 +142,7 @@
MgFeatureSchema parcelSchema = new MgFeatureSchema("ParcelLayerSchema", "temporary schema to hold parcel markers");
parcelSchema.GetClasses().Add(parcelClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("defaultSrs", wkt, parcelSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "defaultSrs", wkt, parcelSchema);
featureService.CreateFeatureSource(parcelMarkerDataResId, sdfParams);
}
Modified: sandbox/jng/v30/Doc/samples/dotnetsamples/digitizing_features/draw_line.aspx
===================================================================
--- sandbox/jng/v30/Doc/samples/dotnetsamples/digitizing_features/draw_line.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/dotnetsamples/digitizing_features/draw_line.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -162,7 +162,7 @@
// Create the feature source
String wkt = map.GetMapSRS();
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("spatial context", wkt, featureSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "spatial context", wkt, featureSchema);
featureService.CreateFeatureSource(resourceIdentifier, sdfParams);
}
Modified: sandbox/jng/v30/Doc/samples/dotnetsamples/modifying_maps_and_layers/create_new_point_layer_definition.aspx
===================================================================
--- sandbox/jng/v30/Doc/samples/dotnetsamples/modifying_maps_and_layers/create_new_point_layer_definition.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/dotnetsamples/modifying_maps_and_layers/create_new_point_layer_definition.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -126,7 +126,7 @@
MgResourceIdentifier resourceIdentifier = new MgResourceIdentifier(featureSourceName);
//wkt = "LOCALCS[\"*XY-MT*\",LOCAL_DATUM[\"*X-Y*\",10000],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]";
String wkt = "GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137.000,298.25722293]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.01745329251994]]";
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("LatLong", wkt, featureSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", wkt, featureSchema);
featureService.CreateFeatureSource(resourceIdentifier, sdfParams);
// We need to add some data to the sdf before using it. The spatial context
Modified: sandbox/jng/v30/Doc/samples/dotnetviewersample/findaddress/findaddressfunctions.aspx
===================================================================
--- sandbox/jng/v30/Doc/samples/dotnetviewersample/findaddress/findaddressfunctions.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/dotnetviewersample/findaddress/findaddressfunctions.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -97,7 +97,7 @@
addressSchema.SetName("AddressMarkerSchema");
addressSchema.GetClasses().Add(addressClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("LL84", ll84Wkt, addressSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LL84", ll84Wkt, addressSchema);
featureService.CreateFeatureSource(addressMarkerDataResId, sdfParams);
}
Modified: sandbox/jng/v30/Doc/samples/dotnetviewersample/query/classes/query.aspx
===================================================================
--- sandbox/jng/v30/Doc/samples/dotnetviewersample/query/classes/query.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/dotnetviewersample/query/classes/query.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -161,7 +161,7 @@
// Create the Feature Source (SDF)
MgFeatureSchema sdfSchema = this.CreateFilterSchema();
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("MAPCS", map.GetMapSRS(), sdfSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "MAPCS", map.GetMapSRS(), sdfSchema);
featureService.CreateFeatureSource(sdfResId, sdfParams);
// Create the Layer
Modified: sandbox/jng/v30/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp
===================================================================
--- sandbox/jng/v30/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -112,7 +112,7 @@
addressSchema.SetName("AddressMarkerSchema");
addressSchema.GetClasses().Add(addressClass);
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("LL84", ll84Wkt, addressSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LL84", ll84Wkt, addressSchema);
featureService.CreateFeatureSource(addressMarkerDataResId, sdfParams);
}
Modified: sandbox/jng/v30/Doc/samples/javaviewersample/query/classes/query.jsp
===================================================================
--- sandbox/jng/v30/Doc/samples/javaviewersample/query/classes/query.jsp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/javaviewersample/query/classes/query.jsp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -165,7 +165,7 @@
// Create the Feature Source (SDF)
MgFeatureSchema sdfSchema = this.CreateFilterSchema();
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("MAPCS", map.GetMapSRS(), sdfSchema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "MAPCS", map.GetMapSRS(), sdfSchema);
featureService.CreateFeatureSource(sdfResId, sdfParams);
// Create the Layer
Modified: sandbox/jng/v30/Doc/samples/phpsamples/analyzing_features/bufferfunctions.php
===================================================================
--- sandbox/jng/v30/Doc/samples/phpsamples/analyzing_features/bufferfunctions.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/phpsamples/analyzing_features/bufferfunctions.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -44,7 +44,7 @@
$bufferSchema = new MgFeatureSchema('BufferLayerSchema', 'temporary schema to hold a buffer');
$bufferSchema->GetClasses()->Add($bufferClass);
- $sdfParams = new MgCreateSdfParams('defaultSrs', $wkt, $bufferSchema);
+ $sdfParams = new MgFileFeatureSourceParams('OSGeo.SDF', 'defaultSrs', $wkt, $bufferSchema);
$featureService->CreateFeatureSource($bufferFeatureResId, $sdfParams);
}
@@ -113,7 +113,7 @@
$parcelSchema = new MgFeatureSchema('ParcelLayerSchema', 'temporary schema to hold parcel markers');
$parcelSchema->GetClasses()->Add($parcelClass);
- $sdfParams = new MgCreateSdfParams('defaultSrs', $wkt, $parcelSchema);
+ $sdfParams = new MgFileFeatureSourceParams('OSGeo.SDF', 'defaultSrs', $wkt, $parcelSchema);
$featureService->CreateFeatureSource($parcelMarkerDataResId, $sdfParams);
}
Modified: sandbox/jng/v30/Doc/samples/phpsamples/digitizing_features/draw_line.php
===================================================================
--- sandbox/jng/v30/Doc/samples/phpsamples/digitizing_features/draw_line.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/phpsamples/digitizing_features/draw_line.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -129,7 +129,7 @@
// Create the feature source
$wkt = $map->GetMapSRS();
- $sdfParams = new MgCreateSdfParams("spatial context",
+ $sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "spatial context",
$wkt, $featureSchema);
$featureService->CreateFeatureSource($resourceIdentifier,
$sdfParams);
Modified: sandbox/jng/v30/Doc/samples/phpsamples/modifying_maps_and_layers/create_new_point_layer_definition.php
===================================================================
--- sandbox/jng/v30/Doc/samples/phpsamples/modifying_maps_and_layers/create_new_point_layer_definition.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/phpsamples/modifying_maps_and_layers/create_new_point_layer_definition.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -99,8 +99,8 @@
$resourceIdentifier = new MgResourceIdentifier($featureSourceName);
//$wkt = "LOCALCS[\"*XY-MT*\",LOCAL_DATUM[\"*X-Y*\",10000],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]";
$wkt = 'GEOGCS["LL84",DATUM["WGS84",SPHEROID["WGS84",6378137.000,298.25722293]],PRIMEM["Greenwich",0],UNIT["Degree",0.01745329251994]]';
- //$sdfParams = new MgCreateSdfParams("ArbitraryXY", $wkt, $featureSchema);
- $sdfParams = new MgCreateSdfParams("LatLong", $wkt, $featureSchema);
+ //$sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "ArbitraryXY", $wkt, $featureSchema);
+ $sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", $wkt, $featureSchema);
$featureService->CreateFeatureSource($resourceIdentifier, $sdfParams);
// We need to add some data to the sdf before using it. The spatial context
Modified: sandbox/jng/v30/Doc/samples/phpviewersample/findaddress/findaddressfunctions.php
===================================================================
--- sandbox/jng/v30/Doc/samples/phpviewersample/findaddress/findaddressfunctions.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/phpviewersample/findaddress/findaddressfunctions.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -87,7 +87,7 @@
$addressSchema->SetName('AddressMarkerSchema');
$addressSchema->GetClasses()->Add($addressClass);
- $sdfParams = new MgCreateSdfParams('LL84', $ll84Wkt, $addressSchema);
+ $sdfParams = new MgFileFeatureSourceParams('OSGeo.SDF', 'LL84', $ll84Wkt, $addressSchema);
$featureService->CreateFeatureSource($addressMarkerDataResId, $sdfParams);
}
Modified: sandbox/jng/v30/Doc/samples/phpviewersample/query/classes/query.php
===================================================================
--- sandbox/jng/v30/Doc/samples/phpviewersample/query/classes/query.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Doc/samples/phpviewersample/query/classes/query.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -156,7 +156,7 @@
// Create the Feature Source (SDF)
$sdfSchema = $this->CreateFilterSchema();
- $sdfParams = new MgCreateSdfParams('MAPCS', $map->GetMapSRS(), $sdfSchema);
+ $sdfParams = new MgFileFeatureSourceParams('OSGeo.SDF', 'MAPCS', $map->GetMapSRS(), $sdfSchema);
$featureService->CreateFeatureSource($sdfResId, $sdfParams);
// Create the Layer
Modified: sandbox/jng/v30/Server/src/UnitTesting/TestFeatureService.cpp
===================================================================
--- sandbox/jng/v30/Server/src/UnitTesting/TestFeatureService.cpp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Server/src/UnitTesting/TestFeatureService.cpp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -822,7 +822,7 @@
STRING wkt = L"LOCAL_CS[\"Non-Earth (Meter)\",LOCAL_DATUM[\"Local Datum\",0],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]";
Ptr<MgResourceIdentifier> fsId = new MgResourceIdentifier(L"Library://UnitTests/Data/GetIdentityPropertiesTest.FeatureSource");
- Ptr<MgCreateSdfParams> createSdf = new MgCreateSdfParams(L"Default", wkt, testSchema);
+ Ptr<MgFileFeatureSourceParams> createSdf = new MgFileFeatureSourceParams(L"OSGeo.SDF", L"Default", wkt, testSchema);
pService->CreateFeatureSource(fsId, createSdf);
// Now query it - as the HttpHandler does it
@@ -2126,13 +2126,6 @@
STRING wkt = L"LOCAL_CS[\"Non-Earth (Meter)\",LOCAL_DATUM[\"Local Datum\",0],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]";
- // Create SDF feature source using class MgCreateSdfParams
- Ptr<MgCreateSdfParams> params1 = new MgCreateSdfParams(L"ArbitraryXY", wkt, schema);
- Ptr<MgResourceIdentifier> resource1 = new MgResourceIdentifier(L"Library://UnitTests/Data/CreateFeatureSourceTest1.FeatureSource");
- pService->CreateFeatureSource(resource1, params1);
- // Delete the resource
- pResourceService->DeleteResource(resource1);
-
// Create SDF feature source using class MgFeatureSourceParams
Ptr<MgFileFeatureSourceParams> params2 = new MgFileFeatureSourceParams(L"OSGeo.SDF", L"ArbitraryXY", wkt, schema);
Ptr<MgResourceIdentifier> resource2 = new MgResourceIdentifier(L"Library://UnitTests/Data/CreateFeatureSourceTest2.FeatureSource");
Modified: sandbox/jng/v30/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
===================================================================
--- sandbox/jng/v30/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml 2014-06-14 19:39:39 UTC (rev 8218)
@@ -136,7 +136,6 @@
<Header path="../../../../Common/PlatformBase/Services/ClassDefinition.h" />
<Header path="../../../../Common/PlatformBase/Services/ClassDefinitionCollection.h" />
<Header path="../../../../Common/PlatformBase/Services/FileFeatureSourceParams.h" />
- <Header path="../../../../Common/PlatformBase/Services/CreateSdfParams.h" />
<Header path="../../../../Common/PlatformBase/Services/DataPropertyDefinition.h" />
<Header path="../../../../Common/PlatformBase/Services/DataReader.h" />
<Header path="../../../../Common/PlatformBase/Services/DeleteFeatures.h" />
Modified: sandbox/jng/v30/Web/src/JavaApi/Makefile.am
===================================================================
--- sandbox/jng/v30/Web/src/JavaApi/Makefile.am 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/JavaApi/Makefile.am 2014-06-14 19:39:39 UTC (rev 8218)
@@ -293,7 +293,6 @@
../../../Common/PlatformBase/Services/ClassDefinition.h \
../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
- ../../../Common/PlatformBase/Services/CreateSdfParams.h \
../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
../../../Common/PlatformBase/Services/DataReader.h \
../../../Common/PlatformBase/Services/DeleteFeatures.h \
Modified: sandbox/jng/v30/Web/src/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/v30/Web/src/JavaApiEx/Makefile.am 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/JavaApiEx/Makefile.am 2014-06-14 19:39:39 UTC (rev 8218)
@@ -293,7 +293,6 @@
../../../Common/PlatformBase/Services/ClassDefinition.h \
../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
- ../../../Common/PlatformBase/Services/CreateSdfParams.h \
../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
../../../Common/PlatformBase/Services/DataReader.h \
../../../Common/PlatformBase/Services/DeleteFeatures.h \
Modified: sandbox/jng/v30/Web/src/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- sandbox/jng/v30/Web/src/MapGuideApi/MapGuideApiGen.xml 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/MapGuideApi/MapGuideApiGen.xml 2014-06-14 19:39:39 UTC (rev 8218)
@@ -313,7 +313,6 @@
<Header path="../../../Common/PlatformBase/Services/ClassDefinition.h" />
<Header path="../../../Common/PlatformBase/Services/ClassDefinitionCollection.h" />
<Header path="../../../Common/PlatformBase/Services/FileFeatureSourceParams.h" />
- <Header path="../../../Common/PlatformBase/Services/CreateSdfParams.h" />
<Header path="../../../Common/PlatformBase/Services/DataPropertyDefinition.h" />
<Header path="../../../Common/PlatformBase/Services/DataReader.h" />
<Header path="../../../Common/PlatformBase/Services/DeleteFeatures.h" />
Modified: sandbox/jng/v30/Web/src/PhpApi/Makefile.am
===================================================================
--- sandbox/jng/v30/Web/src/PhpApi/Makefile.am 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/PhpApi/Makefile.am 2014-06-14 19:39:39 UTC (rev 8218)
@@ -291,7 +291,6 @@
../../../Common/PlatformBase/Services/ClassDefinition.h \
../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
- ../../../Common/PlatformBase/Services/CreateSdfParams.h \
../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
../../../Common/PlatformBase/Services/DataReader.h \
../../../Common/PlatformBase/Services/DeleteFeatures.h \
Modified: sandbox/jng/v30/Web/src/mapviewerjava/buffer.jsp
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerjava/buffer.jsp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/mapviewerjava/buffer.jsp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -168,7 +168,7 @@
schema.GetClasses().Add(classDef);
//finally, creation of the feature source
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("LatLong", srsDefMap, schema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", srsDefMap, schema);
featureSrvc.CreateFeatureSource(dataSourceId, sdfParams);
//Add layer to map
Modified: sandbox/jng/v30/Web/src/mapviewerjava/measure.jsp
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerjava/measure.jsp 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/mapviewerjava/measure.jsp 2014-06-14 19:39:39 UTC (rev 8218)
@@ -182,7 +182,7 @@
schema.GetClasses().Add(classDef);
//finally, creation of the feature source
- MgCreateSdfParams parameters = new MgCreateSdfParams("MapSrs", srs, schema);
+ MgFileFeatureSourceParams parameters = new MgFileFeatureSourceParams("OSGeo.SDF", "MapSrs", srs, schema);
featureSrvc.CreateFeatureSource(dataSourceId, parameters);
//build map tip
Modified: sandbox/jng/v30/Web/src/mapviewernet/buffer.aspx
===================================================================
--- sandbox/jng/v30/Web/src/mapviewernet/buffer.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/mapviewernet/buffer.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -146,7 +146,7 @@
schema.GetClasses().Add(classDef);
//finally, creation of the feature source
- MgCreateSdfParams sdfParams = new MgCreateSdfParams("LatLong", srsDefMap, schema);
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", srsDefMap, schema);
featureSrvc.CreateFeatureSource(dataSourceId, sdfParams);
//Add layer to map
Modified: sandbox/jng/v30/Web/src/mapviewernet/measure.aspx
===================================================================
--- sandbox/jng/v30/Web/src/mapviewernet/measure.aspx 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/mapviewernet/measure.aspx 2014-06-14 19:39:39 UTC (rev 8218)
@@ -160,7 +160,7 @@
schema.GetClasses().Add(classDef);
//finally, creation of the feature source
- MgCreateSdfParams parameters = new MgCreateSdfParams("LatLong", srs, schema);
+ MgFileFeatureSourceParams parameters = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", srs, schema);
featureSrvc.CreateFeatureSource(dataSourceId, parameters);
//build map tip
Modified: sandbox/jng/v30/Web/src/mapviewerphp/buffer.php
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerphp/buffer.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/mapviewerphp/buffer.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -136,7 +136,7 @@
$schema->GetClasses()->Add($classDef);
//finally, creation of the feature source
- $sdfParams = new MgCreateSdfParams("LatLong", $srsDefMap, $schema);
+ $sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", $srsDefMap, $schema);
$featureSrvc->CreateFeatureSource($dataSourceId, $sdfParams);
//Add layer to map
Modified: sandbox/jng/v30/Web/src/mapviewerphp/measure.php
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerphp/measure.php 2014-06-14 19:15:04 UTC (rev 8217)
+++ sandbox/jng/v30/Web/src/mapviewerphp/measure.php 2014-06-14 19:39:39 UTC (rev 8218)
@@ -151,7 +151,7 @@
$schema->GetClasses()->Add($classDef);
//finally, creation of the feature source
- $params = new MgCreateSdfParams("MapSrs", $srs, $schema);
+ $params = new MgFileFeatureSourceParams("OSGeo.SDF", "MapSrs", $srs, $schema);
$featureSrvc->CreateFeatureSource($dataSourceId, $params);
//build map tip
More information about the mapguide-commits
mailing list