Allow offline usage for POIs #1169 - Small issues + logging images to…

… show.
IsraelHikingMap · Jun 7, 2020 · a2ebcc2 · a2ebcc2
1 parent cb810cc
commit a2ebcc2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/IsraelHiking.API/Executors/FeaturesMergeExecutor.cs b/IsraelHiking.API/Executors/FeaturesMergeExecutor.cs
@@ -165,7 +165,7 @@ private List<Feature> MergeExternalFeaturesToOsm(List<Feature> osmFeatures, List
                 }
             }
             externalFeatures = externalFeatures.Where(f => featureIdsToRemove.Contains(f.GetId()) == false).ToList();
-            _logger.LogInformation("Finisehd external features merging by title into OSM. " + externalFeatures.Count);
+            _logger.LogInformation("Finished external features merging by title into OSM. " + externalFeatures.Count);
             return externalFeatures;
         }
 

diff --git a/IsraelHiking.API/Services/Osm/DatabasesUpdaterService.cs b/IsraelHiking.API/Services/Osm/DatabasesUpdaterService.cs
@@ -182,11 +182,7 @@ private async Task RebuildPointsOfInterest()
             var osmSource = _pointsOfInterestAdapterFactory.GetBySource(Sources.OSM);
             var osmFeaturesTask = osmSource.GetPointsForIndexing();
             var sources = _pointsOfInterestAdapterFactory.GetAll().Where(s => s.Source != Sources.OSM).Select(s => s.Source);
-            var externalFeatures = new List<Feature>();
-            foreach (var source in sources)
-            {
-                externalFeatures.AddRange(await _elasticSearchGateway.GetExternalPoisBySource(source));
-            }
+            var externalFeatures = sources.Select(s => _elasticSearchGateway.GetExternalPoisBySource(s)).SelectMany(t => t.Result).ToList();
             if (externalFeatures.GroupBy(f => f.GetId()).Any(g => g.Count() > 1))
             {
                 _logger.LogWarning("Got duplicate id from database :-(");

diff --git a/IsraelHiking.Web/sources/application/pipes/offline-image.pipe.ts b/IsraelHiking.Web/sources/application/pipes/offline-image.pipe.ts
@@ -4,15 +4,19 @@ import { encode } from "base64-arraybuffer";
 
 import { RunningContextService } from "../services/running-context.service";
 import { DatabaseService } from "../services/database.service";
+import { LoggingService } from "../services/logging.service";
 
 @Pipe({ name: "offlineImage" })
 export class OfflineImagePipe implements PipeTransform {
     constructor(private readonly http: HttpClient,
                 private readonly runningContextService: RunningContextService,
+                private readonly loggingService: LoggingService,
                 private readonly databaseService: DatabaseService) {
     }
 
     public async transform(value: string, cache: boolean): Promise<string> {
+        // HM TODO: remove this when issue is resolved!
+        this.loggingService.debug("Showing image: " + value + ", isOnline: " + this.runningContextService.isOnline + ", cache: " + cache);
         if (!this.runningContextService.isOnline) {
             let data = await this.databaseService.getImageByUrl(value);
             if (data != null) {