Skip to content

Commit

Permalink
Prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
mwbernard committed Dec 21, 2023
1 parent 894ae75 commit 09e427b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions vacs-map-app/src/components/CardWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

<div class="info" :class="{ bold: boldTitle, hasDescription: description }">
<div class="title" :class="{ bold: boldTitle }">
<span> {{ title }} </span>
<span> {{ title }} </span>
<span class="subtitle"> {{ subtitle }} </span>
<img v-if="isDynamic && !isActive" src="../assets/img/arrow-right-pointy.svg" alt="">
<img v-if="isDynamic && !isActive" src="../assets/img/arrow-right-pointy.svg" alt="" />
</div>
<div v-if="indicator" class="indicator">
<span class="indicator-category"> {{ indicator.key }} </span>
Expand Down
4 changes: 1 addition & 3 deletions vacs-map-app/src/components/CropFingerprint.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
<div class="svg-wrapper" ref="wrapperRef">
<svg>
<g class="chart" :transform="`translate(${width / 2}, ${height / 2})`">

<circle class="chart-background" :r="y(11)" fill="#17191b"/>

<circle class="chart-background" :r="y(11)" fill="#17191b" />

<g class="selected-crop-plots">
<path
Expand Down
3 changes: 2 additions & 1 deletion vacs-map-app/src/components/MapLegendCropGroups.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<template>
<div class="map-legend">
<div class="legend-title">
{{ selectedCropInfo?.crop_group }} by largest yield <span class="metric" @click="toggleMetric">{{ metric }}</span>
{{ selectedCropInfo?.crop_group }} by largest yield
<span class="metric" @click="toggleMetric">{{ metric }}</span>
<img src="@/assets/img/info.svg" alt="" @click="openCropGroupModal" />
</div>
<div class="legend-items">
Expand Down
24 changes: 13 additions & 11 deletions vacs-map-app/src/components/MapTooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ const { copy } = storeToRefs(contentStore)
const { data: cropInfo } = storeToRefs(cropInformationStore)
const sentence = computed(() => {
const modelDescriptor =
selectedModel.value === 'future_ssp126'
? 'a low emissions scenario'
: 'a high emissions scenario'
selectedModel.value === 'future_ssp126'
? 'a low emissions scenario'
: 'a high emissions scenario'
if (!showCropGroupMap.value) {
const cropName = selectedCropInfo.value?.label
Expand All @@ -50,28 +49,31 @@ const sentence = computed(() => {
const descriptor = cropGroupMetric.value === 'max' ? 'increase' : 'decrease'
if (hoveredCropId === 'none') {
return `At this location, no ${selectedCropInfo.value.crop_group} are projected to ${descriptor} in yield`
return `At this location, no ${selectedCropInfo.value.crop_group} are projected to ${descriptor} in yield`
}
const hoveredCropName = cropInfo.value.find((d) => d.id === hoveredCropId).label
return `Of the ${selectedCropInfo.value.crop_group}, ${hoveredCropName} is projected to have the greatest yield ${descriptor} (${pFormat(hoveredYieldRatio)}) at this location, in ${modelDescriptor}`
return `Of the ${
selectedCropInfo.value.crop_group
}, ${hoveredCropName} is projected to have the greatest yield ${descriptor} (${pFormat(
hoveredYieldRatio
)}) at this location, in ${modelDescriptor}`
}
})
const selectedCropInfo = computed(() => {
return cropInfo.value?.find((d) => d.id === selectedCrop.value)
})
const hoveredValue = computed(() => {
if (!yieldData.value || !selectedCrop.value || !selectedModel.value || !hoveredId.value) return null
if (!yieldData.value || !selectedCrop.value || !selectedModel.value || !hoveredId.value)
return null
const columnName = !showCropGroupMap.value
const columnName = !showCropGroupMap.value
? ['yieldratio', selectedCrop.value, selectedModel.value].join('_')
: [selectedCropInfo.value?.crop_group, selectedModel.value].join('_')
const cellObject = yieldData.value.find((d) => d.id === hoveredId.value)
if (!cellObject) return null
Expand Down

0 comments on commit 09e427b

Please sign in to comment.