diff --git a/src/app/pages/tecnalia-module/bike-trajectory/bike-trajectory.component.ts b/src/app/pages/tecnalia-module/bike-trajectory/bike-trajectory.component.ts index 81f822401574516df54e68116cbc976fc6f3d7f9..1911c7d6afc7eb02b9d2ba2bd3135e523c660302 100644 --- a/src/app/pages/tecnalia-module/bike-trajectory/bike-trajectory.component.ts +++ b/src/app/pages/tecnalia-module/bike-trajectory/bike-trajectory.component.ts @@ -4,10 +4,6 @@ import { ConfigService } from '@ngx-config/core'; import { BikeTrajectoryService } from '../services/bike-trajectory.service'; import { Options, LabelType } from '@angular-slider/ngx-slider'; import { PutGeoJsonService } from '../services/put-geojson.service'; -/* -import { ChartCommonModule } from '@swimlane/ngx-charts'; -import { MatRadioModule } from '@angular/material/radio'; -import { loadavg } from 'os';*/ @Component({ @@ -65,6 +61,7 @@ export class BikeTrajectoryComponent implements OnInit { public chart_configs = {}; public sliderValue = new Date('2020-10-10').getTime() / 1000;; toggleLbls: boolean = false; + toggleQueryType: boolean = false; dayLbls: boolean = false; public viz_type:number; public biker_type:number = 1; @@ -220,27 +217,38 @@ export class BikeTrajectoryComponent implements OnInit { console.log("change::: this.city="+this.city); console.log("change::: this.toggleLbs="+this.toggleLbls); if ( this.toggleLbls ){ - if ( this.city === "1" ){ } + if ( this.city === "1" ){ + // console.log("change::: calling get0"); + // this.get0(); + } this.get_vels0(); }else{ - this.get_day0(); + // console.log("change::: calling get_day0"); + if ( this.dayLbls ){ + this.get0(); + }else{ + this.get_day0(); + } } } dayChange() { this.dayLbls = !this.dayLbls; - this.dchange(); + this.dchange(); } dchange() { + console.log("dchange::: in function"); if ( this.dayLbls ){ document.getElementById('daySlider').style.display='none'; document.getElementById('controls').style.display='block'; + this.get0(); //document.getElementById('info').style.display='block'; }else{ document.getElementById('daySlider').style.display='block'; document.getElementById('controls').style.display='none'; //document.getElementById('info').style.display='none'; + this.get_day0(); } } @@ -355,12 +363,17 @@ export class BikeTrajectoryComponent implements OnInit { get_day0(): void { if ( this.points_loaded ){ console.log(Date.now()+': get_day0::: in routine...this.day='+this.day); - let weekday = parseInt((<HTMLSelectElement> document.getElementById('weekday_select')).value); - let part_day = parseInt((<HTMLSelectElement> document.getElementById('day_select')).value); - this.bikeTrajectoryService.getDay(this.day,weekday,part_day).subscribe(res => this.process_result(res,0), err => console.log(err)); + this.bikeTrajectoryService.getDay(this.day).subscribe(res => this.process_result(res,0), err => console.log(err)); } } + get0(): void { + let weekday = parseInt((<HTMLSelectElement> document.getElementById('weekday_select')).value); + let part_day = parseInt((<HTMLSelectElement> document.getElementById('day_select')).value); + console.log('get0::: weekday='+weekday+" part_day="+part_day); + this.bikeTrajectoryService.get(weekday,part_day).subscribe(res => this.process_result(res,0), err => console.log(err)); + } + print_pnts(){ for( let m in this.markers){ this.map.removeLayer(this.markers[m]);