Skip to content

Commit 05bf770

Browse files
FObermaierFObermaier
committed
Fixing Obsolete issues
1 parent b8f7d8e commit 05bf770

9 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎Examples/ExampleCodeSnippets/HeatLayerExample.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ public void TestRealData()
5151

5252

5353
var m = new SharpMap.Map(new Size(640, 640));
54-
m.Layers.Add(new TileLayer(
55-
new OsmTileSource(new OsmRequest(KnownTileSource.OpenStreetMap) /*,
56-
new FileCache(@"d:\temp\OSM", "png")*/), "OSM"));
54+
m.Layers.Add(new TileLayer(BruTile.Predefined.KnownTileSources.Create(), "OSM"));
5755

5856
var l = new HeatLayer(p, "Data", 0.001f);
5957
l.LayerName = "HEAT";

‎Examples/ExampleCodeSnippets/LineSymbolizerTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public void TestTransformation()
391391
l.CoordinateTransformation = ctFact.CreateFromCoordinateSystems(ProjNet.CoordinateSystems.GeographicCoordinateSystem.WGS84, ProjNet.CoordinateSystems.ProjectedCoordinateSystem.WebMercator);
392392
l.ReverseCoordinateTransformation = ctFact.CreateFromCoordinateSystems(ProjNet.CoordinateSystems.ProjectedCoordinateSystem.WebMercator, ProjNet.CoordinateSystems.GeographicCoordinateSystem.WGS84);
393393

394-
m.Layers.Add(new SharpMap.Layers.TileLayer(new BruTile.Web.OsmTileSource(),"b"));
394+
m.Layers.Add(new SharpMap.Layers.TileLayer(BruTile.Predefined.KnownTileSources.Create(),"b"));
395395
m.Layers.Add(l);
396396

397397
var e = new GeoAPI.Geometries.Envelope(-0.02, 0.02, 51.478885 - 0.01, 51.478885 + 0.01);

‎Examples/WPFSamples/MainWindow.xaml.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
using System.Linq;
33
using System.Windows;
44
using System.Windows.Forms;
5-
using BruTile.Predefined;
6-
using BruTile.Web;
75
using GeoAPI.Geometries;
86
using Application = System.Windows.Application;
97
using MenuItem = System.Windows.Controls.MenuItem;
@@ -28,8 +26,7 @@ private void MenuItem_OnClick(object sender, RoutedEventArgs e)
2826

