Version 1.0.4 update
Added support for .NET Standard 2.0
This commit is contained in:
Ricky Brundritt
Родитель
4b1a7a8014
Коммит
63c1fcc9e4
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26228.9
|
||||
VisualStudioVersion = 15.0.27004.2009
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{6E311F7C-45B1-46C0-96B4-D4BA2048C818}"
|
||||
EndProject
|
||||
|
|
@ -10,6 +10,7 @@ EndProject
|
|||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B9E985-FC31-42F4-A569-AEB80E363C7C}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
.gitignore = .gitignore
|
||||
CHANGELOG.md = CHANGELOG.md
|
||||
CONTRIBUTING.md = CONTRIBUTING.md
|
||||
LICENSE = LICENSE
|
||||
README.md = README.md
|
||||
|
|
@ -40,6 +41,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiReference", "ApiReferenc
|
|||
Docs\ApiReference\Readme.md = Docs\ApiReference\Readme.md
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BingMapsSDSToolkit.Standard", "Source\BingMapsSDSToolkit.Standard\BingMapsSDSToolkit.Standard.csproj", "{9A85F050-2979-40BC-9513-4DC86BF33D26}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDSToolkitConsoleApp.Core", "Samples\Console\SDSToolkitConsoleApp.Core\SDSToolkitConsoleApp.Core.csproj", "{99D07607-250A-44A9-B5D3-ED43C326B247}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -58,6 +63,14 @@ Global
|
|||
{FE6699B1-E03F-42FD-8555-83D3758D0787}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{FE6699B1-E03F-42FD-8555-83D3758D0787}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{FE6699B1-E03F-42FD-8555-83D3758D0787}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9A85F050-2979-40BC-9513-4DC86BF33D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9A85F050-2979-40BC-9513-4DC86BF33D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9A85F050-2979-40BC-9513-4DC86BF33D26}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9A85F050-2979-40BC-9513-4DC86BF33D26}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{99D07607-250A-44A9-B5D3-ED43C326B247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{99D07607-250A-44A9-B5D3-ED43C326B247}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{99D07607-250A-44A9-B5D3-ED43C326B247}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{99D07607-250A-44A9-B5D3-ED43C326B247}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -69,5 +82,10 @@ Global
|
|||
{69E38C4B-4B41-486D-8B01-570C8C1D7FC0} = {AC3A8636-6F98-45FB-A675-241E563E90C9}
|
||||
{FE6699B1-E03F-42FD-8555-83D3758D0787} = {CDEC08CC-3827-459E-87F6-517811CB14A3}
|
||||
{AEB4529E-4AEF-4D0B-9692-8CFBFF4365BF} = {FE243BC0-82EA-4C67-9990-2B825B66BB65}
|
||||
{9A85F050-2979-40BC-9513-4DC86BF33D26} = {6E311F7C-45B1-46C0-96B4-D4BA2048C818}
|
||||
{99D07607-250A-44A9-B5D3-ED43C326B247} = {CDEC08CC-3827-459E-87F6-517811CB14A3}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {08F90658-D4E7-4134-BA9C-B33155B6F970}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>BingMapsSDSToolkit</id>
|
||||
<version>1.0.3</version>
|
||||
<version>1.0.4</version>
|
||||
<title>Bing Maps SDS Toolkit</title>
|
||||
<authors>Microsoft</authors>
|
||||
<owners>microsoft bingmaps</owners>
|
||||
|
|
@ -15,7 +15,30 @@
|
|||
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
||||
<tags>Microsoft "Bing Maps" Maps GIS Map Geospatial VB C# .NET REST</tags>
|
||||
<dependencies>
|
||||
<dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
|
||||
<group targetFramework=".NETFramework4.5">
|
||||
<dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
|
||||
</group>
|
||||
<group targetFramework="UAP10.0">
|
||||
<dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
|
||||
</group>
|
||||
<group targetFramework="WindowsPhoneApp8.1">
|
||||
<dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
|
||||
</group>
|
||||
<group targetFramework="Xamarin.iOS0.0">
|
||||
<dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
|
||||
</group>
|
||||
<group targetFramework=".NETPortable0.0-net45+wp8+win8">
|
||||
<dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
|
||||
</group>
|
||||
<group targetFramework=".NETStandard2.0">
|
||||
<dependency id="System.ServiceModel.Primitives" version="4.4.0" />
|
||||
</group>
|
||||
<group targetFramework=".NETPlatform5.0">
|
||||
<dependency id="System.ServiceModel.Primitives" version="4.4.0" />
|
||||
</group>
|
||||
<group targetFramework="DNXCore5.0">
|
||||
<dependency id="System.ServiceModel.Primitives" version="4.4.0" />
|
||||
</group>
|
||||
</dependencies>
|
||||
<references>
|
||||
<group targetFramework=".NETFramework4.5">
|
||||
|
|
@ -43,12 +66,18 @@
|
|||
</references>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.dll" target="lib\dotnet\BingMapsSDSToolkit.dll" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.pdb" target="lib\dotnet\BingMapsSDSToolkit.pdb" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.XML" target="lib\dotnet\BingMapsSDSToolkit.XML" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.deps.json" target="lib\dnxcore50\BingMapsSDSToolkit.deps.json" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.dll" target="lib\dnxcore50\BingMapsSDSToolkit.dll" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.pdb" target="lib\dnxcore50\BingMapsSDSToolkit.pdb" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.deps.json" target="lib\dotnet\BingMapsSDSToolkit.deps.json" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.dll" target="lib\dotnet\BingMapsSDSToolkit.dll" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.pdb" target="lib\dotnet\BingMapsSDSToolkit.pdb" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.dll" target="lib\net45\BingMapsSDSToolkit.dll" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.pdb" target="lib\net45\BingMapsSDSToolkit.pdb" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.XML" target="lib\net45\BingMapsSDSToolkit.XML" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.deps.json" target="lib\netstandard2.0\BingMapsSDSToolkit.deps.json" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.dll" target="lib\netstandard2.0\BingMapsSDSToolkit.dll" />
|
||||
<file src="..\Source\BingMapsSDSToolkit.Standard\bin\Release\netstandard2.0\BingMapsSDSToolkit.pdb" target="lib\netstandard2.0\BingMapsSDSToolkit.pdb" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.dll" target="lib\portable-net45+wp8+win8\BingMapsSDSToolkit.dll" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.pdb" target="lib\portable-net45+wp8+win8\BingMapsSDSToolkit.pdb" />
|
||||
<file src="..\Source\bin\Release\BingMapsSDSToolkit.XML" target="lib\portable-net45+wp8+win8\BingMapsSDSToolkit.XML" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
## Version 1.0.4 - 11/27/2017
|
||||
|
||||
* Added support for .NET Standard 2.0
|
||||
|
||||
## Version 1.0.3 - 9/20/2017
|
||||
|
||||
* Initial Release
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
[](https://www.nuget.org/packages/BingMapsSDSToolkit)
|
||||
[](https://www.nuget.org/packages/BingMapsSDSToolkit)
|
||||
[](LICENSE)
|
||||
|
||||
# Bing Maps Spatial Data Services (SDS) Toolkit for .NET
|
||||
|
|
@ -35,6 +35,7 @@ Alternatively, if you are using the nuget command line:
|
|||
## Supported Platforms
|
||||
|
||||
* .NET Framework 4.5+
|
||||
* .NET Standard 2.0
|
||||
* Universal Windows Platform (UWP)
|
||||
* Windows 10
|
||||
* Windows 8.1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,63 @@
|
|||
using BingMapsSDSToolkit.GeocodeDataflowAPI;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace SDSToolkitConsoleApp.Core
|
||||
{
|
||||
class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
//This sample shows how to perform a back geocode request from a console app.
|
||||
|
||||
var bingMapsKey = "YOUR_BING_MAPS_KEY";
|
||||
|
||||
var geocodeFeed = new GeocodeFeed()
|
||||
{
|
||||
Entities = new List<GeocodeEntity>()
|
||||
{
|
||||
new GeocodeEntity("New York, NY"),
|
||||
new GeocodeEntity("Seattle, WA")
|
||||
}
|
||||
};
|
||||
|
||||
Console.WriteLine(string.Format("Creating batch geocode job consisting of {0} entities.\n", geocodeFeed.Entities.Count));
|
||||
|
||||
var geocodeManager = new BatchGeocodeManager();
|
||||
var r = geocodeManager.Geocode(geocodeFeed, bingMapsKey).GetAwaiter().GetResult();
|
||||
|
||||
if (!string.IsNullOrEmpty(r.Error))
|
||||
{
|
||||
Console.WriteLine("Error: " + r.Error);
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Batch geocode job complete:\n");
|
||||
|
||||
if (r.Succeeded != null && r.Succeeded.Entities != null)
|
||||
{
|
||||
Console.WriteLine(string.Format("Succeeded: {0}\n", r.Succeeded.Entities.Count));
|
||||
|
||||
Console.WriteLine("Query\tLatitude\tLongitude\n----------------------------------");
|
||||
foreach (var e in r.Succeeded.Entities)
|
||||
{
|
||||
Console.WriteLine(string.Format("{0}\t{1}\t{2}", e.GeocodeResponse[0].Name, e.GeocodeResponse[0].GeocodePoint[0].Latitude, e.GeocodeResponse[0].GeocodePoint[0].Longitude));
|
||||
}
|
||||
}
|
||||
|
||||
if (r.Failed != null && r.Failed.Entities != null)
|
||||
{
|
||||
Console.WriteLine(string.Format("Failed: {0}\n", r.Failed.Entities.Count));
|
||||
|
||||
Console.WriteLine("Query\n-----------");
|
||||
foreach (var e in r.Failed.Entities)
|
||||
{
|
||||
Console.WriteLine(e.GeocodeRequest.Query);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Console.ReadLine();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Source\BingMapsSDSToolkit.Standard\BingMapsSDSToolkit.Standard.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -11,6 +11,8 @@
|
|||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
|
|
@ -58,9 +60,11 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
|
||||
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
|
||||
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
|
||||
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
|
||||
<package id="Microsoft.Bcl.Compression" version="3.9.85" targetFramework="net452" />
|
||||
</packages>
|
||||
|
|
@ -14,6 +14,8 @@
|
|||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
|
|
@ -143,15 +145,12 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
|
||||
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
|
||||
</Target>
|
||||
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
|
||||
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
|
||||
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
|
||||
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
</Target>
|
||||
<!-- 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.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net46" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
|
||||
<package id="Microsoft.Bcl.Compression" version="3.9.85" targetFramework="net46" />
|
||||
<package id="Microsoft.Maps.MapControl.WPF" version="1.0.0.3" targetFramework="net46" />
|
||||
</packages>
|
||||
|
|
@ -0,0 +1,114 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<RootNamespace>BingMapsSDSToolkit</RootNamespace>
|
||||
<AssemblyName>BingMapsSDSToolkit</AssemblyName>
|
||||
<Version>1.0.4</Version>
|
||||
<Description>A portable class library that makes it easy to access the Bing Maps Spatial Data Services from .NET.</Description>
|
||||
<Company>Microsoft</Company>
|
||||
<Authors>microsoft bingmaps</Authors>
|
||||
<Copyright>© Microsoft Corporation. All rights reserved</Copyright>
|
||||
<PackageLicenseUrl>https://github.com/Microsoft/BingMapsSDSToolkit/blob/master/LICENSE</PackageLicenseUrl>
|
||||
<PackageProjectUrl>https://github.com/Microsoft/BingMapsSDSToolkit</PackageProjectUrl>
|
||||
<PackageIconUrl>https://www.bing.com/sa/simg/bing_p_rr_teal_min.ico</PackageIconUrl>
|
||||
<PackageTags>Microsoft "Bing Maps" Maps GIS Map Geospatial VB C# .NET REST</PackageTags>
|
||||
<AssemblyVersion>1.0.4.0</AssemblyVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Common\BasicDataSourceInfo.cs" Link="Common\BasicDataSourceInfo.cs" />
|
||||
<Compile Include="..\Common\BingDataSources.cs" Link="Common\BingDataSources.cs" />
|
||||
<Compile Include="..\Common\DistanceUnitType.cs" Link="Common\DistanceUnitType.cs" />
|
||||
<Compile Include="..\Common\FileExtensionUtilities.cs" Link="Common\FileExtensionUtilities.cs" />
|
||||
<Compile Include="..\Common\GeoDataLocation.cs" Link="Common\GeoDataLocation.cs" />
|
||||
<Compile Include="..\Common\Geography.cs" Link="Common\Geography.cs" />
|
||||
<Compile Include="..\Common\InternalSettings.cs" Link="Common\InternalSettings.cs" />
|
||||
<Compile Include="..\Common\SpatialTools.cs" Link="Common\SpatialTools.cs" />
|
||||
<Compile Include="..\DataSourceAPI\DataSource.cs" Link="DataSourceAPI\DataSource.cs" />
|
||||
<Compile Include="..\DataSourceAPI\DataSourceManager.cs" Link="DataSourceAPI\DataSourceManager.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Enums\DataSourceFormat.cs" Link="DataSourceAPI\Enums\DataSourceFormat.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Enums\LoadOperation.cs" Link="DataSourceAPI\Enums\LoadOperation.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\ColumnHeader.cs" Link="DataSourceAPI\Models\ColumnHeader.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\DataflowJob.cs" Link="DataSourceAPI\Models\DataflowJob.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\DataflowResponse.cs" Link="DataSourceAPI\Models\DataflowResponse.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\DataflowResultSet.cs" Link="DataSourceAPI\Models\DataflowResultSet.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\DataServiceJob.cs" Link="DataSourceAPI\Models\DataServiceJob.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\DataSourceDetails.cs" Link="DataSourceAPI\Models\DataSourceDetails.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\DataSourceGeocodeResults.cs" Link="DataSourceAPI\Models\DataSourceGeocodeResults.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\Link.cs" Link="DataSourceAPI\Models\Link.cs" />
|
||||
<Compile Include="..\DataSourceAPI\Models\ValidationResult.cs" Link="DataSourceAPI\Models\ValidationResult.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\BatchGeocodeManager.cs" Link="GeocodeDataflowAPI\BatchGeocodeManager.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\BatchGeocoderResults.cs" Link="GeocodeDataflowAPI\BatchGeocoderResults.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Enums\BatchFileFormat.cs" Link="GeocodeDataflowAPI\Enums\BatchFileFormat.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Enums\CalculationMethodTypes.cs" Link="GeocodeDataflowAPI\Enums\CalculationMethodTypes.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Enums\ConfidenceTypes.cs" Link="GeocodeDataflowAPI\Enums\ConfidenceTypes.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Enums\GeocodeEntityType.cs" Link="GeocodeDataflowAPI\Enums\GeocodeEntityType.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Enums\MatchCodeTypes.cs" Link="GeocodeDataflowAPI\Enums\MatchCodeTypes.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Enums\QueryParsePropertyTypes.cs" Link="GeocodeDataflowAPI\Enums\QueryParsePropertyTypes.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\GeocodeFeed.cs" Link="GeocodeDataflowAPI\GeocodeFeed.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\Address.cs" Link="GeocodeDataflowAPI\Models\Address.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\BaseRequest.cs" Link="GeocodeDataflowAPI\Models\BaseRequest.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\BoundingBox.cs" Link="GeocodeDataflowAPI\Models\BoundingBox.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\ConfidenceFilter.cs" Link="GeocodeDataflowAPI\Models\ConfidenceFilter.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\GeocodeEntity.cs" Link="GeocodeDataflowAPI\Models\GeocodeEntity.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\GeocodePoint.cs" Link="GeocodeDataflowAPI\Models\GeocodePoint.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\GeocodeRequest.cs" Link="GeocodeDataflowAPI\Models\GeocodeRequest.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\GeocodeResponse.cs" Link="GeocodeDataflowAPI\Models\GeocodeResponse.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\QueryParseValue.cs" Link="GeocodeDataflowAPI\Models\QueryParseValue.cs" />
|
||||
<Compile Include="..\GeocodeDataflowAPI\Models\ReverseGeocodeRequest.cs" Link="GeocodeDataflowAPI\Models\ReverseGeocodeRequest.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Enums\BoundaryEntityType.cs" Link="GeoDataAPI\Enums\BoundaryEntityType.cs" />
|
||||
<Compile Include="..\GeoDataAPI\GeoDataManager.cs" Link="GeoDataAPI\GeoDataManager.cs" />
|
||||
<Compile Include="..\GeoDataAPI\GetBoundaryRequest.cs" Link="GeoDataAPI\GetBoundaryRequest.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\Copyright.cs" Link="GeoDataAPI\Models\Copyright.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\CopyrightSource.cs" Link="GeoDataAPI\Models\CopyrightSource.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\GeoDataPolygon.cs" Link="GeoDataAPI\Models\GeoDataPolygon.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\GeoDataResponse.cs" Link="GeoDataAPI\Models\GeoDataResponse.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\GeoDataResult.cs" Link="GeoDataAPI\Models\GeoDataResult.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\GeoDataResultSet.cs" Link="GeoDataAPI\Models\GeoDataResultSet.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\Metadata.cs" Link="GeoDataAPI\Models\Metadata.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\Name.cs" Link="GeoDataAPI\Models\Name.cs" />
|
||||
<Compile Include="..\GeoDataAPI\Models\Primitive.cs" Link="GeoDataAPI\Models\Primitive.cs" />
|
||||
<Compile Include="..\GeoDataAPI\PointCompression.cs" Link="GeoDataAPI\PointCompression.cs" />
|
||||
<Compile Include="..\Internal\DelimitedFileReader.cs" Link="Internal\DelimitedFileReader.cs" />
|
||||
<Compile Include="..\Internal\DelimitedFileWriter.cs" Link="Internal\DelimitedFileWriter.cs" />
|
||||
<Compile Include="..\Internal\DownloadDetails.cs" Link="Internal\DownloadDetails.cs" />
|
||||
<Compile Include="..\Internal\ServiceHelper.cs" Link="Internal\ServiceHelper.cs" />
|
||||
<Compile Include="..\Internal\XmlNamespaces.cs" Link="Internal\XmlNamespaces.cs" />
|
||||
<Compile Include="..\Internal\XmlUtilities.cs" Link="Internal\XmlUtilities.cs" />
|
||||
<Compile Include="..\QueryAPI\Enums\AvoidType.cs" Link="QueryAPI\Enums\AvoidType.cs" />
|
||||
<Compile Include="..\QueryAPI\Enums\CompareOperator.cs" Link="QueryAPI\Enums\CompareOperator.cs" />
|
||||
<Compile Include="..\QueryAPI\Enums\LogicalOperator.cs" Link="QueryAPI\Enums\LogicalOperator.cs" />
|
||||
<Compile Include="..\QueryAPI\Enums\RouteOptimizationType.cs" Link="QueryAPI\Enums\RouteOptimizationType.cs" />
|
||||
<Compile Include="..\QueryAPI\Enums\TravelModeType.cs" Link="QueryAPI\Enums\TravelModeType.cs" />
|
||||
<Compile Include="..\QueryAPI\FindByPropertyRequest.cs" Link="QueryAPI\FindByPropertyRequest.cs" />
|
||||
<Compile Include="..\QueryAPI\FindInBoundingBoxRequest.cs" Link="QueryAPI\FindInBoundingBoxRequest.cs" />
|
||||
<Compile Include="..\QueryAPI\FindNearByRequest.cs" Link="QueryAPI\FindNearByRequest.cs" />
|
||||
<Compile Include="..\QueryAPI\FindNearRouteRequest.cs" Link="QueryAPI\FindNearRouteRequest.cs" />
|
||||
<Compile Include="..\QueryAPI\IntersectionSearchRequest.cs" Link="QueryAPI\IntersectionSearchRequest.cs" />
|
||||
<Compile Include="..\QueryAPI\Models\FilterExpression.cs" Link="QueryAPI\Models\FilterExpression.cs" />
|
||||
<Compile Include="..\QueryAPI\Models\FilterGroup.cs" Link="QueryAPI\Models\FilterGroup.cs" />
|
||||
<Compile Include="..\QueryAPI\Models\IFilter.cs" Link="QueryAPI\Models\IFilter.cs" />
|
||||
<Compile Include="..\QueryAPI\Models\QueryResponse.cs" Link="QueryAPI\Models\QueryResponse.cs" />
|
||||
<Compile Include="..\QueryAPI\Models\QueryResult.cs" Link="QueryAPI\Models\QueryResult.cs" />
|
||||
<Compile Include="..\QueryAPI\QueryManager.cs" Link="QueryAPI\QueryManager.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Common\" />
|
||||
<Folder Include="DataSourceAPI\Enums\" />
|
||||
<Folder Include="DataSourceAPI\Models\" />
|
||||
<Folder Include="GeocodeDataflowAPI\Enums\" />
|
||||
<Folder Include="GeocodeDataflowAPI\Models\" />
|
||||
<Folder Include="GeoDataAPI\Enums\" />
|
||||
<Folder Include="GeoDataAPI\Models\" />
|
||||
<Folder Include="Internal\" />
|
||||
<Folder Include="QueryAPI\Enums\" />
|
||||
<Folder Include="QueryAPI\Models\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -15,6 +15,8 @@
|
|||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -43,6 +45,7 @@
|
|||
<Compile Include="Common\BasicDataSourceInfo.cs" />
|
||||
<Compile Include="Common\BingDataSources.cs" />
|
||||
<Compile Include="Common\FileExtensionUtilities.cs" />
|
||||
<Compile Include="Common\InternalSettings.cs" />
|
||||
<Compile Include="DataSourceAPI\Models\ColumnHeader.cs" />
|
||||
<Compile Include="DataSourceAPI\Models\DataSourceGeocodeResults.cs" />
|
||||
<Compile Include="GeocodeDataflowAPI\BatchGeocodeManager.cs" />
|
||||
|
|
@ -117,10 +120,12 @@
|
|||
<Compile Include="QueryAPI\Models\QueryResult.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
||||
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
|
||||
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
|
||||
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
</Target>
|
||||
<!-- 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.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* Copyright(c) 2017 Microsoft Corporation. All rights reserved.
|
||||
*
|
||||
* This code is licensed under the MIT License (MIT).
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
* of the Software, and to permit persons to whom the Software is furnished to do
|
||||
* so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
namespace BingMapsSDSToolkit
|
||||
{
|
||||
/// <summary>
|
||||
/// Internal settings.
|
||||
/// </summary>
|
||||
public static class InternalSettings
|
||||
{
|
||||
/// <summary>
|
||||
/// API identifier. Used to help trace and debug issues with the toolkit.
|
||||
/// </summary>
|
||||
public static string ClientApi = "SDSToolkit";
|
||||
}
|
||||
}
|
||||
|
|
@ -243,7 +243,7 @@ namespace BingMapsSDSToolkit.DataSourceAPI
|
|||
{
|
||||
ValidateProperties(accessId, dataSourceName, masterKey);
|
||||
|
||||
string request = string.Format("https://spatial.virtualearth.net/REST/v1/data/{0}/{1}/$commit?output=json&key={2}&clientApi=SDSToolkit", accessId, dataSourceName, masterKey);
|
||||
string request = string.Format("https://spatial.virtualearth.net/REST/v1/data/{0}/{1}/$commit?output=json&key={2}&clientApi={3}", accessId, dataSourceName, masterKey, InternalSettings.ClientApi);
|
||||
|
||||
var jobs = await DownloadDataServiceJobs(request);
|
||||
|
||||
|
|
@ -340,11 +340,11 @@ namespace BingMapsSDSToolkit.DataSourceAPI
|
|||
throw new Exception("Not all rows of the data source contain location information.");
|
||||
}
|
||||
|
||||
string request = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/LoadDataSource?loadOperation={0}&dataSourceName={1}&setPublic={2}&input=xml&output=json&key={3}&clientApi=SDSToolkit",
|
||||
string request = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/LoadDataSource?loadOperation={0}&dataSourceName={1}&setPublic={2}&input=xml&output=json&key={3}&clientApi={4}",
|
||||
loadOperation,
|
||||
dataSource.Info.DataSourceName,
|
||||
(setPublic) ? 1 : 0,
|
||||
dataSource.Info.MasterKey);
|
||||
dataSource.Info.MasterKey, InternalSettings.ClientApi);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(dataSource.Info.QueryKey))
|
||||
{
|
||||
|
|
@ -414,12 +414,12 @@ namespace BingMapsSDSToolkit.DataSourceAPI
|
|||
|
||||
//Handle KML and SHP files.
|
||||
|
||||
string request = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/LoadDataSource?loadOperation={0}&dataSourceName={1}&setPublic={2}&input={3}&output=json&key={4}&clientApi=SDSToolkit",
|
||||
string request = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/LoadDataSource?loadOperation={0}&dataSourceName={1}&setPublic={2}&input={3}&output=json&key={4}&clientApi={5}",
|
||||
loadOperation,
|
||||
info.DataSourceName,
|
||||
(setPublic) ? 1 : 0,
|
||||
(format == DataSourceFormat.KML) ? "kml" : "shp",
|
||||
info.MasterKey);
|
||||
info.MasterKey, InternalSettings.ClientApi);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(info.QueryKey))
|
||||
{
|
||||
|
|
@ -590,7 +590,7 @@ namespace BingMapsSDSToolkit.DataSourceAPI
|
|||
throw new Exception("Master key not specified.");
|
||||
}
|
||||
|
||||
var request = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/DataSourceRollback/{0}/{1}?output=json&key={2}&clientApi=SDSToolkit", jobId, dataSourceName, masterKey);
|
||||
var request = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/DataSourceRollback/{0}/{1}?output=json&key={2}&clientApi={3}", jobId, dataSourceName, masterKey, InternalSettings.ClientApi);
|
||||
|
||||
var jobs = await DownloadDataflowJobs(request);
|
||||
|
||||
|
|
@ -679,7 +679,7 @@ namespace BingMapsSDSToolkit.DataSourceAPI
|
|||
var tcs = new TaskCompletionSource<bool>();
|
||||
ValidateProperties(accessId, dataSourceName, masterKey);
|
||||
|
||||
string requestUrl = string.Format("https://spatial.virtualearth.net/REST/v1/data/{0}/{1}?isStaging={2}&key={3}&clientApi=SDSToolkit", accessId, dataSourceName, (isStaging) ? 1 : 0, masterKey);
|
||||
string requestUrl = string.Format("https://spatial.virtualearth.net/REST/v1/data/{0}/{1}?isStaging={2}&key={3}&clientApi={4}", accessId, dataSourceName, (isStaging) ? 1 : 0, masterKey, InternalSettings.ClientApi);
|
||||
|
||||
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(requestUrl);
|
||||
request.Method = "DELETE";
|
||||
|
|
@ -967,10 +967,10 @@ namespace BingMapsSDSToolkit.DataSourceAPI
|
|||
var tcs = new TaskCompletionSource<string>();
|
||||
|
||||
//Build the HTTP URI that will upload and create the geocode dataflow job
|
||||
string url = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/DataSourceDownload/{0}/{1}?output=json&key={2}&clientApi=SDSToolkit",
|
||||
string url = string.Format("https://spatial.virtualearth.net/REST/v1/Dataflows/DataSourceDownload/{0}/{1}?output=json&key={2}&clientApi={3}",
|
||||
accessId,
|
||||
dataSourceName,
|
||||
Uri.EscapeUriString(masterKey));
|
||||
Uri.EscapeUriString(masterKey), InternalSettings.ClientApi);
|
||||
|
||||
Uri createJobUri = new Uri(url);
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ namespace BingMapsSDSToolkit.GeodataAPI
|
|||
throw new Exception("The Coordinate or Address property of the request must be set.");
|
||||
}
|
||||
|
||||
string requestUrl = string.Format("https://platform.bing.com/geo/spatial/v1/public/Geodata?SpatialFilter=GetBoundary({0},{1},'{2}',{3},{4},'{5}','{6}')&$format=json&key={7}&clientApi=SDSToolkit",
|
||||
string requestUrl = string.Format("https://platform.bing.com/geo/spatial/v1/public/Geodata?SpatialFilter=GetBoundary({0},{1},'{2}',{3},{4},'{5}','{6}')&$format=json&key={7}&clientApi={8}",
|
||||
locationInfo,
|
||||
request.LevelOfDetail,
|
||||
request.EntityType.ToString(),
|
||||
|
|
@ -72,7 +72,7 @@ namespace BingMapsSDSToolkit.GeodataAPI
|
|||
(request.GetEntityMetadata) ? 1 : 0,
|
||||
request.Culture,
|
||||
request.UserRegion,
|
||||
bingMapsKey);
|
||||
bingMapsKey, InternalSettings.ClientApi);
|
||||
|
||||
using (var s = await ServiceHelper.GetStreamAsync(new Uri(requestUrl)))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ namespace BingMapsSDSToolkit.GeocodeDataflowAPI
|
|||
var tcs = new TaskCompletionSource<string>();
|
||||
|
||||
//Build the HTTP URI that will upload and create the geocode dataflow job
|
||||
Uri createJobUri = new Uri("https://spatial.virtualearth.net/REST/v1/dataflows/geocode?input=xml&clientApi=SDSToolkit&key=" + bingMapsKey);
|
||||
Uri createJobUri = new Uri("https://spatial.virtualearth.net/REST/v1/dataflows/geocode?input=xml&clientApi=" + InternalSettings.ClientApi + "&key=" + bingMapsKey);
|
||||
|
||||
//Include the data to geocode in the HTTP request
|
||||
var request = HttpWebRequest.Create(createJobUri);
|
||||
|
|
@ -218,7 +218,7 @@ namespace BingMapsSDSToolkit.GeocodeDataflowAPI
|
|||
private async Task<DownloadDetails> CheckStatus(string dataflowJobLocation, string bingMapsKey)
|
||||
{
|
||||
//Build the HTTP Request to get job status
|
||||
var uriBuilder = new UriBuilder(dataflowJobLocation + @"?key=" + bingMapsKey + "&output=xml&clientApi=SDSToolkit");
|
||||
var uriBuilder = new UriBuilder(dataflowJobLocation + @"?key=" + bingMapsKey + "&output=xml&clientApi=" + InternalSettings.ClientApi);
|
||||
var request = (HttpWebRequest)WebRequest.Create(uriBuilder.Uri);
|
||||
request.Method = "GET";
|
||||
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ namespace BingMapsSDSToolkit.GeocodeDataflowAPI
|
|||
where e.GeocodeRequest != null && e.GeocodeRequest.Address != null && e.GeocodeRequest.Address.Equals(address)
|
||||
select e).FirstOrDefault();
|
||||
|
||||
return (entity != null) ? entity.Id : null;
|
||||
return entity?.Id;
|
||||
}
|
||||
|
||||
private static GeocodeFeed ParseDelimitedFile(StreamReader textReader, BatchFileFormat format)
|
||||
|
|
|
|||
|
|
@ -26,5 +26,5 @@ using System.Runtime.InteropServices;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.3.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.3.0")]
|
||||
[assembly: AssemblyVersion("1.0.4.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.4.0")]
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ namespace BingMapsSDSToolkit.QueryAPI
|
|||
}
|
||||
}
|
||||
|
||||
sb.AppendFormat("&key={0}&clientApi=SDSToolkit", string.IsNullOrEmpty(QueryKey)? MasterKey: QueryKey);
|
||||
sb.AppendFormat("&key={0}&clientApi={1}", string.IsNullOrEmpty(QueryKey)? MasterKey: QueryKey, InternalSettings.ClientApi);
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net45+win" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8" />
|
||||
<package id="Microsoft.Bcl.Compression" version="3.9.85" targetFramework="portable-net45+win" />
|
||||
</packages>
|
||||
Загрузка…
Ссылка в новой задаче