Skip to content

Commit 2ecd2fd

Browse files
arnaudleclercarnaudleclerc
committed
Adapt samples
1 parent fadd381 commit 2ecd2fd

7 files changed

Lines changed: 105 additions & 67 deletions

File tree

‎samples/AzureMapsControl.Sample/Pages/Layers/HeatmapLayerOnReady.razor‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,28 @@
66
StyleOptions="StyleOptions"
77
EventActivationFlags="MapEventActivationFlags
88
.None()
9-
.Enable(MapEventType.Ready)"
10-
OnReady="OnMapReady" />
9+
.Enable(MapEventType.Ready, MapEventType.SourceAdded)"
10+
OnReady="OnMapReady"
11+
OnSourceAdded="OnDatasourceAdded"/>
1112

1213
@code {
1314

15+
private readonly string _datasourceId = "heatmapDataSource";
16+
1417
public StyleOptions StyleOptions = new StyleOptions
1518
{
1619
Style = MapStyle.GrayscaleDark
1720
};
1821

19-
public async Task OnMapReady(MapEventArgs events)
22+
public async Task OnMapReady(MapEventArgs eventArgs)
2023
{
21-
const string dataSourceId = "heatmapDataSource";
22-
var dataSource = new AzureMapsControl.Components.Data.DataSource(dataSourceId);
23-
await events.Map.AddSourceAsync(dataSource);
24+
var dataSource = new AzureMapsControl.Components.Data.DataSource(_datasourceId);
25+
await eventArgs.Map.AddSourceAsync(dataSource);
2426
await dataSource.ImportDataFromUrlAsync("https://services1.arcgis.com/0MSEUqKaxRlEPj5g/arcgis/rest/services/ncov_cases/FeatureServer/1/query?where=1%3D1&f=geojson&outFields=*");
27+
}
2528

29+
public async Task OnDatasourceAdded(MapSourceEventArgs eventArgs)
30+
{
2631
var weightExpressionJsonString = "[\"get\", \"Confirmed\"]";
2732

2833
var layer = new AzureMapsControl.Components.Layers.HeatmapLayer
@@ -31,10 +36,10 @@
3136
{
3237
Weight = new Components.Atlas.ExpressionOrNumber(System.Text.Json.JsonDocument.Parse(weightExpressionJsonString)),
3338
Radius = new Components.Atlas.ExpressionOrNumber(20),
34-
Source = dataSourceId
39+
Source = _datasourceId
3540
}
3641
};
3742

38-
await events.Map.AddLayerAsync(layer);
43+
await eventArgs.Map.AddLayerAsync(layer);
3944
}
4045
}

‎samples/AzureMapsControl.Sample/Pages/Layers/LineLayerOnReady.razor‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,30 @@
66
StyleOptions="StyleOptions"
77
EventActivationFlags="MapEventActivationFlags
88
.None()
9-
.Enable(MapEventType.Ready)"
10-
OnReady="OnMapReady" />
9+
.Enable(MapEventType.Ready, MapEventType.SourceAdded)"
10+
OnReady="OnMapReady"
11+
OnSourceAdded="OnDatasourceAdded"/>
1112

