Merge branch 'main' into feat/dashboard-climate-admin

e-picsa · Oct 14, 2024 · 74314a4 · 74314a4
2 parents 0bd3fe3 + 13ad0e3
commit 74314a4
Show file tree

Hide file tree

Showing 48 changed files with 2,839 additions and 239 deletions.
diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "io.picsa.extension"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3047000
-        versionName "3.47.0"
+        versionCode 3047001
+        versionName "3.47.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/apps/picsa-tools/climate-tool/src/app/data/stations/zm.ts b/apps/picsa-tools/climate-tool/src/app/data/stations/zm.ts
@@ -3,32 +3,308 @@ import type { IStationMeta } from '@picsa/models';
 import merge from 'deepmerge';
 
 const stations: IStationMeta[] = [
+  // Climate system data (merged)
   {
-    id: 'chipata',
-    name: 'Chipata',
-    latitude: -13.3843,
-    longitude: 32.3847,
-    countryCode: 'zm',
-    definitions: CLIMATE_CHART_DEFINTIONS.zm,
+    id: 'chinsali_ftc',
+    name: 'CHINSALI FTC',
+    latitude: -10.56,
+    longitude: 32.06,
+    district: 'CHINSALI',
   },
   {
-    id: 'petauke',
-    name: 'Petauke',
-    latitude: -14.24474,
-    longitude: 31.327641,
-    countryCode: 'zm',
+    id: 'chipata_met',
+    name: 'CHIPATA MET',
+    latitude: -13.55,
+    longitude: 32.58,
+    district: 'CHIPATA',
+  },
+  {
+    id: 'chipepo_met',
+    name: 'CHIPEPO MET',
+    latitude: -17.33,
+    longitude: 28.38,
+    district: 'GWEMBE',
+  },
+  {
+    id: 'choma_met',
+    name: 'CHOMA MET',
+    latitude: -16.85,
+    longitude: 27.06,
+    district: 'CHOMA',
+  },
+  {
+    id: 'isoka_met',
+    name: 'ISOKA MET',
+    latitude: -10.16,
+    longitude: 32.63,
+    district: 'ISOKA',
+  },
+  {
+    id: 'kabompo_met',
+    name: 'KABOMPO MET',
+    latitude: -13.6,
+    longitude: 24.2,
+    district: 'KABOMPO',
+  },
+  {
+    id: 'kabwe_met',
+    name: 'KABWE MET',
+    latitude: -14.41,
+    longitude: 28.48,
+    district: 'KABWE',
+  },
+  {
+    id: 'kabwe_agro',
+    name: 'KABWE AGRO',
+    latitude: -14.44,
+    longitude: 28.46,
+    district: 'KABWE',
+  },
+  {
+    id: 'kafironda_agromet',
+    name: 'KAFIRONDA AGROMET',
+    latitude: -12.6,
+    longitude: 28.11,
+    district: 'MUFULIRA',
+  },
+  {
+    id: 'kafue_polder',
+    name: 'KAFUE POLDER',
+    latitude: -15.76,
+    longitude: 27.91,
+    district: 'MAZABUKA',
+  },
+  {
+    id: 'kalabo_met',
+    name: 'KALABO MET',
+    latitude: -14.95,
+    longitude: 22.7,
+    district: 'KALABO',
+  },
+  {
+    id: 'kaoma_met',
+    name: 'KAOMA MET',
+    latitude: -14.8,
+    longitude: 24.8,
+    district: 'KAOMA',
+  },
+  {
+    id: 'kasama_met',
+    name: 'KASAMA MET',
+    latitude: -10.21,
+    longitude: 31.13,
+    district: 'KASAMA',
+  },
+  {
+    id: 'kasempa_met',
+    name: 'KASEMPA MET',
+    latitude: -13.53,
+    longitude: 25.85,
+    district: 'KASEMPA',
+  },
+  {
+    id: 'kawambwa_met',
+    name: 'KAWAMBWA MET',
+    latitude: -9.8,
+    longitude: 29.08,
+    district: 'KAWAMBWA',
+  },
+  {
+    id: 'livingstone_met',
+    name: 'LIVINGSTONE MET',
+    latitude: -17.81,
+    longitude: 25.81,
+    district: 'LIVINGSTONE',
+  },
+  {
+    id: 'lundazi_met',
+    name: 'LUNDAZI MET',
+    latitude: -12.28,
+    longitude: 33.2,
+    district: 'LUNDAZI',
+  },
+  {
+    id: 'lusaka_city_airpor',
+    name: 'LUSAKA CITY AIRPOR',
+    latitude: -15.41,
+    longitude: 28.31,
+    district: 'LUSAKA',
+  },
+  {
+    id: 'lusaka_int__airpor',
+    name: 'LUSAKA INT. AIRPOR',
+    latitude: -15.31,
+    longitude: 28.45,
+    district: 'LUSAKA',
+  },
+  {
+    id: 'magoye_agromet',
+    name: 'MAGOYE AGROMET',
+    latitude: -16.13,
+    longitude: 27.63,
+    district: 'MONZE',
+  },
+  {
+    id: 'mansa_met',
+    name: 'MANSA MET',
+    latitude: -11.1,
+    longitude: 28.85,
+    district: 'MANSA',
+  },
+  {
+    id: 'mansa_agro',
+    name: 'MANSA AGRO',
+    latitude: -11.24,
+    longitude: 28.95,
+    district: 'MANSA',
+  },
+  {
+    id: 'mbala_met',
+    name: 'MBALA MET',
+    latitude: -8.85,
+    longitude: 31.33,
+    district: 'MBALA',
+  },
+  {
+    id: 'mfuwe_met',
+    name: 'MFUWE MET',
+    latitude: -13.26,
+    longitude: 31.93,
+    district: 'MAMBWE',
+  },
+  {
+    id: 'misamfu_agromet',
+    name: 'MISAMFU AGROMET',
+    latitude: -10.18,
+    longitude: 31.21,
+    district: 'KASAMA',
+  },
+  {
+    id: 'mkushi_met',
+    name: 'MKUSHI MET',
+    latitude: -14,
+    longitude: 30.33,
+    district: 'MKUSHI',
+  },
+  {
+    id: 'mongu_met',
+    name: 'MONGU MET',
+    latitude: -15.25,
+    longitude: 23.15,
+    district: 'MONGU',
+  },
+  {
+    id: 'mpika_met',
+    name: 'MPIKA MET',
+    latitude: -11.75,
+    longitude: 31.43,
+    district: 'MPIKA',
+  },
+  {
+    id: 'mpulungu_met',
+    name: 'MPULUNGU MET',
+    latitude: -8.76,
+    longitude: 31.1,
+    district: 'Mpulungu',
+  },
+  {
+    id: 'msekera_agromet',
+    name: 'MSEKERA AGROMET',
+    latitude: -13.65,
+    longitude: 32.56,
+    district: 'CHIPATA',
+  },
+  {
+    id: 'mt__makulu_agrome',
+    name: 'MT. MAKULU AGROME',
+    latitude: -15.55,
+    longitude: 28.25,
+    district: 'CHILANGA',
+  },
+  {
+    id: 'mumbwa_met',
+    name: 'MUMBWA MET',
+    latitude: -14.98,
+    longitude: 27.06,
+    district: 'MUMBWA',
+  },
+  {
+    id: 'mwinilunga_met',
+    name: 'MWINILUNGA MET',
+    latitude: -11.75,
+    longitude: 24.43,
+    district: 'MWINILUNGA',
+  },
+  {
+    id: 'ndola_met',
+    name: 'NDOLA MET',
+    latitude: -13,
+    longitude: 28.65,
+    district: 'NDOLA',
+  },
+  {
+    id: 'petauke_met',
+    name: 'PETAUKE MET',
+    latitude: -14.25,
+    longitude: 31.28,
+    district: 'PETAUKE',
     definitions: merge(CLIMATE_CHART_DEFINTIONS.zm, {
       extreme_rainfall_days: { definition: 'For Petauke the 95th percentile calculated to be 41.35mm' },
     }),
   },
   {
-    id: 'mansa',
-    name: 'Mansa',
-    latitude: -11.1,
-    longitude: 28.85,
-    countryCode: 'zm',
-    definitions: CLIMATE_CHART_DEFINTIONS.zm,
+    id: 'samfya_met',
+    name: 'SAMFYA MET',
+    latitude: -11.35,
+    longitude: 29.53,
+    district: 'SAMFYA',
+  },
+  {
+    id: 'senanga_met',
+    name: 'SENANGA MET',
+    latitude: -16.11,
+    longitude: 23.26,
+    district: 'SENANGA',
+  },
+  {
+    id: 'serenje_agro_met',
+    name: 'SERENJE AGRO MET',
+    latitude: -13.23,
+    longitude: 30.21,
+    district: 'SERENJE',
+  },
+  {
+    id: 'sesheke_met',
+    name: 'SESHEKE MET',
+    latitude: -17.46,
+    longitude: 24.3,
+    district: 'SESHEKE',
+  },
+  {
+    id: 'simon_mwansa_kapwepwe',
+    name: 'SIMON MWANSA KAPWEPWE',
+    latitude: -12.97,
+    longitude: 28.51,
+    district: 'Ndola',
+  },
+  {
+    id: 'solwezi_met',
+    name: 'SOLWEZI MET',
+    latitude: -12.18,
+    longitude: 26.38,
+    district: 'SOLWEZI',
+  },
+  {
+    id: 'zambezi_met',
+    name: 'ZAMBEZI MET',
+    latitude: -13.53,
+    longitude: 23.11,
+    district: 'ZAMBEZI',
   },
-];
+].map((station) => ({
+  ...station,
+  countryCode: 'zm',
+  definitions: station.definitions || CLIMATE_CHART_DEFINTIONS.zm,
+}));
 
 export default stations;
diff --git a/apps/picsa-tools/climate-tool/src/assets/summaries/zm/chinsali_ftc.csv b/apps/picsa-tools/climate-tool/src/assets/summaries/zm/chinsali_ftc.csv
@@ -0,0 +1,11 @@
+Year,End,Length,Rainfall,Start
+2015,282,,,
+2016,270,137,577,156
+2017,,,,
+2018,265,,,
+2019,,,,139
+2020,270,154,1108,138
+2021,270,103,994,188
+2022,275,122,988,172
+2023,285,140,1062,154
+2014,,,,