Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ajduberstein authored Mar 20, 2021
2 parents 142cdab + 04f38c5 commit ed84905
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 12 deletions.
13 changes: 6 additions & 7 deletions docs/api-reference/carto/carto-bqtiler-layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ First you need first to generate a tileset of your dataset in your BigQuery acco
import DeckGL from '@deck.gl/react';
import {CartoBQTilerLayer} from '@deck.gl/carto';


function App({viewState}) {
const layer = new CartoBQTilerLayer({
data: 'cartobq.maps.nyc_taxi_points_demo_id',
getLineColor: [255, 255, 255],
getFillColor: [238, 77, 90],
pointRadiusMinPixels: 2,
lineWidthMinPixels: 1
});
data: 'cartobq.maps.nyc_taxi_points_demo_id',
getLineColor: [255, 255, 255],
getFillColor: [238, 77, 90],
pointRadiusMinPixels: 2,
lineWidthMinPixels: 1
});

return <DeckGL viewState={viewState} layers={[layer]} />;
}
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/carto/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ This is an object to define the connection to CARTO, including the credentials (

* username (required): unique username in the platform
* apiKey (optional): api key. default to `public_user`
* region (optional): region of the user, possible values are `us` or `eu`. Only need to be specified if you've specifically requested an account in `eu`.
* sqlUrl (optional): SQL API URL Template. Default to `https://{user}.carto.com/api/v2/sql`,
* mapsUrl (optional): MAPS API URL Template. Default to `https://{user}.carto.com/api/v1/map`
* region (optional): region of the user, possible values are `us` or `eu`. Only need to be specified if you've specifically requested an account in `eu`
* sqlUrl (optional): SQL API URL Template. Default to `https://{user}.carto.com/api/v2/sql`
* mapsUrl (optional): MAPS API URL Template. Default to `https://maps-api-v2.{region}.carto.com/user/{user}`

If you're an on-premise user or you're running CARTO from [Google's Market place](https://console.cloud.google.com/marketplace/details/cartodb-public/carto-enterprise-payg), you need to set the URLs to point to your instance.

Expand Down
2 changes: 1 addition & 1 deletion docs/api-reference/geo-layers/mvt-layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Receives arguments:

## Methods

#### `getRenderedFeatures` (Function)
##### `getRenderedFeatures` (Function)

Get the rendered features in the current viewport.

Expand Down
1 change: 1 addition & 0 deletions modules/mapbox/src/deck-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export function getDeckInstance({map, gl, deck}) {
gl,
width: false,
height: false,
touchAction: 'unset',
viewState: getViewState(map)
});
deck = new Deck(deckProps);
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-map-gl": "^5.1.0",
"s2-geometry": "^1.2.10"
"s2-geometry": "^1.2.10",
"typescript": "^4.2.3"
},
"pre-commit": [
"test-fast",
Expand Down
83 changes: 83 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"compilerOptions": {
"target": "es2020",
"jsx": "react",
"strict": true,
"noImplicitAny": false,
"allowJs": true,
"checkJs": true,
"moduleResolution": "node",
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"noEmit": true,
"resolveJsonModule": true,
"baseUrl": ".",
"paths": {
"@deck.gl/core/*": ["modules/core/src/*"],
"@deck.gl/core/test": ["modules/core/test"],
"@deck.gl/extensions/*": ["modules/extensions/src/*"],
"@deck.gl/extensions/test": ["modules/extensions/test"],
"@deck.gl/json/*": ["modules/json/src/*"],
"@deck.gl/json/test": ["modules/json/test"],
"@deck.gl/main/*": ["modules/main/src/*"],
"@deck.gl/main/test": ["modules/main/test"],
"@deck.gl/test-utils/*": ["modules/test-utils/src/*"],
"@deck.gl/test-utils/test": ["modules/test-utils/test"],

"@deck.gl/react/*": ["modules/react/src/*"],
"@deck.gl/react/test": ["modules/react/test"],

"@deck.gl/jupyter-widget/*": ["modules/jupyter-widget/src/*"],
"@deck.gl/jupyter-widget/test": ["modules/jupyter-widget/test"],

"@deck.gl/arcgis/*": ["modules/arcgis/src/*"],
"@deck.gl/arcgis/test": ["modules/arcgis/test"],
"@deck.gl/carto/*": ["modules/carto/src/*"],
"@deck.gl/carto/test": ["modules/carto/test"],
"@deck.gl/mapbox/*": ["modules/mapbox/src/*"],
"@deck.gl/mapbox/test": ["modules/mapbox/test"],
"@deck.gl/google/*": ["modules/google/src/*"],
"@deck.gl/google/test": ["modules/google/test"],

"@deck.gl/layers/*": ["modules/layers/src/*"],
"@deck.gl/layers/test": ["modules/layers/test"],
"@deck.gl/geo-layers/*": ["modules/geo-layers/src/*"],
"@deck.gl/geo-layers/test": ["modules/geo-layers/test"],
"@deck.gl/aggregation-layers/*": ["modules/aggregation-layers/src/*"],
"@deck.gl/aggregation-layers/test": ["modules/aggregation-layers/test"],
"@deck.gl/mesh-layers/*": ["modules/mesh-layers/src/*"],
"@deck.gl/mesh-layers/test": ["modules/mesh-layers/test"],

"test": ["test"]
}
},
"include": [
"modules/core/src/**/*.js",
"modules/extensions/src/**/*.js",
"modules/json/src/**/*.js",
"modules/main/src/**/*.js",
"modules/test-utils/src/**/*.js",
"modules/react/src/**/*.js",
"modules/arcgis/src/**/*.js",
"modules/carto/src/**/*.js",
"modules/mapbox/src/**/*.js",
"modules/google/src/**/*.js",
"modules/layers/src/**/*.js",
"modules/geo-layers/src/**/*.js",
"modules/aggregation-layers/src/**/*.js",
"modules/mesh-layers/src/**/*.js"
],
"exclude":[
"modules/jupyter-widget/src/**/*.js",

"modules/**/test/**/**/*.js",

"modules/**/src/libs/*",
"modules/*/dist/**/*",
"modules/**/wip/**/*",
"examples",
"coverage",
"website",
"test",
]
}
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11495,6 +11495,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==

uglify-js@3.4.x:
version "3.4.10"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
Expand Down

0 comments on commit ed84905

Please sign in to comment.