[mapguide-commits] r9512 - in sandbox/jng/v4: . Common Common/Foundation/System Common/Geometry Common/MapGuideCommon/MapLayer Common/MapGuideCommon/Services Common/PlatformBase/Services
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon May 27 06:29:07 PDT 2019
Author: jng
Date: 2019-05-27 06:29:07 -0700 (Mon, 27 May 2019)
New Revision: 9512
Modified:
sandbox/jng/v4/CMakeLists.txt
sandbox/jng/v4/Common/Foundation/System/Resources.cpp
sandbox/jng/v4/Common/Geometry/Geometry.h
sandbox/jng/v4/Common/Geometry/GeometrySimplificationAlgorithmType.h
sandbox/jng/v4/Common/Geometry/GeometrySimplifier.h
sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.h
sandbox/jng/v4/Common/MapGuideCommon/Services/Metatile.h
sandbox/jng/v4/Common/MapGuideCommon/Services/ProxyRenderingService.h
sandbox/jng/v4/Common/MapGuideCommon/Services/RenderingService.h
sandbox/jng/v4/Common/PlatformBase/Services/FeatureService.h
sandbox/jng/v4/Common/ProductVersion.h
sandbox/jng/v4/configure.in
Log:
First round of 3.3 -> 4.0 find/replace
Also add missing "\since 4.0" in newly added APIs where applicable
Modified: sandbox/jng/v4/CMakeLists.txt
===================================================================
--- sandbox/jng/v4/CMakeLists.txt 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/CMakeLists.txt 2019-05-27 13:29:07 UTC (rev 9512)
@@ -60,8 +60,8 @@
include(CheckSymbolExists)
include(ExternalProject)
-set(MG_VERSION_MAJOR 3)
-set(MG_VERSION_MINOR 3)
+set(MG_VERSION_MAJOR 4)
+set(MG_VERSION_MINOR 0)
set(MG_VERSION_RELEASE 0)
if (NOT MG_VERSION_REV)
set(MG_VERSION_REV 0)
Modified: sandbox/jng/v4/Common/Foundation/System/Resources.cpp
===================================================================
--- sandbox/jng/v4/Common/Foundation/System/Resources.cpp 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/Foundation/System/Resources.cpp 2019-05-27 13:29:07 UTC (rev 9512)
@@ -38,8 +38,8 @@
const STRING MgResources::ServerShuttingDown = L"Server shutting down...";
const STRING MgResources::ServerStarted = L"Server started.";
const STRING MgResources::ServerStopped = L"Server stopped.";
-const STRING MgResources::ServerServiceName = L"MapGuideServer3.3"; // Do not translate
-const STRING MgResources::ServerServiceDisplayName = L"MapGuide Server v3.3"; // Do not translate
+const STRING MgResources::ServerServiceName = L"MapGuideServer4.0"; // Do not translate
+const STRING MgResources::ServerServiceDisplayName = L"MapGuide Server v4.0"; // Do not translate
const STRING MgResources::ServerServiceDescription = L"The MapGuide Server process.";
const STRING MgResources::UsingDefaultResourceFile = L"Defaulting to the \"en\" resource file.";
const STRING MgResources::RegisteredLicenseDetected = L"Registered license detected...";
Modified: sandbox/jng/v4/Common/Geometry/Geometry.h
===================================================================
--- sandbox/jng/v4/Common/Geometry/Geometry.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/Geometry/Geometry.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -750,7 +750,7 @@
/// virtual MgGeometry Prepare();
/// \htmlinclude SyntaxBottom.html
///
- /// \since 3.3
+ /// \since 4.0
///
/// \return
/// An MgPreparedGeometry representing the prepared version of this geometry
@@ -775,7 +775,7 @@
/// virtual MgGeometry Prepare();
/// \htmlinclude SyntaxBottom.html
///
- /// \since 3.3
+ /// \since 4.0
///
/// \return
/// A tesellated version of this geometry. If this geometry is not curve-based, the operation does nothing and this method returns itself.
Modified: sandbox/jng/v4/Common/Geometry/GeometrySimplificationAlgorithmType.h
===================================================================
--- sandbox/jng/v4/Common/Geometry/GeometrySimplificationAlgorithmType.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/Geometry/GeometrySimplificationAlgorithmType.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -28,6 +28,7 @@
/// the various simplification algorithms available for simplifying
/// geometry instances
///
+/// \since 4.0
class MgGeometrySimplificationAlgorithmType
{
PUBLISHED_API:
Modified: sandbox/jng/v4/Common/Geometry/GeometrySimplifier.h
===================================================================
--- sandbox/jng/v4/Common/Geometry/GeometrySimplifier.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/Geometry/GeometrySimplifier.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -60,6 +60,7 @@
/// \endcode
/// \htmlinclude ExampleBottom.html
///
+/// \since 4.0
class MG_GEOMETRY_API MgGeometrySimplifier : public MgGuardDisposable
{
DECLARE_CLASSNAME(MgGeometrySimplifier)
Modified: sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.h
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -392,7 +392,7 @@
/// \param dpi
/// The display DPI to initially set for the map
///
- /// \since 3.3
+ /// \since 4.0
///
/// \return
/// Returns nothing.
Modified: sandbox/jng/v4/Common/MapGuideCommon/Services/Metatile.h
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/Services/Metatile.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/MapGuideCommon/Services/Metatile.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -24,7 +24,7 @@
/// Defines a raw image frame buffer from the result of a meta-tile
/// rendering operation
///
-/// \since 3.3
+/// \since 4.0
class MG_MAPGUIDE_API MgMetatile : public MgSerializable
{
MG_DECL_DYNCREATE()
Modified: sandbox/jng/v4/Common/MapGuideCommon/Services/ProxyRenderingService.h
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/Services/ProxyRenderingService.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/MapGuideCommon/Services/ProxyRenderingService.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -148,6 +148,7 @@
/// \return
/// A byte reader containing the rendered tile image.
///
+ /// \since 4.0
virtual MgByteReader* RenderTile(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -266,6 +267,7 @@
/// \return
/// A byte reader containing the rendered tile image.
///
+ /// \since 4.0
virtual MgByteReader* RenderTileXYZ(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -1154,7 +1156,7 @@
/// A meta-tile with sufficient information for the consumer to properly sub-divide this back into sub-tiles of the
/// originally requested size.
///
- /// \since 3.3
+ /// \since 4.0
virtual MgMetatile* RenderMetatile(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -1209,7 +1211,7 @@
/// A meta-tile with sufficient information for the consumer to properly sub-divide this back into sub-tiles of the
/// originally requested size.
///
- /// \since 3.3
+ /// \since 4.0
virtual MgMetatile* RenderMetatileXYZ(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -1244,7 +1246,7 @@
/// \return
/// The requested sub-tile
///
- /// \since 3.3
+ /// \since 4.0
virtual MgByteReader* RenderTileFromMetaTile(MgMap* map, MgMetatile* metaTile, CREFSTRING rendererName, INT32 subTileX, INT32 subTileY);
protected:
Modified: sandbox/jng/v4/Common/MapGuideCommon/Services/RenderingService.h
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/Services/RenderingService.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/MapGuideCommon/Services/RenderingService.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -162,7 +162,7 @@
/// \return
/// A byte reader containing the rendered tile image.
///
- /// \since 3.3
+ /// \since 4.0
virtual MgByteReader* RenderTile(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -282,6 +282,7 @@
/// \return
/// A byte reader containing the rendered tile image.
///
+ /// \since 4.0
virtual MgByteReader* RenderTileXYZ(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -323,7 +324,7 @@
/// \return
/// A byte reader containing the rendered tile image.
///
- /// \since 3.3
+ /// \since 4.0
virtual MgByteReader* RenderTileUTFGrid(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -1106,6 +1107,7 @@
/// An MgSelection instance identifying the features that meet the
/// selection criteria. Returns null if no features are identified.
///
+ /// \since 4.0
virtual MgBatchPropertyCollection* QueryFeatureProperties(
MgMap* map,
MgStringCollection* layerNames,
@@ -1169,7 +1171,7 @@
/// A meta-tile with sufficient information for the consumer to properly sub-divide this back into sub-tiles of the
/// originally requested size.
///
- /// \since 3.3
+ /// \since 4.0
virtual MgMetatile* RenderMetatile(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -1224,7 +1226,7 @@
/// A meta-tile with sufficient information for the consumer to properly sub-divide this back into sub-tiles of the
/// originally requested size.
///
- /// \since 3.3
+ /// \since 4.0
virtual MgMetatile* RenderMetatileXYZ(
MgMap* map,
CREFSTRING baseMapLayerGroupName,
@@ -1260,7 +1262,7 @@
/// \return
/// The requested sub-tile
///
- /// \since 3.3
+ /// \since 4.0
virtual MgByteReader* RenderTileFromMetaTile(MgMap* map, MgMetatile* metaTile, CREFSTRING rendererName, INT32 subTileX, INT32 subTileY) = 0;
protected:
Modified: sandbox/jng/v4/Common/PlatformBase/Services/FeatureService.h
===================================================================
--- sandbox/jng/v4/Common/PlatformBase/Services/FeatureService.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/PlatformBase/Services/FeatureService.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -2084,7 +2084,7 @@
///
/// \exception MgInvalidArgumentException
///
- /// \since 3.3
+ /// \since 4.0
virtual MgFeatureReader* GetWfsReader(MgResourceIdentifier* featureSourceId,
CREFSTRING featureClass,
MgStringCollection* requiredProperties,
Modified: sandbox/jng/v4/Common/ProductVersion.h
===================================================================
--- sandbox/jng/v4/Common/ProductVersion.h 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/Common/ProductVersion.h 2019-05-27 13:29:07 UTC (rev 9512)
@@ -18,7 +18,7 @@
#ifndef PRODUCTVERSION_H_
#define PRODUCTVERSION_H_
-const STRING ProductVersion = L"3.3.0.0";
-const STRING ApiVersion = L"3.3"; // Major.Minor only
+const STRING ProductVersion = L"4.0.0.0";
+const STRING ApiVersion = L"4.0"; // Major.Minor only
#endif // PRODUCTVERSION_H_
Modified: sandbox/jng/v4/configure.in
===================================================================
--- sandbox/jng/v4/configure.in 2019-05-27 12:34:02 UTC (rev 9511)
+++ sandbox/jng/v4/configure.in 2019-05-27 13:29:07 UTC (rev 9512)
@@ -4,7 +4,7 @@
# Variables
# Following are the makefile directories
#----------------------------------------------------------------------
-AC_INIT(mapguide,3.3.0,http://mapguide.osgeo.org)
+AC_INIT(mapguide,4.0.0,http://mapguide.osgeo.org)
AC_CONFIG_SRCDIR(configure.in)
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects])
More information about the mapguide-commits
mailing list