Merge remote-tracking branch 'maplibre/main' into quickbounds

Author: sharkAndshark

.github/workflows/ci.yml

@@ -722,7 +722,7 @@ jobs:
 
       - name: Publish
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           files: 'target/files/*'

Cargo.lock

@@ -4,7 +4,7 @@ lints.workspace = true
 name = "martin-tile-utils"
 version = "0.4.1"
 authors = ["Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
-description = "Utilites to help with map tile processing, such as type and compression detection. Used by the MapLibre's Martin tile server."
+description = "Utilities to help with map tile processing, such as type and compression detection. Used by the MapLibre's Martin tile server."
 keywords = ["maps", "tiles", "mvt", "tileserver"]
 categories = ["science::geo", "parsing"]
 exclude = [

martin-tile-utils/Cargo.toml

@@ -79,11 +79,13 @@ bit-set = { workspace = true, optional = true }
 brotli.workspace = true
 clap.workspace = true
 deadpool-postgres = { workspace = true, optional = true }
+enum-display.workspace = true
 env_logger.workspace = true
 flate2.workspace = true
 futures.workspace = true
 itertools.workspace = true
 json-patch = { workspace = true, optional = true }
+lambda-web = { workspace = true, optional = true }
 log.workspace = true
 martin-tile-utils.workspace = true
 mbtiles = { workspace = true, optional = true }
@@ -92,8 +94,8 @@ num_cpus.workspace = true
 pbf_font_tools = { workspace = true, optional = true }
 pmtiles = { workspace = true, optional = true }
 postgis = { workspace = true, optional = true }
-postgres-protocol = { workspace = true, optional = true }
 postgres = { workspace = true, optional = true }
+postgres-protocol = { workspace = true, optional = true }
 regex.workspace = true
 rustls-native-certs.workspace = true
 rustls-pemfile.workspace = true
@@ -110,7 +112,6 @@ tilejson.workspace = true
 tokio = { workspace = true, features = ["io-std"] }
 tokio-postgres-rustls = { workspace = true, optional = true }
 url.workspace = true
-lambda-web = { workspace = true, optional = true }
 
 [dev-dependencies]
 cargo-husky.workspace = true

martin/Cargo.toml

@@ -1,6 +1,7 @@
 use std::time::Duration;
 
 use clap::ValueEnum;
+use enum_display::EnumDisplay;
 use log::{info, warn};
 use serde::{Deserialize, Serialize};
 
@@ -13,8 +14,11 @@ use crate::utils::{OptBoolObj, OptOneMany};
 // Must match the help string for BoundsType::Quick
 pub const DEFAULT_BOUNDS_TIMEOUT: Duration = Duration::from_secs(5);
 
-#[derive(PartialEq, Eq, Default, Debug, Clone, Copy, Serialize, Deserialize, ValueEnum)]
+#[derive(
+    PartialEq, Eq, Default, Debug, Clone, Copy, Serialize, Deserialize, ValueEnum, EnumDisplay,
+)]
 #[serde(rename_all = "lowercase")]
