Browse Source

Merge pull request #12210 from vvlladd28/bug/image-map/load-image

Fixed load background in image map
pull/12227/head
Igor Kulikov 2 years ago
committed by GitHub
parent
commit
1aa05c7071
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts

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

@ -23,14 +23,14 @@ import {
PosFunction,
WidgetUnitedMapSettings
} from '../map-models';
import { forkJoin, Observable, of, ReplaySubject, switchMap } from 'rxjs';
import { combineLatest, Observable, of, ReplaySubject, switchMap } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { calculateNewPointCoordinate, loadImageWithAspect } from '@home/components/widget/lib/maps/common-maps-utils';
import { WidgetContext } from '@home/models/widget-component.models';
import { DataSet, DatasourceType, FormattedData, widgetType } from '@shared/models/widget.models';
import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
import { WidgetSubscriptionOptions } from '@core/api/widget-api.models';
import { isDefinedAndNotNull, isEmptyStr, isNotEmptyStr, parseFunction, parseTbFunction } from '@core/utils';
import { isDefinedAndNotNull, isEmptyStr, isNotEmptyStr, parseTbFunction } from '@core/utils';
import { EntityDataPageLink } from '@shared/models/query/query.models';
import { ImagePipe } from '@shared/pipe/image.pipe';
import { CompiledTbFunction } from '@shared/models/js-function.models';
@ -55,7 +55,7 @@ export class ImageMap extends LeafletMap {
mapImage: this.mapImage(options)
};
forkJoin(initData).subscribe(inited => {
combineLatest(initData).subscribe(inited => {
this.posFunction = inited.posFunction;
const mapImage = inited.mapImage;
this.imageUrl = mapImage.imageUrl;

Loading…
Cancel
Save