From e2d17248ea0da7ae1df58c93aa249d6316ea773c Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Mon, 18 Dec 2023 21:47:16 +0100 Subject: [PATCH 1/7] Try smaller image scale --- src/app/components/audio-text/audio-text.component.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/components/audio-text/audio-text.component.css b/src/app/components/audio-text/audio-text.component.css index 992ee2f..594deb8 100644 --- a/src/app/components/audio-text/audio-text.component.css +++ b/src/app/components/audio-text/audio-text.component.css @@ -15,10 +15,10 @@ #portrait { flex: 0 0 auto; - width: 80vw; - height: 80vw; - max-height: 80vh; - max-width: 80vh; + width: 70vw; + height: 70vw; + max-height: 70vh; + max-width: 70vh; object-fit: cover; border-radius: 50%; border: 3px solid #555; From 3b8f9b57e5d31749f3d9dce0fc5e09a76828f363 Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Mon, 18 Dec 2023 21:47:47 +0100 Subject: [PATCH 2/7] Rearrange name, function and title --- src/app/components/audio-text/audio-text.component.css | 2 +- src/app/components/audio-text/audio-text.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/components/audio-text/audio-text.component.css b/src/app/components/audio-text/audio-text.component.css index 594deb8..02673f6 100644 --- a/src/app/components/audio-text/audio-text.component.css +++ b/src/app/components/audio-text/audio-text.component.css @@ -73,7 +73,7 @@ display: block; max-width: 100%; padding: 0 16px; - margin: 8px 0 16px 0; + margin: 24px 0 8px 0; font-size: 1.2rem; } diff --git a/src/app/components/audio-text/audio-text.component.html b/src/app/components/audio-text/audio-text.component.html index 5eb192d..b7c5ac4 100644 --- a/src/app/components/audio-text/audio-text.component.html +++ b/src/app/components/audio-text/audio-text.component.html @@ -1,9 +1,9 @@ Audio Text Portrait
- {{hotspot?.contentSubject}} {{hotspot?.speakerName}} {{hotspot?.speakerFunction}} + {{hotspot?.contentSubject}}
From 0e578920f75a40f9ae270653c95bba61e6d95421 Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Mon, 18 Dec 2023 22:17:02 +0100 Subject: [PATCH 3/7] Increase radius in audio only walk --- package.json | 2 +- src/app/services/hotspot.service.ts | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2327efb..cd98658 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mitwelten-datawalk", - "version": "0.6.7", + "version": "0.6.8", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/src/app/services/hotspot.service.ts b/src/app/services/hotspot.service.ts index f82dd78..c40e5e6 100644 --- a/src/app/services/hotspot.service.ts +++ b/src/app/services/hotspot.service.ts @@ -133,6 +133,7 @@ export class HotspotService { private hotspots: Array = []; private currentHotspot: HotspotType | null = null; private typeFilter = new BehaviorSubject([1,2,3,4,6]); + private radius = new BehaviorSubject(20.0); public trigger: BehaviorSubject; public closeHotspots: BehaviorSubject>; @@ -146,8 +147,8 @@ export class HotspotService { this.trigger = new BehaviorSubject(false); this.closeHotspots = new BehaviorSubject>([]); - combineLatest([this.parcoursService.location, this.typeFilter]) - .subscribe(([location, typeFilter]) => { + combineLatest([this.parcoursService.location, this.typeFilter, this.radius]) + .subscribe(([location, typeFilter, radius]) => { if (this.hotspots.length > 0) { const c = this.hotspots.filter(hotspot => { return typeFilter.includes(hotspot.type); @@ -156,7 +157,7 @@ export class HotspotService { [location.coords.longitude, location.coords.latitude], { units: 'meters' }) })).sort((a,b) => a.distance - b.distance).slice(0, 3); - if (c[0].distance <= 20.) { + if (c[0].distance <= radius) { if (this.currentHotspot?.id !== c[0].id) { this.currentHotspot = c[0]; this.trigger.next(c[0]); @@ -175,11 +176,16 @@ export class HotspotService { this.typeFilter.next(value); } + set radiusValue(value: number) { + this.radius.next(value); + } + loadHotspots(mode: 'walk'|'community'|'audiowalk' = 'walk') { if (mode === 'walk') { this.dataService.getWalkHotspots(1).subscribe(hotspots => { this.hotspots = hotspots; this.typeFilter.next([1, 2, 3, 4, 6]); + this.radius.next(20.0); }); /* // if we want to load community hotspots as well this.dataService.getWalkHotspots(1).pipe( @@ -193,11 +199,13 @@ export class HotspotService { this.dataService.getWalkHotspots(2).subscribe(hotspots => { this.hotspots = hotspots; this.typeFilter.next([4]); + this.radius.next(40.0); }); } else if (mode === 'community') { this.dataService.getCommunityHotspots().subscribe(hotspots => { this.hotspots = hotspots; this.typeFilter.next([5]); + this.radius.next(20.0); }); } } From a94035cce240db862eebe252b553a6530db76cd8 Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Wed, 20 Mar 2024 17:55:39 +0100 Subject: [PATCH 4/7] Add text for introduction --- src/app/components/instructions.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/components/instructions.component.ts b/src/app/components/instructions.component.ts index 53865fd..0b637c9 100644 --- a/src/app/components/instructions.component.ts +++ b/src/app/components/instructions.component.ts @@ -38,6 +38,11 @@ import { Component } from '@angular/core'; regulieren Sie die Abspielung der Inhalte also mit Ihrer Gehgeschwindigkeit.

