From 46d0b62cafbdbaeae2abb5ad5b02765820f45c18 Mon Sep 17 00:00:00 2001
From: "Olabarrieta Palacios, Ignacio" <ignacio.olabarrieta@tecnalia.com>
Date: Thu, 1 Dec 2022 13:28:50 +0100
Subject: [PATCH] a
---
.../bike-trajectory.component.ts | 42 +++++++++++++++----
1 file changed, 34 insertions(+), 8 deletions(-)
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 1911c7d6..9bf37c1e 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
@@ -87,7 +87,7 @@ export class BikeTrajectoryComponent implements OnInit {
console.log("radio_change::: viz_type="+this.viz_type+" markers.length="+Object.keys(this.markers).length);
if ( this.viz_type == 0 ){
if ( Object.keys(this.markers).length == 0 ){ this.print_pnts(); }
- this.get_day0();
+ this.get_day0_all();
document.getElementById('controls_env').style.display='block'
document.getElementById('safe_env').style.display='none';
}else if ( this.viz_type == 1){
@@ -224,10 +224,15 @@ export class BikeTrajectoryComponent implements OnInit {
this.get_vels0();
}else{
// console.log("change::: calling get_day0");
- if ( this.dayLbls ){
- this.get0();
- }else{
- this.get_day0();
+ if ( this.city === "1" ){
+ this.get_day0_all();
+ }
+ else if ( this.city === "0"){
+ if ( this.dayLbls ){
+ this.get0();
+ }else{
+ this.get_day0();
+ }
}
}
}
@@ -248,7 +253,11 @@ export class BikeTrajectoryComponent implements OnInit {
document.getElementById('daySlider').style.display='block';
document.getElementById('controls').style.display='none';
//document.getElementById('info').style.display='none';
- this.get_day0();
+ if ( this.city === "0" ){
+ this.get_day0();
+ }else if ( this.city === "1"){
+ this.get_day0_all();
+ }
}
}
@@ -367,6 +376,15 @@ export class BikeTrajectoryComponent implements OnInit {
}
}
+ get_day0_all(): void {
+ if ( this.points_loaded ){
+ console.log(Date.now()+': get_day0_all::: 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.getDayAll(this.day,weekday,part_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);
@@ -412,7 +430,11 @@ export class BikeTrajectoryComponent implements OnInit {
console.log("get_pnts::: len(markers)=" + Object.keys(this.markers).length);
this.create_legend(clr_idx);
this.points_loaded = true;
- this.get_day0();
+ if ( this.city === "0" ){
+ this.get_day0();
+ }else if ( this.city === "1" ){
+ this.get_day0_all();
+ }
}
create_his_config(id,lst){
@@ -696,7 +718,11 @@ export class BikeTrajectoryComponent implements OnInit {
console.log(Date.now()+": slider_change in routine:::");
this.day = this.fromValtoDay(this.sliderValue);
const dateDay = new Date(this.sliderValue * 1000);
- this.get_day0();
+ if ( this.city === "0" ){
+ this.get_day0();
+ }else if ( this.city === "1" ){
+ this.get_day0_all();
+ }
}
openInstructions() {
--
GitLab