Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update packages to latest #134

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

update packages to latest #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a71c94c
Fix for Angular 9
jmbaravykas Jan 6, 2021
1cd42bb
This should not be here
jmbaravykas Jan 6, 2021
ec5b5e7
Update package.json
jmbaravykas Jan 6, 2021
7f11643
updated
jmbaravykas Jan 6, 2021
dc3e12e
updated packages
Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .vscode/settings.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export {
})
export class MapModule {

static forRoot(mapServiceFactory?: MapServiceFactory, loader?: MapAPILoader): ModuleWithProviders {
static forRoot(mapServiceFactory?: MapServiceFactory, loader?: MapAPILoader): ModuleWithProviders<any> {
return {
ngModule: MapModule,
providers: [
Expand All @@ -179,7 +179,7 @@ export class MapModule {
};
}

static forRootBing(): ModuleWithProviders {
static forRootBing(): ModuleWithProviders<any> {
return {
ngModule: MapModule,
providers: [
Expand All @@ -191,7 +191,7 @@ export class MapModule {
};
}

static forRootGoogle(): ModuleWithProviders {
static forRootGoogle(): ModuleWithProviders<any> {
return {
ngModule: MapModule,
providers: [
Expand Down
49 changes: 24 additions & 25 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-maps",
"version": "6.0.3",
"name": "angular-maps-v9",
"version": "6.0.9",
"description": "Angular Maps (X-Map) is a set of components and services to provide map functionality in angular 2+ apps. X-Maps architecture is provider independent and can be used with Bing, Google, ESRI or any other service enabled mapping provider. X-Map contains a default implementation for Bing Maps.",
"homepage": "https://github.com/infusion-code/angular-maps/wiki",
"bugs": {
Expand All @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/infusion-code/angular-maps"
"url": "https://github.com/Holdimas/angular-maps"
},
"main": "./dist/index.js",
"scripts": {
Expand All @@ -32,30 +32,29 @@
"entryFile": "public_api.ts"
}
},
"dependencies": {},
"devDependencies": {
"@angular-devkit/build-angular": "~0.6.0",
"@angular/animations": "^6.0.0",
"@angular/cli": "~6.0.0",
"@angular/common": "^6.0.0",
"@angular/compiler": "^6.0.0",
"@angular/compiler-cli": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/language-service": "^6.0.0",
"@types/async": "^2.0.45",
"@types/node": "^7.0.5",
"bingmaps": "^2.0.3",
"codelyzer": ">=3.0.1",
"ng-packagr": "^3.0.2",
"tslint": ">=5.4.2",
"typescript": "<=2.8.0",
"zone.js": "^0.8.26"
"@angular-devkit/build-angular": "0.1100.5",
"@angular/animations": "11.0.5",
"@angular/cli": "11.0.5",
"@angular/common": "11.0.5",
"@angular/compiler": "11.0.5",
"@angular/compiler-cli": "11.0.5",
"@angular/core": "11.0.5",
"@angular/language-service": "11.0.5",
"@types/async": "3.2.5",
"@types/node": "14.14.20",
"bingmaps": "2.0.3",
"codelyzer": "6.0.1",
"ng-packagr": "11.0.3",
"tslint": "6.1.3",
"typescript": "4.0.5",
"zone.js": "0.10.3"
},
"peerDependencies": {
"async": "^2.5.0",
"bingmaps": "^2.0.3",
"font-awesome": "^4.6.3",
"json-loader": "^0.5.4",
"rxjs": "^6.0.0"
"async": "3.2.0",
"bingmaps": "2.0.3",
"font-awesome": "4.7.0",
"json-loader": "0.5.7",
"rxjs": "6.6.3"
}
}
8 changes: 6 additions & 2 deletions src/components/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
OnDestroy,
SimpleChange,
ViewChild,
AfterViewInit,
ContentChildren,
Input,
Output,
Expand Down Expand Up @@ -80,7 +81,7 @@ import { MapMarkerDirective } from './map-marker';
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class MapComponent implements OnChanges, OnInit, OnDestroy {
export class MapComponent implements OnChanges, OnInit, AfterViewInit, OnDestroy {

///
/// Field declarations
Expand Down Expand Up @@ -276,10 +277,13 @@ export class MapComponent implements OnChanges, OnInit, OnDestroy {
* @memberof MapComponent
*/
public ngOnInit(): void {
this.InitMapInstance(this._container.nativeElement);
this.MapPromise.emit(this._mapService.MapPromise);
this.MapService.emit(this._mapService);
}

public ngAfterViewInit() {
this.InitMapInstance(this._container.nativeElement);
}

/**
* Called when changes to the databoud properties occur. Part of the ng Component life cycle.
Expand Down
Loading