feat: add location search

proxy.conf.json

@@ -25,5 +25,11 @@
     "secure": false,
     "changeOrigin": true,
     "logLevel": "info"
+  },
+  "/geocoding/photon/api": {
+    "target": "https://download.data.grandlyon.com",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "info"
   }
 }

src/app/home/home.component.ts

@@ -22,6 +22,8 @@ export class HomeComponent implements OnInit {
   public geolocation = false;
   public currentLocation: GeoJson;
   public currentStructure: Structure;
+  public userLatitude: number;
+  public userLongitude: number;
   constructor(private structureService: StructureService, private geoJsonService: GeojsonService) {}
 
   ngOnInit(): void {
@@ -33,37 +35,84 @@ export class HomeComponent implements OnInit {
   }
 
   public getStructures(filters: Filter[]): void {
-    this.structureService.getStructures(filters).subscribe((structures) => {
-      if (structures) {
-        Promise.all(
-          structures.map((structure) => {
-            if (this.geolocation) {
-              structure = this.getStructurePosition(structure);
-            }
-            return this.structureService.updateOpeningStructure(structure, DateTime.local());
-          })
-        ).then((structureList) => {
-          structureList = _.sortBy(structureList, ['distance']);
-          this.structures = structureList;
+    const queryString = _.find(filters, { name: 'query' });
+    if (queryString) {
+      if (this.isLocationRequest(queryString.value)) {
+        this.getCoordByAddress(queryString.value).then((res) => {
+          this.currentLocation = res;
+          this.updateStructuresdistance(
+            this.structures,
+            this.currentLocation.geometry.getLon(),
+            this.currentLocation.geometry.getLat()
+          );
         });
       } else {
-        this.structures = null;
+        this.structureService.getStructures(filters).subscribe((structures) => {
+          if (structures) {
+            this.updateStructuresdistance(structures, this.userLongitude, this.userLatitude);
+          } else {
+            this.structures = null;
+          }
+        });
       }
+    } else {
+      this.structureService.getStructures(filters).subscribe((structures) => {
+        if (structures) {
+          this.updateStructuresdistance(structures, this.userLongitude, this.userLatitude);
+        } else {
+          this.structures = null;
+        }
+      });
+    }
+  }
+
+  private updateStructuresdistance(structures: Structure[], lon: number, lat: number): void {
+    Promise.all(
+      structures.map((structure) => {
+        if (this.geolocation) {
+          structure = this.getStructurePosition(structure, lon, lat);
+        }
+        return this.structureService.updateOpeningStructure(structure, DateTime.local());
+      })
+    ).then((structureList) => {
+      structureList = _.sortBy(structureList, ['distance']);
+      this.structures = structureList;
     });
   }
 
+  /**
+   * Retrive GeoJson for a given address
+   * @param address string
+   */
+  private getCoordByAddress(address: string): Promise<GeoJson> {
+    return new Promise((resolve) => {
+      this.geoJsonService.getCoord(address, '', '69000').subscribe((res) => {
+        resolve(res);
+      });
+    });
+  }
+
+  /**
+   * Check with a regex that an address is request
+   * @param value string
+   */
+  private isLocationRequest(value: string): boolean {
+    const regex = /^\d+\s[A-z]+\s[A-z]+/g;
+    if (value.match(regex)) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Get structures positions and add marker corresponding to those positons on the map
+   * @param structure Structure
+   * @param lon number
+   * @param lat number
    */
-  private getStructurePosition(structure: Structure): Structure {
+  private getStructurePosition(structure: Structure, lon: number, lat: number): Structure {
     structure.distance = parseInt(
-      this.geoJsonService.getDistance(
-        structure.getLon(),
-        structure.getLat(),
-        this.currentLocation.geometry.getLon(),
-        this.currentLocation.geometry.getLat(),
-        'M'
-      ),
+      this.geoJsonService.getDistance(structure.getLat(), structure.getLon(), lat, lon, 'M'),
       10
     );
     return structure;
@@ -72,13 +121,18 @@ export class HomeComponent implements OnInit {
   public getLocation(): void {
     navigator.geolocation.getCurrentPosition((position) => {
       this.geolocation = true;
-      const longitude = position.coords.longitude;
-      const latitude = position.coords.latitude;
-      this.getAddress(longitude, latitude);
+      this.userLongitude = position.coords.longitude;
+      this.userLatitude = position.coords.latitude;
+      this.getAddress(position.coords.longitude, position.coords.latitude);
       this.getStructures(null);
     });
   }
 
+  /**
+   * Get an address by coord
+   * @param longitude number
+   * @param latitude number
+   */
   private getAddress(longitude: number, latitude: number): void {
     this.geoJsonService.getAddressByCoord(longitude, latitude).subscribe(
       (location) => {

src/app/map/components/map.component.ts

@@ -111,8 +111,8 @@ export class MapComponent implements OnChanges {
     structureListe.forEach((structure: Structure) => {
       this.mapService
         .createMarker(
-          structure.getLon(),
           structure.getLat(),
+          structure.getLon(),
           MarkerType.structure,
           structure.id,
           this.buildToolTip(structure)

src/app/map/models/addressGeometry.model.ts

@@ -7,10 +7,10 @@ export class AddressGeometry {
   }
 
   public getLat(): number {
-    return this.coordinates[0];
+    return this.coordinates[1];
   }
 
   public getLon(): number {
-    return this.coordinates[1];
+    return this.coordinates[0];
   }
 }

src/app/models/structure.model.ts

@@ -112,10 +112,10 @@ export class Structure {
   }
 
   public getLat(): number {
-    return this.coord[0];
+    return this.coord[1];
   }
 
   public getLon(): number {
-    return this.coord[1];
+    return this.coord[0];
   }
 }

src/app/services/geojson.service.ts

@@ -43,6 +43,16 @@ export class GeojsonService {
       .pipe(map((data: { features: any[] }) => _.map(data.features, this.parseToGeoJson)));
   }
 
+  /**
+   * Get GeoLocation with an address
+   * @param address Address
+   */
+  public getCoord(numero: string, address: string, zipcode: string): Observable<GeoJson> {
+    return this.http
+      .get('/geocoding/photon/api' + '?q=' + numero + ' ' + address + ' ' + zipcode)
+      .pipe(map((data: { features: any[]; type: string }) => new GeoJson(data.features[0])));
+  }
+
   // :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   // :::                                                                         :::
   // :::  This routine calculates the distance between two points (given the     :::