Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(integration): update latitude and longitude if coords system change #1661

Merged
merged 1 commit into from
May 15, 2024
Merged

fix(integration): update latitude and longitude if coords system change #1661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 44 additions & 29 deletions ...tion/src/lib/map/advanced-map-tool/advanced-coordinates/advanced-coordinates.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export class AdvancedCoordinatesComponent implements OnInit, OnDestroy {
private inMtmZone: boolean = true;
private inLambert2 = { 32198: true, 3798: true };
private mapState$$: Subscription;
private formStatus$$: Subscription;
private _projectionsLimitations: ProjectionsLimitationsOptions = {};
private projectionsConstraints: ProjectionsLimitationsOptions;
private defaultProj: InputProjections;
Expand Down Expand Up @@ -136,40 +137,22 @@ export class AdvancedCoordinatesComponent implements OnInit, OnDestroy {
.pipe(debounceTime(50))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pourquoi ne pas combiner les 2 events? via un combineLatest? ca eviterais de trainer 2 subcriptions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

j'ai traiter chaque événement à part pour résolu l'issue de boucle infini pour la mise a ajour de l'input de la form.
vous pouvez vérifier ce issue pour plus de détails.
#1606

.subscribe(() => {
this.setScaleValue(this.map);
this.currentCenterDefaultProj = this.map.viewController.getCenter(
this.defaultProj.code
);
const currentMtmZone = zoneMtm(this.currentCenterDefaultProj[0]);
const currentUtmZone = zoneUtm(this.currentCenterDefaultProj[0]);
if (!this.inMtmZone && currentMtmZone !== this.currentZones.mtm) {
this.back2quebec();
}
let zoneChange = false;
if (currentMtmZone !== this.currentZones.mtm) {
this.currentZones.mtm = currentMtmZone;
zoneChange = true;
}
if (currentUtmZone !== this.currentZones.utm) {
this.currentZones.utm = currentUtmZone;
zoneChange = true;
}
if (zoneChange) {
this.updateProjectionsZoneChange();
}
this.checkLambert(this.currentCenterDefaultProj);
this.coordinates = this.getCoordinates();
this.cdRef.detectChanges();
this.storageService.set(
'currentProjection',
this.inputProj,
StorageScope.SESSION
);
this.updateCoordinates();
});

this.formStatus$$ = this.form.valueChanges.subscribe(() => {
this.updateCoordinates();
});

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

voir commentaire ci haut.

const tempInputProj = this.storageService.get(
'currentProjection'
) as InputProjections;
this.inputProj = this.projections$.value[0];

this.inputProj =
this.projections$.value.find(
(val) => val.code === this.defaultProj.code
) ?? this.projections$.value[0];

if (tempInputProj !== null) {
const pos = this.positionInList(tempInputProj);
this.inputProj = this.projections$.value[pos];
Expand All @@ -185,6 +168,7 @@ export class AdvancedCoordinatesComponent implements OnInit, OnDestroy {
ngOnDestroy(): void {
this.map.mapCenter$.next(false);
this.mapState$$.unsubscribe();
this.formStatus$$.unsubscribe();
}

setScaleValue(map: IgoMap) {
Expand Down Expand Up @@ -212,6 +196,37 @@ export class AdvancedCoordinatesComponent implements OnInit, OnDestroy {
return coord;
}

updateCoordinates() {
this.currentCenterDefaultProj = this.map.viewController.getCenter(
this.defaultProj.code
);
const currentMtmZone = zoneMtm(this.currentCenterDefaultProj[0]);
const currentUtmZone = zoneUtm(this.currentCenterDefaultProj[0]);
if (!this.inMtmZone && currentMtmZone !== this.currentZones.mtm) {
this.back2quebec();
}
let zoneChange = false;
if (currentMtmZone !== this.currentZones.mtm) {
this.currentZones.mtm = currentMtmZone;
zoneChange = true;
}
if (currentUtmZone !== this.currentZones.utm) {
this.currentZones.utm = currentUtmZone;
zoneChange = true;
}
if (zoneChange) {
this.updateProjectionsZoneChange();
}
this.checkLambert(this.currentCenterDefaultProj);
this.coordinates = this.getCoordinates();

this.storageService.set(
'currentProjection',
this.inputProj,
StorageScope.SESSION
);
}

/**
* Copy the coordinates to a clipboard
*/
Expand Down
Loading