Merge pull request #7 from wateraccounting/new-language

New language
wateraccounting · Apr 1, 2021 · 26b4969 · 26b4969
2 parents 40be451 + 6bea8f5
commit 26b4969
Show file tree

Hide file tree

Showing 17 changed files with 6,231 additions and 8,853 deletions.
diff --git a/.gitignore b/.gitignore
@@ -151,4 +151,8 @@ Thumbs.db #thumbnail cache on Windows
 modules/WaPOR/wapor_api_token.pickle
 notebooks/Module1_unit4/data
 notebooks/Module1_unit5/data
+notebooks_AR/Module1_unit4/data
+notebooks_AR/Module1_unit5/data
+notebooks_FR/Module1_unit4/data
+notebooks_FR/Module1_unit5/data
 # End of https://www.toptal.com/developers/gitignore/api/python
diff --git a/README_FR.md b/README_FR.md
@@ -43,9 +43,9 @@ Cloner dans Git Bash ([Git](https://git-scm.com/) doit être installé)
     >>> git clone https://github.com/wateraccounting/WAPOROCW.git
 
 
-**Étape 2**: Ouvrez Anaconda Prompt, changez de répertoire pour le dossier **..\WAPOROCW\notebooks**
+**Étape 2**: Ouvrez Anaconda Prompt, changez de répertoire pour le dossier **..\WAPOROCW\notebooks_FR**
 
-    >>> cd ..PATH..\WAPOROCW\notebooks
+    >>> cd ..PATH..\WAPOROCW\notebooks_FR
 
 **Étape 3**: Créer un nouvel environnement à partir du fichier environment.yml
 

diff --git a/notebooks/Module1_unit4/1_Bulk_download_WaPOR_data.ipynb b/notebooks/Module1_unit4/1_Bulk_download_WaPOR_data.ipynb
@@ -623,11 +623,10 @@
      "output_type": "stream",
      "text": [
       "\n",
-      "Download WaPOR Level 2 seasonal GBWP data for the period 2009-01-01 till 2009-12-31\n",
-      "ERROR: Cannot get list of available data\n",
-      "ERROR: cannot get list of available data\n",
+      "Download WaPOR Level 2 seasonal GBWP data for the period 2009-01-01 till 2010-12-31\n",
+      "Progress: |██████████████████████████████████████████████████| 100.0% Complete\n",
       "\n",
-      "Download WaPOR Level 2 seasonal PHE data for the period 2009-01-01 till 2009-12-31\n",
+      "Download WaPOR Level 2 seasonal PHE data for the period 2009-01-01 till 2010-12-31\n",
       "Progress: |██████████████████████████████████████████████████| 100.0% Complete\n"
      ]
     },
@@ -646,15 +645,15 @@
     "WaPOR.download_seasonal(output_dir,\n",
     "                       data='GBWP',\n",
     "                       Startdate='2009-01-01',\n",
-    "                       Enddate='2009-12-31',\n",
+    "                       Enddate='2010-12-31',\n",
     "                       latlim=[ymin-0.5, ymax+0.5],\n",
     "                       lonlim=[xmin-0.5, xmax+0.5],\n",
     "                       level=2,\n",
     "                       )\n",
     "WaPOR.download_seasonal(output_dir,\n",
     "                       data='PHE',\n",
     "                       Startdate='2009-01-01',\n",
-    "                       Enddate='2009-12-31',\n",
+    "                       Enddate='2010-12-31',\n",
     "                       latlim=[ymin-0.5, ymax+0.5],\n",
     "                       lonlim=[xmin-0.5, xmax+0.5],\n",
     "                       level=2,\n",

diff --git a/notebooks_AR/Module1_unit4/0_Start_here.ipynb b/notebooks_AR/Module1_unit4/0_Start_here.ipynb
@@ -8,25 +8,37 @@
     "    \n",
     "# يرجى القراءة \n",
     "\n",
+    "</div>\n",
+    "\n",
+    "<div dir=\"rtl\">\n",
     "الدفتر التالي هو مثال عن كيفية استخدام Python لتحميل، معالجة وتحليل WaPOR data:\n",
+    "</div>\n",
     "\n",
-    "* [1 تحميل بيانات WaPOR باستخدام حزمة hkvwaporpy](1_Download_WaPOR_using_hkvwaporpy.ipynb)\n",
+    "<div dir=\"rtl\">\n",
+    "    \n",
+    "* [1 تحميل بيانات WaPOR بالجملة](1_Bulk_download_WaPOR_data.ipynb)\n",
     "* [2 معالجة بيانات WaPOR المحملة](2_Preprocess_WaPOR_data.ipynb)\n",
-    "* [3 معالجة بيانات WaPOR المحملة](3_Bulk_download_WaPOR_data.ipynb)\n",
-    "* [4 تحليل بيانات WaPOR](4_Analyse_WaPOR_data.ipynb)\n",
+    "* [3 تحليل بيانات WaPOR](3_Analyse_WaPOR_data.ipynb)\n",
     "\n",
+    "</div>\n",
+    "\n",
+    "<div dir=\"rtl\">\n",
     "تحتاج إلى تحميل الحزم التالية لبدء تشغيل الدفتر:\n",
+    "</div>\n",
     "\n",
+    "<div dir=\"rtl\">\n",
+    "    \n",
     "* requests\n",
-    "* hkvwaporpy\n",
     "* gdal\n",
     "* numpy\n",
     "* pandas\n",
     "* matplotlib\n",
     "* pyshp (shapefile)\n",
     "\n",
-    "تفقد إن تم تحميل الحزم التالية من خلال بدء تشغيل الكود التالي.\n",
+    "</div>\n",
     "\n",
+    "<div dir=\"rtl\">\n",
+    "تفقد إن تم تحميل الحزم التالية من خلال بدء تشغيل الكود التالي.\n",
     "</div>"
    ]
   },
@@ -37,7 +49,6 @@
    "outputs": [],
    "source": [
     "import requests\n",
-    "import hkvwaporpy\n",
     "import numpy\n",
     "import pandas\n",
     "import matplotlib\n",
@@ -86,7 +97,6 @@
     "[في هذه الحالة، يمكن تجربة الخيارات التالية لتحميل الحزم](https://ocw.un-ihe.org/mod/book/view.php?id=6539&chapterid=680) \n",
     "\n",
     "### ملاحظات:\n",
-    "- **hkvwaporpy** غير متوفرة على Anaconda لذلك سوف تحتاج إلى استخدام طريقة مدير حزمة PIP للتثبيت.\n",
     "- تم الحصول على osr و **ogr** بمجرد تحميل **gdal** \n",
     "    \n",
     "</div>"
@@ -106,13 +116,6 @@
     "\n",
     "![fig1](../img/fig1_get_api_key.gif)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -131,7 +134,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,