Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete trailing spaces #894

Merged
merged 1 commit into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ worker_processes: 8
# - /path/to/pmtiles.pmtiles
# sources:
# pm-src1: /path/to/pmtiles1.pmtiles

# mbtiles:
# paths:
# - /dir-path
Expand Down
4 changes: 2 additions & 2 deletions docs/src/sources-pg-tables.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/src/tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion martin/src/pg/scripts/query_available_tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down