mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2026-04-05 22:46:58 +00:00
Version 4.14. Added support for .NET Core 3
This commit is contained in:
ClemensF
parent
a4fad94921
commit
23778280e1
35 changed files with 797 additions and 36 deletions
|
|
@ -175,7 +175,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
|
||||
<Version>6.2.8</Version>
|
||||
<Version>6.2.9</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
|
|||
[assembly: AssemblyCompany("Clemens Fischer")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyVersion("4.13.1")]
|
||||
[assembly: AssemblyFileVersion("4.13.1")]
|
||||
[assembly: AssemblyVersion("4.14.0")]
|
||||
[assembly: AssemblyFileVersion("4.14.0")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: ComVisible(false)]
|
||||
|
|
|
|||
3
MapControl/WPF.Core/AssemblyInfo.cs
Normal file
3
MapControl/WPF.Core/AssemblyInfo.cs
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
using System.Windows;
|
||||
|
||||
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
||||
91
MapControl/WPF.Core/MapControl.WPF.Core.csproj
Normal file
91
MapControl/WPF.Core/MapControl.WPF.Core.csproj
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
<RootNamespace>MapControl</RootNamespace>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
|
||||
<DelaySign>false</DelaySign>
|
||||
<Product>XAML Map Control</Product>
|
||||
<Authors>Clemens Fischer</Authors>
|
||||
<Version>4.14.0</Version>
|
||||
<Description>XAML Map Control Library</Description>
|
||||
<Copyright>Copyright © 2019 Clemens Fischer</Copyright>
|
||||
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
|
||||
<PackageId>XAML.MapControl.Core</PackageId>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<DefineConstants>TRACE;NET_CORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<DefineConstants>TRACE;NET_CORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Shared\AutoEquirectangularProjection.cs" Link="AutoEquirectangularProjection.cs" />
|
||||
<Compile Include="..\Shared\AzimuthalEquidistantProjection.cs" Link="AzimuthalEquidistantProjection.cs" />
|
||||
<Compile Include="..\Shared\AzimuthalProjection.cs" Link="AzimuthalProjection.cs" />
|
||||
<Compile Include="..\Shared\BingMapsTileLayer.cs" Link="BingMapsTileLayer.cs" />
|
||||
<Compile Include="..\Shared\BingMapsTileSource.cs" Link="BingMapsTileSource.cs" />
|
||||
<Compile Include="..\Shared\BoundingBox.cs" Link="BoundingBox.cs" />
|
||||
<Compile Include="..\Shared\CenteredBoundingBox.cs" Link="CenteredBoundingBox.cs" />
|
||||
<Compile Include="..\Shared\EquirectangularProjection.cs" Link="EquirectangularProjection.cs" />
|
||||
<Compile Include="..\Shared\GnomonicProjection.cs" Link="GnomonicProjection.cs" />
|
||||
<Compile Include="..\Shared\HyperlinkText.cs" Link="HyperlinkText.cs" />
|
||||
<Compile Include="..\Shared\ImageLoader.cs" Link="ImageLoader.cs" />
|
||||
<Compile Include="..\Shared\Intersections.cs" Link="Intersections.cs" />
|
||||
<Compile Include="..\Shared\Location.cs" Link="Location.cs" />
|
||||
<Compile Include="..\Shared\LocationCollection.cs" Link="LocationCollection.cs" />
|
||||
<Compile Include="..\Shared\LocationEx.cs" Link="LocationEx.cs" />
|
||||
<Compile Include="..\Shared\MapBase.cs" Link="MapBase.cs" />
|
||||
<Compile Include="..\Shared\MapGraticule.cs" Link="MapGraticule.cs" />
|
||||
<Compile Include="..\Shared\MapImageLayer.cs" Link="MapImageLayer.cs" />
|
||||
<Compile Include="..\Shared\MapItemsControl.cs" Link="MapItemsControl.cs" />
|
||||
<Compile Include="..\Shared\MapOverlay.cs" Link="MapOverlay.cs" />
|
||||
<Compile Include="..\Shared\MapPanel.cs" Link="MapPanel.cs" />
|
||||
<Compile Include="..\Shared\MapPolygon.cs" Link="MapPolygon.cs" />
|
||||
<Compile Include="..\Shared\MapPolyline.cs" Link="MapPolyline.cs" />
|
||||
<Compile Include="..\Shared\MapProjection.cs" Link="MapProjection.cs" />
|
||||
<Compile Include="..\Shared\MapScale.cs" Link="MapScale.cs" />
|
||||
<Compile Include="..\Shared\MapShape.cs" Link="MapShape.cs" />
|
||||
<Compile Include="..\Shared\MapTileLayer.cs" Link="MapTileLayer.cs" />
|
||||
<Compile Include="..\Shared\OrthographicProjection.cs" Link="OrthographicProjection.cs" />
|
||||
<Compile Include="..\Shared\PolygonCollection.cs" Link="PolygonCollection.cs" />
|
||||
<Compile Include="..\Shared\Pushpin.cs" Link="Pushpin.cs" />
|
||||
<Compile Include="..\Shared\StereographicProjection.cs" Link="StereographicProjection.cs" />
|
||||
<Compile Include="..\Shared\Tile.cs" Link="Tile.cs" />
|
||||
<Compile Include="..\Shared\TileGrid.cs" Link="TileGrid.cs" />
|
||||
<Compile Include="..\Shared\TileImageLoader.cs" Link="TileImageLoader.cs" />
|
||||
<Compile Include="..\Shared\TileSource.cs" Link="TileSource.cs" />
|
||||
<Compile Include="..\Shared\ViewportChangedEventArgs.cs" Link="ViewportChangedEventArgs.cs" />
|
||||
<Compile Include="..\Shared\WebMercatorProjection.cs" Link="WebMercatorProjection.cs" />
|
||||
<Compile Include="..\Shared\WmsImageLayer.cs" Link="WmsImageLayer.cs" />
|
||||
<Compile Include="..\Shared\WorldMercatorProjection.cs" Link="WorldMercatorProjection.cs" />
|
||||
<Compile Include="..\WPF\ImageFileCache.WPF.cs" Link="ImageFileCache.WPF.cs" />
|
||||
<Compile Include="..\WPF\ImageLoader.WPF.cs" Link="ImageLoader.WPF.cs" />
|
||||
<Compile Include="..\WPF\Map.WPF.cs" Link="Map.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapBase.WPF.cs" Link="MapBase.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapGraticule.WPF.cs" Link="MapGraticule.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapItemsControl.WPF.cs" Link="MapItemsControl.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapMultiPolygon.WPF.cs" Link="MapMultiPolygon.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapOverlay.WPF.cs" Link="MapOverlay.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapPanel.WPF.cs" Link="MapPanel.WPF.cs" />
|
||||
<Compile Include="..\WPF\MapShape.WPF.cs" Link="MapShape.WPF.cs" />
|
||||
<Compile Include="..\WPF\Tile.WPF.cs" Link="Tile.WPF.cs" />
|
||||
<Compile Include="..\WPF\TileImageLoader.WPF.cs" Link="TileImageLoader.WPF.cs" />
|
||||
<Compile Include="..\WPF\TypeConverters.WPF.cs" Link="TypeConverters.WPF.cs" />
|
||||
<Compile Include="..\WPF\XmlDocument.WPF.cs" Link="XmlDocument.WPF.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\MapControl.snk" Link="MapControl.snk" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
9
MapControl/WPF.Core/MapControl.WPF.Core.csproj.user
Normal file
9
MapControl/WPF.Core/MapControl.WPF.Core.csproj.user
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
<ItemGroup>
|
||||
<Page Update="Themes\Generic.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
67
MapControl/WPF.Core/Themes/Generic.xaml
Normal file
67
MapControl/WPF.Core/Themes/Generic.xaml
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:map="clr-namespace:MapControl">
|
||||
<Style TargetType="map:MapItemsControl">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate>
|
||||
<ItemsPresenter/>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="ItemsPanel">
|
||||
<Setter.Value>
|
||||
<ItemsPanelTemplate>
|
||||
<map:MapPanel/>
|
||||
</ItemsPanelTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style TargetType="map:MapItem">
|
||||
<Setter Property="Focusable" Value="False"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||
<Setter Property="VerticalAlignment" Value="Stretch"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="map:MapItem">
|
||||
<ContentPresenter Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style TargetType="map:Pushpin">
|
||||
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalAlignment" Value="Bottom"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="Padding" Value="3"/>
|
||||
<Setter Property="Foreground" Value="Black"/>
|
||||
<Setter Property="Background" Value="White"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="map:Pushpin">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Rectangle Fill="{TemplateBinding Background}"/>
|
||||
<Path Grid.Row="1" Fill="{TemplateBinding Background}" Data="M 0,-0.5 L 0,16 16,-0.5"/>
|
||||
<ContentPresenter Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
|
|
@ -186,9 +186,11 @@ namespace MapControl.Caching
|
|||
stream.Write(BitConverter.GetBytes(imageCacheItem.Expiration.Ticks), 0, 8);
|
||||
}
|
||||
|
||||
#if !NET_CORE
|
||||
var fileSecurity = File.GetAccessControl(path);
|
||||
fileSecurity.AddAccessRule(fullControlRule);
|
||||
File.SetAccessControl(path, fileSecurity);
|
||||
#endif
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ using System.Windows;
|
|||
[assembly: AssemblyCompany("Clemens Fischer")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyVersion("4.13.1")]
|
||||
[assembly: AssemblyFileVersion("4.13.1")]
|
||||
[assembly: AssemblyVersion("4.14.0")]
|
||||
[assembly: AssemblyFileVersion("4.14.0")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: ComVisible(false)]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue