diff --git a/README.md b/README.md index 7d9ca3363..df2442e10 100755 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Each tile source will have a [TileJSON](https://github.com/mapbox/tilejson-spec) export DATABASE_URL="postgresql://user:password@host:port/database" martin -# same as above, but passing connection string via CLI, together with a directory of .mbtiles/.pmtiles files +# same as above, but passing connection string via CLI, together with a directory of .mbtiles/.pmtiles files martin postgresql://user:password@host:port/database path/to/dir # publish all discovered tables/funcs from two DBs diff --git a/debian/config.yaml b/debian/config.yaml index 93f7c4642..aacb3b20a 100644 --- a/debian/config.yaml +++ b/debian/config.yaml @@ -22,7 +22,7 @@ worker_processes: 8 # - /path/to/pmtiles.pmtiles # sources: # pm-src1: /path/to/pmtiles1.pmtiles - + # mbtiles: # paths: # - /dir-path diff --git a/docs/src/sources-pg-tables.md b/docs/src/sources-pg-tables.md index 289f3ac95..928b49f0e 100644 --- a/docs/src/sources-pg-tables.md +++ b/docs/src/sources-pg-tables.md @@ -43,9 +43,9 @@ By default the `description` and `name` is database identifies about this table, ## TileJSON in SQL Comments -Other than adjusting `auto_publish` section in configuration file, you can fine tune the `TileJSON` on the database side directly: Add a valid JSON as an SQL comment on the table. +Other than adjusting `auto_publish` section in configuration file, you can fine tune the `TileJSON` on the database side directly: Add a valid JSON as an SQL comment on the table. -Martin will merge table comment into the generated TileJSON using JSON Merge patch. The following example update description and adds attribution, version, foo(even a nested DIY field) fields to the TileJSON. +Martin will merge table comment into the generated TileJSON using JSON Merge patch. The following example update description and adds attribution, version, foo(even a nested DIY field) fields to the TileJSON. ```sql DO $do$ BEGIN diff --git a/docs/src/tools.md b/docs/src/tools.md index ff71bafc7..05f444035 100644 --- a/docs/src/tools.md +++ b/docs/src/tools.md @@ -8,7 +8,7 @@ A small utility that allows users to interact with the `*.mbtiles` files from th This tool can be installed by compiling the latest released version with `cargo install martin-mbtiles`, or by downloading a pre-built binary from the [releases page](https://github.com/maplibre/martin/releases/latest). ### meta-all -Print all metadata values to stdout, as well as the results of tile detection. The format of the values printed is not stable, and should only be used for visual inspection. +Print all metadata values to stdout, as well as the results of tile detection. The format of the values printed is not stable, and should only be used for visual inspection. ```shell mbtiles meta-all my_file.mbtiles @@ -72,7 +72,7 @@ mbtiles validate src_file.mbtiles ## Supported Schema The `mbtiles` tool supports three different kinds of schema for `tiles` data in `.mbtiles` files: -- `flat`: +- `flat`: ``` CREATE TABLE tiles (zoom_level integer, tile_column integer, tile_row integer, tile_data blob); CREATE UNIQUE INDEX tile_index on tiles (zoom_level, tile_column, tile_row); @@ -85,7 +85,7 @@ The `mbtiles` tool supports three different kinds of schema for `tiles` data in ``` - `normalized`: ``` - CREATE TABLE map (zoom_level INTEGER, tile_column INTEGER, tile_row INTEGER, tile_id TEXT); + CREATE TABLE map (zoom_level INTEGER, tile_column INTEGER, tile_row INTEGER, tile_id TEXT); CREATE UNIQUE INDEX map_index ON map (zoom_level, tile_column, tile_row); CREATE TABLE images (tile_data blob, tile_id text); CREATE UNIQUE INDEX images_id ON images (tile_id); diff --git a/martin/src/pg/scripts/query_available_tables.sql b/martin/src/pg/scripts/query_available_tables.sql index 8fbd3d54a..4c4d0be5c 100755 --- a/martin/src/pg/scripts/query_available_tables.sql +++ b/martin/src/pg/scripts/query_available_tables.sql @@ -58,7 +58,7 @@ WITH CAST(obj_description(relfilenode, 'pg_class') AS VARCHAR) AS description FROM pg_class JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid - WHERE relkind = 'r' OR relkind = 'v' + WHERE relkind = 'r' OR relkind = 'v' ) SELECT schema, name,