+

+ Diese WalkApp ist eine prototypische Umsetzung des Forschungsprojektes MITWELTEN. Sollten Sie Probleme feststellen, + lohnt es sich die App zu schliessen und wieder zu öffnen. +

+

Um später wieder zu dieser Anleitung zu gelangen, bitten wir sie das Zahnrad-Icon settings im Hauptmenü anzuklicken. From b6a9e05a8919b354595a1b98f0ab0e1df587a2f0 Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Wed, 20 Mar 2024 21:47:48 +0100 Subject: [PATCH 5/7] Change circle color --- src/app/components/audio-text/audio-text.component.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/audio-text/audio-text.component.css b/src/app/components/audio-text/audio-text.component.css index 02673f6..e2a455b 100644 --- a/src/app/components/audio-text/audio-text.component.css +++ b/src/app/components/audio-text/audio-text.component.css @@ -21,7 +21,7 @@ max-width: 70vh; object-fit: cover; border-radius: 50%; - border: 3px solid #555; + border: 3px solid #797; } From 12182dce5b5eaf6cffaa45a7fd4f4d9e039626b9 Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Wed, 20 Mar 2024 21:49:50 +0100 Subject: [PATCH 6/7] Ignore ios dev dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0711527..bf2ddbe 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ testem.log # System files .DS_Store Thumbs.db +ios/ From 1f5bb8365ee6c10ff00c26af34dbf442b8ef0f30 Mon Sep 17 00:00:00 2001 From: Cedric Spindler Date: Wed, 20 Mar 2024 21:50:07 +0100 Subject: [PATCH 7/7] Temporarily disable sentry --- src/app/services/data.service.ts | 4 ++-- src/app/services/parcours.service.ts | 5 +++-- src/app/services/sentry.service.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts index c2b9e6d..faf9c19 100644 --- a/src/app/services/data.service.ts +++ b/src/app/services/data.service.ts @@ -134,9 +134,9 @@ export class DataService { return this.http.get(`${this.apiUrl}/files/walk/${url}`, {responseType: 'blob'}); } - public postError(payload: unknown) { + /* public postError(payload: unknown) { this.http.post(`${this.apiUrl}/sentry`, { payload: payload }).subscribe(); - } + } */ public queryDataHotspots(endpoint: string, summaryOption?: number) { return this.http.get(`${this.apiUrl}/walk/data-hotspots/${endpoint}${summaryOption ? `&summary=${summaryOption}` : ''}`); diff --git a/src/app/services/parcours.service.ts b/src/app/services/parcours.service.ts index 62552dd..ca7da55 100644 --- a/src/app/services/parcours.service.ts +++ b/src/app/services/parcours.service.ts @@ -47,13 +47,14 @@ export class ParcoursService { this._geolocation = this.geolocation.pipe( tap({ error: error => { - this.dataService.postError({ + console.error(error); + /* this.dataService.postError({ code: error.code, message: error.message, PERMISSION_DENIED: error.PERMISSION_DENIED, POSITION_UNAVAILABLE: error.POSITION_UNAVAILABLE, TIMEOUT: error.TIMEOUT, - }); + }); */ } }), retry({ delay: 2000 }) diff --git a/src/app/services/sentry.service.ts b/src/app/services/sentry.service.ts index 86e98e2..8cba127 100644 --- a/src/app/services/sentry.service.ts +++ b/src/app/services/sentry.service.ts @@ -12,7 +12,7 @@ export class SentryService extends ErrorHandler { override handleError(error: any) { if (error) { - this.dataService.postError(error); + // this.dataService.postError(error); super.handleError(error); } }