feat(pydeck-carto): Add quadbin and styling examples

visgl · Apr 17, 2024 · c857c76 · c857c76
1 parent 88f3a3b
commit c857c76
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 47 deletions.
diff --git a/bindings/pydeck-carto/examples/scripts/carto_layer_h3_query.py b/bindings/pydeck-carto/examples/scripts/carto_layer_h3_query.py
@@ -20,7 +20,6 @@
     sql_query="select * from carto-demo-data.demo_tables"
     ".derived_spatialfeatures_usa_h3res8_v1_yearly_v2",
     aggregation_exp="sum(population) as population_sum",
-    spatial_data_column="h3",
 )
 
 layer = pdk.Layer(

diff --git a/bindings/pydeck-carto/examples/scripts/carto_layer_quadbin_query.py b/bindings/pydeck-carto/examples/scripts/carto_layer_quadbin_query.py
@@ -13,14 +13,18 @@
 
 pdkc.register_layers()
 
-layer = pdk.Layer(
-    "CartoLayer",
-    data="select * from carto-demo-data.demo_tables"
+data = pdkc.sources.quadbin_query_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    sql_query="select * from carto-demo-data.demo_tables"
     ".derived_spatialfeatures_usa_quadbin15_v1_yearly_v2",
-    type_=pdkc.MapType.QUERY,
-    connection=pdkc.CartoConnection.CARTO_DW,
-    credentials=pdkc.get_layer_credentials(carto_auth),
-    geo_column=pdkc.GeoColumnType.QUADBIN,
+    aggregation_exp="sum(population) as population_sum",
+)
+
+layer = pdk.Layer(
+    "QuadbinTileLayer",
+    data=data,
     get_fill_color=[200, 0, 80],
     pickable=True,
 )

diff --git a/bindings/pydeck-carto/examples/scripts/carto_layer_quadbin_table.py b/bindings/pydeck-carto/examples/scripts/carto_layer_quadbin_table.py
@@ -13,14 +13,18 @@
 
 pdkc.register_layers()
 
-layer = pdk.Layer(
-    "CartoLayer",
-    data="carto-demo-data.demo_tables"
+data = pdkc.sources.quadbin_table_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    table_name="carto-demo-data.demo_tables"
     ".derived_spatialfeatures_esp_quadbin15_v1_yearly_v2",
-    type_=pdkc.MapType.TABLE,
-    connection=pdkc.CartoConnection.CARTO_DW,
-    credentials=pdkc.get_layer_credentials(carto_auth),
-    geo_column=pdkc.GeoColumnType.QUADBIN,
+    aggregation_exp="sum(population) as population_sum",
+)
+
+layer = pdk.Layer(
+    "QuadbinTileLayer",
+    data=data,
     get_fill_color=[200, 0, 80],
     pickable=True,
 )

diff --git a/bindings/pydeck-carto/examples/scripts/carto_layer_quadbin_tileset.py b/bindings/pydeck-carto/examples/scripts/carto_layer_quadbin_tileset.py
@@ -13,13 +13,18 @@
 
 pdkc.register_layers()
 
-layer = pdk.Layer(
-    "CartoLayer",
-    data="carto-demo-data.demo_tilesets"
+data = pdkc.sources.quadbin_tileset_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    table_name="carto-demo-data.demo_tilesets"
     ".derived_spatialfeatures_usa_quadbin15_v1_yearly_v2_tileset",
-    type_=pdkc.MapType.TILESET,
-    connection=pdkc.CartoConnection.CARTO_DW,
-    credentials=pdkc.get_layer_credentials(carto_auth),
+    aggregation_exp="sum(population) as population_sum",
+)
+
+layer = pdk.Layer(
+    "QuadbinTileLayer",
+    data=data,
     get_fill_color=[200, 0, 80],
     pickable=True,
 )

diff --git a/bindings/pydeck-carto/examples/scripts/carto_styles_color_bins.py b/bindings/pydeck-carto/examples/scripts/carto_styles_color_bins.py
@@ -13,13 +13,17 @@
 
 pdkc.register_layers()
 
-layer = pdk.Layer(
-    "CartoLayer",
-    data="SELECT geom, pct_higher_ed "
+data = pdkc.sources.vector_query_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    sql_query="SELECT geom, pct_higher_ed "
     "FROM `cartobq.public_account.higher_edu_by_county`",
-    type_=pdkc.MapType.QUERY,
-    connection=pdkc.CartoConnection.CARTO_DW,
-    credentials=pdkc.get_layer_credentials(carto_auth),
+)
+
+layer = pdk.Layer(
+    "VectorTileLayer",
+    data=data,
     get_fill_color=pdkc.styles.color_bins(
         "pct_higher_ed", [0, 20, 30, 40, 50, 60, 70], "PinkYl"
     ),

diff --git a/bindings/pydeck-carto/examples/scripts/carto_styles_color_categories.py b/bindings/pydeck-carto/examples/scripts/carto_styles_color_categories.py
@@ -13,12 +13,16 @@
 
 pdkc.register_layers()
 
+data = pdkc.sources.vector_query_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    sql_query="SELECT geom, landuse_type FROM `cartobq.public_account.wburg_parcels`",
+)
+
 layer = pdk.Layer(
-    "CartoLayer",
-    data="SELECT geom, landuse_type FROM `cartobq.public_account.wburg_parcels`",
-    type_=pdkc.MapType.QUERY,
-    connection=pdkc.CartoConnection.CARTO_DW,
-    credentials=pdkc.get_layer_credentials(carto_auth),
+    "VectorTileLayer",
+    data=data,
     get_fill_color=pdkc.styles.color_categories(
         "landuse_type",
         [

diff --git a/bindings/pydeck-carto/examples/scripts/carto_styles_color_continuous.py b/bindings/pydeck-carto/examples/scripts/carto_styles_color_continuous.py
@@ -13,12 +13,17 @@
 
 pdkc.register_layers()
 
+data = pdkc.sources.vector_query_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    sql_query="SELECT geom, value FROM cartobq.public_account.temps",
+)
+
+
 layer = pdk.Layer(
-    "CartoLayer",
-    data="SELECT geom, value FROM cartobq.public_account.temps",
-    type_=pdkc.MapType.QUERY,
-    connection=pdkc.CartoConnection.CARTO_DW,
-    credentials=pdkc.get_layer_credentials(carto_auth),
+    "VectorTileLayer",
+    data=data,
     get_fill_color=pdkc.styles.color_continuous(
         "value", [70, 75, 80, 85, 90, 95, 100], "Peach"
     ),

diff --git a/bindings/pydeck-carto/examples/scripts/hello_world.py b/bindings/pydeck-carto/examples/scripts/hello_world.py
@@ -7,20 +7,23 @@
 
 import pydeck as pdk
 import pydeck_carto as pdkc
+from carto_auth import CartoAuth
+from os.path import join, dirname
+
+carto_auth = CartoAuth.from_oauth()
 
 pdkc.register_layers()
 
+data = pdkc.sources.vector_query_source(
+    access_token=carto_auth.get_access_token(),
+    api_base_url=carto_auth.get_api_base_url(),
+    connection_name="carto_dw",
+    sql_query="SELECT geom, name FROM cartobq.public_account.populated_places",
+)
+
 layer = pdk.Layer(
-    "CartoLayer",
-    data="SELECT geom, name FROM cartobq.public_account.populated_places",
-    type_=pdkc.MapType.QUERY,
-    connection=pdk.types.String("bqconnection"),
-    credentials={
-        "apiBaseUrl": "https://gcp-us-east1.api.carto.com",
-        "accessToken": "eyJhbGciOiJIUzI1NiJ9"
-        ".eyJhIjoiYWNfN3hoZnd5bWwiLCJqdGkiOiIwMGQ1NmFiMyJ9"
-        ".zqsprFkxiafKXQ91PDB8845nVeWGVnuLg22v49J3Wiw",
-    },
+    "VectorTileLayer",
+    data=data,
     get_fill_color=[238, 77, 90],
     point_radius_min_pixels=2.5,
 )