Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/files/markdown.links.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"replacement": ""
}
],
"timeout": "2s",
"timeout": "3s",
"retryOn429": true,
"ignorePatterns": [
{
Expand Down
2 changes: 1 addition & 1 deletion martin/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ fn webui() {
&["dist", "node_modules"],
);

println!("installing and building in {out_martin_ui_dir:?}");
println!("installing and building in {}", out_martin_ui_dir.display());
static_files::NpmBuild::new(&out_martin_ui_dir)
.install()
.expect("npm install failed")
Expand Down
2 changes: 1 addition & 1 deletion martin/src/bin/martin-cp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ fn compute_tile_ranges(args: &CopyArgs) -> Vec<TileRect> {
ranges
}

fn get_zooms(args: &CopyArgs) -> Cow<Vec<u8>> {
fn get_zooms(args: &CopyArgs) -> Cow<[u8]> {
if let Some(max_zoom) = args.max_zoom {
let mut zooms_vec = Vec::new();
let min_zoom = args.min_zoom.unwrap_or(0);
Expand Down
5 changes: 4 additions & 1 deletion martin/src/srv/styles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ async fn get_style_json(path: Path<StyleRequest>, styles: Data<StyleSources>) ->
match serde_json::from_str::<serde_json::Value>(&style_content) {
Ok(value) => HttpResponse::Ok().json(value),
Err(e) => {
error!("Failed to parse style JSON {e:?} for style {style_id} at {path:?}");
error!(
"Failed to parse style JSON {e:?} for style {style_id} at {:?}",
path.display()
);

HttpResponse::BadRequest()
.content_type(ContentType::plaintext())
Expand Down
10 changes: 8 additions & 2 deletions martin/src/styles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,18 @@ impl StyleSources {
for base_path in cfg.paths {
let files = list_contained_files(&base_path, "json")?;
if files.is_empty() {
warn!("No styles (.json files) found in path {base_path:?}");
warn!(
"No styles (.json files) found in path {:?}",
base_path.display()
);
continue;
}
for path in files {
let Some(name) = path.file_name() else {
warn!("Ignoring style source with no name from {path:?}");
warn!(
"Ignoring style source with no name from {:?}",
path.display()
);
continue;
};
let style_id = name
Expand Down
Loading