Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 98030c3

Browse files
author
Anthony Nahas
committed
fix(project): removed agm core logic
1 parent 78354b5 commit 98030c3

File tree

4 files changed

+39
-14
lines changed

4 files changed

+39
-14
lines changed

‎projects/angular-material-extensions/google-maps-autocomplete/node_modules/.cache/ng-packagr/content-v2/sha512/bb/4b/10bb5826a50194a0a5530cb69157e0eced738eac335e190c668336e841eeed94725f25c5e3674915c063314a239a356e061e2d3320b2436c95161ba4d7f9

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/angular-material-extensions/google-maps-autocomplete/src/lib/component/mat-google-maps-autocomplete.component.ts

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1-
import {Component, ElementRef, EventEmitter, forwardRef, Input, NgZone, OnInit, Output, ViewChild} from '@angular/core';
2-
import {ControlValueAccessor, UntypedFormControl, NG_VALUE_ACCESSOR, Validators} from '@angular/forms';
3-
import {MapsAPILoader} from '@agm/core';
1+
import {
2+
Component,
3+
ElementRef,
4+
EventEmitter,
5+
forwardRef,
6+
Inject,
7+
Input,
8+
NgZone,
9+
OnInit,
10+
Output,
11+
ViewChild
12+
} from '@angular/core';
13+
import {ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormControl, Validators} from '@angular/forms';
414
import {MatValidateAddressDirective} from '../directives/address-validator/mat-address-validator.directive';
515
import {Location} from '../interfaces/location.interface';
616
import {GermanAddress} from '../interfaces';
7-
17+
import {ScriptLoaderService} from "../services/script-loader.service";
18+
import {ApiKeyToken} from "../tokens";
819
import PlaceResult = google.maps.places.PlaceResult;
920
import AutocompleteOptions = google.maps.places.AutocompleteOptions;
1021

@@ -97,8 +108,10 @@ export class MatGoogleMapsAutocompleteComponent implements OnInit, ControlValueA
97108
propagateChange = (_: any) => {
98109
};
99110

100-
constructor(private mapsAPILoader: MapsAPILoader,
101-
private ngZone: NgZone) {
111+
constructor(private ngZone: NgZone,
112+
@Inject(ApiKeyToken)
113+
public apiKey: string,
114+
private loaderService: ScriptLoaderService,) {
102115
}
103116

104117
ngOnInit(): void {
@@ -123,8 +136,8 @@ export class MatGoogleMapsAutocompleteComponent implements OnInit, ControlValueA
123136
}
124137

125138
public initGoogleMapsAutocomplete() {
126-
this.mapsAPILoader
127-
.load()
139+
this.loaderService
140+
.loadScript(`https://maps.googleapis.com/maps/api/js?key=${this.apiKey}&libraries=places`)
128141
.then(() => {
129142
const autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, this.autoCompleteOptions);
130143
autocomplete.addListener('place_changed', () => {
@@ -151,7 +164,7 @@ export class MatGoogleMapsAutocompleteComponent implements OnInit, ControlValueA
151164
germanAddress.geoLocation.longitude = place.geometry.location.lng();
152165
}
153166

154-
if(place.address_components) {
167+
if(place.address_components) {
155168
place.address_components.forEach(value => {
156169
if (value.types.indexOf('street_number') > -1) {
157170
germanAddress.streetNumber = value.short_name;

‎projects/angular-material-extensions/google-maps-autocomplete/src/lib/component/mat-search-google-maps-autocomplete/mat-search-google-maps-autocomplete.component.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import {Component, EventEmitter, forwardRef, Input, OnInit, Output} from '@angular/core';
2-
import {ControlValueAccessor, UntypedFormBuilder, UntypedFormGroup, NG_VALUE_ACCESSOR, Validators} from '@angular/forms';
2+
import {
3+
ControlValueAccessor,
4+
NG_VALUE_ACCESSOR,
5+
UntypedFormBuilder,
6+
UntypedFormGroup,
7+
Validators
8+
} from '@angular/forms';
39

410
import {parseGermanAddress} from '../../helpers/parser';
511
import {GermanAddress} from '../../interfaces';
@@ -186,13 +192,19 @@ export class MatSearchGoogleMapsAutocompleteComponent implements OnInit, Control
186192
this.addressFormGroup.get('streetName').patchValue(germanAddress.streetName, {emitEvent: false, onlySelf: true});
187193
}
188194
if (germanAddress.streetNumber) {
189-
this.addressFormGroup.get('streetNumber').patchValue(germanAddress.streetNumber.toString(), {emitEvent: false, onlySelf: true});
195+
this.addressFormGroup.get('streetNumber').patchValue(germanAddress.streetNumber.toString(), {
196+
emitEvent: false,
197+
onlySelf: true
198+
});
190199
}
191200
if (germanAddress.postalCode) {
192201
this.addressFormGroup.get('postalCode').patchValue(germanAddress.postalCode, {emitEvent: false, onlySelf: true});
193202
}
194203
if (germanAddress.locality && germanAddress.locality.long) {
195-
this.addressFormGroup.get('locality.long').patchValue(germanAddress.locality.long, {emitEvent: false, onlySelf: true});
204+
this.addressFormGroup.get('locality.long').patchValue(germanAddress.locality.long, {
205+
emitEvent: false,
206+
onlySelf: true
207+
});
196208
}
197209

198210
this.value = germanAddress;

‎projects/angular-material-extensions/google-maps-autocomplete/src/lib/mat-google-maps-autocomplete.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {CommonModule} from '@angular/common';
2-
import {InjectionToken,ModuleWithProviders, NgModule} from '@angular/core';
2+
import {ModuleWithProviders, NgModule} from '@angular/core';
33
import {FlexLayoutModule} from '@angular/flex-layout';
44
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
55
import {MatIconModule} from '@angular/material/icon';
@@ -11,7 +11,6 @@ import {MatInputModule} from '@angular/material/input';
1111
import {ApiKeyToken} from "./tokens";
1212

1313

14-
1514
@NgModule({
1615
imports:
1716
[

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /