wip

difference.ipynb

@@ -2,24 +2,14 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
-   "id": "00982ea4-b630-4233-b6df-354af3498ed2",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import ibis"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 21,
    "id": "e84709ab-1b47-49ee-8cbd-8aa69744b6c3",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "cc0e11b65226461e924d9a79ac880cae",
+       "model_id": "c4382edb57b643e6907b0314c79387bd",
        "version_major": 2,
        "version_minor": 0
       },
@@ -33,7 +23,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "740ca34451554f8da330cf50694668be",
+       "model_id": "b4ae3a5cd5f84c5b86fdcd767d330adf",
        "version_major": 2,
        "version_minor": 0
       },
@@ -43,6 +33,78 @@
      },
      "metadata": {},
      "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/html": [
+       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\">DatabaseTable: tmp2.main.t2\n",
+       "  gid                int64\n",
+       "  cpad_ACCESS_TYP    string\n",
+       "  cpad_PARK_NAME     string\n",
+       "  cpad_MNG_AGENCY    string\n",
+       "  cpad_MNG_AG_LEV    string\n",
+       "  reGAP              int16\n",
+       "  Easement           int16\n",
+       "  TYPE               string\n",
+       "  CA_County_Name     string\n",
+       "  CA_Region_Name     string\n",
+       "  TerrMar            string\n",
+       "  CA_Ecoregion_Name  string\n",
+       "  ACCESS_TYP         string\n",
+       "  MNG_AGNCY          string\n",
+       "  MNG_AG_LEV         string\n",
+       "  UNIT_NAME          string\n",
+       "  DefaultSelection   string\n",
+       "  CA_Ecoregion_Acres float32\n",
+       "  CA_Region_Acres    float32\n",
+       "  CA_County_Acres    float32\n",
+       "  Acres              float32\n",
+       "  CA_Marine_Acres    float32\n",
+       "  Release_Year       int16\n",
+       "  mgmt_stack         string\n",
+       "  geom               geospatial:geometry\n",
+       "  SHAPE_bbox         xmin: float32\n",
+       "  ymin: float32\n",
+       "  xmax: float32\n",
+       "  ymax: float32\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "DatabaseTable: tmp2.main.t2\n",
+       "  gid                int64\n",
+       "  cpad_ACCESS_TYP    string\n",
+       "  cpad_PARK_NAME     string\n",
+       "  cpad_MNG_AGENCY    string\n",
+       "  cpad_MNG_AG_LEV    string\n",
+       "  reGAP              int16\n",
+       "  Easement           int16\n",
+       "  TYPE               string\n",
+       "  CA_County_Name     string\n",
+       "  CA_Region_Name     string\n",
+       "  TerrMar            string\n",
+       "  CA_Ecoregion_Name  string\n",
+       "  ACCESS_TYP         string\n",
+       "  MNG_AGNCY          string\n",
+       "  MNG_AG_LEV         string\n",
+       "  UNIT_NAME          string\n",
+       "  DefaultSelection   string\n",
+       "  CA_Ecoregion_Acres float32\n",
+       "  CA_Region_Acres    float32\n",
+       "  CA_County_Acres    float32\n",
+       "  Acres              float32\n",
+       "  CA_Marine_Acres    float32\n",
+       "  Release_Year       int16\n",
+       "  mgmt_stack         string\n",
+       "  geom               geospatial:geometry\n",
+       "  SHAPE_bbox         xmin: float32\n",
+       "  ymin: float32\n",
+       "  xmax: float32\n",
+       "  ymax: float32"
+      ]
+     },
+     "execution_count": 21,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -57,23 +119,50 @@
     "   # .filter(_.UNIT_NAME == \"Angeles National Forest\")\n",
     "    .filter(_.reGAP < 3) \n",
     ")\n",
