From 13617b91b52a4b7726ea6a0a7bb515e1266e822e Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Tue, 9 Mar 2021 11:21:56 +0100
Subject: [PATCH 1/3] fix(autoComplete) : fix adress response
---
.../address-autocomplete.component.ts | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
index 5bfb99bbf..7212396ad 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -28,7 +28,7 @@ export class AddressAutocompleteComponent implements OnInit {
if (!this.isAlreadySearching) {
this.isAlreadySearching = true;
this.addressService.searchAddress(searchString).subscribe((data) => {
- this.data = data.hits.hits.slice(0, this.AUTOCOMPLETE_NBR);
+ this.data = data.features;
this.isAlreadySearching = false;
});
}
@@ -37,9 +37,9 @@ export class AddressAutocompleteComponent implements OnInit {
public selectedResult(hit: any): void {
const address = new Address();
- address.numero = hit._source['data-fr'].properties.numero_str;
- address.street = hit._source['data-fr'].properties.voie_str;
- address.commune = hit._source['data-fr'].properties.commune_str;
+ address.numero = hit.properties.housenumber ? hit.properties.housenumber : 0;
+ address.street = hit.properties.street;
+ address.commune = hit.properties.city;
const value = this.parseHitToAddress(hit);
// Set input value
this.searchAddress.nativeElement.value = value;
@@ -50,6 +50,9 @@ export class AddressAutocompleteComponent implements OnInit {
}
public parseHitToAddress(hit: any): string {
- return `${hit._source['data-fr'].properties.numero_str} ${hit._source['data-fr'].properties.voie_str} ${hit._source['data-fr'].properties.commune_str}`;
+ if (hit.properties.housenumber) {
+ return `${hit.properties.housenumber} ${hit.properties.street} ${hit.properties.city}`;
+ }
+ return `${hit.properties.street} ${hit.properties.city}`;
}
}
--
GitLab
From 66e1c44802f2cc52177a035e530189bcf71b3027 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Tue, 9 Mar 2021 11:27:29 +0100
Subject: [PATCH 2/3] clean code
---
src/index.html | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/index.html b/src/index.html
index 17a60d8dc..7a2041e97 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,8 +11,6 @@
content="Plateforme à destination des acteurs de l'inclusion numérique de la métropole de Lyon"
/>
<meta property="og:image" content="https://resin.grandlyon.com/assets/logos/logo_1200.svg" />
- >
-
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="stylesheet" href="https://openlayers.org/en/v4.6.5/css/ol.css" type="text/css" />
<link
--
GitLab
From dc73fa7de92e8f8de9dbb745eb95dd4b8f0a0b86 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Tue, 9 Mar 2021 14:32:54 +0100
Subject: [PATCH 3/3] fix(autocomplete) : fix logic no number
---
.../address-autocomplete/address-autocomplete.component.ts | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
index 7212396ad..c0dce3bde 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -20,7 +20,9 @@ export class AddressAutocompleteComponent implements OnInit {
ngOnInit(): void {
if (this.address) {
- const address_str = this.address.numero + ' ' + this.address.street + ' ' + this.address.commune;
+ const address_str = this.address.numero
+ ? this.address.numero + ' '
+ : '' + this.address.street + ' ' + this.address.commune;
this.searchAddress.nativeElement.value = address_str;
}
}
@@ -37,7 +39,7 @@ export class AddressAutocompleteComponent implements OnInit {
public selectedResult(hit: any): void {
const address = new Address();
- address.numero = hit.properties.housenumber ? hit.properties.housenumber : 0;
+ address.numero = hit.properties.housenumber ? hit.properties.housenumber : null;
address.street = hit.properties.street;
address.commune = hit.properties.city;
const value = this.parseHitToAddress(hit);
--
GitLab