ztimson/map-alliance
ztimson/map-alliance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Activity

disabled an icon to make space

Browse Source
This commit is contained in:
Zakary Timson 2019-07-11 16:54:16 -04:00
parent d0f6f2f580
commit 9b8474a037
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/map/map.component.html
View File

@ -8,7 +8,7 @@
<button mat-icon-button (click)="draw()" [ngClass]="{'selected': drawListener.length}"><mat-icon>create</mat-icon></button> <button mat-icon-button (click)="draw()" [ngClass]="{'selected': drawListener.length}"><mat-icon>create</mat-icon></button>
<button mat-icon-button><mat-icon>straighten</mat-icon></button> <button mat-icon-button><mat-icon>straighten</mat-icon></button>
<button mat-icon-button (click)="remove = !remove" [ngClass]="{'selected': remove}"><mat-icon>delete</mat-icon></button> <button mat-icon-button (click)="remove = !remove" [ngClass]="{'selected': remove}"><mat-icon>delete</mat-icon></button>
<button *ngIf="!isNaN(position?.heading)" mat-icon-button (click)="calibrate()"><mat-icon>explore</mat-icon></button> <button *ngIf="position?.heading != Infinity" mat-icon-button (click)="calibrate()"><mat-icon>explore</mat-icon></button>
<button mat-icon-button [matMenuTriggerFor]="styleMenu"><mat-icon>layers</mat-icon></button> <button mat-icon-button [matMenuTriggerFor]="styleMenu"><mat-icon>layers</mat-icon></button>
<mat-menu #styleMenu="matMenu"> <mat-menu #styleMenu="matMenu">
<button mat-menu-item (click)="style = 'satellite'" [ngClass]="{'selected': style == 'satellite'}">Satellite</button> <button mat-menu-item (click)="style = 'satellite'" [ngClass]="{'selected': style == 'satellite'}">Satellite</button>
@ -32,8 +32,8 @@
<span *ngIf="!position" class="text-danger">No GPS</span> <span *ngIf="!position" class="text-danger">No GPS</span>
<div *ngIf="position" class="text-white"> <div *ngIf="position" class="text-white">
Heading: Heading:
<span *ngIf="isNaN(position.heading)" class="text-danger">No Heading</span> <span *ngIf="position.heading == null" class="text-danger">No Heading</span>
<span *ngIf="!isNaN(position.heading)">{{position.heading | number : '0.0-0'}}°</span> <span *ngIf="!isNaN(position.heading)">{{position.heading | number : '1.0-0'}}°</span>
<br> <br>
Latitude: {{position.latitude | number : '0.0-5'}} Latitude: {{position.latitude | number : '0.0-5'}}
<br> <br>

4
src/app/map/map.component.ts
View File

@ -24,12 +24,12 @@ export class MapComponent {
style: 'satellite' | 'terrain' | 'roadmap' | 'hybrid' = 'terrain'; style: 'satellite' | 'terrain' | 'roadmap' | 'hybrid' = 'terrain';
version = version; version = version;
Infinity = Infinity;
isNaN = isNaN; isNaN = isNaN;
constructor(private bpObserver: BreakpointObserver, public physicsService: PhysicsService, private snackBar: MatSnackBar, private bottomSheet: MatBottomSheet) { constructor(private bpObserver: BreakpointObserver, public physicsService: PhysicsService, private snackBar: MatSnackBar, private bottomSheet: MatBottomSheet) {
bpObserver.observe([Breakpoints.Handset]).subscribe(results => this.mobile = results.matches); bpObserver.observe([Breakpoints.Handset]).subscribe(results => this.mobile = results.matches);
physicsService.info.pipe(filter(coord => !!coord), debounceTime(50)).subscribe(pos => { physicsService.info.pipe(filter(coord => !!coord)).subscribe(pos => {
console.log('fire');
if(this.mapApi) { if(this.mapApi) {
if(!this.position) this.center(pos); if(!this.position) this.center(pos);
this.position = pos; this.position = pos;

4
src/app/physics/physics.service.ts
View File

@ -40,8 +40,11 @@ export class PhysicsService {
this.motionTimestamp = currentTime; this.motionTimestamp = currentTime;
}); });
this.orientation.subscribe(() => console.log('orientation'));
// Combine data into one nice package // Combine data into one nice package
combineLatest(this.position, this.orientation, this.calibrate, this.speed).subscribe(data => { combineLatest(this.position, this.orientation, this.calibrate, this.speed).subscribe(data => {
console.log('combine');
if(!data[0]) return; if(!data[0]) return;
let info = { let info = {
@ -54,7 +57,6 @@ export class PhysicsService {
speed: data[0].coords.speed speed: data[0].coords.speed
}; };
// TODO-debug
if(info.heading == null && data[1]) { if(info.heading == null && data[1]) {
if(!data[1].absolute && data[2] == Infinity) { if(!data[1].absolute && data[2] == Infinity) {
this.calibrate.next(0); this.calibrate.next(0);