Skip to content

Use pmad-symbol-selector for Orbat and allow any icon set #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jetelain merged 3 commits into from
Feb 28, 2025
Merged

Use pmad-symbol-selector for Orbat and allow any icon set #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbdc324
Use pmad-symbol-selector for Orbat and allow any icon set
jetelain Feb 25, 2025
962e42b
Use UniqueDesignation for preview + Enforce std id and status
jetelain Feb 25, 2025
041e869
Fix link to unit
jetelain Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Arma3TacMapWebApp/Arma3TacMapWebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
<PackageReference Include="Pmad.Milsymbol.AspNetCore" Version="0.1.38" />
<PackageReference Include="Pmad.Milsymbol.Png" Version="0.1.38" />
<PackageReference Include="Pmad.Milsymbol.AspNetCore" Version="0.1.50" />
<PackageReference Include="Pmad.Milsymbol.Png" Version="0.1.50" />
<PackageReference Include="PuppeteerSharp" Version="20.0.5" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />

Expand Down
26 changes: 23 additions & 3 deletions Arma3TacMapWebApp/Controllers/OrbatUnitsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Arma3TacMapWebApp.Entities;
using Arma3TacMapWebApp.Maps;
using Microsoft.AspNetCore.Authorization;
using Pmad.Milsymbol.AspNetCore.Services;