-    "lvl = \"Federal\"\n",
-    "conn.create_table(\"t1\", tbl.filter(_.Release_Year == 2024, _.MNG_AG_LEV != lvl), overwrite = True)\n",
-    "conn.create_table(\"t2\", tbl.filter(_.Release_Year == 2023, _.MNG_AG_LEV != lvl), overwrite = True)\n",
+    "conn.create_table(\"t1\", tbl.filter(_.Release_Year == 2024), overwrite = True)\n",
+    "conn.create_table(\"t2\", tbl.filter(_.Release_Year == 2023), overwrite = True)\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 23,
+   "id": "303792ac-9b1d-41b2-a17b-5cf855d70633",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "ca2024 = conn.table(\"t1\").execute()\n",
+    "ca2023 = conn.table(\"t2\").execute()\n",
+    "\n",
+    "import leafmap.maplibregl as leafmap\n",
+    "m = leafmap.Map()\n",
+    "m.add_gdf(ca2024, name = \"2024\")\n",
+    "m.add_gdf(ca2023, name =\"2023\")\n",
+    "\n",
+    "m"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9fdd2ed2-623f-479c-b0b7-7c723f3f6728",
+   "metadata": {},
+   "outputs": [],
+   "source": [
     "\n",
     "conn.disconnect()"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "id": "121c3cad-680c-4f3a-9075-638711ea1634",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "2e29aea00f864b6b9e440f741c4979d0",
+       "model_id": "c69a096d24974e9ea8ad3d5b937b723a",
        "version_major": 2,
        "version_minor": 0
       },