2927
private void BgOSM_OnClick(object sender, RoutedEventArgs e)
3028
{
31-
WpfMap.BackgroundLayer = new SharpMap.Layers.TileAsyncLayer(
32-
new BruTile.Web.OsmTileSource(), "OSM");
29+
WpfMap.BackgroundLayer = new SharpMap.Layers.TileAsyncLayer(BruTile.Predefined.KnownTileSources.Create(), "OSM");
3330

3431
foreach (var menuItem in Menu.Items.OfType<MenuItem>())
3532
{
@@ -44,7 +41,8 @@ private void BgOSM_OnClick(object sender, RoutedEventArgs e)
4441
private void BgMapQuest_Click(object sender, RoutedEventArgs e)
4542
{
4643
WpfMap.BackgroundLayer = new SharpMap.Layers.TileAsyncLayer(
47-
KnownTileSources.Create(KnownTileSource.MapQuestAerial), "MapQuest");
44+
BruTile.Predefined.KnownTileSources.Create(
45+
BruTile.Predefined.KnownTileSource.MapQuestAerial), "MapQuest");
4846

4947
foreach (var menuItem in Menu.Items.OfType<MenuItem>())
5048
{
@@ -59,7 +57,7 @@ private void BgMapQuest_Click(object sender, RoutedEventArgs e)
5957
private void AddShapeLayer_OnClick(object sender, RoutedEventArgs e)
6058
{
6159
var ofd = new OpenFileDialog();
62-
ofd.Filter = "Shapefiles (*.shp)|*.shp";
60+
ofd.Filter = @"Shapefiles (*.shp)|*.shp";
6361
if (ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
6462
{
6563
var ds = new SharpMap.Data.Providers.ShapeFile(ofd.FileName);

‎SharpMap.Layers.BruTile/Utilities/Web/BingRequestSurrogate.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
// Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
2+
3+
using System;
24
using System.Runtime.Serialization;
35

46
namespace BruTile.Web
57
{
8+
[Obsolete]
69
internal class BingRequestSurrogate : ISerializationSurrogate
710
{
811
#region Implementation of ISerializationSurrogate

‎SharpMap.Layers.BruTile/Utilities/Web/OsmRequestSurrogate.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace BruTile.Web
77
{
8+
[Obsolete]
89
internal class OsmRequestSurrogate : ISerializationSurrogate
910
{
1011
#region Implementation of ISerializationSurrogate
@@ -24,6 +25,7 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
2425
#endregion
2526
}
2627

28+
[Obsolete]
2729
public class OsmTileServerConfigSurrogate : ISerializationSurrogate
2830
{
2931
#region Implementation of ISerializationSurrogate

‎SharpMap.Layers.BruTile/Utilities/Web/TmsRequestSurrogate.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ internal class TmsRequestSurrogate : ISerializationSurrogate
1010

1111
public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
1212
{
13-
info.AddValue("baseUrl", Utility.GetFieldValue(obj, "_baseUrl", Utility.PrivateInstance, BingRequest.UrlBingStaging));
13+
info.AddValue("baseUrl", Utility.GetFieldValue<string>(obj, "_baseUrl"));
1414
Utility.GetDictionary(Utility.GetFieldValue(obj, "_baseUrls", Utility.PrivateInstance, (IDictionary<string, System.Uri>)null), info, context, "baseUrls");
15-
info.AddValue("imageFormat", Utility.GetFieldValue(obj, "_imageFormat", Utility.PrivateInstance, BingRequest.UrlBingStaging));
15+
info.AddValue("imageFormat", Utility.GetFieldValue(obj, "_imageFormat", Utility.PrivateInstance, "png"));
1616
Utility.GetDictionary(Utility.GetFieldValue(obj, "_customParameters", Utility.PrivateInstance, (IDictionary<string, string>)null), info, context, "baseUrls");
1717
Utility.GetList(Utility.GetFieldValue(obj, "_serverNodes", Utility.PrivateInstance, (IList<string>)null), info, context, "baseUrls");
1818
}
@@ -29,7 +29,7 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
2929
Utility.SetList<string>(info, context,"serverNodes"));
3030
//Not serialized, but nonethelesss needed.
3131
Utility.SetFieldValue(ref obj, "_random", Utility.PrivateInstance, new System.Random());
32-
return obj;
32+
return null;
3333
}
3434

3535
#endregion

‎SharpMap.Serialization/MapSerialization.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ public static Map LoadMapFromStream(Stream s)
6666
BruTile.Predefined.KnownTileSource kts;
6767
if (!Enum.TryParse(ol.KnownTileSource, out kts))
6868
kts = BruTile.Predefined.KnownTileSource.OpenStreetMap;
69-
lay = new Layers.TileLayer(BruTile.Predefined.KnownTileSources.Create(kts, ol.ApiKey), l.Name);
69+
if (ol.Async)
70+
lay = new Layers.TileAsyncLayer(BruTile.Predefined.KnownTileSources.Create(kts, ol.ApiKey), l.Name);
71+
else
72+
lay = new Layers.TileLayer(BruTile.Predefined.KnownTileSources.Create(kts, ol.ApiKey), l.Name);
7073
}
7174
/*
7275
else if (l is GoogleLayer)

‎SharpMap.Serialization/SharpMapSerializationClasses.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ public class OsmLayer : MapLayer
103103
public string KnownTileSource { get; set; }
104104

105105
public string ApiKey { get; set; }
106+
107+
public bool Async { get; set; }
106108
}
107109

108110
/*

‎UnitTests/Layers/TileLayerIssues.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public void TestIncompleteImage()
2626
{
2727
map.BackColor = Color.Magenta;
2828
var fc = new BruTile.Cache.FileCache(System.IO.Path.Combine(_fileCacheRoot, "BingStaging"), "png");
29-
var bts = KnownTileSources.Create(KnownTileSource.BingHybridStaging,null, fc);
30-
var tl = new TileLayer(bts, "TileLayer - " + BingMapType.Hybrid.ToString(), Color.Transparent, true);
29+
var bts = KnownTileSources.Create(KnownTileSource.BingHybridStaging, null, fc);
30+
var tl = new TileLayer(bts, "TileLayer - " + KnownTileSource.BingHybridStaging, Color.Transparent, true);
3131

3232
map.Layers.Add(tl);
3333

0 commit comments

Comments
 (0)