namespace Arma3TacMapWebApp.Controllers
{
Expand All @@ -17,12 +18,14 @@ public class OrbatUnitsController : Controller
private readonly Arma3TacMapContext _context;
private readonly MapService _mapSvc;
private readonly IAuthorizationService _authorizationService;
private readonly IApp6dSymbolGenerator _app6DSymbolGenerator;

public OrbatUnitsController(Arma3TacMapContext context, MapService mapSvc, IAuthorizationService authorizationService)
public OrbatUnitsController(Arma3TacMapContext context, MapService mapSvc, IAuthorizationService authorizationService, IApp6dSymbolGenerator app6DSymbolGenerator)
{
_context = context;
_mapSvc = mapSvc;
_authorizationService = authorizationService;
_app6DSymbolGenerator = app6DSymbolGenerator;
}

private async Task<bool> IsEditAllowed(Orbat orbat)
Expand Down Expand Up @@ -67,7 +70,7 @@ public async Task<IActionResult> Create(int orbatID)
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,NatoSymbolIcon,NatoSymbolMod1,NatoSymbolMod2,NatoSymbolSize,NatoSymbolHQ,NatoSymbolFriendlyImageBase64,NatoSymbolHostileImageBase64,NatoSymbolHostileAssumedImageBase64,Position")] OrbatUnit orbatUnit)
public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,FriendSidc,Position")] OrbatUnit orbatUnit)
{
orbatUnit.Orbat = await _context.Orbats.FindAsync(orbatUnit.OrbatID);
if (orbatUnit.Orbat == null)
Expand All @@ -81,6 +84,7 @@ public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUn
if (ModelState.IsValid)
{
orbatUnit.Trigram = await GetTrigam(orbatUnit.OrbatID);
await PrecomputeSvgImages(orbatUnit);
_context.Add(orbatUnit);
await _context.SaveChangesAsync();
return RedirectToAction(nameof(OrbatsController.Details), "Orbats", new { id = orbatUnit.OrbatID });
Expand All @@ -89,6 +93,21 @@ public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUn
return View(orbatUnit);
}

private async Task PrecomputeSvgImages(OrbatUnit orbatUnit)
{
orbatUnit.NatoSymbolFriendlyImageBase64 = await PrecomputeSvg(orbatUnit.GetNatoSymbol('3'), orbatUnit.UniqueDesignation);
orbatUnit.NatoSymbolHostileImageBase64 = await PrecomputeSvg(orbatUnit.GetNatoSymbol('6'), orbatUnit.UniqueDesignation);
orbatUnit.NatoSymbolHostileAssumedImageBase64 = await PrecomputeSvg(orbatUnit.GetNatoSymbol('6', '1'), orbatUnit.UniqueDesignation);
}

private async Task<string> PrecomputeSvg(string sidc, string? uniqueDesignation)
{
var symbol = await _app6DSymbolGenerator.GenerateAsync(sidc, new Pmad.Milsymbol.Icons.SymbolIconOptions() { UniqueDesignation = uniqueDesignation });
var svg = System.Text.Encoding.UTF8.GetBytes(symbol.Svg);
var b64 = "data:image/svg+xml;base64," + Convert.ToBase64String(svg);
return b64;
}

private async Task<string> GetTrigam(int orbatID)
{
var rnd = new Random();
Expand Down Expand Up @@ -135,7 +154,7 @@ public async Task<IActionResult> Edit(int? id)
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(int id, [Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,NatoSymbolIcon,NatoSymbolMod1,NatoSymbolMod2,NatoSymbolSize,NatoSymbolHQ,NatoSymbolFriendlyImageBase64,NatoSymbolHostileImageBase64,NatoSymbolHostileAssumedImageBase64,Position,Trigram")] OrbatUnit orbatUnit)
public async Task<IActionResult> Edit(int id, [Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,FriendSidc,Position,Trigram")] OrbatUnit orbatUnit)
{
if (id != orbatUnit.OrbatUnitID)
{
Expand All @@ -162,6 +181,7 @@ public async Task<IActionResult> Edit(int id, [Bind("OrbatUnitID,OrbatID,ParentO

if (ModelState.IsValid)
{
await PrecomputeSvgImages(orbatUnit);
try
{
_context.Update(orbatUnit);
Expand Down
5 changes: 3 additions & 2 deletions Arma3TacMapWebApp/Entities/Arma3TacMapContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Arma3TacMapWebApp.Entities;

namespace Arma3TacMapWebApp.Entities
{
Expand Down Expand Up @@ -46,7 +45,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<Orbat>().ToTable(nameof(Orbat));

modelBuilder.Entity<OrbatUnit>().ToTable(nameof(OrbatUnit));
var orbatUnit = modelBuilder.Entity<OrbatUnit>();
orbatUnit.Property(t => t.NatoSymbolSet).HasDefaultValue("10");
orbatUnit.ToTable(nameof(OrbatUnit));

var userApiKey = modelBuilder.Entity<UserApiKey>();
userApiKey.ToTable(nameof(UserApiKey));
Expand Down
36 changes: 34 additions & 2 deletions Arma3TacMapWebApp/Entities/OrbatUnit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Pmad.Milsymbol.App6d;
using Pmad.Milsymbol.AspNetCore.Orbat;

namespace Arma3TacMapWebApp.Entities
Expand All @@ -23,6 +25,9 @@ public class OrbatUnit : IOrbatUnit
[Display(Name = "Unique Designation")]
public string? UniqueDesignation { get; set; }

[Display(Name = "Symbol set")]
public string? NatoSymbolSet { get; set; }

[Display(Name = "Symbol")]
public string? NatoSymbolIcon { get; set; }

Expand All @@ -49,7 +54,7 @@ public class OrbatUnit : IOrbatUnit

public int Position { get; set; }

public string GetNatoSymbol(char c, char e = '0') => "100" + c + "10" + e +
public string GetNatoSymbol(char c, char e = '0') => "100" + c + (NatoSymbolSet ?? "10") + e +
(NatoSymbolHQ ?? string.Empty).PadLeft(1, '0') +
(NatoSymbolSize ?? string.Empty).PadLeft(2, '0') +
(NatoSymbolIcon ?? string.Empty).PadLeft(6, '0') +
Expand All @@ -65,6 +70,33 @@ public string GetNatoSymbol(char c, char e = '0') => "100" + c + "10" + e +
[MaxLength(3)]
public string? Trigram { get; set; }

[NotMapped]
public string FriendSidc
{
get { return GetNatoSymbol('3'); }
set
{
if (App6dSymbolId.TryParse(value, out var symbolId))
{
NatoSymbolHQ = symbolId.HqTfFdCode;
NatoSymbolSize = symbolId.Amplifier;
NatoSymbolIcon = symbolId.Icon;
NatoSymbolMod1 = symbolId.Modifier1;
NatoSymbolMod2 = symbolId.Modifier2;
NatoSymbolSet = symbolId.SymbolSet;
}
else
{
NatoSymbolHQ = "0";
NatoSymbolSize = "00";
NatoSymbolIcon = "000000";
NatoSymbolMod1 = "00";
NatoSymbolMod2 = "00";
NatoSymbolSet = "10";
}
}
}

string IOrbatUnit.Sdic => GetNatoSymbol('3');

string? IOrbatUnit.CommonIdentifier => Name;
Expand Down
Loading
Loading