diff --git a/src/charts/aggregate.vue b/src/charts/aggregate.vue
new file mode 100644
index 00000000..e7b18487
--- /dev/null
+++ b/src/charts/aggregate.vue
@@ -0,0 +1,48 @@
+
+aggregate-od.deck-map(
+ :root="fileSystemConfig.slug"
+ :subfolder="subfolder"
+ :config="config"
+ :thumbnail="false"
+)
+
+
+
+
+
+
diff --git a/src/charts/allCharts.ts b/src/charts/allCharts.ts
index 84bc13eb..822d9d3c 100644
--- a/src/charts/allCharts.ts
+++ b/src/charts/allCharts.ts
@@ -15,6 +15,7 @@ import transit from './transit.vue'
import vega from './vega.vue'
// full-screen map visualizations:
+import aggregate from './aggregate.vue'
import carriers from './carriers.vue'
import flowmap from './flowmap.vue'
import links from './links.vue'
@@ -37,7 +38,7 @@ export const plotlyCharts = {
}
// export all remaining charts/maps here:
-export default Object.assign({ carriers, flowmap, links, map }, plotlyCharts)
+export default Object.assign({ aggregate, carriers, flowmap, links, map }, plotlyCharts)
// ----- HELPER FUNCTIONS -----------------------------------------------------
diff --git a/src/plugins/aggregate-od/AggregateOd.vue b/src/plugins/aggregate-od/AggregateOd.vue
index 93ac9d16..c3e671ef 100644
--- a/src/plugins/aggregate-od/AggregateOd.vue
+++ b/src/plugins/aggregate-od/AggregateOd.vue
@@ -1,18 +1,29 @@
.mycomponent(:id="containerId")
- .status-blob(v-show="!thumbnail && loadingText")
- p {{ loadingText }}
zoom-buttons.zoom-buttons(v-if="!thumbnail")
- .map-complications(v-if="!thumbnail && !isMobile()")
- legend-box.complication(:rows="legendRows")
- scale-box.complication(:rows="scaleRows")
-
.map-container
.mymap(:id="mapId")
- collapsible-panel.left-panel(v-if="!thumbnail && !loadingText"
+ .status-blob(v-show="!thumbnail && loadingText")
+ p {{ loadingText }}
+
+ .lower-left(v-if="!thumbnail")
+ .subheading {{ $t('lineWidths')}}
+ scale-slider.scale-slider(:stops='scaleValues' :initialTime='1' @change='bounceScaleSlider')
+
+ .subheading {{ $t('hide')}}
+ line-filter-slider.scale-slider(
+ :initialValue="lineFilter"
+ @change='bounceLineFilter')
+
+ .lower-right(v-if="!thumbnail && !isMobile()")
+ legend-box.complication(:rows="legendRows")
+ scale-box.complication(:rows="scaleRows")
+
+
+ collapsible-panel.left-panel(v-if="!this.config && !thumbnail && !loadingText"
:darkMode="isDarkMode" direction="left" :locked="true")
.info-header(style="padding: 0 0.5rem;")
@@ -21,46 +32,53 @@
.info-description(style="padding: 0 0.5rem;" v-if="this.vizDetails.description")
p.description {{ this.vizDetails.description }}
- .widgets
- h4.heading Uhrzeit
+ .widgets(v-if="!thumbnail" style="{'padding': config ? '0 0'}")
+ .widget-column()
+ h4.heading {{ $t('time')}}
+ label.checkbox(style="margin: 0 0.5rem 0 auto;")
+ input(type="checkbox" v-model="showTimeRange")
+ | {{ $t('duration') }}
time-slider.time-slider(v-if="headers.length > 0"
:useRange='showTimeRange'
:stops='headers'
@change='bounceTimeSlider')
+
+ .widget-column
+ h4.heading {{ $t('Centroids')}}
+ label.checkbox
+ input(type="checkbox" v-model="showCentroids")
+ | {{ $t('showCentroids')}}
label.checkbox
- input(type="checkbox" v-model="showTimeRange")
- | Zeitraum
-
- h4.heading Kreise
- .white-box
- label.checkbox
- input(type="checkbox" v-model="showCentroids")
- | Kreise anzeigen
- label.checkbox
- input(type="checkbox" v-model="showCentroidLabels")
- | Nummern anzeigen
-
- h4.heading Strecken
- .white-box
- .subheading Linienbreiten
- scale-slider.scale-slider(:stops='scaleValues' :initialTime='1' @change='bounceScaleSlider')
-
- .subheading Ausblenden bis
- line-filter-slider.scale-slider(
- :initialValue="lineFilter"
- @change='bounceLineFilter')
-
- h4.heading Insgesamt für
- .buttons-bar
- // {{rowName}}
- button.button(@click='clickedOrigins' :class='{"is-link": isOrigin ,"is-active": isOrigin}') Quellen
- // {{colName}}
- button.button(hint="hide" @click='clickedDestinations' :class='{"is-link": !isOrigin,"is-active": !isOrigin}') Zielorte
+ input(type="checkbox" v-model="showCentroidLabels")
+ | {{$t('showNumbers')}}
+
+ .widget-column(style="margin: 0 0 0 auto")
+ h4.heading {{$t('total')}}
+ button.button(@click='clickedOrigins' :class='{"is-link": isOrigin ,"is-active": isOrigin}') {{$t('origins')}}
+ button.button(hint="hide" @click='clickedDestinations' :class='{"is-link": !isOrigin,"is-active": !isOrigin}') {{$t('dest')}}
-