tileset tab in examples

packages/create-react/.env

@@ -1,5 +1,5 @@
 VITE_APP_TITLE="React template"
-VITE_ACCESS_TOKEN="eyJhbGciOiJIUzI1NiJ9.eyJhIjoiYWNfNDd1dW5tZWciLCJqdGkiOiJhZjRlM2QxMSJ9.e1GDIOtg3Jy2zcwbFpAxsvK38RqycRrWII1NVTH7KtQ"
+VITE_ACCESS_TOKEN="eyJhbGciOiJIUzI1NiJ9.eyJhIjoiYWNfN3hoZnd5bWwiLCJqdGkiOiIwNjU0ZTQ5MyJ9.WoBKztKg5ExQFkUsbAFbwjSZK9nV0ESE9S0_hWS5WgE"
 VITE_API_BASE_URL="https://gcp-us-east1.api.carto.com"
 
 VITE_AUTH_ENABLED="false"

packages/create-react/package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@auth0/auth0-react": "^2.2.4",
-    "@carto/api-client": "^0.4.5",
+    "@carto/api-client": "0.5.0-alpha.2",
     "@carto/create-common": "^0.1.3",
     "@deck.gl/aggregation-layers": "^9.0.40",
     "@deck.gl/carto": "^9.0.40",
@@ -30,6 +30,7 @@
     "@loaders.gl/core": "^4.3.3",
     "@luma.gl/core": "^9.0.27",
     "@luma.gl/engine": "^9.0.27",
+    "echarts": "^5.6.0",
     "maplibre-gl": "^4.7.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

packages/create-react/src/components/views/RiversView.tsx

