2023-01-01 08:03:21 +03:00
|
|
|
listen_addresses: localhost:3111
|
|
|
|
|
postgres:
|
|
|
|
|
default_srid: 900913
|
2023-10-22 10:30:18 +03:00
|
|
|
auto_bounds: calc
|
2023-01-03 19:09:41 +03:00
|
|
|
auto_publish: true
|
2023-01-01 08:03:21 +03:00
|
|
|
tables:
|
|
|
|
|
MixPoints:
|
|
|
|
|
schema: MixedCase
|
|
|
|
|
table: MixPoints
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: Geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -170.94984639004662
|
|
|
|
|
- -84.20025580733805
|
|
|
|
|
- 167.70892858284475
|
|
|
|
|
- 74.23573284753762
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
Gid: int4
|
|
|
|
|
TABLE: text
|
2023-08-04 00:51:10 +03:00
|
|
|
auto_table:
|
|
|
|
|
schema: autodetect
|
|
|
|
|
table: auto_table
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -166.87107126230424
|
|
|
|
|
- -53.44747249115674
|
|
|
|
|
- 168.14061220360549
|
|
|
|
|
- 84.22411861475385
|
2023-08-04 00:51:10 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
feat_id: int4
|
|
|
|
|
gid: int4
|
2023-08-13 05:06:23 +03:00
|
|
|
bigint_table:
|
|
|
|
|
schema: autodetect
|
|
|
|
|
table: bigint_table
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -174.89475564568033
|
|
|
|
|
- -77.2579745396886
|
|
|
|
|
- 174.72753224514435
|
|
|
|
|
- 73.80785950599903
|
2023-08-13 05:06:23 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
big_feat_id: int8
|
|
|
|
|
id: int4
|
2023-01-01 08:03:21 +03:00
|
|
|
points1:
|
|
|
|
|
schema: public
|
|
|
|
|
table: points1
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -179.27313970132585
|
|
|
|
|
- -67.52518563265659
|
|
|
|
|
- 162.60117193735186
|
|
|
|
|
- 84.93092095128937
|
2023-02-08 04:45:01 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
points1_vw:
|
|
|
|
|
schema: public
|
|
|
|
|
table: points1_vw
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -179.27313970132585
|
|
|
|
|
- -67.52518563265659
|
|
|
|
|
- 162.60117193735186
|
|
|
|
|
- 84.93092095128937
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
points2:
|
|
|
|
|
schema: public
|
|
|
|
|
table: points2
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -174.050750735362
|
|
|
|
|
- -80.46177157848345
|
|
|
|
|
- 179.11187181086706
|
|
|
|
|
- 81.13068764165727
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
points3857:
|
|
|
|
|
schema: public
|
|
|
|
|
table: points3857
|
|
|
|
|
srid: 3857
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -161.40590777554058
|
|
|
|
|
- -81.50727021609012
|
|
|
|
|
- 172.51549126768532
|
|
|
|
|
- 84.2440187164111
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
points_empty_srid:
|
|
|
|
|
schema: public
|
|
|
|
|
table: points_empty_srid
|
|
|
|
|
srid: 900913
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -162.35196679784573
|
|
|
|
|
- -84.49919770031491
|
|
|
|
|
- 178.47294677445652
|
|
|
|
|
- 82.7000012450467
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: GEOMETRY
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
table_source:
|
|
|
|
|
schema: public
|
|
|
|
|
table: table_source
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -2.0
|
|
|
|
|
- -1.0
|
|
|
|
|
- 142.84131509869133
|
|
|
|
|
- 45.0
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: GEOMETRY
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
table_source_multiple_geom:
|
|
|
|
|
schema: public
|
|
|
|
|
table: table_source_multiple_geom
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom1
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -136.62076049706184
|
|
|
|
|
- -78.3350299285405
|
|
|
|
|
- 176.56297743499888
|
|
|
|
|
- 75.78731065954437
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
table_source_multiple_geom.1:
|
|
|
|
|
schema: public
|
|
|
|
|
table: table_source_multiple_geom
|
|
|
|
|
srid: 4326
|
|
|
|
|
geometry_column: geom2
|
2023-10-22 10:30:18 +03:00
|
|
|
bounds:
|
|
|
|
|
- -136.62076049706184
|
|
|
|
|
- -78.3350299285405
|
|
|
|
|
- 176.56297743499888
|
|
|
|
|
- 75.78731065954437
|
2023-01-01 08:03:21 +03:00
|
|
|
geometry_type: POINT
|
|
|
|
|
properties:
|
|
|
|
|
gid: int4
|
|
|
|
|
functions:
|
|
|
|
|
function_Mixed_Name:
|
|
|
|
|
schema: MixedCase
|
|
|
|
|
function: function_Mixed_Name
|
|
|
|
|
function_null:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_null
|
|
|
|
|
function_null_row:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_null_row
|
|
|
|
|
function_null_row2:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_null_row2
|
|
|
|
|
function_zoom_xy:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zoom_xy
|
|
|
|
|
function_zxy:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy
|
|
|
|
|
function_zxy2:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy2
|
|
|
|
|
function_zxy_query:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy_query
|
|
|
|
|
function_zxy_query_jsonb:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy_query_jsonb
|
|
|
|
|
function_zxy_query_test:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy_query_test
|
|
|
|
|
function_zxy_row:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy_row
|
|
|
|
|
function_zxy_row_key:
|
|
|
|
|
schema: public
|
|
|
|
|
function: function_zxy_row_key
|
2023-01-08 22:19:11 +03:00
|
|
|
pmtiles:
|
2023-09-29 21:37:18 +03:00
|
|
|
paths:
|
|
|
|
|
- tests/fixtures/mbtiles
|
|
|
|
|
- tests/fixtures/pmtiles
|
2023-11-09 03:46:23 +03:00
|
|
|
- tests/fixtures/pmtiles2
|
2023-01-08 22:19:11 +03:00
|
|
|
sources:
|
2023-09-29 21:37:18 +03:00
|
|
|
png: tests/fixtures/pmtiles/png.pmtiles
|
|
|
|
|
stamen_toner__raster_CC-BY-ODbL_z3: tests/fixtures/pmtiles/stamen_toner__raster_CC-BY+ODbL_z3.pmtiles
|
2023-11-09 03:46:23 +03:00
|
|
|
webp2: tests/fixtures/pmtiles2/webp2.pmtiles
|
Add .mbtiles support (#549)
Adds a new [.mbtiles](https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md)
backend, without the grid support. Uses extensive tile content
detection, i.e. if the content is gzipped, png, jpeg, gif, webp.
From CLI, can be as easy as adding a path to a directory that contains a
.mbtiles file (works just like pmtiles support)
```bash
# All *.mbtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways
(same as pmtiles)
```yaml
mbtiles:
paths:
# scan this whole dir, matching all *.mbtiles files
- /dir-path
# specific mbtiles file will be published as mbtiles2 source
- /path/to/mbtiles2.mbtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/mbtiles.mbtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/mbtiles.mbtiles
```
Fixes #494
2023-01-09 08:10:23 +03:00
|
|
|
mbtiles:
|
2023-09-29 21:37:18 +03:00
|
|
|
paths:
|
|
|
|
|
- tests/fixtures/mbtiles
|
|
|
|
|
- tests/fixtures/pmtiles
|
2023-11-09 03:46:23 +03:00
|
|
|
- tests/fixtures/pmtiles2
|
Add .mbtiles support (#549)
Adds a new [.mbtiles](https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md)
backend, without the grid support. Uses extensive tile content
detection, i.e. if the content is gzipped, png, jpeg, gif, webp.
From CLI, can be as easy as adding a path to a directory that contains a
.mbtiles file (works just like pmtiles support)
```bash
# All *.mbtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways
(same as pmtiles)
```yaml
mbtiles:
paths:
# scan this whole dir, matching all *.mbtiles files
- /dir-path
# specific mbtiles file will be published as mbtiles2 source
- /path/to/mbtiles2.mbtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/mbtiles.mbtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/mbtiles.mbtiles
```
Fixes #494
2023-01-09 08:10:23 +03:00
|
|
|
sources:
|
2023-09-29 21:37:18 +03:00
|
|
|
geography-class-jpg: tests/fixtures/mbtiles/geography-class-jpg.mbtiles
|
|
|
|
|
geography-class-jpg-diff: tests/fixtures/mbtiles/geography-class-jpg-diff.mbtiles
|
|
|
|
|
geography-class-jpg-modified: tests/fixtures/mbtiles/geography-class-jpg-modified.mbtiles
|
|
|
|
|
geography-class-png: tests/fixtures/mbtiles/geography-class-png.mbtiles
|
|
|
|
|
geography-class-png-no-bounds: tests/fixtures/mbtiles/geography-class-png-no-bounds.mbtiles
|
|
|
|
|
json: tests/fixtures/mbtiles/json.mbtiles
|
|
|
|
|
uncompressed_mvt: tests/fixtures/mbtiles/uncompressed_mvt.mbtiles
|
|
|
|
|
webp: tests/fixtures/mbtiles/webp.mbtiles
|
|
|
|
|
world_cities: tests/fixtures/mbtiles/world_cities.mbtiles
|
|
|
|
|
world_cities_diff: tests/fixtures/mbtiles/world_cities_diff.mbtiles
|
|
|
|
|
world_cities_modified: tests/fixtures/mbtiles/world_cities_modified.mbtiles
|
|
|
|
|
zoomed_world_cities: tests/fixtures/mbtiles/zoomed_world_cities.mbtiles
|
Implement dynamic font support `/font/<name>/<start>-<end>` (#755)
This implements dynamic font protobuf generation, allowing users to
request font ranges on the fly, and combining them in any order, e.g.
`Font1,Font2,Font3`, same as with sprites and tiles
This is a first iteration, without any multithreading support. In
theory, this could be done far faster by generating SDFs with multiple
threads.
### Current process
* during init, figure out all glyphs available in each font, and store
them as a bitset
* during request:
* combine requested bitsets to figure out which glyph should come from
which font file
* load those glyphs from files (using a single instance of the freetype
lib)
* convert them to SDFs and package them into a protobuf
---------
Co-authored-by: Lucas <zhangyijunmetro@hotmail.com>
2023-10-28 08:10:48 +03:00
|
|
|
sprites: tests/fixtures/sprites/src1
|
|
|
|
|
fonts:
|
|
|
|
|
- tests/fixtures/fonts/overpass-mono-regular.ttf
|
|
|
|
|
- tests/fixtures/fonts
|
