Browse Source

UI: Fix image map invalid image url handling

pull/6950/head
Igor Kulikov 4 years ago
parent
commit
cfcfc3d7b5
  1. 22
      ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts

22
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 L, { LatLngBounds, LatLngLiteral, LatLngTuple } from 'leaflet';
import LeafletMap from '../leaflet-map'; 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 { Observable, ReplaySubject } from 'rxjs';
import { map, mergeMap } from 'rxjs/operators'; import { catchError, map, mergeMap } from 'rxjs/operators';
import { import {
aspectCache, aspectCache,
calculateNewPointCoordinate calculateNewPointCoordinate
@ -124,7 +130,11 @@ export class ImageMap extends LeafletMap {
}; };
return mapImage; return mapImage;
} }
)); ),
catchError((e) => {
return this.imageFromUrl(defaultImageMapProviderSettings.mapImageUrl);
})
);
} }
private imageFromAlias(alias: Observable<[DataSet, boolean]>): Observable<MapImage> { private imageFromAlias(alias: Observable<[DataSet, boolean]>): Observable<MapImage> {
@ -140,7 +150,11 @@ export class ImageMap extends LeafletMap {
mapImage.aspect = aspect; mapImage.aspect = aspect;
return mapImage; return mapImage;
} }
)); ),
catchError((e) => {
return this.imageFromUrl(defaultImageMapProviderSettings.mapImageUrl);
})
);
}) })
); );
} }

Loading…
Cancel
Save