@@ -88,13 +177,15 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 1min 28s, sys: 6.91 s, total: 1min 35s\n",
-      "Wall time: 1min 28s\n"
+      "CPU times: user 22min 10s, sys: 43 s, total: 22min 53s\n",
+      "Wall time: 11min 47s\n"
      ]
     }
    ],
    "source": [
     "%%time\n",
+    "\n",
+    "## RUN this on a machine with a whole lot of RAM.  consider filtering federal/non-federal first.\n",
     "import duckdb\n",
     "db = duckdb.connect(\"tmp2\")\n",
     "db.install_extension(\"spatial\")\n",
@@ -116,35 +207,67 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "id": "e0a31bd7-4b67-46ad-88c4-7c17d820d66b",
+   "execution_count": 7,
+   "id": "cf3d3e5b-2ff1-4ef9-a147-01f15e970e49",
    "metadata": {},
    "outputs": [],
    "source": [
-    "#db.table(\"diff\").to_parquet(\"diff.parquet\")"
+    "## Cannot go straight to geoparquet due to M geometries!\n",
+    "#db.table(\"diff\").to_parquet(\"diff.parquet\")\n",
+    "\n",
+    "## This doesn't work either: \n",
+    "#db.sql('''CREATE OR REPLACE TABLE diff2024 AS SELECT *, st_force2d(geom) AS geom FROM diff''')\n",
+    "\n",
+    "## We could cast geom as blob...."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
-   "id": "28a66c8b-89fb-4972-9ff5-ee9bfdf148e9",
+   "execution_count": 10,
+   "id": "308dc665-1323-4e9b-bc2d-69201c325c4b",
    "metadata": {},
    "outputs": [],
    "source": [
+    "# F*ck it.  Let's do it all in RAM via geopandas, which drops M geoms due to a fortunate bug! \n",
     "conn = ibis.duckdb.connect(\"tmp2\", extensions=[\"spatial\"])\n",
-    "gdf = conn.table(\"diff\").mutate(geom = _.geom.convert(\"epsg:3310\",\"epsg:4326\")).execute()"
+    "gdf = conn.table(\"diff\").mutate(geom = _.geom.convert(\"epsg:3310\",\"epsg:4326\")).execute()\n",
+    "gdf.to_parquet(\"ca2024_diffs.parquet\")\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
-   "id": "308dc665-1323-4e9b-bc2d-69201c325c4b",
+   "execution_count": 19,
+   "id": "063a11d8-15d7-4b91-b67c-3ccae3edcc8d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# stash in our team S3 storage \n",
+    "\n",
+    "import streamlit as st\n",
+    "from minio import Minio\n",
+    "import os\n",
+    "# Get signed URLs to access license-controlled layers\n",
+    "key = st.secrets[\"MINIO_KEY\"]\n",
+    "secret = st.secrets[\"MINIO_SECRET\"]\n",
+    "client = Minio(\"minio.carlboettiger.info\", key, secret, secure=True)\n",
+    "\n",
+    "size = os.path.getsize(\"ca2024_diffs.parquet\")\n",
+    "with open(\"ca2024_diffs.parquet\", \"rb\") as file_data:\n",
+    "    client.put_object(\"public-biodiversity\", \"ca30x30/ca2024_diffs.parquet\", file_data, length = size)\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "id": "34425101-0592-42fd-9d62-22c9e7a6d6ac",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "3168461698f142a2b6c26bee3647378e",
+       "model_id": "c5cc696c15374d519fb940e054a902f0",
        "version_major": 2,
        "version_minor": 1
       },
@@ -152,16 +275,37 @@
        "Map(height='600px', map_options={'bearing': 0, 'center': (0, 20), 'pitch': 0, 'style': 'https://basemaps.carto…"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 26,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
+    "# can read from S3 and plot the whole thing.  Note gdf has no metadata.\n",
+    "\n",
     "import leafmap.maplibregl as leafmap\n",
+    "import ibis\n",
+    "conn = ibis.duckdb.connect(extensions=[\"spatial\"])\n",
+    "gdf = conn.read_parquet(\"https://minio.carlboettiger.info/public-biodiversity/ca30x30/ca2024_diffs.parquet\").execute()\n",
     "m = leafmap.Map()\n",
     "m.add_gdf(gdf)\n",
-    "m\n"
+    "#m.to_html(\"ca2024.html\")\n",
+    "m"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 25,
+   "id": "17af39a0-9a69-4bfa-9084-d7b26adf74fc",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "path = \"ca2024.html\"\n",
+    "size = os.path.getsize(path)\n",
+    "with open(path, \"rb\") as file_data:\n",
+    "    client.put_object(\"public-biodiversity\", \"ca30x30/\"+path, file_data, length = size)\n",
+    "\n",
+    "\n"
    ]
   },
   {
@@ -171,7 +315,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "\"TO 'new2024.geojson' WITH (FORMAT GDAL, DRIVER 'GeoJSON', LAYER_CREATION_OPTIONS 'WRITE_BBOX=YES')\""
+    "# \"TO 'new2024.geojson' WITH (FORMAT GDAL, DRIVER 'GeoJSON', LAYER_CREATION_OPTIONS 'WRITE_BBOX=YES')\""
    ]
   }
  ],

preprocess.ipynb

@@ -31,32 +31,63 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "buffer = -0.00001\n",
+    "buffer = -2\n",
     "\n",
     "tbl = (\n",
     "    conn.read_parquet(ca_parquet)\n",
     "    .cast({\"SHAPE\": \"geometry\"})\n",
     "    .rename(geom = \"SHAPE\")\n",
-    "   # .filter(_.UNIT_NAME == \"Angeles National Forest\")\n",
+    "#    .filter(_.UNIT_NAME == \"Angeles National Forest\")\n",
     "    .filter(_.reGAP < 3) \n",
     ")\n",
     "tbl_2023 = tbl.filter(_.Release_Year == 2023).mutate(geom=_.geom.buffer(buffer))\n",
     "tbl_2024 = tbl.filter(_.Release_Year == 2024)\n",
     "intersects = tbl_2024.anti_join(tbl_2023, _.geom.intersects(tbl_2023.geom))\n",
