Skip to content
Snippets Groups Projects
Commit d932cb14 authored by Cee Nell's avatar Cee Nell
Browse files

modify data import to use json instead of csv

parent e0b48282
No related branches found
No related tags found
1 merge request!66Add Spanish translation
dimension,determinant,determinant_wrapped,pos_related_total,neg_related_total,unrelated_total,unk_direction_total,evidence_val,sig_value,level_agreement,evidence_bin,agreement_bin dimension,determinant,determinant_wrapped,pos_related_total,neg_related_total,unrelated_total,unk_direction_total,evidence_val,sig_value,level_agreement,evidence_bin,agreement_bin,determinant_es
Demographic characteristics,Age,Age,28,5,0,3,36,28,77.77777777777779,Large,High Demographic characteristics,Age,Age,28,5,0,3,36,28,77.77777777777779,Large,High,Edad
Demographic characteristics,Citizenship,Citizenship,1,2,0,0,3,2,66.66666666666666,Small,Medium Demographic characteristics,Citizenship,Citizenship,1,2,0,0,3,2,66.66666666666666,Small,Medium,Ciudadana
Demographic characteristics,Ethnicity and race,Ethnicity and race,44,11,0,3,58,44,75.86206896551724,Large,High Demographic characteristics,Ethnicity and race,Ethnicity and race,44,11,0,3,58,44,75.86206896551724,Large,High,Etnia/raza
Demographic characteristics,Family structure,Family structure,9,2,0,1,12,9,75,Large,High Demographic characteristics,Family structure,Family structure,9,2,0,1,12,9,75,Large,High,Estructura familiar
Demographic characteristics,Gender,Gender,9,1,0,0,10,9,90,Large,High Demographic characteristics,Gender,Gender,9,1,0,0,10,9,90,Large,High,Gnero
Demographic characteristics,Group facilities,Group facilities,1,0,0,0,1,1,100,Small,High Demographic characteristics,Group facilities,Group facilities,1,0,0,0,1,1,100,Small,High,Instalaciones de grupo
Demographic characteristics,Language proficiency,Language proficiency,8,2,0,0,10,8,80,Large,High Demographic characteristics,Language proficiency,Language proficiency,8,2,0,0,10,8,80,Large,High,Dominio del idioma
Demographic characteristics,Migration,Migration,5,3,0,0,8,5,62.5,Medium,Medium Demographic characteristics,Migration,Migration,5,3,0,0,8,5,62.5,Medium,Medium,Migracin
Demographic characteristics,Political inclination,Political inclination,1,1,0,0,2,1,50,Small,NA Demographic characteristics,Political inclination,Political inclination,1,1,0,0,2,1,50,Small,NA,Inclinacin poltica
Demographic characteristics,Social dependence,Social dependence,5,0,0,0,5,5,100,Medium,High Demographic characteristics,Social dependence,Social dependence,5,0,0,0,5,5,100,Medium,High,Dependencia social
Demographic characteristics,Special needs/ disabilities,Special needs/disabilities,2,0,0,0,2,2,100,Small,High Demographic characteristics,Special needs/ disabilities,Special needs/disabilities,2,0,0,0,2,2,100,Small,High,Necesidades especiales/discapacidades
Exposure,# Of events,# of events,3,0,0,0,3,3,100,Small,High Exposure,# Of events,# of events,3,0,0,0,3,3,100,Small,High,N. de ocurrencias
Exposure,Exposed areas / facilities,Exposed areas/facilities,13,3,0,6,22,13,59.09090909090909,Large,Medium Exposure,Exposed areas / facilities,Exposed areas/facilities,13,3,0,6,22,13,59.09090909090909,Large,Medium,reas/instalaciones expuestas
Exposure,Exposed population,Exposed population,7,0,0,0,7,7,100,Medium,High Exposure,Exposed population,Exposed population,7,0,0,0,7,7,100,Medium,High,Poblacin expuesta
Exposure,Hazard extent,Hazard extent,11,2,0,0,13,11,84.61538461538461,Large,High Exposure,Hazard extent,Hazard extent,11,2,0,0,13,11,84.61538461538461,Large,High,rea de riesgo
Exposure,Losses suffered,Losses suffered,7,2,0,0,9,7,77.77777777777779,Medium,High Exposure,Losses suffered,Losses suffered,7,2,0,0,9,7,77.77777777777779,Medium,High,Prdidas sufridas
Exposure,Mitigation,Mitigation,4,9,0,2,15,9,60,Large,Medium Exposure,Mitigation,Mitigation,4,9,0,2,15,9,60,Large,Medium,Mitigacin
Exposure,Other - physical considerations,Other - physical factors,24,11,0,8,43,24,55.81395348837209,Large,Medium Exposure,Other - physical considerations,Other - physical factors,24,11,0,8,43,24,55.81395348837209,Large,Medium,Otros -- factores fsicos
Exposure,Preparedness,Preparedness,2,3,0,0,5,3,60,Medium,Medium Exposure,Preparedness,Preparedness,2,3,0,0,5,3,60,Medium,Medium,Prevencin
Health,Access,Access,4,1,0,0,5,4,80,Medium,High Health,Access,Access,4,1,0,0,5,4,80,Medium,High,Acceso
Health,Caloric intake/ food insecurity,Calories/food Insecurity,0,1,0,0,1,1,100,Small,High Health,Caloric intake/ food insecurity,Calories/food Insecurity,0,1,0,0,1,1,100,Small,High,Caloras/Inseguridad alimentaria
Health,Disease burden / morbidity,Disease/morbidity,2,1,0,0,3,2,66.66666666666666,Small,Medium Health,Disease burden / morbidity,Disease/morbidity,2,1,0,0,3,2,66.66666666666666,Small,Medium,Enfermedad/morbilidad
Health,Life expectancy,Life expectancy,0,1,0,0,1,1,100,Small,High Health,Life expectancy,Life expectancy,0,1,0,0,1,1,100,Small,High,Esperanza de vida
Health,Mortality,Mortality,1,0,0,0,1,1,100,Small,High Health,Mortality,Mortality,1,0,0,0,1,1,100,Small,High,Mortalidad
Health,Potable water access,Potable water access,2,2,1,0,5,2,40,Medium,Low Health,Potable water access,Potable water access,2,2,1,0,5,2,40,Medium,Low,Acceso a agua potable
Health,Sanitation,Sanitation,1,0,0,0,1,1,100,Small,High Health,Sanitation,Sanitation,1,0,0,0,1,1,100,Small,High,Saneamiento
Land tenure,Owners,Owners,5,1,0,3,9,5,55.55555555555556,Medium,Medium Land tenure,Owners,Owners,5,1,0,3,9,5,55.55555555555556,Medium,Medium,Propietarios
Land tenure,Private property,Private property,0,0,0,1,1,1,100,Small,High Land tenure,Private property,Private property,0,0,0,1,1,1,100,Small,High,Propiedad privada
Land tenure,Renters,Renters,7,5,0,0,12,7,58.333333333333336,Large,Medium Land tenure,Renters,Renters,7,5,0,0,12,7,58.333333333333336,Large,Medium,Personas que alquilan
Land tenure,Tenure length,Tenure length,2,1,0,0,3,2,66.66666666666666,Small,Medium Land tenure,Tenure length,Tenure length,2,1,0,0,3,2,66.66666666666666,Small,Medium,Duracin de la tenencia
Living conditions,Housing quality,Housing quality,2,0,0,0,2,2,100,Small,High Living conditions,Housing quality,Housing quality,2,0,0,0,2,2,100,Small,High,Calidad de la vivienda
Living conditions,Housing type,Housing type,2,0,0,0,2,2,100,Small,High Living conditions,Housing type,Housing type,2,0,0,0,2,2,100,Small,High,Tipo de vivienda
Living conditions,Land use,Land use,8,4,0,1,13,8,61.53846153846154,Large,Medium Living conditions,Land use,Land use,8,4,0,1,13,8,61.53846153846154,Large,Medium,Uso del terreno
Living conditions,Lifelines & infrastructure,Infrastructure,8,2,0,3,13,8,61.53846153846154,Large,Medium Living conditions,Lifelines & infrastructure,Infrastructure,8,2,0,3,13,8,61.53846153846154,Large,Medium,Infraestructura
Living conditions,Population,Population,13,2,0,4,19,13,68.42105263157895,Large,Medium Living conditions,Population,Population,13,2,0,4,19,13,68.42105263157895,Large,Medium,Poblacin
Living conditions,Resource dependence,Resource dependence,9,1,0,1,11,9,81.81818181818183,Large,High Living conditions,Resource dependence,Resource dependence,9,1,0,1,11,9,81.81818181818183,Large,High,Dependencia de los recursos
Living conditions,Rurality,Rurality,3,5,0,0,8,5,62.5,Medium,Medium Living conditions,Rurality,Rurality,3,5,0,0,8,5,62.5,Medium,Medium,Ruralidad
Living conditions,Socially isolated populations,Isolated populations,1,0,0,0,1,1,100,Small,High Living conditions,Socially isolated populations,Isolated populations,1,0,0,0,1,1,100,Small,High,Poblaciones aisladas
Living conditions,Urbanization,Urbanization,4,3,0,0,7,4,57.14285714285714,Medium,Medium Living conditions,Urbanization,Urbanization,4,3,0,0,7,4,57.14285714285714,Medium,Medium,Urbanizacin
Living conditions,Vacant housing units,Vacant housing units,3,0,0,0,3,3,100,Small,High Living conditions,Vacant housing units,Vacant housing units,3,0,0,0,3,3,100,Small,High,Viviendas vacas
Living conditions,Vehicular access,Vehicular access,6,0,0,1,7,6,85.71428571428571,Medium,High Living conditions,Vehicular access,Vehicular access,6,0,0,1,7,6,85.71428571428571,Medium,High,Acceso con vehculo
Risk perception,Awareness,Awareness,4,3,0,1,8,4,50,Medium,NA Risk perception,Awareness,Awareness,4,3,0,1,8,4,50,Medium,NA,Conciencia
Risk perception,Prior experience,Prior experience,6,3,0,0,9,6,66.66666666666666,Medium,Medium Risk perception,Prior experience,Prior experience,6,3,0,0,9,6,66.66666666666666,Medium,Medium,Experiencia previa
Risk perception,Risk denial/ acceptance,Risk denial/acceptance,3,3,0,0,6,3,50,Medium,NA Risk perception,Risk denial/ acceptance,Risk denial/acceptance,3,3,0,0,6,3,50,Medium,NA,Negacin/aceptacin del riesgo
Risk perception,Social capital,Social capital,1,4,0,0,5,4,80,Medium,High Risk perception,Social capital,Social capital,1,4,0,0,5,4,80,Medium,High,Capital social
Risk perception,Trust in officials,Trust in officials,1,1,0,2,4,2,50,Small,NA Risk perception,Trust in officials,Trust in officials,1,1,0,2,4,2,50,Small,NA,Confianza en los funcionarios
Socioeconomic status,Access to basic needs,Access to basic needs,1,0,0,0,1,1,100,Small,High Socioeconomic status,Access to basic needs,Access to basic needs,1,0,0,0,1,1,100,Small,High,Acceso a necesidades bsicas
Socioeconomic status,Education,Education,15,6,0,0,21,15,71.42857142857143,Large,Medium Socioeconomic status,Education,Education,15,6,0,0,21,15,71.42857142857143,Large,Medium,Educacin
Socioeconomic status,Employment,Employment,8,1,0,0,9,8,88.88888888888889,Medium,High Socioeconomic status,Employment,Employment,8,1,0,0,9,8,88.88888888888889,Medium,High,Empleo
Socioeconomic status,House value,House value,1,4,0,0,5,4,80,Medium,High Socioeconomic status,House value,House value,1,4,0,0,5,4,80,Medium,High,Valor de la vivienda
Socioeconomic status,Income,Income,14,18,0,1,33,18,54.54545454545454,Large,Medium Socioeconomic status,Income,Income,14,18,0,1,33,18,54.54545454545454,Large,Medium,Ingresos
Socioeconomic status,Literacy,Literacy,0,2,0,0,2,2,100,Small,High Socioeconomic status,Literacy,Literacy,0,2,0,0,2,2,100,Small,High,Alfabetismo
Socioeconomic status,Median rent,Median rent,1,4,0,0,5,4,80,Medium,High Socioeconomic status,Median rent,Median rent,1,4,0,0,5,4,80,Medium,High,Media de alquiler
Socioeconomic status,Occupation,Occupation,7,1,0,1,9,7,77.77777777777779,Medium,High Socioeconomic status,Occupation,Occupation,7,1,0,1,9,7,77.77777777777779,Medium,High,Profesin
Socioeconomic status,Wealth,Wealth,17,1,0,0,18,17,94.44444444444444,Large,High Socioeconomic status,Wealth,Wealth,17,1,0,0,18,17,94.44444444444444,Large,High,Riqueza
\ No newline at end of file \ No newline at end of file
...@@ -95,7 +95,6 @@ ...@@ -95,7 +95,6 @@
} }
}, },
mounted() { mounted() {
console.log(this.appTitle)
this.showAuthors = this.primaryAuthors.length > 0 ? true : false // Show author statements for any authors this.showAuthors = this.primaryAuthors.length > 0 ? true : false // Show author statements for any authors
this.showAdditionalAuthors = this.additionalAuthors.length > 0 ? true : false // Show author statements for additional authors if any are listed this.showAdditionalAuthors = this.additionalAuthors.length > 0 ? true : false // Show author statements for additional authors if any are listed
this.showAditionalContributionStatement = this.additionalAuthors.length > 0 ? true : false // Show contributions statements for additional authors if any are listed AND showContributionStatements is true this.showAditionalContributionStatement = this.additionalAuthors.length > 0 ? true : false // Show contributions statements for additional authors if any are listed AND showContributionStatements is true
......
...@@ -73,14 +73,11 @@ import * as d3 from 'd3'; ...@@ -73,14 +73,11 @@ import * as d3 from 'd3';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
const { t } = useI18n(); const { t } = useI18n();
const userLang = navigator.language || navigator.userLanguage;
console.log(t('text.components.chartText.bubbleCheckbox')); // Check if this logs the correct text const isSpanish = userLang.startsWith('es');
// Global variables // Global variables
const publicPath = import.meta.env.BASE_URL; const publicPath = import.meta.env.BASE_URL;
const dataSet1 = ref([]);
const dataSet2 = ref([]);
const selectedDataSet = ref('dataSet1');
const data = ref([]); const data = ref([]);
// Set up SVG // Set up SVG
...@@ -142,7 +139,7 @@ function createPattern() { ...@@ -142,7 +139,7 @@ function createPattern() {
.attr('stroke-width', 3); .attr('stroke-width', 3);
} }
function createLegend() { function createLegend() {
const keyW = 30; const keyW = 35;
const keyH = 12; const keyH = 12;
createPattern(); createPattern();
...@@ -167,8 +164,7 @@ function createLegend() { ...@@ -167,8 +164,7 @@ function createLegend() {
// Load data and then make chart // Load data and then make chart
onMounted(async () => { onMounted(async () => {
try { try {
await loadDatasets(); data.value = await loadJsonData('determinant_uncertainty.json');
data.value = selectedDataSet.value === 'dataSet1' ? dataSet1.value : dataSet2.value;
if (data.value.length > 0) { if (data.value.length > 0) {
createBeeswarmChart(); createBeeswarmChart();
createLegend(); createLegend();
...@@ -180,25 +176,10 @@ onMounted(async () => { ...@@ -180,25 +176,10 @@ onMounted(async () => {
} }
}); });
async function loadDatasets() { async function loadJsonData(fileName) {
try {
dataSet1.value = await loadData('determinant_uncertainty.csv');
dataSet2.value = await loadData('indicator_uncertainty.csv');
console.log('data in');
} catch (error) {
console.error('Error loading datasets', error);
}
}
async function loadData(fileName) {
try { try {
const data = await d3.csv(publicPath + fileName, d => { const loadedData = await d3.json(publicPath + fileName);
d.level_agreement = +(+d.level_agreement).toFixed(2); return loadedData;
d.evidence_val = +d.evidence_val;
d.sig_value = +d.sig_value;
return d;
});
return data;
} catch (error) { } catch (error) {
console.error(`Error loading data from ${fileName}`, error); console.error(`Error loading data from ${fileName}`, error);
return []; return [];
...@@ -360,8 +341,14 @@ function handleMouseOver(event, d) { ...@@ -360,8 +341,14 @@ function handleMouseOver(event, d) {
const tooltip = d3.select('#tooltip'); const tooltip = d3.select('#tooltip');
const tooltipTemplate = "{determinant} {appeared} {count} {studyLabel}" // construct tempalte of tooltip sentence const tooltipTemplate = "{determinant} {appeared} {count} {studyLabel}" // construct tempalte of tooltip sentence
function getTranslatedDeterminant(d) {
return isSpanish ? d.determinant_es : d.determinant_wrapped;
}
const translatedDeterminant = getTranslatedDeterminant(d);
console.log(translatedDeterminant)
// Dynamic values // Dynamic values
const determinant = `<strong>${d.determinant_wrapped}</strong>`; const determinant = `<strong>${translatedDeterminant}</strong>`;
const count = d.evidence_val; const count = d.evidence_val;
const studyLabel = d.evidence_val === 1 ? t('text.components.chartText.singleStudy') : t('text.components.chartText.multipleStudies'); const studyLabel = d.evidence_val === 1 ? t('text.components.chartText.singleStudy') : t('text.components.chartText.multipleStudies');
const appeared = t('text.components.chartText.appeared'); const appeared = t('text.components.chartText.appeared');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment