Skip to content

Commit 7211d24

Browse files
authored
Map - add mapReady promise for Azure provider
1 parent c0d5acc commit 7211d24

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

packages/devextreme/js/__internal/ui/map/m_provider.dynamic.azure.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ let azureMapsLoader;
3232
class AzureProvider extends DynamicProvider {
3333
_preventZoomChangeEvent?: boolean;
3434

35+
_mapReadyPromise?: Promise<void>;
36+
3537
_mapType(type) {
3638
const mapTypes = {
3739
roadmap: 'road',
@@ -165,7 +167,7 @@ class AzureProvider extends DynamicProvider {
165167
_init() {
166168
this._createMap();
167169

168-
return Promise.resolve();
170+
return this._mapReadyPromise;
169171
}
170172

171173
_createMap() {
@@ -179,6 +181,12 @@ class AzureProvider extends DynamicProvider {
179181
interactive: !this._option('disabled'),
180182
});
181183

184+
this._mapReadyPromise = new Promise<void>((resolve) => {
185+
this._map.events.add('ready', () => {
186+
resolve();
187+
});
188+
});
189+
182190
this.updateControls();
183191
}
184192

@@ -413,11 +421,10 @@ class AzureProvider extends DynamicProvider {
413421
});
414422
}
415423
}).catch((e) => {
416-
const errorMessage = e.responseJSON.error.message;
417424
const dataSource = new atlas.source.DataSource();
418425
const lineLayer = new atlas.layer.LineLayer(dataSource, null, {});
419426

420-
errors.log('W1006', errorMessage);
427+
errors.log('W1006', e);
421428

422429
resolve({
423430
instance: { dataSource, lineLayer },

packages/devextreme/testing/helpers/forMap/azureMock.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
if(eventName === 'move') {
2121
atlas.moveActionCallback = callbackFun;
2222
}
23+
24+
if(eventName === 'ready') {
25+
targetOrCallback();
26+
}
2327
},
2428
remove: (eventName) => {
2529
atlas.removedEvents = atlas.removedEvents || [];

0 commit comments

Comments
 (0)