search

onthegomap / planetiler

Flexible tool to build planet-scale vector tilesets from OpenStreetMap data fast
Apache License 2.0
1.46k stars 116 forks source link

Convert `${feature.source/source_layer}: [ ... ]` match expression to `MatchSource`/`MatchSourceLayer` #1065

Closed msbarry closed 1 month ago

msbarry commented 1 month ago

This is a followup to #1063 that converts simple match expressions where the left hand side is ${feature.source} or ${feature.source_layer} and don't contain a wildcard, __any__ "" to a MatchSource / MatchSourceLayer expression that gets optimized when matching against features.

Also make source optional on features, when missing it matches features from any source.

sonarcloud[bot] commented 1 month ago

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
92.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

github-actions[bot] commented 1 month ago
This Branch d8c442fcee4e180479419dea1372dbfe9e5d8e48 Base e3d5645e1a9c89ea5a22c79efdba76f9fd28dc9a
``` 0:01:09 DEB [archive] - Tile stats: 0:01:09 DEB [archive] - Biggest tiles (gzipped) 1. 14/4942/6092 (160k) https://onthegomap.github.io/planetiler-demo/#14.5/41.82864/-71.40015 (poi:86k) 2. 9/154/190 (149k) https://onthegomap.github.io/planetiler-demo/#9.5/41.77078/-71.36719 (landcover:85k) 3. 10/308/380 (138k) https://onthegomap.github.io/planetiler-demo/#10.5/41.90214/-71.54297 (landcover:66k) 4. 10/308/381 (137k) https://onthegomap.github.io/planetiler-demo/#10.5/41.63994/-71.54297 (landcover:72k) 5. 14/4941/6092 (113k) https://onthegomap.github.io/planetiler-demo/#14.5/41.82864/-71.42212 (poi:65k) 6. 14/4941/6093 (111k) https://onthegomap.github.io/planetiler-demo/#14.5/41.81227/-71.42212 (building:62k) 7. 14/4940/6092 (100k) https://onthegomap.github.io/planetiler-demo/#14.5/41.82864/-71.44409 (building:92k) 8. 11/616/762 (99k) https://onthegomap.github.io/planetiler-demo/#11.5/41.7057/-71.63086 (landcover:71k) 9. 14/4942/6091 (97k) https://onthegomap.github.io/planetiler-demo/#14.5/41.84501/-71.40015 (building:79k) 10. 11/616/761 (95k) https://onthegomap.github.io/planetiler-demo/#11.5/41.83679/-71.63086 (landcover:72k) 0:01:09 DEB [archive] - Max tile sizes z0 z1 z2 z3 z4 z5 z6 z7 z8 z9 z10 z11 z12 z13 z14 all boundary 155 375 444 584 939 371 467 587 823 1.7k 2.1k 7.2k 6.4k 5.8k 4.5k 7.2k water 7.7k 3.7k 8.6k 5.5k 2.6k 5.1k 15k 18k 16k 26k 15k 13k 17k 15k 12k 26k place 0 0 441 441 441 640 714 1k 1.6k 3.1k 5.7k 3.3k 1.7k 803 948 5.7k landuse 0 0 0 0 549 695 1.6k 6.8k 17k 44k 59k 50k 38k 19k 12k 59k transportation 0 0 0 0 314 850 1.2k 6k 8k 24k 17k 19k 65k 49k 36k 65k waterway 0 0 0 0 112 119 0 0 0 3.2k 2.3k 2.1k 2.1k 4.9k 2.4k 4.9k park 0 0 0 0 0 0 1.2k 4.2k 9.7k 18k 13k 8.2k 3.7k 3.4k 4.4k 18k transportation_name 0 0 0 0 0 0 369 464 1.2k 1.8k 5.5k 4.7k 3.9k 3.4k 18k 18k landcover 0 0 0 0 0 0 0 9.6k 29k 85k 72k 81k 53k 30k 26k 85k mountain_peak 0 0 0 0 0 0 0 1.1k 1.8k 3.4k 4.3k 2.8k 1.4k 1.4k 869 4.3k water_name 0 0 0 0 0 0 0 0 0 486 461 433 452 1.2k 1.5k 1.5k aerodrome_label 0 0 0 0 0 0 0 0 0 0 666 328 273 221 221 666 aeroway 0 0 0 0 0 0 0 0 0 0 1.6k 2.1k 3k 3.4k 2.8k 3.4k poi 0 0 0 0 0 0 0 0 0 0 0 0 506 503 86k 86k building 0 0 0 0 0 0 0 0 0 0 0 0 0 59k 92k 92k housenumber 0 0 0 0 0 0 0 0 0 0 0 0 0 0 35k 35k full tile 7.9k 4k 9.5k 6.5k 3.8k 6.1k 20k 42k 85k 203k 185k 135k 114k 129k 251k 251k gzipped 6.2k 3.6k 7.1k 5.2k 3.1k 4.9k 14k 30k 60k 149k 138k 99k 83k 92k 160k 160k 0:01:09 DEB [archive] - Max tile: 251k (gzipped: 160k) 0:01:09 DEB [archive] - Avg tile: 5.5k (gzipped: 4.1k) using weighted average based on OSM traffic 0:01:09 DEB [archive] - # tiles: 4,115,029 0:01:09 DEB [archive] - # features: 5,495,401 0:01:09 INF [archive] - Finished in 19s cpu:1m9s avg:3.7 0:01:09 INF [archive] - read 1x(3% 0.5s wait:17s done:1s) 0:01:09 INF [archive] - encode 4x(56% 11s wait:2s) 0:01:09 INF [archive] - write 1x(21% 4s wait:13s) 0:01:09 INF [archive] - Finished in 1m10s cpu:3m38s gc:1s avg:3.1 0:01:09 INF [archive] - FINISHED! 0:01:09 INF [archive] - 0:01:09 INF [archive] - ---------------------------------------- 0:01:09 INF [archive] - data errors: 0:01:09 INF [archive] - render_snap_fix_input 16,666 0:01:09 INF [archive] - osm_multipolygon_missing_way 360 0:01:09 INF [archive] - osm_boundary_missing_way 73 0:01:09 INF [archive] - merge_snap_fix_input 12 0:01:09 INF [archive] - feature_centroid_if_convex_osm_invalid_multipolygon_empty_after_fix 2 0:01:09 INF [archive] - render_snap_fix_input2 1 0:01:09 INF [archive] - omt_fix_water_before_ne_intersect 1 0:01:09 INF [archive] - feature_polygon_osm_invalid_multipolygon_empty_after_fix 1 0:01:09 INF [archive] - feature_point_on_surface_osm_invalid_multipolygon_empty_after_fix 1 0:01:09 INF [archive] - ---------------------------------------- 0:01:09 INF [archive] - overall 1m10s cpu:3m38s gc:1s avg:3.1 0:01:09 INF [archive] - lake_centerlines 3s cpu:6s avg:2.1 0:01:09 INF [archive] - read 1x(17% 0.5s done:2s) 0:01:09 INF [archive] - process 4x(0% 0s done:2s) 0:01:09 INF [archive] - write 1x(0% 0s done:2s) 0:01:09 INF [archive] - water_polygons 15s cpu:43s avg:2.9 0:01:09 INF [archive] - read 1x(40% 6s done:8s) 0:01:09 INF [archive] - process 4x(27% 4s wait:4s done:5s) 0:01:09 INF [archive] - write 1x(4% 0.5s wait:10s done:5s) 0:01:09 INF [archive] - natural_earth 11s cpu:17s avg:1.6 0:01:09 INF [archive] - read 1x(56% 6s done:5s) 0:01:09 INF [archive] - process 4x(8% 0.8s wait:6s done:5s) 0:01:09 INF [archive] - write 1x(0% 0s wait:6s done:5s) 0:01:09 INF [archive] - osm_pass1 2s cpu:6s avg:3.2 0:01:09 INF [archive] - read 1x(2% 0s wait:2s) 0:01:09 INF [archive] - parse 4x(33% 0.6s) 0:01:09 INF [archive] - process 1x(73% 1s) 0:01:09 INF [archive] - osm_pass2 18s cpu:1m12s avg:3.9 0:01:09 INF [archive] - read 1x(0% 0s wait:11s done:8s) 0:01:09 INF [archive] - process 4x(76% 14s) 0:01:09 INF [archive] - write 1x(2% 0.4s wait:18s) 0:01:09 INF [archive] - ne_lakes 0s cpu:0s avg:0 0:01:09 INF [archive] - boundaries 0s cpu:0s avg:1.2 0:01:09 INF [archive] - agg_stop 0s cpu:0s avg:0 0:01:09 INF [archive] - sort 1s cpu:3s avg:2.6 0:01:09 INF [archive] - worker 1x(50% 0.6s) 0:01:09 INF [archive] - archive 19s cpu:1m9s avg:3.7 0:01:09 INF [archive] - read 1x(3% 0.5s wait:17s done:1s) 0:01:09 INF [archive] - encode 4x(56% 11s wait:2s) 0:01:09 INF [archive] - write 1x(21% 4s wait:13s) 0:01:09 INF [archive] - ---------------------------------------- 0:01:09 INF [archive] - archive 108MB 0:01:09 INF [archive] - features 291MB -rw-r--r-- 1 runner docker 85M Oct 12 14:34 run.jar ``` ``` 0:01:03 DEB [archive] - Tile stats: 0:01:03 DEB [archive] - Biggest tiles (gzipped) 1. 14/4942/6092 (160k) https://onthegomap.github.io/planetiler-demo/#14.5/41.82864/-71.40015 (poi:86k) 2. 9/154/190 (149k) https://onthegomap.github.io/planetiler-demo/#9.5/41.77078/-71.36719 (landcover:85k) 3. 10/308/380 (138k) https://onthegomap.github.io/planetiler-demo/#10.5/41.90214/-71.54297 (landcover:66k) 4. 10/308/381 (137k) https://onthegomap.github.io/planetiler-demo/#10.5/41.63994/-71.54297 (landcover:72k) 5. 14/4941/6092 (113k) https://onthegomap.github.io/planetiler-demo/#14.5/41.82864/-71.42212 (poi:65k) 6. 14/4941/6093 (111k) https://onthegomap.github.io/planetiler-demo/#14.5/41.81227/-71.42212 (building:62k) 7. 14/4940/6092 (100k) https://onthegomap.github.io/planetiler-demo/#14.5/41.82864/-71.44409 (building:92k) 8. 11/616/762 (99k) https://onthegomap.github.io/planetiler-demo/#11.5/41.7057/-71.63086 (landcover:71k) 9. 14/4942/6091 (97k) https://onthegomap.github.io/planetiler-demo/#14.5/41.84501/-71.40015 (building:79k) 10. 11/616/761 (95k) https://onthegomap.github.io/planetiler-demo/#11.5/41.83679/-71.63086 (landcover:72k) 0:01:03 DEB [archive] - Max tile sizes z0 z1 z2 z3 z4 z5 z6 z7 z8 z9 z10 z11 z12 z13 z14 all boundary 155 375 444 584 939 371 467 587 823 1.7k 2.1k 7.2k 6.4k 5.8k 4.5k 7.2k water 7.7k 3.7k 8.6k 5.5k 2.6k 5.1k 15k 18k 16k 26k 15k 13k 17k 15k 12k 26k place 0 0 441 441 441 640 714 1k 1.6k 3.1k 5.7k 3.3k 1.7k 803 948 5.7k landuse 0 0 0 0 549 695 1.6k 6.8k 17k 44k 59k 50k 38k 19k 12k 59k transportation 0 0 0 0 314 850 1.2k 6k 8k 24k 17k 19k 65k 49k 36k 65k waterway 0 0 0 0 112 119 0 0 0 3.2k 2.3k 2.1k 2.1k 4.9k 2.4k 4.9k park 0 0 0 0 0 0 1.2k 4.2k 9.7k 18k 13k 8.2k 3.7k 3.4k 4.4k 18k transportation_name 0 0 0 0 0 0 369 464 1.2k 1.8k 5.5k 4.7k 3.9k 3.4k 18k 18k landcover 0 0 0 0 0 0 0 9.6k 29k 85k 72k 81k 53k 30k 26k 85k mountain_peak 0 0 0 0 0 0 0 1.1k 1.8k 3.4k 4.3k 2.8k 1.4k 1.4k 869 4.3k water_name 0 0 0 0 0 0 0 0 0 486 461 433 452 1.2k 1.5k 1.5k aerodrome_label 0 0 0 0 0 0 0 0 0 0 666 328 273 221 221 666 aeroway 0 0 0 0 0 0 0 0 0 0 1.6k 2.1k 3k 3.4k 2.8k 3.4k poi 0 0 0 0 0 0 0 0 0 0 0 0 506 503 86k 86k building 0 0 0 0 0 0 0 0 0 0 0 0 0 59k 92k 92k housenumber 0 0 0 0 0 0 0 0 0 0 0 0 0 0 35k 35k full tile 7.9k 4k 9.5k 6.5k 3.8k 6.1k 20k 42k 85k 203k 185k 135k 114k 129k 251k 251k gzipped 6.2k 3.6k 7.1k 5.2k 3.1k 4.9k 14k 30k 60k 149k 138k 99k 83k 92k 160k 160k 0:01:03 DEB [archive] - Max tile: 251k (gzipped: 160k) 0:01:03 DEB [archive] - Avg tile: 5.5k (gzipped: 4.1k) using weighted average based on OSM traffic 0:01:03 DEB [archive] - # tiles: 4,115,029 0:01:03 DEB [archive] - # features: 5,495,401 0:01:03 INF [archive] - Finished in 18s cpu:1m8s avg:3.7 0:01:03 INF [archive] - read 1x(3% 0.5s wait:17s done:1s) 0:01:03 INF [archive] - encode 4x(57% 11s wait:2s done:1s) 0:01:03 INF [archive] - write 1x(21% 4s wait:12s done:1s) 0:01:03 INF [archive] - Finished in 1m4s cpu:3m30s avg:3.3 0:01:03 INF [archive] - FINISHED! 0:01:03 INF [archive] - 0:01:03 INF [archive] - ---------------------------------------- 0:01:03 INF [archive] - data errors: 0:01:03 INF [archive] - render_snap_fix_input 16,666 0:01:03 INF [archive] - osm_multipolygon_missing_way 360 0:01:03 INF [archive] - osm_boundary_missing_way 73 0:01:03 INF [archive] - merge_snap_fix_input 12 0:01:03 INF [archive] - feature_centroid_if_convex_osm_invalid_multipolygon_empty_after_fix 2 0:01:03 INF [archive] - render_snap_fix_input2 1 0:01:03 INF [archive] - omt_fix_water_before_ne_intersect 1 0:01:03 INF [archive] - feature_polygon_osm_invalid_multipolygon_empty_after_fix 1 0:01:03 INF [archive] - feature_point_on_surface_osm_invalid_multipolygon_empty_after_fix 1 0:01:03 INF [archive] - ---------------------------------------- 0:01:03 INF [archive] - overall 1m4s cpu:3m30s avg:3.3 0:01:03 INF [archive] - lake_centerlines 2s cpu:5s avg:2.3 0:01:03 INF [archive] - read 1x(21% 0.5s done:2s) 0:01:03 INF [archive] - process 4x(0% 0s done:2s) 0:01:03 INF [archive] - write 1x(0% 0s done:2s) 0:01:03 INF [archive] - water_polygons 15s cpu:41s avg:2.8 0:01:03 INF [archive] - read 1x(42% 6s done:7s) 0:01:03 INF [archive] - process 4x(27% 4s wait:4s done:5s) 0:01:03 INF [archive] - write 1x(4% 0.5s wait:9s done:5s) 0:01:03 INF [archive] - natural_earth 6s cpu:13s avg:2.1 0:01:03 INF [archive] - read 1x(96% 6s) 0:01:03 INF [archive] - process 4x(13% 0.8s wait:6s) 0:01:03 INF [archive] - write 1x(0% 0s wait:6s) 0:01:03 INF [archive] - osm_pass1 2s cpu:6s avg:3.3 0:01:03 INF [archive] - read 1x(2% 0s wait:2s) 0:01:03 INF [archive] - parse 4x(34% 0.6s) 0:01:03 INF [archive] - process 1x(69% 1s) 0:01:03 INF [archive] - osm_pass2 18s cpu:1m12s avg:3.9 0:01:03 INF [archive] - read 1x(0% 0s wait:11s done:8s) 0:01:03 INF [archive] - process 4x(76% 14s) 0:01:03 INF [archive] - write 1x(2% 0.4s wait:18s) 0:01:03 INF [archive] - ne_lakes 0s cpu:0s avg:0 0:01:03 INF [archive] - boundaries 0s cpu:0s avg:2.4 0:01:03 INF [archive] - agg_stop 0s cpu:0s avg:0 0:01:03 INF [archive] - sort 1s cpu:4s avg:2.6 0:01:03 INF [archive] - worker 1x(45% 0.6s) 0:01:03 INF [archive] - archive 18s cpu:1m8s avg:3.7 0:01:03 INF [archive] - read 1x(3% 0.5s wait:17s done:1s) 0:01:03 INF [archive] - encode 4x(57% 11s wait:2s done:1s) 0:01:03 INF [archive] - write 1x(21% 4s wait:12s done:1s) 0:01:03 INF [archive] - ---------------------------------------- 0:01:03 INF [archive] - archive 108MB 0:01:03 INF [archive] - features 291MB -rw-r--r-- 1 runner docker 85M Oct 12 14:35 run.jar ```

Full logs: https://github.com/onthegomap/planetiler/actions/runs/11306431589