RE1-T115 POI Bug fixes

Providers/Resgrid.Providers.Geo/KmlProvider.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using Resgrid.Model;
 using Resgrid.Model.Providers;
 using SharpKml.Dom;
@@ -15,38 +16,143 @@ public List<Coordinates> ImportFile(Stream input, bool isKmz)
  {
  var coordinates = new List<Coordinates>();
 
+ if (input == null)
+ return coordinates;
+
  try
  {
  KmlFile file;
  if (isKmz)
  {
  var kmz = KmzFile.Open(input);
- file = kmz.GetDefaultKmlFile();
+ file = kmz?.GetDefaultKmlFile();
  }
  else
  file = KmlFile.Load(input);
 
-
- Kml kml = file.Root as Kml;
- if (kml != null)
+ if (file?.Root is Kml kml)
  {
- foreach (var placemark in kml.Flatten().OfType<Placemark>())
- {
- var coords = new Coordinates();
- coords.Name = placemark.Name;
- coords.Latitude = placemark.CalculateBounds().Center.Latitude;
- coords.Longitude = placemark.CalculateBounds().Center.Longitude;
+ ExtractCoordinates(kml, coordinates);
 
- coordinates.Add(coords);
+ // Resolve NetworkLinks to external KML/KMZ resources
+ var networkLinks = kml.Flatten().OfType<NetworkLink>().ToList();
+ foreach (var networkLink in networkLinks)
+ {
+ try
+ {
+ ResolveNetworkLink(networkLink, coordinates);
+ }
+ catch
+ {
+ // Skip failed network link resolution
+ }
  }
  }
  }
- catch
+ catch (Exception ex)
  {
-
+System.Diagnostics.Debug.WriteLine($"KmlProvider.ImportFile error: {ex.Message}");
  }
-
+
  return coordinates;
  }
+
+ private static void ExtractCoordinates(Kml kml, List<Coordinates> coordinates)
+ {
+ foreach (var placemark in kml.Flatten().OfType<Placemark>())
+ {
+ var coords = new Coordinates();
+ coords.Name = placemark.Name;
+
+ try
+ {
+ var bounds = placemark.CalculateBounds();
+ if (bounds != null)
+ {
+ coords.Latitude = bounds.Center.Latitude;
+ coords.Longitude = bounds.Center.Longitude;
+ }
+ }
+ catch
+ {
+ // Skip placemarks that fail bounds calculation
+ }
+
+ if (coords.Latitude.HasValue && coords.Longitude.HasValue)
+ coordinates.Add(coords);
+ }
+ }
+
+ private static void ResolveNetworkLink(NetworkLink networkLink, List<Coordinates> coordinates)
+ {
+ if (networkLink?.Link?.Href == null)
+ return;
+
+ var href = networkLink.Link.Href.OriginalString;
+ if (string.IsNullOrWhiteSpace(href))
+ return;
+
+ // Step 1: URI-based detection — check AbsolutePath for .kmz/.kml suffix
+ bool? isKmzFromUri = null;
+ if (Uri.TryCreate(href, UriKind.Absolute, out Uri uri))
+ {
+ var path = uri.AbsolutePath;
+ if (path.EndsWith(".kmz", StringComparison.OrdinalIgnoreCase))
+ isKmzFromUri = true;
+ else if (path.EndsWith(".kml", StringComparison.OrdinalIgnoreCase))
+ isKmzFromUri = false;
+ }
+
+ using (var httpClient = new HttpClient { Timeout = System.TimeSpan.FromSeconds(30) })
+ using (var response = httpClient.GetAsync(href).GetAwaiter().GetResult())
+ {
+ if (!response.IsSuccessStatusCode)
+ return;
+
+ // Step 2: Content-Type detection — fallback when URI is inconclusive
+ bool? isKmzFromContentType = null;
+ var contentType = response.Content.Headers.ContentType?.MediaType;
+ if (string.Equals(contentType, "application/vnd.google-earth.kmz", StringComparison.OrdinalIgnoreCase))
+ isKmzFromContentType = true;
+ else if (string.Equals(contentType, "application/vnd.google-earth.kml+xml", StringComparison.OrdinalIgnoreCase))
+ isKmzFromContentType = false;
+
+ // Download into memory so we can peek bytes and re-read for parsing
+ var contentBytes = response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
+
+ // Step 3: ZIP magic-byte detection — final fallback
+ bool? isKmzFromMagic = null;
+ if (contentBytes.Length >= 4)
+ {
+ // PK\x03\x04 is the ZIP magic number
+ isKmzFromMagic = contentBytes[0] == 0x50 && contentBytes[1] == 0x4B
+ && contentBytes[2] == 0x03 && contentBytes[3] == 0x04;
+ }
+
+ // Precedence: URI suffix > Content-Type header > magic bytes; default to false
+ bool isKmz = isKmzFromUri ?? isKmzFromContentType ?? isKmzFromMagic ?? false;
+
+ using (var ms = new MemoryStream(contentBytes))
+ {
+ KmlFile file;
+ if (isKmz)
+ {
+ var kmz = KmzFile.Open(ms);
+ file = kmz?.GetDefaultKmlFile();
+ if (file == null)
+ return;
+ }
+ else
+ {
+ file = KmlFile.Load(ms);
+ }
+
+ if (file?.Root is Kml kml)
+ {
+ ExtractCoordinates(kml, coordinates);
+ }
+ }
+ }
+ }
 	}
 }