+#[enum_display(case = "Kebab")]
 pub enum BoundsCalcType {
     /// Compute table geometry bounds, but abort if it takes longer than 5 seconds.
     #[default]
@@ -37,7 +41,7 @@ pub struct PgArgs {
     /// If a spatial PG table has SRID 0, then this default SRID will be used as a fallback.
     #[arg(short, long)]
     pub default_srid: Option<i32>,
-    #[arg(help = format!("Maximum Postgres connections pool size [DEFAULT: {}]", POOL_SIZE_DEFAULT), short, long)]
+    #[arg(help = format!("Maximum Postgres connections pool size [DEFAULT: {POOL_SIZE_DEFAULT}]"), short, long)]
     pub pool_size: Option<usize>,
     /// Limit the number of features in a tile from a PG table source.
     #[arg(short, long)]
@@ -76,31 +80,46 @@ impl PgArgs {
         }
     }
 
+    /// Apply CLI parameters from `self` to the configuration loaded from the config file `pg_config`
     pub fn override_config<'a>(self, pg_config: &mut OptOneMany<PgConfig>, env: &impl Env<'a>) {
-        if self.default_srid.is_some() {
-            info!("Overriding configured default SRID to {} on all Postgres connections because of a CLI parameter", self.default_srid.unwrap());
+        // This ensures that if a new parameter is added to the struct, it will not be forgotten here
+        let Self {
+            default_srid,
+            pool_size,
+            auto_bounds,
+            max_feature_count,
+            ca_root_file,
+        } = self;
+
+        if let Some(value) = default_srid {
+            info!("Overriding configured default SRID to {value} on all Postgres connections because of a CLI parameter");
             pg_config.iter_mut().for_each(|c| {
-                c.default_srid = self.default_srid;
+                c.default_srid = default_srid;
             });
         }
-        if self.pool_size.is_some() {
-            info!("Overriding configured pool size to {} on all Postgres connections because of a CLI parameter", self.pool_size.unwrap());
+        if let Some(value) = pool_size {
+            info!("Overriding configured pool size to {value} on all Postgres connections because of a CLI parameter");
             pg_config.iter_mut().for_each(|c| {
-                c.pool_size = self.pool_size;
+                c.pool_size = pool_size;
             });
         }
-        if self.max_feature_count.is_some() {
-            info!("Overriding maximum feature count to {} on all Postgres connections because of a CLI parameter", self.max_feature_count.unwrap());
+        if let Some(value) = auto_bounds {
+            info!("Overriding auto_bounds to {value} on all Postgres connections because of a CLI parameter");
             pg_config.iter_mut().for_each(|c| {
-                c.max_feature_count = self.max_feature_count;
+                c.auto_bounds = auto_bounds;
             });
         }
-
-        if self.ca_root_file.is_some() {
+        if let Some(value) = max_feature_count {
+            info!("Overriding maximum feature count to {value} on all Postgres connections because of a CLI parameter");
+            pg_config.iter_mut().for_each(|c| {
+                c.max_feature_count = max_feature_count;
+            });
+        }
+        if let Some(ref value) = ca_root_file {
             info!("Overriding root certificate file to {} on all Postgres connections because of a CLI parameter",
-                self.ca_root_file.as_ref().unwrap().display());
+                value.display());
             pg_config.iter_mut().for_each(|c| {
-                c.ssl_certificates.ssl_root_cert = self.ca_root_file.clone();
+                c.ssl_certificates.ssl_root_cert = ca_root_file.clone();
             });
         }
 

martin/src/args/pg.rs

@@ -6,9 +6,9 @@ use crate::srv::{SrvConfig, KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT};
 #[derive(clap::Args, Debug, PartialEq, Default)]
 #[command(about, version)]
 pub struct SrvArgs {
-    #[arg(help = format!("Connection keep alive timeout. [DEFAULT: {}]", KEEP_ALIVE_DEFAULT), short, long)]
+    #[arg(help = format!("Connection keep alive timeout. [DEFAULT: {KEEP_ALIVE_DEFAULT}]"), short, long)]
     pub keep_alive: Option<u64>,
-    #[arg(help = format!("The socket address to bind. [DEFAULT: {}]", LISTEN_ADDRESSES_DEFAULT), short, long)]
+    #[arg(help = format!("The socket address to bind. [DEFAULT: {LISTEN_ADDRESSES_DEFAULT}]"), short, long)]
     pub listen_addresses: Option<String>,
     /// Set TileJSON URL path prefix, ignoring X-Rewrite-URL header. Must begin with a `/`. Examples: `/`, `/tiles`
     #[arg(long)]

martin/src/args/srv.rs

@@ -118,7 +118,7 @@ mod tests {
     }
 
     #[test]
-    fn test_tile_range_is_ovelapping() {
+    fn test_tile_range_is_overlapping() {
         let r1 = TileRect::new(0, 0, 0, 0, 0);
         let r2 = TileRect::new(0, 0, 0, 0, 0);
         assert!(r1.is_overlapping(&r2));

martin/src/utils/rectangle.rs

@@ -57,6 +57,12 @@ postgres:
     fonts: {}
     sprites: {}
     tiles:
+      "-function.withweired---_-characters":
+        content_type: application/x-protobuf
+        description: a function source with special characters
+      ".-Points---quote":
+        content_type: application/x-protobuf
+        description: Escaping test table
       MixPoints:
         content_type: application/x-protobuf
         description: a description from comment on table

martin/tests/pg_server_test.rs

@@ -18,6 +18,12 @@ async fn table_source() {
     let mock = mock_sources(mock_pgcfg("connection_string: $DATABASE_URL")).await;
     assert_yaml_snapshot!(mock.0.tiles.get_catalog(), @r###"
     ---
+    "-function.withweired---_-characters":
+      content_type: application/x-protobuf
+      description: a function source with special characters
+    ".-Points---quote":
+      content_type: application/x-protobuf
+      description: Escaping test table
     MixPoints:
       content_type: application/x-protobuf
       description: a description from comment on table

martin/tests/pg_table_source_test.rs

@@ -1,5 +1,13 @@
 {
   "tiles": {
+    "-function.withweired---_-characters": {
+      "content_type": "application/x-protobuf",
+      "description": "a function source with special characters"
+    },
+    ".-Points---quote": {
+      "content_type": "application/x-protobuf",
+      "description": "Escaping test table"
+    },
     "MixPoints": {
       "content_type": "application/x-protobuf",
       "description": "a description from comment on table"