diff --git a/src/symbolizer_keys.cpp b/src/symbolizer_keys.cpp index b802c453e..a2d343edb 100644 --- a/src/symbolizer_keys.cpp +++ b/src/symbolizer_keys.cpp @@ -78,7 +78,7 @@ static const property_meta_type key_meta[to_integral(keys::MAX_SYMBOLIZER_KEY)] property_meta_type{ "smooth", false, nullptr, property_types::target_double }, property_meta_type{ "simplify-algorithm", enumeration_wrapper(radial_distance), [](enumeration_wrapper e) { return *simplify_algorithm_to_string(simplify_algorithm_e(e.value));}, property_types::target_simplify_algorithm }, - property_meta_type{ "simplify-tolerance", 0.0, nullptr, property_types::target_double }, + property_meta_type{ "simplify", 0.0, nullptr, property_types::target_double }, property_meta_type{ "halo-rasterizer", enumeration_wrapper(HALO_RASTERIZER_FULL), [](enumeration_wrapper e) { return enumeration(halo_rasterizer_enum(e.value)).as_string();}, property_types::target_halo_rasterizer }, property_meta_type{ "text-placements", false, nullptr, property_types::target_double }, diff --git a/tests/visual_tests/grids/line-pattern-smooth-and-offset-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/line-pattern-smooth-and-offset-512-512-1.0-grid-reference.json index 2d3c25756..3e81e18db 100644 --- a/tests/visual_tests/grids/line-pattern-smooth-and-offset-512-512-1.0-grid-reference.json +++ b/tests/visual_tests/grids/line-pattern-smooth-and-offset-512-512-1.0-grid-reference.json @@ -26,91 +26,91 @@ " ", " ", " ", - " !!! !! ", - " !!!!!!!!! !!!!!!!! ", - " !!! !!!! !!!! !!! ", - " !!! !!!!! !!! !!! !!!!! !! ", - " !! !!!!!!!! !!! !!! !!!!!!!! !! ", - " !!!!! ! !! !! !!! !! !! !!! !! ", - " !! !! !!!!! !! !! !! !! !!!!! !!!!!! ", - " !! ! !!! !!!!! !! !! !! !!! !! !! !!! ", - " !! !! !!!!!!! !!!! !! !! !!!!!!!!! !! !! ", - " !! !!!!!!! !! !! !! !! !!!!!!!!!!!!!! !! !! ", - " !!!! !!!! !! ! !! !!!!!!!!! !!!!!! !! ", - " !! !! !!! !! !!!! !! !!!!! !!!!!!!!! ", - " !! ! !!! !!!!! ! !! !!!!!!!!!!!!!! !!!!! !!! ", - " !! !! !!! !!!!!!! !! !!!!!!!!!!! !!!!! !!!!! !! ", - " !! !!!!! !!!!!! !!!! !! !!!!!! !!!!!!!!! !! ", - " !!!! !! !! !!! !!!! !! !!!!! !!!! !!!!!!!! !! ", - " !! !! !! !! !!!!! !! !! !!!!! !!!!!!!!!! !!!! !!!!!! ", - " !! !!!! !!! !!! ! !! !!!!!!!!! !!! !!!! !!!! !! !!! ", - " !! !!!!! !! !!! !!!! !!! !!!!! !!! !!!! !!!!!! !! ", - " !! !!!! !! !! !!!!! !! !!! !!!!! !! !!! !!!!!!! !! ", - " !!!! !! !!! !!!! !!!!! !!! !!!! !!!!!!!! !!! !!!!!!! !! ", - " !! !!!!! !! !!! !!!!! !! !!!!!!! !!!!!!!!! !!! !!! !!!!!! ", - " !! !!!! !! !! !!!!! !! !! !!! !! !! !!! !!!!!! !!! ", - " !! !!!!! !! !! !! !!!!! !!! !!!!! !! !!!!!! !! ", - " !! !!!!!!! !!! !!!!! !! !!!! !!!!!! !! !!!!!!! !! ", - " !!!! !! !! !! !!!!! !!!!!!!! !!! !! !! !!!!!!! !! ", - " !! !!!!!!! !! !!!!!! !!!!! !!!!!! !!! !!!!!!!!!!", - " !! !!!! !! !!! ! !!! !!!! !! !! !!!!!!! !!", - " !! !! !!!! !! !!!!!! !!!! !! !! !!!!!!! !", - " !! !!!!!!! !! !!!! !!!!!!!!!!!!!!! !!!!!!!! !! ", - " !!!! !!!! !! !! !! !!!!!! !! !! !! !!!!!!!!", - " !! !! !!!! !! !!!! !! !! !!!!!!! !!", - " !! !!!! !! !! !! !! !!! !!! !! !! !! !", - " !! !! !!!! !! !! !!!! !!!!!!!! !! !!!!! ", - " !! !! !!!! !! !!!!!!!!!!! !! !! !! !!!", - " !! ! !! !! !! !! !! !!! !! !!!! !!!", - " !! !! !!!! !! !!!!!!!! !! !! !! !!", - " !! !! !!!! !! !!! !!! !! !!!! !!", - " ! !! !!!!! !! !!!! !!! !! !!!!", - " !! !! !!!! !! !!!!!! !!!! !", - " !! !! !!!! !! !! !!!", - " !! !! !!!!! !! !! !! ", - " !! !! !!!! !! !!!! ", - " ! !! !!!!! !! !! ", - " !! !! !!!!! !! ", - " !! !! !!!!!!! ", - " !! !! !!!!! !! ", - " !! !! !!!!! !! ", - " ! !! !!!!!!!! ", - " !! !! !!!!! !! ", - " !! !! !!!!! !! ", - " !! !! !!!!!!!! ", - " !!!!!!!! !! !! !!!!! !! ", - " !!!! !!!!! ! !! !!!!!! !! ", - " !!! !!!! !!!! !! !! !!!!!! ! ", - " !! !!!!!!!! !!!! !! !! ! !!! !! ", - " !! !!! !!!! !!!! !! !! !!!!!! !! ", - " !! !!! !!!!! !!!! !!!! !! !! !!!!!! ! ", - " !! !!! !!! !!!! !!!! !!!! !! !! !! !!!!!! ", - " !! !!! !! !!!!!!!! !!!! !!!! !! !! !!!!!! !! ", - " !! !!! !!!!!!!!!!!!!! !!!! !!! !!!! !! !!!! !! ", - "!! !!! !!!!! !!!!! !!!! !!! !! !! !! ! !!!! ", - "! !!! !!!! !!!!!!! !!!!!! !!! !! !! !! !!!!!! !! ", - " !!! !!! !!!!!!!!!! !!!!!! !! !!! !! !! !!!! !! ", - "!!! !!! !!!! !!! !! !!! !!!!! !! !!!! !!!! ", - "!! !!! !!! !!!!! !! !! !! !! !!!! !! !!!! !! ", - "! !!!! !! !!!!!!!! !! !! ! !! ! !! !! !!!! ! ", - " !!!! !! !!! !!! !! !!!!!! ! !!!! !! ! !! ", + " ", + " ", + " ! ", + " !!!!! !!!!!!! ! !!!!! ", + " !!!!!!!!!!!!!!!!!!! ! ! !!!!!!!! ", + " !!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! ! !! !! !!! ", + " !!!!!!!!! !!!!! !! !!!!!!!! !!! !! !!!!! !!! ", + " !!!!!! ! !!! !!!!! !!!!!!!! !! !!! !! !! ", + " !!!!! !! !!!!!!! !! !!!!!! !! !!!!!!!!! !! ", + " !!!! !!!!!!! !! !! !!!!!!!!!!!!!!!!!! !! ", + " !!!! !! !!!! !! ! !!!!!! !!!!!! ", + " !!!!!!! !! !!! !! !! !!!!!!! !!!!!! ", + " !!!!! !!! ! !!! !!!!! !!!!!!!!!!!!!! !!!!! ", + " !!!! !! !! !! !!! !!!!!!! !!!!!!!! !!!!!!!! !!!!! ", + " !!! ! ! !! !!!!! !!!!!! !! !!!!!! !!!!!!!!!!!!!!!! ", + " !!!! !!! !! !! !! !!! !! !!!!! !!!! !!!!!!!!!!!! ", + " !!! !! !! !! !! !!!!! !!!!! !!!!!!!!!!!!!!!!! !!! ", + " !!! !!!! !!! !!! ! !!!!!! !!!!! !!!!!!!!!! !! ", + " !!! !! !!!!! !! !!! !! !!!!! !!! ! !!!!!!!!!!!! ", + " !!! !!!! !! !! !!!!! !!!!! !! ! !!!!!!!!!!! ", + " !!! !! !! !! !!! !!!! !!!!! !!!!!!!! !!!!!!!!!!! ", + " !!! !! !!!!! !! !!! !!!!! !! !!!!!!!!! !!!!!!! !!! ", + " !! !! ! !!!! !! !!! !!!!! !! !!! !! !! !! !!! !!!!!! ", + " !! ! !!! !!!!! !! !!!! !! !!!!! !!! !!!!! !! !! !!!!!! ", + " !! ! !! !!!!!!! !!!! !!!!! !! !!!! !!!!!! !! !!!!!!! ", + " !! !!!!! !! !! !! !! !!! !!!!! !!!!!!!! !!! !! !! !!!!!!! ", + " !! !!! !!!!!!! !! !!! !!!!!! !!!!! !!!!!! !! ! !!! !!!!!!! ", + " !! !!!! !!!! !! !!! ! ! !!! !!!! !! !! !! !!!!!!! ", + " !! !! ! !! !!!! !! !!! !!!!!! !!!! !! !! !! !!!!!!!! ", + " !! !! !!!!!!! !! !!! !!!! !!!!!!!!!!!!!!! !! !!!!!!!!!!!!", + " !! !! !!!! !! !! !! !! !!!!!! !! !! !! !! !!!!!!!!", + " !! !! !!!! !! !!! !!!! !! !! !!!! !!!!!!!!!!", + " !!! !!!! !! !! !!! !! !! !!! !!!!! !! !! !! !!!!", + " !!! !! !!!! !! !! !! !!!! !!!!!!!! !!! !! !!!!! ", + " !! !! !!!! !! ! !!!!!!!!!!! !! !!! !! !! !!!", + " !! ! !! !! !!! !! !! !!! !! !! !!!! !!!", + " !! !! !!!! !!!! ! !!!!!!!! !! !! !! !! !!", + " !!! !! !!!! !! ! !!! !!! !! !!!! !!", + " !!! !! !!!!! !!! !!!! !!! !! !!!!", + " !! !! !!!! !! ! !!!!!!!! !!!! !", + " !! !! !! !!!! !!! ! ! !!! !! !!!", + " !!! !!! !! !!!!! !!! !!! ! !! !! ", + " !! !!! !! !!!! !! !!!! ", + " !! !!! !! !!!!! !! !! ", + " !! !! !! !!!!! !!! ", + " !! ! !! !!!!!!!!! ", + " !! !!! !! !!!!! !! ", + " !! !! !! !!!!! !! ", + " !! !! !!!!!!!!! ", + " !! !! !!!!! !!!! ", + " !!! !! !! !!!!! !!! ", + " !! ! !! !!!!!!!!!!! ", + " !! !! !!!!! !!!! ", + " !! ! !! !!!!!! !!!! ", + " !! !!! !!!! !! !!!!!! !!!! ", + "!!! !!! !!!!!!!! !! ! !!! !!!! ", + "!! !!! !!! !!!! !! !!!!!! !!!! ", + "! !!!!!! !!!!! !!!! !! !!!!!! !!!! ", + "! !! !!! !!! !!!! !!!! !! !! !!!!!! ! ", + " ! !!!!! !! !!!!!!!! !!!! !! !!!!!! !!!! ", + " !! !!! !!!!!!!!!!!!!! !!!! !! !! !!!! !!!! ", + "!!!!!! !!!!! !!!!! !!!! !! !! ! !!!! ", + " !!!! !!!! !!!!!!! !!!!!! !!! !! !!!!!! !! ", + "!!!! !!! !!!!!!!!!! !!!!!! !! !! !! !!!! !! ", + "!!! !!! !!!! !!! !! !!! !! !! !!!! !!!! ", + "!! !!! !!! !!!!! !! !! !! !! !! !! !!!! !! ", + "! !!!! !! !!!!!!!! !! !! ! !! !! !! !!!! ! ", + " !!!! !! !!! !!! !! !!!!!! !!!! !! ! !! ", "!!!! !! !!! !!! !! !!!!!! !! !! !!!! !! ", "!!! !!! !! !!! !!!!!! !! !!!! !! !!!! ", " !! !! !! !! !!!!!! !!!! !! !!!! !! ", "!! !! !! !! !!!! !!!!! !!!! !! !! ", - "!!!! !!! !! !!!! !! !! !! !!!! ", - " !! !! !! !! !!!!! !!!!! !! !! ", - " ! !! !!!!!!! !!!!!! !!!!! ! ", - " !! !! !!!!! !!!!! !! ", - " ! !! !!!!! !!!!! !! ", - " !! !!!!!!!!!!! !!! ", + "!!!! !!! !! !!!! !! !! !! !!!!!! ", + " !! !! !! !! !!!!! !!!!! !! !!!! ", + " ! !! !!!!!!! !!!!!! !!!!!!! ! ", + " !! !! !!!!! !!!!! !!!! ", + " ! !! !!!!! !!!!! !! ! ", + " !! !!!!!!!!!!! !!!!! ", " !! !!!!!!!!! !!! ", " !! !!! !!! !!! ", - " !! !!!!! !!! ", - " !! !!! ", - " !!!!!!! ", - " !!!! ", - " ", + " !!!! !!!!! !!!!! ", + " !! !! !!! ! ", + " !!!!!!!!!!!! ", + " !!!!!!!! !! ", + " ! !! !! ", " ", " ", " ", diff --git a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-agg-reference.png b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-agg-reference.png index 60f622bab..eeb75b107 100644 Binary files a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-cairo-reference.png b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-cairo-reference.png index 444644bbe..c31bb07ab 100644 Binary files a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-cairo-reference.png and b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-agg-reference.png b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-agg-reference.png index 6857ec0e0..c2cc44615 100644 Binary files a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-cairo-reference.png b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-cairo-reference.png index 623b47bd2..b9b1b9b03 100644 Binary files a/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-cairo-reference.png and b/tests/visual_tests/images/line-pattern-smooth-and-offset-512-512-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml b/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml index efa609fff..7aec8f462 100755 --- a/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml +++ b/tests/visual_tests/styles/line-pattern-smooth-and-offset.xml @@ -3,7 +3,7 @@