diff --git a/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs b/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs index 54ba348..0630b3b 100644 --- a/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs +++ b/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs @@ -7,5 +7,6 @@ namespace Manager.Interfaces.DTO public class AgendaDTO { public List resourceIds { get; set; } // All json files for all languages + public MapProvider? mapProvider { get; set; } // Default = Google } } diff --git a/Manager.Interfaces/DTO/SubSection/MapDTO.cs b/Manager.Interfaces/DTO/SubSection/MapDTO.cs index e03a622..27c8369 100644 --- a/Manager.Interfaces/DTO/SubSection/MapDTO.cs +++ b/Manager.Interfaces/DTO/SubSection/MapDTO.cs @@ -8,7 +8,9 @@ namespace Manager.Interfaces.DTO public class MapDTO { public int zoom { get; set; } // Default = 18 - public MapTypeApp? mapType { get; set; } // Default = Hybrid + public MapTypeApp? mapType { get; set; } // Default = Hybrid for Google + public MapTypeMapBox? mapTypeMapbox { get; set; } // Default = standard for MapBox + public MapProvider? mapProvider { get; set; } // Default = Google public List points { get; set; } public string iconResourceId { get; set; } public string iconSource { get; set; } // url to firebase storage or on internet @@ -51,4 +53,21 @@ namespace Manager.Interfaces.DTO terrain, hybrid } + + public enum MapProvider + { + Google, + MapBox + } + + public enum MapTypeMapBox + { + standard, + streets, + outdoors, + light, + dark, + satellite, + satellite_streets + } } diff --git a/Manager.Interfaces/DTO/SubSection/PdfDTO.cs b/Manager.Interfaces/DTO/SubSection/PdfDTO.cs index a68e421..fa3ea3f 100644 --- a/Manager.Interfaces/DTO/SubSection/PdfDTO.cs +++ b/Manager.Interfaces/DTO/SubSection/PdfDTO.cs @@ -6,7 +6,12 @@ namespace Manager.Interfaces.DTO { public class PdfDTO { - public string resourceId { get; set; } // url to resource id - public string resourceUrl { get; set; } // url to resource firebase or on internet => JSON file + public List pdfs { get; set; } + } + + public class PDFFileDTO + { + public List pdfFilesAndTitles { get; set; } + public int? order { get; set; } // Order to show } } diff --git a/ManagerService/Controllers/ConfigurationController.cs b/ManagerService/Controllers/ConfigurationController.cs index 2213008..6dff0a9 100644 --- a/ManagerService/Controllers/ConfigurationController.cs +++ b/ManagerService/Controllers/ConfigurationController.cs @@ -538,9 +538,12 @@ namespace ManagerService.Controllers break; case SectionType.PDF: PdfDTO pdfDTO = JsonConvert.DeserializeObject(section.data); - if (pdfDTO.resourceId != null) + foreach (var pdf in pdfDTO.pdfs) { - addResourceToList(resourceDTOs, pdfDTO.resourceId); + foreach (var pdfFileAndTitle in pdf.pdfFilesAndTitles) + { + addResourceToList(resourceDTOs, pdfFileAndTitle.resourceId); + } } break; case SectionType.Agenda: diff --git a/ManagerService/Controllers/SectionController.cs b/ManagerService/Controllers/SectionController.cs index 2dfabd7..959c06c 100644 --- a/ManagerService/Controllers/SectionController.cs +++ b/ManagerService/Controllers/SectionController.cs @@ -356,6 +356,8 @@ namespace ManagerService.Controllers case SectionType.Map: mapDTO = new MapDTO(); mapDTO.mapType = MapTypeApp.hybrid; + mapDTO.mapTypeMapbox = MapTypeMapBox.standard; + mapDTO.mapProvider = MapProvider.Google; mapDTO.zoom = 18; mapDTO.points = new List();