Merge branch 'fix/issue-8-structures-adresse' into 'dev'

fixed autocomplete checks ban & bal photon

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server!130

src/structures/services/structures.service.ts

@@ -346,8 +346,33 @@ export class StructuresService {
    */
   private getStructurePosition(structure: Structure): Promise<Structure> {
     return new Promise((resolve, reject) => {
-      this.getCoord(structure.address.numero, structure.address.street, structure.address.commune).subscribe(
+      this.getCoord(structure.address.numero, structure.address.street, structure.address.commune, 'photon').subscribe(
         (res) => {
+          this.getCoord(
+            structure.address.numero,
+            structure.address.street,
+            structure.address.commune,
+            'photon-bal'
+          ).subscribe((resbal) => {
+            // check if photon-bal is more precise than photon ban
+            if (resbal.data.features.length > 0) {
+              resbal.data.features = resbal.data.features.sort((a, b) => {
+                return b.properties.housenumber ? 1 : -1;
+              });
+              const address = resbal.data.features[0];
+              if (address && address.geometry) {
+                structure.coord = address.geometry.coordinates;
+              } else {
+                Logger.error(
+                  `No coord found for: ${structure.address.numero} ${structure.address.street} ${structure.address.commune}`,
+                  'StructureService'
+                );
+                structure.coord = [];
+              }
+              resolve(structure);
+              // else pick structure from photonban if it exists or throw error
+            } else {
+              if (res.data.features.length > 0) {
                 const address = res.data.features[0];
                 if (address && address.geometry) {
                   structure.coord = address.geometry.coordinates;
@@ -359,10 +384,19 @@ export class StructuresService {
                   structure.coord = [];
                 }
                 resolve(structure);
+              } else {
+                Logger.error(
+                  `No structure found for: ${structure.address.numero} ${structure.address.street} ${structure.address.commune}`,
+                  'StructureService'
+                );
+              }
+            }
+          });
         },
         (err) => {
           Logger.error(`Request error: ${err.config.url}`, 'StructureService');
           Logger.error(err);
+          reject(err);
         }
       );
     });
@@ -383,13 +417,17 @@ export class StructuresService {
    */
   public async searchAddress(data: {
     searchQuery: string;
-  }): Promise<AxiosResponse<{ features: { geometry: {}; type: string; properties: {} }[] }>> {
-    const req = `https://download.data.grandlyon.com/geocoding/photon/api?q=${data.searchQuery}&lang=fr&limit=500&osm_tag=:!construction&osm_tag=:!bus_stop`;
-    Logger.debug(`Search request: ${encodeURI(req)}`, 'StructureService');
-    return new Promise((resolve, reject) => {
-      this.httpService
+  }): Promise<{ features: { geometry: {}; type: string; properties: {} }[] }> {
+    const reqBan = `https://download.data.grandlyon.com/geocoding/photon/api?q=${data.searchQuery}&lang=fr&limit=500&osm_tag=:!construction&osm_tag=:!bus_stop`;
+
+    const reqBal = `https://download.data.grandlyon.com/geocoding/photon-bal/api?q=${data.searchQuery}&lang=fr&limit=500&osm_tag=:!construction&osm_tag=:!bus_stop`;
+
+    const requestGroup = (url): Promise<{ features: { geometry: {}; type: string; properties: {} }[] }> =>
+      new Promise((resolve, reject) => {
+        Logger.debug(`Search request: ${encodeURI(url)}`, 'StructureService');
+        return this.httpService
           .request({
-          url: encodeURI(req),
+            url: encodeURI(url),
             method: 'GET',
             headers: { 'Content-Type': 'application/json' },
           })
@@ -409,6 +447,26 @@ export class StructuresService {
             }
           );
       });
+
+    const [reqBanRes, reqBalRes] = await Promise.all([requestGroup(reqBan), requestGroup(reqBal)]);
+    const mergedArray = [...reqBalRes['features'], ...reqBanRes['features']];
+    const duplicateFreeArray = _.unionWith(mergedArray, function (a, b) {
+      return (
+        // excludes structures from photon-BAN if they share postcode && street or name && housenumber
+        //  checking for name and street existance asserts that we will not compare 2 undefined fields
+        a.properties.postcode === b.properties.postcode &&
+        ((a.properties.name &&
+          (a.properties.name === b.properties.name || a.properties.name === b.properties.street)) ||
+          (a.properties.street &&
+            (a.properties.street === b.properties.name || a.properties.street === b.properties.street))) &&
+        (a.properties.housenumber === b.properties.housenumber ||
+          (!a.properties.housenumber && !b.properties.housenumber))
+      );
+    });
+
+    return {
+      features: duplicateFreeArray,
+    };
   }
 
   /**
@@ -447,9 +505,11 @@ export class StructuresService {
     );
   }
 
-  public getCoord(numero: string, address: string, zipcode: string): Observable<AxiosResponse<any>> {
-    const req = 'https://download.data.grandlyon.com/geocoding/photon/api?q=' + numero + ' ' + address + ' ' + zipcode;
-    Logger.log(`getCoord - Request : ${req}`, 'StructureService');
+  public getCoord(numero: string, address: string, zipcode: string, scope: string): Observable<AxiosResponse<any>> {
+    const req =
+      `https://download.data.grandlyon.com/geocoding/${scope}/api?q=` + numero + ' ' + address + ' ' + zipcode;
+    Logger.debug('Print getCoord' + req);
+
     return this.httpService.get(encodeURI(req));
   }