-    "\n",
-    "new2024 = intersects.select(\"OBJECTID\").mutate(established = 2024)"
+    "\n"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 3,
+   "id": "a0b75637-e015-4be4-86e1-c9757ac43d0f",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "## Testing, run only on subset data\n",
+    "if False:\n",
+    "    gdf = intersects.mutate(geom = _.geom.convert(\"epsg:3310\",\"epsg:4326\")).execute()\n",
+    "    gdf_2023 = tbl_2023.mutate(geom = _.geom.convert(\"epsg:3310\",\"epsg:4326\")).execute()\n",
+    "    gdf_2024 = tbl_2024.mutate(geom = _.geom.convert(\"epsg:3310\",\"epsg:4326\")).execute()\n",
+    "    # gdf = ca2024\n",
+    "    established = {'property': 'established',\n",
+    "                   'type': 'categorical',\n",
+    "                   'stops': [\n",
+    "                       [2023, \"#26542C80\"], \n",
+    "                       [2024, \"#F3AB3D80\"]]\n",
+    "                  }\n",
+    "    inter = {\"fill-color\": \"#F3AB3D\"}\n",
+    "    p2024 = {\"fill-color\": \"#26542C\"}\n",
+    "    p2023 = {\"fill-color\": \"#8B0A1A\"}\n",
+    "    \n",
+    "    m = leafmap.Map(style=\"positron\")\n",
+    "    m.add_gdf(gdf_2024,layer_type=\"fill\", name = \"2024\", paint = p2024)\n",
+    "    m.add_gdf(gdf_2023,layer_type=\"fill\", name = \"2023\", paint = p2023)\n",
+    "    m.add_gdf(gdf,layer_type=\"fill\", name = \"intersects\", paint = inter)\n",
+    "    \n",
+    "    m.add_layer_control()\n",
+    "    m"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
    "id": "275c171a-f82f-4ee8-991c-1e34eb83a33d",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "dd86bb91838d45aa87197fc49a3b2362",
+       "model_id": "f1616caa5ca54678a00caa974721de2b",
        "version_major": 2,
        "version_minor": 0
       },
