added states

app.py

@@ -68,6 +68,7 @@ m = leafmap.Map(style="positron",   center=(-100, 40), zoom=3)
 
 url = "https://huggingface.co/datasets/boettiger-lab/landvote/resolve/main/vote.pmtiles"
 
+url_states = "https://huggingface.co/datasets/boettiger-lab/landvote/resolve/main/vote_states.pmtiles"
 #gdf = df.filter(_.year==1988).execute()
 #gdf.to_file("vote.geojson")
 
@@ -93,12 +94,29 @@ style = {
                 "==",
                 ["get", "year"],
                 year,
-            ],  # only show buildings with height info
+            ], 
             "paint": paint
         },
     ],
 }
 
+style_states = {
+    "layers": [
+        {
+            "id": "votes_states",
+            "source": "vote_states",
+            "source-layer": "vote_states",
+            "type": "fill",
+            "filter": [
+                "==",
+                ["get", "year"],
+                year,
+            ],  
+            "paint": {"fill-color": outcome}
+        },
+    ],
+}
+
 m.add_pmtiles(
     url,
     style=style,
@@ -107,6 +125,16 @@ m.add_pmtiles(
     tooltip=True,
     fit_bounds=False,
 )
+
+#states are 2D and transparent, thus added separately.
+m.add_pmtiles(
+    url_states,
+    style=style_states,
+    visible=True,
+    opacity=0.4,
+    tooltip=True,
+    fit_bounds=False,
+)
 #m.add_layer_control()
 m.to_streamlit()
 

static-maps.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "id": "b313a218-4778-4d5b-9036-f0370d4212a0",
    "metadata": {},
    "outputs": [],
@@ -29,7 +29,42 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": null,
+   "id": "09ecf89a-a315-45ef-9ece-783963e6e07e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "vote_states = (votes\n",
+    "                .filter(_[\"Jurisdiction Type\"] == \"State\")\n",
+    "                .rename(state_id = \"State\")\n",
+    "                .rename(amount = 'Conservation Funds at Stake', yes = '% Yes')\n",
+    "                .mutate(amount_n=_.amount.replace('$', '').replace(',', '').cast('float'))\n",
+    "                .mutate(log_amount=_.amount_n.log())\n",
+    "                .mutate(year=_['Date'].year().cast('int32'))\n",
+    "                .mutate(\n",
+    "                    yes=ibis.case()\n",
+    "                        .when(_.yes.isin(['Pass', 'None','Fail']), None)  # Handle non-numeric cases\n",
+    "                        .when(_.yes.notnull(), (_.yes.replace('%', '').cast('float').round(2).cast(dt.float64)).cast(dt.string) + '%')  # Convert valid percentages and add %\n",
+    "                        .else_(None)  # Default to None for other cases\n",
+    "                        .end()\n",
+    "                )\n",
+    "               .mutate(log_amount = _.log_amount.round(4))\n",
+    "               .select('state_id', 'Status', 'yes', 'year', 'amount', 'log_amount', )\n",
+    "               )\n",
+    "\n",
+    "df_states = (states\n",
+    "            .select('state_id','geometry')\n",
+    "            .right_join(vote_states, \"state_id\")\n",
+    "            .mutate(key = _.state_id)\n",
+    "            .select('key','geometry','Status', 'yes', 'year', 'amount', 'log_amount')\n",
+    "            .mutate(jurisdiction = ibis.literal(\"State\"))\n",
+    "            .cast({\"geometry\": \"geometry\"})\n",
+    "             )\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
    "id": "ba4d8915-cde3-4ef9-ad8c-7759ed2c8a13",
    "metadata": {},
    "outputs": [],
@@ -65,7 +100,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "id": "0cce23c9-245c-4c28-9523-0231eb5acc17",
    "metadata": {},
    "outputs": [],
@@ -102,32 +137,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": null,
    "id": "a1e81807-8ce3-44bf-9a1c-8563fa33817c",
    "metadata": {},
    "outputs": [],
    "source": [
-    "df = df_county.union(df_local)\n",
-    "# df.execute()"
+    "df = df_county.union(df_local)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": null,
    "id": "5d3bee26-7ca8-490c-be5b-fc69a6c3db2a",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The token has not been saved to the git credentials helper. Pass `add_to_git_credential=True` in this function directly or `--add-to-git-credential` if using via `huggingface-cli` if you want to set the git credential as well.\n",
-      "Token is valid (permission: write).\n",
-      "Your token has been saved to /home/rstudio/.cache/huggingface/token\n",
-      "Login successful\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import subprocess\n",
     "import os\n",
@@ -172,116 +195,47 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": null,
    "id": "902ece1d-6e57-4f83-9286-709dbb549fae",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "2b18fcc2775845c4a3b40eedbe32475b",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "FloatProgress(value=0.0, layout=Layout(width='auto'), style=ProgressStyle(bar_color='black'))"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "c7314c0c7d9948c9a3feaddadccde55b",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "vote.geojson:   0%|          | 0.00/92.9M [00:00<?, ?B/s]"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "For layer 0, using name \"vote\"\n",
-      "vote.geojson:496: null geometry (additional not reported): in JSON object {\"type\":\"Feature\",\"properties\":{\"key\":null,\"Status\":\"Fail\",\"yes\":\"43.67%\",\"year\":1990,\"amount\":null,\"log_amount\":null,\"jurisdiction\":\"County\"},\"geometry\":null}\n",
-      "2195 features, 10746823 bytes of geometry and attributes, 58352 bytes of string pool, 0 bytes of vertices, 0 bytes of nodes\n",
-      "Choosing a maxzoom of -z3 for features typically 81840 feet (24945 meters) apart, and at least 10982 feet (3348 meters) apart\n",
-      "Choosing a maxzoom of -z11 for resolution of about 214 feet (65 meters) within features\n",
-      "  99.9%  11/189/562  \n",
-      "  100.0%  11/110/897  \r"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Successfully generated PMTiles file: vote.pmtiles\n"
-     ]
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "1176d2d9c19e45539fc9efc2a60db944",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "vote.pmtiles:   0%|          | 0.00/4.81M [00:00<?, ?B/s]"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "outputs": [],
    "source": [
     "gdf= df.execute()\n",
     "gdf = gdf.set_crs(\"EPSG:4326\")\n",
-    "# print(gdf.crs)\n",
-    "# gdf.to_parquet(\"votes.parquet\")\n",
     "\n",
     "gdf.to_file(\"vote.geojson\")\n",
     "hf_upload(\"vote.geojson\", \"boettiger-lab/landvote\")\n",
     "\n",
     "generate_pmtiles(\"vote.geojson\", \"vote.pmtiles\")\n",
     "hf_upload(\"vote.pmtiles\", \"boettiger-lab/landvote\")\n",
+    "\n",
+    "\n",
+    "\n",
+    "gdf_states= df_states.execute()\n",
+    "gdf_states = gdf_states.set_crs(\"EPSG:4326\")\n",
+    "\n",
+    "gdf_states.to_file(\"vote_states.geojson\")\n",
+    "hf_upload(\"vote_states.geojson\", \"boettiger-lab/landvote\")\n",
+    "\n",
+    "generate_pmtiles(\"vote_states.geojson\", \"vote_states.pmtiles\")\n",
+    "hf_upload(\"vote_states.pmtiles\", \"boettiger-lab/landvote\")\n",
     "\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": null,
    "id": "fa397626-6e94-4ab9-a3bb-2bcbd14e8d40",
    "metadata": {
     "scrolled": true
    },
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "d829e5753c414cc2887dac52fd35dc82",
-       "version_major": 2,
-       "version_minor": 1
-      },
-      "text/plain": [
-       "Map(height='600px', map_options={'bearing': 0, 'center': (0, 20), 'pitch': 0, 'style': 'https://basemaps.carto…"
-      ]
-     },
-     "execution_count": 15,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "import leafmap.maplibregl as leafmap\n",
     "m = leafmap.Map(style=\"positron\")\n",
     "\n",
-    "url = \"https://huggingface.co/datasets/boettiger-lab/landvote/resolve/main/vote.pmtiles\"\n",
+    "\n",
+    "url_states = \"https://huggingface.co/datasets/boettiger-lab/landvote/resolve/main/vote_states.pmtiles\"\n",
     "\n",
     "outcome = [\n",
     "      'match',\n",
@@ -290,32 +244,31 @@
     "      \"Fail\", '#FF3300', \n",
     "      '#ccc'\n",
     "    ]\n",
-    "paint = {\"fill-extrusion-color\": outcome, \n",
-    "         \"fill-extrusion-opacity\": 0.7,\n",
-    "         \"fill-extrusion-height\": [\"*\", [\"get\", \"log_amount\"], 5000],\n",
+    "paint_states = {\"fill-color\": outcome, \n",
+    "         # \"fill-opacity\": 0.2,\n",
     "        }\n",
-    "style = {\n",
+    "style_states = {\n",
     "    \"layers\": [\n",
     "        {\n",
-    "            \"id\": \"votes\",\n",
-    "            \"source\": \"vote\",\n",
-    "            \"source-layer\": \"vote\",\n",
-    "            \"type\": \"fill-extrusion\",\n",
+    "            \"id\": \"votes_states\",\n",
+    "            \"source\": \"vote_states\",\n",
+    "            \"source-layer\": \"vote_states\",\n",
+    "            \"type\": \"fill\",\n",
     "            \"filter\": [\n",
     "                \"==\",\n",
     "                [\"get\", \"year\"],\n",
     "                2022,\n",
     "            ],  # only show buildings with height info\n",
-    "            \"paint\": paint\n",
+    "            \"paint\": paint_states\n",
     "        },\n",
     "    ],\n",
     "}\n",
     "\n",
     "m.add_pmtiles(\n",
-    "    url,\n",
-    "    style=style,\n",
+    "    url_states,\n",
+    "    style=style_states,\n",
     "    visible=True,\n",
-    "    opacity=1.0,\n",
+    "    opacity=0.4,\n",
     "    tooltip=True,\n",
     "    fit_bounds=False,\n",
     ")\n",