diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15a074857..b8e0cc677 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: PGPASSWORD: postgres services: postgres: - image: postgis/postgis:14-3.3 + image: postgis/postgis:15-3.4 ports: # will assign a random free host port - 5432/tcp @@ -46,7 +46,7 @@ jobs: --health-timeout 5s --health-retries 5 --entrypoint sh - postgis/postgis:14-3.3 + postgis/postgis:15-3.4 -c "exec docker-entrypoint.sh postgres -c ssl=on -c ssl_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem -c ssl_key_file=/etc/ssl/private/ssl-cert-snakeoil.key" steps: - uses: taiki-e/install-action@v2 @@ -89,7 +89,7 @@ jobs: # TODO: aarch64-unknown-linux-gnu services: postgres: - image: postgis/postgis:14-3.3 + image: postgis/postgis:15-3.4 ports: - 5432/tcp options: >- @@ -104,7 +104,7 @@ jobs: --health-timeout 5s --health-retries 5 --entrypoint sh - postgis/postgis:14-3.3 + postgis/postgis:15-3.4 -c "exec docker-entrypoint.sh postgres -c ssl=on -c ssl_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem -c ssl_key_file=/etc/ssl/private/ssl-cert-snakeoil.key" steps: @@ -126,6 +126,8 @@ jobs: # https://github.com/docker/setup-qemu-action with: platforms: linux/amd64,linux/arm64 + - name: Set up gdal-bin + run: sudo apt-get install -y gdal-bin - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 # https://github.com/docker/setup-buildx-action @@ -348,7 +350,7 @@ jobs: if: matrix.os == 'windows-latest' uses: nyurik/action-setup-postgis@v2.2 id: pg - with: { username: 'postgres', password: 'postgres', database: 'test',postgres-version: 14, port: 34837, postgis_version: 3.3.3} + with: { username: 'postgres', password: 'postgres', database: 'test',postgres-version: 15, port: 34837, postgis_version: 3.4.2} - name: Install and run Postgis (Ubuntu) if: matrix.os == 'ubuntu-latest' run: | @@ -364,7 +366,7 @@ jobs: --health-interval=10s \ --health-timeout=5s \ --health-retries=5 \ - postgis/postgis:14-3.3 \ + postgis/postgis:15-3.4 \ postgres \ -c ssl=on \ -c ssl_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem \ @@ -385,7 +387,6 @@ jobs: export PGSERVICE="${{ steps.pg.outputs.service-name }}" fi tests/fixtures/initdb.sh - - name: Copy static files run: cp -r tests/fixtures/pmtiles2/* ${{ steps.nginx.outputs.html-dir }} - name: Download build artifact build-${{ matrix.target }} @@ -393,6 +394,9 @@ jobs: with: name: build-${{ matrix.target }} path: target/ + - name: Set up gdal-bin + if: matrix.os == 'ubuntu-latest' + run: sudo apt-get install -y gdal-bin - name: Integration Tests run: | export MARTIN_BUILD_ALL=- @@ -410,7 +414,7 @@ jobs: tests/test.sh - name: Compare test output results (Linux) if: matrix.target == 'x86_64-unknown-linux-gnu' - run: diff --brief --recursive --new-file tests/output tests/expected + run: diff --brief --recursive --new-file --exclude='*.pbf' tests/output tests/expected - name: Download Debian package (Linux) if: matrix.target == 'x86_64-unknown-linux-gnu' uses: actions/download-artifact@v4 @@ -450,11 +454,11 @@ jobs: - img_ver: 11-3.0-alpine args: postgres sslmode: disable - - img_ver: 14-3.3-alpine + - img_ver: 15-3.4-alpine args: postgres sslmode: disable # alpine images don't support SSL, so for this we use the debian images - - img_ver: 14-3.3 + - img_ver: 15-3.4 args: postgres -c ssl=on -c ssl_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem -c ssl_key_file=/etc/ssl/private/ssl-cert-snakeoil.key sslmode: require # @@ -517,6 +521,8 @@ jobs: with: name: build-x86_64-unknown-linux-gnu path: target_releases/ + - name: Install gdal-bin + run: sudo apt-get install -y gdal-bin - name: Integration Tests run: | if [[ "${{ matrix.sslmode }}" == "verify-ca" || "${{ matrix.sslmode }}" == "verify-full" ]]; then diff --git a/docker-compose.yml b/docker-compose.yml index 298705b48..ae2bbaf9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: db-is-ready: # This should match the version of postgres used in the CI workflow - image: postgis/postgis:14-3.3-alpine + image: postgis/postgis:15-3.4-alpine network_mode: host command: - 'sh' @@ -25,7 +25,7 @@ services: db: # This should match the version of postgres used in the CI workflow - image: postgis/postgis:14-3.3-alpine + image: postgis/postgis:15-3.4-alpine restart: unless-stopped ports: - '${PGPORT:-5411}:5432' @@ -47,7 +47,7 @@ services: db-ssl: # This should match the version of postgres used in the CI workflow - image: postgis/postgis:14-3.3 + image: postgis/postgis:15-3.4 command: - 'postgres' - '-c' @@ -75,7 +75,7 @@ services: db-ssl-cert: # This should match the version of postgres used in the CI workflow - image: postgis/postgis:14-3.3 + image: postgis/postgis:15-3.4 command: - 'postgres' - '-c' diff --git a/docs/src/development.md b/docs/src/development.md index ad0369cc2..1224ad071 100644 --- a/docs/src/development.md +++ b/docs/src/development.md @@ -25,7 +25,7 @@ Install a few required libs and tools: ```bash, ignore # For Ubuntu-based distros -sudo apt install -y build-essential pkg-config jq file +sudo apt install -y build-essential pkg-config jq file gdal-bin ``` Install [Just](https://github.com/casey/just#readme) (improved makefile processor). Note that some Linux and Homebrew diff --git a/justfile b/justfile index 8784f757e..b072eb811 100644 --- a/justfile +++ b/justfile @@ -172,7 +172,7 @@ test-int: clean-test install-sqlx echo "** Skipping diffing with the expected output" else echo "** Comparing actual output with expected output..." - if ! diff --brief --recursive --new-file tests/output tests/expected; then + if ! diff --brief --recursive --new-file --exclude='*.pbf' tests/output tests/expected; then echo "** Expected output does not match actual output" echo "** If this is expected, run 'just bless' to update expected output" exit 1 diff --git a/tests/expected/auto/cmp_0_0_0.pbf b/tests/expected/auto/cmp_0_0_0.pbf index aa2f2052d..aa413204e 100644 Binary files a/tests/expected/auto/cmp_0_0_0.pbf and b/tests/expected/auto/cmp_0_0_0.pbf differ diff --git a/tests/expected/auto/cmp_0_0_0.pbf.geojson b/tests/expected/auto/cmp_0_0_0.pbf.geojson new file mode 100644 index 000000000..175f941f3 --- /dev/null +++ b/tests/expected/auto/cmp_0_0_0.pbf.geojson @@ -0,0 +1,2212 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 636, + 1311 + ], + "type": "Point" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 69, + 3783 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3786, + 2534 + ], + "type": "Point" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3802, + 3431 + ], + "type": "Point" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2619, + 2576 + ], + "type": "Point" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 8, + 2251 + ], + "type": "Point" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3639, + 1152 + ], + "type": "Point" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2961, + 1833 + ], + "type": "Point" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2312, + 2092 + ], + "type": "Point" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2337, + 1483 + ], + "type": "Point" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1455, + 1594 + ], + "type": "Point" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 862, + 2279 + ], + "type": "Point" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1415, + 4080 + ], + "type": "Point" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2754, + 3130 + ], + "type": "Point" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 769, + 1278 + ], + "type": "Point" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3825, + 1950 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2749, + 2390 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 49, + 2064 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3553, + 1114 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2583, + 1696 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2316, + 2306 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1728, + 1438 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1310, + 995 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1377, + 2018 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 166, + 1389 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3898, + 2774 + ], + "type": "Point" + }, + "properties": { + "gid": 29, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2780, + 2198 + ], + "type": "Point" + }, + "properties": { + "gid": 30, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 874, + 1932 + ], + "type": "Point" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1392, + 3432 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3788, + 2533 + ], + "type": "Point" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1136, + 1206 + ], + "type": "Point" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 417, + 429 + ], + "type": "Point" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3316, + 1807 + ], + "type": "Point" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2607, + 1772 + ], + "type": "Point" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1841, + 1896 + ], + "type": "Point" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 667, + 2267 + ], + "type": "Point" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2111, + 2017 + ], + "type": "Point" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2542, + 2026 + ], + "type": "Point" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1224, + 1934 + ], + "type": "Point" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2068, + 3715 + ], + "type": "Point" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3857, + 2228 + ], + "type": "Point" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1381, + 1037 + ], + "type": "Point" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 355, + 1636 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 4086, + 708 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3025, + 1806 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2561, + 3043 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1876, + 1373 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 68, + 1923 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2353, + 2384 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3166, + 1909 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 941, + 1943 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3897, + 2980 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1158, + 2910 + ], + "type": "Point" + }, + "properties": { + "gid": 29, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 4013, + 2199 + ], + "type": "Point" + }, + "properties": { + "gid": 30, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_0_0_0.pbf.txt b/tests/expected/auto/cmp_0_0_0.pbf.txt deleted file mode 100644 index 4f55922b0..000000000 --- a/tests/expected/auto/cmp_0_0_0.pbf.txt +++ /dev/null @@ -1,644 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - gid=7 - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - gid=12 - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - gid=13 - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - gid=17 - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(636,2785) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(69,313) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3786,1562) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(3802,665) - properties: - gid=7 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(2619,1520) - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(8,1845) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3639,2944) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(2961,2263) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(2312,2004) - properties: - gid=12 - feature: 12 - id: (none) - geomtype: point - geometry: - POINT(2337,2613) - properties: - gid=13 - feature: 13 - id: (none) - geomtype: point - geometry: - POINT(1455,2502) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: point - geometry: - POINT(862,1817) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: point - geometry: - POINT(1415,16) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: point - geometry: - POINT(2754,966) - properties: - gid=17 - feature: 17 - id: (none) - geomtype: point - geometry: - POINT(769,2818) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3825,2146) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(2749,1706) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(49,2032) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3553,2982) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(2583,2400) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(2316,1790) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(1728,2658) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(1310,3101) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(1377,2078) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(166,2707) - properties: - gid=28 - feature: 28 - id: (none) - geomtype: point - geometry: - POINT(3898,1322) - properties: - gid=29 - feature: 29 - id: (none) - geomtype: point - geometry: - POINT(2780,1898) - properties: - gid=30 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(874,2164) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1392,664) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3788,1563) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1136,2890) - properties: - gid=7 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(417,3667) - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(3316,2289) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2607,2324) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(1841,2200) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(667,1829) - properties: - gid=12 - feature: 12 - id: (none) - geomtype: point - geometry: - POINT(2111,2079) - properties: - gid=13 - feature: 13 - id: (none) - geomtype: point - geometry: - POINT(2542,2070) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: point - geometry: - POINT(1224,2162) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: point - geometry: - POINT(2068,381) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: point - geometry: - POINT(3857,1868) - properties: - gid=17 - feature: 17 - id: (none) - geomtype: point - geometry: - POINT(1381,3059) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(355,2460) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(4086,3388) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3025,2290) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(2561,1053) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(1876,2723) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(68,2173) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(2353,1712) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3166,2187) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(941,2153) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3897,1116) - properties: - gid=28 - feature: 28 - id: (none) - geomtype: point - geometry: - POINT(1158,1186) - properties: - gid=29 - feature: 29 - id: (none) - geomtype: point - geometry: - POINT(4013,1897) - properties: - gid=30 diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf b/tests/expected/auto/cmp_12_3673_1911.pbf index c67358ebe..2a64df320 100644 Binary files a/tests/expected/auto/cmp_12_3673_1911.pbf and b/tests/expected/auto/cmp_12_3673_1911.pbf differ diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.geojson b/tests/expected/auto/cmp_12_3673_1911.pbf.geojson new file mode 100644 index 000000000..38ce4d1db --- /dev/null +++ b/tests/expected/auto/cmp_12_3673_1911.pbf.geojson @@ -0,0 +1,230 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 893, + 2829 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 870, + 2859 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 845, + 2859 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 849, + 2869 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 868, + 2822 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 877, + 2870 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 884, + 2867 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 837, + 2837 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 881, + 2840 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 887, + 2816 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 867, + 2861 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 866, + 2850 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 861, + 2822 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 840, + 2846 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 842, + 2868 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 888, + 2880 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.txt b/tests/expected/auto/cmp_12_3673_1911.pbf.txt deleted file mode 100644 index 14dfc1279..000000000 --- a/tests/expected/auto/cmp_12_3673_1911.pbf.txt +++ /dev/null @@ -1,127 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(884,1229) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(837,1259) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(881,1256) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(887,1280) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(867,1235) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(866,1246) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(861,1274) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(840,1250) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(842,1228) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(888,1216) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(893,1267) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(870,1237) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(845,1237) - properties: - gid=3 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(849,1227) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(868,1274) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(877,1226) - properties: - gid=3 diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf b/tests/expected/auto/cmp_13_7346_3822.pbf index 380b7dcb2..da44d9433 100644 Binary files a/tests/expected/auto/cmp_13_7346_3822.pbf and b/tests/expected/auto/cmp_13_7346_3822.pbf differ diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.geojson b/tests/expected/auto/cmp_13_7346_3822.pbf.geojson new file mode 100644 index 000000000..45177fdc3 --- /dev/null +++ b/tests/expected/auto/cmp_13_7346_3822.pbf.geojson @@ -0,0 +1,230 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1787, + 1561 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1741, + 1621 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1691, + 1622 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1698, + 1641 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1736, + 1547 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1755, + 1644 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1769, + 1638 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1674, + 1578 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1762, + 1584 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1774, + 1536 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1733, + 1625 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1731, + 1604 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1722, + 1547 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1680, + 1596 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1685, + 1640 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1776, + 1663 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.txt b/tests/expected/auto/cmp_13_7346_3822.pbf.txt deleted file mode 100644 index 4f61a396d..000000000 --- a/tests/expected/auto/cmp_13_7346_3822.pbf.txt +++ /dev/null @@ -1,127 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1769,2458) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1674,2518) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1762,2512) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1774,2560) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1733,2471) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1731,2492) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1722,2549) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1680,2500) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1685,2456) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1776,2433) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1787,2535) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1741,2475) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1691,2474) - properties: - gid=3 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1698,2455) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1736,2549) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1755,2452) - properties: - gid=3 diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf b/tests/expected/auto/cmp_14_14692_7645.pbf index 2bcd1363f..79014bdf8 100644 Binary files a/tests/expected/auto/cmp_14_14692_7645.pbf and b/tests/expected/auto/cmp_14_14692_7645.pbf differ diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.geojson b/tests/expected/auto/cmp_14_14692_7645.pbf.geojson new file mode 100644 index 000000000..75313751c --- /dev/null +++ b/tests/expected/auto/cmp_14_14692_7645.pbf.geojson @@ -0,0 +1,230 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3573, + 3122 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3482, + 3242 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3382, + 3245 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3396, + 3282 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3472, + 3095 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3510, + 3288 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3538, + 3275 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3348, + 3156 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3524, + 3169 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3548, + 3073 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3467, + 3250 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3462, + 3207 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3444, + 3095 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3360, + 3193 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3369, + 3280 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3551, + 3326 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.txt b/tests/expected/auto/cmp_14_14692_7645.pbf.txt deleted file mode 100644 index c359259f6..000000000 --- a/tests/expected/auto/cmp_14_14692_7645.pbf.txt +++ /dev/null @@ -1,127 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3538,821) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3348,940) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3524,927) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3548,1023) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(3467,846) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3462,889) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(3444,1001) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(3360,903) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(3369,816) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3551,770) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3573,974) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3482,854) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3382,851) - properties: - gid=3 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3396,814) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3472,1001) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3510,808) - properties: - gid=3 diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf b/tests/expected/auto/cmp_17_117542_61161.pbf index f91f4e141..c1c3b0579 100644 Binary files a/tests/expected/auto/cmp_17_117542_61161.pbf and b/tests/expected/auto/cmp_17_117542_61161.pbf differ diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.geojson b/tests/expected/auto/cmp_17_117542_61161.pbf.geojson new file mode 100644 index 000000000..d2a466e28 --- /dev/null +++ b/tests/expected/auto/cmp_17_117542_61161.pbf.geojson @@ -0,0 +1,230 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 4009, + 402 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3279, + 1360 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2477, + 1380 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2594, + 1683 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3202, + 181 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3500, + 1732 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3726, + 1627 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2209, + 674 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3612, + 775 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3808, + 8 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3159, + 1425 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3124, + 1084 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2976, + 184 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2305, + 966 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2379, + 1662 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3833, + 2035 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.txt b/tests/expected/auto/cmp_17_117542_61161.pbf.txt deleted file mode 100644 index 1c1c872d0..000000000 --- a/tests/expected/auto/cmp_17_117542_61161.pbf.txt +++ /dev/null @@ -1,127 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3726,2469) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2209,3422) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3612,3321) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3808,4088) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(3159,2671) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3124,3012) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(2976,3912) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(2305,3130) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2379,2434) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3833,2061) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(4009,3694) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3279,2736) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(2477,2716) - properties: - gid=3 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2594,2413) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3202,3915) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3500,2364) - properties: - gid=3 diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf b/tests/expected/auto/cmp_18_235085_122323.pbf index d61dafde2..d64884aa9 100644 Binary files a/tests/expected/auto/cmp_18_235085_122323.pbf and b/tests/expected/auto/cmp_18_235085_122323.pbf differ diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.geojson b/tests/expected/auto/cmp_18_235085_122323.pbf.geojson new file mode 100644 index 000000000..ace67dc2c --- /dev/null +++ b/tests/expected/auto/cmp_18_235085_122323.pbf.geojson @@ -0,0 +1,230 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3923, + 805 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2463, + 2721 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 859, + 2760 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1092, + 3366 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2308, + 362 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2905, + 3464 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3356, + 3254 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 322, + 1347 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3128, + 1549 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3519, + 16 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2222, + 2850 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2151, + 2167 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1856, + 368 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 513, + 1932 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 662, + 3325 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3569, + 4070 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.txt b/tests/expected/auto/cmp_18_235085_122323.pbf.txt deleted file mode 100644 index 4c6b4628b..000000000 --- a/tests/expected/auto/cmp_18_235085_122323.pbf.txt +++ /dev/null @@ -1,127 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3356,842) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(322,2749) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3128,2547) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3519,4080) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2222,1246) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(2151,1929) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1856,3728) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(513,2164) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(662,771) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3569,26) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3923,3291) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2463,1375) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(859,1336) - properties: - gid=3 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1092,730) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2308,3734) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(2905,632) - properties: - gid=3 diff --git a/tests/expected/auto/cmp_6_57_29.pbf b/tests/expected/auto/cmp_6_57_29.pbf index 29967f05f..98653086d 100644 Binary files a/tests/expected/auto/cmp_6_57_29.pbf and b/tests/expected/auto/cmp_6_57_29.pbf differ diff --git a/tests/expected/auto/cmp_6_57_29.pbf.geojson b/tests/expected/auto/cmp_6_57_29.pbf.geojson new file mode 100644 index 000000000..e10b6ab68 --- /dev/null +++ b/tests/expected/auto/cmp_6_57_29.pbf.geojson @@ -0,0 +1,230 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points1" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/cmp_6_57_29.pbf.txt b/tests/expected/auto/cmp_6_57_29.pbf.txt deleted file mode 100644 index 360cdf607..000000000 --- a/tests/expected/auto/cmp_6_57_29.pbf.txt +++ /dev/null @@ -1,127 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=28 -============================================================= -layer: 1 - name: points1 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - gid=3 -============================================================= -layer: 2 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=3 diff --git a/tests/expected/auto/fnc_0_0_0.pbf.geojson b/tests/expected/auto/fnc_0_0_0.pbf.geojson new file mode 100644 index 000000000..bb68551cd --- /dev/null +++ b/tests/expected/auto/fnc_0_0_0.pbf.geojson @@ -0,0 +1,1344 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_0_0_0.pbf.txt b/tests/expected/auto/fnc_0_0_0.pbf.txt deleted file mode 100644 index d8f52a5d6..000000000 --- a/tests/expected/auto/fnc_0_0_0.pbf.txt +++ /dev/null @@ -1,186 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.geojson b/tests/expected/auto/fnc_12_3673_1911.pbf.geojson new file mode 100644 index 000000000..5facdd4b5 --- /dev/null +++ b/tests/expected/auto/fnc_12_3673_1911.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 884, + 2867 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 837, + 2837 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 881, + 2840 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 887, + 2816 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 867, + 2861 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 866, + 2850 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 861, + 2822 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 840, + 2846 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 842, + 2868 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 888, + 2880 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.txt b/tests/expected/auto/fnc_12_3673_1911.pbf.txt deleted file mode 100644 index 1afd50ebc..000000000 --- a/tests/expected/auto/fnc_12_3673_1911.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(884,1229) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(837,1259) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(881,1256) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(887,1280) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(867,1235) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(866,1246) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(861,1274) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(840,1250) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(842,1228) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(888,1216) - properties: diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.geojson b/tests/expected/auto/fnc_13_7346_3822.pbf.geojson new file mode 100644 index 000000000..716f2d247 --- /dev/null +++ b/tests/expected/auto/fnc_13_7346_3822.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1769, + 1638 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1674, + 1578 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1762, + 1584 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1774, + 1536 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1733, + 1625 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1731, + 1604 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1722, + 1547 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1680, + 1596 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1685, + 1640 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1776, + 1663 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.txt b/tests/expected/auto/fnc_13_7346_3822.pbf.txt deleted file mode 100644 index caf84f969..000000000 --- a/tests/expected/auto/fnc_13_7346_3822.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1769,2458) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1674,2518) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1762,2512) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1774,2560) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1733,2471) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1731,2492) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1722,2549) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1680,2500) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1685,2456) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1776,2433) - properties: diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.geojson b/tests/expected/auto/fnc_14_14692_7645.pbf.geojson new file mode 100644 index 000000000..f4137eb67 --- /dev/null +++ b/tests/expected/auto/fnc_14_14692_7645.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3538, + 3275 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3348, + 3156 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3524, + 3169 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3548, + 3073 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3467, + 3250 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3462, + 3207 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3444, + 3095 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3360, + 3193 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3369, + 3280 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3551, + 3326 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.txt b/tests/expected/auto/fnc_14_14692_7645.pbf.txt deleted file mode 100644 index c2140a15c..000000000 --- a/tests/expected/auto/fnc_14_14692_7645.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3538,821) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3348,940) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3524,927) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3548,1023) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(3467,846) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3462,889) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(3444,1001) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(3360,903) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(3369,816) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3551,770) - properties: diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.geojson b/tests/expected/auto/fnc_17_117542_61161.pbf.geojson new file mode 100644 index 000000000..40ec67ca5 --- /dev/null +++ b/tests/expected/auto/fnc_17_117542_61161.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3726, + 1627 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2209, + 674 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3612, + 775 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3808, + 8 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3159, + 1425 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3124, + 1084 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2976, + 184 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2305, + 966 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2379, + 1662 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3833, + 2035 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.txt b/tests/expected/auto/fnc_17_117542_61161.pbf.txt deleted file mode 100644 index ef61cebac..000000000 --- a/tests/expected/auto/fnc_17_117542_61161.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3726,2469) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2209,3422) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3612,3321) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3808,4088) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(3159,2671) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3124,3012) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(2976,3912) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(2305,3130) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2379,2434) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3833,2061) - properties: diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.geojson b/tests/expected/auto/fnc_18_235085_122323.pbf.geojson new file mode 100644 index 000000000..8878a8318 --- /dev/null +++ b/tests/expected/auto/fnc_18_235085_122323.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3356, + 3254 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 322, + 1347 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3128, + 1549 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3519, + 16 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2222, + 2850 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2151, + 2167 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1856, + 368 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 513, + 1932 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 662, + 3325 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3569, + 4070 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.txt b/tests/expected/auto/fnc_18_235085_122323.pbf.txt deleted file mode 100644 index 986338282..000000000 --- a/tests/expected/auto/fnc_18_235085_122323.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3356,842) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(322,2749) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3128,2547) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3519,4080) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2222,1246) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(2151,1929) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1856,3728) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(513,2164) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(662,771) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3569,26) - properties: diff --git a/tests/expected/auto/fnc_6_57_29.pbf.geojson b/tests/expected/auto/fnc_6_57_29.pbf.geojson new file mode 100644 index 000000000..b9a1ccd38 --- /dev/null +++ b/tests/expected/auto/fnc_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_6_57_29.pbf.txt b/tests/expected/auto/fnc_6_57_29.pbf.txt deleted file mode 100644 index 5084b2607..000000000 --- a/tests/expected/auto/fnc_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.geojson b/tests/expected/auto/fnc_b_6_38_20.pbf.geojson new file mode 100644 index 000000000..4d453f1b3 --- /dev/null +++ b/tests/expected/auto/fnc_b_6_38_20.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_jsonb" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.txt b/tests/expected/auto/fnc_b_6_38_20.pbf.txt deleted file mode 100644 index 783c10dd7..000000000 --- a/tests/expected/auto/fnc_b_6_38_20.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query_jsonb - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.geojson b/tests/expected/auto/fnc_token_0_0_0.pbf.geojson new file mode 100644 index 000000000..4781c8af9 --- /dev/null +++ b/tests/expected/auto/fnc_token_0_0_0.pbf.geojson @@ -0,0 +1,1344 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.txt b/tests/expected/auto/fnc_token_0_0_0.pbf.txt deleted file mode 100644 index 73707333b..000000000 --- a/tests/expected/auto/fnc_token_0_0_0.pbf.txt +++ /dev/null @@ -1,186 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query_test - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.geojson new file mode 100644 index 000000000..b1e961112 --- /dev/null +++ b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zoom_xy" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.txt b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.txt deleted file mode 100644 index 40a59483a..000000000 --- a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zoom_xy - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.geojson new file mode 100644 index 000000000..0c6687506 --- /dev/null +++ b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy2" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.txt b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.txt deleted file mode 100644 index 24f48812e..000000000 --- a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zxy_6_57_29.pbf.geojson new file mode 100644 index 000000000..6ef9fc040 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.txt b/tests/expected/auto/fnc_zxy_6_57_29.pbf.txt deleted file mode 100644 index b772fe849..000000000 --- a/tests/expected/auto/fnc_zxy_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.geojson new file mode 100644 index 000000000..b9a1ccd38 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.txt b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.txt deleted file mode 100644 index 5084b2607..000000000 --- a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf index 5a3a13718..4add5c09e 100644 Binary files a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf and b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf differ diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.geojson new file mode 100644 index 000000000..9136ca3b5 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.geojson @@ -0,0 +1,48 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "Gid": 1, + "source_mvt_layer": "MixedCase.function_Mixed_Name" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "Gid": 3, + "source_mvt_layer": "MixedCase.function_Mixed_Name" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "Gid": 2, + "source_mvt_layer": "MixedCase.function_Mixed_Name" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.txt b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.txt deleted file mode 100644 index 1d5c68698..000000000 --- a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.txt +++ /dev/null @@ -1,23 +0,0 @@ -============================================================= -layer: 0 - name: MixedCase.function_Mixed_Name - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.geojson new file mode 100644 index 000000000..aece2c3d0 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_ROW" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.txt b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.txt deleted file mode 100644 index 126847bda..000000000 --- a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_ROW - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.geojson b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.geojson new file mode 100644 index 000000000..c9daffa32 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.geojson @@ -0,0 +1,136 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_row_key" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.txt b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.txt deleted file mode 100644 index 40ebd163b..000000000 --- a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.txt +++ /dev/null @@ -1,65 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_row_key - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.geojson b/tests/expected/auto/mb_mvt_2_3_1.pbf.geojson new file mode 100644 index 000000000..30a4c4b13 --- /dev/null +++ b/tests/expected/auto/mb_mvt_2_3_1.pbf.geojson @@ -0,0 +1,160 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 640, + 1468 + ], + "type": "Point" + }, + "properties": { + "name": "Chengdu", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 478, + 632 + ], + "type": "Point" + }, + "properties": { + "name": "Bangkok", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 630, + 59 + ], + "type": "Point" + }, + "properties": { + "name": "Singapore", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1200, + 1986 + ], + "type": "Point" + }, + "properties": { + "name": "Beijing", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1100, + 1042 + ], + "type": "Point" + }, + "properties": { + "name": "Hong Kong", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1430, + 1497 + ], + "type": "Point" + }, + "properties": { + "name": "Shanghai", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1436, + 1178 + ], + "type": "Point" + }, + "properties": { + "name": "Taipei", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1683, + 1848 + ], + "type": "Point" + }, + "properties": { + "name": "Seoul", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1409, + 673 + ], + "type": "Point" + }, + "properties": { + "name": "Manila", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2068, + 1689 + ], + "type": "Point" + }, + "properties": { + "name": "Ōsaka", + "source_mvt_layer": "cities" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2264, + 1741 + ], + "type": "Point" + }, + "properties": { + "name": "Tokyo", + "source_mvt_layer": "cities" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.txt b/tests/expected/auto/mb_mvt_2_3_1.pbf.txt deleted file mode 100644 index af02a57c1..000000000 --- a/tests/expected/auto/mb_mvt_2_3_1.pbf.txt +++ /dev/null @@ -1,89 +0,0 @@ -============================================================= -layer: 0 - name: cities - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(-77,3044) - properties: - name="Kolkata" - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(640,2628) - properties: - name="Chengdu" - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(478,3464) - properties: - name="Bangkok" - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(630,4037) - properties: - name="Singapore" - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1200,2110) - properties: - name="Beijing" - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1100,3054) - properties: - name="Hong Kong" - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1430,2599) - properties: - name="Shanghai" - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1436,2918) - properties: - name="Taipei" - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1683,2248) - properties: - name="Seoul" - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1409,3423) - properties: - name="Manila" - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(2068,2407) - properties: - name="Ōsaka" - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(2264,2355) - properties: - name="Tokyo" diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf b/tests/expected/auto/points3857_srid_0_0_0.pbf index 034e64ece..326fc2ab6 100644 Binary files a/tests/expected/auto/points3857_srid_0_0_0.pbf and b/tests/expected/auto/points3857_srid_0_0_0.pbf differ diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.geojson b/tests/expected/auto/points3857_srid_0_0_0.pbf.geojson new file mode 100644 index 000000000..c802fc300 --- /dev/null +++ b/tests/expected/auto/points3857_srid_0_0_0.pbf.geojson @@ -0,0 +1,426 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3587, + 1069 + ], + "type": "Point" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2873, + 1418 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 257, + 2591 + ], + "type": "Point" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2226, + 1208 + ], + "type": "Point" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 514, + 593 + ], + "type": "Point" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 716, + 2172 + ], + "type": "Point" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2767, + 2364 + ], + "type": "Point" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2375, + 3295 + ], + "type": "Point" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3567, + 2689 + ], + "type": "Point" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1384, + 1523 + ], + "type": "Point" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 886, + 2043 + ], + "type": "Point" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3316, + 2022 + ], + "type": "Point" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 648, + 3396 + ], + "type": "Point" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 4011, + 3910 + ], + "type": "Point" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1345, + 353 + ], + "type": "Point" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1250, + 2981 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1653, + 593 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2266, + 2186 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3948, + 811 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1405, + 3997 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2161, + 3216 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3029, + 3703 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 212, + 1587 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2602, + 3209 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2499, + 558 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3997, + 1145 + ], + "type": "Point" + }, + "properties": { + "gid": 29, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2672, + 1591 + ], + "type": "Point" + }, + "properties": { + "gid": 30, + "source_mvt_layer": "points3857" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.txt b/tests/expected/auto/points3857_srid_0_0_0.pbf.txt deleted file mode 100644 index bd613ddcf..000000000 --- a/tests/expected/auto/points3857_srid_0_0_0.pbf.txt +++ /dev/null @@ -1,215 +0,0 @@ -============================================================= -layer: 0 - name: points3857 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3587,3027) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2873,2678) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(257,1505) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(2226,2888) - properties: - gid=7 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(514,3503) - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(716,1924) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2767,1732) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(2375,801) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(3567,1407) - properties: - gid=12 - feature: 12 - id: (none) - geomtype: point - geometry: - POINT(1384,2573) - properties: - gid=13 - feature: 13 - id: (none) - geomtype: point - geometry: - POINT(886,2053) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: point - geometry: - POINT(3316,2074) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: point - geometry: - POINT(648,700) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: point - geometry: - POINT(4011,186) - properties: - gid=17 - feature: 17 - id: (none) - geomtype: point - geometry: - POINT(1345,3743) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(1250,1115) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(1653,3503) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(2266,1910) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3948,3285) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(1405,99) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(2161,880) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3029,393) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(212,2509) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(2602,887) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(2499,3538) - properties: - gid=28 - feature: 28 - id: (none) - geomtype: point - geometry: - POINT(3997,2951) - properties: - gid=29 - feature: 29 - id: (none) - geomtype: point - geometry: - POINT(2672,2505) - properties: - gid=30 diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf b/tests/expected/auto/points_empty_srid_0_0_0.pbf index bd574772b..a901a2fc8 100644 Binary files a/tests/expected/auto/points_empty_srid_0_0_0.pbf and b/tests/expected/auto/points_empty_srid_0_0_0.pbf differ diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.geojson b/tests/expected/auto/points_empty_srid_0_0_0.pbf.geojson new file mode 100644 index 000000000..fbfd8c503 --- /dev/null +++ b/tests/expected/auto/points_empty_srid_0_0_0.pbf.geojson @@ -0,0 +1,426 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3807, + 216 + ], + "type": "Point" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2191, + 845 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2485, + 1245 + ], + "type": "Point" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 760, + 69 + ], + "type": "Point" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2542, + 3062 + ], + "type": "Point" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3794, + 2235 + ], + "type": "Point" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1115, + 1596 + ], + "type": "Point" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 201, + 3046 + ], + "type": "Point" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1434, + 124 + ], + "type": "Point" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 665, + 923 + ], + "type": "Point" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 4079, + 1414 + ], + "type": "Point" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3502, + 3368 + ], + "type": "Point" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1710, + 3529 + ], + "type": "Point" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2488, + 708 + ], + "type": "Point" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2724, + 3809 + ], + "type": "Point" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2162, + 2260 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1861, + 3163 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2895, + 2345 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1409, + 1696 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1374, + 3354 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2212, + 580 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 814, + 2092 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3287, + 2475 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1597, + 2941 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 205, + 3842 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3773, + 261 + ], + "type": "Point" + }, + "properties": { + "gid": 29, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1830, + 1219 + ], + "type": "Point" + }, + "properties": { + "gid": 30, + "source_mvt_layer": "points_empty_srid" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.txt b/tests/expected/auto/points_empty_srid_0_0_0.pbf.txt deleted file mode 100644 index 6646a13b1..000000000 --- a/tests/expected/auto/points_empty_srid_0_0_0.pbf.txt +++ /dev/null @@ -1,215 +0,0 @@ -============================================================= -layer: 0 - name: points_empty_srid - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3807,3880) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2191,3251) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(2485,2851) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(760,4027) - properties: - gid=7 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(2542,1034) - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(3794,1861) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1115,2500) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(201,1050) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(1434,3972) - properties: - gid=12 - feature: 12 - id: (none) - geomtype: point - geometry: - POINT(665,3173) - properties: - gid=13 - feature: 13 - id: (none) - geomtype: point - geometry: - POINT(4079,2682) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: point - geometry: - POINT(3502,728) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: point - geometry: - POINT(1710,567) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: point - geometry: - POINT(2488,3388) - properties: - gid=17 - feature: 17 - id: (none) - geomtype: point - geometry: - POINT(2724,287) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(2162,1836) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(1861,933) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(2895,1751) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(1409,2400) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(1374,742) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(2212,3516) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(814,2004) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3287,1621) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(1597,1155) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(205,254) - properties: - gid=28 - feature: 28 - id: (none) - geomtype: point - geometry: - POINT(3773,3835) - properties: - gid=29 - feature: 29 - id: (none) - geomtype: point - geometry: - POINT(1830,2877) - properties: - gid=30 diff --git a/tests/expected/auto/tbl_0_0_0.pbf.geojson b/tests/expected/auto/tbl_0_0_0.pbf.geojson new file mode 100644 index 000000000..cb3b42729 --- /dev/null +++ b/tests/expected/auto/tbl_0_0_0.pbf.geojson @@ -0,0 +1,1372 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_0_0_0.pbf.txt b/tests/expected/auto/tbl_0_0_0.pbf.txt deleted file mode 100644 index 948451cf0..000000000 --- a/tests/expected/auto/tbl_0_0_0.pbf.txt +++ /dev/null @@ -1,214 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - gid=7 - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - gid=12 - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - gid=13 - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - gid=17 - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=28 diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.geojson b/tests/expected/auto/tbl_12_3673_1911.pbf.geojson new file mode 100644 index 000000000..1370538c6 --- /dev/null +++ b/tests/expected/auto/tbl_12_3673_1911.pbf.geojson @@ -0,0 +1,146 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 884, + 2867 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 837, + 2837 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 881, + 2840 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 887, + 2816 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 867, + 2861 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 866, + 2850 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 861, + 2822 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 840, + 2846 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 842, + 2868 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 888, + 2880 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.txt b/tests/expected/auto/tbl_12_3673_1911.pbf.txt deleted file mode 100644 index 016878316..000000000 --- a/tests/expected/auto/tbl_12_3673_1911.pbf.txt +++ /dev/null @@ -1,75 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(884,1229) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(837,1259) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(881,1256) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(887,1280) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(867,1235) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(866,1246) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(861,1274) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(840,1250) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(842,1228) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(888,1216) - properties: - gid=28 diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.geojson b/tests/expected/auto/tbl_13_7346_3822.pbf.geojson new file mode 100644 index 000000000..1cf90a6bb --- /dev/null +++ b/tests/expected/auto/tbl_13_7346_3822.pbf.geojson @@ -0,0 +1,146 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1769, + 1638 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1674, + 1578 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1762, + 1584 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1774, + 1536 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1733, + 1625 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1731, + 1604 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1722, + 1547 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1680, + 1596 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1685, + 1640 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1776, + 1663 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.txt b/tests/expected/auto/tbl_13_7346_3822.pbf.txt deleted file mode 100644 index f9e52486f..000000000 --- a/tests/expected/auto/tbl_13_7346_3822.pbf.txt +++ /dev/null @@ -1,75 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1769,2458) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1674,2518) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1762,2512) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1774,2560) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1733,2471) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1731,2492) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1722,2549) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1680,2500) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1685,2456) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1776,2433) - properties: - gid=28 diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.geojson b/tests/expected/auto/tbl_14_14692_7645.pbf.geojson new file mode 100644 index 000000000..7006cc3e9 --- /dev/null +++ b/tests/expected/auto/tbl_14_14692_7645.pbf.geojson @@ -0,0 +1,146 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3538, + 3275 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3348, + 3156 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3524, + 3169 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3548, + 3073 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3467, + 3250 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3462, + 3207 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3444, + 3095 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3360, + 3193 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3369, + 3280 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3551, + 3326 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.txt b/tests/expected/auto/tbl_14_14692_7645.pbf.txt deleted file mode 100644 index 4319d0e77..000000000 --- a/tests/expected/auto/tbl_14_14692_7645.pbf.txt +++ /dev/null @@ -1,75 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3538,821) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3348,940) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3524,927) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3548,1023) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(3467,846) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3462,889) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(3444,1001) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(3360,903) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(3369,816) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3551,770) - properties: - gid=28 diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.geojson b/tests/expected/auto/tbl_17_117542_61161.pbf.geojson new file mode 100644 index 000000000..40076a483 --- /dev/null +++ b/tests/expected/auto/tbl_17_117542_61161.pbf.geojson @@ -0,0 +1,146 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3726, + 1627 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2209, + 674 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3612, + 775 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3808, + 8 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3159, + 1425 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3124, + 1084 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2976, + 184 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2305, + 966 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2379, + 1662 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3833, + 2035 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.txt b/tests/expected/auto/tbl_17_117542_61161.pbf.txt deleted file mode 100644 index 44cc3d3ab..000000000 --- a/tests/expected/auto/tbl_17_117542_61161.pbf.txt +++ /dev/null @@ -1,75 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3726,2469) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2209,3422) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3612,3321) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3808,4088) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(3159,2671) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3124,3012) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(2976,3912) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(2305,3130) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2379,2434) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3833,2061) - properties: - gid=28 diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.geojson b/tests/expected/auto/tbl_18_235085_122323.pbf.geojson new file mode 100644 index 000000000..f046dbc7e --- /dev/null +++ b/tests/expected/auto/tbl_18_235085_122323.pbf.geojson @@ -0,0 +1,146 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3356, + 3254 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 322, + 1347 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3128, + 1549 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3519, + 16 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2222, + 2850 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2151, + 2167 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1856, + 368 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 513, + 1932 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 662, + 3325 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3569, + 4070 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.txt b/tests/expected/auto/tbl_18_235085_122323.pbf.txt deleted file mode 100644 index de8fcd37a..000000000 --- a/tests/expected/auto/tbl_18_235085_122323.pbf.txt +++ /dev/null @@ -1,75 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3356,842) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(322,2749) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3128,2547) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(3519,4080) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2222,1246) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(2151,1929) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1856,3728) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(513,2164) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(662,771) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3569,26) - properties: - gid=28 diff --git a/tests/expected/auto/tbl_6_57_29.pbf.geojson b/tests/expected/auto/tbl_6_57_29.pbf.geojson new file mode 100644 index 000000000..58b5855a7 --- /dev/null +++ b/tests/expected/auto/tbl_6_57_29.pbf.geojson @@ -0,0 +1,146 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 556 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1613, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1614, + 557 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/auto/tbl_6_57_29.pbf.txt b/tests/expected/auto/tbl_6_57_29.pbf.txt deleted file mode 100644 index 932715585..000000000 --- a/tests/expected/auto/tbl_6_57_29.pbf.txt +++ /dev/null @@ -1,75 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=19 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - gid=20 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - gid=21 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(1614,3540) - properties: - gid=22 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=23 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=24 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - gid=25 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(1613,3540) - properties: - gid=26 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(1613,3539) - properties: - gid=27 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(1614,3539) - properties: - gid=28 diff --git a/tests/expected/configured/cmp_0_0_0.pbf b/tests/expected/configured/cmp_0_0_0.pbf index b83e66032..ab1a40e74 100644 Binary files a/tests/expected/configured/cmp_0_0_0.pbf and b/tests/expected/configured/cmp_0_0_0.pbf differ diff --git a/tests/expected/configured/cmp_0_0_0.pbf.geojson b/tests/expected/configured/cmp_0_0_0.pbf.geojson new file mode 100644 index 000000000..8e1c901c8 --- /dev/null +++ b/tests/expected/configured/cmp_0_0_0.pbf.geojson @@ -0,0 +1,846 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 636, + 1311 + ], + "type": "Point" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 69, + 3783 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3786, + 2534 + ], + "type": "Point" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3802, + 3431 + ], + "type": "Point" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2619, + 2576 + ], + "type": "Point" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 8, + 2251 + ], + "type": "Point" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3639, + 1152 + ], + "type": "Point" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2961, + 1833 + ], + "type": "Point" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2312, + 2092 + ], + "type": "Point" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2337, + 1483 + ], + "type": "Point" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1455, + 1594 + ], + "type": "Point" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 862, + 2279 + ], + "type": "Point" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1415, + 4080 + ], + "type": "Point" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2754, + 3130 + ], + "type": "Point" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 769, + 1278 + ], + "type": "Point" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3825, + 1950 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2749, + 2390 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 49, + 2064 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3553, + 1114 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2583, + 1696 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2316, + 2306 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1728, + 1438 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1310, + 995 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1377, + 2018 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 166, + 1389 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3898, + 2774 + ], + "type": "Point" + }, + "properties": { + "gid": 29, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2780, + 2198 + ], + "type": "Point" + }, + "properties": { + "gid": 30, + "source_mvt_layer": "abc" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 874, + 1932 + ], + "type": "Point" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1392, + 3432 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3788, + 2533 + ], + "type": "Point" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1136, + 1206 + ], + "type": "Point" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 417, + 429 + ], + "type": "Point" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3316, + 1807 + ], + "type": "Point" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2607, + 1772 + ], + "type": "Point" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1841, + 1896 + ], + "type": "Point" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 667, + 2267 + ], + "type": "Point" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2111, + 2017 + ], + "type": "Point" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2542, + 2026 + ], + "type": "Point" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1224, + 1934 + ], + "type": "Point" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2068, + 3715 + ], + "type": "Point" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3857, + 2228 + ], + "type": "Point" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1381, + 1037 + ], + "type": "Point" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 355, + 1636 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 4086, + 708 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3025, + 1806 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2561, + 3043 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1876, + 1373 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 68, + 1923 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2353, + 2384 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3166, + 1909 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 941, + 1943 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3897, + 2980 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 1158, + 2910 + ], + "type": "Point" + }, + "properties": { + "gid": 29, + "source_mvt_layer": "points2" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 4013, + 2199 + ], + "type": "Point" + }, + "properties": { + "gid": 30, + "source_mvt_layer": "points2" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/configured/cmp_0_0_0.pbf.txt b/tests/expected/configured/cmp_0_0_0.pbf.txt deleted file mode 100644 index 9fafb14fb..000000000 --- a/tests/expected/configured/cmp_0_0_0.pbf.txt +++ /dev/null @@ -1,430 +0,0 @@ -============================================================= -layer: 0 - name: abc - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(636,2785) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(69,313) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3786,1562) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(3802,665) - properties: - gid=7 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(2619,1520) - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(8,1845) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(3639,2944) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(2961,2263) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(2312,2004) - properties: - gid=12 - feature: 12 - id: (none) - geomtype: point - geometry: - POINT(2337,2613) - properties: - gid=13 - feature: 13 - id: (none) - geomtype: point - geometry: - POINT(1455,2502) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: point - geometry: - POINT(862,1817) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: point - geometry: - POINT(1415,16) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: point - geometry: - POINT(2754,966) - properties: - gid=17 - feature: 17 - id: (none) - geomtype: point - geometry: - POINT(769,2818) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3825,2146) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(2749,1706) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(49,2032) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3553,2982) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(2583,2400) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(2316,1790) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(1728,2658) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(1310,3101) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(1377,2078) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(166,2707) - properties: - gid=28 - feature: 28 - id: (none) - geomtype: point - geometry: - POINT(3898,1322) - properties: - gid=29 - feature: 29 - id: (none) - geomtype: point - geometry: - POINT(2780,1898) - properties: - gid=30 -============================================================= -layer: 1 - name: points2 - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: point - geometry: - POINT(874,2164) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(1392,664) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: point - geometry: - POINT(3788,1563) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: point - geometry: - POINT(1136,2890) - properties: - gid=7 - feature: 7 - id: (none) - geomtype: point - geometry: - POINT(417,3667) - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(3316,2289) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2607,2324) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: point - geometry: - POINT(1841,2200) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: point - geometry: - POINT(667,1829) - properties: - gid=12 - feature: 12 - id: (none) - geomtype: point - geometry: - POINT(2111,2079) - properties: - gid=13 - feature: 13 - id: (none) - geomtype: point - geometry: - POINT(2542,2070) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: point - geometry: - POINT(1224,2162) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: point - geometry: - POINT(2068,381) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: point - geometry: - POINT(3857,1868) - properties: - gid=17 - feature: 17 - id: (none) - geomtype: point - geometry: - POINT(1381,3059) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(355,2460) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(4086,3388) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3025,2290) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(2561,1053) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(1876,2723) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(68,2173) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(2353,1712) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3166,2187) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(941,2153) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3897,1116) - properties: - gid=28 - feature: 28 - id: (none) - geomtype: point - geometry: - POINT(1158,1186) - properties: - gid=29 - feature: 29 - id: (none) - geomtype: point - geometry: - POINT(4013,1897) - properties: - gid=30 diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.geojson b/tests/expected/configured/fnc2_0_0_0.pbf.geojson new file mode 100644 index 000000000..4781c8af9 --- /dev/null +++ b/tests/expected/configured/fnc2_0_0_0.pbf.geojson @@ -0,0 +1,1344 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query_test" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.txt b/tests/expected/configured/fnc2_0_0_0.pbf.txt deleted file mode 100644 index 73707333b..000000000 --- a/tests/expected/configured/fnc2_0_0_0.pbf.txt +++ /dev/null @@ -1,186 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query_test - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: diff --git a/tests/expected/configured/fnc_0_0_0.pbf.geojson b/tests/expected/configured/fnc_0_0_0.pbf.geojson new file mode 100644 index 000000000..bb68551cd --- /dev/null +++ b/tests/expected/configured/fnc_0_0_0.pbf.geojson @@ -0,0 +1,1344 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "source_mvt_layer": "public.function_zxy_query" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/configured/fnc_0_0_0.pbf.txt b/tests/expected/configured/fnc_0_0_0.pbf.txt deleted file mode 100644 index d8f52a5d6..000000000 --- a/tests/expected/configured/fnc_0_0_0.pbf.txt +++ /dev/null @@ -1,186 +0,0 @@ -============================================================= -layer: 0 - name: public.function_zxy_query - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: diff --git a/tests/expected/configured/tbl_0_0_0.pbf.geojson b/tests/expected/configured/tbl_0_0_0.pbf.geojson new file mode 100644 index 000000000..cb3b42729 --- /dev/null +++ b/tests/expected/configured/tbl_0_0_0.pbf.geojson @@ -0,0 +1,1372 @@ +{ + "features": [ + { + "geometry": { + "coordinates": [ + 2048, + 2048 + ], + "type": "Point" + }, + "properties": { + "gid": 1, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2025, + 2071 + ], + "type": "Point" + }, + "properties": { + "gid": 2, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2059, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 3, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2071, + 2071 + ], + [ + 2082, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 4, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 2389, + 2162 + ], + "type": "Point" + }, + "properties": { + "gid": 5, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2389, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2503, + 2545 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 6, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2280 + ], + [ + 2276, + 2545 + ], + [ + 2503, + 2545 + ], + [ + 2389, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 7, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2560, + 2623 + ], + [ + 2446, + 2162 + ], + [ + 2162, + 2280 + ], + [ + 2219, + 2545 + ], + [ + 2560, + 2623 + ] + ], + [ + [ + 2446, + 2474 + ], + [ + 2276, + 2406 + ], + [ + 2389, + 2280 + ], + [ + 2446, + 2474 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 8, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "gid": 9, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2162, + 2545 + ], + [ + 2276, + 2280 + ], + [ + 2389, + 2162 + ], + [ + 2503, + 2406 + ] + ], + "type": "MultiPoint" + }, + "properties": { + "gid": 10, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2162, + 2162 + ], + [ + 2276, + 2280 + ], + [ + 2162, + 2545 + ] + ], + [ + [ + 2503, + 2545 + ], + [ + 2389, + 2406 + ], + [ + 2503, + 2280 + ], + [ + 2389, + 2162 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "gid": 11, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2162, + 2280 + ], + [ + 2503, + 2162 + ], + [ + 2219, + 2105 + ], + [ + 2105, + 2162 + ], + [ + 2162, + 2280 + ] + ] + ], + [ + [ + [ + 2389, + 2280 + ], + [ + 2162, + 2545 + ], + [ + 2560, + 2545 + ], + [ + 2389, + 2280 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "gid": 12, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + [ + 2276, + 2474 + ], + [ + 2560, + 2280 + ], + [ + 2389, + 2105 + ], + [ + 2162, + 2162 + ], + [ + 2162, + 2406 + ], + [ + 2276, + 2474 + ] + ], + [ + [ + 2276, + 2342 + ], + [ + 2276, + 2221 + ], + [ + 2389, + 2280 + ], + [ + 2276, + 2342 + ] + ] + ], + [ + [ + [ + 2276, + 2623 + ], + [ + 2503, + 2545 + ], + [ + 2560, + 2406 + ], + [ + 2276, + 2623 + ] + ] + ] + ], + "type": "MultiPolygon" + }, + "properties": { + "gid": 13, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2094, + 2116 + ], + [ + 2128, + 2162 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 14, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2059, + 2105 + ], + [ + 2059, + 2099 + ], + [ + 2060, + 2098 + ], + [ + 2060, + 2094 + ], + [ + 2061, + 2092 + ], + [ + 2061, + 2091 + ], + [ + 2062, + 2089 + ], + [ + 2062, + 2087 + ], + [ + 2063, + 2085 + ], + [ + 2064, + 2084 + ], + [ + 2065, + 2082 + ], + [ + 2066, + 2081 + ], + [ + 2067, + 2079 + ], + [ + 2073, + 2073 + ], + [ + 2075, + 2072 + ], + [ + 2076, + 2071 + ], + [ + 2080, + 2069 + ], + [ + 2081, + 2068 + ], + [ + 2083, + 2067 + ], + [ + 2085, + 2067 + ], + [ + 2086, + 2066 + ], + [ + 2090, + 2066 + ], + [ + 2092, + 2065 + ], + [ + 2103, + 2065 + ], + [ + 2104, + 2066 + ], + [ + 2106, + 2066 + ], + [ + 2108, + 2067 + ], + [ + 2110, + 2067 + ], + [ + 2111, + 2068 + ], + [ + 2115, + 2070 + ], + [ + 2116, + 2071 + ], + [ + 2118, + 2072 + ], + [ + 2120, + 2074 + ], + [ + 2122, + 2075 + ], + [ + 2123, + 2076 + ], + [ + 2124, + 2078 + ], + [ + 2126, + 2079 + ], + [ + 2127, + 2081 + ], + [ + 2128, + 2082 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 15, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + 2048, + 2048 + ], + [ + 2047, + 2049 + ], + [ + 2047, + 2050 + ], + [ + 2046, + 2050 + ], + [ + 2046, + 2057 + ], + [ + 2047, + 2057 + ], + [ + 2047, + 2059 + ], + [ + 2048, + 2059 + ], + [ + 2048, + 2060 + ], + [ + 2049, + 2060 + ], + [ + 2050, + 2061 + ], + [ + 2052, + 2061 + ], + [ + 2052, + 2062 + ], + [ + 2055, + 2062 + ], + [ + 2056, + 2061 + ], + [ + 2058, + 2061 + ], + [ + 2058, + 2060 + ], + [ + 2059, + 2060 + ], + [ + 2059, + 2059 + ], + [ + 2060, + 2059 + ], + [ + 2060, + 2058 + ], + [ + 2061, + 2058 + ], + [ + 2061, + 2056 + ], + [ + 2062, + 2055 + ], + [ + 2062, + 2052 + ], + [ + 2061, + 2052 + ], + [ + 2061, + 2050 + ], + [ + 2060, + 2049 + ], + [ + 2060, + 2048 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ], + "type": "LineString" + }, + "properties": { + "gid": 16, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2044, + 2070 + ], + [ + 2045, + 2071 + ], + [ + 2051, + 2071 + ], + [ + 2052, + 2070 + ], + [ + 2055, + 2070 + ], + [ + 2056, + 2069 + ], + [ + 2058, + 2069 + ], + [ + 2059, + 2068 + ], + [ + 2060, + 2068 + ], + [ + 2068, + 2060 + ], + [ + 2068, + 2059 + ], + [ + 2069, + 2058 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2055 + ], + [ + 2070, + 2052 + ], + [ + 2071, + 2051 + ], + [ + 2071, + 2046 + ], + [ + 2070, + 2045 + ], + [ + 2070, + 2043 + ], + [ + 2069, + 2043 + ], + [ + 2069, + 2041 + ], + [ + 2068, + 2041 + ], + [ + 2068, + 2040 + ], + [ + 2067, + 2040 + ], + [ + 2067, + 2039 + ], + [ + 2066, + 2039 + ], + [ + 2065, + 2038 + ], + [ + 2064, + 2038 + ], + [ + 2064, + 2037 + ], + [ + 2055, + 2037 + ], + [ + 2055, + 2038 + ], + [ + 2054, + 2038 + ], + [ + 2053, + 2039 + ], + [ + 2052, + 2039 + ], + [ + 2052, + 2040 + ], + [ + 2051, + 2040 + ], + [ + 2051, + 2041 + ], + [ + 2050, + 2041 + ], + [ + 2050, + 2042 + ], + [ + 2049, + 2043 + ], + [ + 2049, + 2044 + ], + [ + 2048, + 2045 + ], + [ + 2047, + 2044 + ], + [ + 2047, + 2043 + ], + [ + 2046, + 2042 + ], + [ + 2046, + 2041 + ], + [ + 2045, + 2041 + ], + [ + 2045, + 2040 + ], + [ + 2044, + 2040 + ], + [ + 2044, + 2039 + ], + [ + 2043, + 2039 + ], + [ + 2042, + 2038 + ], + [ + 2041, + 2038 + ], + [ + 2041, + 2037 + ], + [ + 2032, + 2037 + ], + [ + 2032, + 2038 + ], + [ + 2031, + 2038 + ], + [ + 2030, + 2039 + ], + [ + 2029, + 2039 + ], + [ + 2029, + 2040 + ], + [ + 2028, + 2040 + ], + [ + 2028, + 2041 + ], + [ + 2027, + 2041 + ], + [ + 2027, + 2043 + ], + [ + 2026, + 2043 + ], + [ + 2026, + 2045 + ], + [ + 2025, + 2046 + ], + [ + 2025, + 2051 + ], + [ + 2026, + 2052 + ], + [ + 2026, + 2055 + ], + [ + 2027, + 2056 + ], + [ + 2027, + 2058 + ], + [ + 2028, + 2059 + ], + [ + 2028, + 2060 + ], + [ + 2036, + 2068 + ], + [ + 2037, + 2068 + ], + [ + 2038, + 2069 + ], + [ + 2040, + 2069 + ], + [ + 2041, + 2070 + ], + [ + 2044, + 2070 + ] + ], + [ + [ + 2048, + 2059 + ], + [ + 2037, + 2048 + ], + [ + 2048, + 2054 + ], + [ + 2059, + 2048 + ], + [ + 2048, + 2059 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "gid": 17, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + 2105, + 2105 + ], + [ + 2082, + 2105 + ], + [ + 2082, + 2082 + ], + [ + 2048, + 2082 + ] + ], + [ + [ + 2048, + 2048 + ], + [ + 2050, + 2048 + ], + [ + 2051, + 2047 + ], + [ + 2057, + 2047 + ], + [ + 2058, + 2048 + ], + [ + 2060, + 2048 + ], + [ + 2061, + 2049 + ], + [ + 2063, + 2049 + ], + [ + 2063, + 2050 + ], + [ + 2064, + 2050 + ], + [ + 2068, + 2054 + ], + [ + 2068, + 2055 + ], + [ + 2069, + 2055 + ], + [ + 2069, + 2056 + ], + [ + 2070, + 2057 + ], + [ + 2070, + 2059 + ], + [ + 2071, + 2059 + ], + [ + 2071, + 2062 + ], + [ + 2072, + 2063 + ], + [ + 2072, + 2067 + ], + [ + 2071, + 2068 + ], + [ + 2071, + 2071 + ] + ] + ], + "type": "MultiLineString" + }, + "properties": { + "gid": 18, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 19, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 20, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 21, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 22, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 23, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 24, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 25, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 26, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 27, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + 3673, + 2185 + ], + "type": "Point" + }, + "properties": { + "gid": 28, + "source_mvt_layer": "table_source" + }, + "type": "Feature" + } + ], + "name": "merged", + "type": "FeatureCollection" +} diff --git a/tests/expected/configured/tbl_0_0_0.pbf.txt b/tests/expected/configured/tbl_0_0_0.pbf.txt deleted file mode 100644 index 948451cf0..000000000 --- a/tests/expected/configured/tbl_0_0_0.pbf.txt +++ /dev/null @@ -1,214 +0,0 @@ -============================================================= -layer: 0 - name: table_source - version: 2 - extent: 4096 - feature: 0 - id: (none) - geomtype: point - geometry: - POINT(2048,2048) - properties: - gid=1 - feature: 1 - id: (none) - geomtype: point - geometry: - POINT(2025,2025) - properties: - gid=2 - feature: 2 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2048 2048,2059 2037) - properties: - gid=3 - feature: 3 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2071 2025,2082 2014) - properties: - gid=4 - feature: 4 - id: (none) - geomtype: point - geometry: - POINT(2389,1934) - properties: - gid=5 - feature: 5 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2389 1934,2162 1690,2503 1551) - properties: - gid=6 - feature: 6 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2276 1551,2503 1551,2389 1934,2162 1816)[OUTER] - properties: - gid=7 - feature: 7 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2560 1473,2446 1934,2162 1816,2219 1551,2560 1473)[OUTER] - RING[count=4](2446 1622,2276 1690,2389 1816,2446 1622)[INNER] - properties: - gid=8 - feature: 8 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - gid=9 - feature: 9 - id: (none) - geomtype: point - geometry: - POINT(2162,1551) - POINT(2276,1816) - POINT(2389,1934) - POINT(2503,1690) - properties: - gid=10 - feature: 10 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=3](2162 1934,2276 1816,2162 1551) - LINESTRING[count=4](2503 1551,2389 1690,2503 1816,2389 1934) - properties: - gid=11 - feature: 11 - id: (none) - geomtype: polygon - geometry: - RING[count=5](2162 1816,2503 1934,2219 1991,2105 1934,2162 1816)[OUTER] - RING[count=4](2389 1816,2162 1551,2560 1551,2389 1816)[OUTER] - properties: - gid=12 - feature: 12 - id: (none) - geomtype: polygon - geometry: - RING[count=6](2276 1622,2560 1816,2389 1991,2162 1934,2162 1690,2276 1622)[OUTER] - RING[count=4](2276 1754,2276 1875,2389 1816,2276 1754)[INNER] - RING[count=4](2276 1473,2503 1551,2560 1690,2276 1473)[OUTER] - properties: - gid=13 - feature: 13 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=2](2094 1980,2128 1934) - properties: - gid=14 - feature: 14 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=39](2059 1991,2059 1997,2060 1998,2060 2002,2061 2004,2061 2005,2062 2007,2062 2009,2063 2011,2064 2012,2065 2014,2066 2015,2067 2017,2073 2023,2075 2024,2076 2025,2080 2027,2081 2028,2083 2029,2085 2029,2086 2030,2090 2030,2092 2031,2103 2031,2104 2030,2106 2030,2108 2029,2110 2029,2111 2028,2115 2026,2116 2025,2118 2024,2120 2022,2122 2021,2123 2020,2124 2018,2126 2017,2127 2015,2128 2014) - properties: - gid=15 - feature: 15 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=31](2048 2048,2047 2047,2047 2046,2046 2046,2046 2039,2047 2039,2047 2037,2048 2037,2048 2036,2049 2036,2050 2035,2052 2035,2052 2034,2055 2034,2056 2035,2058 2035,2058 2036,2059 2036,2059 2037,2060 2037,2060 2038,2061 2038,2061 2040,2062 2041,2062 2044,2061 2044,2061 2046,2060 2047,2060 2048,2059 2048,2048 2037) - properties: - gid=16 - feature: 16 - id: (none) - geomtype: polygon - geometry: - RING[count=80](2044 2026,2045 2025,2051 2025,2052 2026,2055 2026,2056 2027,2058 2027,2059 2028,2060 2028,2068 2036,2068 2037,2069 2038,2069 2040,2070 2041,2070 2044,2071 2045,2071 2050,2070 2051,2070 2053,2069 2053,2069 2055,2068 2055,2068 2056,2067 2056,2067 2057,2066 2057,2065 2058,2064 2058,2064 2059,2055 2059,2055 2058,2054 2058,2053 2057,2052 2057,2052 2056,2051 2056,2051 2055,2050 2055,2050 2054,2049 2053,2049 2052,2048 2051,2047 2052,2047 2053,2046 2054,2046 2055,2045 2055,2045 2056,2044 2056,2044 2057,2043 2057,2042 2058,2041 2058,2041 2059,2032 2059,2032 2058,2031 2058,2030 2057,2029 2057,2029 2056,2028 2056,2028 2055,2027 2055,2027 2053,2026 2053,2026 2051,2025 2050,2025 2045,2026 2044,2026 2041,2027 2040,2027 2038,2028 2037,2028 2036,2036 2028,2037 2028,2038 2027,2040 2027,2041 2026,2044 2026)[OUTER] - RING[count=5](2048 2037,2037 2048,2048 2042,2059 2048,2048 2037)[INNER] - properties: - gid=17 - feature: 17 - id: (none) - geomtype: linestring - geometry: - LINESTRING[count=4](2105 1991,2082 1991,2082 2014,2048 2014) - LINESTRING[count=22](2048 2048,2050 2048,2051 2049,2057 2049,2058 2048,2060 2048,2061 2047,2063 2047,2063 2046,2064 2046,2068 2042,2068 2041,2069 2041,2069 2040,2070 2039,2070 2037,2071 2037,2071 2034,2072 2033,2072 2029,2071 2028,2071 2025) - properties: - gid=18 - feature: 18 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=19 - feature: 19 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=20 - feature: 20 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=21 - feature: 21 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=22 - feature: 22 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=23 - feature: 23 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=24 - feature: 24 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=25 - feature: 25 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=26 - feature: 26 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=27 - feature: 27 - id: (none) - geomtype: point - geometry: - POINT(3673,1911) - properties: - gid=28 diff --git a/tests/fixtures/functions/function_Mixed_Name.sql b/tests/fixtures/functions/function_Mixed_Name.sql index 8b57925cd..d39025a62 100644 --- a/tests/fixtures/functions/function_Mixed_Name.sql +++ b/tests/fixtures/functions/function_Mixed_Name.sql @@ -5,6 +5,7 @@ RETURNS TABLE("mVt" bytea, key text) AS $$ SELECT mvt, md5(mvt) as key FROM ( SELECT ST_AsMVT(tile, 'MixedCase.function_Mixed_Name', 4096, 'geom') as mvt FROM ( SELECT + "Gid", ST_AsMVTGeom( ST_Transform(ST_CurveToLine("Geom"), 3857), ST_TileEnvelope("Z", x, y), diff --git a/tests/test.sh b/tests/test.sh index 8cf70f35d..82546ea7f 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -27,6 +27,17 @@ TEST_TEMP_DIR="$(dirname "$0")/mbtiles_temp_files" rm -rf "$TEST_TEMP_DIR" mkdir -p "$TEST_TEMP_DIR" +# Verify the tools used in the tests are available +# todo add more verification for other tools like jq file curl sqlite3... +if [[ $OSTYPE == linux* ]]; then # We only used ogrmerge.py on Linux see the test_pbf() function + if ! command -v ogrmerge.py > /dev/null; then + echo "gdal-bin is required for testing" + echo "For Ubuntu, you could install it with sudo apt update && sudo apt install gdal-bin -y" + echo "see more at https://gdal.org/en/stable/download.html#binaries" + exit 1 + fi +fi + function wait_for { # Seems the --retry-all-errors option is not available on older curl versions, but maybe in the future we can just use this: # timeout -k 20s 20s curl --retry 10 --retry-all-errors --retry-delay 1 -sS "$MARTIN_URL/health" @@ -95,7 +106,10 @@ test_pbf() { if [[ $OSTYPE == linux* ]]; then ./tests/fixtures/vtzero-check "$FILENAME" - ./tests/fixtures/vtzero-show "$FILENAME" > "$FILENAME.txt" + # see https://gdal.org/en/stable/programs/ogrmerge.html#ogrmerge + ogrmerge.py -o "$FILENAME.geojson" "$FILENAME" -single -src_layer_field_name "source_mvt_layer" -src_layer_field_content "{LAYER_NAME}" -f "GeoJSON" -overwrite_ds + jq --sort-keys '.features |= sort_by(.properties.source_mvt_layer, .properties.gid) | walk(if type == "number" then .+0.0 else . end)' "$FILENAME.geojson" > "$FILENAME.sorted.geojson" + mv "$FILENAME.sorted.geojson" "$FILENAME.geojson" fi }