@@ -66,9 +97,21 @@
      },
      "metadata": {},
      "output_type": "display_data"
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "CPU times: user 55min 28s, sys: 2.94 s, total: 55min 31s\n",
+      "Wall time: 22min 6s\n"
+     ]
     }
    ],
    "source": [
+    "%%time\n",
+    "\n",
+    "new2024 = intersects.select(\"OBJECTID\").mutate(established = 2024)\n",
+    "\n",
     "ca = (conn\n",
     "      .read_parquet(ca_parquet)\n",
     "      .cast({\"SHAPE\": \"geometry\"})\n",
@@ -78,12 +121,61 @@
     "      .left_join(new2024, \"OBJECTID\")\n",
     "      .mutate(established=_.established.fill_null(2023))\n",
     "      .mutate(geom = _.SHAPE.convert(\"epsg:3310\",\"epsg:4326\"))\n",
-    "      .rename(name = \"UNIT_NAME\", access_type = \"ACCESS_TYP\", manager = \"MNG_AGNCY\",\n",
-    "              manager_type = \"MNG_AG_LEV\", id = \"OBJECTID\", type = \"TYPE\")\n",
+    "      .rename(name = \"cpad_PARK_NAME\", access_type = \"cpad_ACCESS_TYP\", manager = \"cpad_MNG_AGENCY\",\n",
+    "              manager_type = \"cpad_MNG_AG_LEV\", id = \"OBJECTID\", type = \"TYPE\")\n",
     "      .select(_.established, _.reGAP, _.name, _.access_type, _.manager, _.manager_type,\n",
     "              _.Easement, _.Acres, _.id, _.type, _.geom)\n",
     "     )\n",
-    "ca.execute().to_parquet(\"ca2024.parquet\")"
+    "ca2024 = ca.execute()\n",
+    "\n",
+    "ca2024.to_parquet(\"ca2024.parquet\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "cfac7aa4-e418-4d7c-91e0-04ff8eae804c",
+   "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/jovyan/.cache/huggingface/token\n",
+      "Login successful\n"
+     ]
+    },
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "9e680dc3991c4c9b808447f04d056f53",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "ca2024.parquet:   0%|          | 0.00/137M [00:00<?, ?B/s]"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "## Upload to Huggingface\n",
+    "# https://huggingface.co/datasets/boettiger-lab/ca-30x30/\n",
+    "\n",
+    "from huggingface_hub import HfApi, login\n",
+    "import streamlit as st\n",
+    "login(st.secrets[\"HF_TOKEN\"])\n",
+    "api = HfApi()\n",
+    "info = api.upload_file(\n",
+    "        path_or_fileobj=\"ca2024.parquet\",\n",
+    "        path_in_repo=\"ca2024.parquet\",\n",
+    "        repo_id=\"boettiger-lab/ca-30x30\",\n",
+    "        repo_type=\"dataset\",\n",
+    "    )\n"
    ]
   },
   {
@@ -111,14 +203,6 @@
     "ca2024 = conn.read_parquet(\"ca2024.parquet\")"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "id": "ebbb2650-4442-4e54-8467-5e681d6fab9e",
-   "metadata": {},
-   "source": [
-    "Using difference (overlap) instead:"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 6,
@@ -156,88 +240,82 @@
        "      <th>0</th>\n",
        "      <td>California Department of Fish and Wildlife</td>\n",
        "      <td>State</td>\n",
-       "      <td>42086.259379</td>\n",
+       "      <td>54853.556568</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
        "      <td>California Department of Parks and Recreation</td>\n",
        "      <td>State</td>\n",
-       "      <td>17931.321473</td>\n",
+       "      <td>21439.451269</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
        "      <td>California Tahoe Conservancy</td>\n",
        "      <td>State</td>\n",
-       "      <td>4803.250929</td>\n",
+       "      <td>6119.753048</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>3</th>\n",
        "      <td>California Department of Water Resources</td>\n",
        "      <td>State</td>\n",
-       "      <td>2248.610289</td>\n",
+       "      <td>4033.217739</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>4</th>\n",
-       "      <td>University of California</td>\n",
+       "      <td>California State University Sonoma</td>\n",
        "      <td>State</td>\n",
-       "      <td>1860.854444</td>\n",
+       "      <td>3842.054169</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>5</th>\n",
-       "      <td>California Department of Forestry and Fire Pro...</td>\n",
+       "      <td>University of California</td>\n",
        "      <td>State</td>\n",
-       "      <td>1089.029581</td>\n",
+       "      <td>2050.549176</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>6</th>\n",
-       "      <td>Coachella Valley Mountains Conservancy</td>\n",
+       "      <td>California Department of Forestry and Fire Pro...</td>\n",
        "      <td>State</td>\n",
-       "      <td>119.907070</td>\n",
+       "      <td>1212.712394</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>7</th>\n",
-       "      <td>California State Lands Commission</td>\n",
+       "      <td>Coachella Valley Mountains Conservancy</td>\n",
        "      <td>State</td>\n",
-       "      <td>109.016475</td>\n",
+       "      <td>167.224090</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>8</th>\n",
-       "      <td>California State Coastal Conservancy</td>\n",
+       "      <td>California State Lands Commission</td>\n",
        "      <td>State</td>\n",
-       "      <td>97.314705</td>\n",
+       "      <td>113.344073</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>9</th>\n",
-       "      <td>California State University Sonoma</td>\n",
+       "      <td>California State Coastal Conservancy</td>\n",
        "      <td>State</td>\n",
-       "      <td>38.760956</td>\n",
+       "      <td>97.314705</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>10</th>\n",
        "      <td>Other State</td>\n",
        "      <td>State</td>\n",
-       "      <td>32.927882</td>\n",
+       "      <td>55.542241</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>11</th>\n",
-       "      <td>San Joaquin River Conservancy</td>\n",
+       "      <td>California Department of Transportation</td>\n",
        "      <td>State</td>\n",
-       "      <td>1.531470</td>\n",
+       "      <td>1.957490</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>12</th>\n",
-       "      <td>California Department of Transportation</td>\n",
+       "      <td>San Joaquin River Conservancy</td>\n",
        "      <td>State</td>\n",
-       "      <td>1.261433</td>\n",
+       "      <td>1.531470</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>13</th>\n",
-       "      <td>Unknown</td>\n",
-       "      <td>State</td>\n",
-       "      <td>0.255531</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>14</th>\n",
        "      <td>California State University</td>\n",
        "      <td>State</td>\n",
        "      <td>0.021589</td>\n",
@@ -252,34 +330,32 @@
        "1       California Department of Parks and Recreation        State   \n",
        "2                        California Tahoe Conservancy        State   \n",
        "3            California Department of Water Resources        State   \n",
-       "4                            University of California        State   \n",
-       "5   California Department of Forestry and Fire Pro...        State   \n",
-       "6              Coachella Valley Mountains Conservancy        State   \n",
-       "7                   California State Lands Commission        State   \n",
-       "8                California State Coastal Conservancy        State   \n",
-       "9                  California State University Sonoma        State   \n",
+       "4                  California State University Sonoma        State   \n",
+       "5                            University of California        State   \n",
+       "6   California Department of Forestry and Fire Pro...        State   \n",
+       "7              Coachella Valley Mountains Conservancy        State   \n",
+       "8                   California State Lands Commission        State   \n",
+       "9                California State Coastal Conservancy        State   \n",
        "10                                        Other State        State   \n",
-       "11                      San Joaquin River Conservancy        State   \n",
-       "12            California Department of Transportation        State   \n",
-       "13                                            Unknown        State   \n",
-       "14                        California State University        State   \n",
+       "11            California Department of Transportation        State   \n",
+       "12                      San Joaquin River Conservancy        State   \n",
+       "13                        California State University        State   \n",
        "\n",
        "            area  \n",
-       "0   42086.259379  \n",
-       "1   17931.321473  \n",
-       "2    4803.250929  \n",
-       "3    2248.610289  \n",
-       "4    1860.854444  \n",
-       "5    1089.029581  \n",
-       "6     119.907070  \n",
-       "7     109.016475  \n",
-       "8      97.314705  \n",
-       "9      38.760956  \n",
-       "10     32.927882  \n",
-       "11      1.531470  \n",
-       "12      1.261433  \n",
-       "13      0.255531  \n",
-       "14      0.021589  "
+       "0   54853.556568  \n",
+       "1   21439.451269  \n",
+       "2    6119.753048  \n",
+       "3    4033.217739  \n",
+       "4    3842.054169  \n",
+       "5    2050.549176  \n",
+       "6    1212.712394  \n",
+       "7     167.224090  \n",
+       "8     113.344073  \n",
+       "9      97.314705  \n",
+       "10     55.542241  \n",
+       "11      1.957490  \n",
+       "12      1.531470  \n",
+       "13      0.021589  "
       ]
      },
      "execution_count": 6,
@@ -302,40 +378,26 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "id": "c62854f6-1456-4207-8c69-53af17970102",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "10329a95c7b84de4b598f0ccf4c6af20",
-       "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": 7,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
-    "gdf = ca2024.filter(_.manager == \"California Department of Parks and Recreation\", _.established== 2024).execute()\n",
     "\n",
+    "gdf = ca2024.execute()\n",
     "established = {'property': 'established',\n",
     "               'type': 'categorical',\n",
     "               'stops': [\n",
     "                   [2023, \"#26542C80\"], \n",
-    "                   [2024, \"#F3AB3D80\"]]\n",
-    "              }\n",
+    "                   [2024, \"#F3AB3D80\"]]}\n",
     "paint = {\"fill-color\": established}\n",
     "\n",
+    "\n",
     "m = leafmap.Map(style=\"positron\")\n",
-    "m.add_gdf(gdf,layer_type=\"fill\", name = \"CA 30x30\", paint = paint)\n",
+    "m.add_gdf(gdf,layer_type=\"fill\", name = \"intersects\", paint = paint)\n",
+    "\n",
     "m.add_layer_control()\n",
+    "m.to_html(\"ca2024.html\")\n",
     "m"
    ]
   }