@@ -0,0 +1,237 @@
+import { MapView, MapViewState, WebMercatorViewport } from "@deck.gl/core";
+import { useContext, useEffect, useMemo, useState } from "react";
+import { AppContext } from "../../context";
+import { useDebouncedState } from "../../hooks/useDebouncedState";
+import { createViewportSpatialFilter, vectorTilesetSource } from "@carto/api-client";
+import { BASEMAP, VectorTileLayer } from "@deck.gl/carto";
+import { Card } from "../Card";
+import { FormulaWidget } from "../widgets/FormulaWidget";
+import DeckGL from "@deck.gl/react";
+import { Map } from 'react-map-gl/maplibre';
+import { Layers } from "../Layers";
+import { HistogramWidget } from "../widgets/HistogramWidget";
+
+const CONNECTION_NAME = 'amanzanares-pm-bq';
+const TILESET_NAME = 'cartodb-on-gcp-pm-team.amanzanares_opensource_demo.national_water_model_tileset_final_test_4';
+const MAP_VIEW = new MapView({ repeat: true });
+
+const INITIAL_VIEW_STATE: MapViewState = {
+  latitude: 31.8028,
+  longitude: -103.0078,
+  zoom: 4,
+};
+
+const histogramTicks = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+
+function hexToRgb(hex: string) {
+  const r = parseInt(hex.slice(1, 3), 16);
+  const g = parseInt(hex.slice(3, 5), 16);
+  const b = parseInt(hex.slice(5, 7), 16);
+  return [r, g, b];
+}
+
+/**
+ * Example application page, showing U.S. streams network.
+ */
+export default function IncomeView() {
+  // With authentication enabled, access token may change.
+  const { accessToken, apiBaseUrl } = useContext(AppContext);
+  const [attributionHTML, setAttributionHTML] = useState('');
+
+  // data to calculate feature dropping for each zoom level
+  const [fractionsDropped, setFractionsDropped] = useState<number[]>([]);
+  const [minZoom, setMinZoom] = useState(0);
+  const [maxZoom, setMaxZoom] = useState(20);
+  const [tilesLoaded, setTilesLoaded] = useState(false);
+
+  // Debounce view state to avoid excessive re-renders during pan and zoom.
+  const [viewState, setViewState] = useDebouncedState(INITIAL_VIEW_STATE, 200);
+
+  /****************************************************************************
+   * Sources (https://deck.gl/docs/api-reference/carto/data-sources)
+   */
+
+  const data = useMemo(
+    () =>
+      vectorTilesetSource({
+        accessToken,
+        apiBaseUrl,
+        connectionName: CONNECTION_NAME,
+        tableName: TILESET_NAME,
+      }),
+    [accessToken, apiBaseUrl],
+  );
+
+  /****************************************************************************
+   * Layers (https://deck.gl/docs/api-reference/carto/overview#carto-layers)
+   */
+
+  const LAYER_ID = 'Income by block group'
+
+  // Layer visibility represented as name/visibility pairs, managed by the Layers component.
+  const [layerVisibility, setLayerVisibility] = useState<
+    Record<string, boolean>
+  >({
+    [LAYER_ID]: true,
+  });
+
+  // Update layers when data or visualization parameters change.
+  const layers = useMemo(() => {
+    return [
+      new VectorTileLayer({
+        id: LAYER_ID,
+        pickable: true,
+        visible: layerVisibility[LAYER_ID],
+        data,
+        getLineColor: d => {
+          const [r, g, b] = hexToRgb('#d5d5d7');
+          const n = d.properties.streamOrder;
+          const alphaPart = Math.min(n / 10, 1);
+          const alpha = 120 + 128 * alphaPart;
+          return [r, g, b, alpha];
+        },
+        getLineWidth: d => {
+          const n = d.properties.streamOrder;
+          return n * 0.5;
+        },
+        lineWidthUnits: 'pixels',
+        lineWidthMinPixels: 1,
+        onViewportLoad(tiles) {
+          data?.then((res) => {
+            setTilesLoaded(true)
+            res.widgetSource.loadTiles(tiles)
+            const bbox = new WebMercatorViewport(viewState).getBounds()
+            const spatialFilter = createViewportSpatialFilter(bbox)
+            if (spatialFilter) {
+              res.widgetSource.extractTileFeatures({ spatialFilter })
+            }
+          })
+        },
+      }),
+    ];
+  }, [data, layerVisibility]);
+
+  /****************************************************************************
+   * Attribution
+   */
+
+  useEffect(() => {
+    data?.then((res) => {
+      const { fraction_dropped_per_zoom, minzoom, maxzoom, attribution } = res
+      setFractionsDropped(fraction_dropped_per_zoom ?? [])
+      setMinZoom(minzoom ?? 0)
+      setMaxZoom(maxzoom ?? 20)
+      setAttributionHTML(attribution)
+    })
+  }, [data]);
+
+  useEffect(() => {
+    if (data && viewState && tilesLoaded) {
+      data?.then((res) => {
+        const bbox = new WebMercatorViewport(viewState).getBounds()
+        const spatialFilter = createViewportSpatialFilter(bbox)
+        if (spatialFilter) {
+          res.widgetSource.extractTileFeatures({ spatialFilter })
+        }
+      })
+    }
+  }, [data, viewState, tilesLoaded])
+
+  function clamp(n: number, min: number, max: number) {
+    return Math.min(Math.max(n, min), max);
+  }
+
+  const droppingPercent = useMemo(() => {
+    if (!fractionsDropped.length) {
+      return 0
+    }
+    const roundedZoom = Math.round(viewState.zoom)
+    const clampedZoom = clamp(roundedZoom, minZoom, maxZoom)
+    const percent = fractionsDropped[clampedZoom]
+    return percent
+  }, [minZoom, maxZoom, fractionsDropped, viewState.zoom])
+
+  return (
+    <>
+      <aside className="sidebar">
+        <Card>
+          <p className="overline">✨👀 You're viewing</p>
+          <h1 className="title">U.S. Streams Network</h1>
+          <p className="body1">
+            Cheesecake caramels sesame snaps gummi bears oat cake chupa chups.
+            Chupa chups sugar plum tootsie roll powder candy canes. Biscuit cake
+            gummies cheesecake cupcake biscuit bear claw icing. Jelly topping
+            caramels gummi bears carrot cake pudding.
+          </p>
+          <p className="body1">
+            Bear claw marshmallow gingerbread muffin sweet roll bear claw ice
+            cream cake macaroon. Lollipop brownie ice cream pudding sweet gummi
+            bears jelly jelly-o tart.
+          </p>
+        </Card>
+        <span className="flex-space" />
+        {tilesLoaded && (
+          <>
+            {droppingPercent > 0 && droppingPercent <= 0.05 && (
+              <section className='caption' style={{ padding: '4px 8px' }}>
+                <strong>Warning:</strong> There may be some data ({(droppingPercent * 100).toFixed(2)}%) missing at this zoom level ({Math.round(viewState.zoom)}) because of the tileset dropping features.
+              </section>
+            )}
+            {droppingPercent > 0.05 && (
+              <section className='caption' style={{ padding: '4px 8px' }}>
+                <strong>Warning:</strong> There is an important amount of data ({(droppingPercent * 100).toFixed(2)}%) missing at this zoom level ({Math.round(viewState.zoom)}) because of the tileset dropping features. Widget calculations will not be accurate.
+              </section>
+            )}
+            <Card title="Stream count">
+              <FormulaWidget
+                data={data}
+                column={'*'}
+                operation={'count'}
+                viewState={viewState}
+              />
+            </Card>
+            <Card title="Stream count by stream order">
+              <HistogramWidget
+                data={data}
+                column='streamOrder'
+                ticks={histogramTicks}
+                viewState={viewState}
+                operation="count"
+              />
+            </Card>
+          </>
+        )}
+      </aside>
+      <main className="map">
+        <DeckGL
+          layers={layers}
+          views={MAP_VIEW}
+          initialViewState={viewState}
+          controller={{ dragRotate: false }}
+          onViewStateChange={({ viewState }) => setViewState(viewState)}
+        >
+          <Map mapStyle={BASEMAP.DARK_MATTER} />
+        </DeckGL>
+        <Layers
+          layers={layers}
+          layerVisibility={layerVisibility}
+          onLayerVisibilityChange={setLayerVisibility}
+        />
+        {/* <Card title="Legend" className="legend">
+          <LegendEntryCategorical
+            title="Block group"
+            subtitle="By income per capita"
+            values={histogramTicks.map(String)}
+            getSwatchColor={(value: string) =>
+              colors[histogramTicks.indexOf(Number(value))] as Color
+            }
+          />
+        </Card> */}
+        <aside
+          className="map-footer"
+          dangerouslySetInnerHTML={{ __html: attributionHTML }}
+        ></aside>
+      </main>
+    </>
+  )
+}

