From e46bdcca52d920c97d14442026693a8502b03966 Mon Sep 17 00:00:00 2001
From: Cedric Spindler <cedric.spindler@gmail.com>
Date: Mon, 18 Dec 2023 08:53:26 +0100
Subject: [PATCH 1/2] Integrate new fields

---
 .../community-hotspot.component.html                 | 12 +++++++++---
 .../community-hotspot/community-hotspot.component.ts |  1 -
 src/app/services/data.service.ts                     |  3 +++
 src/app/services/hotspot.service.ts                  |  9 +++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/app/components/community-hotspot/community-hotspot.component.html b/src/app/components/community-hotspot/community-hotspot.component.html
index fb5658a..e0a3c11 100644
--- a/src/app/components/community-hotspot/community-hotspot.component.html
+++ b/src/app/components/community-hotspot/community-hotspot.component.html
@@ -2,7 +2,7 @@
   <div class="carousel-wrapper" #wrapper>
     <div *ngFor="let img of hotspot?.media; index as i" [id]="'img-'+i" class="carousel-image">
       <img [src]="img">
-      <app-copyright class="copyright" credits="Wilde Nachbarn (wildenachbarn.ch)"></app-copyright>
+      <app-copyright class="copyright" [credits]="hotspot?.copyright"></app-copyright>
     </div>
   </div>
   <span class="material-symbols-outlined carousel-arrow left" (click)="swipeTransition('left')">
@@ -17,9 +17,15 @@
   <h2>{{ hotspot.species }}</h2>
   <div>
     <div class="infotable">
+      <strong>Beobachungsart:</strong><span>{{ hotspot.observation_type }}</span>
       <strong>Beobachungsdatum:</strong><span>{{ hotspot.date }}, {{ hotspot.time_range }}</span>
     </div>
-    <a mat-stroked-button color="primary" [href]="hotspot.post_url" target="_blank" rel="noopener noreferrer" style="margin-right: 16px;" >Meldung</a>
-    <a mat-stroked-button color="primary" [href]="hotspot.portrait_url" target="_blank" rel="noopener noreferrer">Artenportrait</a>
+    <a mat-stroked-button color="primary" [href]="hotspot.post_url" target="_blank" rel="noopener noreferrer" style="margin-right: 16px;" >
+      <mat-icon class="material-symbols-outlined">open_in_new</mat-icon>Meldung</a>
+    <a mat-stroked-button color="primary" [href]="hotspot.portrait_url" target="_blank" rel="noopener noreferrer">
+      <mat-icon class="material-symbols-outlined">open_in_new</mat-icon>Artenportrait</a>
+    <p *ngIf="hotspot.comment">
+      {{ hotspot.comment }}
+    </p>
   </div>
 </div>
diff --git a/src/app/components/community-hotspot/community-hotspot.component.ts b/src/app/components/community-hotspot/community-hotspot.component.ts
index ec023e6..7d2a577 100644
--- a/src/app/components/community-hotspot/community-hotspot.component.ts
+++ b/src/app/components/community-hotspot/community-hotspot.component.ts
@@ -20,7 +20,6 @@ export class CommunityHotspotComponent {
     this.hotspotService.trigger
       .pipe(filter(h => h !== false && h.type === 5))
       .subscribe(hotspot => {
-        console.log(hotspot);
         if (hotspot && hotspot.type === 5) this.hotspot = hotspot;
       })
   }
diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts
index 443c55f..c2b9e6d 100644
--- a/src/app/services/data.service.ts
+++ b/src/app/services/data.service.ts
@@ -115,6 +115,9 @@ export class DataService {
           subject: `WN: ${p.Art}`,
           id: p.ID,
           species: p.Art,
+          observation_type: p.Beobachtungsart,
+          comment: p.Bemerkungen,
+          copyright: p.Copyright,
           date: p.Datum,
           time_range: p.Zeitraum,
           post_url: p.Meldung,
diff --git a/src/app/services/hotspot.service.ts b/src/app/services/hotspot.service.ts
index 55fae15..f82dd78 100644
--- a/src/app/services/hotspot.service.ts
+++ b/src/app/services/hotspot.service.ts
@@ -47,6 +47,9 @@ export interface HotspotAudiotext extends Hotspot {
 export interface WildeNachbarnProperties {
   ID: number;
   Art: string;
+  Beobachtungsart: string;
+  Bemerkungen: string;
+  Copyright: string;
   Datum: string;
   Zeitraum: string;
   Meldung: string;
@@ -58,6 +61,9 @@ export interface HotspotCommunity extends Hotspot {
   type: 5;
   id: number;
   species: string;
+  observation_type: string;
+  comment: string;
+  copyright: string;
   date: string;
   time_range: string;
   post_url: string;
@@ -249,6 +255,9 @@ export class HotspotService {
               id: 87, type,
               location: { lat: 1, lon: 4},
               species: 'Biber',
+              observation_type: 'Frasspur',
+              comment: 'in der Nähe auch viele weitere neue Frassspuren',
+              copyright: 'Wilde Nachbarn (wildenachbarn.ch)',
               date: '03.12.2016',
               time_range: '14.00 - 14.59',
               post_url: 'https://beidebasel.wildenachbarn.ch/beobachtung/50451',

From 6299bd2047d4b18677ee456fc73dfc9d9f2d41ed Mon Sep 17 00:00:00 2001
From: Cedric Spindler <cedric.spindler@gmail.com>
Date: Mon, 18 Dec 2023 08:54:20 +0100
Subject: [PATCH 2/2] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8465824..2327efb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mitwelten-datawalk",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",