Improve public POI performance and allow offline usage #1169 - Added …

…ablity to create only the poi geojson file
IsraelHikingMap · May 26, 2020 · 66f955e · 66f955e
1 parent 8d09ca2
commit 66f955e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 16 deletions.
diff --git a/IsraelHiking.API/Controllers/UpdateController.cs b/IsraelHiking.API/Controllers/UpdateController.cs
@@ -69,7 +69,8 @@ public async Task<IActionResult> PostUpdateData(UpdateRequest request)
                     request.UpdateOsmFile == false &&
                     request.DownloadOsmFile == false &&
                     request.Images == false &&
-                    request.SiteMap == false)
+                    request.SiteMap == false &&
+                    request.OfflinePoisFile == false)
                 {
                     request = new UpdateRequest
                     {
@@ -78,7 +79,8 @@ public async Task<IActionResult> PostUpdateData(UpdateRequest request)
                         UpdateOsmFile = true,
                         DownloadOsmFile = true,
                         SiteMap = true,
-                        Images = true
+                        Images = true,
+                        OfflinePoisFile = true
                     };
                     _logger.LogInformation("No specific filters were applied, updating all databases.");
                 }

diff --git a/IsraelHiking.API/Executors/IPointsOfInterestFilesCreatorExecutor.cs b/IsraelHiking.API/Executors/IPointsOfInterestFilesCreatorExecutor.cs
@@ -12,6 +12,12 @@ public interface IPointsOfInterestFilesCreatorExecutor
         /// This function creates the sitemap.xml file inside the wwwroot folder
         /// </summary>
         /// <param name="features"></param>
-        void Create(List<Feature> features);
+        void CreateSiteMapXmlFile(List<Feature> features);
+
+        /// <summary>
+        /// This function creates the pois-slim.geojson file inside the wwwroot folder
+        /// </summary>
+        /// <param name="features"></param>
+        void CreateOfflinePoisFile(List<Feature> features);
     }
 }
diff --git a/IsraelHiking.API/Executors/PointsOfInterestFilesCreatorExecutor.cs b/IsraelHiking.API/Executors/PointsOfInterestFilesCreatorExecutor.cs
@@ -48,15 +48,7 @@ public PointsOfInterestFilesCreatorExecutor(IFileSystemHelper fileSystemHelper,
         }
 
         /// <inheritdoc/>
-        public void Create(List<Feature> features)
-        {
-            _logger.LogInformation($"Starting points of interest files creation: {features.Count}.");
-            CreateSitemapXmlFile(features);
-            CreateOfflinePoisFile(features);
-            _logger.LogInformation($"Finished points of interest files creation: {features.Count}.");
-        }
-
-        private void CreateSitemapXmlFile(List<Feature> features)
+        public void CreateSiteMapXmlFile(List<Feature> features)
         {
             using (var fileStream = _fileSystemHelper.CreateWriteStream(Path.Combine(_environment.WebRootPath, "sitemap.xml")))
             {
@@ -83,7 +75,8 @@ private void CreateSitemapXmlFile(List<Feature> features)
             }
         }
 
-        private void CreateOfflinePoisFile(List<Feature> features)
+        /// <inheritdoc/>
+        public void CreateOfflinePoisFile(List<Feature> features)
         {
             var collection = new FeatureCollection();
             var slimCollection = new FeatureCollection();

diff --git a/IsraelHiking.API/Services/Osm/DatabasesUpdaterService.cs b/IsraelHiking.API/Services/Osm/DatabasesUpdaterService.cs
@@ -172,6 +172,10 @@ public async Task Rebuild(UpdateRequest request)
             {
                 await RebuildSiteMap();
             }
+            if (request.OfflinePoisFile)
+            {
+                await RebuildOfflinePoisFile();
+            }
         }
 
         private async Task RebuildPointsOfInterest()
@@ -221,8 +225,16 @@ private async Task RebuildSiteMap()
         {
             _logger.LogInformation("Starting rebuilding sitemap.");
             var features = await _elasticSearchGateway.GetAllPointsOfInterest();
-            _pointsOfInterestFilesCreatorExecutor.Create(features);
+            _pointsOfInterestFilesCreatorExecutor.CreateSiteMapXmlFile(features);
             _logger.LogInformation("Finished rebuilding sitemap.");
         }
+
+        private async Task RebuildOfflinePoisFile()
+        {
+            _logger.LogInformation("Starting rebuilding offline pois file.");
+            var features = await _elasticSearchGateway.GetAllPointsOfInterest();
+            _pointsOfInterestFilesCreatorExecutor.CreateOfflinePoisFile(features);
+            _logger.LogInformation("Finished rebuilding offline pois file.");
+        }
     }
 }
diff --git a/IsraelHiking.Common/UpdateRequest.cs b/IsraelHiking.Common/UpdateRequest.cs
@@ -26,6 +26,10 @@ public class UpdateRequest
         /// Update site map xml file and offline points of interest file
         /// </summary>
         public bool SiteMap { get; set; }
-
+        /// <summary>
+        /// Update pois file
+        /// </summary>
+        public bool OfflinePoisFile { get; set; }
+
     }
 }
diff --git a/Tests/IsraelHiking.API.Tests/Services/Osm/DatabasesUpdaterServiceTests.cs b/Tests/IsraelHiking.API.Tests/Services/Osm/DatabasesUpdaterServiceTests.cs
@@ -80,7 +80,7 @@ public void TestRebuild_ShouldRebuildHighwaysAndPoints()
 
             _elasticSearchGateway.Received(1).UpdateHighwaysZeroDownTime(Arg.Any<List<Feature>>());
             _elasticSearchGateway.Received(1).UpdatePointsOfInterestZeroDownTime(Arg.Any<List<Feature>>());
-            _pointsOfInterestFilesCreatorExecutor.Received(1).Create(Arg.Any<List<Feature>>());
+            _pointsOfInterestFilesCreatorExecutor.Received(1).CreateSiteMapXmlFile(Arg.Any<List<Feature>>());
         }
 
         [TestMethod]