From: <che...@us...> - 2011-04-16 17:44:37
|
Revision: 4172 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4172&view=rev Author: chemelli_sf Date: 2011-04-16 17:44:28 +0000 (Sat, 16 Apr 2011) Log Message: ----------- Migrated to VS2010 and small adjustments for .NET3.5 Modified Paths: -------------- trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs trunk/plugins/WorldMap/MyWorldMap.csproj trunk/plugins/WorldMap/MyWorldMap.sln trunk/plugins/WorldMap/Properties/Resources.Designer.cs trunk/plugins/WorldMap/Properties/Settings.Designer.cs trunk/plugins/WorldMap/Settings.cs trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs trunk/plugins/WorldMap/WorldMap.cs trunk/plugins/WorldMap/WorldmapConfig.cs trunk/plugins/WorldMap/WorldmapMenu.cs trunk/plugins/WorldMap/WorldmapSearch.cs trunk/plugins/WorldMap/app.config Modified: trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs =================================================================== --- trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2011-04-16 17:44:28 UTC (rev 4172) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.3607 +// Runtime Version:4.0.30319.225 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class BingAPIKey { Modified: trunk/plugins/WorldMap/MyWorldMap.csproj =================================================================== --- trunk/plugins/WorldMap/MyWorldMap.csproj 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/MyWorldMap.csproj 2011-04-16 17:44:28 UTC (rev 4172) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,27 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>MyWorldMap</RootNamespace> <AssemblyName>MyWorldMap</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation /> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -36,25 +58,14 @@ <OutputPath>bin\Release\</OutputPath> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.4.41510, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath> - </Reference> - <Reference Include="Dialogs, Version=1.0.4.41523, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> - </Reference> <Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> + <Reference Include="System.EnterpriseServices" /> <Reference Include="System.Web.Services" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> - <Reference Include="Utils, Version=2.2.7.41503, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="LocalizeStrings.cs" /> @@ -79,7 +90,6 @@ <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> <DependentUpon>Reference.map</DependentUpon> - <SubType>Component</SubType> </Compile> <Compile Include="WorldmapConfig.cs"> <SubType>Form</SubType> @@ -162,6 +172,40 @@ <CachedSettingsPropName>MyWorldMap_ImageryService_ImageryService</CachedSettingsPropName> </WebReferenceUrl> </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> + <Visible>False</Visible> + <ProductName>Windows Installer 3.1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> + <ItemGroup> + <Folder Include="__externals__\" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\..\mediaportal1\trunk\mediaportal\Core\Core.csproj"> + <Project>{02FFFC1F-2555-4B99-8B01-3432D0673855}</Project> + <Name>Core</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\..\mediaportal1\trunk\mediaportal\Dialogs\Dialogs.csproj"> + <Project>{396C5208-5D46-4A11-92C1-FD0F2F42D7DD}</Project> + <Name>Dialogs</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\..\mediaportal1\trunk\mediaportal\Utils\Utils.csproj"> + <Project>{6DA0E4DF-6230-4642-98B5-E690BB6942BB}</Project> + <Name>Utils</Name> + </ProjectReference> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/WorldMap/MyWorldMap.sln =================================================================== --- trunk/plugins/WorldMap/MyWorldMap.sln 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/MyWorldMap.sln 2011-04-16 17:44:28 UTC (rev 4172) @@ -1,20 +1,111 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyWorldMap", "MyWorldMap.csproj", "{857D8A0C-FB95-4A26-8ED6-8E51586D2116}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\..\..\..\mediaportal1\trunk\mediaportal\Utils\Utils.csproj", "{6DA0E4DF-6230-4642-98B5-E690BB6942BB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__externals__", "__externals__", "{E63D9A4B-04C7-4B2D-A7F3-2145899A5B08}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialogs", "..\..\..\..\mediaportal1\trunk\mediaportal\Dialogs\Dialogs.csproj", "{396C5208-5D46-4A11-92C1-FD0F2F42D7DD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\..\..\mediaportal1\trunk\mediaportal\Core\Core.csproj", "{02FFFC1F-2555-4B99-8B01-3432D0673855}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + Release (Standalone)|Any CPU = Release (Standalone)|Any CPU + Release (Standalone)|x86 = Release (Standalone)|x86 + Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 + UseCaptureCardDefinitions|Any CPU = UseCaptureCardDefinitions|Any CPU + UseCaptureCardDefinitions|x86 = UseCaptureCardDefinitions|x86 + UseCaptureDefintionsRelease|Any CPU = UseCaptureDefintionsRelease|Any CPU + UseCaptureDefintionsRelease|x86 = UseCaptureDefintionsRelease|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|Any CPU.Build.0 = Debug|Any CPU {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|x86.ActiveCfg = Debug|x86 {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|x86.Build.0 = Debug|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release (Standalone)|Any CPU.ActiveCfg = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release (Standalone)|x86.ActiveCfg = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release (Standalone)|x86.Build.0 = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|Any CPU.ActiveCfg = Release|Any CPU + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|Any CPU.Build.0 = Release|Any CPU {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|x86.ActiveCfg = Release|x86 {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|x86.Build.0 = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureCardDefinitions|x86.ActiveCfg = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureCardDefinitions|x86.Build.0 = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = Release|Any CPU + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|Any CPU.Build.0 = Release|Any CPU + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|x86.ActiveCfg = Release|x86 + {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|x86.Build.0 = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|x86.ActiveCfg = Debug|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|x86.Build.0 = Debug|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release (Standalone)|Any CPU.ActiveCfg = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release (Standalone)|x86.ActiveCfg = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release (Standalone)|x86.Build.0 = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|Any CPU.Build.0 = Release|Any CPU + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|x86.ActiveCfg = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|x86.Build.0 = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureCardDefinitions|x86.ActiveCfg = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureCardDefinitions|x86.Build.0 = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = Release|Any CPU + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|Any CPU.Build.0 = Release|Any CPU + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|x86.ActiveCfg = Release|x86 + {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|x86.Build.0 = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|x86.ActiveCfg = Debug|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|x86.Build.0 = Debug|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release (Standalone)|Any CPU.ActiveCfg = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release (Standalone)|x86.ActiveCfg = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release (Standalone)|x86.Build.0 = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|Any CPU.Build.0 = Release|Any CPU + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|x86.ActiveCfg = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|x86.Build.0 = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureCardDefinitions|x86.ActiveCfg = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureCardDefinitions|x86.Build.0 = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = Release|Any CPU + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|Any CPU.Build.0 = Release|Any CPU + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|x86.ActiveCfg = Release|x86 + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|x86.Build.0 = Release|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|x86.ActiveCfg = Debug|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|x86.Build.0 = Debug|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|Any CPU.ActiveCfg = Release (Standalone)|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|Any CPU.Build.0 = Release (Standalone)|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|x86.ActiveCfg = Release (Standalone)|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|x86.Build.0 = Release (Standalone)|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|Any CPU.Build.0 = Release|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|x86.ActiveCfg = Release|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|x86.Build.0 = Release|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = UseCaptureCardDefinitions|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|Any CPU.Build.0 = UseCaptureCardDefinitions|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|x86.ActiveCfg = UseCaptureCardDefinitions|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|x86.Build.0 = UseCaptureCardDefinitions|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = UseCaptureDefintionsRelease|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|Any CPU.Build.0 = UseCaptureDefintionsRelease|Any CPU + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|x86.ActiveCfg = UseCaptureDefintionsRelease|x86 + {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|x86.Build.0 = UseCaptureDefintionsRelease|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6DA0E4DF-6230-4642-98B5-E690BB6942BB} = {E63D9A4B-04C7-4B2D-A7F3-2145899A5B08} + {396C5208-5D46-4A11-92C1-FD0F2F42D7DD} = {E63D9A4B-04C7-4B2D-A7F3-2145899A5B08} + {02FFFC1F-2555-4B99-8B01-3432D0673855} = {E63D9A4B-04C7-4B2D-A7F3-2145899A5B08} + EndGlobalSection EndGlobal Modified: trunk/plugins/WorldMap/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2011-04-16 17:44:28 UTC (rev 4172) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:4.0.30319.225 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { Modified: trunk/plugins/WorldMap/Properties/Settings.Designer.cs =================================================================== --- trunk/plugins/WorldMap/Properties/Settings.Designer.cs 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/Properties/Settings.Designer.cs 2011-04-16 17:44:28 UTC (rev 4172) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:4.0.30319.225 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); Modified: trunk/plugins/WorldMap/Settings.cs =================================================================== --- trunk/plugins/WorldMap/Settings.cs 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/Settings.cs 2011-04-16 17:44:28 UTC (rev 4172) @@ -30,14 +30,14 @@ public static string ParmDownloadTimeOut = "parmdownloadtimeout"; public static string ParmScrollFactor = "parmscrollfactor"; // Actions - public Action.ActionType ActionMoveDown; - public Action.ActionType ActionMoveLeft; - public Action.ActionType ActionMoveRight; - public Action.ActionType ActionMoveUp; - public Action.ActionType ActionToggleProvider; - public Action.ActionType ActionToggleView; - public Action.ActionType ActionZoomIn; - public Action.ActionType ActionZoomOut; + public MediaPortal.GUI.Library.Action.ActionType ActionMoveDown; + public MediaPortal.GUI.Library.Action.ActionType ActionMoveLeft; + public MediaPortal.GUI.Library.Action.ActionType ActionMoveRight; + public MediaPortal.GUI.Library.Action.ActionType ActionMoveUp; + public MediaPortal.GUI.Library.Action.ActionType ActionToggleProvider; + public MediaPortal.GUI.Library.Action.ActionType ActionToggleView; + public MediaPortal.GUI.Library.Action.ActionType ActionZoomIn; + public MediaPortal.GUI.Library.Action.ActionType ActionZoomOut; public int DownLoadTimeOut; public bool GenerateActionLogEntries; public double LastLatitude; @@ -74,30 +74,30 @@ ScrollFactor = reader.GetValueAsInt(SectionName, ParmScrollFactor, 5); ActionMoveUp = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionMoveUp, (int) (Action.ActionType.ACTION_MOVE_UP)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionMoveUp, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_UP)); ActionMoveDown = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionMoveDown, (int) (Action.ActionType.ACTION_MOVE_DOWN)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionMoveDown, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_DOWN)); ActionMoveLeft = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionMoveLeft, (int) (Action.ActionType.ACTION_MOVE_LEFT)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionMoveLeft, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT)); ActionMoveRight = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionMoveRight, (int) (Action.ActionType.ACTION_MOVE_RIGHT)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionMoveRight, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT)); ActionZoomIn = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionZoomIn, (int) (Action.ActionType.ACTION_PAGE_UP)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionZoomIn, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_UP)); ActionZoomOut = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionZoomOut, (int) (Action.ActionType.ACTION_PAGE_DOWN)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionZoomOut, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_DOWN)); ActionToggleView = - (Action.ActionType) - reader.GetValueAsInt(SectionName, ParmActionToggleView, (int) (Action.ActionType.ACTION_REMOTE_BLUE_BUTTON)); + (MediaPortal.GUI.Library.Action.ActionType) + reader.GetValueAsInt(SectionName, ParmActionToggleView, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_REMOTE_BLUE_BUTTON)); ActionToggleProvider = - (Action.ActionType) + (MediaPortal.GUI.Library.Action.ActionType) reader.GetValueAsInt(SectionName, ParmActionToggleProvider, - (int) (Action.ActionType.ACTION_REMOTE_YELLOW_BUTTON)); + (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_REMOTE_YELLOW_BUTTON)); GenerateActionLogEntries = reader.GetValueAsBool(SectionName, ParmGenerateLogEntries, false); } Modified: trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs =================================================================== --- trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs 2011-04-16 04:06:13 UTC (rev 4171) +++ trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs 2011-04-16 17:44:28 UTC (rev 4172) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:4.0.30319.225 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,1693 +9,1958 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4927. +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.225. // -using System; -using System.CodeDom.Compiler; -using System.ComponentModel; -using System.Diagnostics; -using System.Threading; -using System.Web.Services; -using System.Web.Services.Description; -using System.Web.Services.Protocols; -using System.Xml.Serialization; -using MyWorldMap.Properties; - #pragma warning disable 1591 -namespace MyWorldMap.ImageryService -{ - /// <remarks/> - [GeneratedCode("System.Web.Services", "2.0.50727.4927")] - [DebuggerStepThrough] - [DesignerCategory("code")] - [WebServiceBinding(Name = "BasicHttpBinding_IImageryService", - Namespace = "http://dev.virtualearth.net/webservices/v1/imagery")] - [XmlInclude(typeof (ResponseBase))] - [XmlInclude(typeof (RequestBase))] - public class ImageryService : SoapHttpClientProtocol - { - private SendOrPostCallback GetImageryMetadataOperationCompleted; - - private SendOrPostCallback GetMapUriOperationCompleted; - - private bool useDefaultCredentialsSetExplicitly; - +namespace MyWorldMap.ImageryService { + using System; + using System.Web.Services; + using System.Diagnostics; + using System.Web.Services.Protocols; + using System.ComponentModel; + using System.Xml.Serialization; + + /// <remarks/> - public ImageryService() - { - Url = Settings.Default.MyWorldMap_ImageryService_ImageryService; - if (IsLocalFileSystemWebService(Url)) - { - UseDefaultCredentials = true; - useDefaultCredentialsSetExplicitly = false; - } - else - { - useDefaultCredentialsSetExplicitly = true; - } - } - - public new string Url - { - get { return base.Url; } - set - { - if (((IsLocalFileSystemWebService(base.Url) - && (useDefaultCredentialsSetExplicitly == false)) - && (IsLocalFileSystemWebService(value) == false))) - { - base.UseDefaultCredentials = false; + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="BasicHttpBinding_IImageryService", Namespace="http://dev.virtualearth.net/webservices/v1/imagery")] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(ResponseBase))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(RequestBase))] + public partial class ImageryService : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback GetImageryMetadataOperationCompleted; + + private System.Threading.SendOrPostCallback GetMapUriOperationCompleted; + + private bool useDefaultCredentialsSetExplicitly; + + /// <remarks/> + public ImageryService() { + this.Url = global::MyWorldMap.Properties.Settings.Default.MyWorldMap_ImageryService_ImageryService; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } } - base.Url = value; - } + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { + base.UseDefaultCredentials = false; + } + base.Url = value; + } + } + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { + base.UseDefaultCredentials = value; + this.useDefaultCredentialsSetExplicitly = true; + } + } + + /// <remarks/> + public event GetImageryMetadataCompletedEventHandler GetImageryMetadataCompleted; + + /// <remarks/> + public event GetMapUriCompletedEventHandler GetMapUriCompleted; + + /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://dev.virtualearth.net/webservices/v1/imagery/contracts/IImageryService/GetI" + + "mageryMetadata", RequestNamespace="http://dev.virtualearth.net/webservices/v1/imagery/contracts", ResponseNamespace="http://dev.virtualearth.net/webservices/v1/imagery/contracts", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + [return: System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public ImageryMetadataResponse GetImageryMetadata([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] ImageryMetadataRequest request) { + object[] results = this.Invoke("GetImageryMetadata", new object[] { + request}); + return ((ImageryMetadataResponse)(results[0])); + } + + /// <remarks/> + public void GetImageryMetadataAsync(ImageryMetadataRequest request) { + this.GetImageryMetadataAsync(request, null); + } + + /// <remarks/> + public void GetImageryMetadataAsync(ImageryMetadataRequest request, object userState) { + if ((this.GetImageryMetadataOperationCompleted == null)) { + this.GetImageryMetadataOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetImageryMetadataOperationCompleted); + } + this.InvokeAsync("GetImageryMetadata", new object[] { + request}, this.GetImageryMetadataOperationCompleted, userState); + } + + private void OnGetImageryMetadataOperationCompleted(object arg) { + if ((this.GetImageryMetadataCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetImageryMetadataCompleted(this, new GetImageryMetadataCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// <remarks/> + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://dev.virtualearth.net/webservices/v1/imagery/contracts/IImageryService/GetM" + + "apUri", RequestNamespace="http://dev.virtualearth.net/webservices/v1/imagery/contracts", ResponseNamespace="http://dev.virtualearth.net/webservices/v1/imagery/contracts", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + [return: System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public MapUriResponse GetMapUri([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] MapUriRequest request) { + object[] results = this.Invoke("GetMapUri", new object[] { + request}); + return ((MapUriResponse)(results[0])); + } + + /// <remarks/> + public void GetMapUriAsync(MapUriRequest request) { + this.GetMapUriAsync(request, null); + } + + /// <remarks/> + public void GetMapUriAsync(MapUriRequest request, object userState) { + if ((this.GetMapUriOperationCompleted == null)) { + this.GetMapUriOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMapUriOperationCompleted); + } + this.InvokeAsync("GetMapUri", new object[] { + request}, this.GetMapUriOperationCompleted, userState); + } + + private void OnGetMapUriOperationCompleted(object arg) { + if ((this.GetMapUriCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetMapUriCompleted(this, new GetMapUriCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// <remarks/> + public new void CancelAsync(object userState) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { + return true; + } + return false; + } } - - public new bool UseDefaultCredentials - { - get { return base.UseDefaultCredentials; } - set - { - base.UseDefaultCredentials = value; - useDefaultCredentialsSetExplicitly = true; - } - } - + /// <remarks/> - public event GetImageryMetadataCompletedEventHandler GetImageryMetadataCompleted; - - /// <remarks/> - public event GetMapUriCompletedEventHandler GetMapUriCompleted; - - /// <remarks/> - [SoapDocumentMethod("http://dev.virtualearth.net/webservices/v1/imagery/contracts/IImageryService/GetI" + - "mageryMetadata", - RequestNamespace = "http://dev.virtualearth.net/webservices/v1/imagery/contracts", - ResponseNamespace = "http://dev.virtualearth.net/webservices/v1/imagery/contracts", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - [return: XmlElement(IsNullable = true)] - public ImageryMetadataResponse GetImageryMetadata([XmlElement(IsNullable = true)] ImageryMetadataRequest request) - { - object[] results = Invoke("GetImageryMetadata", new object[] - { - request - }); - return ((ImageryMetadataResponse) (results[0])); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/imagery")] + public partial class ImageryMetadataRequest : RequestBase { + + private ImageryMetadataOptions optionsField; + + private MapStyle styleField; + + private bool styleFieldSpecified; + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public ImageryMetadataOptions Options { + get { + return this.optionsField; + } + set { + this.optionsField = value; + } + } + + /// <remarks/> + public MapStyle Style { + get { + return this.styleField; + } + set { + this.styleField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool StyleSpecified { + get { + return this.styleFieldSpecified; + } + set { + this.styleFieldSpecified = value; + } + } } - + /// <remarks/> - public void GetImageryMetadataAsync(ImageryMetadataRequest request) - { - GetImageryMetadataAsync(request, null); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/imagery")] + public partial class ImageryMetadataOptions { + + private Heading headingField; + + private Location locationField; + + private bool returnImageryProvidersField; + + private bool returnImageryProvidersFieldSpecified; + + private UriScheme uriSchemeField; + + private bool uriSchemeFieldSpecified; + + private System.Nullable<int> zoomLevelField; + + private bool zoomLevelFieldSpecified; + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public Heading Heading { + get { + return this.headingField; + } + set { + this.headingField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public Location Location { + get { + return this.locationField; + } + set { + this.locationField = value; + } + } + + /// <remarks/> + public bool ReturnImageryProviders { + get { + return this.returnImageryProvidersField; + } + set { + this.returnImageryProvidersField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ReturnImageryProvidersSpecified { + get { + return this.returnImageryProvidersFieldSpecified; + } + set { + this.returnImageryProvidersFieldSpecified = value; + } + } + + /// <remarks/> + public UriScheme UriScheme { + get { + return this.uriSchemeField; + } + set { + this.uriSchemeField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UriSchemeSpecified { + get { + return this.uriSchemeFieldSpecified; + } + set { + this.uriSchemeFieldSpecified = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable<int> ZoomLevel { + get { + return this.zoomLevelField; + } + set { + this.zoomLevelField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ZoomLevelSpecified { + get { + return this.zoomLevelFieldSpecified; + } + set { + this.zoomLevelFieldSpecified = value; + } + } } - + /// <remarks/> - public void GetImageryMetadataAsync(ImageryMetadataRequest request, object userState) - { - if ((GetImageryMetadataOperationCompleted == null)) - { - GetImageryMetadataOperationCompleted = new SendOrPostCallback(OnGetImageryMetadataOperationCompleted); - } - InvokeAsync("GetImageryMetadata", new object[] - { - request - }, GetImageryMetadataOperationCompleted, userState); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class Heading { + + private double orientationField; + + private bool orientationFieldSpecified; + + /// <remarks/> + public double Orientation { + get { + return this.orientationField; + } + set { + this.orientationField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool OrientationSpecified { + get { + return this.orientationFieldSpecified; + } + set { + this.orientationFieldSpecified = value; + } + } } - - private void OnGetImageryMetadataOperationCompleted(object arg) - { - if ((GetImageryMetadataCompleted != null)) - { - var invokeArgs = ((InvokeCompletedEventArgs) (arg)); - GetImageryMetadataCompleted(this, - new GetImageryMetadataCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, - invokeArgs.Cancelled, invokeArgs.UserState)); - } - } - + /// <remarks/> - [SoapDocumentMethod("http://dev.virtualearth.net/webservices/v1/imagery/contracts/IImageryService/GetM" + - "apUri", RequestNamespace = "http://dev.virtualearth.net/webservices/v1/imagery/contracts", - ResponseNamespace = "http://dev.virtualearth.net/webservices/v1/imagery/contracts", Use = SoapBindingUse.Literal, - ParameterStyle = SoapParameterStyle.Wrapped)] - [return: XmlElement(IsNullable = true)] - public MapUriResponse GetMapUri([XmlElement(IsNullable = true)] MapUriRequest request) - { - object[] results = Invoke("GetMapUri", new object[] - { - request - }); - return ((MapUriResponse) (results[0])); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class RangeOfdateTime { + + private System.DateTime fromField; + + private bool fromFieldSpecified; + + private System.DateTime toField; + + private bool toFieldSpecified; + + /// <remarks/> + public System.DateTime From { + get { + return this.fromField; + } + set { + this.fromField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool FromSpecified { + get { + return this.fromFieldSpecified; + } + set { + this.fromFieldSpecified = value; + } + } + + /// <remarks/> + public System.DateTime To { + get { + return this.toField; + } + set { + this.toField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ToSpecified { + get { + return this.toFieldSpecified; + } + set { + this.toFieldSpecified = value; + } + } } - + /// <remarks/> - public void GetMapUriAsync(MapUriRequest request) - { - GetMapUriAsync(request, null); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class RangeOfint { + + private int fromField; + + private bool fromFieldSpecified; + + private int toField; + + private bool toFieldSpecified; + + /// <remarks/> + public int From { + get { + return this.fromField; + } + set { + this.fromField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool FromSpecified { + get { + return this.fromFieldSpecified; + } + set { + this.fromFieldSpecified = value; + } + } + + /// <remarks/> + public int To { + get { + return this.toField; + } + set { + this.toField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ToSpecified { + get { + return this.toFieldSpecified; + } + set { + this.toFieldSpecified = value; + } + } } - + /// <remarks/> - public void GetMapUriAsync(MapUriRequest request, object userState) - { - if ((GetMapUriOperationCompleted == null)) - { - GetMapUriOperationCompleted = new SendOrPostCallback(OnGetMapUriOperationCompleted); - } - InvokeAsync("GetMapUri", new object[] - { - request - }, GetMapUriOperationCompleted, userState); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/imagery")] + public partial class CoverageArea { + + private Rectangle boundingRectangleField; + + private RangeOfint zoomRangeField; + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public Rectangle BoundingRectangle { + get { + return this.boundingRectangleField; + } + set { + this.boundingRectangleField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public RangeOfint ZoomRange { + get { + return this.zoomRangeField; + } + set { + this.zoomRangeField = value; + } + } } - - private void OnGetMapUriOperationCompleted(object arg) - { - if ((GetMapUriCompleted != null)) - { - var invokeArgs = ((InvokeCompletedEventArgs) (arg)); - GetMapUriCompleted(this, - new GetMapUriCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, - invokeArgs.UserState)); - } - } - + /// <remarks/> - public new void CancelAsync(object userState) - { - base.CancelAsync(userState); + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class Rectangle : ShapeBase { + + private Location northeastField; + + private Location southwestField; + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public Location Northeast { + get { + return this.northeastField; + } + set { + this.northeastField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public Location Southwest { + get { + return this.southwestField; + } + set { + this.southwestField = value; + } + } } - - private bool IsLocalFileSystemWebService(string url) - { - if (((url == null) - || (url == string.Empty))) - { - return false; - } - var wsUri = new Uri(url); - if (((wsUri.Port >= 1024) - && (string.Compare(wsUri.Host, "localHost", StringComparison.OrdinalIgnoreCase) == 0))) - { - return true; - } - return false; - } - } - - /// <remarks/> - [GeneratedCode("System.Xml", "2.0.50727.4927")] - [Serializable] - [DebuggerStepThrough] - [DesignerCategory("code")] - [XmlType(Namespace = "http://dev.virtualearth.net/webservices/v1/imagery")] - public class ImageryMetadataRequest : RequestBase - { - private ImageryMetadataOptions optionsField; - - private MapStyle styleField; - - private bool styleFieldSpecified; - + /// <remarks/> - [XmlElement(IsNullable = true)] - public ImageryMetadataOptions Options - { - get { return optionsField; } - set { optionsField = value; } + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GeocodeLocation))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(UserLocation))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class Location { + + private double altitudeField; + + private bool altitudeFieldSpecified; + + private double latitudeField; + + private bool latitudeFieldSpecified; + + private double longitudeField; + + private bool longitudeFieldSpecified; + + /// <remarks/> + public double Altitude { + get { + return this.altitudeField; + } + set { + this.altitudeField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool AltitudeSpecified { + get { + return this.altitudeFieldSpecified; + } + set { + this.altitudeFieldSpecified = value; + } + } + + /// <remarks/> + public double Latitude { + get { + return this.latitudeField; + } + set { + this.latitudeField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LatitudeSpecified { + get { + return this.latitudeFieldSpecified; + } + set { + this.latitudeFieldSpecified = value; + } + } + + /// <remarks/> + public double Longitude { + get { + return this.longitudeField; + } + set { + this.longitudeField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LongitudeSpecified { + get { + return this.longitudeFieldSpecified; + } + set { + this.longitudeFieldSpecified = value; + } + } } - + /// <remarks/> - public MapStyle Style - { - get { return styleField; } - set { styleField = value; } + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class GeocodeLocation : Location { + + private string calculationMethodField; + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public string CalculationMethod { + get { + return this.calculationMethodField; + } + set { + this.calculationMethodField = value; + } + } } - + /// <remarks/> - [XmlIgnore] - public bool StyleSpecified - { - get { return styleFieldSpecified; } - set { styleFieldSpecified = value; } + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class UserLocation : Location { + + private Confidence confidenceField; + + private bool confidenceFieldSpecified; + + /// <remarks/> + public Confidence Confidence { + get { + return this.confidenceField; + } + set { + this.confidenceField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ConfidenceSpecified { + get { + return this.confidenceFieldSpecified; + } + set { + this.confidenceFieldSpecified = value; + } + } } - } - - /// <remarks/> - [GeneratedCode("System.Xml", "2.0.50727.4927")] - [Serializable] - [DebuggerStepThrough] - [DesignerCategory("code")] - [XmlType(Namespace = "http://dev.virtualearth.net/webservices/v1/imagery")] - public class ImageryMetadataOptions - { - private Heading headingField; - - private Location locationField; - - private bool returnImageryProvidersField; - - private bool returnImageryProvidersFieldSpecified; - - private UriScheme uriSchemeField; - - private bool uriSchemeFieldSpecified; - - private int? zoomLevelField; - - private bool zoomLevelFieldSpecified; - + /// <remarks/> - [XmlElement(IsNullable = true)] - public Heading Heading - { - get { return headingField; } - set { headingField = value; } + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public enum Confidence { + + /// <remarks/> + High, + + /// <remarks/> + Medium, + + /// <remarks/> + Low, } - + /// <remarks/> - [XmlElement(IsNullable = true)] - public Location Location - { - get { return locationField; } - set { locationField = value; } + [System.Xml.Serialization.XmlIncludeAttribute(typeof(Polygon))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(Rectangle))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(Circle))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchPoint))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class ShapeBase { } - + /// <remarks/> - public bool ReturnImageryProviders - { - get { return returnImageryProvidersField; } - set { returnImageryProvidersField = value; } + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class Polygon : ShapeBase { + + private Location[] verticesField; + + /// <remarks/> + [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] + public Location[] Vertices { + get { + return this.verticesField; + } + set { + this.verticesField = value; + } + } } - + /// <remarks/> - [XmlIgnore] - public bool ReturnImageryProvidersSpecified - { - get { return returnImageryProvidersFieldSpecified; } - set { returnImageryProvidersFieldSpecified = value; } + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.225")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://dev.virtualearth.net/webservices/v1/common")] + public partial class Circle : ShapeBase { + + private Location centerField; + + private DistanceUnit distanceUnitField; + + private bool distanceUnitFieldSpecified; + + private double radiusField; + + private bool radiusFieldSpecified; + + /// <remarks/> + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public Location Center { + get { + return this.centerField; + } + set { + this.centerField = value; + } + } + + /// <remarks/> + public DistanceUnit DistanceUnit { + get { + return this.distanceUnitField; + } + set { + this.distanceUnitField = value; + } + } + + /// <remarks/> + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DistanceUnitSpecified { + get { + ... [truncated message content] |