Merge branch 'main' of https://github.com/k-r-a-s-s/water-access into…

… main
allfed · Jan 18, 2024 · 992f1ed · 992f1ed
2 parents ac6ff27 + 1d8ee8d
commit 992f1ed
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/data/.DS_Store b/data/.DS_Store
diff --git a/data/processed/bicycle_velocity_by_zone.csv b/data/processed/bicycle_velocity_by_zone.csv
diff --git a/data/processed/walk_velocity_by_zone.csv b/data/processed/walk_velocity_by_zone.csv
diff --git a/scripts/gis_global_analysis.ipynb b/scripts/gis_global_analysis.ipynb
@@ -411,6 +411,8 @@
     "    import sys\n",
     "    from pathlib import Path\n",
     "\n",
+    "# Map the road types in df_zones to Crr values\n",
+    "df_zones['Crr'] = df_zones['dominant_road_type'].map(crr_mapping)\n",
     "\n",
     "    # Resolve project root and update sys.path\n",
     "    project_root = Path().resolve().parent\n",
@@ -549,7 +551,28 @@
    "cell_type": "code",
    "execution_count": 27,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "0    3.338853\n",
+       "1    2.810578\n",
+       "2    2.989990\n",
+       "3    2.249984\n",
+       "4    3.017698\n",
+       "5    2.166688\n",
+       "6    2.172357\n",
+       "7    2.077768\n",
+       "8    2.116220\n",
+       "9    3.188453\n",
+       "Name: max distance walking, dtype: float64"
+      ]
+     },
+     "execution_count": 30,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "time_gathering_water = 16\n",
     "df_zones[\"max distance cycling\"] = df_zones[\"average_velocity_bicycle\"] * time_gathering_water / 2 # max distance achievable (not round trip, just the distance from home to water source)\n",
@@ -603,6 +626,34 @@
     "\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "count      9986.000000\n",
+       "mean       2479.965865\n",
+       "std        7757.335516\n",
+       "min           6.042776\n",
+       "25%         480.276669\n",
+       "50%        1195.803226\n",
+       "75%        2362.037534\n",
+       "max      193064.436593\n",
+       "Name: zone_pop_unpiped, dtype: float64"
+      ]
+     },
+     "execution_count": 26,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_zones[\"zone_pop_unpiped\"].describe()"
+   ]
+  },
   {
    "attachments": {},
    "cell_type": "markdown",