diff --git a/Cargo.lock b/Cargo.lock index c8cc6bf..5f11ea3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -530,7 +530,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -613,6 +613,15 @@ dependencies = [ "system-deps", ] +[[package]] +name = "geo-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + [[package]] name = "geo-types" version = "0.7.9" @@ -1165,6 +1174,7 @@ version = "0.3.5" dependencies = [ "chrono", "font-kit", + "geo-macros", "image", "lazy_static", "num-traits", @@ -1248,9 +1258,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] @@ -1283,9 +1293,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1401,7 +1411,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1470,9 +1480,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -1544,7 +1554,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1693,7 +1703,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", "wasm-bindgen-shared", ] @@ -1715,7 +1725,7 @@ checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/src/main.rs b/src/main.rs index 54a9352..6c605f4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ use backend::CairoBackend; +use plotters::chart::MeshStyle; use plotters::prelude::*; use geo_types::{MultiPolygon, Polygon}; @@ -62,16 +63,32 @@ fn build_ui(app: &Application) { let to = "EPSG:3857"; let ft = Proj::new_known_crs(from, to, None).unwrap(); - let proj = Mercator::new().build(); + let proj = Mercator::new().change_min_latitude(-80f64); let mut chart = ChartBuilder::on(&root) - .set_label_area_size(LabelAreaPosition::Left, 60) - .set_label_area_size(LabelAreaPosition::Bottom, 60) - .caption("Area Chart Demo", ("sans-serif", 40)) - .build_geo_coord(None, None, proj) - // .build_cartesian_2d(0..100, 0..100) + .build_geo_coord( + Some(std::ops::Range { + start: 73.0, + end: 135.0, + }), + Some(std::ops::Range { + start: 4.0, + end: 53.5, + }), + proj, + ) .unwrap(); + chart.draw_mesh_lines( + (10, 5), + (true, true), + &ShapeStyle { + color: RGBAColor(0, 0, 0, 1f64), + filled: false, + stroke_width: 1, + }, + ); + // chart // // .configure_mesh() // // .disable_x_mesh()