diff --git a/README.md b/README.md index aaefc24..a382327 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,23 @@ Create tilesets from [Overture Maps](http://overturemaps.org) data. -These tilesets display an "X-ray" visualization of Overture data, for inspecting the breadth of Overture data and attributes. **They are not designed to be a production-ready cartographic basemap.** +These tilesets display an ["X-ray" visualization of Overture data](https://explore.overturemaps.org), for inspecting the breadth of Overture data and attributes. **They are not designed to be a production-ready cartographic basemap.** Each Overture **theme** has an associated [PMTiles](https://github.com/protomaps/PMTiles) file. View these tilesets in your browser: -* [base](https://pmtiles.io/?url=https%3A%2F%2Fhellocdkstack-overturetilesbucket6f38c611-6zusoghoh4au.s3.us-west-2.amazonaws.com%2F2024-06-13-beta%2Fbase.pmtiles) -* [buildings](https://pmtiles.io/?url=https%3A%2F%2Fhellocdkstack-overturetilesbucket6f38c611-6zusoghoh4au.s3.us-west-2.amazonaws.com%2F2024-06-13-beta%2Fbuildings.pmtiles) -* [divisions](https://pmtiles.io/?url=https%3A%2F%2Fhellocdkstack-overturetilesbucket6f38c611-6zusoghoh4au.s3.us-west-2.amazonaws.com%2F2024-06-13-beta%2Fdivisions.pmtiles) -* [places](https://pmtiles.io/?url=https%3A%2F%2Fhellocdkstack-overturetilesbucket6f38c611-6zusoghoh4au.s3.us-west-2.amazonaws.com%2F2024-06-13-beta%2Fplaces.pmtiles) -* [transportation](https://pmtiles.io/?url=https%3A%2F%2Fhellocdkstack-overturetilesbucket6f38c611-6zusoghoh4au.s3.us-west-2.amazonaws.com%2F2024-06-13-beta%2Ftransportation.pmtiles) +* [addresses](https://pmtiles.io/?url=https%3A%2F%2Foverturemaps-tiles-us-west-2-beta.s3.amazonaws.com%2F2024-07-22%2Faddresses.pmtiles) +* [base](https://pmtiles.io/?url=https%3A%2F%2Foverturemaps-tiles-us-west-2-beta.s3.amazonaws.com%2F2024-07-22%2Fbase.pmtiles) +* [buildings](https://pmtiles.io/?url=https%3A%2F%2Foverturemaps-tiles-us-west-2-beta.s3.amazonaws.com%2F2024-07-22%2Fbuildings.pmtiles) +* [divisions](https://pmtiles.io/?url=https%3A%2F%2Foverturemaps-tiles-us-west-2-beta.s3.amazonaws.com%2F2024-07-22%2Fdivisions.pmtiles) +* [places](https://pmtiles.io/?url=https%3A%2F%2Foverturemaps-tiles-us-west-2-beta.s3.amazonaws.com%2F2024-07-22%2Fplaces.pmtiles) +* [transportation](https://pmtiles.io/?url=https%3A%2F%2Foverturemaps-tiles-us-west-2-beta.s3.amazonaws.com%2F2024-07-22%2Ftransportation.pmtiles) -* S3: `s3://example-bucket/RELEASE/THEME.pmtiles` -* HTTP: `https://example-bucket.s3.amazonaws.com/RELEASE/THEME.pmtiles` +* S3: `s3://overturemaps-tiles-us-west-2-beta/RELEASE/THEME.pmtiles` +* HTTP: `https://overturemaps-tiles-us-west-2-beta.s3.amazonaws.com/RELEASE/THEME.pmtiles` -* `THEME`: one of `base`, `buildings`, `divisions`, `places`, `transportation` -* `RELEASE`: The Overture release name, not including minor version. For example, theme `buildings` in **data** release `2024-06-13-beta.0` will have tiles object name `2024-06-13-beta/buildings.pmtiles`. +* `THEME`: one of `addresses`, `base`, `buildings`, `divisions`, `places`, `transportation` +* `RELEASE`: The Overture release name, not including minor version. For example, theme `buildings` in **data** release `2024-07-22.0` will have tiles object name `2024-07-22/buildings.pmtiles`. ## How to Use @@ -28,7 +29,7 @@ To create a new tileset for only part of the world, use the `extract` command of To get all `buildings` tiles around Ghent, Belgium: ``` -pmtiles extract https://.../buildings.pmtiles ghent.pmtiles --bbox=3.660507,51.004250,3.784790,51.065996 +pmtiles extract https://overturemaps-tiles-us-west-2-beta.s3.amazonaws.com/2024-07-22/buildings.pmtiles ghent.pmtiles --bbox=3.660507,51.004250,3.784790,51.065996 ``` ## Building Tilesets @@ -64,7 +65,7 @@ The above command outputs `base.pmtiles` in the `data` dir. * for other themes, run the theme script in `themes/`: ```sh -scripts/2024-06-13-beta/places.sh overture places.pmtiles +scripts/2024-07-22/places.sh overture places.pmtiles ``` This reads from Overture data in `overture` and writes `places.pmtiles`. diff --git a/hello-cdk/.gitignore b/overture-tiles-cdk/.gitignore similarity index 100% rename from hello-cdk/.gitignore rename to overture-tiles-cdk/.gitignore diff --git a/hello-cdk/.npmignore b/overture-tiles-cdk/.npmignore similarity index 100% rename from hello-cdk/.npmignore rename to overture-tiles-cdk/.npmignore diff --git a/hello-cdk/README.md b/overture-tiles-cdk/README.md similarity index 100% rename from hello-cdk/README.md rename to overture-tiles-cdk/README.md diff --git a/hello-cdk/bin/hello-cdk.ts b/overture-tiles-cdk/bin/overture-tiles-cdk.ts similarity index 86% rename from hello-cdk/bin/hello-cdk.ts rename to overture-tiles-cdk/bin/overture-tiles-cdk.ts index 8997a6d..b7a0d63 100644 --- a/hello-cdk/bin/hello-cdk.ts +++ b/overture-tiles-cdk/bin/overture-tiles-cdk.ts @@ -1,10 +1,10 @@ #!/usr/bin/env node import 'source-map-support/register'; import * as cdk from 'aws-cdk-lib'; -import { HelloCdkStack } from '../lib/hello-cdk-stack'; +import { OvertureTilesCdkStack } from '../lib/overture-tiles-cdk-stack'; const app = new cdk.App(); -new HelloCdkStack(app, 'HelloCdkStack', { +new OvertureTilesCdkStack(app, 'OvertureTilesCdkStack', { /* If you don't specify 'env', this stack will be environment-agnostic. * Account/Region-dependent features and context lookups will not work, * but a single synthesized template can be deployed anywhere. */ diff --git a/hello-cdk/cdk.json b/overture-tiles-cdk/cdk.json similarity index 98% rename from hello-cdk/cdk.json rename to overture-tiles-cdk/cdk.json index 2a2c51b..60a0973 100644 --- a/hello-cdk/cdk.json +++ b/overture-tiles-cdk/cdk.json @@ -1,5 +1,5 @@ { - "app": "npx ts-node --prefer-ts-exts bin/hello-cdk.ts", + "app": "npx ts-node --prefer-ts-exts bin/overture-tiles-cdk.ts", "watch": { "include": [ "**" diff --git a/hello-cdk/lib/hello-cdk-stack.ts b/overture-tiles-cdk/lib/overture-tiles-cdk-stack.ts similarity index 97% rename from hello-cdk/lib/hello-cdk-stack.ts rename to overture-tiles-cdk/lib/overture-tiles-cdk-stack.ts index 9c32d14..bcc85f5 100644 --- a/hello-cdk/lib/hello-cdk-stack.ts +++ b/overture-tiles-cdk/lib/overture-tiles-cdk-stack.ts @@ -10,7 +10,7 @@ import { aws_iam as iam } from "aws-cdk-lib"; const ID = "OvertureTiles"; -export class HelloCdkStack extends cdk.Stack { +export class OvertureTilesCdkStack extends cdk.Stack { constructor(scope: Construct, id: string, props?: cdk.StackProps) { super(scope, id, props); @@ -36,6 +36,7 @@ export class HelloCdkStack extends cdk.Stack { }); const bucket = new s3.Bucket(this, `${ID}Bucket`, { + bucketName: 'overturemaps-tiles-us-west-2-beta', blockPublicAccess: new s3.BlockPublicAccess({ blockPublicAcls: false, blockPublicPolicy: false, diff --git a/hello-cdk/package-lock.json b/overture-tiles-cdk/package-lock.json similarity index 99% rename from hello-cdk/package-lock.json rename to overture-tiles-cdk/package-lock.json index 18bd425..2a41608 100644 --- a/hello-cdk/package-lock.json +++ b/overture-tiles-cdk/package-lock.json @@ -1,11 +1,11 @@ { - "name": "hello-cdk", + "name": "overture-tiles-cdk", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "hello-cdk", + "name": "overture-tiles-cdk", "version": "0.1.0", "dependencies": { "aws-cdk-lib": "2.146.0", @@ -13,7 +13,7 @@ "source-map-support": "^0.5.21" }, "bin": { - "hello-cdk": "bin/hello-cdk.js" + "overture-tiles-cdk": "bin/overture-tiles-cdk.js" }, "devDependencies": { "@types/node": "20.12.7", diff --git a/hello-cdk/package.json b/overture-tiles-cdk/package.json similarity index 81% rename from hello-cdk/package.json rename to overture-tiles-cdk/package.json index 9d91d02..0e4ba71 100644 --- a/hello-cdk/package.json +++ b/overture-tiles-cdk/package.json @@ -1,8 +1,8 @@ { - "name": "hello-cdk", + "name": "overture-tiles-cdk", "version": "0.1.0", "bin": { - "hello-cdk": "bin/hello-cdk.js" + "overture-tiles-cdk": "bin/overture-tiles-cdk.js" }, "scripts": { "build": "tsc", diff --git a/hello-cdk/tsconfig.json b/overture-tiles-cdk/tsconfig.json similarity index 100% rename from hello-cdk/tsconfig.json rename to overture-tiles-cdk/tsconfig.json