1213
@code {
1314

15+
private readonly string _dataSourceId = "dataSource";
16+
17+
1418
public StyleOptions StyleOptions = new StyleOptions
1519
{
1620
Style = MapStyle.GrayscaleDark
1721
};
1822

19-
public async Task OnMapReady(MapEventArgs events)
23+
public async Task OnMapReady(MapEventArgs eventArgs)
2024
{
21-
const string dataSourceId = "dataSource";
22-
var dataSource = new AzureMapsControl.Components.Data.DataSource(dataSourceId)
25+
var dataSource = new AzureMapsControl.Components.Data.DataSource(_dataSourceId)
2326
{
2427
Options = new Components.Data.DataSourceOptions
2528
{
2629
LineMetrics = true
2730
}
2831
};
29-
await events.Map.AddSourceAsync(dataSource);
32+
await eventArgs.Map.AddSourceAsync(dataSource);
3033

3134
await dataSource.AddAsync(new AzureMapsControl.Components.Atlas.Shape<AzureMapsControl.Components.Atlas.LineString>(
3235
new AzureMapsControl.Components.Atlas.LineString(new[] {
@@ -46,6 +49,7 @@
4649
{
4750
{ "Color", "#00FF00" }
4851
}));
52+
4953
await dataSource.AddAsync(new AzureMapsControl.Components.Atlas.Shape<AzureMapsControl.Components.Atlas.LineString>(
5054
new AzureMapsControl.Components.Atlas.LineString(new[] {
5155
new AzureMapsControl.Components.Atlas.Position(11.585458, 48.145596),
@@ -63,12 +67,15 @@
6367
{
6468
{ "Color", "#FF0000" }
6569
}));
70+
}
6671

72+
public async Task OnDatasourceAdded(MapSourceEventArgs eventArgs)
73+
{
6774
var layer = new AzureMapsControl.Components.Layers.LineLayer
6875
{
6976
Options = new AzureMapsControl.Components.Layers.LineLayerOptions
7077
{
71-
Source = dataSourceId,
78+
Source = _dataSourceId,
7279
StrokeWidth = new AzureMapsControl.Components.Atlas.ExpressionOrNumber(6),
7380
StrokeColor = new AzureMapsControl.Components.Atlas.ExpressionOrString(
7481
new AzureMapsControl.Components.Atlas.Expression[]
@@ -79,6 +86,6 @@
7986
}
8087
};
8188

82-
await events.Map.AddLayerAsync(layer);
89+
await eventArgs.Map.AddLayerAsync(layer);
8390
}
8491
}

‎samples/AzureMapsControl.Sample/Pages/Layers/PolygonExtrusionLayerOnReady.razor‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,32 @@
55
CameraOptions="new CameraOptions { Center = new Components.Atlas.Position(11.581990, 48.143534), Zoom = 4, Pitch = 45 }"
66
EventActivationFlags="MapEventActivationFlags
77
.None()
8-
.Enable(MapEventType.Ready)"
9-
OnReady="OnMapReady" />
8+
.Enable(MapEventType.Ready, MapEventType.SourceAdded)"
9+
OnReady="OnMapReady"
10+
OnSourceAdded="OnDatasourceAdded"/>
1011

1112
@code {
12-
public async Task OnMapReady(MapEventArgs events)
13+
14+
private readonly string _datasourceId = "dataSource";
15+
16+
public async Task OnMapReady(MapEventArgs eventArgs)
1317
{
14-
const string dataSourceId = "dataSource";
15-
var dataSource = new AzureMapsControl.Components.Data.DataSource(dataSourceId);
16-
await events.Map.AddSourceAsync(dataSource);
18+
var dataSource = new AzureMapsControl.Components.Data.DataSource(_datasourceId);
19+
await eventArgs.Map.AddSourceAsync(dataSource);
1720

1821
await dataSource.ImportDataFromUrlAsync("https://raw.githubusercontent.com/arnaudleclerc/ng-azure-maps/main/assets/data/countries.geojson.json");
22+
}
1923

24+
public async Task OnDatasourceAdded(MapSourceEventArgs eventArgs)
25+
{
2026
var fillColorExpressionJsonString = "[\"step\", [\"get\", \"DENSITY\"], \"#00ff80\", 10, \"#09e076\", 20, \"#0bbf67\", 50, \"#f7e305\", 100, \"#f7c707\", 200, \"#f78205\", 500, \"#f75e05\", 1000, \"#f72505\", 10000, \"#6b0a05\"]";
2127
var heightExpressionJsonString = "[\"interpolate\", [\"linear\"], [\"get\", \"DENSITY\"], 0, 100, 1200, 960000]";
2228

2329
var layer = new AzureMapsControl.Components.Layers.PolygonExtrusionLayer
2430
{
2531
Options = new Components.Layers.PolygonExtrusionLayerOptions
2632
{
27-
Source = dataSourceId,
33+
Source = _datasourceId,
2834
Base = new Components.Atlas.ExpressionOrNumber(100),
2935
FillColor = new Components.Atlas.ExpressionOrString(System.Text.Json.JsonDocument.Parse(fillColorExpressionJsonString)),
3036
FillOpacity = 0.7,
@@ -33,6 +39,6 @@
3339
};
3440

3541

36-
await events.Map.AddLayerAsync(layer, "labels");
42+
await eventArgs.Map.AddLayerAsync(layer, "labels");
3743
}
3844
}

‎samples/AzureMapsControl.Sample/Pages/Layers/PolygonLayerOnReady.razor‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,41 @@
55
CameraOptions="new CameraOptions { Zoom = 2 }"
66
EventActivationFlags="MapEventActivationFlags
77
.None()
8-
.Enable(MapEventType.Ready)"
9-
OnReady="OnMapReady" />
8+
.Enable(MapEventType.Ready, MapEventType.SourceAdded)"
9+
OnReady="OnMapReady"
10+
OnSourceAdded="OnDatasourceAdded"/>
1011

1112
@code {
12-
public async Task OnMapReady(MapEventArgs events)
13+
14+
private readonly string _dataSourceId = "dataSource";
15+
16+
public async Task OnMapReady(MapEventArgs eventArgs)
1317
{
14-
const string dataSourceId = "dataSource";
15-
var dataSource = new AzureMapsControl.Components.Data.DataSource(dataSourceId);
16-
await events.Map.AddSourceAsync(dataSource);
18+
var dataSource = new AzureMapsControl.Components.Data.DataSource(_dataSourceId);
19+
await eventArgs.Map.AddSourceAsync(dataSource);
1720

1821
var polygon = new AzureMapsControl.Components.Atlas.Polygon(new[]
1922
{
20-
new []
23+
new []
2124
{
22-
new AzureMapsControl.Components.Atlas.Position(-50, -20),
23-
new AzureMapsControl.Components.Atlas.Position(0, 40),
24-
new AzureMapsControl.Components.Atlas.Position(50, -20),
25-
new AzureMapsControl.Components.Atlas.Position(-50, -20),
26-
}
25+
new AzureMapsControl.Components.Atlas.Position(-50, -20),
26+
new AzureMapsControl.Components.Atlas.Position(0, 40),
27+
new AzureMapsControl.Components.Atlas.Position(50, -20),
28+
new AzureMapsControl.Components.Atlas.Position(-50, -20),
29+
}
2730
});
2831

2932
await dataSource.AddAsync(new AzureMapsControl.Components.Atlas.Shape<AzureMapsControl.Components.Atlas.Polygon>(polygon));
33+
}
3034

35+
public async Task OnDatasourceAdded(MapEventArgs sourceEventArgs)
36+
{
3137
var layer = new AzureMapsControl.Components.Layers.PolygonLayer
3238
{
3339
EventActivationFlags = Components.Layers.LayerEventActivationFlags.None().Enable(Components.Layers.LayerEventType.Click),
3440
Options = new Components.Layers.PolygonLayerOptions
3541
{
36-
Source = dataSourceId,
42+
Source = _dataSourceId,
3743
FillOpacity = new Components.Atlas.ExpressionOrNumber(0.5),
3844
FillColor = new Components.Atlas.ExpressionOrString("#1a73aa")
3945
}
@@ -74,6 +80,6 @@
7480
}
7581
};
7682

77-
await events.Map.AddLayerAsync(layer);
83+
await sourceEventArgs.Map.AddLayerAsync(layer);
7884
}
7985
}

‎samples/AzureMapsControl.Sample/Pages/Layers/SymbolLayerOnReady.razor‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@
55
CameraOptions="new CameraOptions { Zoom = 2 }"
66
EventActivationFlags="MapEventActivationFlags
77
.None()
8-
.Enable(MapEventType.Ready)"
9-
OnReady="OnMapReady" />
8+
.Enable(MapEventType.Ready, MapEventType.SourceAdded)"
9+
OnReady="OnMapReady"
10+
OnSourceAdded="OnDatasourceAdded"/>
1011

1112
@code {
13+
14+
private readonly string _blueDatasourceId = "blueDatasource";
15+
private readonly string _redDatasourceId = "redDatasource";
16+
1217
public async Task OnMapReady(MapEventArgs events)
1318
{
14-
var blueDataSource = new AzureMapsControl.Components.Data.DataSource("blueDataSource");
19+
var blueDataSource = new AzureMapsControl.Components.Data.DataSource(_blueDatasourceId);
1520
await events.Map.AddSourceAsync(blueDataSource);
1621

17-
var redDataSource = new AzureMapsControl.Components.Data.DataSource("redDataSource");
22+
var redDataSource = new AzureMapsControl.Components.Data.DataSource(_redDatasourceId);
1823
await events.Map.AddSourceAsync(redDataSource);
1924

2025
var bluePoints = new List<AzureMapsControl.Components.Atlas.Shape>();
@@ -28,28 +33,26 @@
2833

2934
await blueDataSource.AddAsync(bluePoints);
3035
await redDataSource.AddAsync(redPoints);
36+
}
3137

32-
var blueLayer = new AzureMapsControl.Components.Layers.SymbolLayer
38+
public async Task OnDatasourceAdded(MapSourceEventArgs eventArgs)
39+
{
40+
var layer = new AzureMapsControl.Components.Layers.SymbolLayer
3341
{
3442
Options = new Components.Layers.SymbolLayerOptions
3543
{
36-
Source = "blueDataSource"
44+
Source = eventArgs.Source.Id
3745
}
3846
};
3947

40-
var redLayer = new AzureMapsControl.Components.Layers.SymbolLayer
48+
if (eventArgs.Source.Id == _redDatasourceId)
4149
{
42-
Options = new Components.Layers.SymbolLayerOptions
50+
layer.Options.IconOptions = new Components.Layers.IconOptions
4351
{
44-
Source = "redDataSource",
45-
IconOptions = new Components.Layers.IconOptions
46-
{
47-
Image = new Components.Atlas.ExpressionOrString("pin-red")
48-
}
49-
}
50-
};
52+
Image = new Components.Atlas.ExpressionOrString("pin-red")
53+
};
54+
}
5155

52-
await events.Map.AddLayerAsync(blueLayer);
53-
await events.Map.AddLayerAsync(redLayer);
56+
await eventArgs.Map.AddLayerAsync(layer);
5457
}
5558
}

‎samples/AzureMapsControl.Sample/Pages/Layers/SymbolLayerWithFeatures.razor‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
CameraOptions="new CameraOptions { Zoom = 16, Center = new Components.Atlas.Position(-122.13284, 47.63699) }"
66
EventActivationFlags="MapEventActivationFlags
77
.None()
8-
.Enable(MapEventType.Ready, MapEventType.Click)"
9-
OnReady="OnMapReady" />
8+
.Enable(MapEventType.Ready, MapEventType.Click, MapEventType.SourceAdded)"
9+
OnReady="OnMapReady"
10+
OnSourceAdded="OnDatasourceAdded"/>
1011
@code {
12+
13+
private readonly string _datasourceId = "datasourceId";
14+
1115
public async Task OnMapReady(MapEventArgs eventArgs)
1216
{
13-
var datasourceId = "datasourceId";
14-
var datasource = new AzureMapsControl.Components.Data.DataSource(datasourceId);
17+
var datasource = new AzureMapsControl.Components.Data.DataSource(_datasourceId);
1518
await eventArgs.Map.AddSourceAsync(datasource);
1619

1720
var feature = new AzureMapsControl.Components.Atlas.Feature<AzureMapsControl.Components.Atlas.Point>(new AzureMapsControl.Components.Atlas.Point(
@@ -22,14 +25,17 @@
2225
});
2326

2427
await datasource.AddAsync(feature);
28+
}
2529

30+
public async Task OnDatasourceAdded(MapSourceEventArgs sourceEventArgs)
31+
{
2632
var textFieldExpressionJsonString = "[\"format\", [\"get\", \"title\"], {\"text-font\": [\"literal\", [\"StandardFont-Bold\"]], \"font-scale\": 1.25}, \"\\n\", {}, [\"get\", \"subtitle\"], {\"font-scale\": 0.75}]";
2733

2834
var layer = new AzureMapsControl.Components.Layers.SymbolLayer
2935
{
3036
Options = new Components.Layers.SymbolLayerOptions
3137
{
32-
Source = datasourceId,
38+
Source = _datasourceId,
3339
TextOptions = new Components.Layers.TextOptions
3440
{
3541
TextField = new Components.Atlas.ExpressionOrString(
@@ -63,6 +69,6 @@
6369
}
6470
};
6571

66-
await eventArgs.Map.AddLayerAsync(layer);
72+
await sourceEventArgs.Map.AddLayerAsync(layer);
6773
}
6874
}

0 commit comments

Comments
 (0)