Web/Resgrid.Web.Services/Controllers/v4/MappingController.cs

@@ -469,7 +469,8 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()
  PoiTypeId = poiType.PoiTypeId,
  Name = poiType.Name,
  Color = poiType.Color,
- ImagePath = poiType.Image,
+ ImagePath = null,
+ PoiImage = poiType.Image,
  Marker = poiType.Marker,
  IsDestination = poiType.IsDestination
  });
@@ -630,7 +631,8 @@ public static PoiTypeResultData ConvertPoiTypeData(PoiType poiType)
  PoiTypeId = poiType.PoiTypeId,
  Name = poiType.Name,
  Color = poiType.Color,
- ImagePath = poiType.Image,
+ ImagePath = null,
+ PoiImage = poiType.Image,
  Marker = poiType.Marker,
  IsDestination = poiType.IsDestination
  };
@@ -649,7 +651,8 @@ public static PoiResultData ConvertPoiData(Poi poi, PoiType poiType)
  Latitude = poi.Latitude,
  Longitude = poi.Longitude,
  Color = poiType.Color,
- ImagePath = poiType.Image,
+ ImagePath = null,
+ PoiImage = poiType.Image,
  Marker = poiType.Marker,
  IsDestination = poiType.IsDestination
  };
@@ -664,7 +667,8 @@ private static MapMakerInfoData ConvertPoiMapMarker(Poi poi, PoiType poiType)
  Latitude = poi.Latitude,
  Title = GetPoiTitle(poi, poiType),
  InfoWindowContent = GetPoiInfoWindowContent(poi, poiType),
- ImagePath = poiType.Image,
+ ImagePath = null,
+ PoiImage = poiType.Image,
  Marker = poiType.Marker,
  Color = poiType.Color,
  Type = 4,

Web/Resgrid.Web.Services/Models/v4/Mapping/GetMapDataResult.cs

@@ -51,6 +51,13 @@ public class MapMakerInfoData
  public string Note { get; set; }
  public string LayerId { get; set; }
  public string LayerName { get; set; }
+
+ /// <summary>
+ /// The POI-specific custom icon image name (only set for POI markers, Type=4).
+ /// New app versions should use this field instead of ImagePath for POI icons.
+ /// ImagePath is set to null for POI markers so old apps fall back to their default icon.
+ /// </summary>
+ public string PoiImage { get; set; }
 	}
 
 	public class PoiLayerData
@@ -61,5 +68,12 @@ public class PoiLayerData
  public string ImagePath { get; set; }
  public string Marker { get; set; }
  public bool IsDestination { get; set; }
+
+ /// <summary>
+ /// The POI-specific custom icon image name.
+ /// New app versions should use this field for POI type icons.
+ /// ImagePath is set to null so old apps fall back to their default icon.
+ /// </summary>
+ public string PoiImage { get; set; }
 	}
 }

Web/Resgrid.Web.Services/Models/v4/Mapping/PoiResultModels.cs

@@ -10,6 +10,13 @@ public class PoiTypeResultData
  public string ImagePath { get; set; }
  public string Marker { get; set; }
  public bool IsDestination { get; set; }
+
+ /// <summary>
+ /// The POI-specific custom icon image name.
+ /// New app versions should use this field for POI type icons.
+ /// ImagePath is set to null so old apps fall back to their default icon.
+ /// </summary>
+ public string PoiImage { get; set; }
 	}
 
 	public class PoiResultData
