dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Fix image map invalid image url handling

Browse Source
This commit is contained in:
Igor Kulikov 2022-07-14 17:38:10 +03:00
parent 8a2ca98000
commit cfcfc3d7b5
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts
View File

@ -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);
})
);
}) })
); );
} }