[mapguide-commits] r8226 - in sandbox/jng/v30: . Common/MapGuideCommon/Controller Common/MapGuideCommon/Services Common/Renderers Oem Server/src/Services/Mapping Server/src/UnitTesting UnitTest/TestData/MappingService UnitTest/WebTier/MapAgent/MapAgentForms Web/src/HttpHandler Web/src/localized/help/en Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jun 16 05:48:47 PDT 2014
Author: jng
Date: 2014-06-16 05:48:47 -0700 (Mon, 16 Jun 2014)
New Revision: 8226
Removed:
sandbox/jng/v30/Common/Renderers/EMapRenderer.cpp
sandbox/jng/v30/Common/Renderers/EMapRenderer.h
sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.cpp
sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.h
sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.cpp
sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.h
sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.cpp
sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.h
sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapform.html
sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapupdateform.html
sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.cpp
sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.h
sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.cpp
sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.h
sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff13ee121107bdda7722-6913.htm
sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7841.htm
sandbox/jng/v30/Web/src/mapviewerjava/dwfviewer.jsp
sandbox/jng/v30/Web/src/mapviewernet/dwfviewer.aspx
sandbox/jng/v30/Web/src/mapviewerphp/dwfviewer.php
sandbox/jng/v30/Web/src/viewerfiles/dwfmappane.templ
sandbox/jng/v30/Web/src/viewerfiles/emaprelayer.html
sandbox/jng/v30/Web/src/viewerfiles/initdwfctrl.js
Modified:
sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.cpp
sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.h
sandbox/jng/v30/Common/MapGuideCommon/Services/MappingDefs.h
sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.cpp
sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.h
sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.cpp
sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.h
sandbox/jng/v30/Common/Renderers/Makefile.am
sandbox/jng/v30/Common/Renderers/Renderers.vcxproj
sandbox/jng/v30/Common/Renderers/Renderers.vcxproj.filters
sandbox/jng/v30/Oem/oem.sln
sandbox/jng/v30/Server/src/Services/Mapping/Makefile.am
sandbox/jng/v30/Server/src/Services/Mapping/MappingOperationFactory.cpp
sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.cpp
sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.h
sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj
sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj.filters
sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingServiceBuild.cpp
sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.cpp
sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.h
sandbox/jng/v30/UnitTest/TestData/MappingService/MappingServiceTest.dump
sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/mappingserviceapi.html
sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj
sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj.filters
sandbox/jng/v30/Web/src/HttpHandler/HttpHandlerBuild.cpp
sandbox/jng/v30/Web/src/HttpHandler/HttpRequest.cpp
sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.cpp
sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.h
sandbox/jng/v30/Web/src/HttpHandler/Makefile.am
sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2b8b.htm
sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2dff.htm
sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2e28.htm
sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-39b4.htm
sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm
sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7ac3.htm
sandbox/jng/v30/Web/src/localized/help/en/mapguide_viewer_command_list.htm
sandbox/jng/v30/Web/src/mapviewerjava/mapframe.jsp
sandbox/jng/v30/Web/src/mapviewernet/mapframe.aspx
sandbox/jng/v30/Web/src/mapviewerphp/mapframe.php
sandbox/jng/v30/build_oem.sh
Log:
The other major part of the deprecated API hit list: DWF EMap support.
This removes the following:
- Remove DWF EMap project from oem.sln
- DWF EMap init/build/clean steps in build_oem.sh
- EMap renderers from Renderers
- The GenerateMap and GenerateMapUpdate methods from MgMappingService and all subclasses.
- The GETMAP and GETMAPUPDATE operations from the mapagent
- Remove dwfviewer.[php/jsp/aspx] entry point and update mapframe.[php/jsp/aspx] to only load AJAX viewer template files
- Remove DWF viewer related content under viewerfiles
- Remove references to the DWF viewer in the AJAX viewer help files
Modified: sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.cpp
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -36,80 +36,6 @@
m_mapAgentUri = mapAgentUri;
}
-//////////////////////////////////////////////////////////////////
-// Processes a GetMap request from the Viewer and returns
-// a DWF containing an EMap that fully describes the map
-// but does not yet contain any layer graphics
-//
-MgByteReader* MgDwfController::GetMap(MgResourceIdentifier* mapDefinition,
- CREFSTRING dwfVersion, CREFSTRING eMapVersion, MgPropertyCollection* mapViewCommands)
-{
- //create a session id to associate with this map
- STRING sessionId;
- Ptr<MgUserInformation> userInfo = m_siteConn->GetUserInfo();
- if (userInfo.p != NULL) sessionId = userInfo->GetMgSessionId();
- if (sessionId.empty())
- {
- Ptr<MgSite> site = m_siteConn->GetSite();
- sessionId = site->CreateSession();
- userInfo->SetMgSessionId(sessionId);
- }
-
- //get an instance of the resource service
- Ptr<MgResourceService> resourceService = (MgResourceService*)GetService(MgServiceType::ResourceService);
-
- //instantiate a map object and let it load itself from the map definition in the resource repository
- Ptr<MgMap> map = new MgMap();
- map->Create(resourceService, mapDefinition, mapDefinition->GetName());
-
- m_operation = get;
-
- //apply commands
- ApplyMapViewCommands(map, mapViewCommands);
-
- //save the map state in the session repository
- Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(L"Session:" + sessionId + L"//" + mapDefinition->GetName() + L"." + MgResourceType::Map);
- map->Save(resourceService.p, resId.p);
-
- Ptr<MgDwfVersion> dwfv = new MgDwfVersion(dwfVersion, eMapVersion);
-
- //get an instance of the mapping service and call the GetMap API
- Ptr<MgMappingService> mappingService = (MgMappingService*)GetService(MgServiceType::MappingService);
- return mappingService->GenerateMap(map, sessionId, m_mapAgentUri, dwfv);
-}
-
-//////////////////////////////////////////////////////////////////
-// Processes a GetMapUpdate request from the Viewer and
-// returns an EMapTransaction DWF containing updated
-// content for the specified map
-//
-MgByteReader* MgDwfController::GetMapUpdate(CREFSTRING mapName, int seqNo,
- CREFSTRING dwfVersion, CREFSTRING eMapVersion, MgPropertyCollection* mapViewCommands)
-{
- //get an instance of the resource service
- Ptr<MgResourceService> resourceService = (MgResourceService*)GetService(MgServiceType::ResourceService);
-
- //recall the state of this map from the session repository
- Ptr<MgMap> map = new MgMap();
- map->Open(resourceService, mapName);
-
- m_operation = update;
-
- //apply new commands
- ApplyMapViewCommands(map, mapViewCommands);
-
- Ptr<MgDwfVersion> dwfv = new MgDwfVersion(dwfVersion, eMapVersion);
-
- //get an instance of the mapping service and call the GetMapUpdate API
- Ptr<MgMappingService> mappingService = (MgMappingService*)GetService(MgServiceType::MappingService);
- MgByteReader* br = mappingService->GenerateMapUpdate(map, seqNo, dwfv);
-
- //save the MgMap state
- map->Save(resourceService);
-
- return br;
-}
-
MgByteReader* MgDwfController::GetPlot(MgMap* map, MgPlotSpecification* plotSpec, MgLayout* layout, CREFSTRING dwfVersion,
CREFSTRING ePlotVersion, MgPropertyCollection* mapViewCommands)
{
Modified: sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.h
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Controller/DwfController.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -61,59 +61,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Processes a GetMap request from the Viewer and returns
- /// a DWF containing an eMap that fully describes the map
- /// but does not yet contain any layer graphics
- ///
- /// \param mapDefinition
- /// Id of a map definition in a resource repository
- /// \param dwfVersion
- /// DWF version
- /// \param eMapVersion
- /// eMap version
- /// \param language
- /// Language code
- /// \param mapViewCommands
- /// Set of commands to be applied
- ///
- /// \return
- /// A byte reader embedding a DWF containing an eMap
- ///
- MgByteReader* GetMap(
- MgResourceIdentifier* mapDefinition,
- CREFSTRING dwfVersion,
- CREFSTRING eMapVersion,
- MgPropertyCollection* mapViewCommands);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Processes a GetMapUpdate request from the Viewer and
- /// returns an eMapTransaction DWF containing updated
- /// content for the specified map
- ///
- /// \param mapName
- /// Name of the map
- /// \param seqNo
- /// Sequence number.
- /// \param dwfVersion
- /// DWF version
- /// \param eMapVersion
- /// eMap version
- /// \param mapViewCommands
- /// Set of commands to be applied
- ///
- /// \return
- /// A byte reader embedding a DWF containing updated
- /// content for the specified map
- ///
- MgByteReader* GetMapUpdate(CREFSTRING mapName,
- int seqNo,
- CREFSTRING dwfVersion,
- CREFSTRING eMapVersion,
- MgPropertyCollection* mapViewCommands);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Processes a GetPlot request from the Viewer and returns either an EPlot for print to scale functionality,
/// an EPlot DWF for offline use, or an EPlot generated using a specified print layout
///
Modified: sandbox/jng/v30/Common/MapGuideCommon/Services/MappingDefs.h
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Services/MappingDefs.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Services/MappingDefs.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -94,8 +94,6 @@
class MG_MAPGUIDE_API MgMappingServiceOpId
{
INTERNAL_API:
- static const int GenerateMap = 0x1111EE01;
- static const int GenerateMapUpdate = 0x1111EE02;
static const int GeneratePlot = 0x1111EE03;
static const int GeneratePlotWithLayout = 0x1111EE04;
static const int GenerateMultiPlot = 0x1111EE05;
Modified: sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.cpp
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -25,19 +25,6 @@
{
}
-//////////////////////////////////////////////////////////////////
-///TODO: Get rid of this stub once user info is passed to the server
-MgByteReader* MgMappingService::GenerateMap(MgMap* map, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion)
-{
- MG_TRY()
-
- throw new MgNotImplementedException(L"MgMappingService.GenerateMap", __LINE__, __WFILE__, NULL, L"", NULL);
-
- MG_CATCH_AND_THROW(L"MgMappingService.GenerateMap")
-
- return NULL;
-}
-
/////////////////////////////////////////////////////////////////
/// <summary>
/// Get the class Id
Modified: sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.h
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Services/MappingService.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -51,106 +51,8 @@
class MG_MAPGUIDE_API MgMappingService : public MgService
{
PUBLISHED_API:
- ////////////////////////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Generates an \link eMap eMap \endlink that describes the specified
- /// map
- ///
- /// \deprecated
- /// This method has been deprecated. eMap DWF support may be removed in a future release of MapGuide
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgByteReader GenerateMap(MgMap map, string mapAgentUri, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgByteReader GenerateMap(MgMap map, String mapAgentUri, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgByteReader GenerateMap(MgMap map, string mapAgentUri, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param map (MgMap)
- /// Map object describing current state of map
- /// \param mapAgentUri (String/string)
- /// Http Uri for map agent
- /// \param dwfVersion (MgDwfVersion)
- /// DWF version required by the client. This
- /// determines the schema and file versions used
- /// to generate the DWFs sent back to the client.
- ///
- /// \return
- /// Returns an MgByteReader object containing a DWF of the
- /// legend in eMap format.
- ///
- /// <!-- Example (PHP) -->
- /// \htmlinclude PHPExampleTop.html
- /// \code
- /// // Assuming $resourceService and $mappingService have already been
- /// // initialized.
- /// // Get a runtime map from a map definition
- /// $resourceID = new MgResourceIdentifier('Library://Calgary/Maps/Calgary.MapDefinition');
- /// $map = new MgMap();
- /// $map->Create($resourceService, $resourceID, 'Calgary');
- ///
- /// // Generate a DWF from the map
- /// $mapAgentURI = 'http://localhost/phpmapagent/mapAgent.php'; // Replace 'localhost' with your server name
- /// $dwfVersion = new MgDwfVersion('6.01','1.2');
- /// $byteReader = $mappingService->GenerateMap($map, $mapAgentURI, $dwfVersion);
- /// \endcode
- /// \htmlinclude ExampleBottom.html
- ///
- /// \exception MgNullArgumentException
- ///
- virtual MgByteReader* GenerateMap(MgMap* map, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion);
-
///////////////////////////////////////////////////////////////////////////////////
/// \brief
- /// Generates an \link eMap eMap \endlink that contains any required
- /// updates to the metadata and layer graphics based on the state
- /// of the specified map.
- ///
- /// \deprecated
- /// This method has been deprecated. eMap DWF support may be removed in a future release of MapGuide
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgByteReader GenerateMapUpdate(MgMap map, int seqNo, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgByteReader GenerateMapUpdate(MgMap map, int seqNo, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgByteReader GenerateMapUpdate(MgMap map, int seqNo, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param map (MgMap)
- /// Map object specifying current state of map.
- /// \param seqNo (int)
- /// Update sequence number. An arbitrary number which is
- /// set automatically by the DWF Viewer and used by a
- /// client to identify a map update request. The client
- /// passes this number as part of its request for data, and
- /// that number is returned here so that the client can
- /// match the response with the request. The MapGuide
- /// server and the web tier do not make any use of this
- /// number except sending it back as part of the response.
- /// \param dwfVersion (MgDwfVersion)
- /// DWF version required by the client. This determines the
- /// schema and file versions used to generate the DWFs sent
- /// back to the client.
- ///
- /// \return
- /// Returns an MgByteReader object containing a DWF of the
- /// legend in eMap format.
- ///
- /// \exception MgNullArgumentException
- ///
- ///
- virtual MgByteReader* GenerateMapUpdate(MgMap* map, INT32 seqNo, MgDwfVersion* dwfVersion) = 0;
-
- ///////////////////////////////////////////////////////////////////////////////////
- /// \brief
/// Plot The map to an EPlot DWF using the center and scale from the map. The
/// extents will be computed to fill the space within the page margins. If the
/// layout paramter is null, no adornments will be added to the page.
@@ -638,9 +540,6 @@
///
MgMappingService();
- //TODO: Get rid of sessionId from API once user information is passed to server
- virtual MgByteReader* GenerateMap(MgMap* map, CREFSTRING sessionId, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion) = 0;
-
///////////////////////////////////////////////////////////////////////////////////
/// \brief
/// Generates an \link ePlot ePlot \endlink containing a legend for the
@@ -714,8 +613,6 @@
/// Enumerations
enum OperationId
{
- opIdGenerateMap = 0x1111EE01,
- opIdGenerateMapUpdate = 0x1111EE02,
opIdGeneratePlot = 0x1111EE03,
opIdGeneratePlotWithLayout = 0x1111EE04,
opIdGenerateMultiPlot = 0x1111EE05,
Modified: sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.cpp
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -47,91 +47,6 @@
}
}
-//////////////////////////////////////////////////////////////////
-///TODO: Get rid of this stub once user info is passed to the server
-MgByteReader* MgProxyMappingService::GenerateMap(MgMap* map, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion)
-{
- STRING sessionId;
-
- if (m_connProp.p != NULL)
- {
- Ptr<MgUserInformation> userInfo = m_connProp->GetUserInfo();
- if (userInfo.p != NULL)
- {
- sessionId = userInfo->GetMgSessionId();
- }
- }
-
- if (sessionId.empty())
- {
- return NULL;
- }
- else
- {
- return GenerateMap(map, sessionId, mapAgentUri, dwfVersion);
- }
-}
-
-
-// Generates an EMap DWF that describes the specified map
-//
-MgByteReader* MgProxyMappingService::GenerateMap(MgMap* map, CREFSTRING sessionId, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion)
-{
- MgCommand cmd;
-
- //Do not carry around track changes for GenerateMap (they are used only for GenerateMapUpdate)
- if(NULL != map)
- map->ClearChanges();
-
- cmd.ExecuteCommand(m_connProp,
- MgCommand::knObject,
- MgMappingServiceOpId::GenerateMap,
- 4,
- Mapping_Service,
- BUILD_VERSION(1,0,0),
- MgCommand::knObject, map,
- MgCommand::knString, &sessionId,
- MgCommand::knString, &mapAgentUri,
- MgCommand::knObject, dwfVersion,
- MgCommand::knNone);
-
- SetWarning(cmd.GetWarningObject());
-
- return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
-}
-
-// Generates an EMap DWF that contains any required updates to the EMap meta-data
-// and layer graphics based on the state of the specified map
-//
-MgByteReader* MgProxyMappingService::GenerateMapUpdate(MgMap* map, INT32 seqNo, MgDwfVersion* dwfVersion)
-{
- MgCommand cmd;
-
- cmd.ExecuteCommand(m_connProp,
- MgCommand::knObject,
- MgMappingServiceOpId::GenerateMapUpdate,
- 3,
- Mapping_Service,
- BUILD_VERSION(1,0,0),
- MgCommand::knObject, map,
- MgCommand::knInt32, seqNo,
- MgCommand::knObject, dwfVersion,
- MgCommand::knNone);
-
- SetWarning(cmd.GetWarningObject());
-
- //Ensure we are clearing track changes after GenerateMapUpdate, so that we
- //won't attempt to reuse them again
- if(NULL != map)
- {
- map->ClearChanges();
- map->ResetLayersRefresh(); //refresh flags are transient. prevent to reuse them multiple times by GenerateMapUpdate
- }
-
- return (MgByteReader*)cmd.GetReturnValue().val.m_obj;
-}
-
-
// Plot the map to a EPlot DWF using the center and scale from the map. The
// extents will be computed to fill the space wihing the page margins. If the
// layout parameter is null, no adonments will be added to the page.
Modified: sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.h
===================================================================
--- sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/MapGuideCommon/Services/ProxyMappingService.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -30,96 +30,6 @@
EXTERNAL_API:
///////////////////////////////////////////////////////////////////////////////////
/// \brief
- /// Generates an eMap DWF that describes the specified map
- ///
- /// \param map
- /// Map object describing current state of map
- /// \param sessionId
- /// Session identifier for client
- /// \param mapAgentUri
- /// Http Uri for map agent
- /// \param dwfVersion
- /// DWF specification supported/required by the client. The DWF spec determines the
- /// schema and file versions used to generate the DWFs sent back to the client.
- ///
- /// \return
- /// An eMap DWF
- ///
- /// \exception To be documented
- ///
- virtual MgByteReader* GenerateMap(MgMap* map, CREFSTRING sessionId, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion);
-
- ////////////////////////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Generates an \link eMap eMap \endlink that describes the specified
- /// map
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgByteReader GenerateMap(MgMap map, string mapAgentUri, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgByteReader GenerateMap(MgMap map, String mapAgentUri, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgByteReader GenerateMap(MgMap map, string mapAgentUri, MgDwfVersion dwfVersion);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param map (MgMap)
- /// Map object describing current state of map
- /// \param mapAgentUri (String/string)
- /// Http Uri for map agent
- /// \param dwfVersion (MgDwfVersion)
- /// DWF version required by the client. This
- /// determines the schema and file versions used
- /// to generate the DWFs sent back to the client.
- ///
- /// \return
- /// Returns an MgByteReader object containing a DWF of the
- /// legend in eMap format.
- ///
- /// <!-- Example (PHP) -->
- /// \htmlinclude PHPExampleTop.html
- /// \code
- /// // Assuming $resourceService and $mappingService have already been
- /// // initialized.
- /// // Get a runtime map from a map definition
- /// $resourceID = new MgResourceIdentifier('Library://Calgary/Maps/Calgary.MapDefinition');
- /// $map = new MgMap();
- /// $map->Create($resourceService, $resourceID, 'Calgary');
- ///
- /// // Generate a DWF from the map
- /// $mapAgentURI = 'http://localhost/phpmapagent/mapAgent.php';
- /// $dwfVersion = new MgDwfVersion('6.01','1.2');
- /// $byteReader = $mappingService->GenerateMap($map, $mapAgentURI, $dwfVersion);
- /// \endcode
- /// \htmlinclude ExampleBottom.html
- ///
- /// \exception MgNullArgumentException
- ///
- virtual MgByteReader* GenerateMap(MgMap* map, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion);
-
- ///////////////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Generates an eMap DWF that contains any required updates to the eMap meta-data
- /// and layer graphics based on the state of the specified map
- ///
- /// \param map
- /// Map object specifying current state of map
- /// \param seqNo
- /// Update sequence number
- /// \param dwfVersion
- /// DWF specification supported/required by the client. The DWF spec determines the
- /// schema and file versions used to generate the DWFs sent back to the client.
- ///
- /// \return
- /// An eMap DWF
- ///
- /// \exception To be documented
- ///
- virtual MgByteReader* GenerateMapUpdate(MgMap* map, INT32 seqNo, MgDwfVersion* dwfVersion);
- ///////////////////////////////////////////////////////////////////////////////////
- /// \brief
/// Plot the map to a EPlot DWF using the center and scale from the map. The
/// extents will be computed to fill the space wihing the page margins. If the
/// layout parameter is null, no adonments will be added to the page.
Deleted: sandbox/jng/v30/Common/Renderers/EMapRenderer.cpp
===================================================================
--- sandbox/jng/v30/Common/Renderers/EMapRenderer.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/EMapRenderer.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,309 +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 "stdafx.h"
-#include "EMapRenderer.h"
-
-#include "dwfcore/UUID.h"
-#include "dwfcore/MIME.h"
-#include "dwf/package/GraphicResource.h"
-#include "dwf/package/writer/PackageWriter.h"
-#include "dwf/package/writer/extensions/6.01/PackageVersionExtension.h"
-#include "dwfemap/EMapVersion.h"
-#include "dwfemap/package/EMapConstants.h"
-#include "dwfemap/package/EMapSection.h"
-#include "dwfemap/package/Background.h"
-#include "dwfemap/package/CoordinateSpace.h"
-#include "dwfemap/package/Bounds.h"
-#include "dwfemap/package/LinearUnit.h"
-#include "dwfemap/package/EMapInterface.h"
-#include "dwfemap/package/Layer.h"
-#include "dwfemap/package/ScaleRange.h"
-#include "dwfemap/package/UIGraphic.h"
-#include "dwfemap/package/LayerGroup.h"
-
-EMapRenderer::EMapRenderer(const RS_String& filename,
- const RS_String& agentUri)
- : DWFRenderer()
-{
- m_pPage = NULL;
- m_uuid = new DWFUUID;
- m_agentUri = agentUri;
- m_dwfFilename = filename;
- m_pLayer = NULL;
-}
-
-
-EMapRenderer::~EMapRenderer()
-{
- delete m_uuid;
-}
-
-
-void EMapRenderer::StartMap(RS_MapUIInfo* mapInfo,
- RS_Bounds& extents,
- double mapScale,
- double dpi,
- double metersPerUnit,
- CSysTransformer* xformToLL)
-{
- //init super first
- DWFRenderer::StartMap(mapInfo, extents, mapScale, dpi, metersPerUnit, xformToLL);
-
- DWFSource oSource( mapInfo->name().c_str(), L"MapGuide Server", L"" );
-
- DWFBackground bg(mapInfo->bgcolor().argb());
-
- //we want to be able to pan around everywhere
- DWFBounds fullView( -DBL_MAX, //minx
- DBL_MAX, //maxx
- -DBL_MAX, //miny
- DBL_MAX);//maxy
-
- //...but the initial view is equal to the
- //user specified map extent
- DWFBounds initialView(extents.minx,
- extents.maxx,
- extents.miny,
- extents.maxy);
-
- DWFLinearUnit unit(mapInfo->units().c_str(), metersPerUnit);
- DWFCoordinateSpace cs(mapInfo->coordsys().c_str(), unit, fullView, &initialView);
-
- m_pPage = DWFCORE_ALLOC_OBJECT( DWFEMapSection(
- mapInfo->name().c_str(), //zTitle
- mapInfo->guid().c_str(), //zObjectId //here we use GUID given by web tier!!!
- oSource, //rSource
- bg, //background
- cs, //coord sys
- m_agentUri.c_str() //map agent url
- ));
-
- // _AW_Session and _AW_MapName are required map properties
- // DO NOT CHANGE THESE PROPERTY NAMES - the DWF Viewer
- DWFProperty propM1(L"_AW_Session", mapInfo->session().c_str());
- DWFProperty propM2(L"_AW_MapName", mapInfo->name().c_str());
-
- // add properties to map
- m_pPage->addProperty(&propM1, false);
- m_pPage->addProperty(&propM2, false);
-
- m_pLayer = NULL;
-}
-
-
-void EMapRenderer::StartLayer(RS_LayerUIInfo* layerInfo,
- RS_FeatureClassInfo* /*classInfo*/)
-{
- // correlate the UIGraphic object ID with the layer object ID
- DWFString uigGuid = GetUIGraphicObjectIdFromLayerObjectId(layerInfo->guid().c_str());
- DWFUIGraphic* pGraphic = DWFCORE_ALLOC_OBJECT(
- DWFUIGraphic( uigGuid,
- layerInfo->graphic().label().c_str(),
- layerInfo->show(),
- !layerInfo->expand()
- ));
-
- // Construct a Layer to be added to the Map
- DWFEMapLayer* pLayer = DWFCORE_ALLOC_OBJECT( DWFEMapLayer(
- layerInfo->name().c_str(),
- layerInfo->guid().c_str(),
- layerInfo->groupguid().c_str(),
- layerInfo->visible(),
- layerInfo->selectable(),
- layerInfo->editable(),
- pGraphic //UI graphic
- ));
-
- DWFImageResource* imgRes = CreateImageResource(layerInfo->graphic().data(), layerInfo->graphic().length());
- if (imgRes)
- {
- imgRes->setParentObjectID(pGraphic->objectID());
- ((DWFEMapSection*)m_pPage)->addResource(imgRes, true);
- }
-
- // Add the Layer and LayerGroup to the Map
- ((DWFEMapSection*)m_pPage)->addLayer(pLayer);
-
- m_pLayer = pLayer;
-
- //no need to call superclass StartLayer since we are not stylizing
-}
-
-
-//adds a scale range to current layer
-void EMapRenderer::AddScaleRange(double min,
- double max,
- std::list<RS_UIGraphic>* uiGraphics)
-{
- // Construct two scaleRanges to add to the Layer
- DWFScaleRange* pScaleR = DWFCORE_ALLOC_OBJECT( DWFScaleRange(
- m_uuid->next(false), // ObjectId
- min, // Min
- max)); // Max
-
- // Add the Scale Range to the Layer
- m_pLayer->addScaleRange(pScaleR);
-
- //now add the theming ui graphics for this scale range
- if (uiGraphics)
- {
- std::list<RS_UIGraphic>::iterator iter = uiGraphics->begin();
- for (; iter != uiGraphics->end(); ++iter)
- {
- // no need to correlate the UIGraphic object ID with any other object ID
- DWFUIGraphic* pGraphic = DWFCORE_ALLOC_OBJECT(
- DWFUIGraphic( m_uuid->next(false), (*iter).label().c_str(), true, false));
-
- pScaleR->addUIGraphic(pGraphic);
-
- if ((*iter).length() > 0 && (*iter).data())
- {
- DWFImageResource* imgRes = CreateImageResource((*iter).data(), (*iter).length());
- if (imgRes)
- {
- imgRes->setParentObjectID(pGraphic->objectID());
- ((DWFEMapSection*)m_pPage)->addResource(imgRes, true);
- }
- }
- }
- }
-}
-
-
-void EMapRenderer::EndLayer()
-{
- //NOTE: we do not have to free m_pLayer since the EMap owns it
- m_pLayer = NULL;
-
- //no need to call superclass EndLayer since we are not stylizing
-}
-
-
-void EMapRenderer::EndMap()
-{
- //first we need to replace layer group parent names by the
- //parents' uuids. This is done as post-processing step
- //so that we know all groups are defined first
- for (layerinfo_map::iterator iter = m_hGroups.begin();
- iter != m_hGroups.end(); ++iter)
- {
- RS_LayerUIInfo layerinfo = iter->second;
-
- // correlate the UIGraphic object ID with the layer group object ID
- DWFString uigGuid = GetUIGraphicObjectIdFromLayerObjectId(layerinfo.guid().c_str());
- DWFUIGraphic* pGraphic =
- DWFCORE_ALLOC_OBJECT( DWFUIGraphic(uigGuid,
- layerinfo.graphic().label().c_str(),
- layerinfo.show(),
- !layerinfo.expand()) );
-
- //create a DWF layer group with the correct id
- DWFEMapLayerGroup* pGroup =
- DWFCORE_ALLOC_OBJECT( DWFEMapLayerGroup(layerinfo.name().c_str(),
- layerinfo.guid().c_str(),
- layerinfo.groupguid().c_str(),
- layerinfo.visible(),
- pGraphic) );
-
- // Add the LayerGroup to the Map
- ((DWFEMapSection*)m_pPage)->addLayerGroup(pGroup);
- }
-
- try
- {
- ///////////////////////////////////////////////////////////////////
- // Write out the DWF
-
- DWFFile oDWF( m_dwfFilename.c_str() );
-
- DWFPackageVersionExtension* pVersionExtension =
- DWFCORE_ALLOC_OBJECT( DWFPackageVersionTypeInfoExtension(DWFEMapInterface::kzEMap_ID) );
-
- DWFPackageWriter oWriter( oDWF, L"", pVersionExtension );
-
- DWFInterface* pEMapInterface =
- DWFCORE_ALLOC_OBJECT( DWFEMapInterface(DWFEMapInterface::kzEMap_Name,
- DWFEMapInterface::kzEMap_HRef,
- DWFEMapInterface::kzEMap_ID) );
-
- //the writer takes ownership of the pEMapInterface
- oWriter.addSection( m_pPage, pEMapInterface );
-
- //TODO: extract strings
- oWriter.write( MAP_PRODUCT_AUTHOR,
- MAP_PRODUCT_NAME,
- MAP_PRODUCT_VERSION,
- MAP_PRODUCT_AUTHOR,
- _DWF_FORMAT_EMAP_VERSION_CURRENT_STRING,
- DWFZipFileDescriptor::eZipFastest);
-
- }
- catch (DWFException& )
- {
- _ASSERT(false);
- //TODO: should we just let the mapping service catch that?
- }
-
- //NOTE: we should not free the EMapSection since the DWF owns it
- m_pPage = NULL;
-
- //call super so that temp files are deleted
- DWFRenderer::EndMap();
-}
-
-
-void EMapRenderer::AddLayerGroup(RS_LayerUIInfo& layerInfo)
-{
- //Note we cannot add the layer group to the map here.
- //Layer groups can have otehr layer groups as parents
- //and these may not be available yet so we do not necessarily
- //know their uuid. We need to keep track of all groups and
- //do some post-processing in EndMap
-
- m_hGroups[std::wstring(layerInfo.name())] = layerInfo;
-}
-
-
-DWFImageResource* EMapRenderer::CreateImageResource(unsigned char* data, int len)
-{
- if (len == 0 || data == NULL)
- return NULL;
-
- //create an image resource with the icon and add it to the section
- DWFImageResource* imgRes = DWFCORE_ALLOC_OBJECT( DWFImageResource (
- L"",
- DWFEMAPXML::kzRole_LegendImage, //role
- DWFMIME::kzMIMEType_PNG //mime type
- ));
-
- DWFBufferInputStream* pImageStream = DWFCORE_ALLOC_OBJECT(
- DWFBufferInputStream
- (
- data,
- len
- ));
-
- // configure the resource
- double anTransform[4][4] = { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 };
- double anExtents[4] = { 0, 0, 31, 31 };
- imgRes->configureGraphic( (const double*)anTransform, (const double*)anExtents );
-
- imgRes->setInputStream(pImageStream);
-
- return imgRes;
-}
Deleted: sandbox/jng/v30/Common/Renderers/EMapRenderer.h
===================================================================
--- sandbox/jng/v30/Common/Renderers/EMapRenderer.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/EMapRenderer.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,112 +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 EMAPRENDERER_H
-#define EMAPRENDERER_H
-
-#include "DWFRenderer.h"
-#include <list>
-
-//dwf declare
-namespace DWFCore
-{
- class DWFUUID;
-}
-
-namespace DWFToolkit
-{
- class DWFImageResource;
-
- namespace DWFEMapExtension
- {
- class DWFEMapLayer;
- class DWFEMapLayerGroup;
- }
-}
-
-using namespace DWFCore;
-using namespace DWFToolkit;
-using namespace DWFToolkit::DWFEMapExtension;
-
-typedef std::map<std::wstring, RS_LayerUIInfo> layerinfo_map;
-
-///<summary>
-/// Specialization of DWFRenderer for EMap output.
-///</summary>
-class EMapRenderer : public DWFRenderer
-{
-public:
- RENDERERS_API EMapRenderer(const RS_String& filename,
- const RS_String& agentUri);
-
- RENDERERS_API virtual ~EMapRenderer();
-
-
- ///////////////////////////////////////////////////////////////////
- // DWFRenderer overloads
-
- RENDERERS_API virtual void StartLayer(RS_LayerUIInfo* layerInfo,
- RS_FeatureClassInfo* classInfo);
-
- RENDERERS_API virtual void EndLayer();
-
- RENDERERS_API virtual void StartMap(RS_MapUIInfo* mapInfo,
- RS_Bounds& extents,
- double mapScale,
- double dpi,
- double metersPerUnit,
- CSysTransformer* xformToLL = NULL);
-
- RENDERERS_API virtual void EndMap();
-
- ///////////////////////////////////////////////////////////////////
- // EMap specific stuff:
-
- //adds a scale range to current layer
- RENDERERS_API virtual void AddScaleRange(double min,
- double max,
- std::list<RS_UIGraphic>* uiGraphics);
-
- //defines a layer group
- RENDERERS_API virtual void AddLayerGroup(RS_LayerUIInfo& layerInfo);
-
- //adds a thumbnail graphic
-// RENDERERS_API virtual void AddUIGraphic();
-
- // TODO: For EMapRenderer we also need to overload all geometry
- // stylization functions to do nothing so that we make sure
- // no geometry is sent with GetMap requests. For now we
- // just take care not to send geometry.
-
-private:
- // Hidden copy constructor and assignment operator.
- EMapRenderer(const EMapRenderer&);
- EMapRenderer& operator=(const EMapRenderer&);
-
- DWFImageResource* CreateImageResource(unsigned char* data, int len);
-
- RS_String m_dwfFilename;
- RS_String m_agentUri;
-
- DWFUUID* m_uuid;
-
- DWFEMapLayer* m_pLayer;
-
- layerinfo_map m_hGroups;
-};
-
-#endif
Deleted: sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.cpp
===================================================================
--- sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,601 +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 "stdafx.h"
-#include "EMapUpdateRenderer.h"
-
-#include "dwfcore/File.h"
-#include "dwfcore/String.h"
-#include "dwfcore/MIME.h"
-#include "dwfcore/StreamFileDescriptor.h"
-#include "dwfcore/FileInputStream.h"
-#include "dwfcore/UUID.h"
-#include "dwfcore/BufferOutputStream.h"
-#include "dwfcore/BufferInputStream.h"
-
-#include "dwf/package/writer/PackageWriter.h"
-#include "dwf/package/writer/extensions/6.01/PackageVersionExtension.h"
-#include "dwf/package/GraphicResource.h"
-
-#include "dwfemap/EMapVersion.h"
-#include "dwfemap/package/EMapSection.h"
-#include "dwfemap/package/EMapConstants.h"
-#include "dwfemap/package/Background.h"
-#include "dwfemap/package/CoordinateSpace.h"
-#include "dwfemap/package/Bounds.h"
-#include "dwfemap/package/LinearUnit.h"
-#include "dwfemap/package/EMapInterface.h"
-#include "dwfemap/package/Layer.h"
-#include "dwfemap/package/LayerGroup.h"
-#include "dwfemap/package/transaction/TransactionSection.h"
-#include "dwfemap/package/transaction/UpdateLayer.h"
-#include "dwfemap/package/transaction/AddLayer.h"
-#include "dwfemap/package/transaction/RemoveLayer.h"
-#include "dwfemap/package/transaction/UpdateLayerGroup.h"
-#include "dwfemap/package/transaction/AddLayerGroup.h"
-#include "dwfemap/package/transaction/RemoveLayerGroup.h"
-#include "dwfemap/package/transaction/UpdateUIGraphic.h"
-#include "dwfemap/package/ScaleRange.h"
-#include "dwfemap/package/UIGraphic.h"
-
-#include "ObservationMesh.h"
-#include "RSDWFOutputStream.h"
-
-#define TOP_LABEL_W2D_ZORDER 2000000000.0
-
-
-EMapUpdateRenderer::EMapUpdateRenderer(const RS_String& filename,
- unsigned int sequenceId)
- : DWFRenderer()
-{
- m_uuid = new DWFUUID;
- m_sequenceId = sequenceId;
- m_dwfFilename = filename;
-}
-
-
-EMapUpdateRenderer::~EMapUpdateRenderer()
-{
- delete m_uuid;
-}
-
-
-void EMapUpdateRenderer::StartMap(RS_MapUIInfo* mapInfo,
- RS_Bounds& extents,
- double mapScale,
- double dpi,
- double metersPerUnit,
- CSysTransformer* xformToLL)
-{
- //init super
- DWFRenderer::StartMap(mapInfo, extents, mapScale, dpi, metersPerUnit, xformToLL);
-
- m_bFirst = true;
-
- DWFSource oSource( mapInfo->name().c_str(), MAP_PRODUCT_NAME, L"" );
-
- DWFBackground bg(mapInfo->bgcolor().argb());
-
- DWFBounds mapextent(extents.minx,
- extents.maxx,
- extents.miny,
- extents.maxy);
-
- m_pPage = DWFCORE_ALLOC_OBJECT( DWFEMapTransactionSection(
- mapInfo->name().c_str(), //zTitle
- m_uuid->uuid(false), //zObjectId
- oSource, //rSource
- m_sequenceId,
- mapInfo->guid().c_str()
- ));
-}
-
-
-void EMapUpdateRenderer::EndMap()
-{
- //find W2D to Map coords transform
- //We need to send this to the viewer in the descriptor
-
- RS_Bounds b = GetBounds();
-
- //W2D to page transform
- double anTransform[4][4] = {
- { 1.0 / GetMapToW2DScale(), 0, 0, 0 },
- { 0, 1.0 / GetMapToW2DScale(), 0, 0 },
- { 0, 0, 1, 0 },
- { b.minx-b.width()*0.5, b.miny-b.height()*0.5, 0, 1 }
- };
-
- //W2D clip
- //optional -- don't send for now
- //double anClip[4] = { b.minx, b.miny, b.maxx, b.maxy };
- double* anClip = NULL;
-
- //////////////////////////////////////////////////////////////////////
- // Feature Data resource W2D (one W2D per each map layer)
- //////////////////////////////////////////////////////////////////////
-
- objdefres_list::iterator oditer = m_lAttributeResources.begin();
- layerinfo_list::iterator iditer = m_lLayerInfos.begin();
- for (stream_list::iterator iter = m_lLayerStreams.begin();
- iter != m_lLayerStreams.end(); ++iter, ++iditer, ++oditer)
- {
- std::wstring layerid = (*iditer).guid();
- if (m_bFirst)
- {
- AddW2DResource( *iter,
- *oditer,
- DWFXML::kzRole_Graphics2d,
- layerid.c_str(),
- (const double*)anTransform,
- (const double*)anClip,
- (*iditer).zorder());
- m_bFirst = false;
- }
- else
- {
- AddW2DResource(*iter,
- *oditer,
- DWFXML::kzRole_Graphics2dOverlay,
- layerid.c_str(),
- (const double*)anTransform,
- (const double*)anClip,
- (*iditer).zorder());
- }
- }
-
- //////////////////////////////////////////////////////////////////////
- // Label resource W2D
- //////////////////////////////////////////////////////////////////////
-
- iditer = m_lLayerInfos.begin();
- for (stream_list::iterator iter = m_lLabelStreams.begin();
- iter != m_lLabelStreams.end(); ++iter, ++iditer)
- {
- if (*iter)
- {
- std::wstring layerid = (*iditer).guid();
- AddW2DResource( *iter,
- NULL, //no attribute data for labels
- DWFXML::kzRole_Graphics2dOverlay,
- layerid.c_str(),
- (const double*)anTransform,
- (const double*)anClip,
- TOP_LABEL_W2D_ZORDER - (*iditer).zorder());
- }
- }
-
- //IMPORTANT
- //Since we added the object definition resources to the EMapTransaction
- //section, it now owns them. We need to clear the object resources
- //collection so that DWFRenderer does not clean them out.
- //TODO: this will be cleaned up some day
- m_lAttributeResources.clear();
-
- m_lLayerInfos.clear();
-
- DWFBufferOutputStream* dwfout = NULL;
-
- ////////////////////////////////////////////////////////////////////
- //now save out the observation mesh, if there is one
- //Note: m_obsMesh is protected member of DWFRenderer (the base class)
- if (m_obsMesh)
- {
- dwfout = DWFCORE_ALLOC_OBJECT( DWFBufferOutputStream(16384));
- RSDWFOutputStream rsos(dwfout);
-
- //serialize to XML
- m_obsMesh->WriteXml(&rsos);
-
- //need to define an observation mesh role string constant
- DWFResource* meshRes = DWFCORE_ALLOC_OBJECT( DWFResource(L"", DWFEMAPXML::kzRole_ObservationMesh, DWFMIME::kzMIMEType_XML));
-
- //create an input stream out of the observation mesh stream
- DWFBufferInputStream* is = DWFCORE_ALLOC_OBJECT(DWFBufferInputStream(
- dwfout->buffer(), dwfout->bytes()));
-
- //the resource now owns the input stream
- meshRes->setInputStream(is);
- meshRes->setParentObjectID(m_pPage->objectID());
-
- m_pPage->addResource(meshRes, true);
- }
-
- ///////////////////////////////////////////////////////////////////
- // Write out the DWF
-
- DWFFile oDWF( m_dwfFilename.c_str() );
-
- DWFPackageVersionExtension* pVersionExtension = DWFCORE_ALLOC_OBJECT(
- DWFPackageVersionTypeInfoExtension(DWFEMapInterface::kzEMapTransaction_ID));
-
- DWFPackageWriter oWriter( oDWF, L"", pVersionExtension );
-
- DWFInterface* pEMapInterface =
- DWFCORE_ALLOC_OBJECT( DWFEMapInterface( DWFEMapInterface::kzEMapTransaction_Name,
- DWFEMapInterface::kzEMapTransaction_HRef,
- DWFEMapInterface::kzEMapTransaction_ID) );
-
- //the writer takes ownership of the pEMapInterface
- oWriter.addSection( m_pPage, pEMapInterface );
-
- //TODO: extract strings
- oWriter.write( MAP_PRODUCT_AUTHOR,
- MAP_PRODUCT_NAME,
- MAP_PRODUCT_VERSION,
- MAP_PRODUCT_AUTHOR,
- _DWF_FORMAT_EMAP_VERSION_CURRENT_STRING,
- DWFZipFileDescriptor::eZipFastest);
-
- //free the observation mesh stream if any
- DWFCORE_FREE_OBJECT(dwfout);
-
- //call super to free the W2D Streams
- DWFRenderer::EndMap();
-}
-
-
-void EMapUpdateRenderer::StartLayer(RS_LayerUIInfo* layerInfo,
- RS_FeatureClassInfo* classInfo
- )
-{
- //call super to do W2D stuff
- DWFRenderer::StartLayer(layerInfo, classInfo);
-
- m_lLayerInfos.push_back(*layerInfo);
-}
-
-
-//TODO: take this out if it does nothing.
-void EMapUpdateRenderer::EndLayer()
-{
- //call super to clean up W2D stuff
- DWFRenderer::EndLayer();
-}
-
-
-void EMapUpdateRenderer::AddW2DResource(DWFCore::DWFBufferOutputStream* w2dStream,
- DWFToolkit::DWFObjectDefinitionResource* objdefs,
- const wchar_t* role,
- const wchar_t* parentId,
- const double* transform,
- const double* clip,
- double zorder)
-{
- //
- // define the resource - this must be allocated on the heap
- //
- DWFGraphicResource* p2Dgfx =
- DWFCORE_ALLOC_OBJECT( DWFGraphicResource(L"", // title
- role, //DWFXML::kzRole_Graphics2d, // role
- DWFMIME::kzMIMEType_W2D, // MIME type
- L"", // author
- L"", // description
- L"", // creation time
- L"") ); // modification time
-
- if (p2Dgfx == NULL)
- {
- _DWFCORE_THROW( DWFMemoryException, L"Failed to allocate resource" );
- }
-
- //TODO: parentID should be the scale range ID instead.
- p2Dgfx->setParentObjectID(parentId);
-
- p2Dgfx->configureGraphic( (const double*)transform,
- NULL,
- (const double*)clip,
- true,
- (int)zorder);
-
- //create an input stream out of the W2D output stream
- //Note the output stream will be freed by DWFRenderer::EndMap
- //which happens after the DWF package is created so everything is cool
- DWFBufferInputStream* is = DWFCORE_ALLOC_OBJECT(DWFBufferInputStream(
- w2dStream->buffer(), w2dStream->bytes()));
-
- if (is == NULL)
- {
- DWFCORE_FREE_OBJECT( p2Dgfx );
-
- _DWFCORE_THROW( DWFMemoryException, L"Failed to allocate file stream" );
- }
-
- p2Dgfx->setInputStream( is );
-
- p2Dgfx->setObjectID(m_uuid->next(false));
-
- //
- // finally, drop the resource into the page
- //
- m_pPage->addResource( p2Dgfx, true );
-
- ///////////////////////////////////////////////////////////////////
- // Add the object attribute data to the section
- ///////////////////////////////////////////////////////////////////
- if (objdefs)
- {
- objdefs->setParentObjectID(p2Dgfx->objectID());
- m_pPage->addResource(objdefs, true);
- }
-}
-
-
-void EMapUpdateRenderer::CmdAddLayer(const RS_String& guid)
-{
- //get the previously accumulated layer information
- RS_LayerUIInfo layerInfo = m_hLayerInfoMap[guid];
-
- //see if we actually got a valid structure
- _ASSERT(!layerInfo.guid().empty());
-
- //correlate the UIGraphic object ID with the layer object ID
- DWFString uigGuid = GetUIGraphicObjectIdFromLayerObjectId(layerInfo.guid().c_str());
- DWFUIGraphic* pGraphic = DWFCORE_ALLOC_OBJECT(
- DWFUIGraphic( uigGuid,
- layerInfo.graphic().label().c_str(),
- layerInfo.show(),
- ! layerInfo.expand()
- ));
-
- //Construct a Layer to be added to the Map
- DWFEMapLayer* pLayer = DWFCORE_ALLOC_OBJECT( DWFEMapLayer(
- layerInfo.name().c_str(),
- layerInfo.guid().c_str(), //m_uuid->next(false)
- layerInfo.groupguid().c_str(),
- layerInfo.visible(),
- layerInfo.selectable(),
- layerInfo.editable(),
- pGraphic //UI graphic
- ));
-
- DWFEMapAddLayerCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapAddLayerCommand( pLayer,
- L"")); //TODO: insert after guid
-
- //keep track added layers so that we can also get scale ranges for them
- //via CmdAddScaleRange
- m_hAddedLayers[guid] = pLayer;
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdRemoveLayer(const RS_String& guid)
-{
- //verify the guid is valid
- _ASSERT(!guid.empty());
-
- DWFEMapRemoveLayerCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapRemoveLayerCommand( guid.c_str()));
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdUpdateLayer(const RS_String& guid)
-{
- //get the previously accumulated layer information
- RS_LayerUIInfo layerInfo = m_hLayerInfoMap[guid];
-
- //see if we actually got a valid structure
- _ASSERT(!layerInfo.guid().empty());
-
- DWFEMapUpdateLayerCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapUpdateLayerCommand( layerInfo.guid().c_str(),
- layerInfo.groupguid().c_str(),
- layerInfo.visible(),
- layerInfo.selectable()));
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdAddLayerGroup(const RS_String& guid)
-{
- //get the previously accumulated layer group information
- RS_LayerUIInfo layerInfo = m_hGroups[guid];
-
- //see if we actually got a valid structure
- _ASSERT(!layerInfo.guid().empty());
-
- //correlate the UIGraphic object ID with the layer group object ID
- DWFString uigGuid = GetUIGraphicObjectIdFromLayerObjectId(layerInfo.guid().c_str());
- DWFUIGraphic* pGraphic = DWFCORE_ALLOC_OBJECT(
- DWFUIGraphic( uigGuid,
- layerInfo.graphic().label().c_str(),
- layerInfo.show(),
- ! layerInfo.expand()
- ));
-
- //Construct a Layer to be added to the Map
- DWFEMapLayerGroup* pLayer = DWFCORE_ALLOC_OBJECT( DWFEMapLayerGroup(
- layerInfo.name().c_str(),
- layerInfo.guid().c_str(),
- layerInfo.groupguid().c_str(),
- layerInfo.visible(),
- pGraphic //UI graphic
- ));
-
- DWFEMapAddLayerGroupCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapAddLayerGroupCommand( pLayer,
- L"" )); //TODO: insert after guid
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdRemoveLayerGroup(const RS_String& guid)
-{
- //verify the guid is valid
- _ASSERT(!guid.empty());
-
- DWFEMapRemoveLayerGroupCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapRemoveLayerGroupCommand( guid.c_str()));
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdUpdateLayerGroup(const RS_String& guid)
-{
- //get the previously accumulated layer group information
- RS_LayerUIInfo layerInfo = m_hGroups[guid];
-
- //see if we actually got a valid structure
- _ASSERT(!layerInfo.guid().empty());
-
- DWFEMapUpdateLayerGroupCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapUpdateLayerGroupCommand( layerInfo.guid().c_str(),
- layerInfo.groupguid().c_str(),
- layerInfo.visible()));
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdUpdateUIGraphicForLayer(const RS_String& guid)
-{
- //get the previously accumulated layer information
- RS_LayerUIInfo layerInfo = m_hLayerInfoMap[guid];
-
- //see if we actually got a valid structure
- _ASSERT(!layerInfo.guid().empty());
-
- //get the UIGraphic object ID correlated with the layer object ID
- DWFString uigGuid = GetUIGraphicObjectIdFromLayerObjectId(layerInfo.guid().c_str());
- DWFEMapUpdateUIGraphicCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapUpdateUIGraphicCommand( uigGuid,
- layerInfo.graphic().label().c_str(),
- layerInfo.show()));
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-}
-
-
-void EMapUpdateRenderer::CmdUpdateUIGraphicForLayerGroup(const RS_String& guid)
-{
- //get the previously accumulated layer group information
- RS_LayerUIInfo layerInfo = m_hGroups[guid];
-
- //see if we actually got a valid structure
- _ASSERT(!layerInfo.guid().empty());
-
- //get the UIGraphic object ID correlated with the layer group object ID
- DWFString uigGuid = GetUIGraphicObjectIdFromLayerObjectId(layerInfo.guid().c_str());
- DWFEMapUpdateUIGraphicCommand* cmd = DWFCORE_ALLOC_OBJECT(
- DWFEMapUpdateUIGraphicCommand( uigGuid,
- layerInfo.graphic().label().c_str(),
- layerInfo.show()));
-
- ((DWFEMapTransactionSection*)m_pPage)->addCommand(cmd);
-
-}
-
-
-void EMapUpdateRenderer::AddLayerGroupInfo(RS_LayerUIInfo& layerInfo)
-{
- //In GetMapUpdate, unlike GetMap, we index by GUID, not name
- //in order to deal with transaction commands easier
- m_hGroups[std::wstring(layerInfo.guid())] = layerInfo;
-}
-
-
-void EMapUpdateRenderer::AddLayerInfo(RS_LayerUIInfo& layerInfo)
-{
- //In GetMapUpdate, unlike GetMap, we index by GUID, not name
- //in order to deal with transaction commands easier
- m_hLayerInfoMap[std::wstring(layerInfo.guid())] = layerInfo;
-}
-
-
-//note this has to be called after we know about the layer added command
-//since it relies on the EMap layer already existing -- it is confusing
-//and ambiguous unfortunately
-//This is because we do the layer command processing outside of the normal
-//StartLayer->EndLayer loop, which the EMapRenderer has the luxury of using,
-//since EMapRenderer does not need to worry about generating layer graphics also
-void EMapUpdateRenderer::AddScaleRange(RS_String& layerGuid,
- double min,
- double max,
- std::list<RS_UIGraphic>* uiGraphics)
-{
- DWFEMapLayer* pLayer = m_hAddedLayers[layerGuid];
-
- // Construct two scaleRanges to add to the Layer
- DWFScaleRange* pScaleR = DWFCORE_ALLOC_OBJECT( DWFScaleRange(
- m_uuid->next(false), // ObjectId
- min, // Min
- max)); // Max
-
- // Add the Scale Range to the Layer
- pLayer->addScaleRange(pScaleR);
-
- //now add the theming ui graphics for this scale range
- if (uiGraphics)
- {
- std::list<RS_UIGraphic>::iterator iter = uiGraphics->begin();
- for (; iter != uiGraphics->end(); ++iter)
- {
- // no need to correlate the UIGraphic object ID with any other object ID
- DWFUIGraphic* pGraphic = DWFCORE_ALLOC_OBJECT(
- DWFUIGraphic( m_uuid->next(false), (*iter).label().c_str(), true, false));
-
- pScaleR->addUIGraphic(pGraphic);
-
- if ((*iter).length() > 0 && (*iter).data())
- {
- DWFImageResource* imgRes = CreateImageResource((*iter).data(), (*iter).length());
- if (imgRes)
- {
- imgRes->setParentObjectID(pGraphic->objectID());
- ((DWFEMapTransactionSection*)m_pPage)->addResource(imgRes, true);
- }
- }
- }
- }
-}
-
-
-DWFImageResource* EMapUpdateRenderer::CreateImageResource(unsigned char* data, int len)
-{
- if (len == 0 || data == NULL)
- return NULL;
-
- //create an image resource with the icon and add it to the section
- DWFImageResource* imgRes = DWFCORE_ALLOC_OBJECT( DWFImageResource (
- L"",
- DWFEMAPXML::kzRole_LegendImage, //role
- DWFMIME::kzMIMEType_PNG //mime type
- ));
-
- DWFBufferInputStream* pImageStream = DWFCORE_ALLOC_OBJECT(
- DWFBufferInputStream
- (
- data,
- len
- ));
-
- // configure the resource
- double anTransform[4][4] = { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 };
- double anExtents[4] = { 0, 0, 31, 31 };
- imgRes->configureGraphic( (const double*)anTransform, (const double*)anExtents );
-
- imgRes->setInputStream(pImageStream);
-
- return imgRes;
-}
Deleted: sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.h
===================================================================
--- sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/EMapUpdateRenderer.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,126 +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 EMAPUPDATERENDERER_H
-#define EMAPUPDATERENDERER_H
-
-#include "DWFRenderer.h"
-#include <list>
-
-//dwf declare
-namespace DWFCore
-{
- class DWFUUID;
-}
-
-namespace DWFToolkit
-{
- class DWFObjectDefinitionResource;
- class DWFImageResource;
-
- namespace DWFEMapExtension
- {
- class DWFEMapLayer;
- }
-}
-
-using namespace DWFCore;
-using namespace DWFToolkit;
-using namespace DWFToolkit::DWFEMapExtension;
-
-typedef std::map<std::wstring, RS_LayerUIInfo> layerinfo_map;
-typedef std::vector<RS_LayerUIInfo> layerinfo_list;
-
-///<summary>
-/// Specialization of DWFRenderer for EMap output.
-///</summary>
-class EMapUpdateRenderer : public DWFRenderer
-{
-public:
- RENDERERS_API EMapUpdateRenderer(const RS_String& filename,
- unsigned int sequenceId);
-
- RENDERERS_API virtual ~EMapUpdateRenderer();
-
- RENDERERS_API virtual void StartMap(RS_MapUIInfo* mapInfo,
- RS_Bounds& extents,
- double mapScale,
- double dpi,
- double metersPerUnit,
- CSysTransformer* xformToLL);
-
- RENDERERS_API virtual void EndMap();
-
- RENDERERS_API virtual void StartLayer(RS_LayerUIInfo* layerInfo,
- RS_FeatureClassInfo* classInfo);
-
- RENDERERS_API virtual void EndLayer();
-
- RENDERERS_API void AddLayerGroupInfo(RS_LayerUIInfo& layerInfo);
- RENDERERS_API void AddLayerInfo(RS_LayerUIInfo& layerInfo);
-
- RENDERERS_API virtual void CmdAddLayer(const RS_String& guid);
- RENDERERS_API virtual void CmdRemoveLayer(const RS_String& guid);
- RENDERERS_API virtual void CmdUpdateLayer(const RS_String& guid);
- RENDERERS_API virtual void CmdAddLayerGroup(const RS_String& guid);
- RENDERERS_API virtual void CmdRemoveLayerGroup(const RS_String& guid);
- RENDERERS_API virtual void CmdUpdateLayerGroup(const RS_String& guid);
- RENDERERS_API virtual void CmdUpdateUIGraphicForLayer(const RS_String& guid);
- RENDERERS_API virtual void CmdUpdateUIGraphicForLayerGroup(const RS_String& guid);
-
- //TODO
- RENDERERS_API virtual void AddScaleRange(RS_String& layerGuid,
- double min,
- double max,
- std::list<RS_UIGraphic>* uiGraphics );
-
-private:
- // Hidden copy constructor and assignment operator.
- EMapUpdateRenderer(const EMapUpdateRenderer&);
- EMapUpdateRenderer& operator=(const EMapUpdateRenderer&);
-
- void AddW2DResource(DWFCore::DWFBufferOutputStream* w2dStream,
- DWFToolkit::DWFObjectDefinitionResource* objdefs,
- const wchar_t* role,
- const wchar_t* parentId,
- const double* transform,
- const double* clip,
- double zorder);
-
- DWFImageResource* CreateImageResource(unsigned char* data, int len);
-
- bool m_bFirst;
- DWFUUID* m_uuid;
- std::wstring m_dwfFilename;
- unsigned int m_sequenceId;
-
- layerinfo_map m_hGroups;
-
- //Note: we have both a list and a map for the layer info structures
- //in order to ensure that less assumptions are made as to how
- //the API of this class is called. In the normal Start-EndLayer loop
- //all we need is a list of the layer infos so that we can iterate over them
- //at the end when writing out the DWF.
- //On the other hand the map is used only for the EMap transaction commands.
- //This way the commands are separate from generation of useful things like
- //graphics.
- layerinfo_map m_hLayerInfoMap;
- layerinfo_list m_lLayerInfos;
- std::map<RS_String, DWFEMapLayer*> m_hAddedLayers;
-};
-
-#endif
Modified: sandbox/jng/v30/Common/Renderers/Makefile.am
===================================================================
--- sandbox/jng/v30/Common/Renderers/Makefile.am 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/Makefile.am 2014-06-16 12:48:47 UTC (rev 8226)
@@ -25,8 +25,6 @@
../../Oem/agg-2.4/font_freetype/agg_font_freetype.cpp \
CriticalSection.cpp \
DWFRenderer.cpp \
- EMapRenderer.cpp \
- EMapUpdateRenderer.cpp \
EPlotRenderer.cpp \
FontManager.cpp \
GDFillPatterns.cpp \
@@ -56,8 +54,6 @@
CriticalSection.h \
DWFRenderer.h \
DWFRSInputStream.h \
- EMapRenderer.h \
- EMapUpdateRenderer.h \
EPlotRenderer.h \
FontManager.h \
GDFillPatterns.h \
@@ -92,10 +88,8 @@
../../Oem/gd/lpng/libpng.a \
../../Oem/agg-2.4/src/libagg.a \
-ldwfcore \
- -ldwftk \
- -ldwfemap
+ -ldwftk
libMgRenderers_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../Oem/DWFTK7.1/develop/global/src/dwfcore/.libs \
- -L../../Oem/DWFTK7.1/develop/global/src/dwf/.libs \
- -L../../Oem/DWFTK7.1/develop/global/src/dwfemap/.libs
+ -L../../Oem/DWFTK7.1/develop/global/src/dwf/.libs
Modified: sandbox/jng/v30/Common/Renderers/Renderers.vcxproj
===================================================================
--- sandbox/jng/v30/Common/Renderers/Renderers.vcxproj 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/Renderers.vcxproj 2014-06-16 12:48:47 UTC (rev 8226)
@@ -105,7 +105,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;emaptk_wt.1.0.0.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderersd.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\Oem\DWFTK7.1\develop\global\lib\static\$(Configuration);..\..\Oem\gd\build\win32\gd\$(Configuration);..\..\Oem\gd\freetype\objs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -134,7 +134,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;emaptk_wt.1.0.0.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderersd.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\Oem\DWFTK7.1\develop\global\lib\static\$(Configuration)64;..\..\Oem\gd\build\win32\gd\$(Configuration)64;..\..\Oem\gd\freetype\objs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -164,7 +164,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;emaptk_wt.1.0.0.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderers.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\Oem\DWFTK7.1\develop\global\lib\static\$(Configuration);..\..\Oem\gd\build\win32\gd\$(Configuration);..\..\Oem\gd\freetype\objs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -199,7 +199,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;emaptk_wt.1.0.0.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dwfcore_wt.1.1.1.lib;dwftk_wt.7.1.1.lib;whiptk_wt.7.7.601.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderers.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\Oem\DWFTK7.1\develop\global\lib\static\$(Configuration)64;..\..\Oem\gd\build\win32\gd\$(Configuration)64;..\..\Oem\gd\freetype\objs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -217,8 +217,6 @@
<ClCompile Include="MapQuantization.cpp" />
<ClCompile Include="SymbolTrans.cpp" />
<ClCompile Include="DWFRenderer.cpp" />
- <ClCompile Include="EMapRenderer.cpp" />
- <ClCompile Include="EMapUpdateRenderer.cpp" />
<ClCompile Include="EPlotRenderer.cpp" />
<ClCompile Include="W2DRewriter.cpp" />
<ClCompile Include="complex_polygon_gd.cpp" />
@@ -264,8 +262,6 @@
<ClInclude Include="SymbolTrans.h" />
<ClInclude Include="DWFRenderer.h" />
<ClInclude Include="DWFRSInputStream.h" />
- <ClInclude Include="EMapRenderer.h" />
- <ClInclude Include="EMapUpdateRenderer.h" />
<ClInclude Include="EPlotRenderer.h" />
<ClInclude Include="RSDWFInputStream.h" />
<ClInclude Include="RSDWFOutputStream.h" />
Modified: sandbox/jng/v30/Common/Renderers/Renderers.vcxproj.filters
===================================================================
--- sandbox/jng/v30/Common/Renderers/Renderers.vcxproj.filters 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Common/Renderers/Renderers.vcxproj.filters 2014-06-16 12:48:47 UTC (rev 8226)
@@ -30,12 +30,6 @@
<ClCompile Include="DWFRenderer.cpp">
<Filter>DWFRenderers</Filter>
</ClCompile>
- <ClCompile Include="EMapRenderer.cpp">
- <Filter>DWFRenderers</Filter>
- </ClCompile>
- <ClCompile Include="EMapUpdateRenderer.cpp">
- <Filter>DWFRenderers</Filter>
- </ClCompile>
<ClCompile Include="EPlotRenderer.cpp">
<Filter>DWFRenderers</Filter>
</ClCompile>
@@ -131,12 +125,6 @@
<ClInclude Include="DWFRSInputStream.h">
<Filter>DWFRenderers</Filter>
</ClInclude>
- <ClInclude Include="EMapRenderer.h">
- <Filter>DWFRenderers</Filter>
- </ClInclude>
- <ClInclude Include="EMapUpdateRenderer.h">
- <Filter>DWFRenderers</Filter>
- </ClInclude>
<ClInclude Include="EPlotRenderer.h">
<Filter>DWFRenderers</Filter>
</ClInclude>
Modified: sandbox/jng/v30/Oem/oem.sln
===================================================================
--- sandbox/jng/v30/Oem/oem.sln 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Oem/oem.sln 2014-06-16 12:48:47 UTC (rev 8226)
@@ -63,8 +63,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWFCore", "DWFTK7.1\develop\global\build\VS\DWFCore\DWFCore.vcxproj", "{8BECE007-1749-4300-87D8-267B613AAE6B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF EMap Toolkit (1.0.0)", "DWFTK7.1\develop\global\build\VS\DWFEMapToolkit\DWFEMap.vcxproj", "{B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWFToolkit (7.1.1)", "DWFTK7.1\develop\global\build\VS\DWFToolkit\DWFToolkit.vcxproj", "{2D22C637-6219-4096-8399-EEA4BBD142AA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W3D Toolkit (1.2.1236)", "DWFTK7.1\develop\global\build\VS\W3DToolkit\W3DToolkit.vcxproj", "{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}"
@@ -306,14 +304,6 @@
{8BECE007-1749-4300-87D8-267B613AAE6B}.Release|Win32.Build.0 = Release (Read-Write WChar LIB)|Win32
{8BECE007-1749-4300-87D8-267B613AAE6B}.Release|x64.ActiveCfg = Release (Read-Write WChar LIB)|x64
{8BECE007-1749-4300-87D8-267B613AAE6B}.Release|x64.Build.0 = Release (Read-Write WChar LIB)|x64
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Debug|Win32.ActiveCfg = Debug (Read-Write WChar LIB)|Win32
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Debug|Win32.Build.0 = Debug (Read-Write WChar LIB)|Win32
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Debug|x64.ActiveCfg = Debug (Read-Write WChar LIB)|x64
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Debug|x64.Build.0 = Debug (Read-Write WChar LIB)|x64
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Release|Win32.ActiveCfg = Release (Read-Write WChar LIB)|Win32
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Release|Win32.Build.0 = Release (Read-Write WChar LIB)|Win32
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Release|x64.ActiveCfg = Release (Read-Write WChar LIB)|x64
- {B3FC0127-BE6A-48DE-A90D-1F3AA2DE968D}.Release|x64.Build.0 = Release (Read-Write WChar LIB)|x64
{2D22C637-6219-4096-8399-EEA4BBD142AA}.Debug|Win32.ActiveCfg = Debug (Read-Write WChar LIB)|Win32
{2D22C637-6219-4096-8399-EEA4BBD142AA}.Debug|Win32.Build.0 = Debug (Read-Write WChar LIB)|Win32
{2D22C637-6219-4096-8399-EEA4BBD142AA}.Debug|x64.ActiveCfg = Debug (Read-Write WChar LIB)|x64
Modified: sandbox/jng/v30/Server/src/Services/Mapping/Makefile.am
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/Makefile.am 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/Makefile.am 2014-06-16 12:48:47 UTC (rev 8226)
@@ -39,8 +39,6 @@
OpDescribeRuntimeMap.cpp \
OpGenerateLegendImage.cpp \
OpGenerateLegendPlot.cpp \
- OpGenerateMap.cpp \
- OpGenerateMapUpdate.cpp \
OpGenerateMultiPlot.cpp \
OpGeneratePlot.cpp \
OpQueryFeatures.cpp \
@@ -62,8 +60,6 @@
OpDescribeRuntimeMap.h \
OpGenerateLegendImage.h \
OpGenerateLegendPlot.h \
- OpGenerateMap.h \
- OpGenerateMapUpdate.h \
OpGenerateMultiPlot.h \
OpGeneratePlot.h \
OpQueryFeatures.h \
Modified: sandbox/jng/v30/Server/src/Services/Mapping/MappingOperationFactory.cpp
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/MappingOperationFactory.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/MappingOperationFactory.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -20,8 +20,6 @@
#include "OpCreateRuntimeMap.h"
#include "OpDescribeRuntimeMap.h"
-#include "OpGenerateMap.h"
-#include "OpGenerateMapUpdate.h"
#include "OpGeneratePlot.h"
#include "OpGenerateMultiPlot.h"
#include "OpGenerateLegendPlot.h"
@@ -77,30 +75,6 @@
MG_TRY()
switch (operationId)
{
- case MgMappingService::opIdGenerateMap:
- switch (VERSION_NO_PHASE(operationVersion))
- {
- case VERSION_SUPPORTED(1,0):
- handler.reset(new MgOpGenerateMap());
- break;
- default:
- throw new MgInvalidOperationVersionException(
- L"MgDrawingOperationFactory.GetOperation", __LINE__, __WFILE__, NULL, L"", NULL);
- }
- break;
-
- case MgMappingService::opIdGenerateMapUpdate:
- switch (VERSION_NO_PHASE(operationVersion))
- {
- case VERSION_SUPPORTED(1,0):
- handler.reset(new MgOpGenerateMapUpdate());
- break;
- default:
- throw new MgInvalidOperationVersionException(
- L"MgDrawingOperationFactory.GetOperation", __LINE__, __WFILE__, NULL, L"", NULL);
- }
- break;
-
case MgMappingService::opIdGeneratePlot:
switch (VERSION_NO_PHASE(operationVersion))
{
Deleted: sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.cpp
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,123 +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 "ServerMappingServiceDefs.h"
-#include "OpGenerateMap.h"
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Constructs the object.
-/// </summary>
-///----------------------------------------------------------------------------
-MgOpGenerateMap::MgOpGenerateMap()
-{
-}
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Destructs the object.
-/// </summary>
-///----------------------------------------------------------------------------
-MgOpGenerateMap::~MgOpGenerateMap()
-{
-}
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Executes the operation.
-/// </summary>
-///
-/// <exceptions>
-/// MgException
-/// </exceptions>
-///----------------------------------------------------------------------------
-void MgOpGenerateMap::Execute()
-{
- ACE_DEBUG((LM_DEBUG, ACE_TEXT(" (%t) MgOpGenerateMap::Execute()\n")));
-
- MG_LOG_OPERATION_MESSAGE(L"GenerateMap");
-
- MG_TRY()
-
- MG_LOG_OPERATION_MESSAGE_INIT(m_packet.m_OperationVersion, m_packet.m_NumArguments);
-
- ACE_ASSERT(m_stream != NULL);
-
- if (4 == m_packet.m_NumArguments)
- {
- STRING sessionId, mapAgentUri;
- Ptr<MgMap> map = (MgMap*)m_stream->GetObject();
- Ptr<MgResourceIdentifier> resource = map->GetResourceId();
- map->SetDelayedLoadResourceService(m_resourceService);
-
- m_stream->GetString(sessionId);
- m_stream->GetString(mapAgentUri);
- Ptr<MgDwfVersion> dwfVersion = (MgDwfVersion*)m_stream->GetObject();
- STRING version = dwfVersion->GetFileVersion();
- version += L"/";
- version += dwfVersion->GetSchemaVersion();
-
- BeginExecution();
-
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
- MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == resource) ? L"MgResourceIdentifier" : resource->ToString().c_str());
- MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(sessionId.c_str());
- MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(mapAgentUri.c_str());
- MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(version);
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
-
- Validate();
-
- Ptr<MgByteReader> byteReader =
- m_service->GenerateMap(map, sessionId, mapAgentUri, dwfVersion);
-
- EndExecution(byteReader);
- }
- else
- {
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- }
-
- if (!m_argsRead)
- {
- throw new MgOperationProcessingException(L"MgOpGenerateMap.Execute",
- __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- // Successful operation
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
-
- MG_CATCH(L"MgOpGenerateMap.Execute")
-
- if (mgException != NULL)
- {
- // Failed operation
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- }
-
- // Add access log entry for operation
- MG_LOG_OPERATION_MESSAGE_ACCESS_ENTRY();
-
- MG_THROW()
-}
Deleted: sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.h
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMap.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,31 +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_OP_GENERATE_MAP_H
-#define MG_OP_GENERATE_MAP_H
-
-class MgOpGenerateMap : public MgMappingOperation
-{
- public:
- MgOpGenerateMap();
- virtual ~MgOpGenerateMap();
-
- public:
- virtual void Execute();
-};
-
-#endif
Deleted: sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.cpp
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,119 +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 "ServerMappingServiceDefs.h"
-#include "OpGenerateMapUpdate.h"
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Constructs the object.
-/// </summary>
-///----------------------------------------------------------------------------
-MgOpGenerateMapUpdate::MgOpGenerateMapUpdate()
-{
-}
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Destructs the object.
-/// </summary>
-///----------------------------------------------------------------------------
-MgOpGenerateMapUpdate::~MgOpGenerateMapUpdate()
-{
-}
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Executes the operation.
-/// </summary>
-///
-/// <exceptions>
-/// MgException
-/// </exceptions>
-///----------------------------------------------------------------------------
-void MgOpGenerateMapUpdate::Execute()
-{
- ACE_DEBUG((LM_DEBUG, ACE_TEXT(" (%t) MgOpGenerateMapUpdate::Execute()\n")));
-
- MG_LOG_OPERATION_MESSAGE(L"GenerateMapUpdate");
-
- MG_TRY()
-
- MG_LOG_OPERATION_MESSAGE_INIT(m_packet.m_OperationVersion, m_packet.m_NumArguments);
-
- ACE_ASSERT(m_stream != NULL);
-
- if (3 == m_packet.m_NumArguments)
- {
- INT32 seqNo;
- Ptr<MgMap> map = (MgMap*)m_stream->GetObject();
- Ptr<MgResourceIdentifier> resource = map->GetResourceId();
- map->SetDelayedLoadResourceService(m_resourceService);
-
- m_stream->GetInt32(seqNo);
- Ptr<MgDwfVersion> dwfVersion = (MgDwfVersion*)m_stream->GetObject();
- STRING version = dwfVersion->GetFileVersion();
- version += L"/";
- version += dwfVersion->GetSchemaVersion();
-
- BeginExecution();
-
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
- MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == resource) ? L"MgResourceIdentifier" : resource->ToString().c_str());
- MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
- MG_LOG_OPERATION_MESSAGE_ADD_INT32(seqNo);
- MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(version);
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
-
- Validate();
-
- Ptr<MgByteReader> byteReader = m_service->GenerateMapUpdate(map, seqNo, dwfVersion);
-
- EndExecution(byteReader);
- }
- else
- {
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
- MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- }
-
- if (!m_argsRead)
- {
- throw new MgOperationProcessingException(L"MgOpGenerateMapUpdate.Execute",
- __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- // Successful operation
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
-
- MG_CATCH(L"MgOpGenerateMapUpdate.Execute")
-
- if (mgException != NULL)
- {
- // Failed operation
- MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- }
-
- // Add access log entry for operation
- MG_LOG_OPERATION_MESSAGE_ACCESS_ENTRY();
-
- MG_THROW()
-}
Deleted: sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.h
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/OpGenerateMapUpdate.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,31 +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_OP_GENERATE_MAP_UPDATE_H
-#define MG_OP_GENERATE_MAP_UPDATE_H
-
-class MgOpGenerateMapUpdate : public MgMappingOperation
-{
- public:
- MgOpGenerateMapUpdate();
- virtual ~MgOpGenerateMapUpdate();
-
- public:
- virtual void Execute();
-};
-
-#endif
Modified: sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -25,8 +25,6 @@
#include "MappingUtil.h"
#include "EPlotRenderer.h"
-#include "EMapRenderer.h"
-#include "EMapUpdateRenderer.h"
#include "DefaultStylizer.h"
@@ -137,620 +135,6 @@
///----------------------------------------------------------------------------
/// <summary>
-/// Generates an EMap DWF that describes the specified map
-/// </summary>
-/// <param name="map">
-/// Map object describing current state of map
-/// </param>
-/// <param name="sessionId">
-/// Session identifier for client
-/// </param>
-/// <param name="mapAgentUri">
-/// Http Uri for map agent
-/// </param>
-/// <param name="dwfVersion">
-/// DWF specification supported/required by the client. The DWF spec determines the
-/// schema and file versions used to generate the DWFs sent back to the client.
-/// </param>
-/// <returns>
-/// An EMap DWF
-/// </returns>
-/// <exceptions>
-/// MgException
-/// </exceptions>
-///----------------------------------------------------------------------------
-MgByteReader* MgServerMappingService::GenerateMap(MgMap* map,
- CREFSTRING sessionId, CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion)
-{
- Ptr<MgByteReader> byteReader;
- std::vector<MgByte*> uiGraphicSources;
-
- MG_SERVER_MAPPING_SERVICE_TRY()
-
- MG_LOG_TRACE_ENTRY(L"MgServerMappingService::GenerateMap()");
-
- //TODO: uncomment once dwf version is serializable and comes in
- if (0 == map || sessionId.empty() || mapAgentUri.empty() || 0 == dwfVersion)
- {
- throw new MgNullArgumentException(
- L"MgServerMappingService.GenerateMap", __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- if (m_svcResource == NULL)
- InitializeResourceService();
-
- //temporary place for the resId of the Map
- Ptr<MgResourceIdentifier> mapResId = map->GetMapDefinition();
-
- //get the map definition
- auto_ptr<MdfModel::MapDefinition> mdf(MgMappingUtil::GetMapDefinition(m_svcResource, mapResId));
-
- MdfModel::Box2D box = mdf->GetExtents();
- RS_Bounds b(box.GetMinX(),
- box.GetMinY(),
- box.GetMaxX(),
- box.GetMaxY());
-
- //get a temporary file to write out EMap DWF to
- STRING dwfName = MgFileUtil::GenerateTempFileName(false, mdf->GetName());
-
- EMapRenderer dr(dwfName, mapAgentUri);
-
- dr.SetRasterGridSize(m_rasterGridSize);
- dr.SetMinRasterGridSize(m_minRasterGridSize);
- dr.SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
- dr.SetMaxRasterImageWidth(m_maxRasterImageWidth);
- dr.SetMaxRasterImageHeight(m_maxRasterImageHeight);
-
- //get the coordinate system unit scale
- MdfModel::MdfString srs = map->GetMapSRS();
-
- Ptr<MgCoordinateSystem> cs;
-
- if (!srs.empty())
- {
- //let's not fail here if coord sys conversion fails for the
- //map's coordinate system. Instead we will fail per layer at a later stage
- try
- {
- cs = m_pCSFactory->Create(srs);
- }
- catch (MgInvalidCoordinateSystemException* e)
- {
- e->Release();
- }
- }
-
- double metersPerUnit = (cs.p) ? cs->ConvertCoordinateSystemUnitsToMeters(1.0) : 1.0;
- RS_String units = (cs.p) ? cs->GetUnits() : L"";
-
- RS_Color bgcolor;
- StylizationUtil::ParseColor( mdf->GetBackgroundColor(), bgcolor);
-
- //These should not matter for GenerateMap
- Ptr<MgPoint> ptCenter = map->GetViewCenter();
- Ptr<MgCoordinate> coord = ptCenter->GetCoordinate();
- double dMapScale = map->GetViewScale();
- double dpi = map->GetDisplayDpi();
-
- RS_MapUIInfo mapInfo(sessionId, mapResId->GetName(), map->GetObjectId(), srs, units, bgcolor, coord->GetX(), coord->GetY(), dMapScale);
-
- dr.StartMap(&mapInfo, b, dMapScale, dpi, metersPerUnit);
-
- //do layer groups
- Ptr<MgLayerGroupCollection> mggroups = map->GetLayerGroups();
-
- //add the groups first.
- //This is important to do before we do any layers
- //so that the layers can later find the guids for the groups.
- for (int k=0; k<mggroups->GetCount(); k++)
- {
- Ptr<MgLayerGroup> mggroup = mggroups->GetItem(k);
- Ptr<MgLayerGroup> mgparent = mggroup->GetGroup();
-
- //layer legend and ui specific information
- RS_UIGraphic uig(NULL, 0, mggroup->GetLegendLabel());
- RS_LayerUIInfo layerInfo( mggroup->GetName(),
- L"",
- mggroup->GetObjectId(),
- false, // selectable - does not apply to groups
- mggroup->GetVisible(),
- true, // editable - does not apply to groups
- (mgparent.p) ? mgparent->GetName() : L"",
- (mgparent.p) ? mgparent->GetObjectId() : L"",
- mggroup->GetDisplayInLegend(),
- mggroup->GetExpandInLegend(),
- 0.0, // zorder - does not apply to groups
- uig);
-
- dr.AddLayerGroup(layerInfo);
- }
-
- //now do the layers
- Ptr<MgLayerCollection> mglayers = map->GetLayers();
-
- //iterate over layers
- for (int i = 0; i < mglayers->GetCount(); i++)
- {
- Ptr<MgLayerBase> mglayer = mglayers->GetItem(i);
- Ptr<MgLayerGroup> mgparent = mglayer->GetGroup();
-
- //get layer definition
- Ptr<MgResourceIdentifier> resId = mglayer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
-
- //base map layers are not editable
- bool bEditable = true;
- if (mglayer->GetLayerType() == MgLayerType::BaseMap)
- bEditable = false;
-
- //layer legend and ui specific information
- Ptr<MgResourceIdentifier> layerDefId = mglayer->GetLayerDefinition();
- RS_UIGraphic uig(NULL, 0, mglayer->GetLegendLabel());
- RS_LayerUIInfo layerInfo( mglayer->GetName(),
- layerDefId->ToString(),
- mglayer->GetObjectId(),
- mglayer->GetSelectable(),
- mglayer->GetVisible(),
- bEditable,
- (mgparent.p)? mgparent->GetName() : L"",
- (mgparent.p)? mgparent->GetObjectId() : L"",
- mglayer->GetDisplayInLegend(),
- mglayer->GetExpandInLegend(),
- -mglayer->GetDisplayOrder(),
- uig);
-
- MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
- MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
- MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
-
- if (vl) // vector layer
- {
- dr.StartLayer(&layerInfo, NULL); //send null property mapping here
- //since it only matters when we stylize actual data
-
- MdfModel::VectorScaleRangeCollection* scr = vl->GetScaleRanges();
-
- for (int j=0; j < scr->GetCount(); j++)
- {
- MdfModel::VectorScaleRange* sr = scr->GetAt(j);
- std::list<RS_UIGraphic> uiGraphics;
-
- MakeUIGraphicsForScaleRange(uiGraphics, uiGraphicSources, sr);
-
- dr.AddScaleRange(sr->GetMinScale(), sr->GetMaxScale(), &uiGraphics);
- }
-
- dr.EndLayer();
- }
- else if (dl) // drawing layer
- {
- dr.StartLayer(&layerInfo, NULL);
-
- //it's a hardcoded icon
- std::list<RS_UIGraphic> uiGraphics;
- RS_UIGraphic gr((unsigned char*)DWF_LAYER_ICON, sizeof(DWF_LAYER_ICON), L"");
- uiGraphics.push_back(gr);
-
- dr.AddScaleRange( dl->GetMinScale(), dl->GetMaxScale(), &uiGraphics);
-
- dr.EndLayer();
- }
- else if (gl) // grid (raster) layer
- {
- dr.StartLayer(&layerInfo, NULL); //send null property mapping here
- //since it only matters when we stylize actual data
-
- MdfModel::GridScaleRangeCollection* scr = gl->GetScaleRanges();
-
- for (int j=0; j < scr->GetCount(); j++)
- {
- MdfModel::GridScaleRange* sr = scr->GetAt(j);
-
- //hardcoded graphic
- std::list<RS_UIGraphic> uiGraphics;
- RS_UIGraphic gr((unsigned char*)RASTER_LAYER_ICON, sizeof(RASTER_LAYER_ICON), L"");
- uiGraphics.push_back(gr);
-
- dr.AddScaleRange(sr->GetMinScale(), sr->GetMaxScale(), &uiGraphics);
- }
-
- dr.EndLayer();
- }
- }
-
- dr.EndMap();
-
- //write out the file
- Ptr<MgByteSource> bs = new MgByteSource(dwfName, true);
-
- bs->SetMimeType(MgMimeType::Dwf);
- byteReader = bs->GetReader();
-
- MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GenerateMap")
-
- //release legend bitmap buffers
- for (std::vector<MgByte*>::iterator iter = uiGraphicSources.begin(); iter != uiGraphicSources.end(); iter++)
- {
- if (*iter)
- (*iter)->Release();
- }
-
- return byteReader.Detach();
-}
-
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Generates an EMapTransaction DWF that contains any required updates to the EMap
-/// meta-data and layer graphics based on the state of the specified map
-/// </summary>
-/// <param name="map">
-/// Map object specifying current state of map
-/// </param>
-/// <param name="seqNo">
-/// Update sequence number
-/// </param>
-/// <param name="dwfVersion">
-/// DWF specification supported/required by the client. The DWF spec determines the
-/// schema and file versions used to generate the DWFs sent back to the client.
-/// </param>
-/// <returns>
-/// An EMap DWF
-/// </returns>
-/// <exceptions>
-/// MgException
-/// </exceptions>
-///----------------------------------------------------------------------------
-MgByteReader* MgServerMappingService::GenerateMapUpdate(MgMap* map,
- INT32 seqNo, MgDwfVersion* dwfVersion)
-{
- Ptr<MgByteReader> byteReader;
- MgCSTrans* xformToLL = NULL;
- std::vector<MgByte*> uiGraphicSources;
-
- MG_SERVER_MAPPING_SERVICE_TRY()
-
- MG_LOG_TRACE_ENTRY(L"MgServerMappingService::GenerateMapUpdate()");
-
- if (0 == map || 0 == dwfVersion)
- {
- throw new MgNullArgumentException(
- L"MgServerMappingService.GenerateMapUpdate", __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- if (m_svcResource == NULL)
- InitializeResourceService();
- if (m_svcFeature == NULL)
- InitializeFeatureService();
- if (m_svcDrawing == NULL)
- InitializeDrawingService();
-
- //temporary place for the resId of the Map
- Ptr<MgResourceIdentifier> mapResId = map->GetMapDefinition();
-
- Ptr<MgEnvelope> box = map->GetDataExtent();
- Ptr<MgCoordinate> ll = box->GetLowerLeftCoordinate();
- Ptr<MgCoordinate> ur = box->GetUpperRightCoordinate();
- RS_Bounds b(ll->GetX(),
- ll->GetY(),
- ur->GetX(),
- ur->GetY());
-
- //get a temporary file to write out EMapTransaction DWF to
- STRING dwfName = MgFileUtil::GenerateTempFileName(false, map->GetName());
-
- //convert the map coordinate system from srs wkt to a mentor cs structure
- MdfModel::MdfString srs = map->GetMapSRS();
- Ptr<MgCoordinateSystem> dstCs;
-
- if (!srs.empty())
- {
- //let's not fail here if coord sys conversion fails for the
- //map's coordinate system. Instead we will fail per layer at a later stage
- try
- {
- dstCs = m_pCSFactory->Create(srs);
- }
- catch (MgInvalidCoordinateSystemException* e)
- {
- e->Release();
- }
- }
-
- double metersPerUnit = (dstCs.p) ? dstCs->ConvertCoordinateSystemUnitsToMeters(1.0) : 1.0;
- RS_String units = (dstCs.p) ? dstCs->GetUnits() : L"";
-
- //set up the map coord sys to lat lon transformation -- for use by the observation mesh
- if (dstCs)
- {
- //don't create an observation mesh for an aribtrary XY coordinate system
- if(dstCs->GetType() != MgCoordinateSystemType::Arbitrary)
- {
- try
- {
- Ptr<MgCoordinateSystem> ll84 = m_pCSFactory->Create(SRS_LL84);
- xformToLL = new MgCSTrans(dstCs, ll84);
- }
- catch(MgException* mge)
- {
- mge->Release();
- xformToLL = NULL;
- }
- }
- }
-
- //set up map-specific params, like bg color, scale, etc.
- //and initialize the appropriate map renderer
- RS_Color bgcolor;
- StylizationUtil::ParseColor( map->GetBackgroundColor(), bgcolor);
-
- Ptr<MgPoint> ptCenter = map->GetViewCenter();
- Ptr<MgCoordinate> coord = ptCenter->GetCoordinate();
- double dMapScale = map->GetViewScale();
- double dpi = map->GetDisplayDpi();
-
- // get the session ID
- STRING sessionId;
- Ptr<MgUserInformation> userInfo = MgUserInformation::GetCurrentUserInfo();
- if (userInfo != NULL)
- sessionId = userInfo->GetMgSessionId();
-
- // prepare the renderer
- EMapUpdateRenderer dr(dwfName, seqNo);
-
- dr.SetRasterGridSize(m_rasterGridSize);
- dr.SetMinRasterGridSize(m_minRasterGridSize);
- dr.SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
- dr.SetMaxRasterImageWidth(m_maxRasterImageWidth);
- dr.SetMaxRasterImageHeight(m_maxRasterImageHeight);
-
- RSMgSymbolManager mgr(m_svcResource);
- dr.SetSymbolManager(&mgr);
-
- SEMgSymbolManager semgr(m_svcResource);
- DefaultStylizer ds(&semgr);
-
- RS_MapUIInfo mapInfo(sessionId, map->GetName(), map->GetObjectId(), srs, units, bgcolor, coord->GetX(), coord->GetY(), dMapScale);
-
- //begin map stylization
- dr.StartMap(&mapInfo, b, dMapScale, dpi, metersPerUnit, xformToLL);
-
- Ptr<MgLayerGroupCollection> mggroups = map->GetLayerGroups();
-
- //add the groups first.
- //This is important to do before we do any layers
- //so that the layers can later find the guids for the groups.
- for (int k=0; k<mggroups->GetCount(); k++)
- {
- Ptr<MgLayerGroup> mggroup = mggroups->GetItem(k);
- Ptr<MgLayerGroup> mgparent = mggroup->GetGroup();
-
- //layer legend and ui specific information
- RS_UIGraphic uig(NULL, 0, mggroup->GetLegendLabel());
- RS_LayerUIInfo layerInfo( mggroup->GetName(),
- L"",
- mggroup->GetObjectId(),
- false, // selectable - does not apply to groups
- mggroup->GetVisible(),
- true, // editable - does not apply to groups
- (mgparent.p) ? mgparent->GetName() : L"",
- (mgparent.p) ? mgparent->GetObjectId() : L"",
- mggroup->GetDisplayInLegend(),
- mggroup->GetExpandInLegend(),
- 0.0, // zorder - does not apply to groups
- uig);
-
- dr.AddLayerGroupInfo(layerInfo);
- }
-
- //now add the layer information
- //we do this for all layers -- I'm not sure if
- //we could only do it for the ones that need update...
- //we'll see
- Ptr<MgLayerCollection> layers = map->GetLayers();
-
- for (int k=0; k<layers->GetCount(); k++)
- {
- Ptr<MgLayerBase> mglayer = layers->GetItem(k);
- Ptr<MgLayerGroup> mggroup = mglayer->GetGroup();
-
- //base map layers are not editable
- bool bEditable = true;
- if (mglayer->GetLayerType() == MgLayerType::BaseMap)
- bEditable = false;
-
- Ptr<MgResourceIdentifier> layerDefId = mglayer->GetLayerDefinition();
- //layer legend and ui specific information
- RS_UIGraphic uig(NULL, 0, mglayer->GetLegendLabel());
- RS_LayerUIInfo layerInfo( mglayer->GetName(),
- layerDefId->ToString(),
- mglayer->GetObjectId(),
- mglayer->GetSelectable(),
- mglayer->GetVisible(),
- bEditable,
- (mggroup.p) ? mggroup->GetName() : L"",
- (mggroup.p) ? mggroup->GetObjectId() : L"",
- mglayer->GetDisplayInLegend(),
- mglayer->GetExpandInLegend(),
- -mglayer->GetDisplayOrder(),
- uig);
-
- dr.AddLayerInfo(layerInfo);
- }
-
- //now process the changes to the Map
- //we need to go over the changelists sent us by the webtier
- //and describe them to the EMapUpdateRenderer so that it can
- //generate appropriate transaction commands into the EMap DWF
- Ptr<MgNamedCollection> changelists = map->GetChangeLists();
- for (int i=0; i<changelists->GetCount(); i++)
- {
- Ptr<MgChangeList> changelist = (MgChangeList*)changelists->GetItem(i);
-
- for (int j=0; j<changelist->GetChangeCount(); j++)
- {
- Ptr<MgObjectChange> change = changelist->GetChangeAt(j);
-
- MgObjectChange::ChangeType type = change->GetType();
- switch (type)
- {
- case MgObjectChange::removed:
- {
- if (changelist->IsLayer())
- dr.CmdRemoveLayer(changelist->GetObjectId());
- else
- dr.CmdRemoveLayerGroup(changelist->GetObjectId());
- }
- break;
-
- case MgObjectChange::added:
- {
- if (changelist->IsLayer())
- {
- //add the layer
- dr.CmdAddLayer(changelist->GetObjectId());
-
- //and now we need to add its scale ranges
- //TODO: may be we can move this to the layer iteration
- //loop above, but doing it for all layers might affect performance
- //and in most all cases it is not needed during map updates
-
- //see also similar code in GenerateMap above
-
- //find the corresponding MgLayer first
- Ptr<MgLayerBase> layerToAdd;
- for (int i=0; i<layers->GetCount(); i++)
- {
- Ptr<MgLayerBase> temp = layers->GetItem(i);
- if (temp->GetObjectId() == changelist->GetObjectId())
- {
- layerToAdd = temp;
- break;
- }
- }
-
- if (layerToAdd.p)
- {
- //get layer definition
- Ptr<MgResourceIdentifier> resId = layerToAdd->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
- MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
- MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
- MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
-
- if (vl) // vector layer
- {
- MdfModel::VectorScaleRangeCollection* scr = vl->GetScaleRanges();
-
- for (int j=0; j < scr->GetCount(); j++)
- {
- MdfModel::VectorScaleRange* sr = scr->GetAt(j);
- std::list<RS_UIGraphic> uiGraphics;
-
- MakeUIGraphicsForScaleRange(uiGraphics, uiGraphicSources, sr);
-
- STRING oid = changelist->GetObjectId();
- dr.AddScaleRange(oid, sr->GetMinScale(), sr->GetMaxScale(), &uiGraphics);
- }
- }
- else if (dl) // drawing layer
- {
- //it's a hardcoded icon
- std::list<RS_UIGraphic> uiGraphics;
- RS_UIGraphic gr((unsigned char*)DWF_LAYER_ICON, sizeof(DWF_LAYER_ICON), L"");
- uiGraphics.push_back(gr);
-
- STRING oid = changelist->GetObjectId();
- dr.AddScaleRange(oid, dl->GetMinScale(), dl->GetMaxScale(), &uiGraphics);
- }
- else if (gl) // grid (raster) layer
- {
- MdfModel::GridScaleRangeCollection* scr = gl->GetScaleRanges();
-
- for (int j=0; j < scr->GetCount(); j++)
- {
- MdfModel::GridScaleRange* sr = scr->GetAt(j);
-
- //hardcoded graphic
- std::list<RS_UIGraphic> uiGraphics;
- RS_UIGraphic gr((unsigned char*)RASTER_LAYER_ICON, sizeof(RASTER_LAYER_ICON), L"");
- uiGraphics.push_back(gr);
-
- STRING oid = changelist->GetObjectId();
- dr.AddScaleRange(oid, sr->GetMinScale(), sr->GetMaxScale(), &uiGraphics);
- }
- }
- }
- }
- else
- dr.CmdAddLayerGroup(changelist->GetObjectId());
- }
- break;
-
- case MgObjectChange::visibilityChanged:
- case MgObjectChange::parentChanged:
- case MgObjectChange::selectabilityChanged:
- {
- if (changelist->IsLayer())
- dr.CmdUpdateLayer(changelist->GetObjectId());
- else
- dr.CmdUpdateLayerGroup(changelist->GetObjectId());
- }
- break;
-
- case MgObjectChange::displayInLegendChanged:
- case MgObjectChange::legendLabelChanged:
- {
- if (changelist->IsLayer())
- dr.CmdUpdateUIGraphicForLayer(changelist->GetObjectId());
- else
- dr.CmdUpdateUIGraphicForLayerGroup(changelist->GetObjectId());
- }
- break;
-
- }
- }
- }
-
- //transfer layers to a temporary collection
- //here it doesn't matter but in the rendering service it does
- Ptr<MgReadOnlyLayerCollection> rolc = new MgReadOnlyLayerCollection();
-
- for (int u=0; u<layers->GetCount(); u++)
- {
- Ptr<MgLayerBase> lr = layers->GetItem(u);
- rolc->Add(lr);
- }
-
- //finally generate graphics data for the layers that need it
- MgMappingUtil::StylizeLayers(m_svcResource, m_svcFeature, m_svcDrawing, m_pCSFactory, map,
- rolc, NULL, &ds, &dr, dstCs, false, true, map->GetViewScale());
-
- dr.EndMap();
-
- //write out the file
- Ptr<MgByteSource> bs = new MgByteSource(dwfName, true);
-
- bs->SetMimeType(MgMimeType::Dwf);
- byteReader = bs->GetReader();
-
- MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GenerateMapUpdate")
-
- //release legend bitmap buffers
- for (std::vector<MgByte*>::iterator iter = uiGraphicSources.begin();
- iter != uiGraphicSources.end(); iter++)
- if (*iter) (*iter)->Release();
-
- //finally clean up if needed
- delete xformToLL;
-
- return byteReader.Detach();
-}
-
-
-///----------------------------------------------------------------------------
-/// <summary>
/// Plot The map to an EPlot DWF using the center and scale from the map. The
/// extents will be computed to fill the space within the page margins. If the
/// layout paramter is null, no adornments will be added to the page.
Modified: sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.h
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -67,11 +67,6 @@
// Methods
public:
- virtual MgByteReader* GenerateMap(MgMap* map, CREFSTRING sessionId,
- CREFSTRING mapAgentUri, MgDwfVersion* dwfVersion);
- virtual MgByteReader* GenerateMapUpdate(MgMap* map, INT32 seqNo,
- MgDwfVersion* dwfVersion);
-
virtual MgByteReader* GeneratePlot(
MgMap* map,
MgPlotSpecification* plotSpec,
Modified: sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj 2014-06-16 12:48:47 UTC (rev 8226)
@@ -238,18 +238,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="OpGenerateMap.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="OpGenerateMapUpdate.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="OpGenerateMultiPlot.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -337,8 +325,6 @@
<ClInclude Include="OpDescribeRuntimeMap.h" />
<ClInclude Include="OpGenerateLegendImage.h" />
<ClInclude Include="OpGenerateLegendPlot.h" />
- <ClInclude Include="OpGenerateMap.h" />
- <ClInclude Include="OpGenerateMapUpdate.h" />
<ClInclude Include="OpGenerateMultiPlot.h" />
<ClInclude Include="OpGeneratePlot.h" />
<ClInclude Include="OpQueryFeatures.h" />
Modified: sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj.filters
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj.filters 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingService.vcxproj.filters 2014-06-16 12:48:47 UTC (rev 8226)
@@ -18,12 +18,6 @@
<ClCompile Include="OpGenerateLegendPlot.cpp">
<Filter>Ops</Filter>
</ClCompile>
- <ClCompile Include="OpGenerateMap.cpp">
- <Filter>Ops</Filter>
- </ClCompile>
- <ClCompile Include="OpGenerateMapUpdate.cpp">
- <Filter>Ops</Filter>
- </ClCompile>
<ClCompile Include="OpGenerateMultiPlot.cpp">
<Filter>Ops</Filter>
</ClCompile>
@@ -66,12 +60,6 @@
<ClInclude Include="OpGenerateLegendPlot.h">
<Filter>Ops</Filter>
</ClInclude>
- <ClInclude Include="OpGenerateMap.h">
- <Filter>Ops</Filter>
- </ClInclude>
- <ClInclude Include="OpGenerateMapUpdate.h">
- <Filter>Ops</Filter>
- </ClInclude>
<ClInclude Include="OpGenerateMultiPlot.h">
<Filter>Ops</Filter>
</ClInclude>
Modified: sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingServiceBuild.cpp
===================================================================
--- sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingServiceBuild.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/Services/Mapping/ServerMappingServiceBuild.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -24,8 +24,6 @@
#include "OpCreateRuntimeMap.cpp"
#include "OpDescribeRuntimeMap.cpp"
#include "OpGeneratePlot.cpp"
-#include "OpGenerateMap.cpp"
-#include "OpGenerateMapUpdate.cpp"
#include "OpGenerateMultiPlot.cpp"
#include "OpGenerateLegendPlot.cpp"
#include "OpGenerateLegendImage.cpp"
Modified: sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.cpp
===================================================================
--- sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -459,63 +459,6 @@
}
}
-void TestMappingService::TestCase_GetMap()
-{
- try
- {
- //make a runtime map
- Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap(m_siteConnection);
- map->Create(mdfres, L"UnitTestSheboygan");
-
- Ptr<MgDwfVersion> version = new MgDwfVersion();
-
- //call the API
- Ptr<MgByteReader> emap = m_svcMapping->GenerateMap(map, L"blurple", L"clump", version);
- }
- catch(MgException* e)
- {
- STRING message = e->GetDetails(TEST_LOCALE);
- SAFE_RELEASE(e);
- CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
- }
- catch(...)
- {
- throw;
- }
-}
-
-
-void TestMappingService::TestCase_GetMapUpdate()
-{
- try
- {
- //make a runtime map
- Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap(m_siteConnection);
- map->Create(mdfres, L"UnitTestSheboygan");
-
- Ptr<MgDwfVersion> version = new MgDwfVersion();
-
- //call the API
- Ptr<MgByteReader> emapupdate = m_svcMapping->GenerateMapUpdate(map, 42, version);
-
- INT64 len = emapupdate->GetLength();
-
- //CPPUNIT_ASSERT(len == 7000); //TODO: determine correct length
- }
- catch(MgException* e)
- {
- STRING message = e->GetDetails(TEST_LOCALE);
- SAFE_RELEASE(e);
- CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
- }
- catch(...)
- {
- throw;
- }
-}
-
void TestMappingService::TestCase_SaveMap()
{
try
Modified: sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.h
===================================================================
--- sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Server/src/UnitTesting/TestMappingService.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -25,8 +25,6 @@
CPPUNIT_TEST_SUITE(TestMappingService);
CPPUNIT_TEST(TestStart); // This must be the very first unit test
- CPPUNIT_TEST(TestCase_GetMap);
- CPPUNIT_TEST(TestCase_GetMapUpdate);
CPPUNIT_TEST(TestCase_SaveMap);
CPPUNIT_TEST(TestCase_GetMultiPlot);
CPPUNIT_TEST(TestCase_GetPlotUsingCurrentCenterAndScale);
@@ -55,8 +53,6 @@
void TestCase_CreateRuntimeMap();
void TestCase_DescribeRuntimeMap();
- void TestCase_GetMap();
- void TestCase_GetMapUpdate();
void TestCase_SaveMap();
void TestCase_GetPlot();
void TestCase_GetMultiPlot();
Modified: sandbox/jng/v30/UnitTest/TestData/MappingService/MappingServiceTest.dump
===================================================================
--- sandbox/jng/v30/UnitTest/TestData/MappingService/MappingServiceTest.dump 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/UnitTest/TestData/MappingService/MappingServiceTest.dump 2014-06-16 12:48:47 UTC (rev 8226)
@@ -6,12 +6,7 @@
INSERT INTO "HttpTestResults" VALUES('Add World sdf', 4, 'text/plain; charset=utf-8', '');
INSERT INTO "HttpTestResults" VALUES('Add world layer definition', 5, 'text/plain; charset=utf-8', '');
INSERT INTO "HttpTestResults" VALUES('Add world map definition', 6, 'text/plain; charset=utf-8', '');
-INSERT INTO "HttpTestResults" VALUES('GetMap for world map', 1000, 'model/vnd.dwf', '(DWF V06.01)');
CREATE TABLE Params(ParamSet INTEGER, ParamName TEXT, ParamValue TEXT);
-INSERT INTO "Params" VALUES(1000, 'MAPDEFINITION', 'Library://Test/MappingService/UT_Rail.MapDefinition');
-INSERT INTO "Params" VALUES(1000, 'DWFVERSION', '6.01');
-INSERT INTO "Params" VALUES(1000, 'EMAPVERSION', '1.2');
-INSERT INTO "Params" VALUES(1000, 'OPERATION', 'GETMAP');
INSERT INTO "Params" VALUES(1, 'OPERATION', 'DELETERESOURCE');
INSERT INTO "Params" VALUES(1, 'RESOURCEID', 'Library://Test/MappingService/');
INSERT INTO "Params" VALUES(1, 'ALWAYSPASS', 'start from scratch');
@@ -39,6 +34,5 @@
CREATE TABLE ApiTestResults (Description TEXT, ParamSet INTEGER, ContentType TEXT, Result TEXT);
INSERT INTO "ApiTestResults" VALUES('Get map extent', 1, 'text/plain', '(-180:-90)-(180:90)');
CREATE TABLE TestCase (ExecuteSequence INTEGER, TestName TEXT, ParamSets TEXT, Description TEXT, TestType TEXT, Prerequisite TEXT);
-INSERT INTO "TestCase" VALUES(2, 'MappingService_SessionTesting', '1000,', 'Test session handling', 'Http', 'LoadData');
INSERT INTO "TestCase" VALUES(1, 'MappingService_LoadData', '1,2,3,4,5,6,', 'Load sample world data for Mapping Service Test', 'Http', 'None');
COMMIT;
Deleted: sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapform.html
===================================================================
--- sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapform.html 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapform.html 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,56 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<script type="text/javascript" src="setactiontarget.js" >
-</script>
-</head>
- <body>
- <form name="input" action="" method="get" ID="Form1">
- <div nowrap="true">
- <b>Operation:</b> <input type="text" name="OPERATION" value="GETMAP" size="50" ID="Text1">
- <p>
- Version: <input type="text" name="VERSION" value="1.0.0" size="10" ID="Text2">
- <p>
- Dwf version: <input type="text" name="DWFVERSION" value="6.01" size="30" ID="Text3">
- <p>
- EMap version: <input type="text" name="EMAPVERSION" value="1.0" size="10" ID="Text4">
- <p>
- Locale: <input type="text" name="LOCALE" value="en" size="10" ID="Text5">
- <p>
- Client Agent: <input type="text" name="CLIENTAGENT" value="MapGuide Developer" size="100">
- <p>
- Map definition: <input type="text" name="MAPDEFINITION" value="Library://" size="100" ID="Text6">
- <p>
- Session id (optional): <input type="text" name="SESSION" size="100" ID="Text7">
- <p>
- ------------------------------ Commands (optional) ------------------------------
- <p>
- View center X: <input type="text" name="SETVIEWCENTERX" size="10" ID="Text101">
- <p>
- View center Y: <input type="text" name="SETVIEWCENTERY" size="10" ID="Text102">
- <p>
- View scale: <input type="text" name="SETVIEWSCALE" size="10" ID="Text103">
- <p>
- Data extent (x1, y1, x2, y2): <input type="text" name="SETDATAEXTENT" size="50" ID="Text104">
- <p>
- Display Dpi: <input type="text" name="SETDISPLAYDPI" value="75" size="10" ID="Text105">
- <p>
- Display width: <input type="text" name="SETDISPLAYWIDTH" value="1024" size="10" ID="Text106" disabled="true" style="background-color:lightgrey">
- <p>
- Display height: <input type="text" name="SETDISPLAYHEIGHT" value="768" size="10" ID="Text107" disabled="true" style="background-color:lightgrey">
- <p>
- Show layers: <input type="text" name="SHOWLAYERS" size="80" ID="Text108">
- <p>
- Hide layers: <input type="text" name="HIDELAYERS" size="80" ID="Text109">
- <p>
- Show groups: <input type="text" name="SHOWGROUPS" size="80" ID="Text110">
- <p>
- Hide groups: <input type="text" name="HIDEGROUPS" size="80" ID="Text111">
- <p>
- Refresh layers: <input type="text" name="REFRESHLAYERS" size="80" ID="Text112" disabled="true" style="background-color:lightgrey">
- <p>
- <input type="submit" value="Submit" onclick="SetActionTarget()"> <input type="reset">
- </div>
- </form>
- </body>
-</html>
Deleted: sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapupdateform.html
===================================================================
--- sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapupdateform.html 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/getmapupdateform.html 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,57 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<script type="text/javascript" src="setactiontarget.js" >
-</script>
-</head>
- <body>
- <form name="input" action="" method="get" ID="Form1">
- <div nowrap="true">
- <b>Operation:</b> <input type="text" name="OPERATION" value="GETMAPUPDATE" size="50" ID="Text1">
- <p>
- Version: <input type="text" name="VERSION" value="1.0.0" size="10" ID="Text2">
- <p>
- Dwf version: <input type="text" name="DWFVERSION" value="6.01" size="30" ID="Text3">
- <p>
- EMap version: <input type="text" name="EMAPVERSION" value="1.0" size="10" ID="Text4">
- <p>
- Session id: <input type="text" name="SESSION" size="100" ID="Text5">
- <p>
- Client Agent: <input type="text" name="CLIENTAGENT" value="MapGuide Developer" size="100">
- <p>
- Map name: <input type="text" name="MAPNAME" value="TestMap" size="100" ID="Text6">
- <p>
- Sequence number: <input type="text" name="SEQNO" size="10" ID="Text7">
- <p>
- ------------------------------ Commands (optional) ------------------------------
- <p>
- View center X: <input type="text" name="SETVIEWCENTERX" size="10" ID="Text101">
- <p>
- View center Y: <input type="text" name="SETVIEWCENTERY" size="10" ID="Text102">
- <p>
- View scale: <input type="text" name="SETVIEWSCALE" size="10" ID="Text103">
- <p>
- Data extent (x1, y1, x2, y2): <input type="text" name="SETDATAEXTENT" size="50" ID="Text104">
- <p>
- Display Dpi: <input type="text" name="SETDISPLAYDPI" value="75" size="10" ID="Text105">
- <p>
- Display width: <input type="text" name="SETDISPLAYWIDTH" value="1024" size="10" ID="Text106" disabled="true" style="background-color:lightgrey">
- <p>
- Display height: <input type="text" name="SETDISPLAYHEIGHT" value="768" size="10" ID="Text107" disabled="true" style="background-color:lightgrey">
- <p>
- Show layers: <input type="text" name="SHOWLAYERS" size="80" ID="Text108">
- <p>
- Hide layers: <input type="text" name="HIDELAYERS" size="80" ID="Text109">
- <p>
- Show groups: <input type="text" name="SHOWGROUPS" size="80" ID="Text110">
- <p>
- Hide groups: <input type="text" name="HIDEGROUPS" size="80" ID="Text111">
- <p>
- Refresh layers: <input type="text" name="REFRESHLAYERS" size="80" ID="Text112">
- <p>
- <input type="submit" value="Submit" onclick="SetActionTarget()"> <input type="reset">
- </div>
- </form>
- </p>
- </body>
-</html>
Modified: sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/mappingserviceapi.html
===================================================================
--- sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/mappingserviceapi.html 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/UnitTest/WebTier/MapAgent/MapAgentForms/mappingserviceapi.html 2014-06-16 12:48:47 UTC (rev 8226)
@@ -9,10 +9,6 @@
<body>
<UL>
<LI>
- <A href="getmapform.html" target="showform">GetMap</a></LI>
- <LI>
- <A href="getmapupdateform.html" target="showform">GetMapUpdate</a></LI>
- <LI>
<A href="getplotform.html" target="showform">GetPlot</a></LI>
<LI>
<A href="getfeaturesetenvelopeform.html" target="showform">GetFeatureSetEnvelope</a></LI>
Deleted: sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.cpp
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,72 +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 "HttpHandler.h"
-#include "HttpGetMap.h"
-
-HTTP_IMPLEMENT_CREATE_OBJECT(MgHttpGetMap)
-
-/// <summary>
-/// Initializes the common parameters and parameters specific to this request.
-/// </summary>
-/// <param name="name">Input
-/// MgHttpRequest
-/// This contains all the parameters of the request.
-/// </param>
-/// <returns>
-/// nothing
-/// </returns>
-MgHttpGetMap::MgHttpGetMap(MgHttpRequest *hRequest)
-{
- InitializeCommonParameters(hRequest);
-
- Ptr<MgHttpRequestParam> params = hRequest->GetRequestParam();
- m_mapDefinition = params->GetParameterValue(MgHttpResourceStrings::reqMappingMapDefinition);
- m_dwfVersion = params->GetParameterValue(MgHttpResourceStrings::reqMappingDwfVersion);
- m_emapVersion = params->GetParameterValue(MgHttpResourceStrings::reqMappingEmapVersion);
-}
-
-/// <summary>
-/// Executes the specific request.
-/// </summary>
-/// <returns>
-/// MgHttpResponse
-/// This contains the response (including MgHttpResult and StatusCode) from the server.
-/// </returns>
-void MgHttpGetMap::Execute(MgHttpResponse& hResponse)
-{
- Ptr<MgHttpResult> hResult = hResponse.GetResult();
-
- MG_HTTP_HANDLER_TRY()
-
- // Check common parameters
- ValidateCommonParameters();
-
- Ptr<MgResourceIdentifier> mapDefinition = new MgResourceIdentifier(m_mapDefinition);
- Ptr<MgHttpRequestParam> params = m_hRequest->GetRequestParam();
- Ptr<MgPropertyCollection> commands = params->GetParameters()->GetPropertyCollection();
-
- //execute the request through a dwf controller
- MgDwfController controller(m_siteConn, m_hRequest->GetAgentUri());
- Ptr<MgByteReader> map = controller.GetMap(mapDefinition,
- m_dwfVersion, m_emapVersion,
- commands);
-
- hResult->SetResultObject(map, map->GetMimeType());
-
- MG_HTTP_HANDLER_CATCH_AND_THROW_EX(L"MgHttpGetMap.Execute")
-}
Deleted: sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.h
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpGetMap.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,60 +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 _FS_GET_MAP_H
-#define _FS_GET_MAP_H
-
-class MgHttpGetMap : public MgHttpRequestResponseHandler
-{
-HTTP_DECLARE_CREATE_OBJECT()
-
-public:
- /// <summary>
- /// Initializes the common parameters of the request.
- /// </summary>
- /// <param name="name">Input
- /// MgHttpRequest
- /// This contains all the parameters of the request.
- /// </param>
- /// <returns>
- /// nothing
- /// </returns>
- MgHttpGetMap(MgHttpRequest *hRequest);
-
- /// <summary>
- /// Executes the specific request.
- /// </summary>
- /// <param name="hResponse">Input
- /// This contains the response (including MgHttpResult and StatusCode) from the server.
- /// </param>
- void Execute(MgHttpResponse& hResponse);
-
- /// <summary>
- /// Returns the classification of this request/response handler
- /// </summary>
- /// <returns>
- /// Classification of handler
- /// </returns>
- MgRequestClassification GetRequestClassification() { return MgHttpRequestResponseHandler::mrcViewer; }
-
-private:
- STRING m_mapDefinition;
- STRING m_dwfVersion;
- STRING m_emapVersion;
-};
-
-#endif // _FS_GET_MAP_H
Deleted: sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.cpp
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,81 +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 "HttpHandler.h"
-#include "HttpGetMapUpdate.h"
-
-HTTP_IMPLEMENT_CREATE_OBJECT(MgHttpGetMapUpdate)
-
-/// <summary>
-/// Initializes the common parameters and parameters specific to this request.
-/// </summary>
-/// <param name="name">Input
-/// MgHttpRequest
-/// This contains all the parameters of the request.
-/// </param>
-/// <returns>
-/// nothing
-/// </returns>
-MgHttpGetMapUpdate::MgHttpGetMapUpdate(MgHttpRequest *hRequest)
-{
- InitializeCommonParameters(hRequest);
-
- Ptr<MgHttpRequestParam> params = hRequest->GetRequestParam();
- m_mapName = params->GetParameterValue(MgHttpResourceStrings::reqMappingMapName);
- m_seqNo = params->GetParameterValue(MgHttpResourceStrings::reqMappingSeqNo);
- m_dwfVersion = params->GetParameterValue(MgHttpResourceStrings::reqMappingDwfVersion);
- m_emapVersion = params->GetParameterValue(MgHttpResourceStrings::reqMappingEmapVersion);
-}
-
-/// <summary>
-/// Executes the specific request.
-/// </summary>
-/// <returns>
-/// MgHttpResponse
-/// This contains the response (including MgHttpResult and StatusCode) from the server.
-/// </returns>
-void MgHttpGetMapUpdate::Execute(MgHttpResponse& hResponse)
-{
- Ptr<MgHttpResult> hResult = hResponse.GetResult();
- Ptr<MgHttpRequestParam> params = m_hRequest->GetRequestParam();
-
- MG_HTTP_HANDLER_TRY()
-
- if (params->GetParameterValue(MgHttpResourceStrings::reqVersion) == L"")
- {
- MgStringCollection arguments;
- arguments.Add(L"0");
- arguments.Add(MgResources::BlankArgument);
-
- throw new MgInvalidArgumentException(L"MgHttpGetMapUpdate.Execute",
- __LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
- }
-
- Ptr<MgPropertyCollection> commands = params->GetParameters()->GetPropertyCollection();
-
- //execute the request through a dwf controller
- MgDwfController controller(m_siteConn,m_hRequest->GetAgentUri());
- Ptr<MgByteReader> reader = controller.GetMapUpdate(m_mapName,
- MgUtil::StringToInt32(m_seqNo),
- m_dwfVersion,
- m_emapVersion,
- commands);
-
- hResult->SetResultObject(reader, reader->GetMimeType());
-
- MG_HTTP_HANDLER_CATCH_AND_THROW_EX(L"MgHttpGetMapUpdate.Execute")
-}
Deleted: sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.h
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpGetMapUpdate.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,61 +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 _FS_GET_MAP_UPDATE_H
-#define _FS_GET_MAP_UPDATE_H
-
-class MgHttpGetMapUpdate : public MgHttpRequestResponseHandler
-{
-HTTP_DECLARE_CREATE_OBJECT()
-
-public:
- /// <summary>
- /// Initializes the common parameters of the request.
- /// </summary>
- /// <param name="name">Input
- /// MgHttpRequest
- /// This contains all the parameters of the request.
- /// </param>
- /// <returns>
- /// nothing
- /// </returns>
- MgHttpGetMapUpdate(MgHttpRequest *hRequest);
-
- /// <summary>
- /// Executes the specific request.
- /// </summary>
- /// <param name="hResponse">Input
- /// This contains the response (including MgHttpResult and StatusCode) from the server.
- /// </param>
- void Execute(MgHttpResponse& hResponse);
-
- /// <summary>
- /// Returns the classification of this request/response handler
- /// </summary>
- /// <returns>
- /// Classification of handler
- /// </returns>
- MgRequestClassification GetRequestClassification() { return MgHttpRequestResponseHandler::mrcViewer; }
-
-private:
- STRING m_mapName;
- STRING m_seqNo;
- STRING m_dwfVersion;
- STRING m_emapVersion;
-};
-
-#endif // _FS_GET_MAP_UPDATE_H
Modified: sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj 2014-06-16 12:48:47 UTC (rev 8226)
@@ -528,18 +528,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="HttpGetMap.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="HttpGetMapUpdate.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="HttpGetPlot.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile>
@@ -1003,8 +991,6 @@
<ClInclude Include="HttpGetDrawingSectionResource.h" />
<ClInclude Include="HttpGetFeatureSetEnvelope.h" />
<ClInclude Include="HttpGetLegendImage.h" />
- <ClInclude Include="HttpGetMap.h" />
- <ClInclude Include="HttpGetMapUpdate.h" />
<ClInclude Include="HttpGetPlot.h" />
<ClInclude Include="HttpEnumerateGroups.h" />
<ClInclude Include="HttpEnumerateUsers.h" />
Modified: sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj.filters
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj.filters 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpHandler.vcxproj.filters 2014-06-16 12:48:47 UTC (rev 8226)
@@ -198,12 +198,6 @@
<ClCompile Include="HttpGetLegendImage.cpp">
<Filter>Mapping Service</Filter>
</ClCompile>
- <ClCompile Include="HttpGetMap.cpp">
- <Filter>Mapping Service</Filter>
- </ClCompile>
- <ClCompile Include="HttpGetMapUpdate.cpp">
- <Filter>Mapping Service</Filter>
- </ClCompile>
<ClCompile Include="HttpGetPlot.cpp">
<Filter>Mapping Service</Filter>
</ClCompile>
@@ -386,6 +380,7 @@
<ClCompile Include="ReaderByteSourceImpl.cpp">
<Filter>Byte Source Adapters</Filter>
</ClCompile>
+ <ClCompile Include="HttpDescribeRuntimeMap.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="HttpApplyResourcePackage.h">
@@ -544,12 +539,6 @@
<ClInclude Include="HttpGetLegendImage.h">
<Filter>Mapping Service</Filter>
</ClInclude>
- <ClInclude Include="HttpGetMap.h">
- <Filter>Mapping Service</Filter>
- </ClInclude>
- <ClInclude Include="HttpGetMapUpdate.h">
- <Filter>Mapping Service</Filter>
- </ClInclude>
<ClInclude Include="HttpGetPlot.h">
<Filter>Mapping Service</Filter>
</ClInclude>
@@ -757,6 +746,7 @@
<ClInclude Include="ReaderByteSourceImpl.h">
<Filter>Byte Source Adapters</Filter>
</ClInclude>
+ <ClInclude Include="HttpDescribeRuntimeMap.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="HttpHandler.rc" />
Modified: sandbox/jng/v30/Web/src/HttpHandler/HttpHandlerBuild.cpp
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpHandlerBuild.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpHandlerBuild.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -71,10 +71,8 @@
#include "HttpGetHtmlViewerPage.cpp"
#include "HttpGetLegendImage.cpp"
#include "HttpGetLongTransactions.cpp"
-#include "HttpGetMap.cpp"
#include "HttpGetMapImage.cpp"
#include "HttpGetMapLegendImage.cpp"
-#include "HttpGetMapUpdate.cpp"
#include "HttpGetPlot.cpp"
#include "HttpGetRepositoryContent.cpp"
#include "HttpGetRepositoryHeader.cpp"
Modified: sandbox/jng/v30/Web/src/HttpHandler/HttpRequest.cpp
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpRequest.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpRequest.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -74,8 +74,6 @@
// Http Mapping Service operations
#include "HttpCreateRuntimeMap.h"
-#include "HttpGetMap.h"
-#include "HttpGetMapUpdate.h"
#include "HttpGetPlot.h"
#include "HttpGetLegendImage.h"
#include "HttpGetFeatureSetEnvelope.h"
@@ -344,8 +342,6 @@
//
httpClassCreators[MgHttpResourceStrings::opCreateRuntimeMap] = MgHttpCreateRuntimeMap::CreateObject;
httpClassCreators[MgHttpResourceStrings::opDescribeRuntimeMap] = MgHttpDescribeRuntimeMap::CreateObject;
- httpClassCreators[MgHttpResourceStrings::opGetMap] = MgHttpGetMap::CreateObject;
- httpClassCreators[MgHttpResourceStrings::opGetMapUpdate] = MgHttpGetMapUpdate::CreateObject;
httpClassCreators[MgHttpResourceStrings::opGetDrawing] = MgHttpGetDrawing::CreateObject;
httpClassCreators[MgHttpResourceStrings::opGetDrawingLayer] = MgHttpGetDrawingLayer::CreateObject;
httpClassCreators[MgHttpResourceStrings::opDescribeDrawing] = MgHttpDescribeDrawing::CreateObject;
Modified: sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.cpp
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.cpp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.cpp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -192,8 +192,6 @@
// Mapping Service Operation Requests
const STRING MgHttpResourceStrings::opCreateRuntimeMap = L"CREATERUNTIMEMAP";
const STRING MgHttpResourceStrings::opDescribeRuntimeMap = L"DESCRIBERUNTIMEMAP";
-const STRING MgHttpResourceStrings::opGetMap = L"GETMAP";
-const STRING MgHttpResourceStrings::opGetMapUpdate = L"GETMAPUPDATE";
const STRING MgHttpResourceStrings::opGetPlot = L"GETPLOT";
const STRING MgHttpResourceStrings::opGetLegendImage = L"GETLEGENDIMAGE";
const STRING MgHttpResourceStrings::opGetFeatureSetEnvelope = L"GETFEATURESETENVELOPE";
Modified: sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.h
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.h 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/HttpResourceStrings.h 2014-06-16 12:48:47 UTC (rev 8226)
@@ -301,8 +301,6 @@
// Mapping services
static const STRING opCreateRuntimeMap;
static const STRING opDescribeRuntimeMap;
- static const STRING opGetMap;
- static const STRING opGetMapUpdate;
static const STRING opGetPlot;
static const STRING opGetLegendImage;
static const STRING opGetFeatureSetEnvelope;
Modified: sandbox/jng/v30/Web/src/HttpHandler/Makefile.am
===================================================================
--- sandbox/jng/v30/Web/src/HttpHandler/Makefile.am 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/HttpHandler/Makefile.am 2014-06-16 12:48:47 UTC (rev 8226)
@@ -74,10 +74,8 @@
HttpGetIdentityProperties.cpp \
HttpGetLegendImage.cpp \
HttpGetLongTransactions.cpp \
- HttpGetMap.cpp \
HttpGetMapLegendImage.cpp \
HttpGetMapImage.cpp \
- HttpGetMapUpdate.cpp \
HttpGetPlot.cpp \
HttpGetRepositoryContent.cpp \
HttpGetRepositoryHeader.cpp \
@@ -200,10 +198,8 @@
HttpGetIdentityProperties.h \
HttpGetLegendImage.h \
HttpGetLongTransactions.h \
- HttpGetMap.h \
HttpGetMapLegendImage.h \
HttpGetMapImage.h \
- HttpGetMapUpdate.h \
HttpGetPlot.h \
HttpGetRepositoryContent.h \
HttpGetRepositoryHeader.h \
Deleted: sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff13ee121107bdda7722-6913.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff13ee121107bdda7722-6913.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff13ee121107bdda7722-6913.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,18 +0,0 @@
-
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>Uninstalling the DWF Viewer</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="Uninstalling the DWF Viewer"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WS1a9193826455f5ff13ee121107bdda7722-6913.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">Changing Viewer Options</div><a href="WS1a9193826455f5ff9110c71085341391d-39b4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">MapGuide Viewer Help</div><a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><img src="" border="0"></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document
.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none';
this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><span>Uninstalling the DWF Viewer</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff13ee121107bdda7722-6913"></a></span><div class="body_content"><!--Body--><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58a8"></a></span>Microsoft® Windows® XP®
-offers two menu styles: the default Start menu style and the Classic
-Start menu style. (To determine which style is enabled on your computer,
-right-click the Start button and choose Properties.)</p><div><div class="note-note"><span class="label">Note</span>It
-is recommended that you reboot your computer to complete the uninstall.</div></div><!--OList--><span style="display:none"><a name="WS1a9193826455f5ff13ee121107bdda7722-6912"></a></span><p class="list-intro" id="d0e554"><a name="TOC_ENTRY__d0e554"></a><span style="display:none"><a name="WS1a9193826455f5ff13ee121107bdda7722-6911"></a></span>To uninstall the DWF Viewer using the
-default Start menu style</p><ol type="1" start="1"><li>Choose Start > Control Panel.</li><li>Double-click Add or Remove Programs.</li><li>From the list of Currently installed
-programs, select Autodesk DWF Viewer.</li><li>Click Change/Remove.</li><li>Click Uninstall.</li><li>Click Finish.</li></ol><!--OList--><span style="display:none"><a name="WS1a9193826455f5ff13ee121107bdda7722-6910"></a></span><p class="list-intro" id="d0e569"><a name="TOC_ENTRY__d0e569"></a><span style="display:none"><a name="WS1a9193826455f5ff13ee121107bdda7722-690f"></a></span>To uninstall the DWF Viewer using the
-Classic Start menu style</p><ol type="1" start="1"><li>Choose Start > Settings > Control
-Panel.</li><li>Double-click Add or Remove Programs.</li><li>From the list of Currently installed
-programs, select Autodesk DWF Viewer.</li><li>Click Change/Remove.</li><li>Click Uninstall.</li><li>Click Finish.</li></ol><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></div><br></div></body></html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2b8b.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2b8b.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2b8b.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,15 +1,83 @@
-
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>The MapGuide Viewer Interface</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="The MapGuide Viewer Interface"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WS1a9193826455f5ff9110c71085341391d-2b8b.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">Contents of the Maps</div><a href="WS1a9193826455f5ff9110c71085341391d-2e07.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">Contents of the Maps</div><a href="WS1a9193826455f5ff9110c71085341391d-2e07.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">Organization of Data into Layers</div><a href="WS1a9193826455f5ff9110c71085341391d-2e06.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseo
ut="hideInfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout=
"document.getElementById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><span>The MapGuide Viewer Interface</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2b8b"></a></span><div class="body_content"><!--Body--><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d3"></a></span>The MapGuide Viewer interface
-may include the following sections: </p><!--UList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2b8a"></a></span><ul><li>The Layers Pane displays the layers and
-layer groups in the map. Right-click the list of layers to access
-commands related to the layer list and the display of map layers.</li><li>The Properties Pane displays properties
-of selected items. In the DWF Viewer, right-click the Properties
-Pane for additional options.</li><li>The Task Pane displays task options and
-information or help topics, depending on your actions.</li></ul><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></div><br></div></body></html>
+<!-- saved from url=(0014)about:internet -->
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>The MapGuide Viewer Interface</title>
+ <link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <meta name="description" content="The MapGuide Viewer Interface">
+ <meta name="keywords" content="">
+ <meta name="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Topic;
+ Class = CPM-Topic ISD-Topic ;
+ Url = WS1a9193826455f5ff9110c71085341391d-2b8b.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <div id="prevTitle" style="display:none">Contents of the Maps</div>
+ <a href="WS1a9193826455f5ff9110c71085341391d-2e07.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="parentTitle" style="display:none">Contents of the Maps</div>
+ <a href="WS1a9193826455f5ff9110c71085341391d-2e07.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="nextTitle" style="display:none">Organization of Data into Layers</div>
+ <a href="WS1a9193826455f5ff9110c71085341391d-2e06.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text">
+ <div class="collapse-expand">
+ <div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span>
+ </div>
+ <div class="collapse-expand-description" id="expand-description"></div>
+ </div>
+ <div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span>
+ </div>
+ <div class="collapse-expand-description" id="collapse-description"></div>
+ </div>
+ </div><span>The MapGuide Viewer Interface</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2b8b"></a></span>
+ <div class="body_content">
+ <!--Body-->
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d3"></a></span>The MapGuide Viewer interface may include the following sections:</p>
+ <!--UList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2b8a"></a></span>
+ <ul>
+ <li>The Layers Pane displays the layers and layer groups in the map. Right-click the list of layers to access commands related to the layer list and the display of map layers.</li>
+ <li>The Properties Pane displays properties of selected items.</li>
+ <li>The Task Pane displays task options and information or help topics, depending on your actions.</li>
+ </ul>
+ <!---->
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a>
+ </div>
+ <br>
+ </div>
+</body>
+
+</html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2dff.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2dff.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2dff.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,12 +1,81 @@
-
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>Zooming Dynamically</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="Zooming Dynamically"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WS1a9193826455f5ff9110c71085341391d-2dff.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">Panning Dynamically</div><a href="WS1a9193826455f5ff9110c71085341391d-2e03.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">How to Use MapGuide Viewer</div><a href="WSfacf1429558a55def7b6851052968aa39-7848.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">Zooming to a Rectangle</div><a href="WS1a9193826455f5ff9110c71085341391d-2e02.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="h
ideInfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="docu
ment.getElementById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><span>Zooming Dynamically</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dff"></a></span><div class="body_content"><!--OList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dfe"></a></span><p class="list-intro" id="d0e397"><a name="TOC_ENTRY__d0e397"></a><span style="display:none"><a name="WS1a9
193826455f5ff9110c71085341391d-2dfd"></a></span>To zoom dynamically in the DWF Viewer</p><ol type="1" start="1"><li>Choose the Zoom Dynamic command.</li><li>On the map, click and drag the cursor
-to move the map view.</li><li>Move the cursor up to zoom in or down
-to zoom out.</li><li>Repeat steps 2 and 3 as necessary.</li></ol><!--UList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dfc"></a></span><p class="list-intro" id="d0e408"><a name="TOC_ENTRY__d0e408"></a><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dfb"></a></span>To zoom dynamically in the AJAX Viewer</p><ul><li>Move the slider up or down to zoom in
-or out.</li></ul><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></div><br></div></body></html>
+<!-- saved from url=(0014)about:internet -->
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>Zooming Dynamically</title>
+ <link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <meta name="description" content="Zooming Dynamically">
+ <meta name="keywords" content="">
+ <meta name="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Topic;
+ Class = CPM-Topic ISD-Topic ;
+ Url = WS1a9193826455f5ff9110c71085341391d-2dff.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <div id="prevTitle" style="display:none">Panning Dynamically</div>
+ <a href="WS1a9193826455f5ff9110c71085341391d-2e03.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="parentTitle" style="display:none">How to Use MapGuide Viewer</div>
+ <a href="WSfacf1429558a55def7b6851052968aa39-7848.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="nextTitle" style="display:none">Zooming to a Rectangle</div>
+ <a href="WS1a9193826455f5ff9110c71085341391d-2e02.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text">
+ <div class="collapse-expand">
+ <div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span>
+ </div>
+ <div class="collapse-expand-description" id="expand-description"></div>
+ </div>
+ <div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span>
+ </div>
+ <div class="collapse-expand-description" id="collapse-description"></div>
+ </div>
+ </div><span>Zooming Dynamically</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dff"></a></span>
+ <div class="body_content">
+ <!--UList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dfc"></a></span>
+ <p class="list-intro" id="d0e408">
+ <a name="TOC_ENTRY__d0e408"></a><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2dfb"></a></span>To zoom dynamically in the AJAX Viewer</p>
+ <ul>
+ <li>Move the slider up or down to zoom in or out.</li>
+ </ul>
+ <!---->
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a>
+ </div>
+ <br>
+ </div>
+</body>
+
+</html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2e28.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2e28.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-2e28.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,45 +1,206 @@
-<html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>MapGuide Viewer Command List</title>
-<link rel="stylesheet" type="text/css" href="./style/cpm.css">
-<link rel="stylesheet" type="text/css" href="./style/isd.css">
-<link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
-<link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
-<script language="javascript">
- function hideInfo() {
- info = document.getElementById('infoline');
- info.style.visibility = 'hidden';
- }
- function showInfo(title) {
- info = document.getElementById('infoline');
- info.innerText = title;
- info.style.visibility='visible';
- }
- </script><meta type="description" content="MapGuide Viewer Command List"><meta type="keywords" content=""><meta type="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WS1a9193826455f5ff9110c71085341391d-2e28.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">MapGuide Viewer Help</div><a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">MapGuide Viewer Help</div><a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">Understanding MapGuide Viewer</div><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="
hideInfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><span>MapGuide Viewer Command List</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e28"></a></span><!--Body--><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f2"></a></span>This list displays commands that may be available
-on the toolbar, in right-click menus, or in the task pane of MapGuide Viewer.
-For an overview, see <span class="hypertext"><span class="char_link"><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm"><!--Reference = WS73099cc142f487551e5a0cb10850d4cd7c-689b; Target topic = WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm-->Understanding MapGuide Viewer</a></span></span>.</p><dl><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0f"></a></span>Buffer</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f1"></a></span>Use this command to create a buffer zone around
-a selected set of features. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7847.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7847; Target topic = WSfacf1429558a55def7b6851052968aa39-7847.htm-->Buffering</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e15"></a></span>Clear Selection</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f0"></a></span>Clears all features currently selected.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e13"></a></span>Copy</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ef"></a></span>Copies the current view of the map to the clipboard
-as a Windows Metafile.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e11"></a></span>Get Printable
-Page</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ee"></a></span>In the AJAX Viewer, this command opens a dialog
-box for choosing layout options, which leads to the creation of
-a new browser page that you can print with the browser Print command.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1a"></a></span>Initial Center and Scale</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ed"></a></span>Zooms to the initial extents set for the web application.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1b"></a></span>Initial
-Map View</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ec"></a></span>Zooms to the initial extents set for the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0e"></a></span>Measure</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58eb"></a></span>Measure distances by drawing line segments on
-the map. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7843.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7843; Target topic = WSfacf1429558a55def7b6851052968aa39-7843.htm-->Measuring</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1c"></a></span>Next View</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ea"></a></span>Advances to the next view in the view history.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e27"></a></span>Pan </span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e9"></a></span>Activates interactive panning. Click and hold
-the map to move it in any direction. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e03.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e03; Target topic = WS1a9193826455f5ff9110c71085341391d-2e03.htm-->Panning Dynamically</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e25"></a></span>Pan Down</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e8"></a></span>Pans south on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e23"></a></span>Pan Left</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e7"></a></span>Pans west on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455
f5ff9110c71085341391d-2e24"></a></span>Pan Right</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e6"></a></span>Pans east on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e26"></a></span>Pan Up</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e5"></a></span>Pans north on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1d"></a></span>Previous View</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e4"></a></span>Returns to the previous view in the view history.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e12"></a></span>Print</span></dt><dd><div class="definition"><p><span
style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e3"></a></span> This command opens the DWF Viewer Print dialog
-box. Set printing options, preview, and print the current view of the
-map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e14"></a></span>Refresh Map</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e2"></a></span>Refreshes the map and reloads all layers, keeping
-the current center and scale.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0d"></a></span> Search</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e1"></a></span>Search for map features using a specific keyword.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e19"></a></span>Select</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e0"></a></span>Click a single feature to select it. Click and
-drag the cursor to draw a rectangle around multiple features.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e17"></a></span>Select Polygon</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58df"></a></span>Specify a set of points to form a polygon containing
-the features you want to select. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2df8.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2df8; Target topic = WS1a9193826455f5ff9110c71085341391d-2df8.htm-->Selecting Features in a Polygon</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e18"></a></span>Select Radius</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58de"></a></span>Click a center point. Then drag the cursor to
-specify the radius of the circle containing the features you want
-to select.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e16"></a></span>Select Within</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dd"></a></span>Selects map features that fall within previously
-selected polygon map features. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39ab.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39ab; Target topic = WS1a9193826455f5ff9110c71085341391d-39ab.htm-->Selecting Within</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e10"></a></span>View Options</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dc"></a></span>Select display options for the status bar and
-tool tips. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39b4.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39b4; Target topic = WS1a9193826455f5ff9110c71085341391d-39b4.htm-->Changing Viewer Options</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e22"></a></span>Zoom Dynamic</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58db"></a></span>Activates dynamic zooming. Click and hold the
-map, and then drag the cursor up or down to zoom. For more information,
-see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2dff.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2dff; Target topic = WS1a9193826455f5ff9110c71085341391d-2dff.htm-->Zooming Dynamically</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e21"></a></span>Zoom In</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58da"></a></span>Activates zoom mode. Click the map to zoom in.
-The point you click will be the center point of the new view. </p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e20"></a></span>Zoom Out</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d9"></a></span>Activates zoom mode. Click the map to zoom out.
-The point you click will be the center point of the new view.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1f"></a></span>Zoom Rectangle</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d8"></a></span>Draw a rectangle to select the new view extent.
-For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e02.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e02; Target topic = WS1a9193826455f5ff9110c71085341391d-2e02.htm-->Zooming to a Rectangle</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1e"></a></span>Zoom Selection</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d7"></a></span>Zooms to the extents of all selected features. </p></div></dd></dl><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comment about this page</span></a></div><br></body></html>
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>MapGuide Viewer Command List</title>
+ <link rel="stylesheet" type="text/css" href="./style/cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <script language="javascript">
+ function hideInfo() {
+ info = document.getElementById('infoline');
+ info.style.visibility = 'hidden';
+ }
+
+ function showInfo(title) {
+ info = document.getElementById('infoline');
+ info.innerText = title;
+ info.style.visibility = 'visible';
+ }
+ </script>
+ <meta type="description" content="MapGuide Viewer Command List">
+ <meta type="keywords" content="">
+ <meta type="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Topic;
+ Class = CPM-Topic ISD-Topic ;
+ Url = WS1a9193826455f5ff9110c71085341391d-2e28.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <div id="prevTitle" style="display:none">MapGuide Viewer Help</div>
+ <a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="parentTitle" style="display:none">MapGuide Viewer Help</div>
+ <a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="nextTitle" style="display:none">Understanding MapGuide Viewer</div>
+ <a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text"><span>MapGuide Viewer Command List</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e28"></a></span>
+ <!--Body-->
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f2"></a></span>This list displays commands that may be available on the toolbar, in right-click menus, or in the task pane of MapGuide Viewer. For an overview, see <span class="hypertext"><span class="char_link"><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm"><!--Reference = WS73099cc142f487551e5a0cb10850d4cd7c-689b; Target topic = WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm-->Understanding MapGuide Viewer</a></span></span>.</p>
+ <dl><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0f"></a></span>Buffer</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f1"></a></span>Use this command to create a buffer zone around a selected set of features. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7847.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7847; Target topic = WSfacf1429558a55def7b6851052968aa39-7847.htm-->Buffering</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e15"></a></span>Clear Selection</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f0"></a></span>Clears all features currently selected.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e13"></a></span>Copy</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ef"></a></span>Copies the current view of the map to the clipboard as a Windows Metafile.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e11"></a></span>Get Printable
+Page</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ee"></a></span>In the AJAX Viewer, this command opens a dialog box for choosing layout options, which leads to the creation of a new browser page that you can print with the browser Print command.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1a"></a></span>Initial Center and Scale</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ed"></a></span>Zooms to the initial extents set for the web application.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1b"></a></span>Initial
+Map View</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ec"></a></span>Zooms to the initial extents set for the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0e"></a></span>Measure</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58eb"></a></span>Measure distances by drawing line segments on the map. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7843.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7843; Target topic = WSfacf1429558a55def7b6851052968aa39-7843.htm-->Measuring</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1c"></a></span>Next View</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ea"></a></span>Advances to the next view in the view history.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e27"></a></span>Pan </span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e9"></a></span>Activates interactive panning. Click and hold the map to move it in any direction. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e03.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e03; Target topic = WS1a9193826455f5ff9110c71085341391d-2e03.htm-->Panning Dynamically</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e25"></a></span>Pan Down</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e8"></a></span>Pans south on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e23"></a></span>Pan Left</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e7"></a></span>Pans west on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e24"></a></span>Pan Right</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e6"></a></span>Pans east on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e26"></a></span>Pan Up</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e5"></a></span>Pans north on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1d"></a></span>Previous View</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e4"></a></span>Returns to the previous view in the view history.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e14"></a></span>Refresh Map</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e2"></a></span>Refreshes the map and reloads all layers, keeping the current center and scale.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0d"></a></span> Search</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e1"></a></span>Search for map features using a specific keyword.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e19"></a></span>Select</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e0"></a></span>Click a single feature to select it. Click and drag the cursor to draw a rectangle around multiple features.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e17"></a></span>Select Polygon</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58df"></a></span>Specify a set of points to form a polygon containing the features you want to select. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2df8.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2df8; Target topic = WS1a9193826455f5ff9110c71085341391d-2df8.htm-->Selecting Features in a Polygon</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e18"></a></span>Select Radius</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58de"></a></span>Click a center point. Then drag the cursor to specify the radius of the circle containing the features you want to select.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e16"></a></span>Select Within</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dd"></a></span>Selects map features that fall within previously selected polygon map features. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39ab.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39ab; Target topic = WS1a9193826455f5ff9110c71085341391d-39ab.htm-->Selecting Within</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e10"></a></span>View Options</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dc"></a></span>Select display options for the status bar and tool tips. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39b4.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39b4; Target topic = WS1a9193826455f5ff9110c71085341391d-39b4.htm-->Changing Viewer Options</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e22"></a></span>Zoom Dynamic</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58db"></a></span>Activates dynamic zooming. Click and hold the map, and then drag the cursor up or down to zoom. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2dff.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2dff; Target topic = WS1a9193826455f5ff9110c71085341391d-2dff.htm-->Zooming Dynamically</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e21"></a></span>Zoom In</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58da"></a></span>Activates zoom mode. Click the map to zoom in. The point you click will be the center point of the new view.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e20"></a></span>Zoom Out</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d9"></a></span>Activates zoom mode. Click the map to zoom out. The point you click will be the center point of the new view.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1f"></a></span>Zoom Rectangle</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d8"></a></span>Draw a rectangle to select the new view extent. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e02.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e02; Target topic = WS1a9193826455f5ff9110c71085341391d-2e02.htm-->Zooming to a Rectangle</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1e"></a></span>Zoom Selection</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d7"></a></span>Zooms to the extents of all selected features.</p>
+ </div>
+ </dd>
+ </dl>
+ <!---->
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comment about this page</span></a>
+ </div>
+ <br>
+</body>
+
+</html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-39b4.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-39b4.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WS1a9193826455f5ff9110c71085341391d-39b4.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,13 +1,83 @@
-
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>Changing Viewer Options</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="Changing Viewer Options"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WS1a9193826455f5ff9110c71085341391d-39b4.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">Measuring</div><a href="WSfacf1429558a55def7b6851052968aa39-7843.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">How to Use MapGuide Viewer</div><a href="WSfacf1429558a55def7b6851052968aa39-7848.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">Uninstalling the DWF Viewer</div><a href="WS1a9193826455f5ff13ee121107bdda7722-6913.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideI
nfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document
.getElementById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><span>Changing Viewer Options</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-39b4"></a></span><div class="body_content"><!--Body--><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58aa"></a></span> Use the View Options
-command to change the units of measurement in which distances are
-displayed on the status bar and in tool tips.</p><!--OList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-39b3"></a></span><p class="list-intro" id="d0e534"><a name="TOC_ENTRY__d0e534"></a><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-39b2"></a></span>To change viewer options</p><ol type="1" start="1"><li>Choose the View Options command. <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58a9"></a></span>The Viewer Options task will appear in the Task
-Pane on the right side of the viewer window.</p></li><li>Under Display Distances In, click a unit
-of measurement. </li><li>Click Save.</li></ol><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></div><br></div></body></html>
+<!-- saved from url=(0014)about:internet -->
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>Changing Viewer Options</title>
+ <link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <meta name="description" content="Changing Viewer Options">
+ <meta name="keywords" content="">
+ <meta name="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Topic;
+ Class = CPM-Topic ISD-Topic ;
+ Url = WS1a9193826455f5ff9110c71085341391d-39b4.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <div id="prevTitle" style="display:none">Measuring</div>
+ <a href="WSfacf1429558a55def7b6851052968aa39-7843.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="parentTitle" style="display:none">How to Use MapGuide Viewer</div>
+ <a href="WSfacf1429558a55def7b6851052968aa39-7848.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text">
+ <div class="collapse-expand">
+ <div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span>
+ </div>
+ <div class="collapse-expand-description" id="expand-description"></div>
+ </div>
+ <div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span>
+ </div>
+ <div class="collapse-expand-description" id="collapse-description"></div>
+ </div>
+ </div><span>Changing Viewer Options</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-39b4"></a></span>
+ <div class="body_content">
+ <!--Body-->
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58aa"></a></span> Use the View Options command to change the units of measurement in which distances are displayed on the status bar and in tool tips.</p>
+ <!--OList--><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-39b3"></a></span>
+ <p class="list-intro" id="d0e534">
+ <a name="TOC_ENTRY__d0e534"></a><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-39b2"></a></span>To change viewer options</p>
+ <ol type="1" start="1">
+ <li>Choose the View Options command.
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58a9"></a></span>The Viewer Options task will appear in the Task Pane on the right side of the viewer window.</p>
+ </li>
+ <li>Under Display Distances In, click a unit of measurement.</li>
+ <li>Click Save.</li>
+ </ol>
+ <!---->
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a>
+ </div>
+ <br>
+ </div>
+</body>
+
+</html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,9 +1,80 @@
-
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>MapGuide Viewer Help</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="MapGuide Viewer Help"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Chapter;
- Class = CPM-Chapter ISD-Chapter ;
- Url = WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><img src="" border="0"><img src="" border="0"><div id="nextTitle" style="display:none">MapGuide Viewer Command List</div><a href="mapguide_viewer_command_list.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline';
this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><s
pan>MapGuide Viewer Help</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WSfacf1429558a55de2ab0a1008e4bf960-7ff4"></a></span><div class="body_content"><!----><div class="topic-list"><h4 class="related">Topics in this section</h4><ul><li class="topiclist-litem"><a href="mapguide_viewer_command_list.htm">MapGuide Viewer Command List</a></li><li class="topiclist-litem"><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm">Understanding MapGuide Viewer</a></li><li class="topiclist-litem"><a href="WSfacf1429558a55def7b6851052968aa39-7848.htm">How to Use MapGuide Viewer</a></li><li class="topiclist-litem"><a href="WS1a9193826455f5ff13ee121107bdda7722-6913.htm">Uninstalling the DWF Viewer</a></li></ul></div><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></d
iv><br></div></body></html>
+<!-- saved from url=(0014)about:internet -->
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>MapGuide Viewer Help</title>
+ <link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <meta name="description" content="MapGuide Viewer Help">
+ <meta name="keywords" content="">
+ <meta name="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Chapter;
+ Class = CPM-Chapter ISD-Chapter ;
+ Url = WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <img src="" border="0">
+ <img src="" border="0">
+ <div id="nextTitle" style="display:none">MapGuide Viewer Command List</div>
+ <a href="mapguide_viewer_command_list.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text">
+ <div class="collapse-expand">
+ <div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span>
+ </div>
+ <div class="collapse-expand-description" id="expand-description"></div>
+ </div>
+ <div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span>
+ </div>
+ <div class="collapse-expand-description" id="collapse-description"></div>
+ </div>
+ </div><span>MapGuide Viewer Help</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WSfacf1429558a55de2ab0a1008e4bf960-7ff4"></a></span>
+ <div class="body_content">
+ <!---->
+ <div class="topic-list">
+ <h4 class="related">Topics in this section</h4>
+ <ul>
+ <li class="topiclist-litem"><a href="mapguide_viewer_command_list.htm">MapGuide Viewer Command List</a>
+ </li>
+ <li class="topiclist-litem"><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm">Understanding MapGuide Viewer</a>
+ </li>
+ <li class="topiclist-litem"><a href="WSfacf1429558a55def7b6851052968aa39-7848.htm">How to Use MapGuide Viewer</a>
+ </li>
+ </ul>
+ </div>
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a>
+ </div>
+ <br>
+ </div>
+</body>
+
+</html>
Deleted: sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7841.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7841.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7841.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,15 +0,0 @@
-<html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>Differences Between Viewer
-Versions</title><link rel="stylesheet" type="text/css" href="./style/cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="Differences Between Viewer Versions"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WSfacf1429558a55def7b6851052968aa39-7841.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">Available Versions of MapGuide Viewer</div><a href="WS1a9193826455f5ff9110c71085341391d-2e05.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">Available Versions of MapGuide Viewer</div><a href="WS1a9193826455f5ff9110c71085341391d-2e05.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">Copyright Information</div><a href="WSfacf1429558a55def7b6851052968aa39-7ac3.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle'
).innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="collapseexpand"><table width="100%" border="0" cellpadding="0" cellspacing="0" class="head-text_table"><tr><td><div class="head-text"><span>Differences Between Viewer
-Versions</span></div></td><td width="100px" align="center"><div class="collapseexpandAllSection" id="expandAllSection"><table><tr><td><span class="expandcollapse" id="expandcollapse" onmouseover="document.getElementById('collapse_description').style.visibility='visible'; this.style.textDecoration='underline'; this.style.color='#e00'" onmouseout="document.getElementById('collapse_description').style.visibility='hidden'; this.style.textDecoration='none'; this.style.color='white'" onclick="javascript: ExpandOrCollapse()"><img class="expandcollapse_img" id="expand_img" src="" onclick="javascript: ExpandOrCollapse()">Expand All</span></td></tr><tr><td><span class="expandcollapse_description" id="collapse_description">Expand all collapsed sections.</span></td></tr></table></div><div class="collapseexpandAllSection" id="collapseAllSection"><table><tr><td><span class="expandcollapse" id="expandcollapse" onmouseover="document.getElementById('expand_description').style.visibility='vis
ible'; this.style.textDecoration='underline'; this.style.color='#e00'" onmouseout="document.getElementById('expand_description').style.visibility='hidden'; this.style.textDecoration='none'; this.style.color='white'" onclick="javascript: ExpandOrCollapse()"><img class="expandcollapse_img" id="collapse_img" src="" onclick="javascript: ExpandOrCollapse()">Collapse All</span></td></tr><tr><td><span class="expandcollapse_description" id="expand_description">Collapse all expanded sections.</span></td></tr></table></div></td></tr></table></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WSfacf1429558a55def7b6851052968aa39-7841"></a></span><!--Body--><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58cd"></a></span>There are minor differences
-in functionality between the viewers. </p><div class="section"><span style="display:none"><a name="WS73099cc142f487551e5a0cb10850d4cd7c-5225"></a></span><p class="section_title_h1"><a name="TOC_ENTRY__d0e300"></a>Panning and Zooming</p><!--UList--><span style="display:none"><a name="WS73099cc142f487551e5a0cb10850d4cd7c-5224"></a></span><ul><li>DWF Viewer - Use the Pan and Zoom commands
-on the right-click menu to interactively pan and zoom. </li><li>AJAX Viewers - Use the compass and slider
-bar to pan and zoom interactively. </li></ul></div><div class="section"><span style="display:none"><a name="WS73099cc142f487551e5a0cb10850d4cd7c-5223"></a></span><p class="section_title_h1"><a name="TOC_ENTRY__d0e308"></a>Printing</p><!--UList--><span style="display:none"><a name="WS73099cc142f487551e5a0cb10850d4cd7c-5222"></a></span><ul><li>DWF Viewer - Use the Print command to
-print the currently displayed section of the map. </li><li>AJAX Viewers - Use the Get Printable
-Page command to print the currently displayed section of the map.</li></ul></div><div class="section"><span style="display:none"><a name="WS73099cc142f487555e01641096cb1c9da-7e2e"></a></span><p class="section_title_h1"><a name="TOC_ENTRY__d0e316"></a>Right-click Menus</p><!--UList--><span style="display:none"><a name="WS73099cc142f487555e01641096cb1c9da-7e2d"></a></span><ul><li>The right-click menu for the Layer Pane
-may contain different options in the DWF Viewer.</li><li>The DWF Viewer may include a right-click
-menu for the Properties Pane.</li></ul></div><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comment about this page</span></a></div><br></body></html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7ac3.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7ac3.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/WSfacf1429558a55def7b6851052968aa39-7ac3.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,20 +1,76 @@
-
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>Copyright Information</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="Copyright Information"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = WSfacf1429558a55def7b6851052968aa39-7ac3.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">Available Versions of MapGuide Viewer</div><a href="WS1a9193826455f5ff9110c71085341391d-2e05.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">Understanding MapGuide Viewer</div><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">How to Use MapGuide Viewer</div><a href="WSfacf1429558a55def7b6851052968aa39-7848.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').
innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded se
ctions.'" onmouseout="document.getElementById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><span>Copyright Information</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WSfacf1429558a55def7b6851052968aa39-7ac3"></a></span><div class="body_content"><!--Body--><div class="section"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-3b4f"></a></span><p class="section_title_h1"><a name="TOC_ENTRY__d0e316"></a
>Copyright© 2010 Autodesk, Inc.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58cc"></a></span>This work is licensed
-under the Creative Commons Attribution-ShareAlike 2.5 License. You
-are free to: (i) copy, distribute, display and perform the work;
-(ii) make derivative works; and (iii) make commercial use of the
-work, each under the conditions set forth in the license set forth
-at: <a href="http://creativecommons.org/licenses/by-sa/2.5/legalcode">http://creativecommons.org/licenses/by-sa/2.5/legalcode</a>.
-Notwithstanding the foregoing, you shall acquire no rights in, and
-the foregoing license shall not apply to, any of Autodesk's or a third
-party's trademarks used in this document.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58cb"></a></span><em class="strong">AUTODESK, INC., MAKES NO
+<!-- saved from url=(0014)about:internet -->
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>Copyright Information</title>
+ <link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <meta name="description" content="Copyright Information">
+ <meta name="keywords" content="">
+ <meta name="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Topic;
+ Class = CPM-Topic ISD-Topic ;
+ Url = WSfacf1429558a55def7b6851052968aa39-7ac3.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <div id="prevTitle" style="display:none">Available Versions of MapGuide Viewer</div>
+ <a href="WS1a9193826455f5ff9110c71085341391d-2e05.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="parentTitle" style="display:none">Understanding MapGuide Viewer</div>
+ <a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="nextTitle" style="display:none">How to Use MapGuide Viewer</div>
+ <a href="WSfacf1429558a55def7b6851052968aa39-7848.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text">
+ <div class="collapse-expand">
+ <div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span>
+ </div>
+ <div class="collapse-expand-description" id="expand-description"></div>
+ </div>
+ <div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span>
+ </div>
+ <div class="collapse-expand-description" id="collapse-description"></div>
+ </div>
+ </div><span>Copyright Information</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WSfacf1429558a55def7b6851052968aa39-7ac3"></a></span>
+ <div class="body_content">
+ <!--Body-->
+ <div class="section"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-3b4f"></a></span>
+ <p class="section_title_h1">
+ <a name="TOC_ENTRY__d0e316"></a>Copyright© 2010 Autodesk, Inc.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58cc"></a></span>This work is licensed under the Creative Commons Attribution-ShareAlike 2.5 License. You are free to: (i) copy, distribute, display and perform the work; (ii) make derivative works; and (iii) make commercial use of the work, each under the conditions set forth in the license set forth at: <a href="http://creativecommons.org/licenses/by-sa/2.5/legalcode">http://creativecommons.org/licenses/by-sa/2.5/legalcode</a>. Notwithstanding the foregoing, you shall acquire no rights in, and the foregoing license shall not apply to, any of Autodesk's or a third party's trademarks used in this document.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58cb"></a></span><em class="strong">AUTODESK, INC., MAKES NO
WARRANTY, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
REGARDING THESE MATERIALS, AND MAKES SUCH MATERIALS AVAILABLE SOLELY
@@ -23,39 +79,42 @@
DAMAGES IN CONNECTION WITH OR ARISING OUT OF ACQUISITION OR USE
OF THESE MATERIALS. THE SOLE AND EXCLUSIVE LIABILITY TO AUTODESK,
INC., REGARDLESS OF THE FORM OF ACTION, SHALL NOT EXCEED THE PURCHASE
-PRICE, IF ANY, OF THE MATERIALS DESCRIBED HEREIN.</em></p></div><div class="section"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-3b4e"></a></span><p class="section_title_h1"><a name="TOC_ENTRY__d0e327"></a>Trademarks</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ca"></a></span>Autodesk, Autodesk Map,
-Autodesk MapGuide are registered trademarks of Autodesk, Inc., in
-the USA and/or other countries. DWF is a trademark of Autodesk,
-Inc., in the USA and/or other countries. All other brand names,
-product names, or trademarks belong to their respective holders.</p></div><div class="section"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-3b4c"></a></span><p class="section_title_h1"><a name="TOC_ENTRY__d0e332"></a>Third Party Software Program
-Credits</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c9"></a></span>Portions copyright 1994,
-1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 by Cold
-Spring Harbor Laboratory. Funded under Grant P41-RR02188 by the
-National Institutes of Health.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c8"></a></span>Portions copyright 1996,
-1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 by Boutell.Com, Inc.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c7"></a></span>Portions relating to
-GD2 format copyright 1999, 2000, 2001, 2002, 2003, 2004 Philip Warner. </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c6"></a></span>Portions relating to
-PNG copyright 1999, 2000, 2001, 2002, 2003, 2004 Greg Roelofs. </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c5"></a></span>Portions relating to
-gdttf.c copyright 1999, 2000, 2001, 2002, 2003,2004 John Ellson
-(ellson at graphviz.org). </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c4"></a></span>Portions relating to
-gdft.c copyright 2001, 2002, 2003, 2004 John Ellson (ellson at graphviz.org). </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c3"></a></span>Portions relating to
-JPEG and to color quantization copyright 2000, 2001, 2002, 2003,
-2004, Doug Becker and copyright (C) 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004 Thomas G. Lane.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c2"></a></span>This software is based
-in part on the work of the Independent JPEG Group. </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c1"></a></span>Portions relating to
-GIF compression copyright 1989 by Jef Poskanzer and David Rowley,
-with modifications for thread safety by Thomas Boutell. </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c0"></a></span>Portions relating to
-GIF decompression copyright 1990, 1991, 1993 by David Koblas, with
-modifications for thread safety by Thomas Boutell. </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bf"></a></span>Portions relating to
-WBMP copyright 2000, 2001, 2002, 2003, 2004Maurice Szmurlo and Johan
-Van den Brande. </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58be"></a></span>Portions relating to
-GIF animations copyright 2004 Jaakko Hyvätti(jaakko.hyvatti at iki.fi). </p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bd"></a></span>This product includes
-PHP, freely available from <a href="http://www.php.net/">http://www.php.net/</a>.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bc"></a></span>This product includes
-software developed by the Apache Software Foundation (http://www.apache.org/).</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bb"></a></span>The Director General
-of the Geographic Survey Institute has issued the approval for the
-coordinates exchange numbered TKY2JGD for Japan. Geodetic Datum
-2000, also known as technical information No H1-N0.2 of the Geographic
-Survey Institute, to be installed and used within this software product
-(Approval No.: 646 issued by GSI, April 8, 2002).</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ba"></a></span>The OSTN97 coordinate
-transformation is © Crown Copyright 1997. All rights reserved.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58b9"></a></span>The OSTN02 coordinate
-transformation is © Crown copyright 2002. All rights reserved.</p><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58b8"></a></span>The OSGM02 coordinate
-transformation is © Crown copyright 2002, © Ordnance Survey Ireland, 2002.</p></div><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></div><br></div></body></html>
+PRICE, IF ANY, OF THE MATERIALS DESCRIBED HEREIN.</em>
+ </p>
+ </div>
+ <div class="section"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-3b4e"></a></span>
+ <p class="section_title_h1">
+ <a name="TOC_ENTRY__d0e327"></a>Trademarks</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ca"></a></span>Autodesk, Autodesk Map, Autodesk MapGuide are registered trademarks of Autodesk, Inc., in the USA and/or other countries. DWF is a trademark of Autodesk, Inc., in the USA and/or other countries. All other brand names, product names, or trademarks belong to their respective holders.</p>
+ </div>
+ <div class="section"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-3b4c"></a></span>
+ <p class="section_title_h1">
+ <a name="TOC_ENTRY__d0e332"></a>Third Party Software Program Credits
+ </p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c9"></a></span>Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under Grant P41-RR02188 by the National Institutes of Health.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c8"></a></span>Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 by Boutell.Com, Inc.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c7"></a></span>Portions relating to GD2 format copyright 1999, 2000, 2001, 2002, 2003, 2004 Philip Warner.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c6"></a></span>Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003, 2004 Greg Roelofs.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c5"></a></span>Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002, 2003,2004 John Ellson (ellson at graphviz.org).</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c4"></a></span>Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John Ellson (ellson at graphviz.org).</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c3"></a></span>Portions relating to JPEG and to color quantization copyright 2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas G. Lane.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c2"></a></span>This software is based in part on the work of the Independent JPEG Group.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c1"></a></span>Portions relating to GIF compression copyright 1989 by Jef Poskanzer and David Rowley, with modifications for thread safety by Thomas Boutell.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58c0"></a></span>Portions relating to GIF decompression copyright 1990, 1991, 1993 by David Koblas, with modifications for thread safety by Thomas Boutell.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bf"></a></span>Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004Maurice Szmurlo and Johan Van den Brande.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58be"></a></span>Portions relating to GIF animations copyright 2004 Jaakko Hyvätti(jaakko.hyvatti at iki.fi).</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bd"></a></span>This product includes PHP, freely available from <a href="http://www.php.net/">http://www.php.net/</a>.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bc"></a></span>This product includes software developed by the Apache Software Foundation (http://www.apache.org/).</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58bb"></a></span>The Director General of the Geographic Survey Institute has issued the approval for the coordinates exchange numbered TKY2JGD for Japan. Geodetic Datum 2000, also known as technical information No H1-N0.2 of the Geographic Survey Institute, to be installed and used within this software product (Approval No.: 646 issued by GSI, April 8, 2002).</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ba"></a></span>The OSTN97 coordinate transformation is © Crown Copyright 1997. All rights reserved.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58b9"></a></span>The OSTN02 coordinate transformation is © Crown copyright 2002. All rights reserved.</p>
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58b8"></a></span>The OSGM02 coordinate transformation is © Crown copyright 2002, © Ordnance Survey Ireland, 2002.</p>
+ </div>
+ <!---->
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a>
+ </div>
+ <br>
+ </div>
+</body>
+
+</html>
Modified: sandbox/jng/v30/Web/src/localized/help/en/mapguide_viewer_command_list.htm
===================================================================
--- sandbox/jng/v30/Web/src/localized/help/en/mapguide_viewer_command_list.htm 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/localized/help/en/mapguide_viewer_command_list.htm 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,52 +1,231 @@
-
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- saved from url=(0014)about:internet --><html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
- <title>MapGuide Viewer Command List</title><link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css"><link rel="stylesheet" type="text/css" href="./style/isd.css"><link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css"><link rel="stylesheet" type="text/css" href="./style/comments-disabled.css"><meta name="description" content="MapGuide Viewer Command List"><meta name="keywords" content=""><meta name="topic-type" content="concept"></head><body><!--
- Name = Topic;
- Class = CPM-Topic ISD-Topic ;
- Url = mapguide_viewer_command_list.htm--><div class="head"><div class="head-block"><div class="nav-group"><!--browse buttons--><div class="browse"><nobr><!--No Additional browse buttons are defined--><div id="prevTitle" style="display:none">MapGuide Viewer Help</div><a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="parentTitle" style="display:none">MapGuide Viewer Help</div><a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();"><img src="" border="0"></a><div id="nextTitle" style="display:none">Understanding MapGuide Viewer</div><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();"
><img src="" border="0"></a></nobr></div><!--end browse buttons--></div><div class="button-info"><span id="infoline"> </span></div><div class="head-text"><div class="collapse-expand"><div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span></div><div class="collapse-expand-description" id="expand-description"></div></div><div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getEle
mentById('collapse-description').innerHTML=''"><div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span></div><div class="collapse-expand-description" id="collapse-description"></div></div></div><span>MapGuide Viewer Command List</span></div></div></div><div class="head-margin"> </div><div style="line-height: 0pt"> </div><div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e28"></a></span><div class="body_content"><!--Body--><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f2"></a></span>This list displays commands
-that may be available on the toolbar, in right-click menus, or in
-the task pane of MapGuide Viewer. For an overview, see <span class="hypertext"><span class="char_link"><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm"><!--Reference = WS73099cc142f487551e5a0cb10850d4cd7c-689b; Target topic = WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm-->Understanding MapGuide Viewer</a></span></span>.</p><dl><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0f"></a></span><!--CPM-ContextId = 'Buffer'-->Buffer</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f1"></a></span>Use this command to create
-a buffer zone around a selected set of features. For more information,
-see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7847.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7847; Target topic = WSfacf1429558a55def7b6851052968aa39-7847.htm-->Buffering</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e15"></a></span><!--CPM-ContextId = 'Clear Selection'-->Clear Selection</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f0"></a></span>Clears all features currently selected.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e13"></a></span><!--CPM-ContextId = 'Copy'-->Copy</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ef"></a></span>Copies the current view of
-the map to the clipboard as a Windows Metafile.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d21"></a></span>External Providers<!--CPM-ContextId = 'External Providers'--></span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d20"></a></span>Lets you switch between available
-baselayers in the map. </p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e11"></a></span><!--CPM-ContextId = 'Get Printable Page'-->Get Printable
-Page</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ee"></a></span>In the AJAX Viewer, this command
-opens a dialog box for choosing layout options, which leads to the
-creation of a new browser page that you can print with the browser
-Print command.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1a"></a></span><!--CPM-ContextId = 'Initial Center and Scale'-->Initial Center and Scale</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ed"></a></span>Zooms to the initial extents
-set for the web application.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1b"></a></span><!--CPM-ContextId = 'Initial Map View'-->Initial
-Map View</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ec"></a></span>Zooms to the initial extents
-set for the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0e"></a></span><!--CPM-ContextId = 'Measure'-->Measure</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58eb"></a></span>Measure distances by drawing
-line segments on the map. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7843.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7843; Target topic = WSfacf1429558a55def7b6851052968aa39-7843.htm-->Measuring</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1c"></a></span><!--CPM-ContextId = 'Next View'-->Next View</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ea"></a></span>Advances to the next view
-in the view history.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e27"></a></span><!--CPM-ContextId = 'Pan'-->Pan </span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e9"></a></span>Activates interactive panning.
-Click and hold the map to move it in any direction. For more information,
-see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e03.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e03; Target topic = WS1a9193826455f5ff9110c71085341391d-2e03.htm-->Panning Dynamically</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e25"></a></span><!--CPM-ContextId = 'Pan Down'-->Pan Down</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e8"></a></span>Pans south on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e23"></a></span><!--CPM-ContextId = 'Pan Left'-->Pan Left</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e7"></a></span>Pans west on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a919
3826455f5ff9110c71085341391d-2e24"></a></span><!--CPM-ContextId = 'Pan Right'-->Pan Right</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e6"></a></span>Pans east on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e26"></a></span><!--CPM-ContextId = 'Pan Up'-->Pan Up</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e5"></a></span>Pans north on the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1d"></a></span><!--CPM-ContextId = 'Previous View'-->Previous View</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e4"></a></span>Returns to the previous view
-in the view history.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e12"></a></span><!--CPM-ContextId = 'Print'-->Print</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e3"></a></span> This command opens the
-DWF Viewer Print dialog box. Set printing options, preview, and
-print the current view of the map.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d19"></a></span>Query<!--CPM-ContextId = 'Query'--></span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d18"></a></span>Use this command to find
-features. </p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1d"></a></span>Redline<!--CPM-ContextId = 'Redline'--></span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1c"></a></span>Lets you annotate a map with
-a selection of symbols and text, and the export it as either DWF
-or KML file types. </p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e14"></a></span><!--CPM-ContextId = 'Refresh'-->Refresh Map</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e2"></a></span>Refreshes the map and reloads
-all layers, keeping the current center and scale.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0d"></a></span><!--CPM-ContextId = 'Search'--> Search</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e1"></a></span>Search for map features using
-a specific keyword.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e19"></a></span><!--CPM-ContextId = 'Select'-->Select</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e0"></a></span>Click a single feature
-to select it. Click and drag the cursor to draw a rectangle around
-multiple features.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e17"></a></span><!--CPM-ContextId = 'Select Polygon'-->Select Polygon</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58df"></a></span>Specify a set of points
-to form a polygon containing the features you want to select. For
-more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2df8.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2df8; Target topic = WS1a9193826455f5ff9110c71085341391d-2df8.htm-->Selecting Features in a Polygon</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e18"></a></span><!--CPM-ContextId = 'Select Radius'-->Select Radius</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58de"></a></span>Click a center point. Then
-drag the cursor to specify the radius of the circle containing the
-features you want to select.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e16"></a></span><!--CPM-ContextId = 'Select Within'-->Select Within</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dd"></a></span>Selects map features
-that fall within previously selected polygon map features. For more
-information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39ab.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39ab; Target topic = WS1a9193826455f5ff9110c71085341391d-39ab.htm-->Selecting Within</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1b"></a></span>Theme<!--CPM-ContextId = 'Theme'--></span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1a"></a></span>Use this command to create
-themed maps. </p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e10"></a></span><!--CPM-ContextId = 'View Options'-->View Options</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dc"></a></span>Select display options
-for the status bar and tool tips. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39b4.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39b4; Target topic = WS1a9193826455f5ff9110c71085341391d-39b4.htm-->Changing Viewer Options</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e22"></a></span><!--CPM-ContextId = 'Zoom'-->Zoom Dynamic</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58db"></a></span>Activates dynamic zooming.
-Click and hold the map, and then drag the cursor up or down to zoom.
-For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2dff.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2dff; Target topic = WS1a9193826455f5ff9110c71085341391d-2dff.htm-->Zooming Dynamically</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e21"></a></span><!--CPM-ContextId = 'Zoom In'-->Zoom In</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58da"></a></span>Activates zoom mode. Click
-the map to zoom in. The point you click will be the center point
-of the new view. </p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e20"></a></span><!--CPM-ContextId = 'Zoom Out'-->Zoom Out</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d9"></a></span>Activates zoom mode. Click
-the map to zoom out. The point you click will be the center point
-of the new view.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1f"></a></span><!--CPM-ContextId = 'Zoom Rectangle'-->Zoom Rectangle</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d8"></a></span>Draw a rectangle to select the
-new view extent. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e02.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e02; Target topic = WS1a9193826455f5ff9110c71085341391d-2e02.htm-->Zooming to a Rectangle</a></span></span>.</p></div></dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1e"></a></span><!--CPM-ContextId = 'Zoom to Selection'-->Zoom Selection</span></dt><dd><div class="definition"><p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d7"></a></span>Zooms to the extents
-of all selected features. </p></div></dd></dl><!----><div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a></div><br></div></body></html>
+<!-- saved from url=(0014)about:internet -->
+<html>
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+ <title>MapGuide Viewer Command List</title>
+ <link rel="stylesheet" type="text/css" href="./style/adsk.cpm.css">
+ <link rel="stylesheet" type="text/css" href="./style/isd.css">
+ <link rel="stylesheet" type="text/css" href="./style/cpm-gbu.css">
+ <link rel="stylesheet" type="text/css" href="./style/comments-disabled.css">
+ <meta name="description" content="MapGuide Viewer Command List">
+ <meta name="keywords" content="">
+ <meta name="topic-type" content="concept">
+</head>
+
+<body>
+ <!--
+ Name = Topic;
+ Class = CPM-Topic ISD-Topic ;
+ Url = mapguide_viewer_command_list.htm-->
+ <div class="head">
+ <div class="head-block">
+ <div class="nav-group">
+ <!--browse buttons-->
+ <div class="browse">
+ <nobr>
+ <!--No Additional browse buttons are defined-->
+ <div id="prevTitle" style="display:none">MapGuide Viewer Help</div>
+ <a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('prevTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="parentTitle" style="display:none">MapGuide Viewer Help</div>
+ <a href="WSfacf1429558a55de2ab0a1008e4bf960-7ff4.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('parentTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ <div id="nextTitle" style="display:none">Understanding MapGuide Viewer</div>
+ <a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm" class="headNavLink" onmouseover="showInfo(document.getElementById('nextTitle').innerHTML);" onmouseout="hideInfo();">
+ <img src="" border="0">
+ </a>
+ </nobr>
+ </div>
+ <!--end browse buttons-->
+ </div>
+ <div class="button-info"><span id="infoline"> </span>
+ </div>
+ <div class="head-text">
+ <div class="collapse-expand">
+ <div id="expandAllSection" onmouseover="document.getElementById('expand-description').innerHTML='Expand all collapsed sections.'" onmouseout="document.getElementById('expand-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: ExpandAll()"><img class="expandcollapse_img" id="collapse_img" src="./images/ac.right.gif">Expand All</span>
+ </div>
+ <div class="collapse-expand-description" id="expand-description"></div>
+ </div>
+ <div id="collapseAllSection" onmouseover="document.getElementById('collapse-description').innerHTML='Collapse all expanded sections.'" onmouseout="document.getElementById('collapse-description').innerHTML=''">
+ <div class="collapse-expand-label"><span onmouseover="this.style.textDecoration='underline'; this.style.color='white'" onmouseout="this.style.textDecoration='none'; this.style.color='#959595'" onclick="javascript: CollapseAll()"><img class="expandcollapse_img" id="expand_img" src="./images/ac.down.gif">Collapse All</span>
+ </div>
+ <div class="collapse-expand-description" id="collapse-description"></div>
+ </div>
+ </div><span>MapGuide Viewer Command List</span>
+ </div>
+ </div>
+ </div>
+ <div class="head-margin"> </div>
+ <div style="line-height: 0pt"> </div>
+ <div class="head-margin"> </div><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e28"></a></span>
+ <div class="body_content">
+ <!--Body-->
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f2"></a></span>This list displays commands that may be available on the toolbar, in right-click menus, or in the task pane of MapGuide Viewer. For an overview, see <span class="hypertext"><span class="char_link"><a href="WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm"><!--Reference = WS73099cc142f487551e5a0cb10850d4cd7c-689b; Target topic = WS73099cc142f487551e5a0cb10850d4cd7c-689b.htm-->Understanding MapGuide Viewer</a></span></span>.</p>
+ <dl><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0f"></a></span><!--CPM-ContextId = 'Buffer'-->Buffer</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f1"></a></span>Use this command to create a buffer zone around a selected set of features. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7847.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7847; Target topic = WSfacf1429558a55def7b6851052968aa39-7847.htm-->Buffering</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e15"></a></span><!--CPM-ContextId = 'Clear Selection'-->Clear Selection</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58f0"></a></span>Clears all features currently selected.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e13"></a></span><!--CPM-ContextId = 'Copy'-->Copy</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ef"></a></span>Copies the current view of the map to the clipboard as a Windows Metafile.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d21"></a></span>External Providers<!--CPM-ContextId = 'External Providers'--></span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d20"></a></span>Lets you switch between available baselayers in the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e11"></a></span><!--CPM-ContextId = 'Get Printable Page'-->Get Printable
+Page</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ee"></a></span>In the AJAX Viewer, this command opens a dialog box for choosing layout options, which leads to the creation of a new browser page that you can print with the browser Print command.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1a"></a></span><!--CPM-ContextId = 'Initial Center and Scale'-->Initial Center and Scale</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ed"></a></span>Zooms to the initial extents set for the web application.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1b"></a></span><!--CPM-ContextId = 'Initial Map View'-->Initial
+Map View</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ec"></a></span>Zooms to the initial extents set for the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0e"></a></span><!--CPM-ContextId = 'Measure'-->Measure</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58eb"></a></span>Measure distances by drawing line segments on the map. For more information, see <span class="hypertext"><span class="char_link"><a href="WSfacf1429558a55def7b6851052968aa39-7843.htm"><!--Reference = WSfacf1429558a55def7b6851052968aa39-7843; Target topic = WSfacf1429558a55def7b6851052968aa39-7843.htm-->Measuring</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1c"></a></span><!--CPM-ContextId = 'Next View'-->Next View</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58ea"></a></span>Advances to the next view in the view history.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e27"></a></span><!--CPM-ContextId = 'Pan'-->Pan </span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e9"></a></span>Activates interactive panning. Click and hold the map to move it in any direction. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e03.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e03; Target topic = WS1a9193826455f5ff9110c71085341391d-2e03.htm-->Panning Dynamically</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e25"></a></span><!--CPM-ContextId = 'Pan Down'-->Pan Down</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e8"></a></span>Pans south on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e23"></a></span><!--CPM-ContextId = 'Pan Left'-->Pan Left</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e7"></a></span>Pans west on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e24"></a></span><!--CPM-ContextId = 'Pan Right'-->Pan Right</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e6"></a></span>Pans east on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e26"></a></span><!--CPM-ContextId = 'Pan Up'-->Pan Up</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e5"></a></span>Pans north on the map.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1d"></a></span><!--CPM-ContextId = 'Previous View'-->Previous View</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e4"></a></span>Returns to the previous view in the view history.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d19"></a></span>Query<!--CPM-ContextId = 'Query'--></span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d18"></a></span>Use this command to find features.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1d"></a></span>Redline<!--CPM-ContextId = 'Redline'--></span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1c"></a></span>Lets you annotate a map with a selection of symbols and text, and the export it as either DWF or KML file types.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e14"></a></span><!--CPM-ContextId = 'Refresh'-->Refresh Map</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e2"></a></span>Refreshes the map and reloads all layers, keeping the current center and scale.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e0d"></a></span><!--CPM-ContextId = 'Search'--> Search</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e1"></a></span>Search for map features using a specific keyword.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e19"></a></span><!--CPM-ContextId = 'Select'-->Select</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58e0"></a></span>Click a single feature to select it. Click and drag the cursor to draw a rectangle around multiple features.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e17"></a></span><!--CPM-ContextId = 'Select Polygon'-->Select Polygon</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58df"></a></span>Specify a set of points to form a polygon containing the features you want to select. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2df8.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2df8; Target topic = WS1a9193826455f5ff9110c71085341391d-2df8.htm-->Selecting Features in a Polygon</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e18"></a></span><!--CPM-ContextId = 'Select Radius'-->Select Radius</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58de"></a></span>Click a center point. Then drag the cursor to specify the radius of the circle containing the features you want to select.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e16"></a></span><!--CPM-ContextId = 'Select Within'-->Select Within</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dd"></a></span>Selects map features that fall within previously selected polygon map features. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39ab.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39ab; Target topic = WS1a9193826455f5ff9110c71085341391d-39ab.htm-->Selecting Within</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1b"></a></span>Theme<!--CPM-ContextId = 'Theme'--></span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff-735130a41278d915f58-7d1a"></a></span>Use this command to create themed maps.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e10"></a></span><!--CPM-ContextId = 'View Options'-->View Options</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58dc"></a></span>Select display options for the status bar and tool tips. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-39b4.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-39b4; Target topic = WS1a9193826455f5ff9110c71085341391d-39b4.htm-->Changing Viewer Options</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e22"></a></span><!--CPM-ContextId = 'Zoom'-->Zoom Dynamic</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58db"></a></span>Activates dynamic zooming. Click and hold the map, and then drag the cursor up or down to zoom. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2dff.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2dff; Target topic = WS1a9193826455f5ff9110c71085341391d-2dff.htm-->Zooming Dynamically</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e21"></a></span><!--CPM-ContextId = 'Zoom In'-->Zoom In</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58da"></a></span>Activates zoom mode. Click the map to zoom in. The point you click will be the center point of the new view.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e20"></a></span><!--CPM-ContextId = 'Zoom Out'-->Zoom Out</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d9"></a></span>Activates zoom mode. Click the map to zoom out. The point you click will be the center point of the new view.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1f"></a></span><!--CPM-ContextId = 'Zoom Rectangle'-->Zoom Rectangle</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d8"></a></span>Draw a rectangle to select the new view extent. For more information, see <span class="hypertext"><span class="char_link"><a href="WS1a9193826455f5ff9110c71085341391d-2e02.htm"><!--Reference = WS1a9193826455f5ff9110c71085341391d-2e02; Target topic = WS1a9193826455f5ff9110c71085341391d-2e02.htm-->Zooming to a Rectangle</a></span></span>.</p>
+ </div>
+ </dd><dt><span class="term"><span style="display:none"><a name="WS1a9193826455f5ff9110c71085341391d-2e1e"></a></span><!--CPM-ContextId = 'Zoom to Selection'-->Zoom Selection</span></dt>
+ <dd>
+ <div class="definition">
+ <p><span style="display:none"><a name="WS1a9193826455f5ff5f7e8f111d4851871-58d7"></a></span>Zooms to the extents of all selected features.</p>
+ </div>
+ </dd>
+ </dl>
+ <!---->
+ <div class="footer-block"><a href="javascript:doComments('');"><span class="comments-link">Please send us your comments about this page</span></a>
+ </div>
+ <br>
+ </div>
+</body>
+
+</html>
Deleted: sandbox/jng/v30/Web/src/mapviewerjava/dwfviewer.jsp
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerjava/dwfviewer.jsp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/mapviewerjava/dwfviewer.jsp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,31 +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
---%>
-
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ page import="org.osgeo.mapguide.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.io.*" %>
-<%@ page import="javax.servlet.jsp.*" %>
-<%@ page import="javax.servlet.http.*" %>
-<%@ include file="mainframe.jsp" %>
-
-<%
-response.setContentType("text/html; charset=UTF-8");
-request.setCharacterEncoding("UTF-8");
-MgLocalizer.SetLocalizedFilesPath(getServletContext().getRealPath("/") + "localized/");
-
-GenerateMainPage(1, request, response);
-%>
Modified: sandbox/jng/v30/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerjava/mapframe.jsp 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/mapviewerjava/mapframe.jsp 2014-06-16 12:48:47 UTC (rev 8226)
@@ -32,7 +32,6 @@
int showProperties;
int showSlider;
String sessionId;
-String type;
String hlTgt;
String hlTgtName;
String selectionColor;
@@ -45,156 +44,125 @@
response.setContentType("text/html; charset=UTF-8");
request.setCharacterEncoding("UTF-8");
infoWidth = showLegend = showProperties = 0;
- hlTgt = hlTgtName = locale = mapDefinition = sessionId = type = "";
+ hlTgt = hlTgtName = locale = mapDefinition = sessionId = "";
MgLocalizer.SetLocalizedFilesPath(getServletContext().getRealPath("/") + "localized/");
GetRequestParameters(request);
- if (type.equals("DWF"))
- {
- String frameName = "";
- if(hlTgt.equals("1"))
- {
- frameName = "taskPaneFrame";
- }
- else if(hlTgt.equals("3"))
- {
- frameName = hlTgtName;
- }
- else
- {
- frameName = "_BLANK";
- }
- String mapRequest = GetRootVirtualFolder(request) + "/mapagent/mapagent.fcgi?OPERATION=GETMAP&VERSION=1.0&MAPDEFINITION=" + URLEncoder.encode(mapDefinition, "UTF-8") + "&DWFVERSION=6.01&EMAPVERSION=1.0&LOCALE=" + locale + (sessionId != ""? "&SESSION=" + sessionId: "") + "&reload=true";
- String vals[] = { mapRequest,
- String.valueOf(infoWidth),
- showLegend != 0 || showProperties != 0? "true": "false",
- showLegend != 0 ? "true": "false",
- showProperties != 0 ? "true": "false",
- frameName
- };
- //load html template code and format it
- //
- String templ = MgLocalizer.Localize(LoadTemplate("/viewerfiles/dwfmappane.templ"), locale, GetClientOS(request));
- response.getWriter().write(Substitute(templ, vals));
- }
- else
- {
- InitializeWebTier();
+ InitializeWebTier();
- // create the map instance and store it with the session
- //
- MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ // create the map instance and store it with the session
+ //
+ MgUserInformation userInfo = new MgUserInformation();
+ userInfo.SetMgSessionId(sessionId);
+ userInfo.SetClientIp(GetClientIp(request));
+ userInfo.SetClientAgent(GetClientAgent());
- MgSiteConnection site = new MgSiteConnection();
- site.Open(userInfo);
+ MgSiteConnection site = new MgSiteConnection();
+ site.Open(userInfo);
- MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
- int tileSizeX = tileSrvc.GetDefaultTileSizeX();
- int tileSizeY = tileSrvc.GetDefaultTileSizeY();
+ MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
+ int tileSizeX = tileSrvc.GetDefaultTileSizeX();
+ int tileSizeY = tileSrvc.GetDefaultTileSizeY();
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
- MgMap map = new MgMap(site);
- MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
- String mapName = resId.GetName();
- map.Create(resId, mapName);
+ MgMap map = new MgMap(site);
+ MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
+ String mapName = resId.GetName();
+ map.Create(resId, mapName);
- //create an empty selection object and store it in the session repository
- MgSelection sel = new MgSelection(map);
- sel.Save(resourceSrvc, mapName);
+ //create an empty selection object and store it in the session repository
+ MgSelection sel = new MgSelection(map);
+ sel.Save(resourceSrvc, mapName);
- //get the map extent and calculate the scale factor
- //
- MgEnvelope mapExtent = map.GetMapExtent();
- String srs = map.GetMapSRS();
- double metersPerUnit;
- String unitsType;
- if(srs != null && srs.length() > 0)
- {
- MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
- MgCoordinateSystem cs = csFactory.Create(srs);
- metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
- unitsType = cs.GetUnits();
- }
- else
- {
- metersPerUnit = 1.0;
- unitsType = MgLocalizer.GetString("DISTANCEMETERS", locale);
- }
+ //get the map extent and calculate the scale factor
+ //
+ MgEnvelope mapExtent = map.GetMapExtent();
+ String srs = map.GetMapSRS();
+ double metersPerUnit;
+ String unitsType;
+ if(srs != null && srs.length() > 0)
+ {
+ MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
+ MgCoordinateSystem cs = csFactory.Create(srs);
+ metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
+ unitsType = cs.GetUnits();
+ }
+ else
+ {
+ metersPerUnit = 1.0;
+ unitsType = MgLocalizer.GetString("DISTANCEMETERS", locale);
+ }
- MgCoordinate llExtent = mapExtent.GetLowerLeftCoordinate();
- MgCoordinate urExtent = mapExtent.GetUpperRightCoordinate();
- String bgColor = map.GetBackgroundColor();
- if(bgColor.length() == 8)
- {
- bgColor = "#" + bgColor.substring(2);
- }
- else
- {
- bgColor = "white";
- }
+ MgCoordinate llExtent = mapExtent.GetLowerLeftCoordinate();
+ MgCoordinate urExtent = mapExtent.GetUpperRightCoordinate();
+ String bgColor = map.GetBackgroundColor();
+ if(bgColor.length() == 8)
+ {
+ bgColor = "#" + bgColor.substring(2);
+ }
+ else
+ {
+ bgColor = "white";
+ }
- String scaleCreationCode = "";
+ String scaleCreationCode = "";
- // Create a sorted set of display scales
- TreeSet scales = new TreeSet();
- for(int i = 0; i < map.GetFiniteDisplayScaleCount(); i++)
- {
- scales.add(new Double(map.GetFiniteDisplayScaleAt(i)));
- }
- Iterator iter = scales.iterator();
- int i = 0;
- while(iter.hasNext())
- {
- scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + iter.next().toString().replace(',','.') + "; ";
- i++;
- }
- MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
- map.Save(resourceSrvc, mapStateId);
-
- //load html template code and format it
- //
- String templ = MgLocalizer.Localize(LoadTemplate("/viewerfiles/ajaxmappane.templ"), locale, GetClientOS(request));
- String vpath = GetSurroundVirtualPath(request);
- String vals[] = {
- String.valueOf(tileSizeX),
- String.valueOf(tileSizeY),
- GetRootVirtualFolder(request) + "/mapagent/mapagent.fcgi",
- mapName,
- mapDefinition,
- String.valueOf(infoWidth),
- showLegend != 0 ? "true": "false",
- showProperties != 0 ? "true": "false",
- sessionId,
- String.valueOf(llExtent.GetX()), String.valueOf(llExtent.GetY()),
- String.valueOf(urExtent.GetX()), String.valueOf(urExtent.GetY()),
- String.valueOf(metersPerUnit),
- unitsType,
- bgColor,
- hlTgt,
- hlTgtName,
- vpath + "setselection.jsp",
- showSlider != 0? "true": "false",
- locale,
- scaleCreationCode,
- selectionColor,
- mapImgFormat,
- selImgFormat,
- String.valueOf(pointBufferSize),
- vpath + "ajaxviewerabout.jsp",
- vpath + "legendctrl.jsp",
- URLEncoder.encode(mapName, "UTF-8"),
- sessionId,
- locale,
- vpath + "propertyctrl.jsp",
- locale };
- response.getWriter().write(Substitute(templ, vals));
+ // Create a sorted set of display scales
+ TreeSet scales = new TreeSet();
+ for(int i = 0; i < map.GetFiniteDisplayScaleCount(); i++)
+ {
+ scales.add(new Double(map.GetFiniteDisplayScaleAt(i)));
}
+ Iterator iter = scales.iterator();
+ int i = 0;
+ while(iter.hasNext())
+ {
+ scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + iter.next().toString().replace(',','.') + "; ";
+ i++;
+ }
+ MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
+ map.Save(resourceSrvc, mapStateId);
+ //load html template code and format it
+ //
+ String templ = MgLocalizer.Localize(LoadTemplate("/viewerfiles/ajaxmappane.templ"), locale, GetClientOS(request));
+ String vpath = GetSurroundVirtualPath(request);
+ String vals[] = {
+ String.valueOf(tileSizeX),
+ String.valueOf(tileSizeY),
+ GetRootVirtualFolder(request) + "/mapagent/mapagent.fcgi",
+ mapName,
+ mapDefinition,
+ String.valueOf(infoWidth),
+ showLegend != 0 ? "true": "false",
+ showProperties != 0 ? "true": "false",
+ sessionId,
+ String.valueOf(llExtent.GetX()), String.valueOf(llExtent.GetY()),
+ String.valueOf(urExtent.GetX()), String.valueOf(urExtent.GetY()),
+ String.valueOf(metersPerUnit),
+ unitsType,
+ bgColor,
+ hlTgt,
+ hlTgtName,
+ vpath + "setselection.jsp",
+ showSlider != 0? "true": "false",
+ locale,
+ scaleCreationCode,
+ selectionColor,
+ mapImgFormat,
+ selImgFormat,
+ String.valueOf(pointBufferSize),
+ vpath + "ajaxviewerabout.jsp",
+ vpath + "legendctrl.jsp",
+ URLEncoder.encode(mapName, "UTF-8"),
+ sessionId,
+ locale,
+ vpath + "propertyctrl.jsp",
+ locale };
+ response.getWriter().write(Substitute(templ, vals));
+
%>
<%!
@@ -209,7 +177,6 @@
showLegend = GetIntParameter(request, "SHOWLEGEND");
showProperties = GetIntParameter(request, "SHOWPROP");
showSlider = GetIntParameter(request, "SHOWSLIDER");
- type = GetParameter(request, "TYPE");
selectionColor = ValidateColorString(GetParameter(request, "SELCOLOR"), 8);
mapImgFormat = GetParameter(request, "MAPIMGFORMAT");
selImgFormat = GetParameter(request, "SELIMGFORMAT");
Deleted: sandbox/jng/v30/Web/src/mapviewernet/dwfviewer.aspx
===================================================================
--- sandbox/jng/v30/Web/src/mapviewernet/dwfviewer.aspx 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/mapviewernet/dwfviewer.aspx 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,24 +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
---%>
-
-<%@ Page language="c#" %>
-<%@ Import Namespace="System" %>
-<%@ Import Namespace="System.Collections.Specialized" %>
-<%@ Import Namespace="System.IO" %>
-<%@ Import Namespace="OSGeo.MapGuide" %>
-
-<script runat="server">int forDwf=1;</script>
-<!-- #Include File="mainframe.aspx -->
Modified: sandbox/jng/v30/Web/src/mapviewernet/mapframe.aspx
===================================================================
--- sandbox/jng/v30/Web/src/mapviewernet/mapframe.aspx 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/mapviewernet/mapframe.aspx 2014-06-16 12:48:47 UTC (rev 8226)
@@ -27,12 +27,11 @@
<script runat="server">
String mapDefinition;
String locale;
-int infoWidth;
+int infoWidth;
int showLegend;
int showProperties;
int showSlider;
String sessionId;
-String type;
String hlTgt;
String hlTgtName;
String selectionColor;
@@ -52,157 +51,124 @@
GetRequestParameters();
String mapRequest = "";
- if ("DWF" == type)
+ try
{
- String frameName = "";
- if(hlTgt.Equals("1"))
- {
- frameName = "taskPaneFrame";
- }
- else if(hlTgt.Equals("3"))
- {
- frameName = hlTgtName;
- }
- else
- {
- frameName = "_BLANK";
- }
- mapRequest = GetRootVirtualFolder(Request) + "/mapagent/mapagent.fcgi?OPERATION=GETMAP&VERSION=1.0&MAPDEFINITION=" + HttpUtility.UrlEncode(mapDefinition) + "&DWFVERSION=6.01&EMAPVERSION=1.0&LOCALE=" + locale + (sessionId != "" ? "&SESSION=" + sessionId : "") + "&reload=true";
+ InitializeWebTier();
- //load html template code and format it
+ // create the map instance and store it with the session
//
- String template = MgLocalizer.Localize(LoadTemplate(Request, "../viewerfiles/dwfmappane.templ"), locale, GetClientOS(Request));
- String[] vals = {
- mapRequest,
- infoWidth.ToString(NumberFormatInfo.InvariantInfo),
- (0!=showLegend) || (0!=showProperties)? "true":"false",
- 0!=showLegend? "true":"false",
- 0!=showProperties? "true":"false",
- frameName
- };
- Response.Write(Substitute(template, vals));
- }
- else
- {
- try
- {
- InitializeWebTier();
+ MgUserInformation userInfo = new MgUserInformation(sessionId);
+ userInfo.SetClientIp(GetClientIp(Request));
+ userInfo.SetClientAgent(GetClientAgent());
- // create the map instance and store it with the session
- //
- MgUserInformation userInfo = new MgUserInformation(sessionId);
- userInfo.SetClientIp(GetClientIp(Request));
- userInfo.SetClientAgent(GetClientAgent());
+ MgSiteConnection site = new MgSiteConnection();
+ site.Open(userInfo);
- MgSiteConnection site = new MgSiteConnection();
- site.Open(userInfo);
+ MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
+ int tileSizeX = tileSrvc.GetDefaultTileSizeX();
+ int tileSizeY = tileSrvc.GetDefaultTileSizeY();
- MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
- int tileSizeX = tileSrvc.GetDefaultTileSizeX();
- int tileSizeY = tileSrvc.GetDefaultTileSizeY();
+ MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgMap map = new MgMap(site);
+ MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
+ String mapName = resId.GetName();
+ map.Create(resId, mapName);
- MgMap map = new MgMap(site);
- MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
- String mapName = resId.GetName();
- map.Create(resId, mapName);
+ //create an empty selection object and store it in the session repository
+ MgSelection sel = new MgSelection(map);
+ sel.Save(resourceSrvc, mapName);
- //create an empty selection object and store it in the session repository
- MgSelection sel = new MgSelection(map);
- sel.Save(resourceSrvc, mapName);
+ //get the map extent and calculate the scale factor
+ //
+ MgEnvelope mapExtent = map.GetMapExtent();
+ String srs = map.GetMapSRS();
+ double metersPerUnit;
+ String unitsType;
+ if(srs != null && srs.Length > 0)
+ {
+ MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
+ MgCoordinateSystem cs = csFactory.Create(srs);
+ metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
+ unitsType = cs.GetUnits();
+ }
+ else
+ {
+ metersPerUnit = 1.0;
+ unitsType = MgLocalizer.GetString("DISTANCEMETERS", locale);
+ }
- //get the map extent and calculate the scale factor
- //
- MgEnvelope mapExtent = map.GetMapExtent();
- String srs = map.GetMapSRS();
- double metersPerUnit;
- String unitsType;
- if(srs != null && srs.Length > 0)
- {
- MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
- MgCoordinateSystem cs = csFactory.Create(srs);
- metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
- unitsType = cs.GetUnits();
- }
- else
- {
- metersPerUnit = 1.0;
- unitsType = MgLocalizer.GetString("DISTANCEMETERS", locale);
- }
+ MgCoordinate llExtent = mapExtent.GetLowerLeftCoordinate();
+ MgCoordinate urExtent = mapExtent.GetUpperRightCoordinate();
+ String bgColor = map.GetBackgroundColor();
+ if(bgColor.Length == 8)
+ {
+ bgColor = "#" + bgColor.Substring(2);
+ }
+ else
+ {
+ bgColor = "white";
+ }
- MgCoordinate llExtent = mapExtent.GetLowerLeftCoordinate();
- MgCoordinate urExtent = mapExtent.GetUpperRightCoordinate();
- String bgColor = map.GetBackgroundColor();
- if(bgColor.Length == 8)
- {
- bgColor = "#" + bgColor.Substring(2);
- }
- else
- {
- bgColor = "white";
- }
-
- String scaleCreationCode = "";
- ArrayList scales = new ArrayList();
- for(int i = 0; i < map.GetFiniteDisplayScaleCount(); i++)
- {
- scales.Add(map.GetFiniteDisplayScaleAt(i));
- }
- scales.Sort();
- for(int i = 0; i < scales.Count; i++)
- {
- scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + scales[i].ToString().Replace(',','.') + "; ";
- }
- MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
- map.Save(resourceSrvc, mapStateId);
-
- //load html template code and format it
- //
- String templ = MgLocalizer.Localize(LoadTemplate(Request, "../viewerfiles/ajaxmappane.templ"), locale, GetClientOS(Request));
- String vpath = GetSurroundVirtualPath(Request);
- String[] vals = {
- IntToString(tileSizeX),
- IntToString(tileSizeY),
- GetRootVirtualFolder(Request) + "/mapagent/mapagent.fcgi",
- mapName,
- mapDefinition,
- IntToString(infoWidth),
- showLegend != 0 ? "true": "false",
- showProperties != 0 ? "true": "false",
- sessionId,
- DoubleToString(llExtent.GetX()), DoubleToString(llExtent.GetY()),
- DoubleToString(urExtent.GetX()), DoubleToString(urExtent.GetY()),
- DoubleToString(metersPerUnit),
- unitsType,
- bgColor,
- hlTgt,
- hlTgtName,
- vpath + "setselection.aspx",
- showSlider != 0? "true": "false",
- locale,
- scaleCreationCode,
- selectionColor,
- mapImgFormat,
- selImgFormat,
- pointBufferSize.ToString(NumberFormatInfo.InvariantInfo),
- vpath + "ajaxviewerabout.aspx",
- vpath + "legendctrl.aspx",
- HttpUtility.UrlEncode(mapName),
- sessionId,
- locale,
- vpath + "propertyctrl.aspx",
- locale };
- Response.Write(Substitute(templ, vals));
+ String scaleCreationCode = "";
+ ArrayList scales = new ArrayList();
+ for(int i = 0; i < map.GetFiniteDisplayScaleCount(); i++)
+ {
+ scales.Add(map.GetFiniteDisplayScaleAt(i));
}
- catch(MgException mge)
+ scales.Sort();
+ for(int i = 0; i < scales.Count; i++)
{
- String errorMsg = EscapeForHtml(mge.GetDetails());
- Response.Write(errorMsg);
+ scaleCreationCode = scaleCreationCode + "scales[" + i + "]=" + scales[i].ToString().Replace(',','.') + "; ";
}
- }
+ MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
+ map.Save(resourceSrvc, mapStateId);
+ //load html template code and format it
+ //
+ String templ = MgLocalizer.Localize(LoadTemplate(Request, "../viewerfiles/ajaxmappane.templ"), locale, GetClientOS(Request));
+ String vpath = GetSurroundVirtualPath(Request);
+ String[] vals = {
+ IntToString(tileSizeX),
+ IntToString(tileSizeY),
+ GetRootVirtualFolder(Request) + "/mapagent/mapagent.fcgi",
+ mapName,
+ mapDefinition,
+ IntToString(infoWidth),
+ showLegend != 0 ? "true": "false",
+ showProperties != 0 ? "true": "false",
+ sessionId,
+ DoubleToString(llExtent.GetX()), DoubleToString(llExtent.GetY()),
+ DoubleToString(urExtent.GetX()), DoubleToString(urExtent.GetY()),
+ DoubleToString(metersPerUnit),
+ unitsType,
+ bgColor,
+ hlTgt,
+ hlTgtName,
+ vpath + "setselection.aspx",
+ showSlider != 0? "true": "false",
+ locale,
+ scaleCreationCode,
+ selectionColor,
+ mapImgFormat,
+ selImgFormat,
+ pointBufferSize.ToString(NumberFormatInfo.InvariantInfo),
+ vpath + "ajaxviewerabout.aspx",
+ vpath + "legendctrl.aspx",
+ HttpUtility.UrlEncode(mapName),
+ sessionId,
+ locale,
+ vpath + "propertyctrl.aspx",
+ locale };
+ Response.Write(Substitute(templ, vals));
+ }
+ catch(MgException mge)
+ {
+ String errorMsg = EscapeForHtml(mge.GetDetails());
+ Response.Write(errorMsg);
+ }
+
%>
<script runat="server">
@@ -221,7 +187,6 @@
void GetParameters(NameValueCollection parameters)
{
- type = GetParameter(parameters, "TYPE"); // "DWF" or other
sessionId = ValidateSessionId(GetParameter(parameters, "SESSION"));
locale = ValidateLocaleString(GetParameter(parameters, "LOCALE"));
hlTgt = ValidateHyperlinkTargetValue(GetParameter(parameters, "HLTGT"));
Deleted: sandbox/jng/v30/Web/src/mapviewerphp/dwfviewer.php
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerphp/dwfviewer.php 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/mapviewerphp/dwfviewer.php 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,33 +0,0 @@
-<?php
-
-//
-// 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
-//
-
-// Start output buffering
-ob_start();
-
-include 'mainframe.php';
-
-BuildViewer();
-
-// Set content length header
-header("Content-Length:".ob_get_length());
-
-// Flush output buffer
-ob_end_flush();
-
-?>
Modified: sandbox/jng/v30/Web/src/mapviewerphp/mapframe.php
===================================================================
--- sandbox/jng/v30/Web/src/mapviewerphp/mapframe.php 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/mapviewerphp/mapframe.php 2014-06-16 12:48:47 UTC (rev 8226)
@@ -26,7 +26,6 @@
$showLegend = false;
$showProperties = false;
$sessionId = "";
-$type = "";
$username = '';
$password = '';
$hlTgt = '';
@@ -41,136 +40,115 @@
SetLocalizedFilesPath(GetLocalizationPath());
-if($type == "DWF")
+try
{
- if($hlTgt == 1)
- $frameName = "taskPaneFrame";
- else if($hlTgt == 3)
- $frameName = $hlTgtName;
- else
- $frameName = "_BLANK";
- $mapRequest = GetRootVirtualFolder() . "/mapagent/mapagent.fcgi?OPERATION=GETMAP&VERSION=1.0&MAPDEFINITION=" . urlencode($mapDefinition) . "&DWFVERSION=6.01&EMAPVERSION=1.0&LOCALE=" . $locale . ($sessionId != ""? "&SESSION=" . $sessionId: "") . "&reload=true";
- $templ = Localize(file_get_contents("../viewerfiles/dwfmappane.templ"), $locale, GetClientOS());
- printf ($templ,
- $mapRequest,
- $infoWidth,
- $showLegend || $showProperties?"true":"false",
- $showLegend?"true":"false",
- $showProperties?"true":"false",
- $frameName);
-}
-else
-{
- try
- {
- InitializeWebTier();
+ InitializeWebTier();
- // create the map instance and store it with the session
- //
- $userInfo = new MgUserInformation();
- $userInfo->SetMgSessionId($sessionId);
- $userInfo->SetClientIp(GetClientIp());
- $userInfo->SetClientAgent(GetClientAgent());
+ // create the map instance and store it with the session
+ //
+ $userInfo = new MgUserInformation();
+ $userInfo->SetMgSessionId($sessionId);
+ $userInfo->SetClientIp(GetClientIp());
+ $userInfo->SetClientAgent(GetClientAgent());
- $site = new MgSiteConnection();
- $site->Open($userInfo);
+ $site = new MgSiteConnection();
+ $site->Open($userInfo);
- $tileSrvc = $site->CreateService(MgServiceType::TileService);
+ $tileSrvc = $site->CreateService(MgServiceType::TileService);
- $tileSizeX = $tileSrvc->GetDefaultTileSizeX();
- $tileSizeY = $tileSrvc->GetDefaultTileSizeY();
+ $tileSizeX = $tileSrvc->GetDefaultTileSizeX();
+ $tileSizeY = $tileSrvc->GetDefaultTileSizeY();
- $resourceSrvc = $site->CreateService(MgServiceType::ResourceService);
+ $resourceSrvc = $site->CreateService(MgServiceType::ResourceService);
- $map = new MgMap($site);
- $resId = new MgResourceIdentifier($mapDefinition);
- $mapName = $resId->GetName();
- $map->Create($resId, $mapName);
+ $map = new MgMap($site);
+ $resId = new MgResourceIdentifier($mapDefinition);
+ $mapName = $resId->GetName();
+ $map->Create($resId, $mapName);
- //create an empty selection object and store it in the session repository
- $sel = new MgSelection($map);
- $sel->Save($resourceSrvc, $mapName);
+ //create an empty selection object and store it in the session repository
+ $sel = new MgSelection($map);
+ $sel->Save($resourceSrvc, $mapName);
- //get the map extent and calculate the scale factor
- //
- $mapExtent = $map->GetMapExtent();
- $srs = $map->GetMapSRS();
- if($srs != "")
- {
- $csFactory = new MgCoordinateSystemFactory();
- $cs = $csFactory->Create($srs);
- $metersPerUnit = $cs->ConvertCoordinateSystemUnitsToMeters(1.0);
- $unitsType = $cs->GetUnits();
- }
- else
- {
- $metersPerUnit = 1.0;
- $unitsType = GetLocalizedString("DISTANCEMETERS", $locale);
- }
-
- $llExtent = $mapExtent->GetLowerLeftCoordinate();
- $urExtent = $mapExtent->GetUpperRightCoordinate();
- $bgColor = $map->GetBackgroundColor();
- if(strlen($bgColor) == 8)
- $bgColor = '#' . substr($bgColor, 2);
- else
- $bgColor = "white";
-
- $scaleCreationCode = "";
- $scales = array();
- for($i = 0; $i < $map->GetFiniteDisplayScaleCount(); $i ++)
- $scales[$i] = $map->GetFiniteDisplayScaleAt($i);
- sort($scales);
- for($i = 0; $i < count($scales); $i ++)
- $scaleCreationCode = $scaleCreationCode . "scales[" . $i . "]=" . str_replace(",", ".", $scales[$i]) . "; ";
-
- $mapStateId = new MgResourceIdentifier("Session:" . $sessionId . "//" . $mapName . "." . MgResourceType::Map);
- $map->Save($resourceSrvc, $mapStateId);
- $templ = Localize(file_get_contents("../viewerfiles/ajaxmappane.templ"), $locale, GetClientOS());
- $vpath = GetSurroundVirtualPath();
- printf ($templ,
- $tileSizeX,
- $tileSizeY,
- GetRootVirtualFolder() . "/mapagent/mapagent.fcgi",
- $mapName,
- $mapDefinition,
- $infoWidth,
- $showLegend?"true":"false",
- $showProperties?"true":"false",
- $sessionId,
- $llExtent->GetX(), $llExtent->GetY(), $urExtent->GetX(), $urExtent->GetY(),
- $metersPerUnit,
- $unitsType,
- $bgColor,
- $hlTgt, $hlTgtName,
- $vpath . "setselection.php",
- $showSlider? "true": "false",
- $locale,
- $scaleCreationCode,
- $selectionColor,
- $mapImgFormat,
- $selImgFormat,
- $pointBufferSize,
- $vpath . "ajaxviewerabout.php",
- $vpath . "legendctrl.php",
- urlencode($mapName),
- $sessionId,
- $locale,
- $vpath . "propertyctrl.php",
- $locale
- );
+ //get the map extent and calculate the scale factor
+ //
+ $mapExtent = $map->GetMapExtent();
+ $srs = $map->GetMapSRS();
+ if($srs != "")
+ {
+ $csFactory = new MgCoordinateSystemFactory();
+ $cs = $csFactory->Create($srs);
+ $metersPerUnit = $cs->ConvertCoordinateSystemUnitsToMeters(1.0);
+ $unitsType = $cs->GetUnits();
}
- catch(MgException $e)
+ else
{
- $errorMsg = EscapeForHtml($e->GetDetails());
- echo $errorMsg;
+ $metersPerUnit = 1.0;
+ $unitsType = GetLocalizedString("DISTANCEMETERS", $locale);
}
+
+ $llExtent = $mapExtent->GetLowerLeftCoordinate();
+ $urExtent = $mapExtent->GetUpperRightCoordinate();
+ $bgColor = $map->GetBackgroundColor();
+ if(strlen($bgColor) == 8)
+ $bgColor = '#' . substr($bgColor, 2);
+ else
+ $bgColor = "white";
+
+ $scaleCreationCode = "";
+ $scales = array();
+ for($i = 0; $i < $map->GetFiniteDisplayScaleCount(); $i ++)
+ $scales[$i] = $map->GetFiniteDisplayScaleAt($i);
+ sort($scales);
+ for($i = 0; $i < count($scales); $i ++)
+ $scaleCreationCode = $scaleCreationCode . "scales[" . $i . "]=" . str_replace(",", ".", $scales[$i]) . "; ";
+
+ $mapStateId = new MgResourceIdentifier("Session:" . $sessionId . "//" . $mapName . "." . MgResourceType::Map);
+ $map->Save($resourceSrvc, $mapStateId);
+ $templ = Localize(file_get_contents("../viewerfiles/ajaxmappane.templ"), $locale, GetClientOS());
+ $vpath = GetSurroundVirtualPath();
+ printf ($templ,
+ $tileSizeX,
+ $tileSizeY,
+ GetRootVirtualFolder() . "/mapagent/mapagent.fcgi",
+ $mapName,
+ $mapDefinition,
+ $infoWidth,
+ $showLegend?"true":"false",
+ $showProperties?"true":"false",
+ $sessionId,
+ $llExtent->GetX(), $llExtent->GetY(), $urExtent->GetX(), $urExtent->GetY(),
+ $metersPerUnit,
+ $unitsType,
+ $bgColor,
+ $hlTgt, $hlTgtName,
+ $vpath . "setselection.php",
+ $showSlider? "true": "false",
+ $locale,
+ $scaleCreationCode,
+ $selectionColor,
+ $mapImgFormat,
+ $selImgFormat,
+ $pointBufferSize,
+ $vpath . "ajaxviewerabout.php",
+ $vpath . "legendctrl.php",
+ urlencode($mapName),
+ $sessionId,
+ $locale,
+ $vpath . "propertyctrl.php",
+ $locale
+ );
}
+catch(MgException $e)
+{
+ $errorMsg = EscapeForHtml($e->GetDetails());
+ echo $errorMsg;
+}
//load ajax template code and format it
function GetParameters($params)
{
- global $mapDefinition, $type;
+ global $mapDefinition;
global $infoWidth, $showLegend, $showProperties, $sessionId;
global $locale, $hlTgt, $hlTgtName, $showSlider;
global $selectionColor, $mapImgFormat, $selImgFormat, $pointBufferSize;
@@ -184,7 +162,6 @@
$showProperties = (GetIntParameter($params, 'SHOWPROP') == 1);
$showSlider = (GetIntParameter($params, 'SHOWSLIDER') == 1);
$infoWidth = GetIntParameter($params, 'INFOWIDTH');
- $type = GetParameter($params, 'TYPE');
$selectionColor = ValidateColorString(GetParameter($params, 'SELCOLOR'), 8);
$mapImgFormat = GetParameter($params, 'MAPIMGFORMAT');
$selImgFormat = GetParameter($params, 'SELIMGFORMAT');
Deleted: sandbox/jng/v30/Web/src/viewerfiles/dwfmappane.templ
===================================================================
--- sandbox/jng/v30/Web/src/viewerfiles/dwfmappane.templ 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/viewerfiles/dwfmappane.templ 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,624 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" href="../viewerfiles/viewer.css" type="text/css">
-<style type="text/css">
- body.TaskPane
- {
- border-right-width: 1px;
- border-right-style: solid;
- border-right-color: #a0a0a0;
- }
- div.PopupMenu
- {
- position: absolute;
- width: 200px;
- background-color: white;
- position: absolute;
- left: -500px;
- top: 1px;
- border: solid 1px #a0a0a0;
- overflow: hidden;
- z-index: -1;
- }
- div.PopupScrollUpArea
- {
- position: absolute;
- left: 0px;
- top: 0px;
- height: 12px;
- background: white;
- width: 100%%;
- cursor: pointer;
- visibility: hidden;
- }
- div.PopupScrollDownArea
- {
- position: absolute;
- left: 0px;
- top: 0px;
- height: 12px;
- background: white;
- width: 100%%;
- cursor: pointer;
- visibility: hidden;
- }
- span.PopupMetrics
- {
- font-family: __#@font#__;
- font-size: __#@fontsize#__;
- font-weight: normal;
- }
-</style>
-
-<script type="text/javascript" src="../viewerfiles/browserdetect.js"></script>
-<script type="text/javascript" src="../viewerfiles/contextmenu.js"></script>
-<script type="text/javascript" src="../viewerfiles/hashtable.js"></script>
-<script type="text/javascript">
-
-function LayerDef(legend, name, objectId)
-{
- this.legend = legend;
- this.name = name;
- this.objectId = objectId;
-}
-
-var intId;
-var tbMenu;
-var ctxMenu;
-var selectionSet = null;
-var selEnumerator = null;
-var curFeature = null;
-var emapViewer;
-var digihandler = null;
-var digitizing = false;
-
-// public functions -----------------------------------------------
-//
-function ZoomToView(x,y,scale,refresh)
-{
- emapViewer.ZoomToView(x, y, scale);
- if(refresh == 1)
- emapViewer.Refresh();
-}
-
-function ZoomToScale(scale)
-{
- emapViewer.MapScale = scale;
- emapViewer.Refresh();
-}
-
-function Refresh()
-{
- emapViewer.Refresh();
-}
-
-function GetMapWidth()
-{
- return emapViewer.MapWidth;
-}
-
-function GetMapHeight()
-{
- return emapViewer.MapHeight;
-}
-
-function GetSessionId()
-{
- return emapViewer.Document.Properties("_AW_Session").Value;
-}
-
-function GetMapName()
-{
- return emapViewer.Document.Properties("_AW_MapName").Value;
-}
-
-function ScreenToMapUnits(x, y)
-{
- return emapViewer.ScreenToMapUnits(x, y);
-}
-
-function MapUnitsToLatLon(x, y)
-{
- return emapViewer.MapUnitsToLonLat(x, y);
-}
-
-function GetSelectedCount()
-{
- if(selectionSet == null)
- selectionSet = emapViewer.SelectionSet;
- return selectionSet.Count;
-}
-
-function ClearSelection()
-{
- emapViewer.ExecuteCommand("CLEARSELECTION");
-}
-
-function GetLayers(onlyVisible, onlySelectable)
-{
- var layers = new Array();
- var list = new Enumerator(emapViewer.Document.Layers);
- for (; !list.atEnd(); list.moveNext())
- {
- var layer = list.item();
- if(!layer.Visible && onlyVisible)
- continue;
- if(!layer.Selectable && onlySelectable)
- continue;
- var uiGr = layer.UIGraphic;
- var lyr = new LayerDef(uiGr != null && uiGr.ShowInLegend? uiGr.Label: "", layer.Name, layer.ObjectId);
- layers.push(lyr);
- }
- return layers;
-}
-
-function GetSelectedLayers()
-{
- var lyrId = "";
- var layers = new Array();
- var ht = new Hashtable();
- if(selectionSet == null)
- selectionSet = emapViewer.SelectionSet;
-
- for(selEnumerator = new Enumerator(selectionSet); !selEnumerator.atEnd(); selEnumerator.moveNext())
- {
- var feature = selEnumerator.item();
- var currId = feature.LayerObjectId;
- if(currId != lyrId)
- {
- lyrId = currId;
- var layer = emapViewer.Document.GetMapLayer(currId);
- var name = layer.Name;
- if(ht.getItem(name) == null)
- {
- ht.setItem(name, "");
- var uiGr = layer.UIGraphic;
- var layer = new LayerDef(uiGr != null && uiGr.ShowInLegend? uiGr.Label: "", name, currId);
- layers.push(layer);
- }
- }
- }
- return layers;
-}
-
-function GetSelectionXML()
-{
- if(GetSelectedCount() == 0)
- return "";
- return emapViewer.SerializeSet(selectionSet);
-}
-
-function SetSelectionXML(xmlSet)
-{
- emapViewer.ExecuteCommand("CLEARSELECTION");
- var set = emapViewer.DeserializeSet(xmlSet);
- emapViewer.SelectionSet = set;
-}
-
-function IsEnglishUnits()
-{
- return !emapViewer.MetricMapUnits;
-}
-
-function IsLatLongDisplayUnits()
-{
- return emapViewer.LonLatCoordinateUnits;
-}
-
-function SetEnglishUnits(isEnglish)
-{
- emapViewer.MetricMapUnits = !isEnglish;
-}
-
-function SetLatLonDisplayUnits(isLatLon)
-{
- emapViewer.LonLatCoordinateUnits = isLatLon;
-}
-
-function GetMapUnitsType()
-{
- return emapViewer.Document.CoordinateSpace.Units.UnitType;
-}
-
-function GetMetersPerUnits()
-{
- return emapViewer.Document.CoordinateSpace.Units.ScaleFactor;
-}
-
-function GetCenter()
-{
- return emapViewer.MapCenter;
-}
-
-function GetScale()
-{
- return emapViewer.MapScale;
-}
-
-function DigitizePoint(handler)
-{
- if(!PrepareDigitization(handler))
- return;
- emapViewer.DocumentHandler.DigitizePoint();
-}
-
-function DigitizeLine(handler)
-{
- if(!PrepareDigitization(handler))
- return;
- emapViewer.DocumentHandler.DigitizeLine();
-}
-
-function DigitizeLineString(handler)
-{
- if(!PrepareDigitization(handler))
- return;
- emapViewer.DocumentHandler.DigitizeLineString();
-}
-
-function DigitizePolygon(handler)
-{
- if(!PrepareDigitization(handler))
- return;
- emapViewer.DocumentHandler.DigitizePolygon();
-}
-
-function DigitizeCircle(handler)
-{
- if(!PrepareDigitization(handler))
- return;
- emapViewer.DocumentHandler.DigitizeCircle();
-}
-
-function DigitizeRectangle(handler)
-{
- if(!PrepareDigitization(handler))
- return;
- emapViewer.DocumentHandler.DigitizeRectangle();
-}
-
-function IsDigitizing()
-{
- return digitizing;
-}
-
-// private functions -----------------------------------------------
-//
-function ExecuteMapAction(action)
-{
- switch(action)
- {
- case 1:
- emapViewer.ExecuteCommand("PAN");
- break;
- case 2:
- emapViewer.ExecuteCommand("PANUP");
- break;
- case 3:
- emapViewer.ExecuteCommand("PANDOWN");
- break;
- case 4:
- emapViewer.ExecuteCommand("PANRIGHT");
- break;
- case 5:
- emapViewer.ExecuteCommand("PANLEFT");
- break;
- case 6:
- emapViewer.ExecuteCommand("ZOOM");
- break;
- case 7:
- emapViewer.ExecuteCommand("ZOOMIN");
- break;
- case 8:
- emapViewer.ExecuteCommand("ZOOMOUT");
- break;
- case 9:
- emapViewer.ExecuteCommand("ZOOMRECT");
- break;
- case 10:
- emapViewer.ExecuteCommand("ZOOMSELECTION");
- break;
- case 11:
- emapViewer.ExecuteCommand("INITIALMAPVIEW");
- break;
- case 12:
- emapViewer.ExecuteCommand("PREVIOUSVIEW");
- break;
- case 13:
- emapViewer.ExecuteCommand("NEXTVIEW");
- break;
- case 14:
- emapViewer.ExecuteCommand("INITIALMAPVIEW");
- break;
- case 15:
- emapViewer.ExecuteCommand("SELECT");
- break;
- case 16:
- emapViewer.ExecuteCommand("SELECTRADIUS");
- break;
- case 17:
- emapViewer.ExecuteCommand("SELECTPOLYGON");
- break;
- case 19:
- emapViewer.ExecuteCommand("CLEARSELECTION");
- break;
- case 20:
- Refresh();
- break;
- case 21:
- emapViewer.ExecuteCommand("COPY");
- break;
- case 22:
- emapViewer.ExecuteCommand("ABOUT");
- break;
- default:
- return;
- }
- digitizing = false;
-}
-
-function InitDocument()
-{
- document.onmousedown = OnMouseDown;
-
- document.getElementById("FlyoutDivs").innerHTML = InitToolbarFlyouts(parent.toolbarItems);
- if(parent.IsContextMenu())
- document.getElementById("CtxMenuDivs").innerHTML = InitContextMenu(parent.ctxMenuItems);
-
- // the current product (DWF Viewer or ADR)
- var productName = DWFViewer.ProductName;
-
- // create the event relayer object, accounting for the product
- frdoc = frames["Relayer"].document;
- var object = frdoc.createElement("OBJECT");
- object.style.visibility = "hidden";
- object.id = 'EMapEventRelayer';
- if (productName == "Autodesk DWF Viewer")
- object.classid = 'clsid:90BB2003-1BA4-4D88-45BC-4734E453A8EF';
- else if (productName == "Autodesk Design Review")
- object.classid = 'clsid:90BB2003-1BA4-4D88-45BC-5734E453A8EF';
- frdoc.appendChild(object);
-
- // add the relayer to the viewer
- DWFViewer.AddEventRelayer(frdoc.EMapEventRelayer);
-}
-
-function ContextMenu(x, y)
-{
- hidePopup(tbMenu);
- showPopup(ctxMenu, true, x, y);
-}
-
-function OnMouseDown(e)
-{
- if(!PopupMouseDown(e))
- {
- hidePopup(tbMenu)
- hidePopup(ctxMenu)
- parent.ForwardMouseDown(document, e);
- }
-}
-
-function InitToolbarFlyouts(items)
-{
- var divs = "";
- for(var i = 0; i < items.length; i++)
- {
- if(items[i].type == 3)
- {
- divs += "<iframe id=\"IFr" + items[i].htmlElt + "\" style=\"position:absolute;top:0px;left:0px;width:0px;height:0px;background-color:cyan;\" frameborder=\"0\"></iframe>\n";
- divs += "<div class=\"PopupMenu\" id=\"" + items[i].htmlElt + "\"></div>\n";
- divs += InitToolbarFlyouts(items[i].subItems);
- }
- }
- return divs;
-}
-
-function BuildContextMenuObjects(menus, parentMenu, items, divName, nesting)
-{
- var menuObj = new MenuData(divName,20, 21, 50, 150, "../stdicons/icon_popupscrollup.gif", "../stdicons/icon_popupscrollup_disabled.gif", "../stdicons/icon_popupscrolldown.gif", "../stdicons/icon_popupscrolldown_disabled.gif", parent, true, "white");
- startBuildMenuContent(menuObj);
- var subIndex = 0;
- for(var i = 0; i < items.length; i++)
- {
- var item = items[i];
- if(item.type == 2)
- addMenuOption(menuObj, "", 0, 2, "", "", false);
- else if(item.type == 1)
- {
- var cmd = parent.commands[item.cmdIndex];
- addMenuOption(menuObj, item.name, item.cmdIndex, 1, cmd.icon, cmd.iconDisabled, cmd.enabled);
- }
- else if(item.type == 3)
- {
- addMenuOption(menuObj, item.name, "Sub:" + (subIndex ++), 3, item.iconUrl, "", false);
- menuObj.subMenus.push(BuildContextMenuObjects(menus, menuObj, item.subItems, item.htmlElt, nesting + 1));
- }
- }
-
- endBuildMenuContent(menuObj);
- menuObj.parentMenu = parentMenu;
- menuObj.nesting = nesting;
- menus[menus.length] = menuObj;
-
- return menuObj;
-}
-
-function InitContextMenu(items)
-{
- var menus = new Array();
- ctxMenu = BuildContextMenuObjects(menus, null, items, 'CtxMenu', 0);
-
- var divs = "";
- for(var i = 0; i < menus.length; i++)
- {
- var menu = menus[i];
- divs += "<iframe id=\"IFr" + menu.menuName + "\" style=\"position:absolute;top:0px;left:0px;width:0px;height:0px;background-color:white;\" frameborder=\"0\"></iframe>\n";
- divs += "<div class=\"PopupMenu\" id=\"" + menu.menuName + "\"></div>\n";
- }
-
- return divs;
-}
-
-function OpenFlyout(xpos, tbItemIndex)
-{
- var tbItem = parent.toolbarItems[tbItemIndex];
- tbMenu = new MenuData(tbItem.htmlElt, 20, 21, 50, 150,
- "../stdicons/icon_popupscrollup.gif", "../stdicons/icon_popupscrollup_disabled.gif", "../stdicons/icon_popupscrolldown.gif", "../stdicons/icon_popupscrolldown_disabled.gif",
- parent, true, "#f0f0f0");
- startBuildMenuContent(tbMenu);
-
- var commands = parent.commands;
- var items = tbItem.subItems;
- for(var i = 0; i < items.length; i++)
- {
- var item = items[i];
- if(item.type == 2)
- addMenuOption(tbMenu, "", 0, 2, "", "", false);
- else if(item.type == 1)
- {
- var cmd = commands[item.cmdIndex];
- addMenuOption(tbMenu, item.name, item.cmdIndex, 1, cmd.icon, cmd.iconDisabled, cmd.enabled);
- }
- }
- endBuildMenuContent(tbMenu);
- showPopup(tbMenu, false, xpos, 0);
-}
-
-function OnForwardMouseDown(e)
-{
- hidePopup(tbMenu);
- hidePopup(ctxMenu);
-}
-
-function OnDblClick(x, y)
-{
- // Override this method in an external script to implement
- // your own double-click handler.
- // e.g. mapFrame.OnDblClick = MyOnDblClick
- // where MyOnDblClick() is a function in your script
-
- return false;
-}
-
-function Print(layouts, title)
-{
- var layoutColl = new ActiveXObject("AdCommon.Collection2");
- var unitStr = emapViewer.MetricMapUnits? "Metric": "US-English";
-
- for(var i = 0; i < layouts.length; i++)
- {
- var resId = layouts[i];
- var name = "";
- try
- {
- name = resId.substr(resId.lastIndexOf('/') + 1).slice(0, -12);
- var layout = emapViewer.CreatePrintLayout();
- layout.Name = name;
- layout.Resource = resId;
- layout.Title = title;
- layout.UnitType = unitStr;
- layoutColl._Add(layout, name);
- }
- catch(e) {}
- }
- emapViewer.ShowPrintDialog(layoutColl);
-}
-
-function OnDigitizeEnd(shape)
-{
- if(digihandler != null)
- {
- digitizing = false;
- digihandler(shape);
- digihandler = null;
- }
-}
-
-function PrepareDigitization(handler)
-{
- if(handler == null)
- return false;
- if(parent.InMeasure())
- {
- parent.SetStatusMsg("__#MEASALREADYRUNNING#__");
- return false;
- }
- digihandler = handler;
- digitizing = true;
- return true;
-}
-
-var Src="%s"
-var NavpaneWidth="%s";
-var NavpaneVisible="%s";
-var LayersBandVisible="%s";
-var PropertiesBandVisible="%s";
-var HyperlinkTarget="%s";
-
-</script>
-
-<script src="../viewerfiles/initdwfctrl.js"></script>
-
-<script type="text/javascript" for="DWFViewer" event="OnLButtonDown(x, y, handled)">
- parent.ForwardMouseDown(document, null);
- if(parent.ClickMap(x, y))
- handled.State = true;
-</script>
-
-<script type="text/javascript" for="DWFViewer" event="OnLButtonDblClick(x, y, handled)">
- if(OnDblClick(x, y))
- {
- handled.State = true;
- }
-</script>
-
-<script type="text/javascript" for="DWFViewer" event="OnKeyDown(key, handled)">
- if(key == 27 && digitizing)
- digitizing = false;
-</script>
-
-<script type="text/javascript" for="DWFViewer" event="OnExecuteCommandEx(itemType, state, data, handled)">
- if(itemType == "CONTEXTMENU")
- {
- if(parent.IsContextMenu())
- {
- if(isPopupOpen(ctxMenu))
- hidePopup(ctxMenu);
-
- handled.State = true;
- var x = data >> 16;
- var y = data %% 65536;
-
- self.ContextMenu(x - self.screenLeft, y - self.screenTop);
- }
- else
- handled.State = true;
- }
-</script>
-
-<script type="text/javascript" for="DWFViewer" event="OnMouseMove(buttons, x, y, handled)">
- if(!parent.OnCursorPosChanged(x, y))
- handled.State = true;
-</script>
-
-<script type="text/javascript" for="DWFViewer" event="OnEndLoadItem(itemName, data, res)">
- if(itemName == "DOCUMENT")
- {
- emapViewer = DWFViewer.DocumentHandler;
- parent.OnMapLoaded();
- parent.OnScaleChanged(emapViewer.MapScale);
- }
-</script>
-
-</head>
-<body leftmargin=0 topmargin=0 rightmargin=0 bottommargin=0 marginwidth=0 marginheight=0 bgcolor=#d0d0d0>
- <iframe name="Relayer" width=0 height=0 src="../viewerfiles/emaprelayer.html"></iframe>
- <div class="PopupMetricsDiv" id="MetricsDiv"><span class="PopupMetrics" id="Metrics"></span></div>
- <span id="FlyoutDivs"></span>
- <span id="CtxMenuDivs"></span>
- <div id="DWF"></div>
- <script language="JScript">CreateDWFControl();</script>
-</body>
-</html>
Deleted: sandbox/jng/v30/Web/src/viewerfiles/emaprelayer.html
===================================================================
--- sandbox/jng/v30/Web/src/viewerfiles/emaprelayer.html 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/viewerfiles/emaprelayer.html 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,40 +0,0 @@
-<head>
- <script language=javascript for="EMapEventRelayer" event="OnMapScaleChanged(mapScale)">
- parent.parent.OnScaleChanged(mapScale);
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnDigitizedPoint(map, point)">
- parent.OnDigitizeEnd(point);
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnDigitizedLine(map, line)">
- parent.OnDigitizeEnd(line);
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnDigitizedLineString(map, line)">
- parent.OnDigitizeEnd(line);
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnDigitizedPolygon(map, poly)">
- parent.OnDigitizeEnd(poly);
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnDigitizedRectangle(map, rect)">
- if(parent.digihandler != null)
- {
- y = rect.Y1; rect.Y1 = rect.Y2; rect.Y2 = y;
- parent.OnDigitizeEnd(rect);
- }
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnDigitizedCircle(map, circle)">
- parent.OnDigitizeEnd(circle);
- </script>
-
- <script language="javascript" for="EMapEventRelayer" event="OnSelectionChanged()">
- parent.selectionSet = null;
- parent.parent.OnSelectionChanged();
- </script>
-</head>
-<body>
-</body>
Deleted: sandbox/jng/v30/Web/src/viewerfiles/initdwfctrl.js
===================================================================
--- sandbox/jng/v30/Web/src/viewerfiles/initdwfctrl.js 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/Web/src/viewerfiles/initdwfctrl.js 2014-06-16 12:48:47 UTC (rev 8226)
@@ -1,15 +0,0 @@
-function CreateDWFControl()
-{
- var d = document.getElementById("DWF");
- d.innerHTML = '<object id="DWFViewer"\nclassid="clsid:A662DA7E-CCB7-4743-B71A-D817F6D575DF"\nborder=0\nwidth=100%\nheight=100%\nstyle="position: absolute; left: -1px; top: 0px;" >\n' +
- ' <param name="Src" value="' + Src + '">\n' +
- ' <param name="ToolbarVisible" value="False">\n' +
- ' <param name="NavpaneWidth" value="' + NavpaneWidth + '">\n' +
- ' <param name="NavpaneVisible" value="' + NavpaneVisible + '">\n' +
- ' <param name="LayersBandVisible" value="' + LayersBandVisible + '">\n' +
- ' <param name="PropertiesBandVisible" value="' + PropertiesBandVisible + '">\n' +
- ' <param name="HyperlinkTarget" value="' + HyperlinkTarget + '">\n' +
- ' <param name="ViewerParams" value="?PreferredDefaultInterface=\'{69BD6A6D-F788-4A34-BAE9-76AB5F69EF9D}">\n' +
- '</object>';
- InitDocument();
-}
Modified: sandbox/jng/v30/build_oem.sh
===================================================================
--- sandbox/jng/v30/build_oem.sh 2014-06-15 17:30:25 UTC (rev 8225)
+++ sandbox/jng/v30/build_oem.sh 2014-06-16 12:48:47 UTC (rev 8226)
@@ -187,46 +187,6 @@
}
#**********************************************************
-# Build DWFEMAP 1.0
-# Notes: none
-#**********************************************************
-
-init_dwfemap()
-{
- LIB_NAME="DWFEMAP 1.0"
- pushd DWFTK7.1/develop/global/build/gnu/dwfemap
- if [ $CLEAN_FLAG -eq 0 ]; then
- sh ./build_setup.sh
- fi
- popd
-}
-
-build_dwfemap()
-{
- pushd DWFTK7.1/develop/global/src/dwfemap
- aclocal
- libtoolize --copy --force
- automake --add-missing --copy
- autoconf
- if [ $BUILD_CONFIG = "debug" ]; then
- sh ./configure --disable-optimized --enable-silent-rules --prefix="${INSTALLDIR}"
- else
- sh ./configure --enable-optimized --enable-silent-rules --prefix="${INSTALLDIR}"
- fi
- make
- check_build
- popd
-}
-
-clean_dwfemap()
-{
- pushd DWFTK7.1/develop/global/src/dwfemap
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
# Build GEOS 2.2.0
# Notes: none
#**********************************************************
@@ -659,7 +619,7 @@
#**********************************************************
pushd Oem
-for lib in ace dwfcore dwftk dwfemap geos bdbxml cppunit imake zlib libpng jpeg freetype gd agg json csmap;
+for lib in ace dwfcore dwftk geos bdbxml cppunit imake zlib libpng jpeg freetype gd agg json csmap;
do
echo "$lib: Initialization..........................."
init_"$lib"
More information about the mapguide-commits
mailing list