[mapguide-commits] r7532 - in trunk/Tools/Maestro: LocalConfigure/Resources Maestro Maestro.AddIn.Local Maestro.AddIn.Local/FDO Maestro.Editors/MapDefinition Maestro.LiveMapEditor Maestro.MapViewer OSGeo.MapGuide.MaestroAPI/Mapping OSGeo.MapGuide.MaestroAPI.Local
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 28 06:58:38 PDT 2013
Author: jng
Date: 2013-05-28 06:58:37 -0700 (Tue, 28 May 2013)
New Revision: 7532
Modified:
trunk/Tools/Maestro/LocalConfigure/Resources/Platform.ini
trunk/Tools/Maestro/Maestro.AddIn.Local/
trunk/Tools/Maestro/Maestro.AddIn.Local/ACE.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/CS_Comp.exe
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEProvider91.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEProvider92.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ExpressionEngine.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOCommon.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOGeometry.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOSpatial.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/Fdo.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/GRFPMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/GRFPOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/GRFPProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/KingOracleMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/KingOracleOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/KingOracleProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/MySQLProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/MySqlOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ODBCProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/OGRProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/OWS.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/OdbcOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/PostgreSQLOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/PostgreSQLProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/RdbmsMsg.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/RdbmsOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SDFMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SDFProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SHPMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SHPOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SHPProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SQLServerSpatialOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SQLServerSpatialProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SQLiteProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SmMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WFSMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WFSProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WMSMessage.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WMSOverrides.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WMSProvider.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/Xalan-C_1_11.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/XalanMessages_1_11.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/boost_date_time-vc100-mt-1_42.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/boost_thread-vc100-mt-1_42.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/gdal19.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/providers.xml
trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/xerces-c_3_1.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/GEOS.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgFoundation.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgGeometry.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsCommon.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsQueryEngine.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsResource.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfModel.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfParser.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgPlatformBase.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgRenderers.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgStylization.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/gd.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/xerces-c_3_1mg.dll
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs
trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs
trunk/Tools/Maestro/Maestro/changelog.txt
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
Log:
This submission contains the following changes:
- Update mg-desktop to latest release (2.5.0.7449, with FDO 3.8), this includes a patched MgDesktop.dll with the cached content fix (r7531)
- Update Platform.ini template that LocalConfigure.exe writes out
- #2018: Fix Live Map Definition Editor to work with LocalRuntimeMap
- Remove some properties/events introduced in the previous submission. Instead we add a new generic LayerAdded event and let the Live Map Definition editor handle the extent/cs computations.
- Add some boolean capability properties to RuntimeMap to allow the Live Map Definition Editor a way to update the view where modifying key RuntimeMap properties is not possible (as is the case with LocalRuntimeMap)
- Set some desired default RuntimeMapLayer properties
- Make MapViewer property change event raising cross-thread safe for UI code.
Modified: trunk/Tools/Maestro/LocalConfigure/Resources/Platform.ini
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/Maestro/changelog.txt 2013-05-28 13:58:37 UTC (rev 7532)
@@ -1,5 +1,6 @@
5.0 RC1
-------
+ - mg-desktop binary update (2.5.0.7449)
- Re-pointer command now supports all resource types with downstream dependencies.
- Added support for viewing layer draw order in RtMapInspector
- New context menu command to create default layers from a Feature Source
Property changes on: trunk/Tools/Maestro/Maestro.AddIn.Local
___________________________________________________________________
Modified: svn:externals
- Dictionaries http://svn.osgeo.org/metacrs/csmap/branches/13.10/CsMapDev/Dictionaries
+ Dictionaries http://svn.osgeo.org/metacrs/csmap/branches/14.00/CsMapDev/Dictionaries
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/ACE.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/CS_Comp.exe
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEProvider91.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ArcSDEProvider92.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ExpressionEngine.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOCommon.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOGeometry.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/FDOSpatial.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/Fdo.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/GRFPMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/GRFPOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/GRFPProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/KingOracleMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/KingOracleOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/KingOracleProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/MySQLProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/MySqlOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/ODBCProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/OGRProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/OWS.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/OdbcOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/PostgreSQLOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/PostgreSQLProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/RdbmsMsg.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/RdbmsOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SDFMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SDFProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SHPMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SHPOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SHPProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SQLServerSpatialOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SQLServerSpatialProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SQLiteProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/SmMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WFSMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WFSProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WMSMessage.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WMSOverrides.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/WMSProvider.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/Xalan-C_1_11.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/XalanMessages_1_11.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/boost_date_time-vc100-mt-1_42.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/boost_thread-vc100-mt-1_42.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/gdal19.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/providers.xml
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/providers.xml 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/providers.xml 2013-05-28 13:58:37 UTC (rev 7532)
@@ -1,120 +1,120 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FeatureProviderRegistry>
<FeatureProvider>
- <Name>OSGeo.SDF.3.7</Name>
+ <Name>OSGeo.SDF.3.8</Name>
<DisplayName>OSGeo FDO Provider for SDF</DisplayName>
<Description>Read/write access to Autodesk's spatial database format, a file-based personal geodatabase that supports multiple features/attributes, spatial indexing, and file-locking.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SDFProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.SHP.3.7</Name>
+ <Name>OSGeo.SHP.3.8</Name>
<DisplayName>OSGeo FDO Provider for SHP</DisplayName>
<Description>Read/write access to spatial and attribute data in an ESRI SHP file.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SHPProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.ArcSDE.3.7</Name>
+ <Name>OSGeo.ArcSDE.3.8</Name>
<DisplayName>OSGeo FDO Provider for ArcSDE</DisplayName>
<Description>Read/write access to an ESRI ArcSDE-based data store, using Oracle and SQL Server.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\ArcSDEProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.WFS.3.7</Name>
+ <Name>OSGeo.WFS.3.8</Name>
<DisplayName>OSGeo FDO Provider for WFS</DisplayName>
<Description>Read access to OGC WFS-based data store.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\WFSProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.WMS.3.7</Name>
+ <Name>OSGeo.WMS.3.8</Name>
<DisplayName>OSGeo FDO Provider for WMS</DisplayName>
<Description>Read access to OGC WMS-based data store.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\WMSProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.ODBC.3.7</Name>
+ <Name>OSGeo.ODBC.3.8</Name>
<DisplayName>OSGeo FDO Provider for ODBC</DisplayName>
<Description>FDO Provider for ODBC</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\ODBCProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.MySQL.3.7</Name>
+ <Name>OSGeo.MySQL.3.8</Name>
<DisplayName>OSGeo FDO Provider for MySQL</DisplayName>
<Description>FDO Provider for MySql</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\MySQLProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.Gdal.3.7</Name>
+ <Name>OSGeo.Gdal.3.8</Name>
<DisplayName>OSGeo FDO Provider for GDAL</DisplayName>
<Description>FDO Provider for GDAL</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\GRFPProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.OGR.3.7</Name>
+ <Name>OSGeo.OGR.3.8</Name>
<DisplayName>OSGeo FDO Provider for OGR</DisplayName>
<Description>FDO Access to OGR Data Sources</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\OGRProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.KingOracle.3.7</Name>
+ <Name>OSGeo.KingOracle.3.8</Name>
<DisplayName>OSGeo FDO Provider for Oracle</DisplayName>
<Description>Read/write access to spatial and attribute data in an Oracle Spatial.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\KingOracleProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.SQLServerSpatial.3.7</Name>
+ <Name>OSGeo.SQLServerSpatial.3.8</Name>
<DisplayName>OSGeo FDO Provider for SQL Server Spatial</DisplayName>
<Description>Read/Write access to feature data in a MS SQL Server spatially enabled data store. Supports geospatial and non-geospatial data and schema.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SQLServerSpatialProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.SQLite.3.7</Name>
+ <Name>OSGeo.SQLite.3.8</Name>
<DisplayName>OSGeo FDO Provider for SQLite (spatial)</DisplayName>
<Description>Read/write access to feature data in a SQLite file.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SQLiteProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.PostgreSQL.3.7</Name>
+ <Name>OSGeo.PostgreSQL.3.8</Name>
<DisplayName>OSGeo FDO Provider for PostgreSQL/PostGIS</DisplayName>
<Description>Read/write access to PostgreSQL/PostGIS-based data store. Supports spatial data types and spatial query operations.</Description>
<IsManaged>False</IsManaged>
- <Version>3.7.0.0</Version>
- <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <Version>3.8.0.0</Version>
+ <FeatureDataObjectsVersion>3.8.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\PostgreSQLProvider.dll</LibraryPath>
</FeatureProvider>
</FeatureProviderRegistry>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FDO/xerces-c_3_1.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/GEOS.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgFoundation.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGeometry.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsCommon.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsQueryEngine.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsResource.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfModel.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfParser.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgPlatformBase.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgRenderers.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgStylization.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/gd.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/xerces-c_3_1mg.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs 2013-05-28 13:58:37 UTC (rev 7532)
@@ -213,6 +213,13 @@
var ldf = (ILayerDefinition)conn.ResourceService.GetResource(message.ResourceID);
var rtLayer = mapSvc.CreateMapLayer(map, ldf);
+ //Set some desired properties if not already set
+ if (string.IsNullOrEmpty(rtLayer.LegendLabel))
+ rtLayer.LegendLabel = rtLayer.Name;
+ rtLayer.ShowInLegend = true;
+ rtLayer.ExpandInLegend = true;
+ rtLayer.Selectable = true;
+
if (groupMeta != null)
rtLayer.Group = groupMeta.Name;
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs 2013-05-28 13:58:37 UTC (rev 7532)
@@ -31,6 +31,10 @@
using Maestro.Editors.MapDefinition;
using OSGeo.MapGuide.ObjectModels;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
+using System.Diagnostics;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.Common;
namespace Maestro.LiveMapEditor
{
@@ -45,6 +49,9 @@
InitializeComponent();
_conn = conn;
_origTitle = this.Text;
+#if DEBUG
+ debugToolStripMenuItem.Visible = true;
+#endif
}
protected override void OnLoad(EventArgs e)
@@ -95,6 +102,8 @@
EvaluateCommandStates();
}
+ private bool _bComputeLayerCsAndExtentOnFirstLayerAdded = false;
+
private void LoadMapDefinitionForEditing(IMapDefinition mdf)
{
CleanupExistingMap();
@@ -109,22 +118,76 @@
_mapEditor = new LiveMapDefinitionEditorCtrl();
_mapEditor.Bind(new ResourceEditorService(mdf.ResourceID, _conn));
- _mapEditor.Map.ComputeCoordSysAndExtentsOnFirstLayerAdded = _mapEditor.EditorService.IsNew;
- if (_mapEditor.EditorService.IsNew)
- {
- _mapEditor.Map.CoordSysAndExtentsChangedFromFirstLayer += OnMapCoordSysAndExtentsChangedFromFirstLayer;
- }
+ _bComputeLayerCsAndExtentOnFirstLayerAdded = _mapEditor.EditorService.IsNew;
+ _mapEditor.Map.LayerAdded += OnMapLayerAdded;
_mapEditor.Dock = DockStyle.Fill;
rootPanel.Controls.Add(_mapEditor);
}
+ private static bool SupportsMutableMapProperties(RuntimeMap runtimeMap)
+ {
+ return runtimeMap.SupportsMutableBackgroundColor &&
+ runtimeMap.SupportsMutableCoordinateSystem &&
+ runtimeMap.SupportsMutableExtents &&
+ runtimeMap.SupportsMutableMetersPerUnit;
+ }
+
+ void OnMapLayerAdded(object sender, RuntimeMapLayer layer)
+ {
+ if (_bComputeLayerCsAndExtentOnFirstLayerAdded && _mapEditor.Map.Layers.Count == 1)
+ {
+ Debug.WriteLine("Computing map extents and CS based on first layer added");
+ try
+ {
+ ILayerDefinition layerDef = (ILayerDefinition)_conn.ResourceService.GetResource(layer.LayerDefinitionID);
+ string wkt;
+ IEnvelope env = layerDef.GetSpatialExtent(true, out wkt);
+ if (SupportsMutableMapProperties(_mapEditor.Map))
+ {
+ _mapEditor.Map.MapExtent = env;
+ _mapEditor.Map.CoordinateSystem = wkt;
+ if (CsHelper.DefaultCalculator != null)
+ {
+ _mapEditor.Map.MetersPerUnit = CsHelper.DefaultCalculator.Calculate(wkt, 1.0);
+ }
+ else
+ {
+ var calc = _mapEditor.Map.CurrentConnection.GetCalculator();
+ _mapEditor.Map.MetersPerUnit = calc.Calculate(wkt, 1.0);
+ }
+ _mapEditor.ReloadViewer();
+ }
+ else
+ {
+ //We have to tear down the current runtime map, update the shadow copy
+ //map definition and then rebuild a new runtime map
+ _mapEditor.SyncMap();
+ IMapDefinition mdf = _mapEditor.GetMapDefinition();
+ mdf.Extents = env;
+ mdf.CoordinateSystem = wkt;
+ CleanupExistingMap();
+ //If local, we'd be rebuilding off of the resource ID and not its in-memory
+ //object representation so flush
+ _mapEditor.EditorService.SyncSessionCopy();
+ _mapEditor.RebuildRuntimeMap();
+ _mapEditor.ReloadViewer();
+ }
+ Debug.WriteLine("Computed map extents and CS");
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine("Uh-Oh: " + ex.ToString());
+ }
+ }
+ }
+
private void CleanupExistingMap()
{
if (_mapEditor != null)
{
if (_mapEditor.Map != null)
{
- _mapEditor.Map.CoordSysAndExtentsChangedFromFirstLayer -= OnMapCoordSysAndExtentsChangedFromFirstLayer;
+ _mapEditor.Map.LayerAdded -= OnMapLayerAdded;
}
}
}
@@ -215,12 +278,10 @@
if (diag.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
CleanupExistingMap();
+ _mapEditor.EditorService.SyncSessionCopy();
_mapEditor.RebuildRuntimeMap();
- _mapEditor.Map.ComputeCoordSysAndExtentsOnFirstLayerAdded = _mapEditor.EditorService.IsNew;
- if (_mapEditor.EditorService.IsNew)
- {
- _mapEditor.Map.CoordSysAndExtentsChangedFromFirstLayer += OnMapCoordSysAndExtentsChangedFromFirstLayer;
- }
+ _bComputeLayerCsAndExtentOnFirstLayerAdded = _mapEditor.EditorService.IsNew;
+ _mapEditor.Map.LayerAdded += OnMapLayerAdded;
_mapEditor.ReloadViewer();
}
}
Modified: trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs 2013-05-28 13:58:37 UTC (rev 7532)
@@ -2868,9 +2868,16 @@
/// <param name="name">The name.</param>
protected void OnPropertyChanged(string name)
{
- var handler = this.PropertyChanged;
- if (handler != null)
- handler(this, new PropertyChangedEventArgs(name));
+ Action action = () =>
+ {
+ var handler = this.PropertyChanged;
+ if (handler != null)
+ handler(this, new PropertyChangedEventArgs(name));
+ };
+ if (this.InvokeRequired)
+ this.Invoke(action);
+ else
+ action();
}
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2013-05-28 13:58:37 UTC (rev 7532)
@@ -132,12 +132,6 @@
/// </summary>
public IServerConnection CurrentConnection { get; private set; }
- /// <summary>
- /// If set to true. The first layer added to this map will automatically compute the map's extents and coordinate system
- /// based on the first layer.
- /// </summary>
- public bool ComputeCoordSysAndExtentsOnFirstLayerAdded { get; set; }
-
internal Version SiteVersion { get; private set; }
/// <summary>
@@ -160,12 +154,31 @@
public const double Z_ORDER_TOP = 100.0;
/// <summary>
+ /// Gets whether extents of this map can be modified at runtime
+ /// </summary>
+ public virtual bool SupportsMutableExtents { get { return true; } }
+
+ /// <summary>
+ /// Gets whether the coordinate system of this map can be modified at runtime
+ /// </summary>
+ public virtual bool SupportsMutableCoordinateSystem { get { return true; } }
+
+ /// <summary>
+ /// Gets whether the background color of this map can be modified at runtime
+ /// </summary>
+ public virtual bool SupportsMutableBackgroundColor { get { return true; } }
+
+ /// <summary>
+ /// Gets whether the meters-per-unit value of this map can be modified at runtime
+ /// </summary>
+ public virtual bool SupportsMutableMetersPerUnit { get { return true; } }
+
+ /// <summary>
/// Initializes this instance
/// </summary>
/// <param name="conn"></param>
protected internal RuntimeMap(IServerConnection conn)
{
- this.ComputeCoordSysAndExtentsOnFirstLayerAdded = false;
this.StrictSelection = true;
this.IsDirty = false;
_disableChangeTracking = true;
@@ -267,7 +280,7 @@
//batch. Eliminating lots of chatter for really large maps.
if (_getRes != null)
{
- Trace.TraceInformation("[RuntimeMap.ctor]: Batching layer requests"); //NOXLATE
+ Debug.WriteLine("[RuntimeMap.ctor]: Batching layer requests"); //NOXLATE
var res = _getRes.Execute(GetLayerIds(mdf));
//Pre-populate layer def cache so GetLayerDefinition() returns these
//instead of making a new request
@@ -277,7 +290,7 @@
if (layer != null)
layerDefinitionCache.Add(key, layer);
}
- Trace.TraceInformation("[RuntimeMap.ctor]: {0} layers pre-cached", layerDefinitionCache.Count); //NOXLATE
+ Debug.WriteLine("[RuntimeMap.ctor]: {0} layers pre-cached", layerDefinitionCache.Count); //NOXLATE
}
//Load map layers
@@ -351,13 +364,15 @@
public double GetFiniteDisplayScaleAt(int index) { return _finiteDisplayScales[index]; }
/// <summary>
- /// Gets or sets the map extents.
+ /// Gets or sets the map extents. Inspect the <see cref="P:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.SupportsMutableMapExtents"/>
+ /// to determine if setting the map extents is allowed
/// </summary>
+ /// <exception cref="T:System.NotSupportedException">Thrown if the operation is not supported</exception>
/// <value>The map extents.</value>
public virtual IEnvelope MapExtent
{
get;
- protected set;
+ set;
}
/// <summary>
@@ -564,13 +579,15 @@
protected string _mapSrs;
/// <summary>
- /// Gets or sets the coordinate system in WKT format
+ /// Gets or sets the coordinate system in WKT format. Check the <see cref="P:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.SupportsMutableCoordinateSystem"/>
+ /// to see if setting the coordinate system WKT is allowed.
/// </summary>
+ /// <exception cref="T:System.NotSupportedException">Thrown if the operation is not supported</exception>
/// <value>The coordinate system in WKT format.</value>
public virtual string CoordinateSystem
{
get { return _mapSrs; }
- internal set { SetField(ref _mapSrs, value, "CoordinateSystem"); } //NOXLATE
+ set { SetField(ref _mapSrs, value, "CoordinateSystem"); } //NOXLATE
}
/// <summary>
@@ -579,8 +596,10 @@
protected System.Drawing.Color _bgColor;
/// <summary>
- /// Gets or sets the color of the background.
+ /// Gets or sets the color of the background. Check the <see cref="P:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.SupportsMutableBackgroundColor"/>
+ /// to see if setting the background color is allowed.
/// </summary>
+ /// <exception cref="T:System.NotSupportedException">Thrown if the operation is not supported</exception>
/// <value>The color of the background.</value>
public virtual System.Drawing.Color BackgroundColor
{
@@ -622,13 +641,15 @@
}
/// <summary>
- /// Gets the meters per unit value.
+ /// Gets the meters per unit value. Check the <see cref="P:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.SupportsMutableMetersPerUnit"/>
+ /// to see if setting the meters per unit value is allowed.
/// </summary>
+ /// <exception cref="T:System.NotSupportedException">Thrown if the operation is not supported</exception>
/// <value>The meters per unit.</value>
public virtual double MetersPerUnit
{
get;
- internal set;
+ set;
}
/// <summary>
@@ -1490,43 +1511,15 @@
}
/// <summary>
- /// Raised when <see cref="P:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.ComputeCoordSysAndExtentsOnFirstLayerAdded"/> is true
- /// and the first layer was added the map extents and coordinate system were successfully computed from that layer
+ /// Raise when a layer is added to the map
/// </summary>
- public event EventHandler CoordSysAndExtentsChangedFromFirstLayer;
+ public event LayerEventHandler LayerAdded;
internal void OnLayerAdded(RuntimeMapLayer layer)
{
- if (this.ComputeCoordSysAndExtentsOnFirstLayerAdded && this.Layers.Count == 1)
- {
- Debug.WriteLine("Computing map extents and CS based on first layer added");
- try
- {
- ILayerDefinition layerDef = (ILayerDefinition)this.ResourceService.GetResource(layer.LayerDefinitionID);
- string wkt;
- IEnvelope env = layerDef.GetSpatialExtent(true, out wkt);
-
- this.MapExtent = env;
- this.CoordinateSystem = wkt;
- if (CsHelper.DefaultCalculator != null)
- {
- this.MetersPerUnit = CsHelper.DefaultCalculator.Calculate(wkt, 1.0);
- }
- else
- {
- var calc = this.CurrentConnection.GetCalculator();
- this.MetersPerUnit = calc.Calculate(wkt, 1.0);
- }
- Debug.WriteLine("Computed map extents and CS");
- var h = this.CoordSysAndExtentsChangedFromFirstLayer;
- if (h != null)
- h(this, EventArgs.Empty);
- }
- catch (Exception ex)
- {
- Debug.WriteLine("Uh-Oh: " + ex.ToString());
- }
- }
+ var h = this.LayerAdded;
+ if (h != null)
+ h(this, layer);
//Fix the draw order of this layer that was added
//???
@@ -1829,4 +1822,6 @@
return newMdf;
}
}
+
+ public delegate void LayerEventHandler(object sender, RuntimeMapLayer layer);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs 2013-05-28 13:26:12 UTC (rev 7531)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs 2013-05-28 13:58:37 UTC (rev 7532)
@@ -48,6 +48,38 @@
_disableChangeTracking = false;
}
+ public override bool SupportsMutableBackgroundColor
+ {
+ get
+ {
+ return false;
+ }
+ }
+
+ public override bool SupportsMutableExtents
+ {
+ get
+ {
+ return false;
+ }
+ }
+
+ public override bool SupportsMutableCoordinateSystem
+ {
+ get
+ {
+ return false;
+ }
+ }
+
+ public override bool SupportsMutableMetersPerUnit
+ {
+ get
+ {
+ return false;
+ }
+ }
+
private void InitializeLayersAndGroups()
{
this.Layers.Clear();
@@ -177,7 +209,7 @@
return ObjectFactory.CreateEnvelope(envLL.X, envLL.Y, envUR.X, envUR.Y);
}
- protected set
+ set
{
if (_disableChangeTracking) return; //Still initializing
throw new NotSupportedException();
@@ -190,6 +222,7 @@
{
return _impl.GetMetersPerUnit();
}
+ set { throw new NotImplementedException(); }
}
public override string ObjectId
More information about the mapguide-commits
mailing list