Merge pull request #451 from mrc-ide/nm-17

[NM-17] uncertainty ranges in tooltips

inst/metadata/metadata.csv

@@ -1,12 +1,12 @@
 data_type,plot_type,indicator,value_column,error_low_column,error_high_column,indicator_column,indicator_value,name,scale,accuracy,format
-survey,choropleth,prevalence,estimate,,,indicator,prevalence,t_(HIV_PREVALENCE),1,,"""0.0%"""
-survey,choropleth,art_coverage,estimate,,,indicator,art_coverage,t_(ART_COVERAGE),1,,"""0.0%"""
+survey,choropleth,prevalence,estimate,ci_lower,ci_upper,indicator,prevalence,t_(HIV_PREVALENCE),1,,"""0.0%"""
+survey,choropleth,art_coverage,estimate,ci_lower,ci_upper,indicator,art_coverage,t_(ART_COVERAGE),1,,"""0.0%"""
 programme,choropleth,art_current,art_current,,,,,t_(ART_NUMBER_ATTENDING),1,100,"""0,0"""
 programme,choropleth,art_new,art_new,,,,,t_(ART_NEW_TOTAL),1,100,"""0,0"""
 programme,choropleth,vl_tested_12mos,vl_tested_12mos,,,,,t_(VL_TESTED_12MOS_TOTAL),1,100,"""0,0"""
 programme,choropleth,vl_suppressed_12mos,vl_suppressed_12mos,,,,,t_(VL_SUPPRESSED_12MOS_TOTAL),1,100,"""0,0"""
-survey,choropleth,recent_infected,estimate,,,indicator,recent_infected,t_(PROPORTION_RECENTLY_INFECTED),1,1,"""0.00%"""
-survey,choropleth,viral_suppression_plhiv,estimate,,,indicator,viral_suppression_plhiv,t_(VLS),1,,"""0.0%"""
+survey,choropleth,recent_infected,estimate,ci_lower,ci_upper,indicator,recent_infected,t_(PROPORTION_RECENTLY_INFECTED),1,1,"""0.00%"""
+survey,choropleth,viral_suppression_plhiv,estimate,ci_lower,ci_upper,indicator,viral_suppression_plhiv,t_(VLS),1,,"""0.0%"""
 anc,choropleth,anc_prevalence,anc_prevalence,,,,,t_(ANC_HIV_PREVALENCE),1,,"""0.0%"""
 anc,choropleth,anc_art_coverage,anc_art_coverage,,,,,t_(ANC_PRIOR_ART_COVERAGE),1,,"""0.0%"""
 output,choropleth,prevalence,mean,lower,upper,indicator,prevalence,t_(HIV_PREVALENCE),1,,"""0.0%"""