From cfcfc3d7b573b5f6a0274be10cdd4be13c896b6b Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 14 Jul 2022 17:38:10 +0300 Subject: [PATCH] UI: Fix image map invalid image url handling --- .../widget/lib/maps/providers/image-map.ts | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts index 18605a7142..e27c997d26 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts @@ -16,9 +16,15 @@ import L, { LatLngBounds, LatLngLiteral, LatLngTuple } from 'leaflet'; import LeafletMap from '../leaflet-map'; -import { CircleData, MapImage, PosFuncton, WidgetUnitedMapSettings } from '../map-models'; +import { + CircleData, + defaultImageMapProviderSettings, + MapImage, + PosFuncton, + WidgetUnitedMapSettings +} from '../map-models'; import { Observable, ReplaySubject } from 'rxjs'; -import { map, mergeMap } from 'rxjs/operators'; +import { catchError, map, mergeMap } from 'rxjs/operators'; import { aspectCache, calculateNewPointCoordinate @@ -124,7 +130,11 @@ export class ImageMap extends LeafletMap { }; return mapImage; } - )); + ), + catchError((e) => { + return this.imageFromUrl(defaultImageMapProviderSettings.mapImageUrl); + }) + ); } private imageFromAlias(alias: Observable<[DataSet, boolean]>): Observable { @@ -140,7 +150,11 @@ export class ImageMap extends LeafletMap { mapImage.aspect = aspect; return mapImage; } - )); + ), + catchError((e) => { + return this.imageFromUrl(defaultImageMapProviderSettings.mapImageUrl); + }) + ); }) ); }