From 37d049f6fc23c0e85a5cb13b60c8a53c9096a17d Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 30 Apr 2021 14:51:08 +0200
Subject: [PATCH] fix: map locate causing search issue
---
src/app/map/components/map.component.ts | 1 -
.../structure-list-search.component.ts | 26 ++-----------------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/app/map/components/map.component.ts b/src/app/map/components/map.component.ts
index 61da5c52d..9ca53b192 100644
--- a/src/app/map/components/map.component.ts
+++ b/src/app/map/components/map.component.ts
@@ -193,7 +193,6 @@ export class MapComponent implements OnChanges {
this.map = map;
// Handle location
this.lc = L.control.locate(this.locateOptions).addTo(this.map);
- // .locate(this.locateOptions).addTo(this.map);
this.map.on('locationfound', () => {
this.locatationTrigger.emit(true);
});
diff --git a/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts b/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
index e38926865..b84aafe94 100644
--- a/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
+++ b/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
@@ -1,7 +1,6 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { forkJoin } from 'rxjs';
-import { GeoJson } from '../../../map/models/geojson.model';
import { GeojsonService } from '../../../services/geojson.service';
import { TypeModal } from '../../enum/typeModal.enum';
import { Category } from '../../models/category.model';
@@ -17,7 +16,7 @@ import { ActivatedRoute, Router } from '@angular/router';
templateUrl: './structure-list-search.component.html',
styleUrls: ['./structure-list-search.component.scss'],
})
-export class StructureListSearchComponent implements OnInit, OnChanges {
+export class StructureListSearchComponent implements OnInit {
@Output() searchEvent = new EventEmitter();
// Show/hide form createStructure
@@ -47,9 +46,7 @@ export class StructureListSearchComponent implements OnInit, OnChanges {
constructor(
public searchService: SearchService,
private fb: FormBuilder,
- private geoJsonService: GeojsonService,
private activatedRoute: ActivatedRoute,
- private location: Location,
private route: ActivatedRoute,
private router: Router
) {
@@ -69,12 +66,6 @@ export class StructureListSearchComponent implements OnInit, OnChanges {
}
}
- ngOnChanges(changes: SimpleChanges): void {
- if (changes.locate && changes.locate.currentValue && !changes.locate.previousValue) {
- this.locateMe();
- }
- }
-
// Accessor to template angular.
public get TypeModal(): typeof TypeModal {
return TypeModal;
@@ -173,19 +164,6 @@ export class StructureListSearchComponent implements OnInit, OnChanges {
this.modalTypeOpened = undefined;
}
- // Get adress and put it in input
- public locateMe(): void {
- navigator.geolocation.getCurrentPosition((position) => {
- const longitude = position.coords.longitude;
- const latitude = position.coords.latitude;
- this.geoJsonService.getAddressByCoord(longitude, latitude).subscribe((geoPosition: GeoJson) => {
- const adress = geoPosition.properties.name;
- this.searchForm.setValue({ searchTerm: adress });
- this.applyFilter(adress);
- });
- this.locatationTrigger.emit(true);
- });
- }
// Management of the checkbox event (Check / Uncheck)
public numericPassCheck(event, categ): void {
const checkValue: string = event.target.value;
--
GitLab