packages/create-react/src/components/widgets/CategoryWidget.tsx

@@ -9,6 +9,7 @@ import {
   removeFilter,
   getFilter,
   hasFilter,
+  WidgetSourceProps,
 } from '@carto/api-client';
 import {
   createSpatialFilter,
@@ -21,11 +22,13 @@ const { IN } = FilterType;
 
 export interface CategoryWidgetProps {
   /** Widget-compatible data source, from vectorTableSource, vectorQuerySource, etc. */
-  data: Promise<{ widgetSource: WidgetSource }>;
+  data: Promise<{ widgetSource: WidgetSource<WidgetSourceProps> }>;
   /** Column containing category names. */
   column: string;
   /** Operation used to aggregate features in each category. */
   operation?: Exclude<AggregationType, 'custom'>;
+  /** Column containing a value to be aggregated. */
+  operationColumn: string;
   /** Map view state. If specified, widget will be filtered to the view. */
   viewState?: MapViewState;
   /** Filter state. If specified, widget will be filtered. */
@@ -42,6 +45,7 @@ export function CategoryWidget({
   data,
   column,
   operation,
+  operationColumn,
   viewState,
   filters,
   onFiltersChange,
@@ -66,6 +70,7 @@ export function CategoryWidget({
         widgetSource.getCategories({
           column,
           operation,
+          operationColumn,
           spatialFilter: viewState && createSpatialFilter(viewState),
           abortController,
           filterOwner: owner,
@@ -84,7 +89,7 @@ export function CategoryWidget({
     setStatus('loading');
 
     return () => abortController.abort();
-  }, [data, column, operation, viewState, owner]);
+  }, [data, column, operation, operationColumn, viewState, owner]);
 
   // Compute min/max over category values.
   const [min, max] = useMemo(() => {

packages/create-react/src/components/widgets/FormulaWidget.tsx

@@ -1,5 +1,5 @@
 import { MapViewState } from '@deck.gl/core';
-import { AggregationType, WidgetSource } from '@carto/api-client';
+import { AggregationType, WidgetSource, WidgetSourceProps } from '@carto/api-client';
 import { useEffect, useState } from 'react';
 import {
   createSpatialFilter,
@@ -9,7 +9,7 @@ import {
 
 export interface FormulaWidgetProps {
   /** Widget-compatible data source, from vectorTableSource, vectorQuerySource, etc. */
-  data: Promise<{ widgetSource: WidgetSource }>;
+  data: Promise<{ widgetSource: WidgetSource<WidgetSourceProps> }>;
   /** Column containing a value to be aggregated. */
   column: string;
   /** Operation used to aggregate the specified column. */
@@ -45,7 +45,9 @@ export function FormulaWidget({
         }),
       )
       .then((response) => {
-        setValue(response.value);
+        if (response.value) {
+          setValue(response.value);
+        }
         setStatus('complete');
       })
       .catch(() => {