@@ -26,6 +33,13 @@ public class PoiResultData
  public string ImagePath { get; set; }
  public string Marker { get; set; }
  public bool IsDestination { get; set; }
+
+ /// <summary>
+ /// The POI-specific custom icon image name.
+ /// New app versions should use this field for POI icons.
+ /// ImagePath is set to null so old apps fall back to their default icon.
+ /// </summary>
+ public string PoiImage { get; set; }
 	}
 
 	public class PoiTypesResult : StandardApiResponseV4Base

Web/Resgrid.Web/Areas/User/Controllers/MappingController.cs

@@ -289,6 +289,8 @@ public async Task<IActionResult> POIs()
  {
  var modal = new POIsView();
  modal.Types = await _mappingService.GetPOITypesForDepartmentAsync(DepartmentId);
+ modal.Message = TempData["ImportPOIsMessage"] as string;
+ modal.ErrorMessage = TempData["ImportPOIsError"] as string;
 
  return View(modal);
  }
@@ -305,37 +307,41 @@ public async Task<IActionResult> AddPOIType()
  }
 
  [HttpGet]
- public async Task<IActionResult> ImportPOIs()
+ public async Task<IActionResult> ImportPOIs(int poiTypeId)
  {
  var model = new ImportPOIsView();
+ model.TypeId = poiTypeId;
 
  return View(model);
  }
 
  [HttpPost]
+ [ValidateAntiForgeryToken]
  public async Task<IActionResult> ImportPOIs(ImportPOIsView modal, IFormFile fileToUpload, CancellationToken cancellationToken)
  {
- if (fileToUpload != null && fileToUpload.Length > 0)
+ if (fileToUpload == null || fileToUpload.Length == 0)
  {
- //Path.GetExtension(file.FileName).ToLower() == "kmz"
-
- //var extenion = file.FileName.Substring(file.FileName.IndexOf(char.Parse(".")) + 1, file.FileName.Length - file.FileName.IndexOf(char.Parse(".")) - 1);
- var extenion = Path.GetExtension(fileToUpload.FileName).ToLower();
-
- if (!String.IsNullOrWhiteSpace(extenion))
- extenion = extenion.ToLower();
+ ModelState.AddModelError("fileToUpload", "Please select a file to upload.");
+ }
+ else
+ {
+ var extension = Path.GetExtension(fileToUpload.FileName).ToLower();
 
- if (extenion != ".kml" && extenion != ".kmz")
- ModelState.AddModelError("fileToUpload", string.Format("File type ({0}) is not a KMZ or KML extension to import POIs.", extenion));
+ if (extension != ".kml" && extension != ".kmz")
+ ModelState.AddModelError("fileToUpload", string.Format("File type ({0}) is not a KMZ or KML extension to import POIs.", extension));
 
  if (fileToUpload.Length > 10000000)
  ModelState.AddModelError("fileToUpload", "Document is too large, must be smaller then 10MB.");
  }
 
+ if (modal.TypeId <= 0)
+ ModelState.AddModelError("TypeId", "Please select a POI type before importing.");
+
  if (ModelState.IsValid)
  {
  var coordinates = _kmlProvider.ImportFile(fileToUpload.OpenReadStream(), Path.GetExtension(fileToUpload.FileName).ToLower() == ".kmz");
 
+ int importedCount = 0;
  foreach (var coordinate in coordinates)
  {
  var poi = new Poi();
@@ -348,9 +354,15 @@ public async Task<IActionResult> ImportPOIs(ImportPOIsView modal, IFormFile file
  poi.Longitude = coordinate.Longitude.Value;
 
  await _mappingService.SavePOIAsync(poi, cancellationToken);
+ importedCount++;
  }
  }
 
+ if (importedCount > 0)
+ TempData["ImportPOIsMessage"] = string.Format("Successfully imported {0} POI(s).", importedCount);
+ else
+ TempData["ImportPOIsError"] = "No valid placemarks with coordinates could be found in the uploaded file.";
+
  return RedirectToAction("POIs");
  }
 

Web/Resgrid.Web/Areas/User/Models/Mapping/POIsView.cs

@@ -6,6 +6,8 @@ namespace Resgrid.Web.Areas.User.Models.Mapping
 	public class POIsView
 	{
  public List<PoiType> Types { get; set; }
+ public string Message { get; set; }
+ public string ErrorMessage { get; set; }
 
  public POIsView()
  {