Remove redundant [ADDITIONAL] tag from data sources
Browse files- src/primepy/demo.py +2 -2
- src/primepy/ui_app.py +6 -6
src/primepy/demo.py
CHANGED
|
@@ -394,7 +394,7 @@ def run_demo_and_export(
|
|
| 394 |
|
| 395 |
# Determine population data source
|
| 396 |
if params.use_new_turkish_population:
|
| 397 |
-
pop_source = f"TÜİK (2007-2024)
|
| 398 |
pop_link = "https://data.tuik.gov.tr"
|
| 399 |
else:
|
| 400 |
pop_source = f"PRIME R ({pop_year_str})"
|
|
@@ -410,7 +410,7 @@ def run_demo_and_export(
|
|
| 410 |
gdp_source = "PRIME R (placeholder)"
|
| 411 |
gdp_link = ""
|
| 412 |
else:
|
| 413 |
-
gdp_source = "World Bank (2024)
|
| 414 |
gdp_link = "https://data.worldbank.org/indicator/NY.GDP.MKTP.CD?locations=TR"
|
| 415 |
|
| 416 |
sources_df = pd.DataFrame(
|
|
|
|
| 394 |
|
| 395 |
# Determine population data source
|
| 396 |
if params.use_new_turkish_population:
|
| 397 |
+
pop_source = f"TÜİK (2007-2024)"
|
| 398 |
pop_link = "https://data.tuik.gov.tr"
|
| 399 |
else:
|
| 400 |
pop_source = f"PRIME R ({pop_year_str})"
|
|
|
|
| 410 |
gdp_source = "PRIME R (placeholder)"
|
| 411 |
gdp_link = ""
|
| 412 |
else:
|
| 413 |
+
gdp_source = "World Bank (2024)"
|
| 414 |
gdp_link = "https://data.worldbank.org/indicator/NY.GDP.MKTP.CD?locations=TR"
|
| 415 |
|
| 416 |
sources_df = pd.DataFrame(
|
src/primepy/ui_app.py
CHANGED
|
@@ -549,8 +549,8 @@ def main() -> None:
|
|
| 549 |
st.markdown("| Data | Source |")
|
| 550 |
st.markdown("|------|--------|")
|
| 551 |
for _, row in display_df.iterrows():
|
| 552 |
-
# Highlight
|
| 553 |
-
if '
|
| 554 |
bg_style = " 🟢"
|
| 555 |
elif 'placeholder' in row['Source'].lower():
|
| 556 |
bg_style = " 🟠"
|
|
@@ -561,8 +561,8 @@ def main() -> None:
|
|
| 561 |
st.markdown("")
|
| 562 |
st.markdown("""
|
| 563 |
**PRIME R** = Data from the PRIME model (LSHTM)
|
| 564 |
-
🟢
|
| 565 |
-
🟠
|
| 566 |
|
| 567 |
**PRIME Data Sources:**
|
| 568 |
- Incidence/Mortality/Prevalence: GLOBOCAN (IARC/WHO)
|
|
@@ -711,12 +711,12 @@ def main() -> None:
|
|
| 711 |
|
| 712 |
# Determine population source for display
|
| 713 |
if has_new_pop_data and use_new_population:
|
| 714 |
-
pop_source_display = "[TÜİK (2007-2024)
|
| 715 |
else:
|
| 716 |
pop_source_display = "PRIME R (UNWPP)"
|
| 717 |
|
| 718 |
# Determine GDP source for display
|
| 719 |
-
gdp_source_display = "[World Bank (2024)
|
| 720 |
|
| 721 |
# Create display data
|
| 722 |
display_data = [
|
|
|
|
| 549 |
st.markdown("| Data | Source |")
|
| 550 |
st.markdown("|------|--------|")
|
| 551 |
for _, row in display_df.iterrows():
|
| 552 |
+
# Highlight non-PRIME sources
|
| 553 |
+
if 'PRIME R' not in row['Source']:
|
| 554 |
bg_style = " 🟢"
|
| 555 |
elif 'placeholder' in row['Source'].lower():
|
| 556 |
bg_style = " 🟠"
|
|
|
|
| 561 |
st.markdown("")
|
| 562 |
st.markdown("""
|
| 563 |
**PRIME R** = Data from the PRIME model (LSHTM)
|
| 564 |
+
🟢 = Turkey-specific enhancements (click links for source data)
|
| 565 |
+
🟠 = Default placeholder values
|
| 566 |
|
| 567 |
**PRIME Data Sources:**
|
| 568 |
- Incidence/Mortality/Prevalence: GLOBOCAN (IARC/WHO)
|
|
|
|
| 711 |
|
| 712 |
# Determine population source for display
|
| 713 |
if has_new_pop_data and use_new_population:
|
| 714 |
+
pop_source_display = "[TÜİK (2007-2024)](https://data.tuik.gov.tr)"
|
| 715 |
else:
|
| 716 |
pop_source_display = "PRIME R (UNWPP)"
|
| 717 |
|
| 718 |
# Determine GDP source for display
|
| 719 |
+
gdp_source_display = "[World Bank (2024)](https://data.worldbank.org/indicator/NY.GDP.MKTP.CD?locations=TR)"
|
| 720 |
|
| 721 |
# Create display data
|
| 722 |
display_data = [
|