Add `--preferred-encoding (gzip|brotli)` to use when tile is not pre-encoded by source #1189

sharkAndshark · 2024-02-11T05:22:35Z

Try to fix #1178

Add optional --preferred-encoding to cli, br brotli and gzip are allowed
Add optional preferred-encoding to config, br brotli and gzip are allowed
Add test
Update doc

nyurik

good first step, left a few comments

martin/src/args/srv.rs

martin/src/srv/server.rs

nyurik

love it! One small nit, and seems it is pretty good to go!

martin/src/srv/tiles.rs

nyurik

nah, not worth it, will fix naming if needed later, good enough. I made a few more minor suggestions

docs/src/config-file.md

docs/src/run-with-cli.md

martin/src/args/srv.rs

martin/tests/mb_server_test.rs

nyurik

I'm not too happy with the description, but can't think think too clearly. Will try in the morning. In the mean time, there is one line that i think was left by an accident, but good to go otherwise, so remove it and feel free to merge :)

nyurik · 2024-02-19T08:10:48Z

martin/src/srv/tiles.rs

                // only apply compression if the content supports it
                if let Some(HeaderEnc::Known(enc)) =
-                    accept_enc.negotiate(SUPPORTED_ENCODINGS.iter())
+                    // accept_enc.negotiate(SUPPORTED_ENCODINGS.iter())


Suggested change

// accept_enc.negotiate(SUPPORTED_ENCODINGS.iter())

Oops. Deleted.

"Preferred tile encoding when martin is negotiating with browser, only works if the tile itself is not pre-compressed. The default Brotli is much smaller(and may be faster with caching) but a little bit slower than gzip."
Well this version maybe much worse..

Add tile encoding opt to cli and config

1fe3920

nyurik reviewed Feb 11, 2024

View reviewed changes

martin/src/args/srv.rs Outdated Show resolved Hide resolved

martin/src/args/srv.rs Outdated Show resolved Hide resolved

martin/src/srv/server.rs Outdated Show resolved Hide resolved

nyurik changed the title ~~Allow seeting tile encoding preference~~ Add --preferred-encoding (gzip|brotli) to use when tile is not pre-encoded by source Feb 11, 2024

sharkAndshark added 15 commits February 12, 2024 00:08

wip

71ae417

Inject SrvConfig to server

731cd3f

wip

cf07349

wip

31e74d2

Keep -p used by pool_size

165c83e

Format and clippy

27fdbf7

Inject SrvConfig to testserver

99b274e

Inject SrvConfig to test server

80f4ba4

Inject SrvConfig to test server

8395c21

Fmt and clippy

d86ca50

Update run-with-cli.md

0e2d20f

Update config test

4412d2c

Add clap alias br to PrefereedEncoding enum

05e361c

Add tests

75ad627

Update config-file.md

bc883a2

sharkAndshark marked this pull request as ready for review February 19, 2024 05:41

nyurik reviewed Feb 19, 2024

View reviewed changes

martin/src/srv/tiles.rs Outdated Show resolved Hide resolved

nyurik reviewed Feb 19, 2024

View reviewed changes

martin/src/srv/tiles.rs Outdated Show resolved Hide resolved

A little bit cleanup

0cdf327

nyurik reviewed Feb 19, 2024

View reviewed changes

docs/src/config-file.md Outdated Show resolved Hide resolved

docs/src/run-with-cli.md Show resolved Hide resolved

martin/src/args/srv.rs Outdated Show resolved Hide resolved

martin/tests/mb_server_test.rs Outdated Show resolved Hide resolved

sharkAndshark added 3 commits February 19, 2024 15:47

Update config-file.md

cc41a0b

Update description about --preferred-encoding option

0ca49c7

Use SrvConfig::default() directly

b253923

nyurik approved these changes Feb 19, 2024

View reviewed changes

sharkAndshark added 2 commits February 19, 2024 16:19

Cleanup

ec54c68

Cargo fmt and clippy

04c7a78

sharkAndshark merged commit 3e30c43 into maplibre:main Feb 19, 2024
19 checks passed

sharkAndshark deleted the compress branch February 19, 2024 11:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `--preferred-encoding (gzip|brotli)` to use when tile is not pre-encoded by source #1189

Add `--preferred-encoding (gzip|brotli)` to use when tile is not pre-encoded by source #1189

sharkAndshark commented Feb 11, 2024 •

edited

Loading

nyurik left a comment

nyurik left a comment

nyurik left a comment •

edited

Loading

nyurik left a comment

nyurik Feb 19, 2024

sharkAndshark Feb 19, 2024

sharkAndshark Feb 19, 2024 •

edited

Loading

Add --preferred-encoding (gzip|brotli) to use when tile is not pre-encoded by source #1189

Add --preferred-encoding (gzip|brotli) to use when tile is not pre-encoded by source #1189

Conversation

sharkAndshark commented Feb 11, 2024 • edited Loading

nyurik left a comment

Choose a reason for hiding this comment

nyurik left a comment

Choose a reason for hiding this comment

nyurik left a comment • edited Loading

Choose a reason for hiding this comment

nyurik left a comment

Choose a reason for hiding this comment

nyurik Feb 19, 2024

Choose a reason for hiding this comment

sharkAndshark Feb 19, 2024

Choose a reason for hiding this comment

sharkAndshark Feb 19, 2024 • edited Loading

Choose a reason for hiding this comment

Add `--preferred-encoding (gzip|brotli)` to use when tile is not pre-encoded by source #1189

Add `--preferred-encoding (gzip|brotli)` to use when tile is not pre-encoded by source #1189

sharkAndshark commented Feb 11, 2024 •

edited

Loading

nyurik left a comment •

edited

Loading

sharkAndshark Feb 19, 2024 •

edited

Loading