From b404bb09beebc418e386f2072ce4adfe022cd635 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Sun, 8 Jan 2023 19:05:23 +0100
Subject: [PATCH 1/5] Added Mvg Widget

Display mvg departure times for MVG station.
---
 docs/widgets.md                       |  36 +++
 src/components/Widgets/Mvg.vue        | 361 ++++++++++++++++++++++++++
 src/components/Widgets/WidgetBase.vue |   1 +
 src/utils/defaults.js                 |   1 +
 4 files changed, 399 insertions(+)
 create mode 100644 src/components/Widgets/Mvg.vue

diff --git a/docs/widgets.md b/docs/widgets.md
index 4a1d6551..611e559a 100644
--- a/docs/widgets.md
+++ b/docs/widgets.md
@@ -35,6 +35,7 @@ Dashy has support for displaying dynamic content in the form of widgets. There a
   - [GitHub Trending](#github-trending)
   - [GitHub Profile Stats](#github-profile-stats)
   - [Healthchecks Status](#healthchecks status)
+  - [Mvg Departure](#mvg-departure)
 - **[Self-Hosted Services Widgets](#self-hosted-services-widgets)**
   - [System Info](#system-info)
   - [Cron Monitoring](#cron-monitoring-health-checks)
@@ -1173,6 +1174,41 @@ Display status of one or more HealthChecks project(s). Works with healthcheck.io
 
 ---
 
+### MVG Departure
+
+Display departure time of a MVG (Münchner Verkehrs Gesellschaft) station.
+
+From https://www.mvg.de/impressum.html:
+
+> [...] Die Verarbeitung unserer Inhalte oder Daten durch Dritte erfordert unsere ausdrückliche Zustimmung. Für private, nicht-kommerzielle Zwecke, wird eine gemäßigte Nutzung ohne unsere ausdrückliche Zustimmung geduldet. Jegliche Form von Data-Mining stellt keine gemäßigte Nutzung dar.[...]
+
+In other words: Private, noncomercial, moderate use of the API is tolerated. They don’t consider data mining as moderate use.
+
+#### Options
+
+**Field** | **Type** | **Required** | **Description**
+--- | --- | --- | ---
+**`location`** | `string` |  Required | The name of the location (exact) or the location id, startin with `de:09162:`
+**`limit`** | `integer` |  _Optional_ | Limit number of entries, defaults to 10.
+
+```yaml
+- type: mvg
+  options:
+    location: Marienplatz
+    limit: 5
+```
+
+#### Info
+
+- **CORS**: 🟢 Enabled
+- **Auth**: 🟢 Required
+- **Price**: 🟢 Free / Paid / Self-hosted 
+- **Host**: Managed Instance or Self-Hosted (see [healthchecks/healthchecks](https://github.com/healthchecks/healthchecks))
+- **Privacy**: _See [Healthchecks.io Privacy Policy](https://healthchecks.io/privacy/)_
+
+---
+
+
 ## Self-Hosted Services Widgets
 
 ### System Info
diff --git a/src/components/Widgets/Mvg.vue b/src/components/Widgets/Mvg.vue
new file mode 100644
index 00000000..564d25de
--- /dev/null
+++ b/src/components/Widgets/Mvg.vue
@@ -0,0 +1,361 @@
+<template>
+<div class="mvg-wrapper" v-if="departures">
+  <template
+    v-for="departure in departures"
+  >
+    <div class="departure" v-bind:key="departure.key" v-tooltip="mvgTooltipDeparture(departure)">
+      <span :class="{live: departure.live}">
+        {{ departure.realtimeDepartureTime | formatDepartureTime }}
+      </span>
+    </div>
+    <div class='line'
+      v-bind:key="departure.key + 'line'"
+      >
+      <div
+        class="transport"
+        :class="['type-' + departure.transportType,
+        'line-' + departure.label,
+        ]"
+      >{{ departure.label }}</div>
+      <div
+      class='destination'
+      v-tooltip="mvgTooltipDestination(departure)"
+      :class="{cancelled: departure.cancelled}">{{ departure.destination }}</div>
+      <span class="delay"
+        :class="{'has-delay': departure.realtimeDepartureTime > departure.plannedDepartureTime}"
+      >{{ Math.max(0, 
+          (departure.realtimeDepartureTime - departure.plannedDepartureTime)/60000) }}</span>
+      <span class="occupancy"
+      :class="'occupancy-' + departure.occupancy"
+        v-if="departure.occupancy != 'UNKNOWN'"
+        v-tooltip="departure.occupancy"
+      >■</span>
+    </div>
+  </template>
+</div>
+</template>
+
+<script>
+import WidgetMixin from '@/mixins/WidgetMixin';
+import { widgetApiEndpoints } from '@/utils/defaults';
+import { timestampToTime } from '@/utils/MiscHelpers';
+
+export default {
+  mixins: [WidgetMixin],
+  components: {},
+  data() {
+    return {
+      departures: null,
+      locationSearch: null,
+    };
+  },
+  created() {
+    if (!this.isLocationId) {
+      this.makeRequest(this.endpointLocation).then(
+        (response) => {
+          const stations = response.filter((r) => r.type === 'STATION');
+          if (stations.length > 0) {
+            this.location = stations[0].globalId;
+            this.fetchData();
+          } else {
+            this.error('Cannot find station for specified string');
+          }
+        },
+      );
+    } else {
+      this.location = this.options.location;
+    }
+  },
+  filters: {
+    formatDepartureTime(timestamp) {
+      const msDifference = new Date(timestamp).getTime() - new Date().getTime();
+      const diff = Math.max(0, Math.round(msDifference / 60000));
+      return diff;
+    },
+    limitLength(str) {
+      return str;
+    },
+  },
+  computed: {
+    /* API endpoint, either for self-hosted or managed instance */
+    isLocationId() {
+      if (!this.options.location) {
+        this.error('Location is required');
+      }
+      if (typeof this.options.location !== 'string') this.error('Location can only be a string');
+      if (this.options.location.startsWith('de:09162:')) return true;
+      return false;
+    },
+    offset() {
+      if (this.options.offset) return this.options.offset;
+      return 0;
+    },
+    limit() {
+      if (this.options.limit) return this.options.limit;
+      return 10;
+    },
+    endpointDeparture() {
+      return `${widgetApiEndpoints.mvg}/departure?globalId=${this.location}&limit=30&offsetInMinutes=${this.offset}&transportTypes=UBAHN,TRAM,BUS,SBAHN`;
+    },
+    endpointLocation() {
+      return `${widgetApiEndpoints.mvg}/location?query=${encodeURIComponent(this.options.location)}`;
+    },
+  },
+  methods: {
+    update() {
+      this.startLoading();
+      this.fetchData();
+      this.finishLoading();
+    },
+    fetchData() {
+      if (this.location !== undefined) {
+        this.makeRequest(this.endpointDeparture).then(
+          (response) => { this.processData(response); },
+        );
+      }
+    },
+    /* Assign data variables to the returned data */
+    processData(data) {
+      let i = 0;
+      const results = [];
+      data
+        .filter(this.filter_results)
+        .sort(this.sort_results)
+        .slice(0, this.limit).forEach((dep) => {
+          results.push({ ...dep, key: `mvg-dep-${this.location}-${i}` });
+          i += 1;
+        });
+      this.departures = results;
+    },
+    ensure_array(value) {
+      if (typeof value === 'string') {
+        return [value];
+      }
+      return value;
+    },
+    filter_results(value) {
+      if (!this.options.filters) return true;
+      let useEntry = true;
+      useEntry = useEntry
+        && (
+          (!this.options.filters.line)
+            || this.ensure_array(this.options.filters.line).includes(value.label)
+        );
+      useEntry = useEntry
+        && (
+          (!this.options.filters.product)
+            || this.ensure_array(this.options.filters.product)
+              .some(x => x.toLowerCase() === value.transportType.toLowerCase())
+        );
+      useEntry = useEntry
+        && (
+          (!this.options.filters.destination)
+            || this.ensure_array(this.options.filters.destination)
+              .some(x => x.toLowerCase() === value.destination.toLowerCase())
+        );
+      return useEntry;
+    },
+    sort_results(a, b) {
+      const depa = a.realtimeDepartureTime ? a.realtimeDepartureTime : a.plannedDepartureTime;
+      const depb = b.realtimeDepartureTime ? b.realtimeDepartureTime : b.plannedDepartureTime;
+      if (depa > depb) return 1;
+      if (depa < depb) return -1;
+      if (a.label < b.label) return 1;
+      if (a.label > b.label) return -1;
+      if (a.destination < b.destination) return 1;
+      if (a.destination > b.destination) return -1;
+      return 0;
+    },
+    makeUrl(cronId) {
+      const base = this.options.host || 'https://healthchecks.io';
+      return `${base}/checks/${cronId}/details`;
+    },
+    mvgTooltipDeparture(data) {
+      let departureDetails = '';
+      if (data.realtime) {
+        departureDetails += `Live: ${timestampToTime(data.realtimeDepartureTime)}<br />`;
+      }
+      departureDetails += `Planned: ${timestampToTime(data.plannedDepartureTime)}<br />`;
+      if (data.realtime) {
+        departureDetails += 'Live!<br />';
+      }
+      return {
+        content: departureDetails, html: true, trigger: 'hover', delay: 250, classes: 'mvg-info-tt',
+      };
+    },
+    mvgTooltipDestination(data) {
+      let departureDetails = `<b>Infos:</b><br />${data.messages.join('<br />')}`;
+      if (data.platform) {
+        departureDetails += `Platform: ${data.platform}<br />`;
+      }
+      if (data.cancelled) {
+        departureDetails += '<b>Cancelled!</b><br />';
+      }
+      return {
+        content: departureDetails, html: true, trigger: 'hover', delay: 250, classes: 'mvg-info-tt',
+      };
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.mvg-wrapper {
+  display: grid;
+  justify-content: left;
+  grid-template-columns: 1fr 9fr;
+  color: var(--widget-text-color);
+  padding: 0.25rem 0;
+  grid-row-gap: 0.4em;
+  .departure {
+    min-width: 1rem;
+    font-size: 1.1rem;
+    font-weight: bold;
+    text-align: right;
+    margin-right: 0.2rem;
+    span.live {
+      color: var(--success);
+    }
+  }
+  .line {
+    background-color: #FFFFFF;
+    margin: 0;
+    padding-right: 0.2em;
+    border-radius: 0.2em;
+    display: grid;
+    grid-template-columns: 2.2em 1fr minmax(1.5em,max-content) 0.75em;
+    .type-UBAHN {
+      border: 0px;
+    }
+    .type-SBAHN {
+      border: 0px;
+    }
+    .type-BUS {
+    }
+    .type-TRAM {
+    }
+    .transport{
+      border-top-left-radius: 0.2em 0.2em;
+      border-bottom-left-radius: 0.2em 0.2em;
+      margin: 0em;
+      padding: 0.15em 0;
+      color: #FFFFFF;
+      margin-right: 0.40em;
+      text-align: center;
+      over
+      span {
+        min-width: 2em;
+        display: inline-block;
+      }
+      &.line-U1 {
+        background-color: #468447;
+      }
+      &.line-U2 {
+        background-color: #dd3d4d;
+      }
+      &.line-U3 {
+        background-color: #ef8824;
+      }
+      &.line-U4 {
+        background-color: #04af90;
+      }
+      &.line-U5 {
+        background-color: #b78730;
+      }
+      &.line-U6 {
+        background-color: #0472b3;
+      }
+      &.line-S1 {
+        background-color: #79c6e7;
+      }
+      &.line-S2 {
+        background-color: #9bc04c;
+      }
+      &.line-S3 {
+        background-color: #942d8d;
+      }
+      &.line-S4 {
+        background-color: #d4214d;
+      }
+      &.line-S5 {
+        background-color: #03a074;
+      }
+      &.line-S6 {
+        background-color: #03a074;
+      }
+      &.line-S7 {
+        background-color: #964438;
+      }
+      &.line-S8 {
+        background-color: #000000;
+      }
+      &.type-BUS {
+        background-color: #0d5c70;
+      }
+    }
+    .destination{
+      border-radius: 0.2em;
+      width: 100%;
+      background-color: #FFFFFF;
+      color: #000;
+      padding-top: 0.15em;
+      padding-bottom: 0.15em;
+      white-space: nowrap;
+      overflow: hidden;
+      span.cancelled {
+        color: var(--danger);
+        text-decoration: line-through;
+      }
+      span.destination {
+        overflow: clip;
+        margin-right: 0.25em;
+        width: 75%;
+        display: inline-block;
+      }
+    }
+
+    .delay{
+      padding: 0.15em;
+      font-weight: bold;
+      &.has-delay{
+        padding: 0.15em;
+        background-color: var(--danger);
+        color: #FFF;
+        border-radius: 0.2em;
+      }
+    }
+    .delay::before{
+      content: "+";
+    }
+    .occupancy{
+      display: inline-block;
+      padding: 0 0.15em;
+      border-radius: 0.2em;
+      &.occupancy-LOW {
+        color: green;
+      }
+      &.occupancy-MEDIUM {
+        color: orange;
+      }
+      &.occupancy-HIGH {
+        color: red;
+      }
+    }
+  }
+  &:not(:last-child) {
+    border-bottom: 1px dashed var(--widget-text-color);
+  }
+}
+
+</style>
+
+<style lang="scss">
+.ping-times-tt {
+  min-width: 20rem;
+}
+</style>
+<style lang="scss">
+.mvg-info-tt {
+  min-width: 20rem;
+}
+</style>
diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue
index ecd7b536..60d25bb9 100644
--- a/src/components/Widgets/WidgetBase.vue
+++ b/src/components/Widgets/WidgetBase.vue
@@ -82,6 +82,7 @@ const COMPAT = {
   image: 'ImageWidget',
   joke: 'Jokes',
   'mullvad-status': 'MullvadStatus',
+  mvg: 'Mvg',
   'nd-cpu-history': 'NdCpuHistory',
   'nd-load-history': 'NdLoadHistory',
   'nd-ram-history': 'NdRamHistory',
diff --git a/src/utils/defaults.js b/src/utils/defaults.js
index 8d609684..8f51df94 100644
--- a/src/utils/defaults.js
+++ b/src/utils/defaults.js
@@ -236,6 +236,7 @@ module.exports = {
     jokes: 'https://v2.jokeapi.dev/joke/',
     news: 'https://api.currentsapi.services/v1/latest-news',
     mullvad: 'https://am.i.mullvad.net/json',
+    mvg: 'https://www.mvg.de/api/fib/v2/',
     publicIp: 'https://ipapi.co/json',
     publicIp2: 'https://api.ipgeolocation.io/ipgeo',
     publicIp3: 'http://ip-api.com/json',

From 4cb3332e3e4138f6dce13717dec6660dc095d0e1 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Sun, 22 Jan 2023 12:57:02 +0100
Subject: [PATCH 2/5] Added mvg connection + doc updates

---
 docs/widgets.md                          |  62 +++-
 src/components/Widgets/MvgConnection.vue | 376 +++++++++++++++++++++++
 src/components/Widgets/WidgetBase.vue    |   1 +
 3 files changed, 434 insertions(+), 5 deletions(-)
 create mode 100644 src/components/Widgets/MvgConnection.vue

diff --git a/docs/widgets.md b/docs/widgets.md
index 611e559a..04548233 100644
--- a/docs/widgets.md
+++ b/docs/widgets.md
@@ -36,6 +36,7 @@ Dashy has support for displaying dynamic content in the form of widgets. There a
   - [GitHub Profile Stats](#github-profile-stats)
   - [Healthchecks Status](#healthchecks status)
   - [Mvg Departure](#mvg-departure)
+  - [Mvg Connection](#mvg-connection)
 - **[Self-Hosted Services Widgets](#self-hosted-services-widgets)**
   - [System Info](#system-info)
   - [Cron Monitoring](#cron-monitoring-health-checks)
@@ -1182,7 +1183,7 @@ From https://www.mvg.de/impressum.html:
 
 > [...] Die Verarbeitung unserer Inhalte oder Daten durch Dritte erfordert unsere ausdrückliche Zustimmung. Für private, nicht-kommerzielle Zwecke, wird eine gemäßigte Nutzung ohne unsere ausdrückliche Zustimmung geduldet. Jegliche Form von Data-Mining stellt keine gemäßigte Nutzung dar.[...]
 
-In other words: Private, noncomercial, moderate use of the API is tolerated. They don’t consider data mining as moderate use.
+In other words: Private, noncomercial, moderate use of the API is tolerated. They don’t consider data mining as moderate use. (This is not a legal advice)
 
 #### Options
 
@@ -1190,6 +1191,12 @@ In other words: Private, noncomercial, moderate use of the API is tolerated. The
 --- | --- | --- | ---
 **`location`** | `string` |  Required | The name of the location (exact) or the location id, startin with `de:09162:`
 **`limit`** | `integer` |  _Optional_ | Limit number of entries, defaults to 10.
+**`title`** | `string` |  _Optional_ | A custom title to be displayed.
+**`header`** | `bool` |  _Optional_ | Shall the title be shown?
+**`filters`** | `object` |  _Optional_ | Filter results
+**`filters.line`** | `string/array` |  _Optional_ | Filter results for given line(s).
+**`filters.product`** | `string/array` |  _Optional_ | Filter results for specific product (TRAM, UBAHN, SBAHN, BUS).
+**`filters.destination`** | `string/object` |  _Optional_ | Filter results for specific destination(s)
 
 ```yaml
 - type: mvg
@@ -1201,10 +1208,55 @@ In other words: Private, noncomercial, moderate use of the API is tolerated. The
 #### Info
 
 - **CORS**: 🟢 Enabled
-- **Auth**: 🟢 Required
-- **Price**: 🟢 Free / Paid / Self-hosted 
-- **Host**: Managed Instance or Self-Hosted (see [healthchecks/healthchecks](https://github.com/healthchecks/healthchecks))
-- **Privacy**: _See [Healthchecks.io Privacy Policy](https://healthchecks.io/privacy/)_
+- **Auth**: 🟢 Not Required
+- **Price**: 🟢 Free / Private use only
+- **Host**: [MVG](https://mvg.de)
+- **Privacy**: _See [MVG Datenschutz](https://www.mvg.de/datenschutz-mvg.html)_
+
+---
+
+### MVG Connection
+
+Display the next connection for two addresses/coordinates, stations or POI within Munich using MVG MVG (Münchner Verkehrs Gesellschaft).
+
+From https://www.mvg.de/impressum.html:
+
+> [...] Die Verarbeitung unserer Inhalte oder Daten durch Dritte erfordert unsere ausdrückliche Zustimmung. Für private, nicht-kommerzielle Zwecke, wird eine gemäßigte Nutzung ohne unsere ausdrückliche Zustimmung geduldet. Jegliche Form von Data-Mining stellt keine gemäßigte Nutzung dar.[...]
+
+In other words: Private, noncomercial, moderate use of the API is tolerated. They don’t consider data mining as moderate use. (This is not a legal advice)
+
+#### Options
+
+**Field** | **Type** | **Required** | **Description**
+--- | --- | --- | ---
+**`origin`** | `string` |  Required | Origin of the connection.
+**`destination`** | `string` |  Required | Destination of the connection.
+**`title`** | `string` |  _Optional_ | A custom title to be displayed.
+**`header`** | `bool` |  _Optional_ | Shall the title be shown?
+**`filters`** | `object` |  _Optional_ | Filter results
+**`filters.line`** | `string/array` |  _Optional_ | Filter results for given line(s).
+**`filters.product`** | `string/array` |  _Optional_ | Filter results for specific product (TRAM, UBAHN, SBAHN, BUS).
+**`filters.destination`** | `string/object` |  _Optional_ | Filter results for specific destination(s)
+
+```yaml
+- type: mvg-connection
+  options:
+    from: Marienplatz
+    from: Dachauer Straße 123
+    header: true
+    filters:
+      product: [UBAHN]
+      line: [U1,U2,U4,U5]
+
+```
+
+#### Info
+
+- **CORS**: 🟢 Enabled
+- **Auth**: 🟢 Not Required
+- **Price**: 🟢 Free / Private use only
+- **Host**: [MVG](https://mvg.de)
+- **Privacy**: _See [MVG Datenschutz](https://www.mvg.de/datenschutz-mvg.html)_
 
 ---
 
diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue
new file mode 100644
index 00000000..9f644c7c
--- /dev/null
+++ b/src/components/Widgets/MvgConnection.vue
@@ -0,0 +1,376 @@
+<template>
+<div class="mvg-connections-outer-wrapper">
+  <div class="mvg-connections-header" v-if="showTitle">{{ connectionName }}</div>
+  <div class="mvg-wrapper" v-if="connections">
+    <div
+      v-for="connection in connections"
+      v-bind:key="connection.uniqueId"
+      class="line"
+        v-tooltip="mvgTooltipConnection(connection)"
+    >
+      <div
+      class="departure"
+      >
+        <span class="time"
+        >
+          {{connection.parts[0].from.plannedDeparture | formatTime}}
+        </span>
+        <span class="delay"
+          :class="{'has-delay': connection.parts[0].from.departureDelayInMinutes > 0}"
+        >{{ Math.max(parseInt(connection.parts[0].from.departureDelayInMinutes) || 0, 0) }}</span>
+      </div>
+      <div
+      class="changes"
+      >
+        <template
+          v-for="(part,index) in connection.parts"
+        >
+          <span
+            v-if="index > 0"
+            v-bind:key="'change-' + index"
+            class="change"
+            v-tooltip="part.from.name"
+          >⬌</span>
+          <span
+            v-bind:key="'transport-' + index"
+              :class="['type-' + part.line.transportType,
+              'line-' + part.line.label,
+              ]"
+            v-if="part.line.transportType != 'PEDESTRIAN'"
+            class="transport"
+          >{{part.line.label}}</span>
+          <span v-else
+            v-bind:key="'transport-' + index"
+          >🚶</span>
+        </template>
+      </div>
+      <span class="time">
+        {{Date.parse(connection.parts[connection.parts.length-1]
+            .to.plannedDeparture) - Date.parse(connection.parts[0]
+              .from.plannedDeparture) | formatDuration}}
+      </span>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import WidgetMixin from '@/mixins/WidgetMixin';
+import { widgetApiEndpoints } from '@/utils/defaults';
+
+export default {
+  mixins: [WidgetMixin],
+  components: {},
+  data() {
+    return {
+      connections: null,
+      locationSearch: null,
+      connectionName: null,
+      defaultTitle: "Connection",
+      locations: {
+        origin: undefined,
+        destination: undefined,
+      },
+    };
+  },
+  created() {
+    const promStart = this.getLocationId(this.start);
+    const promEnd = this.getLocationId(this.end);
+    Promise.all([promStart, promEnd]).then(
+      (results) => {
+        [this.locations.origin, this.locations.destination] = results.map((r) => r[0]);
+        this.defaultTitle = `${this.locations.origin.name} - ${this.locations.destination.name}`;
+        this.fetchData();
+      },
+    );
+  },
+  filters: {
+    formatDepartureTime(timestamp) {
+      const msDifference = new Date(timestamp).getTime() - new Date().getTime();
+      const diff = Math.max(0, Math.round(msDifference / 60000));
+      return diff;
+    },
+    limitLength(str) {
+      return str;
+    },
+    formatTime(str) {
+      const d = new Date(Date.parse(str));
+      function ii(i) {
+        let s = `${i}`;
+        if (s.length < 2) s = `0${s}`;
+        return s;
+      }
+      return `${ii(d.getHours())}:${ii(d.getMinutes())}`;
+    },
+    formatDuration(val) {
+      function ii(i) {
+        let s = `${i}`;
+        if (s.length < 2) s = `0${s}`;
+        return s;
+      }
+      return `${Math.floor(val / 3600000, 0)}:${ii(Math.floor(val / 60000, 0))}`;
+    },
+  },
+  computed: {
+    start() {
+      return this.options.from || this.options.start || this.options.origin || 'Marienplatz';
+    },
+    end() {
+      return this.options.to || this.options.end || this.options.destination || 'Giesing';
+    },
+    title() {
+      if (this.options.title) {
+        return this.options.title;
+      }
+      return this.defaultTitle;
+    },
+    showTitle() {
+      return (this.options.header) ? this.options.header : true;
+    },
+    transportTypes() {
+      if (this.options.transportations) {
+        return this.options.transportations.join(',');
+      }
+      return 'UBAHN,TRAM,BUS,SBAHN';
+    },
+  },
+  methods: {
+    formatPoint(point, typ) {
+      if (point.type === 'ADDRESS' || point.type === 'POI') {
+        return `${typ}Latitude=${point.latitude}&${typ}Longitude=${point.longitude}`;
+      }
+      return `${typ}StationGlobalId=${point.globalId}`;
+    },
+    isLocationId(loc) {
+      if (!loc) {
+        this.error('Location is required');
+      }
+      if (typeof loc !== 'string') this.error('Location can only be a string');
+      return (loc.startsWith('de:09162:'));
+    },
+    getLocationId(loc) {
+      return this.makeRequest(this.getEndpointLocation(loc));
+    },
+    getEndpointLocation(loc) {
+      return `${widgetApiEndpoints.mvg}/location?query=${encodeURIComponent(loc)}`;
+    },
+    endpointConnection() {
+      return `${widgetApiEndpoints.mvg}/connection?${this.formatPoint(this.locations.origin, 'origin')}&${this.formatPoint(this.locations.destination, 'destination')}&routingDateTime=${(new Date()).toISOString()}&limit=30&offsetInMinutes=${this.offset}&transportTypes=${this.transportTypes}`;
+    },
+    update() {
+      this.startLoading();
+      this.fetchData();
+      this.finishLoading();
+    },
+    fetchData() {
+      if (this.locations.origin !== undefined
+          && this.locations.destination !== undefined) {
+        this.makeRequest(this.endpointConnection()).then(
+          (response) => { this.processData(response); },
+        );
+      }
+    },
+    /* Assign data variables to the returned data */
+    processData(data) {
+      this.connections = data;
+    },
+    ensure_array(value) {
+      if (typeof value === 'string') {
+        return [value];
+      }
+      return value;
+    },
+    mvgTooltipConnection(data) {
+      let connectionDetails = '';
+      const self = this;
+      function addStep(step) {
+        connectionDetails += `<b>${self.$options.filters.formatTime(step.plannedDeparture)}</b>
+          <span class="delay">+${Math.max(parseInt(step.departureDelayInMinutes, 10) || 0, 0)}</span>
+          <span>${step.name}</span>`;
+      }
+      addStep(data.parts[0].from);
+      data.parts.forEach((part) => {
+        addStep(part.to);
+      });
+      return {
+        content: connectionDetails, html: true, trigger: 'hover', delay: 250, classes: 'mvg-connection-detail',
+      };
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.mvg-header {
+   color: var(--widget-text-color);
+   font-size:1.2em;
+}
+.mvg-wrapper {
+  display: grid;
+  justify-content: left;
+  grid-template-columns: 100%;
+  color: var(--widget-text-color);
+  padding: 0.25rem 0;
+  grid-row-gap: 0.4em;
+  .departure {
+    min-width: 1rem;
+    font-size: 1.1rem;
+    font-weight: bold;
+    text-align: right;
+    margin-right: 0.2rem;
+    span.live {
+      color: var(--success);
+    }
+  }
+  .line {
+    margin: 0em;
+    padding: 0em;
+    border-radius: 0.2em;
+    display: grid;
+    grid-template-columns: 2fr 5fr 0.75fr;
+    .changes {
+      text-align: center;
+    }
+    .type-UBAHN {
+      border: 0px;
+    }
+    .type-SBAHN {
+      border: 0px;
+    }
+    .type-BUS {
+    }
+    .type-TRAM {
+        background-color: #dd3d4d;
+    }
+    .transport{
+      border-radius: 0.2em;
+      margin: 0em;
+      padding: 0.15em 0.15em;
+      color: #FFFFFF;
+      margin-right: 0.40em;
+      margin-left: 0.40em;
+      text-align: center;
+      over
+      span {
+        min-width: 2em;
+        display: inline-block;
+      }
+      &.line-Fussweg {
+            text-indent: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+      }
+      &.line-U1 {
+        background-color: #468447;
+      }
+      &.line-U2 {
+        background-color: #dd3d4d;
+      }
+      &.line-U3 {
+        background-color: #ef8824;
+      }
+      &.line-U4 {
+        background-color: #04af90;
+      }
+      &.line-U5 {
+        background-color: #b78730;
+      }
+      &.line-U6 {
+        background-color: #0472b3;
+      }
+      &.line-S1 {
+        background-color: #79c6e7;
+      }
+      &.line-S2 {
+        background-color: #9bc04c;
+      }
+      &.line-S3 {
+        background-color: #942d8d;
+      }
+      &.line-S4 {
+        background-color: #d4214d;
+      }
+      &.line-S5 {
+        background-color: #03a074;
+      }
+      &.line-S6 {
+        background-color: #03a074;
+      }
+      &.line-S7 {
+        background-color: #964438;
+      }
+      &.line-S8 {
+        background-color: #000000;
+      }
+      &.type-BUS {
+        background-color: #0d5c70;
+      }
+    }
+    .destination{
+      border-radius: 0.2em;
+      width: 100%;
+      background-color: #FFFFFF;
+      color: #000;
+      padding-top: 0.15em;
+      padding-bottom: 0.15em;
+      white-space: nowrap;
+      overflow: hidden;
+      span.cancelled {
+        color: var(--danger);
+        text-decoration: line-through;
+      }
+      span.destination {
+        overflow: clip;
+        margin-right: 0.25em;
+        width: 75%;
+        display: inline-block;
+      }
+    }
+
+    .delay{
+      padding: 0.15em;
+      font-weight: bold;
+      &.has-delay{
+        padding: 0.15em;
+        background-color: var(--danger);
+        color: #FFF;
+        border-radius: 0.2em;
+      }
+    }
+    .delay::before{
+      content: "+";
+    }
+    .occupancy{
+      display: inline-block;
+      padding: 0 0.15em;
+      border-radius: 0.2em;
+      &.occupancy-LOW {
+        color: green;
+      }
+      &.occupancy-MEDIUM {
+        color: orange;
+      }
+      &.occupancy-HIGH {
+        color: red;
+      }
+    }
+  }
+  &:not(:last-child) {
+    border-bottom: 1px dashed var(--widget-text-color);
+  }
+}
+
+</style>
+
+<style lang="scss">
+.ping-times-tt {
+  min-width: 20rem;
+}
+</style>
+<style lang="scss">
+.mvg-connection-detail .tooltip-inner {
+  min-width: 20rem;
+  display: grid;
+  grid-template-columns: 2fr 1fr 6fr;
+}
+</style>
diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue
index 60d25bb9..98f333a2 100644
--- a/src/components/Widgets/WidgetBase.vue
+++ b/src/components/Widgets/WidgetBase.vue
@@ -83,6 +83,7 @@ const COMPAT = {
   joke: 'Jokes',
   'mullvad-status': 'MullvadStatus',
   mvg: 'Mvg',
+  'mvg-connection': 'MvgConnection',
   'nd-cpu-history': 'NdCpuHistory',
   'nd-load-history': 'NdLoadHistory',
   'nd-ram-history': 'NdRamHistory',

From 1e84f51825c62962b589283ff8d3cf9ce136cb17 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Sun, 22 Jan 2023 15:50:02 +0100
Subject: [PATCH 3/5] Fixed deepscan analysis warnings

---
 src/components/Widgets/Mvg.vue           | 4 +---
 src/components/Widgets/MvgConnection.vue | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/Widgets/Mvg.vue b/src/components/Widgets/Mvg.vue
index 564d25de..a4f74c8b 100644
--- a/src/components/Widgets/Mvg.vue
+++ b/src/components/Widgets/Mvg.vue
@@ -135,9 +135,7 @@ export default {
     },
     filter_results(value) {
       if (!this.options.filters) return true;
-      let useEntry = true;
-      useEntry = useEntry
-        && (
+      let useEntry = (
           (!this.options.filters.line)
             || this.ensure_array(this.options.filters.line).includes(value.label)
         );
diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue
index 9f644c7c..2bd76da1 100644
--- a/src/components/Widgets/MvgConnection.vue
+++ b/src/components/Widgets/MvgConnection.vue
@@ -108,7 +108,7 @@ export default {
         if (s.length < 2) s = `0${s}`;
         return s;
       }
-      return `${Math.floor(val / 3600000, 0)}:${ii(Math.floor(val / 60000, 0))}`;
+      return `${Math.floor(val / 3600000)}:${ii(Math.floor(val / 60000))}`;
     },
   },
   computed: {

From 75b06f8af80b14f44f40b92b18df994729dd53d8 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Sun, 22 Jan 2023 15:51:34 +0100
Subject: [PATCH 4/5] Fix CodeSonar warnings

---
 src/components/Widgets/Mvg.vue           | 1 -
 src/components/Widgets/MvgConnection.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/Widgets/Mvg.vue b/src/components/Widgets/Mvg.vue
index a4f74c8b..fa9ff3f7 100644
--- a/src/components/Widgets/Mvg.vue
+++ b/src/components/Widgets/Mvg.vue
@@ -240,7 +240,6 @@ export default {
       color: #FFFFFF;
       margin-right: 0.40em;
       text-align: center;
-      over
       span {
         min-width: 2em;
         display: inline-block;
diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue
index 2bd76da1..998e6356 100644
--- a/src/components/Widgets/MvgConnection.vue
+++ b/src/components/Widgets/MvgConnection.vue
@@ -250,7 +250,6 @@ export default {
       margin-right: 0.40em;
       margin-left: 0.40em;
       text-align: center;
-      over
       span {
         min-width: 2em;
         display: inline-block;

From 59118a54dd84ad39f1b197dcb32b606d2dfedd58 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Sun, 22 Jan 2023 18:22:24 +0100
Subject: [PATCH 5/5] Fixed as suggested

---
 src/components/Widgets/Mvg.vue           | 7 +------
 src/components/Widgets/MvgConnection.vue | 5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/Widgets/Mvg.vue b/src/components/Widgets/Mvg.vue
index fa9ff3f7..166eed00 100644
--- a/src/components/Widgets/Mvg.vue
+++ b/src/components/Widgets/Mvg.vue
@@ -72,12 +72,8 @@ export default {
       const diff = Math.max(0, Math.round(msDifference / 60000));
       return diff;
     },
-    limitLength(str) {
-      return str;
-    },
   },
   computed: {
-    /* API endpoint, either for self-hosted or managed instance */
     isLocationId() {
       if (!this.options.location) {
         this.error('Location is required');
@@ -91,8 +87,7 @@ export default {
       return 0;
     },
     limit() {
-      if (this.options.limit) return this.options.limit;
-      return 10;
+      return this.options.limit || 10;
     },
     endpointDeparture() {
       return `${widgetApiEndpoints.mvg}/departure?globalId=${this.location}&limit=30&offsetInMinutes=${this.offset}&transportTypes=UBAHN,TRAM,BUS,SBAHN`;
diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue
index 998e6356..b4eae501 100644
--- a/src/components/Widgets/MvgConnection.vue
+++ b/src/components/Widgets/MvgConnection.vue
@@ -90,9 +90,6 @@ export default {
       const diff = Math.max(0, Math.round(msDifference / 60000));
       return diff;
     },
-    limitLength(str) {
-      return str;
-    },
     formatTime(str) {
       const d = new Date(Date.parse(str));
       function ii(i) {
@@ -155,7 +152,7 @@ export default {
       return `${widgetApiEndpoints.mvg}/location?query=${encodeURIComponent(loc)}`;
     },
     endpointConnection() {
-      return `${widgetApiEndpoints.mvg}/connection?${this.formatPoint(this.locations.origin, 'origin')}&${this.formatPoint(this.locations.destination, 'destination')}&routingDateTime=${(new Date()).toISOString()}&limit=30&offsetInMinutes=${this.offset}&transportTypes=${this.transportTypes}`;
+      return `${widgetApiEndpoints.mvg}/connection?${this.formatPoint(this.locations.origin, 'origin')}&${this.formatPoint(this.locations.destination, 'destination')}&routingDateTime=${(new Date()).toISOString()}&offsetInMinutes=${this.offset}&transportTypes=${this.transportTypes}`;
     },
     update() {
       this.startLoading();