-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
28 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 16 additions & 16 deletions
32
projects/angular8-yandex-maps/src/lib/services/yandex-map/yandex-map.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| import { Injectable, Injector } from '@angular/core'; | ||
| import { Subject } from 'rxjs'; | ||
| import { Inject, Injectable, Injector } from '@angular/core'; | ||
| import { from, fromEvent, Observable } from 'rxjs'; | ||
| import { IYandexMapService } from './yandex-service.type'; | ||
| import { DOCUMENT } from '@angular/common'; | ||
| import { map, switchMap } from 'rxjs/operators'; | ||
|
|
||
| declare const ymaps: any; | ||
|
|
||
| /** @dynamic */ | ||
| @Injectable({ | ||
| providedIn: 'root' | ||
| }) | ||
| export class YandexMapService implements IYandexMapService { | ||
| private _ymaps$ = new Subject<any>(); | ||
| private _scriptYmaps: HTMLScriptElement; | ||
| private _apiKey: string; | ||
|
|
||
| constructor(private _injector: Injector) { | ||
| constructor(private _injector: Injector, @Inject(DOCUMENT) private document: Document) { | ||
| this._apiKey = this._injector.get('API_KEY'); | ||
| } | ||
|
|
||
| /** | ||
| * Init ymaps script if it's not initiated | ||
| * Return ymaps subject | ||
| */ | ||
| public initScript(): Subject<any> { | ||
| public initScript(): Observable<any> { | ||
| if (!this._scriptYmaps) { | ||
| this._loadScript(); | ||
|
|
||
| this._scriptYmaps.onload = () => { | ||
| ymaps.ready(() => this._ymaps$.next(ymaps)); | ||
| }; | ||
| const ymapScript = this.document.createElement('script'); | ||
| ymapScript.src = `https://api-maps.yandex.ru/2.1/?apikey=${this._apiKey}&lang=ru_RU`; | ||
| this._scriptYmaps = this.document.body.appendChild(ymapScript); | ||
| } | ||
|
|
||
| return this._ymaps$; | ||
| } | ||
| if ('ymaps' in window) { | ||
| return from(ymaps.ready()).pipe(map(() => ymaps)); | ||
| } | ||
|
|
||
| private _loadScript(): void { | ||
| this._scriptYmaps = document.createElement('script'); | ||
| this._scriptYmaps.src = `https://api-maps.yandex.ru/2.1/?apikey=${this._apiKey}&lang=ru_RU`; | ||
| document.body.appendChild(this._scriptYmaps); | ||
| return fromEvent(this._scriptYmaps, 'load').pipe( | ||
| switchMap(() => from(ymaps.ready()).pipe(map(() => ymaps))) | ||
| ); | ||
| } | ||
| } |
4 changes: 2 additions & 2 deletions
4
projects/angular8-yandex-maps/src/lib/services/yandex-map/yandex-service.type.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { Subject } from 'rxjs'; | ||
| import { Observable } from 'rxjs'; | ||
|
|
||
| export interface IYandexMapService { | ||
| initScript(): Subject<any>; | ||
| initScript(): Observable<any>; | ||
| } |