diff --git a/.travis.yml b/.travis.yml index c58892b2e..13d22e7f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,4 +52,3 @@ notifications: email: on_success: [never] on_failure: [change] - diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d33e79b6..2f75d920b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ Released ... Summary: TODO +- PostGIS: Added support for rendering 3D and 4D geometries (previously silently skipped) (#44) + +- AGG renderer: fixed geometry offsetting to work after smoothing to produce more consistent results (#2202) + +- AGG renderer: increased `vertex_dist_epsilon` to ensure nearly coincident points are discarded more readily (#2196) + - GDAL plugin: Added back support for user driven `nodata` on rgb(a) images (#2023) - GDAL plugin: Allowed nodata to override alpha band if set on rgba images (#2023) diff --git a/deps/agg/include/agg_math.h b/deps/agg/include/agg_math.h index 2de178bbc..945d1eb27 100644 --- a/deps/agg/include/agg_math.h +++ b/deps/agg/include/agg_math.h @@ -27,7 +27,7 @@ namespace agg //------------------------------------------------------vertex_dist_epsilon // Coinciding points maximal distance (Epsilon) - const double vertex_dist_epsilon = 1e-14; + const double vertex_dist_epsilon = 1e-5; //-----------------------------------------------------intersection_epsilon // See calc_intersection diff --git a/include/mapnik/offset_converter.hpp b/include/mapnik/offset_converter.hpp index 3c2659280..4adba6ac8 100644 --- a/include/mapnik/offset_converter.hpp +++ b/include/mapnik/offset_converter.hpp @@ -46,7 +46,6 @@ template struct MAPNIK_DECL offset_converter { typedef std::size_t size_type; - //typedef typename Geometry::value_type value_type; offset_converter(Geometry & geom) : geom_(geom) @@ -62,10 +61,7 @@ struct MAPNIK_DECL offset_converter enum status { initial, - process, - last_vertex, - angle_joint, - end + process }; double get_offset() const @@ -98,19 +94,27 @@ struct MAPNIK_DECL offset_converter unsigned vertex(double * x, double * y) { if (offset_ == 0.0) + { return geom_.vertex(x, y); + } if (status_ == initial) + { init_vertices(); + } if (pos_ >= vertices_.size()) + { return SEG_END; + } pre_ = (pos_ ? cur_ : pre_first_); - cur_ = vertices_[pos_++]; + cur_ = vertices_.at(pos_++); if (pos_ == vertices_.size()) + { return output_vertex(x, y); + } double const check_dist = offset_ * threshold_; double const check_dist2 = check_dist * check_dist; @@ -127,13 +131,19 @@ struct MAPNIK_DECL offset_converter double const dy = u0.y - cur_.y; if (dx*dx + dy*dy > check_dist2) + { break; + } if (!intersection(pre_, cur_, &vt, u0, u1, &ut)) + { continue; + } if (vt < 0.0 || vt > t || ut < 0.0 || ut > 1.0) + { continue; + } t = vt; pos_ = i+1; @@ -162,11 +172,17 @@ private: static double explement_reflex_angle(double angle) { if (angle > pi) + { return angle - 2 * pi; + } else if (angle < -pi) + { return angle + 2 * pi; + } else + { return angle; + } } static bool intersection(vertex2d const& u1, vertex2d const& u2, double* ut, @@ -186,7 +202,9 @@ private: double const dn = vx * uy - ux * vy; if (dn > -1e-6 && dn < 1e-6) + { return false; // they are parallel + } *vt = up / dn; *ut = (*vt * vx + dx) / ux; @@ -200,7 +218,9 @@ private: double const dn = vy * ux - uy * vx; if (dn > -1e-6 && dn < 1e-6) + { return false; // they are parallel + } *vt = up / dn; *ut = (*vt * vy + dy) / uy; @@ -251,7 +271,9 @@ private: status init_vertices() { if (status_ != initial) // already initialized + { return status_; + } vertex2d v1(vertex2d::no_init); vertex2d v2(vertex2d::no_init); @@ -261,7 +283,9 @@ private: v2.cmd = geom_.vertex(&v2.x, &v2.y); if (v2.cmd == SEG_END) // not enough vertices in source + { return status_ = process; + } double angle_a = 0; double angle_b = std::atan2((v2.y - v1.y), (v2.x - v1.x)); @@ -290,16 +314,24 @@ private: if (offset_ < 0.0) { if (joint_angle > 0.0) + { joint_angle = joint_angle - 2 * pi; + } else - bulge_steps = 1 + int(std::floor(half_turns / pi)); + { + bulge_steps = 1 + static_cast(std::floor(half_turns / pi)); + } } else { if (joint_angle < 0.0) + { joint_angle = joint_angle + 2 * pi; + } else - bulge_steps = 1 + int(floor(half_turns / pi)); + { + bulge_steps = 1 + static_cast(std::floor(half_turns / pi)); + } } #ifdef MAPNIK_LOG @@ -322,7 +354,7 @@ private: displace(w, v1, angle_a); push_vertex(w); - for (int s = 0; ++s < bulge_steps; ) + for (int s = 0; ++s < bulge_steps;) { displace(w, v1, angle_a + (joint_angle * s) / bulge_steps); push_vertex(w); diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp index fb9efe0b4..dbd058b12 100644 --- a/include/mapnik/png_io.hpp +++ b/include/mapnik/png_io.hpp @@ -36,9 +36,6 @@ // boost -// stl -#include - extern "C" { #include @@ -542,11 +539,9 @@ void save_as_png8_oct(T1 & file, std::vector pal; trees[j].setOffset( static_cast(palette.size())); trees[j].create_palette(pal); - assert(pal.size() <= opts.colors); leftovers = cols[j] - static_cast(pal.size()); cols[j] = static_cast(pal.size()); palette.insert(palette.begin(), pal.begin(), pal.end()); - assert(palette.size() <= 256); } } @@ -684,7 +679,6 @@ void save_as_png8_hex(T1 & file, //transparency values per palette index std::vector pal; tree.create_palette(pal); - assert(int(pal.size()) <= opts.colors); std::vector palette; std::vector alphaTable; for(unsigned i=0; i #include #include #include @@ -449,9 +450,9 @@ feature_ptr gdal_featureset::get_feature_at_point(mapnik::coord2d const& pt) { // construct feature feature_ptr feature = feature_factory::create(ctx_,1); - geometry_type * point = new geometry_type(mapnik::geometry_type::types::Point); + std::unique_ptr point = std::make_unique(mapnik::geometry_type::types::Point); point->move_to(pt.x, pt.y); - feature->add_geometry(point); + feature->add_geometry(point.release()); feature->put_new("value",value); if (raster_has_nodata) { diff --git a/plugins/input/occi/occi_featureset.cpp b/plugins/input/occi/occi_featureset.cpp index 2c553786d..33f89e833 100644 --- a/plugins/input/occi/occi_featureset.cpp +++ b/plugins/input/occi/occi_featureset.cpp @@ -259,9 +259,9 @@ void occi_featureset::convert_geometry(SDOGeometry* geom, feature_ptr feature) SDOPointType* sdopoint = geom->getSdo_point(); if (sdopoint && ! sdopoint->isNull()) { - geometry_type* point = new geometry_type(mapnik::geometry_type::types::Point); + std::unique_ptr point = std::make_unique(mapnik::geometry_type::types::Point); point->move_to(sdopoint->getX(), sdopoint->getY()); - feature->add_geometry(point); + feature->add_geometry(point.release()); } } break; diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp index 59c041948..319e02713 100644 --- a/plugins/input/ogr/ogr_datasource.cpp +++ b/plugins/input/ogr/ogr_datasource.cpp @@ -165,8 +165,8 @@ void ogr_datasource::init(mapnik::parameters const& params) int num_layers = dataset_->GetLayerCount(); if (*layer_by_index >= num_layers) { - std::ostringstream s("OGR Plugin: only "); - s << num_layers << " layer(s) exist, cannot find layer by index '" << *layer_by_index << "'"; + std::ostringstream s; + s << "OGR Plugin: only " << num_layers << " layer(s) exist, cannot find layer by index '" << *layer_by_index << "'"; throw datasource_exception(s.str()); } @@ -214,7 +214,8 @@ void ogr_datasource::init(mapnik::parameters const& params) if (! layer_.is_valid()) { - std::ostringstream s("OGR Plugin: "); + std::ostringstream s; + s << "OGR Plugin: "; if (layer_by_name) { @@ -452,8 +453,8 @@ void validate_attribute_names(query const& q, std::vector if (! found_name) { - std::ostringstream s("OGR Plugin: no attribute '"); - s << *pos << "'. Valid attributes are: "; + std::ostringstream s; + s << "OGR Plugin: no attribute named '" << *pos << "'. Valid attributes are: "; std::vector::const_iterator e_itr = names.begin(); std::vector::const_iterator e_end = names.end(); for ( ;e_itr!=e_end;++e_itr) diff --git a/plugins/input/osm/build.py b/plugins/input/osm/build.py index 2dc7bb0f8..d82e8e1d5 100644 --- a/plugins/input/osm/build.py +++ b/plugins/input/osm/build.py @@ -21,6 +21,7 @@ Import ('plugin_base') Import ('env') +from copy import copy PLUGIN_NAME = 'osm' @@ -37,9 +38,24 @@ plugin_sources = Split( """ % locals() ) +plugin_env['LIBS'] = [] +if env['RUNTIME_LINK'] == 'static': + # pkg-config is more reliable than pg_config across platforms + cmd = 'pkg-config libcurl --libs --static' + try: + plugin_env.ParseConfig(cmd) + except OSError, e: + # if this fails likely only system curl is available + # on OS X at least the system curl lacks a pkg-config file + # so static linking is not viable anyway + plugin_env.Append(LIBS='curl') +else: + plugin_env.Append(LIBS='curl') + +plugin_env.Append(LIBS='xml2') + # Link Library to Dependencies -libraries = [ 'xml2' ] -libraries.append('curl') +libraries = copy(plugin_env['LIBS']) libraries.append(env['ICU_LIB_NAME']) libraries.append('boost_system%s' % env['BOOST_APPEND']) diff --git a/plugins/input/osm/osm_featureset.cpp b/plugins/input/osm/osm_featureset.cpp index c5d400a8b..b6f68af39 100644 --- a/plugins/input/osm/osm_featureset.cpp +++ b/plugins/input/osm/osm_featureset.cpp @@ -22,6 +22,7 @@ *****************************************************************************/ // mapnik +#include #include #include #include @@ -64,9 +65,9 @@ feature_ptr osm_featureset::next() feature = feature_factory::create(ctx_, cur_item->id); double lat = static_cast(cur_item)->lat; double lon = static_cast(cur_item)->lon; - geometry_type* point = new geometry_type(mapnik::geometry_type::types::Point); + std::unique_ptr point = std::make_unique(mapnik::geometry_type::types::Point); point->move_to(lon, lat); - feature->add_geometry(point); + feature->add_geometry(point.release()); } else if (dataset_->current_item_is_way()) { @@ -82,15 +83,12 @@ feature_ptr osm_featureset::next() if (!cur_item) return feature_ptr(); feature = feature_factory::create(ctx_, cur_item->id); - geometry_type* geom; + mapnik::geometry_type::types geom_type = mapnik::geometry_type::types::LineString; if (static_cast(cur_item)->is_polygon()) { - geom = new geometry_type(mapnik::geometry_type::types::Polygon); - } - else - { - geom = new geometry_type(mapnik::geometry_type::types::LineString); + geom_type = mapnik::geometry_type::types::Polygon; } + std::unique_ptr geom = std::make_unique(geom_type); geom->move_to(static_cast(cur_item)->nodes[0]->lon, static_cast(cur_item)->nodes[0]->lat); @@ -102,7 +100,7 @@ feature_ptr osm_featureset::next() geom->line_to(static_cast(cur_item)->nodes[count]->lon, static_cast(cur_item)->nodes[count]->lat); } - feature->add_geometry(geom); + feature->add_geometry(geom.release()); } else { diff --git a/plugins/input/postgis/build.py b/plugins/input/postgis/build.py index 3cafa1bad..4a011681f 100644 --- a/plugins/input/postgis/build.py +++ b/plugins/input/postgis/build.py @@ -34,23 +34,21 @@ plugin_sources = Split( """ % locals() ) -# Link Library to Dependencies +cxxflags = [] plugin_env['LIBS'] = [] -libraries = ['pq'] - -#if env['THREADING'] == 'multi': -# libraries.append('boost_thread%s' % env['BOOST_APPEND']) if env['RUNTIME_LINK'] == 'static': - # pg_config does not seem to report correct deps of libpq - # on os x so resort to hardcoding for now - if env['PLATFORM'] == 'Darwin': - libraries.extend(['ldap', 'pam', 'ssl', 'crypto', 'krb5']) - else: - # TODO - parse back into libraries variable - plugin_env.ParseConfig('pg_config --libs') - if plugin_env['LIBS']: - libraries.extend(copy(plugin_env['LIBS'])) + # pkg-config is more reliable than pg_config across platforms + cmd = 'pkg-config libpq --libs --static' + try: + plugin_env.ParseConfig(cmd) + except OSError, e: + plugin_env.Append(LIBS='pq') +else: + plugin_env.Append(LIBS='pq') + +# Link Library to Dependencies +libraries = copy(plugin_env['LIBS']) if env['PLUGIN_LINKING'] == 'shared': libraries.insert(0,'mapnik') diff --git a/plugins/input/postgis/connection.hpp b/plugins/input/postgis/connection.hpp index 14ae9cac7..492dac30c 100644 --- a/plugins/input/postgis/connection.hpp +++ b/plugins/input/postgis/connection.hpp @@ -77,32 +77,38 @@ public: } } - bool execute(std::string const& sql) const + bool execute(std::string const& sql) { #ifdef MAPNIK_STATS mapnik::progress_timer __stats__(std::clog, std::string("postgis_connection::execute ") + sql); #endif - PGresult *result = PQexec(conn_, sql.c_str()); + if ( ! executeAsyncQuery(sql) ) return false; + PGresult *result = 0; + // fetch multiple times until NULL is returned, + // to handle multi-statement queries + while ( PGresult *tmp = getResult() ) { + if ( result ) PQclear(result); + result = tmp; + } bool ok = (result && (PQresultStatus(result) == PGRES_COMMAND_OK)); if ( result ) PQclear(result); return ok; } - std::shared_ptr executeQuery(std::string const& sql, int type = 0) const + std::shared_ptr executeQuery(std::string const& sql, int type = 0) { #ifdef MAPNIK_STATS mapnik::progress_timer __stats__(std::clog, std::string("postgis_connection::execute_query ") + sql); #endif - PGresult* result = 0; - if (type == 1) - { - result = PQexecParams(conn_,sql.c_str(), 0, 0, 0, 0, 0, 1); - } - else - { - result = PQexec(conn_, sql.c_str()); + if ( executeAsyncQuery(sql, type) ) { + // fetch multiple times until NULL is returned, + // to handle multi-statement queries + while ( PGresult *tmp = getResult() ) { + if ( result ) PQclear(result); + result = tmp; + } } if (! result || (PQresultStatus(result) != PGRES_TUPLES_OK)) @@ -112,10 +118,7 @@ public: err_msg += "\nin executeQuery Full sql was: '"; err_msg += sql; err_msg += "'\n"; - if (result) - { - PQclear(result); - } + if ( result ) PQclear(result); throw mapnik::datasource_exception(err_msg); } @@ -163,10 +166,15 @@ public: return result; } + PGresult* getResult() + { + PGresult *result = PQgetResult(conn_); + return result; + } std::shared_ptr getNextAsyncResult() { - PGresult *result = PQgetResult(conn_); + PGresult *result = getResult(); if( result && (PQresultStatus(result) != PGRES_TUPLES_OK)) { std::string err_msg = "Postgis Plugin: "; @@ -183,7 +191,7 @@ public: std::shared_ptr getAsyncResult() { - PGresult *result = PQgetResult(conn_); + PGresult *result = getResult(); if ( !result || (PQresultStatus(result) != PGRES_TUPLES_OK)) { std::string err_msg = "Postgis Plugin: "; diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp index 429a1df1b..a3086aa5f 100644 --- a/plugins/input/postgis/postgis_datasource.cpp +++ b/plugins/input/postgis/postgis_datasource.cpp @@ -1026,8 +1026,7 @@ boost::optional postgis_datasource::get_geometry } else // geometry { - result.reset(mapnik::datasource::Collection); - return result; + g_type = ""; } } } diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp index 4ded6a975..c3de10d90 100644 --- a/src/agg/agg_renderer.cpp +++ b/src/agg/agg_renderer.cpp @@ -241,7 +241,7 @@ void agg_renderer::start_style_processing(feature_type_style const& st) { int radius = 0; mapnik::filter::filter_radius_visitor visitor(radius); - for(mapnik::filter::filter_type const& filter_tag : st.image_filters()) + for (mapnik::filter::filter_type const& filter_tag : st.image_filters()) { boost::apply_visitor(visitor, filter_tag); } diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp index d650069c4..1a11e56f8 100644 --- a/src/agg/process_line_symbolizer.cpp +++ b/src/agg/process_line_symbolizer.cpp @@ -82,8 +82,10 @@ void agg_renderer::process(line_symbolizer const& sym, typedef agg::pixfmt_custom_blend_rgba pixfmt_comp_type; typedef agg::renderer_base renderer_base; typedef boost::mpl::vector conv_types; + affine_transform_tag, + simplify_tag, smooth_tag, + offset_transform_tag, + dash_tag, stroke_tag> conv_types; pixfmt_comp_type pixf(buf); pixf.comp_op(static_cast(sym.comp_op())); diff --git a/src/build.py b/src/build.py index 620bcccf9..4bdb39f62 100644 --- a/src/build.py +++ b/src/build.py @@ -59,7 +59,8 @@ system = 'boost_system%s' % env['BOOST_APPEND'] # clear out and re-set libs for this env # note: order matters on linux: see lorder | tsort -lib_env['LIBS'] = [filesystem,regex] +lib_env['LIBS'] = [filesystem, + regex] if env['HAS_CAIRO']: lib_env.Append(LIBS=env['CAIRO_ALL_LIBS']) diff --git a/src/cairo_context.cpp b/src/cairo_context.cpp index f6d21d061..784159d39 100644 --- a/src/cairo_context.cpp +++ b/src/cairo_context.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(HAVE_CAIRO) + #include #include #include @@ -480,3 +482,4 @@ void cairo_context::add_text(glyph_positions_ptr pos, } } //ns mapnik +#endif diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 422ff9fce..b49053071 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -450,8 +450,10 @@ void cairo_renderer_base::process(line_symbolizer const& sym, proj_transform const& prj_trans) { typedef boost::mpl::vector conv_types; + affine_transform_tag, + simplify_tag, smooth_tag, + offset_transform_tag, + dash_tag, stroke_tag> conv_types; cairo_save_restore guard(context_); mapnik::stroke const& stroke_ = sym.get_stroke(); context_.set_operator(sym.comp_op()); diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp index d43bd8caa..a8d818bbd 100644 --- a/src/grid/grid.cpp +++ b/src/grid/grid.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -146,3 +148,5 @@ void hit_grid::add_feature(mapnik::feature_impl & feature) template class hit_grid; } + +#endif diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp index 52a86c7b0..061c9e7db 100644 --- a/src/grid/grid_renderer.cpp +++ b/src/grid/grid_renderer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -212,3 +214,5 @@ void grid_renderer::render_marker(mapnik::feature_impl & feature, unsigned in template class grid_renderer; } + +#endif diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp index b7d2ce44d..9222b3588 100644 --- a/src/grid/process_building_symbolizer.cpp +++ b/src/grid/process_building_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -165,3 +167,5 @@ template void grid_renderer::process(building_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_line_pattern_symbolizer.cpp b/src/grid/process_line_pattern_symbolizer.cpp index 890ad9900..573277993 100644 --- a/src/grid/process_line_pattern_symbolizer.cpp +++ b/src/grid/process_line_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -136,3 +138,6 @@ template void grid_renderer::process(line_pattern_symbolizer const&, proj_transform const&); } + +#endif + diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp index 088f689b6..b4aecdeca 100644 --- a/src/grid/process_line_symbolizer.cpp +++ b/src/grid/process_line_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -120,3 +122,5 @@ template void grid_renderer::process(line_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp index a21ac7079..51a128add 100644 --- a/src/grid/process_markers_symbolizer.cpp +++ b/src/grid/process_markers_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + /* porting notes --> @@ -257,3 +259,5 @@ template void grid_renderer::process(markers_symbolizer const&, mapnik::feature_impl &, proj_transform const&); } + +#endif diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp index 17d759c12..2d5700b44 100644 --- a/src/grid/process_point_symbolizer.cpp +++ b/src/grid/process_point_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -119,3 +121,5 @@ template void grid_renderer::process(point_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_polygon_pattern_symbolizer.cpp b/src/grid/process_polygon_pattern_symbolizer.cpp index 089656587..0c549e02c 100644 --- a/src/grid/process_polygon_pattern_symbolizer.cpp +++ b/src/grid/process_polygon_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // boost @@ -114,3 +116,6 @@ template void grid_renderer::process(polygon_pattern_symbolizer const&, proj_transform const&); } + +#endif + diff --git a/src/grid/process_polygon_symbolizer.cpp b/src/grid/process_polygon_symbolizer.cpp index 98402116e..2388ad315 100644 --- a/src/grid/process_polygon_symbolizer.cpp +++ b/src/grid/process_polygon_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // boost @@ -99,3 +101,5 @@ template void grid_renderer::process(polygon_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_raster_symbolizer.cpp b/src/grid/process_raster_symbolizer.cpp index da923d9e9..9bc262f58 100644 --- a/src/grid/process_raster_symbolizer.cpp +++ b/src/grid/process_raster_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -41,3 +43,5 @@ template void grid_renderer::process(raster_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp index c88b80ee1..6813a0595 100644 --- a/src/grid/process_shield_symbolizer.cpp +++ b/src/grid/process_shield_symbolizer.cpp @@ -21,6 +21,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -65,3 +67,5 @@ template void grid_renderer::process(shield_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp index 1d3c4fdc7..cfbd227a6 100644 --- a/src/grid/process_text_symbolizer.cpp +++ b/src/grid/process_text_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -55,3 +57,6 @@ template void grid_renderer::process(text_symbolizer const&, proj_transform const&); } + +#endif + diff --git a/src/svg/output/process_building_symbolizer.cpp b/src/svg/output/process_building_symbolizer.cpp index 23f602b17..c0ff9f423 100644 --- a/src/svg/output/process_building_symbolizer.cpp +++ b/src/svg/output/process_building_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(building_symbo mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_line_pattern_symbolizer.cpp b/src/svg/output/process_line_pattern_symbolizer.cpp index 42156c1d2..e41c996d8 100644 --- a/src/svg/output/process_line_pattern_symbolizer.cpp +++ b/src/svg/output/process_line_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(line_pattern_s mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_line_symbolizer.cpp b/src/svg/output/process_line_symbolizer.cpp index 6f2008408..c912def11 100644 --- a/src/svg/output/process_line_symbolizer.cpp +++ b/src/svg/output/process_line_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -46,3 +48,6 @@ template void svg_renderer >::process(line_symbolize mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif + diff --git a/src/svg/output/process_markers_symbolizer.cpp b/src/svg/output/process_markers_symbolizer.cpp index 67c1fe5ed..7f97c52e0 100644 --- a/src/svg/output/process_markers_symbolizer.cpp +++ b/src/svg/output/process_markers_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(markers_symbol mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_point_symbolizer.cpp b/src/svg/output/process_point_symbolizer.cpp index b737bf37e..bde46cdd7 100644 --- a/src/svg/output/process_point_symbolizer.cpp +++ b/src/svg/output/process_point_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(point_symboliz mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_polygon_pattern_symbolizer.cpp b/src/svg/output/process_polygon_pattern_symbolizer.cpp index f164044a9..c64a07b7d 100644 --- a/src/svg/output/process_polygon_pattern_symbolizer.cpp +++ b/src/svg/output/process_polygon_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(polygon_patter mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_polygon_symbolizer.cpp b/src/svg/output/process_polygon_symbolizer.cpp index 43ca9bdf8..6ef961c70 100644 --- a/src/svg/output/process_polygon_symbolizer.cpp +++ b/src/svg/output/process_polygon_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -41,3 +43,5 @@ template void svg_renderer >::process(polygon_symbol mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_raster_symbolizer.cpp b/src/svg/output/process_raster_symbolizer.cpp index a659fe58f..b325a8223 100644 --- a/src/svg/output/process_raster_symbolizer.cpp +++ b/src/svg/output/process_raster_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(raster_symboli mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_shield_symbolizer.cpp b/src/svg/output/process_shield_symbolizer.cpp index 1fa981db6..db633d9e6 100644 --- a/src/svg/output/process_shield_symbolizer.cpp +++ b/src/svg/output/process_shield_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(shield_symboli mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp index 10de95982..dfeec037e 100644 --- a/src/svg/output/process_symbolizers.cpp +++ b/src/svg/output/process_symbolizers.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -92,3 +94,6 @@ template bool svg_renderer >::process(rule::symboliz proj_transform const& prj_trans); } + +#endif + diff --git a/src/svg/output/process_text_symbolizer.cpp b/src/svg/output/process_text_symbolizer.cpp index 45bc8bf3b..b21f24df1 100644 --- a/src/svg/output/process_text_symbolizer.cpp +++ b/src/svg/output/process_text_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(text_symbolize mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/svg_generator.cpp b/src/svg/output/svg_generator.cpp index 712d08aa8..f25f56a75 100644 --- a/src/svg/output/svg_generator.cpp +++ b/src/svg/output/svg_generator.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include #include @@ -109,3 +111,6 @@ namespace mapnik { namespace svg { template class svg_generator >; }} + +#endif + diff --git a/src/svg/output/svg_output_attributes.cpp b/src/svg/output/svg_output_attributes.cpp index 544b280ad..972fbb766 100644 --- a/src/svg/output/svg_output_attributes.cpp +++ b/src/svg/output/svg_output_attributes.cpp @@ -21,6 +21,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -288,3 +290,6 @@ namespace mapnik { namespace svg { svg_namespace_url_ = SVG_NAMESPACE_URL; } }} + +#endif + diff --git a/src/svg/output/svg_renderer.cpp b/src/svg/output/svg_renderer.cpp index b92347c25..69fd1ca83 100644 --- a/src/svg/output/svg_renderer.cpp +++ b/src/svg/output/svg_renderer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include #include @@ -117,3 +119,5 @@ void svg_renderer::end_layer_processing(layer const& lay) template class svg_renderer >; } + +#endif diff --git a/src/wkb.cpp b/src/wkb.cpp index a28dfd833..039a31f40 100644 --- a/src/wkb.cpp +++ b/src/wkb.cpp @@ -63,14 +63,31 @@ public: wkbMultiLineString=5, wkbMultiPolygon=6, wkbGeometryCollection=7, + // Z wkbPointZ=1001, wkbLineStringZ=1002, wkbPolygonZ=1003, wkbMultiPointZ=1004, wkbMultiLineStringZ=1005, wkbMultiPolygonZ=1006, - wkbGeometryCollectionZ=1007 - }; + wkbGeometryCollectionZ=1007, + // M + wkbPointM=2001, + wkbLineStringM=2002, + wkbPolygonM=2003, + wkbMultiPointM=2004, + wkbMultiLineStringM=2005, + wkbMultiPolygonM=2006, + wkbGeometryCollectionM=2007, + // ZM + wkbPointZM=3001, + wkbLineStringZM=3002, + wkbPolygonZM=3003, + wkbMultiPointZM=3004, + wkbMultiLineStringZM=3005, + wkbMultiPolygonZM=3006, + wkbGeometryCollectionZM=3007 + }; wkb_reader(const char* wkb, std::size_t size, wkbFormat format) : wkb_(wkb), @@ -143,24 +160,50 @@ public: read_collection(paths); break; case wkbPointZ: + case wkbPointM: read_point_xyz(paths); break; + case wkbPointZM: + read_point_xyzm(paths); + break; case wkbLineStringZ: + case wkbLineStringM: read_linestring_xyz(paths); break; + case wkbLineStringZM: + read_linestring_xyzm(paths); + break; case wkbPolygonZ: + case wkbPolygonM: read_polygon_xyz(paths); break; + case wkbPolygonZM: + read_polygon_xyzm(paths); + break; case wkbMultiPointZ: + case wkbMultiPointM: read_multipoint_xyz(paths); break; + case wkbMultiPointZM: + read_multipoint_xyzm(paths); + break; case wkbMultiLineStringZ: + case wkbMultiLineStringM: read_multilinestring_xyz(paths); break; + case wkbMultiLineStringZM: + read_multilinestring_xyzm(paths); + break; case wkbMultiPolygonZ: + case wkbMultiPolygonM: read_multipolygon_xyz(paths); break; + case wkbMultiPolygonZM: + read_multipolygon_xyzm(paths); + break; case wkbGeometryCollectionZ: + case wkbGeometryCollectionM: + case wkbGeometryCollectionZM: read_collection(paths); break; default: @@ -246,6 +289,27 @@ private: } } + void read_coords_xyzm(CoordinateArray& ar) + { + if (! needSwap_) + { + for (unsigned i = 0; i < ar.size(); ++i) + { + read_double_ndr(wkb_ + pos_, ar[i].x); + read_double_ndr(wkb_ + pos_ + 8, ar[i].y); + pos_ += 32; // skip XYZM + } + } + else + { + for (unsigned i = 0; i < ar.size(); ++i) + { + read_double_xdr(wkb_ + pos_, ar[i].x); + read_double_xdr(wkb_ + pos_ + 8, ar[i].y); + pos_ += 32; // skip XYZM + } + } + } void read_point(boost::ptr_vector & paths) { @@ -276,6 +340,16 @@ private: paths.push_back(pt.release()); } + void read_point_xyzm(boost::ptr_vector & paths) + { + double x = read_double(); + double y = read_double(); + std::auto_ptr pt(new geometry_type(geometry_type::types::Point)); + pos_ += 16; + pt->move_to(x, y); + paths.push_back(pt); + } + void read_multipoint_xyz(boost::ptr_vector & paths) { int num_points = read_integer(); @@ -286,6 +360,16 @@ private: } } + void read_multipoint_xyzm(boost::ptr_vector & paths) + { + int num_points = read_integer(); + for (int i = 0; i < num_points; ++i) + { + pos_ += 5; + read_point_xyzm(paths); + } + } + void read_linestring(boost::ptr_vector & paths) { int num_points = read_integer(); @@ -330,6 +414,23 @@ private: } } + void read_linestring_xyzm(boost::ptr_vector & paths) + { + int num_points = read_integer(); + if (num_points > 0) + { + CoordinateArray ar(num_points); + read_coords_xyzm(ar); + std::auto_ptr line(new geometry_type(geometry_type::types::LineString)); + line->move_to(ar[0].x, ar[0].y); + for (int i = 1; i < num_points; ++i) + { + line->line_to(ar[i].x, ar[i].y); + } + paths.push_back(line); + } + } + void read_multilinestring_xyz(boost::ptr_vector & paths) { int num_lines = read_integer(); @@ -340,6 +441,15 @@ private: } } + void read_multilinestring_xyzm(boost::ptr_vector & paths) + { + int num_lines = read_integer(); + for (int i = 0; i < num_lines; ++i) + { + pos_ += 5; + read_linestring_xyzm(paths); + } + } void read_polygon(boost::ptr_vector & paths) { @@ -403,6 +513,32 @@ private: } } + void read_polygon_xyzm(boost::ptr_vector & paths) + { + int num_rings = read_integer(); + if (num_rings > 0) + { + std::auto_ptr poly(new geometry_type(geometry_type::types::Polygon)); + for (int i = 0; i < num_rings; ++i) + { + int num_points = read_integer(); + if (num_points > 0) + { + CoordinateArray ar(num_points); + read_coords_xyzm(ar); + poly->move_to(ar[0].x, ar[0].y); + for (int j = 1; j < num_points; ++j) + { + poly->line_to(ar[j].x, ar[j].y); + } + poly->close_path(); + } + } + if (poly->size() > 2) // ignore if polygon has less than 3 vertices + paths.push_back(poly); + } + } + void read_multipolygon_xyz(boost::ptr_vector & paths) { int num_polys = read_integer(); @@ -413,6 +549,16 @@ private: } } + void read_multipolygon_xyzm(boost::ptr_vector & paths) + { + int num_polys = read_integer(); + for (int i = 0; i < num_polys; ++i) + { + pos_ += 5; + read_polygon_xyzm(paths); + } + } + void read_collection(boost::ptr_vector & paths) { int num_geometries = read_integer(); diff --git a/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png b/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png index 6a8094948..26da9fad9 100644 Binary files a/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png and b/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png differ diff --git a/tests/python_tests/postgis_test.py b/tests/python_tests/postgis_test.py index 256801c3e..d90bcb714 100644 --- a/tests/python_tests/postgis_test.py +++ b/tests/python_tests/postgis_test.py @@ -164,6 +164,34 @@ INSERT INTO test11(label,geom) values ('label_7',GeomFromEWKT('SRID=4326;MULTIPO INSERT INTO test11(label,geom) values ('label_8',GeomFromEWKT('SRID=4326;GEOMETRYCOLLECTION(POLYGON((1 1, 2 1, 2 2, 1 2,1 1)),POINT(2 3),LINESTRING(2 3,3 4))')); """ +insert_table_12 = """ +CREATE TABLE test12(gid serial PRIMARY KEY, name varchar(40), geom geometry); +INSERT INTO test12(name,geom) values ('Point',GeomFromEWKT('SRID=4326;POINT(0 0)')); +INSERT INTO test12(name,geom) values ('PointZ',GeomFromEWKT('SRID=4326;POINTZ(0 0 0)')); +INSERT INTO test12(name,geom) values ('PointM',GeomFromEWKT('SRID=4326;POINTM(0 0 0)')); +INSERT INTO test12(name,geom) values ('PointZM',GeomFromEWKT('SRID=4326;POINTZM(0 0 0 0)')); +INSERT INTO test12(name,geom) values ('MultiPoint',GeomFromEWKT('SRID=4326;MULTIPOINT(0 0, 1 1)')); +INSERT INTO test12(name,geom) values ('MultiPointZ',GeomFromEWKT('SRID=4326;MULTIPOINTZ(0 0 0, 1 1 1)')); +INSERT INTO test12(name,geom) values ('MultiPointM',GeomFromEWKT('SRID=4326;MULTIPOINTM(0 0 0, 1 1 1)')); +INSERT INTO test12(name,geom) values ('MultiPointZM',GeomFromEWKT('SRID=4326;MULTIPOINTZM(0 0 0 0, 1 1 1 1)')); +INSERT INTO test12(name,geom) values ('LineString',GeomFromEWKT('SRID=4326;LINESTRING(0 0, 1 1)')); +INSERT INTO test12(name,geom) values ('LineStringZ',GeomFromEWKT('SRID=4326;LINESTRINGZ(0 0 0, 1 1 1)')); +INSERT INTO test12(name,geom) values ('LineStringM',GeomFromEWKT('SRID=4326;LINESTRINGM(0 0 0, 1 1 1)')); +INSERT INTO test12(name,geom) values ('LineStringZM',GeomFromEWKT('SRID=4326;LINESTRINGZM(0 0 0 0, 1 1 1 1)')); +INSERT INTO test12(name,geom) values ('Polygon',GeomFromEWKT('SRID=4326;POLYGON((0 0, 1 1, 2 2, 0 0))')); +INSERT INTO test12(name,geom) values ('PolygonZ',GeomFromEWKT('SRID=4326;POLYGONZ((0 0 0, 1 1 1, 2 2 2, 0 0 0))')); +INSERT INTO test12(name,geom) values ('PolygonM',GeomFromEWKT('SRID=4326;POLYGONZ((0 0 0, 1 1 1, 2 2 2, 0 0 0))')); +INSERT INTO test12(name,geom) values ('PolygonZM',GeomFromEWKT('SRID=4326;POLYGONZM((0 0 0 0, 1 1 1 1, 2 2 2 2, 0 0 0 0))')); +INSERT INTO test12(name,geom) values ('MultiLineString',GeomFromEWKT('SRID=4326;MULTILINESTRING((0 0, 1 1),(2 2, 3 3))')); +INSERT INTO test12(name,geom) values ('MultiLineStringZ',GeomFromEWKT('SRID=4326;MULTILINESTRINGZ((0 0 0, 1 1 1),(2 2 2, 3 3 3))')); +INSERT INTO test12(name,geom) values ('MultiLineStringM',GeomFromEWKT('SRID=4326;MULTILINESTRINGM((0 0 0, 1 1 1),(2 2 2, 3 3 3))')); +INSERT INTO test12(name,geom) values ('MultiLineStringZM',GeomFromEWKT('SRID=4326;MULTILINESTRINGZM((0 0 0 0, 1 1 1 1),(2 2 2 2, 3 3 3 3))')); +INSERT INTO test12(name,geom) values ('MultiPolygon',GeomFromEWKT('SRID=4326;MULTIPOLYGON(((0 0, 1 1, 2 2, 0 0)),((0 0, 1 1, 2 2, 0 0)))')); +INSERT INTO test12(name,geom) values ('MultiPolygonZ',GeomFromEWKT('SRID=4326;MULTIPOLYGONZ(((0 0 0, 1 1 1, 2 2 2, 0 0 0)),((0 0 0, 1 1 1, 2 2 2, 0 0 0)))')); +INSERT INTO test12(name,geom) values ('MultiPolygonM',GeomFromEWKT('SRID=4326;MULTIPOLYGONM(((0 0 0, 1 1 1, 2 2 2, 0 0 0)),((0 0 0, 1 1 1, 2 2 2, 0 0 0)))')); +INSERT INTO test12(name,geom) values ('MultiPolygonZM',GeomFromEWKT('SRID=4326;MULTIPOLYGONZM(((0 0 0 0, 1 1 1 1, 2 2 2 2, 0 0 0 0)),((0 0 0 0, 1 1 1 1, 2 2 2 2, 0 0 0 0)))')); +""" + def postgis_setup(): call('dropdb %s' % MAPNIK_TEST_DBNAME,silent=True) @@ -182,6 +210,7 @@ def postgis_setup(): call('''psql -q %s -c "%s"''' % (MAPNIK_TEST_DBNAME,insert_table_9),silent=False) call('''psql -q %s -c "%s"''' % (MAPNIK_TEST_DBNAME,insert_table_10),silent=False) call('''psql -q %s -c "%s"''' % (MAPNIK_TEST_DBNAME,insert_table_11),silent=False) + call('''psql -q %s -c "%s"''' % (MAPNIK_TEST_DBNAME,insert_table_12),silent=False) def postgis_takedown(): pass @@ -757,6 +786,231 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \ # This used to raise an exception before correction of issue 2042 mapnik.render_to_file(map2,'world2.png', 'png') + def test_handling_of_zm_dimensions(): + ds = mapnik.PostGIS(dbname=MAPNIK_TEST_DBNAME, + table='(select gid,ST_CoordDim(geom) as dim,name,geom from test12) as tmp', + geometry_field='geom') + eq_(len(ds.fields()),3) + eq_(ds.fields(),['gid', 'dim', 'name']) + eq_(ds.field_types(),['int', 'int', 'str']) + fs = ds.featureset() + # Point (2d) + feat = fs.next() + eq_(feat.id(),1) + eq_(feat['gid'],1) + eq_(feat['dim'],2) + eq_(feat['name'],'Point') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Point(0 0)') + # PointZ + feat = fs.next() + eq_(feat.id(),2) + eq_(feat['gid'],2) + eq_(feat['dim'],3) + eq_(feat['name'],'PointZ') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Point(0 0)') + # PointM + feat = fs.next() + eq_(feat.id(),3) + eq_(feat['gid'],3) + eq_(feat['dim'],3) + eq_(feat['name'],'PointM') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Point(0 0)') + # PointZM + feat = fs.next() + eq_(feat.id(),4) + eq_(feat['gid'],4) + eq_(feat['dim'],4) + eq_(feat['name'],'PointZM') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Point(0 0)') + # MultiPoint + feat = fs.next() + eq_(feat.id(),5) + eq_(feat['gid'],5) + eq_(feat['dim'],2) + eq_(feat['name'],'MultiPoint') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Point(0 0)') + eq_(geoms[1].to_wkt(),'Point(1 1)') + # MultiPointZ + feat = fs.next() + eq_(feat.id(),6) + eq_(feat['gid'],6) + eq_(feat['dim'],3) + eq_(feat['name'],'MultiPointZ') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Point(0 0)') + eq_(geoms[1].to_wkt(),'Point(1 1)') + # MultiPointM + feat = fs.next() + eq_(feat.id(),7) + eq_(feat['gid'],7) + eq_(feat['dim'],3) + eq_(feat['name'],'MultiPointM') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Point(0 0)') + eq_(geoms[1].to_wkt(),'Point(1 1)') + # MultiPointZM + feat = fs.next() + eq_(feat.id(),8) + eq_(feat['gid'],8) + eq_(feat['dim'],4) + eq_(feat['name'],'MultiPointZM') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Point(0 0)') + eq_(geoms[1].to_wkt(),'Point(1 1)') + # LineString + feat = fs.next() + eq_(feat.id(),9) + eq_(feat['gid'],9) + eq_(feat['dim'],2) + eq_(feat['name'],'LineString') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + # LineStringZ + feat = fs.next() + eq_(feat.id(),10) + eq_(feat['gid'],10) + eq_(feat['dim'],3) + eq_(feat['name'],'LineStringZ') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + # LineStringM + feat = fs.next() + eq_(feat.id(),11) + eq_(feat['gid'],11) + eq_(feat['dim'],3) + eq_(feat['name'],'LineStringM') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + # LineStringZM + feat = fs.next() + eq_(feat.id(),12) + eq_(feat['gid'],12) + eq_(feat['dim'],4) + eq_(feat['name'],'LineStringZM') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + # Polygon + feat = fs.next() + eq_(feat.id(),13) + eq_(feat['gid'],13) + eq_(feat['name'],'Polygon') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # PolygonZ + feat = fs.next() + eq_(feat.id(),14) + eq_(feat['gid'],14) + eq_(feat['name'],'PolygonZ') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # PolygonM + feat = fs.next() + eq_(feat.id(),15) + eq_(feat['gid'],15) + eq_(feat['name'],'PolygonM') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # PolygonZM + feat = fs.next() + eq_(feat.id(),16) + eq_(feat['gid'],16) + eq_(feat['name'],'PolygonZM') + geoms = feat.geometries() + eq_(len(geoms),1) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # MultiLineString + feat = fs.next() + eq_(feat.id(),17) + eq_(feat['gid'],17) + eq_(feat['name'],'MultiLineString') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + eq_(geoms[1].to_wkt(),'LineString(2 2,3 3)') + # MultiLineStringZ + feat = fs.next() + eq_(feat.id(),18) + eq_(feat['gid'],18) + eq_(feat['name'],'MultiLineStringZ') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + eq_(geoms[1].to_wkt(),'LineString(2 2,3 3)') + # MultiLineStringM + feat = fs.next() + eq_(feat.id(),19) + eq_(feat['gid'],19) + eq_(feat['name'],'MultiLineStringM') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + eq_(geoms[1].to_wkt(),'LineString(2 2,3 3)') + # MultiLineStringZM + feat = fs.next() + eq_(feat.id(),20) + eq_(feat['gid'],20) + eq_(feat['name'],'MultiLineStringZM') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'LineString(0 0,1 1)') + eq_(geoms[1].to_wkt(),'LineString(2 2,3 3)') + # MultiPolygon + feat = fs.next() + eq_(feat.id(),21) + eq_(feat['gid'],21) + eq_(feat['name'],'MultiPolygon') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + eq_(geoms[1].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # MultiPolygonZ + feat = fs.next() + eq_(feat.id(),22) + eq_(feat['gid'],22) + eq_(feat['name'],'MultiPolygonZ') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + eq_(geoms[1].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # MultiPolygonM + feat = fs.next() + eq_(feat.id(),23) + eq_(feat['gid'],23) + eq_(feat['name'],'MultiPolygonM') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + eq_(geoms[1].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + # MultiPolygonZM + feat = fs.next() + eq_(feat.id(),24) + eq_(feat['gid'],24) + eq_(feat['name'],'MultiPolygonZM') + geoms = feat.geometries() + eq_(len(geoms),2) + eq_(geoms[0].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + eq_(geoms[1].to_wkt(),'Polygon((0 0,1 1,2 2,0 0))') + atexit.register(postgis_takedown) diff --git a/tests/python_tests/reprojection_test.py b/tests/python_tests/reprojection_test.py index 14a48adf7..371ed217e 100644 --- a/tests/python_tests/reprojection_test.py +++ b/tests/python_tests/reprojection_test.py @@ -44,9 +44,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-wgs842merc-reprojection-render.png' expected = 'images/support/mapnik-wgs842merc-reprojection-render.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) def test_visual_zoom_all_rendering2(): m = mapnik.Map(512,512) @@ -56,9 +56,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-merc2wgs84-reprojection-render.png' expected = 'images/support/mapnik-merc2wgs84-reprojection-render.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) # maximum-extent read from map.xml def test_visual_zoom_all_rendering3(): @@ -69,9 +69,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-merc2merc-reprojection-render1.png' expected = 'images/support/mapnik-merc2merc-reprojection-render1.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) # no maximum-extent def test_visual_zoom_all_rendering4(): @@ -83,9 +83,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-merc2merc-reprojection-render2.png' expected = 'images/support/mapnik-merc2merc-reprojection-render2.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) if __name__ == "__main__": setup() diff --git a/tests/visual_tests/compare.py b/tests/visual_tests/compare.py index 9130059a3..c999f54aa 100644 --- a/tests/visual_tests/compare.py +++ b/tests/visual_tests/compare.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import os import sys import mapnik @@ -10,6 +11,11 @@ except ImportError: COMPUTE_THRESHOLD = 16 +# testcase images are generated on OS X +# so they should exactly match +if os.uname()[0] == 'Darwin': + COMPUTE_THRESHOLD = 2 + # returns true if pixels are not identical def compare_pixels(pixel1, pixel2, alpha=True): if pixel1 == pixel2: diff --git a/tests/visual_tests/data/line.dbf b/tests/visual_tests/data/line.dbf new file mode 100755 index 000000000..c27e6d5f6 Binary files /dev/null and b/tests/visual_tests/data/line.dbf differ diff --git a/tests/visual_tests/data/line.shp b/tests/visual_tests/data/line.shp new file mode 100755 index 000000000..52976981a Binary files /dev/null and b/tests/visual_tests/data/line.shp differ diff --git a/tests/visual_tests/data/line.shx b/tests/visual_tests/data/line.shx new file mode 100755 index 000000000..60746dfb3 Binary files /dev/null and b/tests/visual_tests/data/line.shx differ diff --git a/tests/visual_tests/grids/charspacing-lines-300-300-1.0-grid-reference.json b/tests/visual_tests/grids/charspacing-lines-300-300-1.0-grid-reference.json index a1fa0eac4..9501ec8b0 100644 --- a/tests/visual_tests/grids/charspacing-lines-300-300-1.0-grid-reference.json +++ b/tests/visual_tests/grids/charspacing-lines-300-300-1.0-grid-reference.json @@ -19,12 +19,11 @@ " ", " ", " ", - " ", " ! ! !! ! ! ! !! ! ! ! !! !! ", " ! !! ! !! ! !! !! ", " ! ! ", " ! ! !! ! ! !! ", - " ! ! ! ! ", + " ! ! ! ! ! ", " !!!! ! ! ! !! ! ! ! ! ! ", " !!!! ! !! ! !! ! ! ", " ! ! ! ! ", @@ -37,18 +36,18 @@ " !!!!!! ! ! ! !! ! !!!! ", " ! ! ! ! !!!! !!! ! ! !! ", " ! !! !!! !!! !!!! ", + " !! ! ! ! ! ! ", " !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", - " !!! !!!! !! !! !! ", " !!!! !!!! !!! ! !! ", " !!! ! !!!! !!! ! !! ! ", " !!! !!! ! ! !!!! ", " ! ! ! ! ! ", " !!! ! !!! ! ! !! ! ", - " ! ! !! !! ! ! ", + " ! !! ! !! !! ! ! ", " !!!!!! ! !! !!! ! !! ", " !! !!! !!! ! !! ! ", - " ! ! ! ! ", - " ! !! ! !! ! !! ! ", + " ! ! ! !! ", + " ! !! ! !! ! !! !! ", " ! !! ! !!!!! ! ! ", " ! ! !! ! !! !!! ! ", " !!!! !!! ! !! !!! ", @@ -60,8 +59,8 @@ " !! ! ! ! ! ", " ! ! ! !! !!! !! ! ", " ! !!!!! ! ", - " ! !! ! !!! !!!! !!!! ", - " !! !! !! !! !!! !! ! ", + " ! !! ! !!! ! !! !!!! ", + " !! !! !! !! !! !! ! ", " ! ", " ", " ", @@ -79,6 +78,7 @@ " ", " ", " ", + " ", " " ] } \ No newline at end of file diff --git a/tests/visual_tests/grids/expressionformat-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/expressionformat-500-100-1.0-grid-reference.json index 56e5a9b65..c5fce6529 100644 --- a/tests/visual_tests/grids/expressionformat-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/expressionformat-500-100-1.0-grid-reference.json @@ -28,8 +28,8 @@ " ", " ! # $ % & ' ( ) * + ", " ", - " # $$$ %%% &&&& ''''' (( ))) )) )) ** * * ++ + ", - " ' (((((((( ))) )) )) * * ** ++++ +++ ", + " # $$$ %%% &&&& ''''' (( ( )) ) ))) ** *** ++ + ", + " ' ((((((( )) ))))) * * * + + ++++ ", " ", " ", " ", diff --git a/tests/visual_tests/grids/formatting-1-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/formatting-1-500-100-1.0-grid-reference.json index 209a22817..2725f745d 100644 --- a/tests/visual_tests/grids/formatting-1-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/formatting-1-500-100-1.0-grid-reference.json @@ -28,12 +28,12 @@ " ", " ! # $ % & ' ( ) * + ", " ", - "! ! $$$ $ $ && & && ((( *** * ", - " ! ! !!!! ! $$ $ $ $ $$$ $$$ & & &&&& & ( ( ( (((( **** * ** *** ", - " !! !!!! $$ $ $ $$ $ && & && ( ( ( ( ** ** * ** ", + "! ! $$$ $ $ &&& & && ((( ( ** ", + " !!! ! !!! ! $$ $ $ $$$ $$$ &&& & &&& & ( ((( ( ((((( ( * * * *** ", + " ! !! !!! $$ $ $ $$$ $ $ & && && & ( ( (( (( ((( ( * * ** ", " ", - " ! !!!!!!!! $$$$$$$$$$$ & &&&&&&&& (((((((((( ********* ", - " !!!!!!! $$$$$$ $$$$ &&&&& & ((( (((((( *** **** ", + " !!!! !!! $$$$$$$$$ $ &&&&&&&& (((((((((( ******** ", + " !!!!!!! $$$$$$$$$ &&&& & (((((( ( ( ***** **** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/formatting-2-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/formatting-2-500-100-1.0-grid-reference.json index 209a22817..2725f745d 100644 --- a/tests/visual_tests/grids/formatting-2-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/formatting-2-500-100-1.0-grid-reference.json @@ -28,12 +28,12 @@ " ", " ! # $ % & ' ( ) * + ", " ", - "! ! $$$ $ $ && & && ((( *** * ", - " ! ! !!!! ! $$ $ $ $ $$$ $$$ & & &&&& & ( ( ( (((( **** * ** *** ", - " !! !!!! $$ $ $ $$ $ && & && ( ( ( ( ** ** * ** ", + "! ! $$$ $ $ &&& & && ((( ( ** ", + " !!! ! !!! ! $$ $ $ $$$ $$$ &&& & &&& & ( ((( ( ((((( ( * * * *** ", + " ! !! !!! $$ $ $ $$$ $ $ & && && & ( ( (( (( ((( ( * * ** ", " ", - " ! !!!!!!!! $$$$$$$$$$$ & &&&&&&&& (((((((((( ********* ", - " !!!!!!! $$$$$$ $$$$ &&&&& & ((( (((((( *** **** ", + " !!!! !!! $$$$$$$$$ $ &&&&&&&& (((((((((( ******** ", + " !!!!!!! $$$$$$$$$ &&&& & (((((( ( ( ***** **** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/formatting-3-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/formatting-3-500-100-1.0-grid-reference.json index 33965421e..ef9f0089b 100644 --- a/tests/visual_tests/grids/formatting-3-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/formatting-3-500-100-1.0-grid-reference.json @@ -28,9 +28,9 @@ " ", " ! # $ % & ' ( ) * + ", " ", - "! ! $$$ $ $ && & && ((( *** * ", - " ! ! !!!! ! $$ $ $ $ $$$ $$$ & & &&&& & ( ( ( (((( **** * ** *** ", - " !! !!!! $$ $ $ $$ $ && & && ( ( ( ( ** ** * ** ", + "! ! $$$ $ $ &&& & && ((( ( ** ", + " !!! ! !!! ! $$ $ $ $$$ $$$ &&& & &&& & ( ((( ( ((((( ( * * * *** ", + " ! !! !!! $$ $ $ $$$ $ $ & && && & ( ( (( (( ((( ( * * ** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/harfbuzz-800-200-1.0-grid-reference.json b/tests/visual_tests/grids/harfbuzz-800-200-1.0-grid-reference.json index bb52dba2c..ba1bf30fa 100644 --- a/tests/visual_tests/grids/harfbuzz-800-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/harfbuzz-800-200-1.0-grid-reference.json @@ -19,34 +19,34 @@ " ", " ", " ", + " !! ", + " !! ", + " ", + " # # # # ! !! ! ! ", + " # # # # # ! ! ! ", + " # # # # ## # # ! ! ! ! ", + " #### # # # # # ## ! ! !! ! ! ", + " # ## ### # # ### # # # # ! ! ! ! ! ! ", + " # ## # # # # # ## ### ## # ! ! ! ! ! !! ! ", + " # ## ####### # ####### # !!!! !!! !!!!!!! ! ", + " $$ $$ $ # ## !! !! ", + " $ $ $$ #### ## !!! ", + " $ $ $$ $$$$$$ ", + " $ $ $ % % ", + " %%%%%% %%%%%% %% ", + " % %%%% %% ", + " %% % % ", " ", " ", " ", - " ", - " ", - " ", - " ", - " ! ", - " ! ", - " # ## # ! !! ! ", - " # # ## # ! !!! ! ", - " # # ## # ## ! !! ! ", - " ### ## # ## # # # ! !! ! ", - " $$ $$ $ % % % % # ### ### ## # ## ### !! ! !! ! ", - " $ $ $$ % %%% %%% %%%%%% %% # ### ### ## # # # # # # # ! ! ! ! ! ! ", - " $ $ $$ $$$$$$ % %% %% %%% % # ###### ### # ########## # !!!! !! !!!!! ! ", - " $ $ $ % % % # # ## ## ! !! ", - " # ## !! !! ", - " ### # ! ", - " ", " $ & % ' ( # ) * ! + ", " ", " ", " ", - " $$ $$ % % %% % # # # ! ! !! ", - " $$$$$$ %%%%%%%%% %% %%%%%% # # ## ! !!!! ", - " $ $ % %%% %% % % %% % % %%% ! ", - " % % % % % ", + " $$ $$ %%% # # # ! ! !! ", + " $$$$$$ %%% %%%%%% %%%%%% # # ## ! !!!! ", + " $ $ % % % % % %% % % % % ! ", + " % % % % % ", " ", " ", " ", diff --git a/tests/visual_tests/grids/hb-fontsets-800-200-1.0-grid-reference.json b/tests/visual_tests/grids/hb-fontsets-800-200-1.0-grid-reference.json index 9074ddf43..394bd2c52 100644 --- a/tests/visual_tests/grids/hb-fontsets-800-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/hb-fontsets-800-200-1.0-grid-reference.json @@ -1,9 +1,9 @@ { "keys": [ "", - "2", "6", "8", + "2", "4" ], "data": {}, @@ -20,26 +20,26 @@ " ", " ", " ", - " ! ! # # $ ", - " !!!! # ## $$$ ", + " ! ! # # ", + " $$$ ! !! # ## ", " ", - " ! !! ! %%%% %%%%% %%%% %%%%%%%%%% ##### # # # $ $$ $$ ", - " !! ! ! !! ! ! % % % % % %% % # ## # # ## $ $$ $ $ $ $$ ", - " !! ! !!!! ! %%%% % % % % %% % # # # #### # $ $ $ $$$$ $ ", - " ! ! ! ! ! ! ! % % % % % %% % # # # # # $ $ $ $ $ $ $ ", - " !!!! ! !! ! ! % %% % % % %% % # # ## # # $ $ $ $ $ $ ", - " ! ! ! !! ! ! % %% % % % % %% % ## # # # ## # # $ $$ $ $ $ $ ", - " ! % % % %% % ## # $ ", - " ! ! ! %%%%% %%%% %%%%%%%%%% # # # $ $ $ ", - " ! !! ! # ## # $ $$ $ ", - " ! ! ! # ## # $ $ $ ", - " ! ! # # $ $ ", - " ! ## $ ", + " $ $ $$$$ $ %%%% %%%%% %%%% %%%%%%%%%%%%%%% %%%% !!!!! !! ! ! ! ! # # #### # ", + " $ $ $ $$ $ $ $$ % %% % % % %% %% % !! !!! ! ! ! ! ! # # # ## # ## ## ", + " $ $ $$$$ $ $$$$ $ %%%% % % % % %% %% % ! ! !!!!! ! !!!!! ! # #### # #### # ", + " $ $ $ $ $ $ $ $ $ % %% % % % %% %% % ! ! ! ! ! ! ! # # # # # # # ", + " $$$ $$ $ $ $$ $ $$ % % % % % %% %% % !! !! ! ! !! ! !! # ## # # ## # ## ", + " $ $ $$ $ $ $$ $ $$ % %% % % % % %% %% % !! !! ! !! ! ! !! ! !! # ## # # ## # ## ", + " % % % %% %% % !!! ", + " $ $ %%%%% %%%% %%%%%%%%%%%%%%% %%%% # ", + " $ $ # ", " ", " ", - " !! !! ! %% % % % % % ## # # ## # $ $$ $ $$ $ ", - " !! !!! !!!!! !! % %%%%% %%%%%%% % ### ### ###### # $$ $$ $ $ $$ $$$$$ ", - " ! % ", + " ", + " ", + " ", + " $$ $$ $ $ %% % % %% % ! ! ! !! ! # ## # # ### # ", + " $ $ $$$$$ $$$$ $$ %%%%%%%% %%%%%% % !!! !!! !!!!!!! !! ## ## ###### ###### ", + " $ ", " ", " ", " ", diff --git a/tests/visual_tests/grids/jalign-auto-200-200-1.0-grid-reference.json b/tests/visual_tests/grids/jalign-auto-200-200-1.0-grid-reference.json index 727f77717..0a2e7e41a 100644 --- a/tests/visual_tests/grids/jalign-auto-200-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/jalign-auto-200-200-1.0-grid-reference.json @@ -18,8 +18,8 @@ " ", " ", " ", - " !!!!!! ! ! !!!!!!! ! !!!!! ", - " !!! !!! ! !!! !!! ! ! !!!! ", + " !!!!!! ! ! ! ! ! !!! !!!!!! ! ! ", + " ! ! !!! ! !! !! ! !! ! ! !!! ! ", " ", " !! ! !! ! ! !!!! ! ", " !!! ! ! !! !!!! ! ", @@ -28,8 +28,8 @@ " ", " ", " ", - " !!!!!! ! ! ! !!!!! ", - " !!! !!! ! ! ! !!!! ", + " !!!!!! ! ! !!!!!! ! ! ", + " ! ! !!! ! ! ! !!! ! ", " ! ", " !! ! !!!! ! ", " !!! ! !!!! ! ", @@ -38,8 +38,8 @@ " ", " ", " ", - " !!!!!! ! ! !!!!!!! ! !!!!! ", - " !!! !!! ! !!! !!! ! ! !!!! ", + " !!!!!! ! ! ! ! ! !!! !!!!!! ! ! ", + " ! ! !!! ! !! !! ! !! ! ! !!! ! ", " ", " !! ! !! ! ! !!!! ! ", " !!! ! ! !! !!!! ! ", diff --git a/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json b/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json index a2f4f98c3..b22a999a2 100644 --- a/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json @@ -31,25 +31,25 @@ " ", " ", " ! ", - " ! ", - " !!! !! !! ! !! !!!! !!! !! !!!!! !!!! !!!!! !!!!!! !! ! ", - " ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ", - " ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !!! ! ! ! ! ! ", + " ! ! ! ", + " !!! !!! ! ! !! ! !! !!!! !!! !! !!!!! !!!! !!! !!!!!!!!!!!! !! !! ", + " ! ! ! ! !!! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ", + " ! ! ! ! !! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !!! !! ! ! ! ! ! ", " ", - " ! !! ", + " ! ! ", " ", " ", " # $ % & ' ( ! ) * + ", " ", + " %% ", + " ' ' * * * ", + " % % % %% ''' ' ' ' ' '' '' *** * ** * * * *** ** * ", + " % % % % % ' ' ' ' ' ' '' * * * * * ** * * ** * ", + " %%% % % %% ' ''' ''' ' ''' *** * * * * * * * ** * ", + " % '' ", + " % ' ** ", + " ", " ", - " %% * ", - "### ## #### ### #### ### # # # # % %% % ''' ' ''' ''' ''' * *** ** *** ** ", - "# # # # # # # ## ### # # # % %%% % ' ' ' ''' ''' '' * * ** *** * * ", - "# # # # # # # # # # # # % % % % ' ' ' ' ' ' '' * ** * * * * * ", - "# # # ## # ### # # # ### ## % % %% ' ' ' '' '' '' * * ** *** * * ", - " # ## % % ''' *** ", - " # % % % ", - " % ' ** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/line-offset-900-250-1.0-grid-reference.json b/tests/visual_tests/grids/line-offset-900-250-1.0-grid-reference.json index 92ceb756f..db3484bdf 100644 --- a/tests/visual_tests/grids/line-offset-900-250-1.0-grid-reference.json +++ b/tests/visual_tests/grids/line-offset-900-250-1.0-grid-reference.json @@ -30,38 +30,38 @@ " ", " ", " ", - " !!! # ", - " !!! !!!!!! ## #### ", - " !!!!!!! !!!!!!!!! ! ####### ## ##### ", - " !!!!!!! !!!!!!!!!! !! ######## ############# ", - " !!! !!! !!!!!!!!!!! !! !!!! ### ### ######## ## ### $$$$$$ ", - " %% %%% !!!!! !! ! !!!!! ##### ## ## ##### $$ $$$ ", - " %% %%%%%% %% !!!! !! !!!!!!!! ##### # ######## $$ $$$$$$$ $ $ ", - " % %%%%%%%%%%%%%%%%% % %% !!!!! ! !! !! #### # ## ### $ $$$$$$ $$$$$$$$$$ $ ", - " % % %%%%%%%%%%%%%%% %%% % !!!! ! !!! ##### # # # $ $$$$$$$$$$ $$$$$$ $$$$ $ ", - " % %%%% %%% %%% %%% % !!! ! ! ##### # $$$$$$$ $$$$$$ $ ", - " % %%%%% %%%% !!! ! # # $$ $$$$$ $ ", - " %%%%% %%%%% % ! !! # # ## $ $$$$ $ ", - " % %%%% %%% % ! ! !!! # ### $ $$$ $ ", - " %%%% % % !!!! #### $ $ $ ", - " % %%% %% ! !! ! #### $$$$$ ", - " % %% &&&& & && %%%%% ''''' '''' '''''''' !!!! # (((((( (((( ((( ### $$$$$ )))))) )) ) )) $$$ $ ", - " % &&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ! '''''''' '''' !!!! # (((((((((( (((( ### $$$$$ )))))))))) ))))))))))))))) ", - " % &&&&&&&& &&& %%%% !!! ' ' ! !! ( ( ## # $$$ ))))))))) ) $$$ $ ", - " % %%%% !!! !!! ### #### $$$ $$$ $ ", - " %%%%% !!! ! ! !! ### # ### $ $$$ $$ ", - " % % % !!! !! ## # # $$$ $$ $ ", - " % %%% %% % !!! ! !!! ! ### # # ### $ $$$$ $$$ $ ", - " % %%% %%%%%%% !!!! ! !!!!!! ### # # #### $ $$$$$$ $$$$$$$$ ", - " %%%%%%%% %%%%%%%% % !!! ! ! !!!! ### # # #### $ $ $$$$ $ $$$$$$ $ ", - " % %%%%%%%%%%%%%%%%%%%%%%% % !!!!! ! ! !!!! #### # ###### $ $$$$$$$$$$$$$$$$$ $$$$ $ ", - " % %%%%%% %%%%%% %%%% % !! !!! ! ! !! ###### # ## ## $$ $$$$$ $$$$$$$$$ $ $ ", - " %% %% %%%%%%% % %% !!! !!! !!! !! !! # ### ## ## ## ## $ $$$$$$ $$$ $$ ", - " %%% %%% !!!!!! !!!!!!! !! !!! ###### ######### # #### $$$$$ $$$$$ ", - " !!!!!! !! !!!!!!!! ###### ## ######## ", - " !!! !!!!!!!!! !!!! ## ########## #### ", - " !!!!!!!!! ! # ########## # ", - " !!!!!! ######### ", + " !! ", + " ! !!!!!!! # ####### ", + " !!!!!!! !!!!!!!!! !!! ####### ############# ", + " !!!!!!!! !!!!!!!!! !!!! ## ##### ########## ### ", + " !! !!!!! !!!!!!!!!!! !!!!! # ###### ######## # ##### $$$$$$ ", + " %% %%% !!!! ! !! ! !!!!! ### # ## ## ##### $$ $$$ ", + " %% %%%%%%% %% !!!!!!! !! !! ##### # ## ### $$ $ $$$$$$$ $ $ ", + " % %%%%%%%%%% %%%%%%%% %% !!!! ! !!! #### # ### $ $$$$$$$$$ $$$$$$$ $$ $ ", + " % %%%%%%%%%%%%%%%%%% %% % !!! ! ! #### # # $ $$$$$$$$$$ $ $$$$$$$$$ $ ", + " % %%% %%% %%% %%% % !!!!! ! ! ##### # # $$$$$ $$$$$$$ $ ", + " % %%%% %%%%% !!!!! !!!!! ### # ### $ $$$$ $ ", + " %%%%% %%%%% % !! !!!!! #### ##### $ $$$$ $ ", + " % %%%% %%% % ! ! !!! # ### $ $$$ $ ", + " %%%% % % % !!!! # ## $$$ $$$ $ ", + " %%%%% %%% ! !! # ## $$$ $ $$ ", + " %%%% &&&& & && %%% ''''' '''' '''''''' !!!!! # (((((( (((( ((( ### $$$$ )))))) )) ) )) $$$$$ ", + " % % &&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ! !! '''''''' '''' ! ! # (((((((((( (((( # $$ $ )))))))))) ))))))))))))))) ", + " % &&&&&&&& &&& %%%% !!!! ' ! !!! #### ( ( # ### $$$ ))))))))) ) $$ $ ", + " % %%%%% !!! !!! #### # ### $$$ $$$ $ ", + " %%% % !!! ! ! !!! ## # ### $$$$ $$$ ", + " % % % !!! !!!! ### # ### $$$$ $$$$$ ", + " % %% %% % !!! ! ! !!! ### # # ### $ $$$$$ $$ $$ ", + " % %%% %%%%%% !!! ! !!!!!! ### # ###### $$$ $$$ $$$$ $ ", + " %%%%%%%% % %%%%% % !!!! ! !!!!!! ### # ###### $ $$$$$ $ $$$$$$$$$ ", + " % %%%%%%%%%%%%% %%%%%%%%% % !!!!! ! ! !!! ### # # ## ### $ $$$$$$$$$$$$$$$$ $$$$$ $ ", + " % %%%%%% %%%%%%%%%%%% % ! !! ! ! ! ## ## # ## ## $$ $$$ $$$$$$$$$$ $ $ ", + " %% %% %%%%%%% %%%% !!!!! !!! !!! ! #### ## ## # $ $$$$$$$$$$$$ $$ ", + " %%% %%% !!!!!! !!!!!!! !! # ##### ######### ### $$$$$ $$$$$ ", + " !!!!! !!! !!!!!!!! ###### ### ######## ", + " !! !!!!!!!!!! !!!!!! ## ########## ###### ", + " !!!!!! !!! ! ! ##### #### # ## ", + " !!! !! ## #### ", " ", " ", " ", diff --git a/tests/visual_tests/grids/line-smooth-and-offset-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/line-smooth-and-offset-512-512-1.0-grid-reference.json new file mode 100644 index 000000000..2d3c25756 --- /dev/null +++ b/tests/visual_tests/grids/line-smooth-and-offset-512-512-1.0-grid-reference.json @@ -0,0 +1,137 @@ +{ + "keys": [ + "", + "1" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " !!! !! ", + " !!!!!!!!! !!!!!!!! ", + " !!! !!!! !!!! !!! ", + " !!! !!!!! !!! !!! !!!!! !! ", + " !! !!!!!!!! !!! !!! !!!!!!!! !! ", + " !!!!! ! !! !! !!! !! !! !!! !! ", + " !! !! !!!!! !! !! !! !! !!!!! !!!!!! ", + " !! ! !!! !!!!! !! !! !! !!! !! !! !!! ", + " !! !! !!!!!!! !!!! !! !! !!!!!!!!! !! !! ", + " !! !!!!!!! !! !! !! !! !!!!!!!!!!!!!! !! !! ", + " !!!! !!!! !! ! !! !!!!!!!!! !!!!!! !! ", + " !! !! !!! !! !!!! !! !!!!! !!!!!!!!! ", + " !! ! !!! !!!!! ! !! !!!!!!!!!!!!!! !!!!! !!! ", + " !! !! !!! !!!!!!! !! !!!!!!!!!!! !!!!! !!!!! !! ", + " !! !!!!! !!!!!! !!!! !! !!!!!! !!!!!!!!! !! ", + " !!!! !! !! !!! !!!! !! !!!!! !!!! !!!!!!!! !! ", + " !! !! !! !! !!!!! !! !! !!!!! !!!!!!!!!! !!!! !!!!!! ", + " !! !!!! !!! !!! ! !! !!!!!!!!! !!! !!!! !!!! !! !!! ", + " !! !!!!! !! !!! !!!! !!! !!!!! !!! !!!! !!!!!! !! ", + " !! !!!! !! !! !!!!! !! !!! !!!!! !! !!! !!!!!!! !! ", + " !!!! !! !!! !!!! !!!!! !!! !!!! !!!!!!!! !!! !!!!!!! !! ", + " !! !!!!! !! !!! !!!!! !! !!!!!!! !!!!!!!!! !!! !!! !!!!!! ", + " !! !!!! !! !! !!!!! !! !! !!! !! !! !!! !!!!!! !!! ", + " !! !!!!! !! !! !! !!!!! !!! !!!!! !! !!!!!! !! ", + " !! !!!!!!! !!! !!!!! !! !!!! !!!!!! !! !!!!!!! !! ", + " !!!! !! !! !! !!!!! !!!!!!!! !!! !! !! !!!!!!! !! ", + " !! !!!!!!! !! !!!!!! !!!!! !!!!!! !!! !!!!!!!!!!", + " !! !!!! !! !!! ! !!! !!!! !! !! !!!!!!! !!", + " !! !! !!!! !! !!!!!! !!!! !! !! !!!!!!! !", + " !! !!!!!!! !! !!!! !!!!!!!!!!!!!!! !!!!!!!! !! ", + " !!!! !!!! !! !! !! !!!!!! !! !! !! !!!!!!!!", + " !! !! !!!! !! !!!! !! !! !!!!!!! !!", + " !! !!!! !! !! !! !! !!! !!! !! !! !! !", + " !! !! !!!! !! !! !!!! !!!!!!!! !! !!!!! ", + " !! !! !!!! !! !!!!!!!!!!! !! !! !! !!!", + " !! ! !! !! !! !! !! !!! !! !!!! !!!", + " !! !! !!!! !! !!!!!!!! !! !! !! !!", + " !! !! !!!! !! !!! !!! !! !!!! !!", + " ! !! !!!!! !! !!!! !!! !! !!!!", + " !! !! !!!! !! !!!!!! !!!! !", + " !! !! !!!! !! !! !!!", + " !! !! !!!!! !! !! !! ", + " !! !! !!!! !! !!!! ", + " ! !! !!!!! !! !! ", + " !! !! !!!!! !! ", + " !! !! !!!!!!! ", + " !! !! !!!!! !! ", + " !! !! !!!!! !! ", + " ! !! !!!!!!!! ", + " !! !! !!!!! !! ", + " !! !! !!!!! !! ", + " !! !! !!!!!!!! ", + " !!!!!!!! !! !! !!!!! !! ", + " !!!! !!!!! ! !! !!!!!! !! ", + " !!! !!!! !!!! !! !! !!!!!! ! ", + " !! !!!!!!!! !!!! !! !! ! !!! !! ", + " !! !!! !!!! !!!! !! !! !!!!!! !! ", + " !! !!! !!!!! !!!! !!!! !! !! !!!!!! ! ", + " !! !!! !!! !!!! !!!! !!!! !! !! !! !!!!!! ", + " !! !!! !! !!!!!!!! !!!! !!!! !! !! !!!!!! !! ", + " !! !!! !!!!!!!!!!!!!! !!!! !!! !!!! !! !!!! !! ", + "!! !!! !!!!! !!!!! !!!! !!! !! !! !! ! !!!! ", + "! !!! !!!! !!!!!!! !!!!!! !!! !! !! !! !!!!!! !! ", + " !!! !!! !!!!!!!!!! !!!!!! !! !!! !! !! !!!! !! ", + "!!! !!! !!!! !!! !! !!! !!!!! !! !!!! !!!! ", + "!! !!! !!! !!!!! !! !! !! !! !!!! !! !!!! !! ", + "! !!!! !! !!!!!!!! !! !! ! !! ! !! !! !!!! ! ", + " !!!! !! !!! !!! !! !!!!!! ! !!!! !! ! !! ", + "!!!! !! !!! !!! !! !!!!!! !! !! !!!! !! ", + "!!! !!! !! !!! !!!!!! !! !!!! !! !!!! ", + " !! !! !! !! !!!!!! !!!! !! !!!! !! ", + "!! !! !! !! !!!! !!!!! !!!! !! !! ", + "!!!! !!! !! !!!! !! !! !! !!!! ", + " !! !! !! !! !!!!! !!!!! !! !! ", + " ! !! !!!!!!! !!!!!! !!!!! ! ", + " !! !! !!!!! !!!!! !! ", + " ! !! !!!!! !!!!! !! ", + " !! !!!!!!!!!!! !!! ", + " !! !!!!!!!!! !!! ", + " !! !!! !!! !!! ", + " !! !!!!! !!! ", + " !! !!! ", + " !!!!!!! ", + " !!!! ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/grids/line_break-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/line_break-800-800-1.0-grid-reference.json index cbb79acd1..509c19d84 100644 --- a/tests/visual_tests/grids/line_break-800-800-1.0-grid-reference.json +++ b/tests/visual_tests/grids/line_break-800-800-1.0-grid-reference.json @@ -85,32 +85,32 @@ " ", " ", " ", + " ! ", + " !! ! !!!!! !! ", + " ! ! ! ! ! ", + " ! !! ! ! ", + " ! ! !! !! !!!! ", + " !! ! !!! !! !!!!! !!!!!!!!! ", " ", - " ", - " ! ", - " !!! !!!! !! ! ! ! !! ! ", - " !! ! ! ! ! ! ", - " ! !! ", - " ! ! ! ! ! ! ! ", - " ! !!!!!! !! !! !!!! !! !!!!! ", - " #### #### # !! ! ", - " ## ## # # ! ", - " # # # ## ### ###### # #### # # # # #### #### ! !!!!! ! !! ! ! !! !! ! ", - " # # # # # # # # # # # # ## # # # #### # ! !! ! ! ! ", - " # # # # ##### # # # # # ## ## # # ## # ! ", - " ## ## ## # # # # # # ## ## # # # # # !! ", - " #### ## #### # # # #### ## ## # # # #### ! !!!!! !! ! !!!!! !! ", - " # ! ! ! ", - " ### ! ", - " !!! !!!! ! ! ! ! ! !!! ", - " # # !! ! ! ! ! ! ", - " # # ! ! ", - " # # ### ### ### !! ! ! ! ", - " # # # # ## ## # !!!!!!! !!!!!!!!!!!!!! ", - " # # # # ##### ## !! ! !! ", - " # # # # # # ", - " # # # # ## ## # ! ", - " ## ## ! ", + " ! ", + " ### #### # !! ! ! !! !! ", + " # # # # ! !! ! ", + " ## # # # #### ###### # ### ## ## # # #### #### ", + " # ## # ## # # ## # # # ## # ## # # # # # # ! !! ! ! ! ", + " ## ## # # #### # # # # # # #### # # # # # !! !!!!!!! !!!!! ! ", + " # # # # # # # # # ## ## ## # # # # # ", + " #### # #### # # # ### # # # # # ### ! ", + " # !! ! !! !! !! ! !! !! ", + " #### ! !!! ! ", + " ! ! ! ! ", + " # # !!! !!!! ! !!! ", + " # # !!!!!!!! !!!! !!!!!! ", + " # # ### ### ### ", + " # # # # ## ## # ! ! ! ! ", + " # # # # ##### ## ! !!!!! ! !!!!! !!!! ", + " # # # # # # ! !! ! !! ", + " # # # # ## ## # ", + " ## ## ", " ", " ", " ", @@ -118,48 +118,48 @@ " ", " ", " ", - " # # # # # # # # # ) ) ) ) ) ) ) ", - " # ###### ### ### # #### # ###### # # # # ### # ### ## # # ## # )) )))))) ))) ))) ) ))) ) ) )))))) ) ) ) ))) ))) ))) ) ) ", - " ######### ### ### ###### ### ### ####### ### ####### #### ### ## ## ## ## ))))))))) ))) )))) ) ))) )))))))))))) ))) ))) )))))) )))) ))) )) ) ", + " # # # # # # ## ) ) )) ) ) ) )) ) ", + " ## # # ## ##### # # # ## # # #### ### # #### ## #### # ##### ## ) ) ))) ) ) )) )))) )) ) ))) )) ) )) ))))))) ))))))) ))) ) ", + " ## # ###### ### ## # # ## ### ######### ###### # ####### #### #### ))) ))) ))))) ))) ))) ))) ) )))) ))) ))))))))))) ))))) )))))))) ", " ", - " # ## #### #### ### #### # #### # ## # ##### # # # ### # # ##### ### ## ##### ### # ) )) )) ) )) ) ))) ))) )))) ))))) )) ))) ))) ) ))) ))) ))) ) ))))))) ", - " ### # # ### ## ##### ##### # ## ### ## # ## ### # ### # # # )) )))) ) ) )) ) )))))) ))))) ) ) )) ) )) ) )) )) ", - " # # ) ", - " # ## ## # # ) ) ) ) )) )) ) ", - " # # #### # # ### ### # #### ## #### # # # ## #### ### #### ) )))) ) ) ) ) ) )))) ) ) ))) ))) ) )))) )) )))) ) ) ) )) ", - " ####### ####### # ##### ############# # ### ########## #### #### # ### ) ))))) ))) ) ))))))) ))))))) ) ))))) ))))))))))))) ) ))) )))))))))) ", + " ### # #### ### # # #### ##### ## ### ##### ### ### ##### ####### ### ######### )) ) ))))))) )))) ) ) ) ))))) ) ))))))) )) ) ))) ) )))) ) )))))))))) ", + " #### # # # # ## ## ## ## # ## ## ## # # # ## ## ### #### ## # ) ) ))) ) )) ) ) )) ) )))) ))) )) )) )))))) ) )) ) ))) ", + " # ", + " # # # # # # # ) )) ) ) ) ) ) ) ) ) ", + " # # ### #### # # ## ### # ### ##### #### ##### #### #### #### # # ))) )))) ))) ) ) ))) )))) ) ) )) ))) ) ))) ))))) )))) ))))) )))) ) ", + " ######## #### ## # # #### # ######## # ### ## ######### ### #### # #### ))) )))))))))) )))))))) )))) )) ) ) )))) ) )))))))) ) ))) )) ))))))))) ", " ", - " ##### ###### ######## #### # #### ### ####### #### ### ## # ##### # ####### ## ) )))) ))) ))))) ))) )) ) ))))) ))))))) )) ))))))) ", - " # ## ## # # ### ### ## # ### # # # ## ##### ### # # # # ### # # ))) )) )) ) ) )) ) ))) )))))) )))) )) ) ", - " # # # ", - " # # # # # # )) )) ) ) ) ) )) )) ) ", - " ## # ## ## ##### ## ###### # #### # ## ### ### #### # ## # ## )) )) ) )))) )))) ) ) ))) ) ))) ) )) ))))))) )) ) ))) )))) ))) ", - " ####### ## ##### # # ###### # ########## # ##### ## ########### # ### ) )))) )))) ))))) )))) )))) )))) ) ) ) )))))) )))))))) )))))))))) ", + " ### ## # ##### ####### ## ####### ### ########### # ####### ## # ### ### #### # ) )))) ))) ))))) ))) )) ) ))))) ))))))) )) ))))))) ))) ))))))))))) ) ", + " # ## # ### ###### #### ## # # ## # # # # ###### ### ## ## ### ## ## ))) )) )) ) ) )) ) ))) )))))) )))) )) ) ) )) ) ) ) ) ", + " # # ) ", + " # ## # #### # # ## # # ) ) ) ) ) ) ) ", + " ## ### # ### #### ##### # ## #### # # ## ## ##### #### # ) )))) ))))))) )))) ))) ) )) )) )) ))))) )) ))))))) ) )))) ", + " # # #### ## ##### # ####### ### ###### # ### # #### #### ##### ## ))))))) )))) ))))) ))) ))))))) ))) ))) )))))))) ) ) )))))) ) ) )))))) ) ", " ", - " ## ## ## # ### ##### ##### #### ### ##### # ### ## #### ##### ### ## ## ######### ### )))))) )) )))))))))) )) )))))) ))) )) ))))))) )) ))))))) ) ) ", - " ## # # ## ### #### ## # # # ### # #### ## # # ## ### # # ## # # ## )) ))) ) ) ))) ) ) )) )) ))) ) ) ) ) ) )))) ) ", - " # # # # ) )) ) ", - " # # # # # # ) ))) ", - " # #### ## ## #### # # # ## #### ##### # ### #### #### # ## ## ##### # )) ) ))))) ))) ))) ) ) )) ) ))))) )))) )))) ) )) ) ", - " # ##### ###### ######## ## ### ## ############ ############# #### ### ###### ### ))) ))))) ))))) )))) ))) )))))))) ))))) )))) ))))))))))) ) ", + " ####### # ##### # ### ### # ###### ### # # #### # #### ##### #### ### ## ######## )) )) )) ))) )) ))))))) )) ))))))) ) ) ))) ) )) ) ))))) )) ", + " ###### ## # # # # ### # ### # # # # # ### # ## ## ## ## # # # ##### ))) ) ) ) ) ) ) )))) ) )) ) ) ))) ) ", + " # ) ) ", + " # # # # ## # # ## ) )) )) ) ) ) )) ) ", + " ### # # ### ## # ### ###### ### # ### # # # ##### ## ## # #### ))))) ))) )) )))) )) )) ) )))) )))) ))) )) ))))) )))) ) ) ) )))) ", + " #### ### ##### ### ### ####### #### ### #### # # #### ######## # ### ###### )))))) ))) ))) ))) ) )))) )))) ))))) )))) ))) ))) )))))))))))))) ) ", " ", - " #### #### ###### ######## ### ## # ### # ###### ###### ### ## # # ### ))) )) )))))))) ))) )) )))) ) ) )))) )))) )) ))) ))))) ))))) ) )) ", - " # ## #### # ##### ## ## ### # ## # # # # ##### # ## # ## # ) ) ) ))))) )) ))) )))) ) ) )))) )))) ))) ) ))) )) ", - " # # # ) ) ) ", - " # # # # # ## # )) ) ) ) ) ) ) ) ", - " # ### # ### ###### # ## ## # ####### #### # # # # ## # ### ##### )))) )))) ) ))) )) ))))) )) )) ))) )))) ) )))) )))) )))) ", - " ######### #### ####### #### ##### ##### ## #### # ### ## ### # #### ######## ))))))))) ))))))) )))))) )) ) ))) ) ))))) ))))) )))) )))))))))) )))) ) ", + " # # # ### #### # # ## #### #### #### # # # ## ###### #### # ## ### ## ## ))))))))) ) )))) )) )) )) )) )) )) ) )) ) )))))))) ))) )) ))) ) )))) ", + " # ## # ### # ## ## # ####### #### # # ### #### # ## # # ## # # )))) )))) )) ))) ) ) ) ) ) ) ))) )))) ) )) ) )) ) ) ", + " # # # # ) ) ", + " # # ## ## # # # ) ) ) ))) ) ) ) ", + " ##### # # ## ##### ### # #### ### # #### ## # ## # # ## ### ## #### ))) ) )))) ) ))))) )))) ))))) ) ) ) ))))) )))) ) )) )) ) )) ", + " # ####### ## ####### ########### ##### #### # #### ## # # ###### # ##### ) ))))))))))) )))) )))))))))) )))))) )))) ))))))))) ))) ) )) ))) )) ))) ", " ", - " ## #### ### ##### ## # ### ## ## ## ## ## ## #### ###### # # # #### ## # ## )))) ))) )))))) )) )) ))) )) ))) )))) ) )) )) ))))) ) )))) ))))) ", - " # # ## # ## ### ## ## # # # # # ##### ## ## ### # ## ### ) ) ) ))))) ) )) ) ) )) ))) ))) ) ) ) ) )) ) )) ))))) ", - " # # ) ) ", - " ) ) ) )) ) )) ", - " # # #### ))))) )))) ) ) ) ) )) ) ))) ))))) ))) ) ) )) ))))) ))) ", - " # ### ##### )))) )) )))) ) ))) )) ))) ) )))) )))))))) )))) )))) )))))))))))))) ", + " ## # # # # ############ # ### #### ###### ### #### # # ###### ####### #### ## )) )) )))) ))))) )))))) )))) )) )))) ))))) )) )) ))) ))) ) ))) ", + " ### # # # ########## ### # ### #### # ### ## ## # # # ###### # ## ## ))) ) ) ) ) ))) )))) )))) ))) ) )) ) ) ) ) )) ) ) ) ", + " # # ) ", + " )) ) ) ) ) ", + " # # #### )) ) ) ) )))) )) ) ) ) )) ))) ) ) ))) ) ))) )) )) ) ", + " # ### ##### ))) ))) )) )))))) )))))) ))) ))) ))) )) )))) ) ))))))))) ))) ) ", " ", - " ))))) ) )) )))))))) )) )))))) ) ) ) ) )) )))) )))) ) )))))))) )) ", - " ) ))) ) )) ))) )))) ) ))) ) ) )) ) ) )) ))) )))))))) ) ", - " ) ", + " ) ))) )))) ) ))) ))))))))))) ", + " ) ) ) )) )) )))) )))) ", + " ) ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-1-600-600-1.0-grid-reference.json b/tests/visual_tests/grids/lines-1-600-600-1.0-grid-reference.json index 013e69545..ae13670ff 100644 --- a/tests/visual_tests/grids/lines-1-600-600-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-1-600-600-1.0-grid-reference.json @@ -90,7 +90,7 @@ " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", - " % %% % % ", + " %% %% % % ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-1-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-1-800-800-1.0-grid-reference.json index be14568e7..75c1e0755 100644 --- a/tests/visual_tests/grids/lines-1-800-800-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-1-800-800-1.0-grid-reference.json @@ -80,7 +80,7 @@ " #################################################################################################################################################################################### ", " #################################################################################################################################################################################### ", " #################################################################################################################################################################################### ", - " # # # # # # # # ## # # ", + " # # # # # # # # # ## # # ", " ", " ", " ", @@ -115,7 +115,7 @@ " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", - " % %% % % ", + " %% %% % % ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-2-600-600-1.0-grid-reference.json b/tests/visual_tests/grids/lines-2-600-600-1.0-grid-reference.json index 6e92037e2..6269e3550 100644 --- a/tests/visual_tests/grids/lines-2-600-600-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-2-600-600-1.0-grid-reference.json @@ -64,7 +64,7 @@ " ######################################################################################################################################## ", " ######################################################################################################################################## ", " ######################################################################################################################################## ", - " ## ## ## # # # ", + " ## ## ## # ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-2-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-2-800-800-1.0-grid-reference.json index d5a043c0b..98a1c1a8c 100644 --- a/tests/visual_tests/grids/lines-2-800-800-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-2-800-800-1.0-grid-reference.json @@ -80,7 +80,7 @@ " #################################################################################################################################################################################### ", " #################################################################################################################################################################################### ", " #################################################################################################################################################################################### ", - " # # # # # # # # # # ## # # # # # # ## # ", + " # # # # # # # # # # # ## # # ", " ", " ", " ", @@ -100,7 +100,7 @@ " $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ", " $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ", " $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ", - " $ $ $ $ ", + " $ $ ", " ", " ", " ", @@ -115,7 +115,7 @@ " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", - " %% %% % % ", + " %% %% % % % ", " ", " ", " ", @@ -125,7 +125,7 @@ " &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ", " &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ", " &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ", - " && && & & & & & & ", + " && && & & ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-3-600-600-1.0-grid-reference.json b/tests/visual_tests/grids/lines-3-600-600-1.0-grid-reference.json index c526430e4..67b4633c9 100644 --- a/tests/visual_tests/grids/lines-3-600-600-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-3-600-600-1.0-grid-reference.json @@ -90,7 +90,7 @@ " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", - " % %% % % ", + " %% %% % % ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-3-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-3-800-800-1.0-grid-reference.json index 4e1318371..e7bd89e95 100644 --- a/tests/visual_tests/grids/lines-3-800-800-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-3-800-800-1.0-grid-reference.json @@ -80,7 +80,7 @@ " #################################################################################################################################################################################### ", " #################################################################################################################################################################################### ", " #################################################################################################################################################################################### ", - " # # # # # # # # ## # # # # # # # # # # ## # # ", + " # # # # # # # # # ## # # # # # # # # # # # ## # # ", " ", " ", " ", @@ -115,7 +115,7 @@ " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", " %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ", - " % %% % % ", + " %% %% % % ", " ", " ", " ", @@ -142,7 +142,7 @@ " (((((((( (((((((( '''' '''' ", " (((((( (((((( '''' '''' ", " (((( ((((( ''' ''' ", - " (((( (((( '''' ''' ", + " (((( ((( '''' ''' ", " (((( ((( ''' '''' ", " ((( (((( '''' ''' ", " (((( ((( ''' '''' ", diff --git a/tests/visual_tests/grids/lines-5-200-200-1.0-grid-reference.json b/tests/visual_tests/grids/lines-5-200-200-1.0-grid-reference.json index 30a1bcc1b..6b2943d9c 100644 --- a/tests/visual_tests/grids/lines-5-200-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-5-200-200-1.0-grid-reference.json @@ -3,71 +3,71 @@ "", "9", "8", - "7", "4", "5", + "7", "16", "6", - "11", - "10", "12", + "10", "2", "13", "14", + "11", "3", "15", "1" ], "data": {}, "grid": [ - " !!!! ! !!! ! !!!!! ", - " !!! !!!!! ! !! ! ", - " ! !!! !! ! !!!!! !!! ! ! ", - " !!!!!!! !!!!! !! !!!!! ", - " ! !!!!! ! !!!! !!! ! ", - " !!!!!!!! !!!!!!! !!!!!!! !!! ", - " !!!!!!!!!! !!!!!!!!! !!!!!!!! !!!! ", - " !!!! !!!!! !!!!! !!!!!!!!!!!!!!!!!!!!! ", + " ", + " ", + " ", + " !! ! !! ! ", + " !!!!! !!!!! !!!! ", + " !!!!!!!! !!!!!!! !!!!!! !!!! ", + " !!!!!!!!!!!! !!!!!!!!! !!!!!!!!!! !!!! ", + " !!!! !!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!! ", " !! # !!!!!!!!! # !!!!!!!!! !!!!!!!! ", - " #### !!!!!!! ### !!!!! $# !!!!!! ", - " ###### $$$$! ###### !!! ##$##$$$! ## %%% ", - " #######$#$ $!$######### ######$$$$####%%% ", - " #### ##$## ###########$ ##$#$$###$$####%%% ", - " &&&## $$#$#$#### ###$$##$$$$####%### %%% ", - " &&& $$$$$$$## ###$$$#$$ ####% %%%% ", - " &&& $$$$ $$####### #######$ $$$$$#%%%%%%%%% ", - " &&&$$$$$$$ ###$$# #$##### $$$$$$$%%% %%%%% ", - " &&$$$$$$$$$$#####$$##$$#$$##$$$$$$$$$%% %%%%% ", - " &&&$$$ $$$$$##$ $##$#$##$#$###$ $$$$$$ % %%% ", - " &&& $ $$$$$ ####$$$###$$##$ $$$%$ %%'%% ", - " &&& $$$ ## $$ ## #### %%%%%%'%% ", - " &&& &(( #((( (((### ((((( '''%'''%% ", - " &&&((&(&&( (((((( ())(((( (((((((''*''''*% ", - " &&((&&(((((((((((((()()))(((((((((((((** %%% ", - " &&&(&& &((((((( ((()))))(((((((( (((((* **%%**", - " &&& & &&(((( ++)((( ))((**((**********%**", - " &&& & &&(((,, +++--))).)))(.*(*(******** *%%*", - " &&& & ,,,,,, +++-)))).....(((*)******%%%**% ", - " &&& & ,&,,, +++))).......())(( %%%%%*%% ", - " &&& &,,,,,,, +++---)))))))(((()( % *%*%%% ", - " &&& ,,,,,//,,/,++----))))))(()))((( ***%%% ", - " &/&,/,,//,/,///++----))) (0000000 %%***%%% ", - " //////,/,,,/,,,/+---)))) 0000000 %%**%%%% ", - " ///,///,// , //---))) 0000000*%%%%%*%%% ", - " &// /////,,,, /// )))) ********%*%%*%%% ", - " &/& / /,/, /// )))) ***********%%%%% ", - " &&&/ //,, /// ))))))))))))) **** %%% ", - " //&////// /// )))))))))))) ** **** %%% ", - " &&& ///// //// ))))))))))) **** *%% ", - " / ///// ////// 111 * ** * ", - " /////////// 111111111111*** * ", - " /////////// 111111111111** * ", - " ///// //// 1111111111111 ", - " / /// /// 1 1111 ", - " / / /// 1 11 ", - " / /// 1 ", - " //// 1 1111 ", - " // 1111111 ", + " #### !!!!!!! ### !!!!! ## !!!!!! ", + " ###### !!! ###### !!! ##### !! ## $$$ ", + " ########## ! ######### ######## ####$$$ ", + " #### ##### ############ ###############$$$ ", + " %%%## ########## ######### ######## $$$ ", + " %%% ####### #&##### ##### $$$ ", + " %%% &&&& ###&&& & &&&#&&# &&&&&### $$$ ", + " %%%&&&&&&& &#&&&&&&&&&&&&&&&&&&&&&& $$$$ ", + " %%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& $$$$ ", + " %%%%&& &&&&&&&& &&&&&&& &&&&&&& &&&&&& $$$$ ", + " %%%%& &&&&& &&&&&& &&&&& &&&&& '$$$$ ", + " %%%% &&& && & '''''$'$$ ", + " %%% ((( (((( (((( ((((( ''''''$$$ ", + " %%%%(((((( (((((( ((((((( ((((((('''''$$$$ ", + " %%%%(((((((((((((((((((((((((((((((((( $$$ ", + " %%%((( (((((((((((((((( ((((((( ((((( $$$$ ", + " %%%%( (((((( (()((((( (((((*********** $$$ ", + " %%% (((++ )))(,(----(---************$$$$ ", + " %%%% ++++++ ))),((--------***.*********$$$ ", + " %%% +++++ ))),,,--------.... ****$$$ ", + " %%%% +++++/// ))),,,............ ***$$$ ", + " %%%%+++++//////)),,,............. **$$$$ ", + " %%%%%++////////)),,,.... 0000000 **$$$$ ", + " %%%%++//////////),,..... 0000000 ***$$$ ", + " %%%%%+//// //,,.... 0000000*******$$$ ", + " %%%%%//// /// .... *************$$$ ", + " %%% /// /// .... ************ $$$ ", + " %%% //// /// ............. *** $$$ ", + " %%% ///// /// ............. $$$ ", + " %%% //// //// ............ $$$ ", + " /////// ////// 111 ", + " //////////// 1111111111111 ", + " ///////// 1111111111111 ", + " ////// 1111111111111 ", + " ", + " ", + " ", + " ", + " ", " ", " " ] diff --git a/tests/visual_tests/grids/lines-5-400-400-1.0-grid-reference.json b/tests/visual_tests/grids/lines-5-400-400-1.0-grid-reference.json index 0c8882415..e2da8b021 100644 --- a/tests/visual_tests/grids/lines-5-400-400-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-5-400-400-1.0-grid-reference.json @@ -13,8 +13,8 @@ "12", "13", "14", - "3", "11", + "3", "15", "1" ], @@ -24,91 +24,91 @@ " ", " ", " ", - " ! ! !! ! ", - " !!!! ! ! !!! ! !!!! ", - " !!!! !! !!!!! !!!!! ! ! !!! ! ", - " !!!! ! ! !! ! !! !! !! ! !!! ! ", - " ! !!! !!!! ! !!! !!!!!! !!! !!!! ! ! ", - " !! !!!!!! !! !! ! !!!! !!!! ! !!! !!! !!! !!! ", - " !!! !!!!!!!!! !!! ! !!!!!!!!! !!! ! !!!!! !!!!!! !! ", - " ! !!!!!!!!!!!!!!!! ! !!!!!!!!!!! !! !!!!!!!! !!!! !!! ", - " !!!!!! !!!!!!! !! !!!!! !!!!!! !! !!!!!!!!!!! ! !!! !!!!! ", - " !!!!!! !!!!! !!! !!!!!! !!!!! !!!! !!!!!! !!!!!! !!!!!!!!!!!! ", - " !!!!! !!!!! ! !!!!!! !!!!!!! !!!!!! !!!!! ! ! !!!!! ", - " !!!! !!!!!! !!!!!! !!!!!!! !!!!! !!!!! !!!!!! ", + " ", + " ", + " ", + " !!! ", + " !!!!! !!! ", + " !!!!!!!! !!!!! !!! ", + " !!!!!!!!! !!!!!!!! !!!!!! !! ", + " !!!!!!!!!!!! ! !!!!!!!!!! !!!!!!!! !!!! ", + " !!!!!! !!!!!!! !!!!!!! !!!!!! !!!!!!!!!!!! ! !!!!! ", + " !!!!!! !!!!! !!!!!!! !!!!! !!!!!! !!!!!!! !!!!!! ", + " !!!!! !!!!! !!!!!!!! !!!!!! !!!!!!! !!!!! !!!!!! ", + " !!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!!!!!!!!!! ", " ! !!!!! !!!!!! !!!!!!!!!!! !!!!!!!!!!! ", " !!!!!!!!! !!!!!!!!! !!!!!!! ", " # !!!!!!! # !!!!!! !!!!! ", " #### !!!!! #### !!! ## !!! $$$ ", " ####### ! ###### ! #### # $$$ ", " ########## ######### ####### ### $$$ ", - " ####### ##### ###### ##### ######### ####$$$$$$ ", - " ###### ###### ###### ##### ###### ##### ###$$$$$$$$ ", - " ##### ###### ##### ###### ##### ###### #####$$ $$$$$ ", - " %%%%#### ##### ###### ###### ##### ###### ###### $$$ ", - " %%%% # & &&& #####&&&&##### & & ##### ###### #&######## $$ $$$ ", - " %%%% & & && ###&&#&&#### & ###########& #&###### $$ $$$$ ", - " %%%% & &&#&#&### &&& ##&#####&& & &&& &&### $$$$$ $$$ ", - " %%%% &&&&& & &&#&&# &&& ##&##&&& &&& && &&&& $ $$ $$$ ", - " %%%%%% &&&&&&&& &&## & && &## && && &&&&&& $$$$$ ", - " %%%%% &&&& && &&&#&&&&& &&& &&&&&& & &&&&&&&&&& && $$$ ", - " %%%%%% &&&&&&&&& &&& &&&&&&&& && &&& &&&&&&&& && & &&&&&&&&&&& $$$ ", - " %%%%%% &%&&&&&&& &&& &&&&&&&&&&& &&&&&&&&&&&&&& &&& &&&&&&&&&&&& $$$ ", - " %%%%%%&&&&&&&&&&& &&&&&&& &&&&&& &&&&&& &&&& && &&&&&& &&&& & $$$ ", - " %%%%%%%%%& &&&& &&&&&& &&&& &&&&& &&&& &&&&& &&&&&&&&& $$$ ", - " %%%%%%&%% &&&&&&&&&& &&&&&&&&&& &&&&&&&&&& &&&&&&&& $$$ ", - " %%%%%%%% &&&&&&&&& &&&&&&&& &&&&&&&& &&&&&& $$$ ", - " %%%% &&&&&&& &&&&&& &&&&& &&&& $$ $$$$ ", - " %%%% &&& & $$$$$$$$$ ", - " %%%% $$$'$$$$$ ", - " %%%% ''$'$$$$$ ", - " %%%% ''''''''''''$$$$$ ", - " %%%% (( ((((( ((((( ((((((( '''''''''$'''$$$$ ", - " %%%% ((((((( (((((((( (((((((( ((((((((( ''''''''$$$'$$$$$ ", - " %%%% ((((((((( (((((((((( ((((((((((( ((((((((((( ''''' ' $ $$$ ", - " %%%% %(((((((((( (((((( (((( (((((( ((((( (((((( (((( ''' ''' $$$ ", - " %%%%%%(((( ( ((((( (((((( (( (((( ((((( ((((( ((((( (((( (( '' ''$$ ", - " %%%%%%((% (((((((( ((((((((( ( ((((((((((( ( (((((((((( ((((((((( '''' ''$$$ ", - " %%%%%%( (( ((((((((((((( ((((((((( (( (((((((( (((((((((( ' ' '$$$ ", - " %%%%%% % ( (((((((())( (((((((((( ( ((((( (*** (( (((( $$$ ", - " %%%%% %%% ( (((( ))))(( ((++ (((((( (( ( ( ((((*********(*(***** $$$$$$ ", - " %%%%%%%%% ((( ( )))))((((((++ ,,,( (( (( ( *((*****(*((((****** $$$$$$$$ ", - " %%%% %% ((( )))))) ( +(( ,,, ((((------------ (**(*****((***********$$ $$$$$ ", - " %%% %% ( (( ()))) ((+ ,,, ((------------((((( (((((((((***** $$$ ", - " %%% ())))) +++ ,,, (------------((-( ((((( **$$ $$$ ", - " %%% ))())) ..++ ,,, ////////////// **$$ $$$$ ", - " %%% ))))) ..... ,,/// ////////////////////// $$$$$ $$$ ", - " %%% )))))))) .+... ,//, / /////////////////////// *$*$$ $$$ ", - " %%% )))))) )) ) ....++..,/// //////////////////////// *** $$$$$ ", - " %%% ))))) ))).)..... ..+...,,/ //// *** $$$ ", - " %%% )))))) ))).)))........ ..+ /,, / /// *** $$$ ", - " %%% )).)) ) ..)..............+ ,/, ///// *** $$$ ", - " %%% )).)) .)))). .......+.++,// / /// 000000000000000 *** $$$ ", - " %%%)))).. .. ))).. ...+++,,,,// /// 000000000000000 **** $$$ ", - " %%% ))). . ..).. .... ,,,,// /// 000000000000000 **** $$$ ", - " %%% )). . ..... ....,,,, /// *** $$$ ", - " %%% .. . .... .....,, /// **** ****$ $$$$ ", - " %%% .. ..... .... /// *********************$$$$$$$$$ ", - " %%% . ... ... /// *********************$$$ $$$$$ ", - " %%% . ... ... /// ********************* $ $$$$$ ", - " %%% .. ... ... //// **** * $$$$$ ", - " %%% .... ... ///// ** * $ $$$$$ ", - " %%% .... ... /////////////////////// $$$$$$$$$ ", - " %%% .... .... /////////////////////* ****** $ $$$ ", - " %%% .... ....... ////////////////////*** **** $$$ ", - " %%% .... ... ... // ////////////////// $$$ ", - " .... ..... . ////// / /// $$$ ", - " .... ....... .. // / / /// / /// ", - " .... ......... . // // /// / ", - " .......... ..... . . .. ////// /////1/1/111111111111 ", - " . .............. . ... ////11111//111//111111111111 ", - " . ............ ... 11111111111111111111111111 ", - " . .... .... . 11111111111111111111 ", - " .. ... . 1111 11 ", - " ... 111 11 ", - " ..... 11 1 11 ", - " ..... 111 11111 ", - " 1 111111 ", + " ####### ##### ############ ######### ##### $$$ ", + " ################ ############## ############ ##### $$$ ", + " ####### ####### ####### ###### ####### ###### ###### $$$ ", + " %%%%#### ####### ###### # ###### ####### ###### ###### $$$$ ", + " %%%% # ####### ##### # ##### ######## # ############ $$$ ", + " %%%% ################ ########### ######### $$$ ", + " %%%% # ########### ######## ######## $$$ ", + " %%%%% ####### ####### # & # ### $$$ ", + " %%%% & ##### &&&& #### # & &&& $$$ ", + " %%%% &&&&&& ###&&&& &&&&&& # # &&&&&&&& $$$$ ", + " %%%% &&&&&&&& &&&&&&&& &&&&&&&&&& &&&&&&&&&& $$$$ ", + " %%%%% &&&&&&&&& &&&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&&&&& $$$$ ", + " %%%%%&&&&&&&&&&&&& &&&&&&& &&&&& &&&&&&& &&&& &&&&&&& &&&&&& & $$$$ ", + " %%%% &&&&& &&&&& &&&&&& &&&&&&&&&&&& &&&& &&&&& &&&&&&&&& $$$$ ", + " %%%% &&& &&&&&&&&&& &&&&&&&&&& &&&&&&&&&& &&&&&&&& $$$ ", + " %%%%% & &&&&&&&&& &&&&&&&& &&&&&&&& &&&&&& $$$$ ", + " %%%%% &&&&&&& &&&&&& &&&&& &&&& $$$$ ", + " %%%%% &&& & ''''' $$$ ", + " %%%% ''''' $$$ ", + " %%%% ''''' $$$ ", + " %%%% '''''''''''''$$$$ ", + " %%%% (( ((((( ((((( ((((((( ''''''''''''' $$$ ", + " %%%% ((((((( (((((((( (((((((( ((((((((( ''''''''''''' $$$ ", + " %%%% ((((((((( (((((((((( ((((((((((( ((((((((((( $$$ ", + " %%%% ((((((((((( (((((( (((( ((((((((((((( ((((((((((((( $$$ ", + " %%%%(((((( ((((((( (((((( (((( ((((((( ((((( ((((( (( ((((( (( $$$ ", + " %%%% ((( ((((( ((((( (((((((((( ( (((((((((( ((((((((( $$$ ", + " %%%% ( (((((((((( ((((((((( ((((((((( (((((((( $$$ ", + " %%%% ( (((((((() (((((((( ((((( *** (((((* $$$ ", + " %%% ((((( ())) ++++ ((((((( ****************** $$$ ", + " %%% (())))) ++++ ((,,, ******************** * $$$ ", + " %%% )))))) +++ ,,, --------------- ********************** $$$ ", + " %%% ))))) +++ ,,, --------------- ****** $$$$ ", + " %%% )))))))) +++ ,,, ---------..---- ***** $$$ ", + " %%%% ))))))) +++ ,,, .... ............... **** $$$ ", + " %%% ))))) ) ++++ ,,, ....................... *** $$$ ", + " %%% )))))))) ++++ ,,,, ....................... *** $$$ ", + " %%% ))))))) / +++ ,,,, ....................... *** $$$ ", + " %%% ))))) ) //////// +++ ,,, .... *** $$$$ ", + " %%% )))))) )) //////////// +++ ,,, ... *** $$$$ ", + " %%%% ))))))) ///////////////+++ ,,, ... *** $$$$ ", + " %%%% ))))))) ////// ////////+++,,, ... 000000000000000 *** $$$$ ", + " %%%))))))) ///// //////,,,, ... 000000000000000 **** $$$$ ", + " %%%%))) ) ///// /////,,,, ... 000000000000000 **** $$$ ", + " %%%%)) ///// ////,,,, ... *** $$$$ ", + " %%% //// /////,, ... **** **** $$$$ ", + " %%% /// //// ... *********************** $$$ ", + " %%%% /// /// ... ********************** $$$ ", + " %%% /// /// ... ********************* $$$ ", + " %%%% /// /// .... * ** * *** $$$$ ", + " %%%% //// /// ..... ** $$$ ", + " %%% //// /// ....................... $$$ ", + " %%% //// //// ...................... $$$ ", + " %%% //// //// ...................... $$$ ", + " %%% //// /// .................... $$$ ", + " //// //// .. . . .. $$$ ", + " //// ////// ", + " //// ////// ", + " ////////// /////// 11111111111111111111 ", + " /////////////// 11111111111111111111111111 ", + " ///////////// 11111111111111111111111111 ", + " / //////// 11111111111111111111 ", + " // 1 11111 111 1 ", + " ", + " ", + " ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-5-600-600-1.0-grid-reference.json b/tests/visual_tests/grids/lines-5-600-600-1.0-grid-reference.json index 2e0f0b9b4..6c1721abf 100644 --- a/tests/visual_tests/grids/lines-5-600-600-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-5-600-600-1.0-grid-reference.json @@ -26,130 +26,130 @@ " ", " ", " ", - " ! ", - " ! !!! ", - " !!! !! !! ! ", - " ! ! !!! !! ! ", - " !! !! ! !! ! !!! ", - " !!!! ! !!! !!!!! ! !!! ! ", - " !!! !! !!!! ! ! !!! !!! ! ! ! !!!!! ", - " ! ! ! !!!!! ! !!! ! !!!! !!!! ! ! !!!! !! ", - " ! ! !!!!!!!!! !!!! ! !!!!! ! ! ! !! ! ! ", - " !!!! !!!!!!!!!!!!!!! !!! !!!!!!! ! ! ! !!!!!! !! !!!!! ! ", - " ! ! !!!!!! !!!!! ! !! ! !!!!!!!!!! !! !! !!! !!!!!!!! ! !!! !!! !!! !! ", - " !!!!!!!!!!! !!!!! !! ! ! !!!!! !!!!!!!!! !! ! !!!!!!!!!!! !! !! ! !!!!!!!! ", - " !!! !!!!!! !!!!!!!!! !!!!!!! !!!!!! !!!!!!!!!! ! !! ! !!!!!! !!!!! ! !!!!!!!!!!! ", - " ! !!!!!! !!!!! !!! !!! !!! !!!!!! !!!!! !!! !!! ! ! !!!!! !!!!!! ! ! !! !!!!! ", - " !!!!!!! !!!!! ! ! !! !!!!!! !!!!! !!! ! ! !!!!!! !!!!!!!!! ! !!!!!!! ", - " !!!!!! !!!!! ! !! !!! !!!!!! !!!!!! !!!! !!!!!! !!!!! ! !! !!!!!!! ", - " !!!!! !!!!!!! !!! !!!!! !!!!!! !!! !!!!! !!!!! !! !!!!! ", - " !!! !!!!! !!!!!!! !!!!! ! !!!!!! !!!!!! !!!!!! ", - " !!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! ", - " !!!!! !!!!!! !!!!!! !!!!! !!!!!!!!!! ", + " ", + " ", + " ", + " ", + " ", + " ", + " !! ", + " !!!!!! !! ", + " ! !!!!!!!! !!!!!!! !!!! ", + " !!!!!!!!!!!! !!!!!!!!! !!!!!! ! ", + " !!!!!!!! !!!!! !!!!!!!!!! !!!!!!!! ! !! ", + " !!!!!! !!!!! ! !!!!! !!!!!! !!!!!!!!!!!! !!!!! ", + " !!!!!!!! !!!!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!!!! ", + " !!!!!!! !!!!!! !!!!!!! !!!!!! !!!!! !!!!!!! !!!!!! ", + " !!!!!!! !!!!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! ", + " !!!!!! !!!!!! !!!!!! !!!!!!! !!!!!! !!!!! !!!!!!!! ", + " !!!!! !!!!!!! !!!!! !!!!!! !!!!!!! !!!!! ! !!!!! ", + " !!! !!!!!! !!!!!! !!!!! !!!!!! !!!!!! ! !!!!!! ", + " !!!!!!! !!!!!!! !!!!!! !!!!!!!! !!!!!! !!!!!!! ", + " !!!!!! !!!!!! !!!!!!!!!!!! !!!!!!!!!! ", " !!!!!!!!!!! !!!!!!!!! !!!!!!!! ", " !!!!!!! !!!!!! !!!!! ", " ## !!!!! # !!!! !! ", " ##### !!! #### ! # $$$$ ", " ######## ###### ### $$$$ ", " ########## ######### ##### ## $$$$ ", - " ###### ###### ###### ##### ######### ####$ $$$$ ", - " ###### ###### ######## ##### ########### #####$ $ $$$$ ", - " ###### ##### ###### ########### ##### ##### ######$$$$$$$$$ ", - " ########### ##### ###### ######### ################ ##### $$ $$$$$$ ", - " ###### ### # # ## ###### ##### ## ##### ######## ## ##### ###### $ $$$$$$ ", - " ##### # #### ######### ###### ## ##### ##### ###### ###### $$$$$$ ", - " %%% ### ### ### ##### ###### ## ###### ##### # ## ###### ######### $$$$$ ", - " %%% #### ## # ##### ###### # ##### ###### # #### ##### ###### ### $$ $$$$$$ ", - " %%% ## ### # ###### ###### # ##### ###### # #### ############## # $$$$ ", - " %%% %% ## ##### ##### ## ###### ##### # & ############ #### $$$$ ", - " %%% %%%%% & ## ########### & ##&&###### & # &&& ##### # ## $$$$ ", - " %%%%% % & &&& & ### ##&&&#### & &&&& &#&&#### && & &&&& ## #### $$$$ ", - " %%%%% % && && ## #&&&##& && & &&&& &&&& &&& & ### $$$$ ", - " %%%%% %% &&& & &&&&#&#&& &&& &&&& &&&& && &&&& & && & && $$$$ ", - " %%% % %%% && & && &&& &&&& && &&& & & && && & & & &&&& &&&&& &&& $$$$$$ ", - " %%% %%% & && && & &&&&& &&&&& && & &&&&&&&&&&&&& &&& &&&&&&&&&&&&&& && $$$$$$$$$ ", - " %%%% % &&&&&&&& & & & & &&&&&&&&& && &&& &&&&&&&&&&&&&& &&& &&&&&&&&&&&&&& $$ $$$$$$ ", - " %%% &&&&&&&&&& && & &&&&&&&&&&&& & & &&&&&&&&&&&&&& &&&&&&&&&&&&&&&&& $ $$$$ ", - " %%% &&&&&&&&&&&&& & &&&&&&& &&&&&&& &&&&&& &&&&&& & &&&&&& &&&&& & $$ $$$$ ", - " %%% &&&&&& &&&& && &&&&&& &&&& & &&&&&& &&&& &&& &&&&& &&&& & & $$ $$$$$ ", - " %%% &&&&& &&&&&&&& &&&&& &&&& && &&&&& &&&&&& &&&&& &&&& && & $$$$ $$$$ ", - " %%% &&&&& &&&&&&&& &&&&& &&&&& &&&&& &&&& & &&&&&& &&&& &&&& $$ $$$$ ", - " %%% &&& &&&&& &&&&&& &&&&& &&&&&& &&&&&&&&&&&&& &&&&&&&&&&&& $$$$$$ ", + " ####### ###### ############ ######### #### $$$$ ", + " ####### ###### ####### ##### ########### ###### $$$$ ", + " ###### # ####### ###### # ####### ############# ###### $$$$ ", + " ####### # ##### ###### # ###### ###### ####### ###### $$$$$ ", + " ######## ###### ######## ##### ####### # ##### ###### $$$$ ", + " ###### ###### ######## ##### ####### ####### ####### $$$$$ ", + " %%% #### ##### ####### ####### ##### ###### ###### $$$$ ", + " %%% ###### ######## ####### ###### ##### ####### $$$$ ", + " %%% ####### ###### # ##### ###### ########## # $$$$$ ", + " %%% ####### ##### ####### ##### ######## # $$$$ ", + " %%%% ########### ########### ###### $$$$ ", + " %%%% ######### ######## ##### $$$$$ ", + " %%% # ####### ###### $$$$$ ", + " %%% ##### ### & $$$$ ", + " %%%% # & &&&&&& $$$$ ", + " %%% & && &&&&&&& &&&&&&&&& &&&&&&&&& $$$$ ", + " %%% &&&&&&&&& &&&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&&& $$$$ ", + " %%%% &&&&&&&&&&& &&&&&&&&&&&&& &&&&&&&&&&&&&& &&&&&&&&&&&&&&&& $$$$ ", + " %%%% &&&&&&&&&&&&&& &&&&&&&& &&&&& &&&&&&&& &&&&& &&&&&& &&&&& $$$$$ ", + " %%% &&&&&& &&&& &&&&&& &&&& &&&&&&& &&&& &&&&&& &&&&& $$$$ ", + " %%%% &&&&& &&&&& &&&&& &&&& &&&&&& &&&& &&&&& &&&& & $$$$ ", + " %%%% &&&&& &&&&& &&&&& &&&& &&&&&&& &&&&&& &&&&&& &&&& & &&&& $$$$ ", + " %%% &&& &&&&& &&&&&& &&&&&& &&&&&& &&&&&&&&&&&&& &&&&&&&&&&&& $$$$ ", " %%% & &&&&&&&&&&&& &&&&&&&&&&& &&&&&&&&&& &&&&&&&&& $$$$ ", - " %%% &&&&&&&&& &&&&&&&&& &&&&&&&& &&&&&& $$$$ ", - " %%%%% &&&&&&& &&&&&& &&& & $$$$ ", - " %%%%% % && $$$$ ", - " %%% % '''''' $$$$ ", - " %%%%% % '''''' $$$$ ", - " %%%%% '''''' $$$$ ", - " %%%%%%%%% ''''$' $$$$$ ", - " %%%% %% '''''''''''''''''$$$$$$$$$ ", - " %%%%%% % '''''''''''''''''$$ $$$$$$ ", - " %%% ((( (((((( ((((((( '''''''''''''''''$' $$$$$$ ", - " %%% ((((((( (((((((( ((((((((( ((((((((((( ' ' $$$$$$ ", - " %%% (((((((((( ((((((((((( (((((((((((( ((((((((((((( '''''' $ $$$$$ ", - " %%% ((((((((((((( ((((((((((((( (((((((( ((((( (((((( ((( (((( $$ $$$$$$ ", - " %%% ((((((( ((((( (((((( (((((( ((((( ((((( (((( ((((( ( (((( '' ' ' ' $ $$$$ ", - " %%% (((((((((( (((( (((((((((((( ((((( (((((( ((((( ((((( ((((( ((( (((( ( '''' $$$$ ", - " %%% ((((((( ( ( (((( ((((( ( ( (((( ((((( ( (((( (((((( ( ( ( ((((( ((( $$$$ ", - " %%%%% (((( ( ( (((( ((((( ( (( (((( ((((( ( ((((( (((((( ( (((( (((((((((((( $$$$ ", - " %%% %% %( ((((( (((((( (((((( (((((( ((((((((((( ( ((( (((((((((( ( ( ( (((((((((( $$$$ ", - " %%% %%%% (((( ( (((((((((((( ( ((( ((((((((( ( ( ( (((((((( (( ((((((( $$$$ ", - " %%%% %% ( ( ((((((((( )) (( (((((( (( ((((( ( ( (( ( $$$$$$$ ", - " %%% % %% (( (((((((( )))) *(* (( ( ( ( (( ((( +++++++ ((( ( $$$$$$$$$ ", - " %%% %% ( (( ))))) **** ( ((((( ( (((((( ++++++++++++++++++((+++++++ $$ $$$$$$ ", - " %%% % % ((( )))))) **** ( ,,,(( ( ((((+++++++++++++++++((+++((((+++ $$$$$$ ", - " %%% %%%% ((( ())))) *** ((,(( (( -- (( (( (( .++.++++++++++++(((+(+((++++++ $$ $$$$$$ ", - " %%% %% ( (((())) *** (((,(( -----.--....---(-((((- ....... ( ( +++++++++ $$ $$$$$ ", - " %%% (((((())) *** (,(, -----..-...----------- ...... +++++ $$$$ $$$$ ", - " %%% ))))))) ) *** ,,, -----.---------------- .. .. ++++ $ $$ $$$$ ", - " %%% ))))))) ) **** ,,, ...... .. ... ... ++++ $$$$$$ ", - " %%% )))))))) ))) **** ,,, ..... ... . . ... ++++ $$$ ", - " %%% ))))) ) ) ))) **** ,,, ........................ +++ $$$ ", - " %%% ))))) ) ) / /// *** ,,,, . ................................ +++ $$$ ", - " %%% %% )))))) ))) ///// *** ,,,, ... . ................................ +++ $$$ ", - " %%% %%%% ))))) ))) / / *** ,,,. . . .................... +++ $$$ ", - " %%% %%%%% )))))) / //// *** ,,, .. ...... +++ $$$ ", - " %%% % % )))))) //// /// **** ,,, .. ...... +++ $$$ ", - " %%% % %% ))))) /////////// // ///* ,,,.... ... +++ $$ $$$$ ", - " %%% % %% )))))) ///////////////// / */* ,,,,. .. ... +++$$$$$$$$$ ", - " %%% % % )))))) //////////////////////***//,,,, .. ... +++$$$ $ $$$ ", - " %%% %% ))))) ))) ) ////// //////// //*///,,,, ..... +++ $ $$$$$ ", - " %%% %% )))))))))))))) ///// //// ***///,, .... 00000000000000000000000 ++++ $$$$$ ", - " %%% )))))))) ) )))////// /////*/ //,, .... 00000000000000000000000 ++++ $ $$$$ ", - " %%% ))))) )))////// /////// ,,, ... 00000000000000000000000 +++ $$ $$$$$ ", - " %%% ))) ///// //// / /,,, ... 00 00 0 +++ $ $$$ ", - " %%% )) ))) //// //// ,,,, ... 000000 +++ $$$ ", - " %%% ) /// //// ,,,, ... ++++ $$$ ", - " %%% //// ///// ... 0000 0000 ++++ $$$ ", - " %%% % //// //// ... +++0+0+0+000++++++++++++++++++++++ $$$ ", - " %%% %% %% /// /// .... +++++++++++++++++++++++++++++++++ $$$ ", - " %%% % /// //// ....... +++++++++++++++++++++++++++++++++ $$$$$$ ", - " %%% %% /// /// ... ..... + + +++++++++++ $$$$$$$$ ", - " %%% %% %% /// /// .. . ... ++++++ +++++++ $$ $$$$$ ", - " %%% %% %% / /// /// .. . .... + ++++++ $$$$$$ ", - " %%% %% %% // ////// //// .. ....... ++++ + ++ $$ $$$$$ ", - " %%% % % / / ////// /// / // . ......... +++ + +++++ $$ $$$$ ", - " %%% /// /// ///// / / .. .. ...... +++ + $$$$ $$$ ", - " %%% // ////// ////// .. ............................... $ $$ $$$ ", - " %%% // ////// /// // / . .............................. $$$$$ ", - " %%% / // //// /// // / ............................ $$$ ", - " %%% // /// //// ///// / .. ... . ... . $$$ ", - " / //// //// / . ... . . . $$$ ", - " //// ///// / .. .. ", - " //// ////// ......... .... .... ", - " //// ////// .. ... . . ... ", - " ///// ///// ", - " //////// ////// ", - " ///////////// /////// 11111111111111111111111111111111111111 ", - " ////////////////////// 11111111111111111111111111111111111111 ", - " // //////////////// / 11111111111111111111111111111111111111 ", - " / //// //////// //// 11111111111111 1 1 ", - " // /// / / // 1111111 1111111 ", - " ////// // /// 111111 11 ", - " ///// / / / / 11 1 11 1111111 ", - " / / / 11 11111 111 11 1 ", - " 11 111111 ", + " %%%% &&&&&&&&& &&&&&&&&& &&&&&&&& &&&&&& $$$$ ", + " %%% &&&&&&& &&&&&& &&& & $$$$ ", + " %%%% && $$$$ ", + " %%%% '''''' $$$$ ", + " %%% '''''' $$$$ ", + " %%% '''''' $$$$ ", + " %%% '''''' $$$$ ", + " %%% '''''''''''''''''''' $$$$ ", + " %%% ''''''''''''''''''' $$$$$ ", + " %%% ((( (((((( ((((((( ''''''''''''''''''' $$$$ ", + " %%% ((((((( (((((((( ((((((((( ((((((((((( ''' '' ' ' ' ' $$$$$ ", + " %%%% (((((((((( ((((((((((( (((((((((((( ((((((((((((( '' $$$$ ", + " %%% ((((((((((((( ((((((((((((( ((((((( ((((( (((((( ((((( $$$$ ", + " %%% (((((((( (((((( (((((((((((((((( ((((( ( (((( ((((( (((((( $$$$$ ", + " %%%% ((((( ( (((((((( ((((((( ((((( ((((((( ((((( ((((( (((((( ( $$$$ ", + " %%%% ((((( ((((( (((((( ( (((( ((((( ( (((( (((((( ( ((((( ((( $$$$ ", + " %%%% (((( ((((( (((((((( (((( (((((( (((((( (((((( ((((((((((((( $$$$$ ", + " %%%% (( (((((( ((((((( (((((((((((( ((((((((((( ((((((((((( $$$$$ ", + " %%% ((((((((((((( ((((((((( ( ((((((((( ((((((( $$$$ ", + " %%% ((((((((( ( )) ((((((((( (((((((( ( ((( $$$$ ", + " %%%% (((( )))) *** (( ( ( +++++++ $$$$$ ", + " %%%% ))))) ***** +++++++++++++++++++++++++++ $$$$ ", + " %%% )))))) **** ,,, - +++++++++++++++++++++++++++++ $$$$ ", + " %%%% ))))) *** ,,,, ------ -- - -------- +++++++++++++++++++++++++++++ $$$$$ ", + " %%%% ))))) **** ,,,, ---------------------- +++++++++ $$$$ ", + " %%%% )))))) **** ,,,,, ---------------------- +++++ $$$$ ", + " %%% ))))) **** ,,, ---------------------- ++++ $$$$ ", + " %%%% ))))) **** ,,,, ++++ $$$$ ", + " %%% )))))))) ***** ,,, . .. .. . .. +++++ $$$ ", + " %%% ))))) ***** ,,,, ........................ ++++ $$$ ", + " %%% ))))))) **** ,,,,, ................................ ++++ $$$ ", + " %%% )))))) ) **** ,,,,, ................................ ++++ $$$ ", + " %%% ))))))) **** ,,,, ................... ++++ $$$ ", + " %%% )))))) ) **** ,,, .... ++++ $$$ ", + " %%% )))))) ) //// / **** ,,, , ..... ++++ $$$ ", + " %%% ))))))) /////////// //// **** ,,,,, .... ++++ $$$ ", + " %%% )))))))) / ///////////////// *** ,,,,, .... +++ $$$ ", + " %%% ))))))) //////////////////// **** ,,,,, .... +++ + $$$$ ", + " %%%% ))))) ) /////// //////// **** ,,,,, .... ++++ $$$ ", + " %%%% )))))) ///// //// *** ,,,,, .... 00000000000000000000000 +++++ $$$$ ", + " %%%% )))))) ////// /////** ,,, ..... 00000000000000000000000 +++++ $$$ ", + " %%% ))))) ////// ///// ,,, .... 00000000000000000000000 ++++ $$$ ", + " %%%% ))) ////// ////// ,,,, ... 0 000 000000 ++++ $$$$ ", + " %%%% )) //// //// ,,,, .... 00 +++ $$$ ", + " %%% //// //// ,,,, .... ++++ $$$ ", + " %%%% //// ///// ... ++++ $$$$ ", + " %%%% //// //// ... ++++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% /// /// .... +++++++++++++++++++++++++++++++++ $$$ ", + " %%%% /// //// .... +++++++++++++++++++++++++++++++++ $$$ ", + " %%%% //// /// .... ++++++ ++++++++++++++ $$$$ ", + " %%%% /// /// .... +++ +++++ $$$ ", + " %%%%% /// /// .... $$$ ", + " %%%% //// //// ..... $$$$ ", + " %%%%% //// //// ..... $$$ ", + " %%%% /// //// ...... $$$ ", + " %%% //// //// ............................... $$$ ", + " %%% //// //// .............................. $$$ ", + " %%% //// //// ............................ $$$ ", + " %%% //// //// .... ..... ...... $$$ ", + " //// //// .. $$$ ", + " ///// ///// ", + " ///// ////// ", + " ///// //////// ", + " ////// ////// ", + " //////// ////// / ", + " ////////////// ////// 11111111111111111111111111111111111111 ", + " ///////////////// / 11111111111111111111111111111111111111 ", + " / / //////////// 11111111111111111111111111111111111111 ", + " / /// //// 11111111111111 11 1111 11 1 ", + " 111 1 111 1 ", + " ", + " ", + " ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-5-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-5-800-800-1.0-grid-reference.json index f2ccd1bc3..51d84aa87 100644 --- a/tests/visual_tests/grids/lines-5-800-800-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-5-800-800-1.0-grid-reference.json @@ -9,10 +9,10 @@ "16", "6", "2", - "10", "12", - "14", + "10", "13", + "14", "11", "3", "15", @@ -33,164 +33,164 @@ " ", " ", " ", - " !!! ! ", - " !! !! !! !! !!! ", - " ! !! ! ! ! !!!! !! ! ", - " !!!!! !!!! ! ! ! !!! ! ! ! ", - " !!! !!!! !! ! ! ! ! ! !!! ! ", - " !!!!!!!!!! ! !!! !!!!!!! !! ! !!! !!!! !!! ", - " !!!!!!!!! ! ! ! !!!!!!! !!! ! !!!!!!!! !!! ! ", - " ! ! !!!!!! !!!!! !!! ! ! !!!!!!! !!!! ! !! !!!!! ! ! !!!!! ", - " !!! !!!!!! !!!!!!!!!! ! !!!!!!!!!!!!!!! ! ! !!!!!!!!! !!! !!! !! ! ", - " !!! !!!! !!!!!! !!!!!!!!! !! !!!!!! !!!!! !! ! !!!!!!!!!!! !!! !!! !!! !!!! ", - " ! !! !!!!!! !!!!! !!! ! !!!!!! !!!!! ! ! ! !!!!! !!!!!!!!!! ! ! !!!!!!!! ", - " !!!! !!!!!! !!!!!!! !! !! ! !!!!!! !!!!!! !! ! !!!! !!!!!! !!!!!!!! ! ! ! !!!!! ", - " ! ! !!!!!!!! !!!!!! !!!! !!!!! !!!!!! ! !!! !! !!!!!! !!!!! ! ! !! !!!!!!!!! ", - " ! !!!!!! !!!!! ! !! !!!! !!!!!! !!!!! !!!!! !!! !! !!!!! !!!!! ! ! !! !!!!!! ", - " !!!!!!! !!!!! !! ! ! ! !!! !!!!!! !!!!! !!! ! ! !!!!!!!!! !!!!!! !!!! !!!!! ", - " !!!!!! !!!!!! !!! ! !! !!!!!! !!!!!! !! ! !!!!!! !!!!! !!!!! !!!!!! ", - " !!!!! !!!!!! !! !!! !!!!!! !!!!! !!! !!! !!!!! !!!!! ! !!!!!! ", - " !!!! !!!!! !!! !!! !!!!! !!!!! !!! ! !!!!!! !!!!!!!! ! !! !!!!! ", - " ! !!!!! !!! !!!!!!! !!!!!!!! !!!!! !!!!!!!! !! !!!!!!! ", - " !!!!!!!!! !!!!! !!!!!! !!!!!! !!!!! !! !!!!! ", - " !!!!!! !!!!!! !!!!! !!!!!! !!!!! !!!!!! ", - " !!!!! !!!!!! !!!!!! !!!!! !!!!!!!!!!! ", + " ", + " ", + " ", + " ! ", + " ! !!!! ", + " !!!!!!!! !!! ", + " !!!!!!!!!! ! !!!!!! ! !!! ", + " !!!!!!!! !!!!! !!!!!!!!! !!!!! ", + " !!!!!!!! !!!!!!!! !!!!!!!!!!!! !!!!!!!!! ! ", + " !!!!!!!! !!!!! ! !!!!!! !!!!! !!!!!!!!!!! !!!!! ", + " !!!!!! !!!!! ! !!!!!!! !!!!! !!!!!! !!!!!! !!!!!!!! ", + " !!!!!! !!!!!!! !!!!!! !!!!!! !!!!!! !!!!!!! !!!!!! ", + " !!!!!!! !!!!!!! !!!!! !!!!!! ! ! !!!!!! !!!!! !!!!!! ", + " !!!!!!! !!!!!! !!!!!! !!!!! ! !!!!!! !!!!!!! ! !!!!!! ", + " !!!!!!! !!!!! ! !!!!!! !!!!!! !!!!!! !!!!!!! !!!!!!! ", + " !!!!!! !!!!!! !!!!!! !!!!!!! !!!!!!! !!!!!! !!!!!!! ", + " !!!!! !!!!!! !!!!!!! !!!!!! !!!!!! !!!!! !!!!!!!! ", + " !!!! !!!!! !!!!!! !!!!!!! !!!!!! !!!!!! !!!!!! ", + " ! !!!!! !!!!!!! !!!!!!! !!!!! !!!!!! !!!!!! ", + " !!!!!! !!!!!!! !!!!!! ! !!!!!! !!!!!!! ! !!!!! ", + " !!!!!! !!!!!!! !!!!!! !!!!!! !!!!! !!!!!! ", + " !!!!! !!!!!!!! !!!!!! !!!!! !!!!!!!!!!! ", " !!!!!!!!!!! !!!!!!!!!! !!!!!!!! ", " !!!!!!!!! !!!!!!! !!!!! ", " !!!!!! !!!! !!! ", " ### !!! # !! $$$ ", " ##### ! #### $$$ ", " ######## ####### ## $$$ ", - " ########### ########## ##### # $ $$$ ", - " ###### ####### ###### ##### ######## ### $$ $$ $$$ ", - " ####### ## ##### ##### ## ##### ########## ##### $ $$ $$$ ", - " ###### # ##### ###### ### ###### ##### ##### ##### $ $$$ ", - " ###### # ###### ######### ###### ######## ###### ###### $ $$$ ", - " ###### # ####### ####### # # ##### ########## ###### ###### $$ $ $$$ ", - " ######### ## # ##### ###### # ### # # ##### ##### ### ##### ######## $$ $ $$$ ", - " ####### ### ### ##### ##### # ## # ## ###### ##### # # ## ###### ###### ##### $ $$$ ", - " ########## ## #### ###### ###### ### # ## ##### ###### ##### ###### ###### ## ### $$ $$$ ", - " ######## # # # # ##### ######### # #### ##### ##### ### ## # ##### ###### ## ### $$$ ", - " %%% ## # ### ## # ##### ##### ### ## # ###### ##### ## # # ######## ###### # ### $$$ ", - " %%% ## # # ###### ######## ### # # ###### ###### ######### ##### #### $$$ ", - " %%% % ### ######## ######### ### #### ##### ######## ## # ###### ###### $$$ ", - " %%%%% %% # ### ##### ###### # ### ### ##### ##### ## # # ########### $$$ ", - " %%%%% % #### ##### ###### ### ### ###### ##### ## ## # ####### # $$$ ", - " %%% % ##### ###### ##### ### # ########### ## # # ###### # $ $$$ ", - " %%% % %% ### ########### # && ######## # ## &&& && ### ###### # $ $ $$$ ", - " %%% % %%% & ### ######## && && &&& ###### # # &&&& && ### #### ### $$ $$ $$$ ", - " %%% %%%%% &&&& ### ##&&& && && & &### ### & ### ## # $$ $$ $$$ ", - " %%% % &&&& ### &#&& &&&& & &&&&& &&&# # &&& & # # # $$ $$ $$$ ", - " %%% % && & && & & && & && && &&&&& && & &&&&&&& & ## $$ $$$ ", - " %%% &&& & &&&& & & &&&&& && & & && && &&&&&&&& &&& $ $$$ ", - " %%% &&& && &&&&&& & &&& &&&&&& & & & &&&&&&&& &&&&& &&&&&&&&&& && $$ $$ $$$ ", - " %%% && && & &&&&&&&&& & &&&&&&&&&&&&&&& & &&&&&&&&&&&& && & && &&&& &&&&&&&&&&&&& && & $ $$$ ", - " %%% & &&& &&&&&&&&&&& && & &&&&&&&&&&&&& && &&&& &&&&&&&&&&&&&&& && && &&&&&&&&&& &&&&& & & $$$ ", - " %%% &&& &&&&&&&&&&&&&& & & &&&&&&& &&&&&& & && && &&&&&&& &&&&&&&& & &&& &&&&&& &&&&& & && $$$$ ", - " %%% &&& &&&&&&& &&&&& &&& & &&&&&&& &&&&& & &&& & &&&&&& &&&&&&&& & &&&&& &&&&&&&&&& $$$$ ", - " %%% %% &&&&&&& &&&& &&&& & &&&&&& &&&&&& && &&& &&&&& &&&&&& & &&& &&&&& &&&& && $$$$ ", - " %%% %%%% &&&&&& &&&&& & && &&&&& &&&&& & &&&&&&&&&& &&&& &&& &&&&&&& &&&& & & $$$$ ", - " %%% %%%%%&&&&& &&&& & & &&&&& &&&& && &&&&&&& &&&&&&& &&&&& &&&&&& &&& && $$$$$$ ", - " %%% % %&&&&& &&&& && &&&& &&&&& &&&& & &&&&& &&&&& &&&&& &&&&& &&& &&&&& $$ $$$$$$ ", - " %%% % %% &&& &&&& &&& &&&&&& &&&& &&&&& &&&&& &&&&&& &&&&&&&&&&&&&& $ $$$$$$ ", - " %%% % %% & &&&&& &&&&&&& &&&&&& &&&&&& &&&&&&&&&&&&& &&&&&&&&&&& $ $$$$ ", - " %%% % % &&&&&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&& &&&&&&&&& $ $$$$$$ ", - " %%% %% &&&&&&&&&&& &&&&&&&& &&&&&& &&&& $$ $ $$$$ ", - " %%% %% &&&&&&& &&&& & $$ $ $$$$ ", - " %%% && $ $$$$ ", - " %%% $$$$$$ ", + " ########### ########## ##### # $$$$$ ", + " ############## ############ ######## ### $$$$$ ", + " ####### # ##### ####### ###### ########## ##### $$$$ ", + " ######## ##### ####### ###### ##### ##### ##### $$$ ", + " ####### ####### ####### ####### ###### ###### ###### $$$ ", + " ###### ####### ##### # ##### ####### ###### ###### $$$$ ", + " ###### ## ####### ####### ##### ####### ####### ####### $$$$$ ", + " ####### ###### ###### ###### ##### ######## ####### $$$$$ ", + " ######## ######## ###### ###### ####### ####### ####### $$$$$ ", + " #### # # ##### ###### ###### ##### # ######## ######## $$$ ", + " %%% ## ####### ##### ###### ##### ######## ####### $$$$ ", + " %%% ######## ######## ####### ###### ####### ##### ## $$$ ", + " %%% ######## ####### ####### ####### # ###### ######## $$$ ", + " %%% ####### ###### # # ##### ####### ############## $$$$$ ", + " %%% ####### ######## ######## ##### ####### $$$$ ", + " %%%% # ###### ####### ############# ##### $$$$ ", + " %%%% ########### # ########## ## $$$$ ", + " %%% ######## # ######## $$$$$ ", + " %%%% ####### #### $$$ ", + " %%%% ### # ## $$$ ", + " %%%% && $$$ ", + " %%% && & & &&&&&&&&& $$$ ", + " %%% & &&& &&&&&&& &&&&&&&& &&&&&&&&&& $$$ ", + " %%%% &&&&&&&&& &&&&&&&&&& & &&&&&&&&&&&&&& &&&&&&&&&&&&&&&& $$$$$ ", + " %%% &&&&&&&&&&& &&&&&&&&&&&&&& &&&&&&&&&&&&&&&& &&&&&&&&& &&&&& $$$$$ ", + " %%%% &&&&&&&&&&&&&&& &&&&&&& &&&&&&& &&&&&&&& &&&&&& &&&&&&& &&&&& $$$$ ", + " %%%% &&&&&&&& &&&&& &&&&&&& &&&&&& &&&&&&&& &&&&&& &&&&&& &&&&& $$$$$ ", + " %%%% &&&&&& &&&& &&&&&&& &&&& &&&&&&& &&&&& &&&&&&& &&&& $$$$ ", + " %%%% &&&&&& &&&&& &&&&& &&&&& &&&&&&& &&&&& &&&&&& &&&&& $$$$ ", + " %%%% &&&&& &&&&& &&&&&& &&&& &&&&&& &&&& & &&&&& &&&&& &&& $$$$$ ", + " %%% &&&&& &&&&& &&&&&& &&&& &&&&&&& &&&&&& &&&&& &&&&&& &&&&&& $$$$$ ", + " %%% &&& &&&& &&&&&&& &&&& &&&&& &&&&&& &&&&&& &&&&&&&&&&&&&& $$$$ ", + " %%% & &&&&&& & &&&&&&& &&&&&& &&&&&&& &&&&&&&&&&&&& &&&&&&&&&&& $$$$$ ", + " %%% &&&&&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&& &&&&&&&&& $$$$$ ", + " %%% &&&&&&&&&&& &&&&&&&& &&&&&& &&&& $$$$ ", + " %%% &&&&&&& &&&& & $$$$ ", + " %%% && $$$$ ", " %%% $$$$ ", - " %%% '''''''' $$$$ ", - " %%% '''''''' $$$$ ", - " %%% '''''''' $$$$ ", - " %%% % ''' $$$$ ", - " %%% % ''''''''''''''''''''''''' $$$$ ", - " %%% % %% ''''''''''''''''''''''''' $$$$ ", - " %%% % %% (( '''''''''''''''''''''''''$ $ $$$$ ", - " %%% %% ((((((( (((((((( '''''''''''''''''''''''''$$ $$$$$$ ", - " %%% %% %% (((((( (((((((( (((((((((( (((((((((((( ' ''' $$ $$$$$$ ", - " %%% % %% (((((((((( (((((((((((( ((((((((((((( (((((((((((((( ' ''' $ $$$$$$ ", - " %%% %% % (((((((((((((( ((((((((((((((( (((((((( ( ((((( ((((((( ((((( ''' '' $$$$$$ ", - " %%% ((((((( (((((( ((((((( ((( (((( (((((( (( (((((( (((((( ((((((( ' ' ' ''' $$$$$ ", - " %%% ((((((( ( (((( (((((( (((((( (((( (((((( (((( (((( ((((( (( (((( ' ' ''' $$ $$$$$$ ", - " %%% (((((( (( (((( (((((( ( (( (((( ((((( ( ((((((( ((((( ( ((((((( $ $$$$ ", - " %%% (((((((((( ( (((( ((((( (( (((( (((((( ((( (((( ((((((((( (( (((((( (( $$$$ ", - " %%% ((((((((( (((( ((((( ((((( (( (( (((( ((((( ( ((( (((( (((((((((( (( ( ((((((( (((( $$$$ ", - " %%% (((( ( ((( (( (((( (((((( ((( (( (((( ((((((( ( (( (((( (((((((( ( ((( ((( ( ((((( (((((( $$$$ ", - " %%% %% (( (((( ( ((((( (((((( ( ((((( (((((( (( ( ( (((((((((((((( ( (( (( ((((((((((((( $$$$ ", - " %%% % %% ((( ((((((((( (((((( ( (((((((((((((( (((( ( (((((((((((( (((( (( ((((((((( $$$$ ", - " %%% %% (( ((((((((((((( (((((((((((( (( (( ((((((((( ((( ((( (((((( (( $$$$$$ ", - " %%% %% % ( (((((((( ((( )) (((((((((( (( ( (( ((( ( ((( (((((( * $$ $$$$$$ ", - " %%%%% % (( ( ((((( ( (((() +++ (((( ( ((( ,, (((((( ((( (( ( (( ** ** * $$ $$$$$$ ", - " %%%% % %% (( ( ())()) +++ (( ((( ,,, ,, ((((( ************ (( ( * * ** $$$$$$ ", - " %%%%% ((( ( ((())) +++ ( ( ( ((( ( ***************************((((( *** * *** $ $$$$$$ ", - " %%%% % % ((((( (()())) ++++ ( (((((--- ,,,,,,,, (( ((((( **************************((*(******* ******* $$ $ $$$$ ", - " %%%%%% ((( ()))) ++++ ((( ((--- ,,, ,,,,, ( ((( ********************************* * * $$ $ $$$$ ", - " %%%% )))))) ) +++ (--- ,,,,,, **************** $ $$$$ ", - " %%%% ))))))))) ) +++ ---- ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ****** $$$$$$ ", - " %%%% ))))) ))) )) +++ ----- -- ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, . .. **** $$$$ ", - " %%%% )))))) ))) )) +++ --- -- - ,,,,,,,,,,,,,,,,,,....,..,,,, .. ... . **** $$$$ ", - " %%%% )))))) ) ))) ++++++ + ------ - . ... ... .. . .... **** $$$$ ", - " %%%% ))))) ) ++++ ++ + --- - ... ... .. . .. . .. **** $$$$ ", - " %%%%% )))))) )) +++++++ ----- -- . .. ..... ... ..... **** $$$$ ", - " %%%%%% )))))) ) ++++ ++ ---- -- .. ..... ... . . . *** $$$$ ", - " %%%% %% ))))) +++ + + ----- -- . .. ................................. *** $$$$ ", - " %%%%%% % )))))) / +++ + ++ ---- -- .......................................... *** $ $ $$$$ ", - " %%%%%% )))))))) // //// // ++++++ ++ --- -- ........................................... *** $$ $$$$ ", - " %%%%%%%%% ))))) ))) ///// //// ++++++++ --- ................. *** $$ $ $$$$ ", - " %%%%%% %% )))))) ))) )) // // // ++++++ --- ..... *** $ $$$$$$ ", - " %%%%%%%%% )))))) )) ) ) /// /// // // +++ --- .... *** $$$$$$ ", - " %%%%%% ))))) )) ) // //// ///// / +++ ---- . ... *** $$$$$ ", - " %%%% )))))) ) )) //////// /// / +++ ---- . . ... *** $$ $$$$$$ ", - " %%%% )))))) ))) /////////////// / +++ ---- .. . .... *** $ $$$$ ", - " %%%% ))))) ) ////////////////////// ++++ --- . . .... *** $$$$ ", - " %%%% )))))) ////// ////////////// ++++ --- .. ..... *** $$$$ ", - " %%%% )))))) ////// ///////// +/+ --- . ..... **** $$$$ ", - " %%%% %% ))))) ) ///// //// /++/ --- ... ..... **** $$$$ ", - " %%%% %%%% ))))))))) ) ////// ///////++// ---- . ... 00000000000000000000000000000 **** $$$$ ", - " %%%%%% %)))))))) )) ////// //// /++////---- . ... 00000000000000000000000000000 *** $$$$$$ ", - " %%%%%% %%)))) ))) )) ///// //// / / --- ... 00000000000000000000000000000 *** $$$$$$$$$ ", - " %%%%%% )%))) ) ) )) ////// //// // /--- ... 00 00 0 0000 *** $$ $$$$$$ ", - " %%%% % %%%) ) ) ////// /////// --- ... 000000 0 00 *** $$$$$$$ ", - " %%% %) ))) ///////// //// // --- ... **** $ $$$$$$ ", - " %%%% % ) //////// //// / --- ... 00000000 00 00000 ****** **$$ $ $$$$ ", - " %%% / / /// //// --- ... 00 0000 000000 *** ** *$$ $ $$$$ ", - " %%% // // /// ///// ... ***** * $ $$$$ ", - " %%% / / /// //// ... **************** **** * * $$$$$$ ", - " %%% // / //// /// . ... ********************************************** ** $$$$ ", - " %%% // // //// /// .. ..... ******************************************** * * $$$$ ", - " %%% // /// //// ..... ********************************* * ** $$$$ ", - " %%% ////// //// . ... * * *** ** ** *** ** $$$$ ", - " %%%%% /// //// .. ..... * **** * **** ** *** $$$$ ", - " %%% %% % /// /// / ......... ** * * $$$$ ", - " %%% %%%%% //// /// // .. .. .... **** * ****** ***** ** $$$$ ", - " %%%% %% /////// ///// / . ..... ** * *** ** * ******* $ $ $$$$ ", - " %%%%% %% //////// ///// // . .... $$ $$$$ ", - " %%%%%% // ///// ///// // ..... $$ $ $$$$ ", - " %%%%% %% // / /// //// / ...... $ $$$$$$ ", - " %%%%%%%% // / /// /// / // .......................................... $$$$$$ ", - " %%%%%% // ///// /// //// ......................................... $$$$$ ", - " %%% / // //// /// / . .. ...................................... $$ $$$$$$ ", - " %%% / // //// /// .. . . . . .. . $ $$$$ ", - " %%% / //// /// .. ... .. ... ... .. $$$$ ", - " //// //// ... . $$$$ ", - " //// ///// ..... .. . . . . ..... $$$$ ", - " ///// ///// ... .... ... .... ", - " //// ////// ", + " %%% $$$$ ", + " %%%% '''''''' $$$$$ ", + " %%%% '''''''' $$$$$ ", + " %%%% '''''''' $$$$ ", + " %%%% ''' $$$$ ", + " %%%%% ''''''''''''''''''''''''' $$$$ ", + " %%% ''''''''''''''''''''''''' $$$$ ", + " %%%% (( ''''''''''''''''''''''''' $$$$ ", + " %%%% ((((((( (((((((( ''''''''''''''''''''''''' $$$$ ", + " %%% (((((( (((((((( (((((((((( (((((((((((( ''' '' ''' ''' $$$$$ ", + " %%%% (((((((((( (((((((((((( ((((((((((((( (((((((((((((( $$$$ ", + " %%%% (((((((((((((( ((((((((((((((( ((((((((( (((((( (((((((( ( (((( $$$$$ ", + " %%%% ((((((((( (((((( (((((((((( ((((( (((((( (((((( (((((( ( (((( $$$$ ", + " %%%% ((((((( ( ((((((( (((((((( ( ((((( (((((( (((( ((((( ( ( (((( $$$$ ", + " %%% (((((( (( ((((( ((((((( (((( ((((((( ((((( ((((( ( (((((( $$$$$ ", + " %%%% (((((( (((( ((((( ((((( ((((((( (((((( (((((((( ((((( (( $$$$ ", + " %%%% ((((((( (((( ((((( ((((( ((((((( ((((( ((((( ( (((( (((( $$$$ ", + " %%%%% (((( (((( (((((( ((((( ((((( ( (((((( ((((((( ((((( (((((( $$$$$ ", + " %%%%% (( ((((( ((((((( (((((( (((((( ( ((((((((((((((((( (((((((((((((( $$$$$ ", + " %%% (((((( (((((((( (((((((((((( (((((((((((( ( (((((((((( $$$$ ", + " %%% (((((((((((( (((((((((( (((((((((( ( (((((((( $$$$ ", + " %%% (((((((((( )) ((((((((( ((( ((( (((( $$$$$ ", + " %%%% (((((( ( )))) *** (( ( + $$$$ ", + " %%%% ( ( ))))) *** +++++++++++++ + +++++ $$$$ ", + " %%%% )))))) *** ++++++++++++++++++++++++++++++++ + $$$$$ ", + " %%%% )))))) **** ,,, +++++++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% ))))))) **** ,,, - - ++++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% )))))))) *** ,,, ------- - --- - ----- +++++++++++++++ $$$$ ", + " %%%% )))))))) **** ,,,, ----------------------------- +++++++ $$$$ ", + " %%%% ))))))) **** ,,,, ----------------------------- ++++++ $$$$ ", + " %%%% )))))) ) **** ,,, ----------------------------- +++++ $$$$ ", + " %%%%% )))))) ) ***** ,,, +++++ $$$$ ", + " %%%% )))))))) **** ,,, +++++ $$$$ ", + " %%%% )))))) ) *** ,,, ++++ $$$$ ", + " %%%%% )))))) *** ,,,, . .. .. . . . +++ $$$$$ ", + " %%%%% ))))))) **** ,,,,, . ................................. +++ $$$$ ", + " %%%% ))))))) *** ,,,,, .......................................... +++ $$$$ ", + " %%%% )))))) **** ,,,, ............................................ +++ $$$$ ", + " %%%% ))))) **** ,,,, .................. +++ $$$$ ", + " %%%% )))))) *** ,,,, ...... +++ $$$$ ", + " %%%% )))))) **** ,,, .... +++ $$$$$ ", + " %%%%% ))))) ) / // **** ,,,, ... +++ $$$$$ ", + " %%%% )))))))) //////// **** ,,,,, .... +++ $$$$ ", + " %%%% )))))) /////////////////// / **** ,,,,, .... +++ $$$$ ", + " %%%% ))))))) //////////////////////// **** ,,,, .... +++ $$$$$ ", + " %%%% ))))))) /////// //////////////// **** ,,,, ... +++ $$$$ ", + " %%%% )))))) /////// ///////// *** ,,, .... ++++ $$$$ ", + " %%%% )))))) ) /////// //// *** ,,,, ... ++++ $$$$ ", + " %%%% ))))))))) ////// ///// *** ,,,, ... 00000000000000000000000000000 ++++ $$$$ ", + " %%%% )))))))) / ////// //// *** ,,,, ... 00000000000000000000000000000 +++ $$$$ ", + " %%%% ))))))) /////// //// ,,, ... 00000000000000000000000000000 +++ $$$$ ", + " %%%% )))))) ////// ///// ,,, ... 0 000 0000000 0 +++ $$$$ ", + " %%%%% ))) ////// ///// ,,, ... 00 ++++ $$$$ ", + " %%%% ) //// ////// ,,, ... ++++ $$$$ ", + " %%% /// //// ,,, ... ++++ $$$$ ", + " %%% /// //// ,,, ... ++++ $$$$$ ", + " %%% /// ///// ... +++++ $$$$ ", + " %%% /// //// ... ++++++++++++++++ +++++ $$$$ ", + " %%% //// /// ... +++++++++++++++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% //// /// ... ++++++++++++++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% /// //// ... + ++++++++++++++++++++++++++++++++++++ $$$$ ", + " %%% //// //// .... ++++ +++ ++++ $$$$ ", + " %%%% /// //// ..... $$$$$ ", + " %%%% /// /// .... $$$$$ ", + " %%% ///// //// ..... $$$$$ ", + " %%% ///// //// ...... $$$$$ ", + " %%%% //// //// ..... $$$$ ", + " %%% /// //// ..... $$$$$ ", + " %%%% /// //// ....... $$$$$ ", + " %%%% / /// /// / .......................................... $$$$ ", + " %%% //// //// ........................................ $$$$ ", + " %%% ///// /// ........................................ $$$$ ", + " %%% ////// //// ... . . . ...... $$$$$ ", + " %%% ///// /// . $$$$ ", + " ///// ///// $$$$ ", + " ///// ////// $$$$ ", + " ////// ///// ", + " ///// //////// ", " //// /////// ", - " //// ///// ", - " ///// /////// / / ", - " / ///// ///////// /// ", - " / /////////// ///// / /// ", - " // / /////////////////////// / / 11111111111111111111111111111111111111111111111111 ", - " / / //////////////////// /// 11111111111111111111111111111111111111111111111111 ", - " / / //////////// /// 11111111111111111111111111111111111111111111111111 ", - " //// / / //// 1111111111 1 1 1111 ", - " / /// // /// 1111111 1 1 1 1 11 ", - " /// ///// 111 11 1 1 ", - " / /// / 11 1 11 11111 1 11111 ", - " // ///// 11 11111 111 11 1 111111 ", - " ////// 1 111111 ", + " //// /////// ", + " ///// ////// ", + " ///// ////// ", + " /////////// ///// ", + " /////////////////////// 11111111111111111111111111111111111111111111111111 ", + " //////////////////// 11111111111111111111111111111111111111111111111111 ", + " // ///////////// 11111111111111111111111111111111111111111111111111 ", + " / /// ///// 11111111111 111111 11 11 1111111111 ", + " / /// 1 11 11 11 ", + " ", + " ", + " ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-6-200-200-1.0-grid-reference.json b/tests/visual_tests/grids/lines-6-200-200-1.0-grid-reference.json index f8a58961a..e67327f9a 100644 --- a/tests/visual_tests/grids/lines-6-200-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-6-200-200-1.0-grid-reference.json @@ -27,42 +27,42 @@ " !!!!! !!!! !!! ", " !!!!!!!! !!!!!!! !!!!!! !!! ", " !!!!!!!!!! !!!!!!!!! !!!!!!!! !!!! ", - " !!!!! !!!!! !!!!! !!!!!!!!!!!!!!!!!!!!! ", - " !! #! !!!!!!!!! # !!!!!!!!! !!!!!!!! ", + " !!!! !!!!! !!!!! !!!!!!!!!!!!!!!!!!!!! ", + " !! # !!!!!!!!! # !!!!!!!!! !!!!!!!! ", " #### !!!!!!! ### !!!!! ## !!!!!! ", - " ###### !!! ###### !!! ##### !! ###$$$ ", - " ########## ! ########!! ######## ####$$$ ", + " ###### !!! ###### !!! ##### !! ## $$$ ", + " ########## ! ######### ######## ####$$$ ", " #### ##### ############ ###############$$$ ", " %%%## ########## ######### ######## $$$ ", " %%% ####### ####### ##### $$$ ", - " %%% &&&& #####& &&&##### &&&&&### $$$ ", - " %%%&&&&&&& &&&&&& &&&&&&# #&&&&&& $$$ ", - " %%%%%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& $$$ ", + " %%% &&&& #####& &&&#### &&&&&### $$$ ", + " %%%&&&&&&& &#&&&& &&&&&&# &&&&&&& $$$ ", + " %%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& $$$ ", " %%%&&& &&&&&&&&&&&&&&&& &&&&&&& &&&&&& $$$ ", " %%% & &&&&& &&&&&&& &&&&& &&&&& '''$$ ", " %%% &&& && & '''''''$$ ", - " %%% ((( (((( (((( ((((( '''''''$$ ", + " %%% ((( ((((( (((( ((((( '''''''$$ ", " %%%((((((( (((((( ((((((( ((((((('''''''$$ ", - " %%%((((((((((((((((((((((((((((((((((( $$$ ", - " %%%((( (((((((((((((((( ((((((( ((((( $$$ ", - " %%% ( ((((( ())(((( ((((*********** $$$ ", + " %%(((((((((((((((((((((((((((((((((((( $$$ ", + " %%%((( (((((((( ((((((( ((((((( ((((( $$$ ", + " %%% ( ((((( )((((( ((((*********** $$$ ", " %%% (((++ ))),,,--------************ $$$ ", " %%% ++++++ ))),,,--------***.*********$$$ ", - " %%% ++/++ ))),,,------.-.... ****$$$ ", - " %%% ++++//// ))),,,............ ***$$$ ", + " %%% +++++ ))),,,--------.... ******$$$ ", + " %%% +++++/// ))),,,............ ***$$$ ", " %%% +++++//////)),,,,............ ***$$$ ", - " %%%++++////////)),,,,... 0000000 ***$$$$", - " %%%+++//////////),,,.... 0000000 ***$$$$", + " %%%++++////////)),,,,... 0000000 ***$$$ ", + " %%%+++//////////),,,.... 0000000 ***$$$ ", " %%%+++//// //,,,... 0000000*******$$$ ", - " %%% /// /// .... . *************$$$ ", - " %%% /// /// .... . ************ $$$ ", - " %%% /// /// ............. **** $$$ ", - " %%% //// /// ............ * $$$ ", + " %%% /// /// .... *************$$$ ", + " %%% /// /// .... ************ $$$ ", + " %%% /// /// ............. *** $$$ ", + " %%% //// /// ............ $$$ ", " %%% //// //// ........... $$$ ", - " ///// ////// 111 ", + " ///// ////// . . 111 ", " /////////// 1111111111111 ", " //////// 1111111111111 ", - " ///// 1111111111111 ", + " ////// 1111111111111 ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-6-400-400-1.0-grid-reference.json b/tests/visual_tests/grids/lines-6-400-400-1.0-grid-reference.json index cff78e9a7..6fe7530ff 100644 --- a/tests/visual_tests/grids/lines-6-400-400-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-6-400-400-1.0-grid-reference.json @@ -34,76 +34,76 @@ " !!!!!!!!!!!! !!!!!!!!!! !!!!!!!! !!! ", " !!!!!! !!!!!! !!!!! !!!!!! !!!!!!!!!!! !!!!! ", " !!!!!! !!!!! !!!!!! !!!!! !!!!!! !!!!!! !!!!!! ", - " !!!!!! !!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!! ", - " !!!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!!!! !!!!!! ", - " ! !!!!! !!!!!! !!!!!!!!!!!! !!!!!!!!!!! ", - " !!!!!!!!! !!!!!!!!!!! !!!!!!! ", - " # !!!!!!! # !!!!!! !!!!! ", + " !!!!! !!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!! ", + " !!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!! !!!!!! ", + " ! !!!!! !!!!!! !!!!!!!!!!! !!!!!!!!!!! ", + " !!!!!!!!! !!!!!!!!! !!!!!!! ", + " ## !!!!!!! # !!!!!! !!!!! ", " #### !!!!! #### !!! ## !!! $$$ ", - " ####### !!! ###### ! #### # $$$ ", + " ####### ! ###### ! #### # # $$$ ", " ########## ######### ####### ### $$$ ", " ####### ##### ###### ##### ######### ##### $$$ ", - " ###### ###### ###### ##### ###### ##### ##### $$$ ", - " ###### ###### ##### ###### ##### ####### ###### $$$ ", - " %%%%###### ##### ###### ###### ##### ######## ###### $$$ ", - " %%%% # # ##### ##### ##### ###### ########## $$$ ", - " %%%% ############ ############# ######## $$$ ", + " ###### ###### ###### ##### ############ ##### $$$ ", + " ##### ###### ##### ###### ##### ###### ###### $$$ ", + " %%%%#### ##### ###### ###### ##### ###### ###### $$$ ", + " %%%% # ##### ##### ##### ###### ########## $$$ ", + " %%%% ############ ########### ######## $$$ ", " %%%% ######### ######## ##### $$$ ", " %%%% ###### ###### ## $$$ ", - " %%%% ##### ### && $$$ ", - " %%%% &&&& ##&#&&& &&&&&& &&&&&&& $$$ ", + " %%%% #### ### && $$$ ", + " %%%% &&&& ##&&&&& &&&&&& &&&&&&& $$$ ", " %%%% &&&&&&&& &&&&&&&& &&&&&&&& &&&&&&&&&& $$$ ", " %%%% &&&&&&&&& &&&&&&&&&& &&&&&&&&&&& &&&&&&&&&&&& $$$ ", " %%%% &&&&&&&&&&&& &&&&&& &&&&& &&&&&& &&&& &&&&&& &&&& & $$$ ", " %%%% &&&&& &&&& &&&&&& &&&& &&&&& &&&& &&&&& &&&&&&&&& $$$ ", - " %%%% &&& & &&&&&&&&&& &&&&&&&&&&& &&&&&&&&&& &&&&&&&& $$$ ", - " %%%% & &&&&&&&&& & &&&&&&&& &&&&&&&& &&&&&& $$$ ", + " %%%% &&& &&&&&&&&&& &&&&&&&&&& &&&&&&&&&& &&&&&&&& $$$ ", + " %%%% & &&&&&&&&& &&&&&&&& &&&&&&&& &&&&&& $$$ ", " %%%% &&&&&&& &&&&&& &&&&& &&&& $$$ ", - " %%%% &&& & ''''' $$$ ", + " %%%% &&& & & ''''' $$$ ", " %%%% ''''' $$$ ", - " %%%% ''''' $$$$$ ", - " %%%% ''''''''''''' $$$$ ", - " %%%% (( ((((( ((((( ((((((( ''''''''''''' $$$ ", + " %%%% ''''' $$$ ", + " %%%% ''''''''''''' $$$ ", + " %%%% (( ( ((((( ((((( ((((((( ''''''''''''' $$$ ", " %%%% ((((((( (((((((( (((((((( ((((((((( ''''''''''''' $$$ ", " %%%% ((((((((( (((((((((( ((((((((((( ((((((((((( $$$ ", " %%%% ((((((((((( (((((( (((( (((((( ((((( (((((( (((( $$$ ", - " %%%%((((((( ((((( (((((( (((( ((((( ((((( ((((( (((( (( $$$ ", - " %%%% ((( ( ((((( ((((( ((((((((((( (((((((((( ((((((((( $$$ ", - " %%%% ( ((((((((() ((((((((((( (((((((( (((((((( $$$ ", + " %%%%(((((( ((((( (((((( (((( ( ((((( ((((( ((((( (((( (( $$$ ", + " %%%% ((( ((((( ((((( (((((((((( (((((((((( ((((((((( $$$ ", + " %%%% ( ((((((((() ((((((((( (((((((( (((((((( $$$ ", " %%%% ((((((()) ((((((( ((((( *** (((( $$$ ", - " %%% (((( )))) ++++ (( (****************** $$$ ", + " %%% (((( )))) ++++ (( ****************** $$$ ", " %%% )))))) ++++ ,,,, ******************** $$$ ", " %%% )))))) +++ ,,, --------------- ********************* $$$ ", - " %%% ))))) +++ ,,, --------------- ** ***** $$$ ", - " %%%%% )))))) +++ ,,, --------------- * **** $$$ ", - " %%%% )))))) +++ ,,, .............. **** $$$ ", + " %%% ))))) +++ ,,, --------------- * ***** $$$ ", + " %%% )))))) +++ ,,, --------------- **** $$$ ", + " %%% )))))) +++ ,,, .............. **** $$$ ", " %%% ))))) ++++ ,,, ...................... *** $$$ ", " %%% )))))) ++++ ,,,, ....................... *** $$$ ", " %%% )))))) +++ ,,,, ....................... *** $$$ ", " %%% ))))) /////// +++ ,,, .... *** $$$ ", - " %%% )))))) //////////// +++ ,,, ..... *** $$$ ", + " %%% )))))) //////////// +++ ,,, ... *** $$$ ", " %%% ))))) ///////////////+++ ,,, ... *** $$$ ", " %%% ))))) ////// ///////++++,,, ... 000000000000000 *** $$$ ", - " %%%))))))) ///// ///+++,,,, ... 000000000000000 **** $$$ ", - " %%% ))) ) ///// //// ,,,, ... 000000000000000 **** $$$ ", + " %%%)))))) ///// ///+++,,,, ... 000000000000000 **** $$$ ", + " %%% ))) ///// //// ,,,, ... 000000000000000 **** $$$ ", " %%% )) ///// ////,,,, ... *** $$$ ", - " %%% //// /////,, ... **** **** $$$ ", - " %%% /// / //// ... *********************** $$$ ", + " %%% //// /////,, ... **** * * **** $$$ ", + " %%% /// //// ... *********************** $$$ ", " %%% /// /// ... ********************** $$$ ", - " %%% /// /// ... ********************* $$$$$ ", - " %%% /// /// .... $$$$ ", - " %%% //// /// ..... * $$$ ", - " %%% //// /// ........................ $$$ ", + " %%% /// /// ... ********************* $$$ ", + " %%% /// /// .... $$$ ", + " %%% //// /// ...... $$$ ", + " %%% //// /// ....................... $$$ ", " %%% //// //// ...................... $$$ ", " %%% //// //// ..................... $$$ ", " %%% //// /// .................. $$$ ", " //// //// $$$ ", " //// ////// ", - " //// ////// ", - " ////////// ///// 11111111111111111111 ", + " //// / ////// ", + " ////////// ///// 111111111111111111111 ", " ////////////// 11111111111111111111111111 ", " //////////// 11111111111111111111111111 ", - " // //// 11111111111111111111 ", + " //// 11111111111111111111 ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-6-600-600-1.0-grid-reference.json b/tests/visual_tests/grids/lines-6-600-600-1.0-grid-reference.json index 706166b05..ecac2a691 100644 --- a/tests/visual_tests/grids/lines-6-600-600-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-6-600-600-1.0-grid-reference.json @@ -38,114 +38,114 @@ " !!!!!!!!!!! !!!!!!! !!!!! ! ", " !!!!!! !!!!! !!!!!!!!!! !!!!!!!! !! ", " !!!!!! !!!!! !!!!! !!!!!! !!!!!!!!!!! !!!!! ", - " !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!!! ", + " !!!!!! !!!!!! !!!!!! !!!!!!! !!!!!! !!!!! !!!!!! ", " !!!!!! !!!!! !!!!!! !!!!! !!!!! !!!!!! !!!!! ", " !!!!!!! !!!!! !!!!!! !!!!! !!!!!! !!!!!! !!!!!! ", - " !!!!!! !!!!!! !!!!!! !!!!!! !!!!!!!! !!!!! !!!!!! ", - " !!!!!! ! !!!!!! !!!!! !!!!!! !!!!! !!!!! !!!!! ", - " !!! ! !!!!! !!!!!!! !!!!!! !!!!!! !!!!!! !!!!!! ", - " !!!!! !!!!!! ! ! !!!!!! !!!!!! !!!!!! !!!!!! ", + " !!!!!! !!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!!! ", + " !!!!! !!!!!! !!!!! !!!!!! !!!!! !!!!! !!!!! ", + " !!! !!!!! !!!!!! !!!!! !!!!!! !!!!!! !!!!!! ", + " !!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! ", " !!!!! !!!!!! !!!!!! !!!!! !!!!!!!!!! ", - " !!!!!!!!!!! !!!!!!!!! !!!!!!!! ", - " !!!!!!! !!!!!! !!!!!! ", - " ## !!!!! # !!!! ! !! ", - " ##### !!! #### ! # $$$$ ", + " !!!!!!!!!!!! !!!!!!!!! !!!!!!!! ", + " !!!!!!! !!!!!! !!!!! ", + " ## ! !!!!! # !!!! ! !! ", + " ##### !!! #### # ! # $$$$ ", " ######## ###### ### $$$$ ", " ########## ######### ##### ## $$$$ ", - " ###### ###### ###### ##### ######### #### $$$$ ", + " ###### ###### ############ ######### #### $$$$ ", " ###### ###### ###### ##### ########### ###### $$$$ ", " ###### ##### ###### ###### ##### ##### ###### $$$$ ", " ####### ##### ###### ###### ##### ###### ##### $$$$ ", " ###### ###### ##### ##### ###### ##### ###### $$$$ ", " ##### ###### ###### ##### ##### ###### ###### $$$$ ", - " %%% ### # ###### ###### ####### ##### # ###### ###### $$$$ ", - " %%% ####### ###### # # ##### ###### ##### ###### $$$$ ", + " %%% ### ##### ###### ###### ##### ###### # ###### $$$$ ", + " %%% ##### ###### ##### ###### ##### ###### $$$$ ", " %%% ###### ###### ##### ###### ########## $$$$ ", - " %%% ##### ##### ###### ##### ######## $$$$ ", - " %%%%% ########### ########## ###### $$$$ ", - " %%%%% ######### ####### ## $$$$ ", + " %%% ###### ##### ###### ##### ######## $$$$ ", + " %%% ########### ########## ##### $$$$ ", + " %%% ######### ####### ## $$$$ ", " %%% ###### #### $$$$ ", " %%% ### ## $$$$ ", " %%% &&&&& $$$$ ", " %%% && &&&&& &&&&&&&& &&&&&&&&& $$$$ ", " %%% &&&&&&&& &&&&&&&&& &&&&&&&&&&& &&&&&&&&&&& $$$$ ", " %%% &&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&&&&& &&&&&&&&&&&&&& $$$$ ", - " %%% &&&&&&&&&&&&& &&&&&&& &&&&& &&&&&& &&&&& &&&&&& & &&&&& $$$$ ", - " %%% &&&&&& &&&& &&&&&& &&&& &&&&&& &&&& &&&&& & &&&& $$$$$ ", - " %%% &&&&& &&&& &&&&& &&&& &&&&& &&&&&& &&&&& &&&& & $$$$ ", - " %%% &&&&&& &&&&& &&&&& &&&& &&&&& &&&& &&&&&& &&&& &&&& $$$$ ", + " %%% &&&&&&&&&&&&& &&&&&&& &&&&& &&&&&& &&&&& &&&&&& &&&&& $$$$ ", + " %%% &&&&&& &&&& &&&&&& &&&& &&&&&& &&&& &&&&& &&&& $$$$ ", + " %%% &&&&& &&&& &&&&& &&&& &&&&& &&&& &&&&& &&&& & $$$$ ", + " %%% &&&&& &&&&& &&&&& &&&& &&&&& &&&& &&&&&& &&&& &&&& $$$$ ", " %%% &&& &&&&& &&&&&& &&&&& &&&&&& &&&&&&&&&&&&& &&&&&&&&&&&& $$$$ ", " %%% & &&&&&&&&&&&& &&&&&&&&&&& &&&&&&&&&& &&&&&&&&& $$$$ ", - " %%% &&&&&&&&&& &&&&&&&&& &&&&&&&& &&&&&& $$$$ ", - " %%% &&&&&&& & &&&&&& &&& & $$$$ ", - " %%% && && $$$$ ", - " %%% '''''' $$$$ ", + " %%% &&&&&&&&& &&&&&&&&& &&&&&&&& &&&&&& $$$$ ", + " %%% &&&&&&& &&&&&& &&& & $$$$ ", + " %%% && $$$$ ", " %%% '''''' $$$$ ", " %%% '''''' $$$$ ", " %%% '''''' $$$$ ", + " %%% ' ' '''''' $$$$ ", " %%% ''''''''''''''''''' $$$$ ", - " %%% ''''''''''''''''''' $$$$ ", - " %%% ((( (((((( ((((((( ''''''''''''''''''' $$$$ ", - " %%% ((((((( (((((((( ((((((((( ((((((((((( '' $$$$ ", - " %%% (((((((((( ((((((((((( (((((((((((( ((((((((((((( ' $$$$ ", - " %%%%% ((((((((((((( ((((((((((((( ((((((( ((((( (((((( ( (((( $$$$ ", - " %%% ((((((( ((((( (((((( ((((( ((((( (((( ((((( ( (((( $$$$ ", + " %%% ( ''''''''''''''''''' $$$$ ", + " %%% ( ((( (((((( ((((((( ''''''''''''''''''' $$$$ ", + " %%% ((((((( (((((((( ((((((((( ((((((((((( $$$$ ", + " %%% (((((((((( ((((((((((( (((((((((((( ((((((((((((( $$$$ ", + " %%% ((((((((((((( ((((((((((((( ((((((( ((((( (((((( (((( $$$$ ", + " %%% ((((((( ((((( (((((( ((((( ((((( (((( ((((( (((( $$$$ ", " %%% ((((( (((( (((((( ((((( (((((( ((((( ((((( (((( ( $$$$ ", - " %%% (((((( (((( ((((( (((( ((((( ( (((( (((((( ((((( ((( $$$$ ", - " %%% (((( ( (((( ((((( (((( ((((( ((((( (((((( (((((((((((( $$$$ ", + " %%% ((((( (((( ((((( (((( ((((( (((( (((((( ((((( ((( $$$$ ", + " %%% (((( (((( ((((( (((( ((((( ((((( (((((( (((((((((((( $$$$ ", " %%% (( (((((( (((((( ((((((((((( (((((((((( (((((((((( $$$$ ", " %%% ((((((((((( ((((((((( (((((((( ((((((( $$$$ ", - " %%% ((((((((( )) (((((( ((((( (( $$$$ ", - " %%% (((( ()))) *** (( ( +++++++ $$$$ ", + " %%% (((((((( )) (((((( ((((( (( $$$$ ", + " %%% (((( )))) *** ( +++++++ $$$$ ", " %%% ))))) **** +++++++++++++++++++++++++++ $$$$ ", " %%% )))))) **** ,,, +++++++++++++++++++++++++++++ $$$$ ", - " %%% ))))) **** ,,,, -- +++++++++++++++++++++++++++++ $$$$ ", - " %%% ))))) *** ,,,, ---------------------- + +++++++++ $$$$$ ", + " %%% ))))) *** ,,,, -- +++++++++++++++++++++++++++++ $$$$ ", + " %%% ))))) *** ,,,, ---------------------- +++++++++ $$$$ ", " %%% )))))) *** ,,, ---------------------- +++++ $$$$ ", " %%% ))))) *** ,,, ---------------------- ++++ $$$$ ", " %%% ))))) **** ,,, ++++ $$$$ ", - " %%% )))))) **** ,,, - ++++ $$$ ", + " %%% )))))) **** ,,, ++++ $$$ ", " %%% ))))) **** ,,, ........................ +++ $$$ ", " %%% ))))) *** ,,,, ................................ +++ $$$ ", " %%% )))))) *** ,,,, ................................ +++ $$$ ", " %%% ))))) *** ,,, ................... +++ $$$ ", - " %%% )))))) *** ,,, .... . +++ $$$ ", + " %%% )))))) *** ,,, .... +++ $$$ ", " %%% )))))) //// **** ,,, .... +++ $$$ ", " %%% ))))) /////////// **** ,,, ... +++ $$$ ", " %%% )))))) ///////////////// *** ,,,, ... +++ $$$ ", - " %%%%% ))))))) //////////////////// *** ,,,, ... +++ $$$ ", - " %%%% ))))) ) ////// / //////// *** ,,,, .... +++ $$$ ", - " %%% )))))) ///// / //// *** ,,, .... 00000000000000000000000 ++++ $$$ ", + " %%% )))))) //////////////////// *** ,,,, ... +++ $$$ ", + " %%% ))))) ////// / //////// *** ,,,, .... 0 +++ $$$ ", + " %%% )))))) ///// //// *** ,,, .... 00000000000000000000000 ++++ $$$ ", " %%% )))))) ////// ////*** ,,, .... 00000000000000000000000 ++++ $$$ ", - " %%% ))))) ////// ///// ,,,,, ... 00000000000000000000000 +++ $$$ ", + " %%% ))))) ////// ///// ,,, ... 00000000000000000000000 +++ $$$ ", " %%% ))) ///// //// ,,, ... +++ $$$ ", - " %%% )) //// //// ,,,, ... 0 +++ $$$ ", + " %%% )) //// //// ,,,, ... +++ $$$ ", " %%% /// //// ,,,, ... ++++ $$$ ", - " %%% //// ///// ... ++++ $$$ ", + " %%% //// ///// ... + ++++ $$$ ", " %%% //// //// ... ++++++++++++++++++++++++++++++++++ $$$ ", " %%% /// /// .... +++++++++++++++++++++++++++++++++ $$$ ", " %%% /// //// .... +++++++++++++++++++++++++++++++++ $$$ ", - " %%% /// /// ... + +++++++++++ $$$ ", - " %%% /// /// .... + $$$ ", - " %%% /// / /// .... $$$ ", - " %%% //// /// ..... $$$$ ", - " %%% //// /// ..... $$$$$ ", - " %%% /// //// ...... $$$ ", + " %%% /// /// ... +++++++++++ $$$ ", + " %%% /// /// ... $$$ ", + " %%% /// /// .... $$$ ", + " %%% //// /// ..... $$$ ", + " %%% //// /// ..... $$$ ", + " %%% /// //// ...... . . $$$ ", " %%% //// //// ............................... $$$ ", " %%% //// /// .............................. $$$ ", " %%% //// /// ............................ $$$ ", - " %%% //// /// .. $$$ ", - " ///// //// . $$$ ", - " / //// ///// ", - " //// ////// ", + " %%% //// /// $$$ ", + " //// //// $$$ ", + " //// ///// ", + " ///// ////// ", " //// ////// ", " ///// ///// ", " //////// ////// ", " ///////////// ////// 11111111111111111111111111111111111111 ", - " /////////////////// 11111111111111111111111111111111111111 ", - " //////////// / 11111111111111111111111111111111111111 ", + " ///////////////// 11111111111111111111111111111111111111 ", + " //////////// 11111111111111111111111111111111111111 ", " //// 11111111111111 ", - " 1 ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/lines-6-800-800-1.0-grid-reference.json b/tests/visual_tests/grids/lines-6-800-800-1.0-grid-reference.json index 2427458c8..6bfbb95d2 100644 --- a/tests/visual_tests/grids/lines-6-800-800-1.0-grid-reference.json +++ b/tests/visual_tests/grids/lines-6-800-800-1.0-grid-reference.json @@ -42,151 +42,151 @@ " !!!!!!!!! !!!!! !!! ", " !!!!!! !!!!! !!!!!!! !!!!! ", " !!!!!! !!!!!! !!!!!!!!!!! !!!!!!!! ! ", - " !!!!!! !!!!!! !!!!!! !!!!! !!!!!!!!!! !!!! ", - " !!!!!! ! !!!!! !!!!!! !!!!! !!!!! !!!!!! !!!!!! ", - " !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!! ", - " !!!!!!! !!!!!! !!!!! !!!!!! !!!!!! !!!!!! !!!!!! ", - " !!!!!! !!!!! !!!!!! !!!!! !!!!! !! !!!!! !!!!!! ", - " !!!!!!! !!!!! !!!!!!!! !!!!! !!!!!! !!!!!! !!!!! ", + " !!!!!! !!!!! !!!!!! !!!!!! !!!!!!!!!! !!!! ", + " !!!!!! !!!!! !!!!!! !!!!! !!!!! !!!!!! !!!!!! ", + " !!!!!! !!!!!! !!!!!! !!!!!!! !!!!!! !!!!!! !!!!! ", + " !!!!!!! !!!!!! !!!!! !!!!!! !!!!!! !!!!! !!!!!! ", + " !!!!!! !!!!! !!!!!! !!!!! !!!!! !!!!! !!!!!! ", + " !!!!!!! !!!!!! !!!!!! !!!!! !!!!!! !!!!!! !!!!! ", " !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!!! ", - " !!!!!! !!!!!! !!!!!! !!!!!! !!!!! !!!!! !!!!!! ", - " !!!!!! !!!!! !!!!! !! !!!!! !!!!!! !!!!!! !!!!! ", - " ! ! !!!!! !!!!!! !!!!!! !!!!! !!!!!! !!!!!! ", - " !!!!!! !!!!! !!!!!! !!!!!!! !!!!! !!!!! ", - " !!!!!! !!!!!! !!!!! !!!!!!!! !!!!! !!!!!! ", + " !!!!! !!!!!! !!!!!! !!!!! !!!!! !!!!! !!!!!! ", + " !!!! !!!!! !!!!! !!!!! !!!!!! !!!!!! !!!!! ", + " ! !!!!! !!!!!! !!!!!! !!!!! !!!!!! !!!!!! ", + " !!!!!! !!!!! !!!!!! !!!!!! !!!!! !!!!! ", + " !!!!!! !!!!!! !!!!! !!!!!! !!!!! !!!!!! ", " !!!!! !!!!!! !!!!!! !!!!! !!!!!!!!!!! ", - " !!!!!!!!!!! !!!!!!!!!! !!!!!!!!! ", - " !!!!!!!!! !!!!!!! !!!!! ! ", - " !!!!!!! !!!! !!! ", - " ### ! !!! # !! $$$ ", - " ##### ! #### $$$ ", - " ######## ####### ## $$$ ", + " !!!!!!!!!!! !!!!!!!!!! !!!!!!!! ", + " !!!!!!!!! !!!!!!! !!!!! ", + " !!!!!! !!!! !!! ", + " ### !!! # !! $$$ ", + " ##### ! ##### $$$ ", + " ######## ####### ## # $$$ ", " ########### ########## ##### # $$$ ", " ###### ###### ###### ##### ######## ### $$$ ", " ####### ##### ##### ##### ########## ##### $$$ ", " ###### ##### ###### ###### ##### ##### ##### $$$ ", - " ###### ####### ###### ###### ###### ####### ###### $$$ ", - " ###### # ###### ##### ##### ###### ## ###### ###### $$$ ", - " ###### ##### ####### ##### ##### ##### ##### $$$ ", - " ####### ##### ##### # ###### ##### ###### ###### $$$ ", - " ###### ###### ###### ###### ###### ###### ##### $$$ ", - " #### ##### ###### ####### ##### ##### ###### $$$ ", - " %%% ## # ##### ##### ###### ##### ###### ###### $$$ ", + " ###### ###### ###### ###### ###### ###### ###### $$$ ", + " ###### ###### ##### ##### ###### ###### ###### $$$ ", + " ###### ###### ###### ##### ##### ##### ##### $$$ ", + " ####### ##### ##### ###### ##### ###### ###### $$$ ", + " ###### ###### ###### ##### ###### ###### ##### $$$ ", + " #### ##### ###### ##### ##### ##### ###### $$$ ", + " %%% ## ##### ##### ###### ##### ###### ###### $$$ ", " %%% ###### ###### ###### ###### ##### ##### $$$ ", " %%% ###### ###### ##### ###### ###### ###### $$$ ", " %%% ##### ###### ##### ##### ########### $$$ ", - " %%%%% ##### ###### ###### ###### ######## $$$ ", - " %%% ###### ##### ########### # ##### # $$$ ", + " %%% ##### ###### ####### ##### ####### $$$ ", + " %%% ###### ##### ########### ##### $$$ ", " %%% ########### ######## ## $$$ ", - " %%% ######## ###### $$$ $ ", + " %%% ######## ###### $$$ ", " %%% ##### #### $$$ ", " %%% ### # $$$ ", - " %%% # $$$ ", + " %%% $$$ ", " %%% &&&&&&& $$$ ", " %%% &&&&&& &&&&&&&& &&&&&&&&&& $$$ ", " %%% &&&&&&&& &&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&&&&& $$$ ", " %%% &&&&&&&&&&& &&&&&&&&&&&&& &&&&&&&&&&&&&& &&&&&&&& &&&&& $$$ ", - " %%% &&&&&&&&&&&&&& &&&&&&& &&&&&& &&&&&&& & &&&&& &&&&&& &&&&& $$$$ ", - " %%% &&&&&&& &&&&& &&&&&&& &&&&& &&&&&& & &&&&& &&&&& &&&&& $$$$ ", - " %%% &&&&&& &&&& &&&&&& &&&& &&&&& &&&&& &&&&& & &&&& $$$$ ", - " %%% &&&&&& &&&&& &&&&& & &&&&& &&&&&& &&&& &&&&&& &&&& $$$$ ", - " %%% &&&&& &&&& &&&&& &&&& &&&&& &&&& &&&&& &&&& && $$$$ ", - " %%% &&&&&& &&&& &&&&& &&&& &&&&& &&&&& &&&&& &&&&& &&&&& $$$$ ", + " %%% &&&&&&&&&&&&&& &&&&&&& &&&&&& &&&&&&& &&&&& &&&&&& &&&&& $$$$ ", + " %%% &&&&&&& &&&&& &&&&&&& &&&&& &&&&&& &&&&& &&&&& &&&&& $$$$ ", + " %%% &&&&&& &&&& &&&&&& &&&& &&&&& &&&&& &&&&& &&&& $$$$ ", + " %%% &&&&&& &&&&& &&&&& &&&&& &&&&&& &&&& &&&&&& &&&& $$$$ ", + " %%% &&&&& &&&& &&&&& &&&&& &&&&& &&&& &&&&& &&&& && $$$$ ", + " %%% &&&&& &&&& &&&&& &&&& &&&&& &&&&& &&&&& &&&&& &&&&& $$$$ ", " %%% &&& &&&& &&&&&& &&&& &&&&& &&&&& &&&&&& &&&&&&&&&&&&&& $$$$ ", " %%% & &&&&& &&&&&&& &&&&&& &&&&&& &&&&&&&&&&&&& &&&&&&&&&&& $$$$ ", - " %%% &&&&&&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&& &&&&&&&&& $$$$ ", - " %%% & &&&&&&&&&&& &&&&&&&& &&&&&& &&&& $$$$ ", - " %%% &&&&&&& &&&& & $$$$ ", - " %%% && $$$$ ", - " %%% & $$$$ ", + " %%% &&&&&&&&&&&&& &&&&&&&&&&&& &&&&&&&&&& &&&&&&&&& $$$$ ", + " %%% &&&&&&&&&&& &&&&&&&& &&&&&& &&&& $$$$ ", + " %%% &&&&&&& &&&& & & $$$$ ", + " %%% &&& $$$$ ", " %%% $$$$ ", - " %%%%% '''''''' $$$$ ", - " %%%% '''''''' $$$$ $ ", + " %%% $$$$ ", + " %%% '''''''' $$$$ ", + " %%% '''''''' $$$$ ", " %%% '''''''' $$$$ ", " %%% ''' $$$$ ", " %%% ''''''''''''''''''''''''' $$$$ ", " %%% ''''''''''''''''''''''''' $$$$ ", " %%% (( ''''''''''''''''''''''''' $$$$ ", - " %%% ((((((( (((((((( ''''''''''''''''''''''''' $$$$ ", + " %%% ((((((( ((((((((( ''''''''''''''''''''''''' $$$$ ", " %%% (((((( (((((((( (((((((((( (((((((((((( $$$$ ", - " %%% (((((((((( (((((((((((( ((((((((((((( (((((((((((((( $$$$ ", - " %%% (((((((((((((( ((((((((((((((( (((((((( ((((((( ((((((( (((( $$$$ ", - " %%% ((((((( (((((( ((((((( (((( (((((( (( (((( (((((( ((((( $$$$ ", - " %%% ((((((( (((( (((((((( (((( (((((( (((( ((((( (((((( $$$$ ", - " %%% (((((( (((( (((((( ( (((( ((((( ((((( ((((( ((((( $$$$ ", + " %%% (((((((((( (((((((((((( ((((((((((((( ((((((((((((((( $$$$ ", + " %%% (((((((((((((( (((((((((((((((( (((((((( ((((( ((((((( (((( $$$$ ", + " %%% ((((((( (((((( ((((((( (((( (((((( (((( (((((( (((( $$$$ ", + " %%% ((((((( (((( (((((( (((( (((((( (((( ((((( (((( $$$$ ", + " %%% (((((( (((( (((((( (((( ((((( ((((( ((((( ((((( $$$$ ", " %%% ((((( (((( ((((( (((( (((((( (((( (((((( (((( (( $$$$ ", - " %%% (((((( (((( ((((( (((( ((((( (((( ((((( (((( (((( $$$$ ", - " %%% (((( ( (((( (((((( (((( ((((( (((( (((((( ((((( (((((( $$$$ ", + " %%% ((((( (((( ((((( (((( ((((( (((( ((((( (((( (((( $$$$ ", + " %%% (((( (((( (((((( (((( ((((( (((( (((((( ((((( (((((( $$$$ ", " %%% (( ((((( (((((( ((((( (((((( (((((((((((((( ((((((((((((( $$$$ ", - " %%% ((((((( (((((( (((((((((((( (((((((((((( ((((((((( $$$$ ", - " %%% (( ((((((((((( (((((((((( (((((((( ( (((((( $$$$ ", + " %%% ((((((((((((( (((((((((((( (((((((((((( ((((((((( $$$$ ", + " %%% ((((((((((( (((((((((( (((((((( (((((( $$$$ ", " %%% (((((((( )) ((((((( ((( $$$$ ", - " %%%% (((( )))) *** (( $$$$ ", - " %%%% ))))) *** ( ++++++++++++ $$$$ ", + " %%%% (((( )))) *** ( $$$$ ", + " %%%% ))))) *** ++++++++++++ $$$$ ", " %%%% )))))) *** ++++++++++++++++++++++++++++++++ $$$$ ", - " %%%% )))))) **** ,,, +++++++++++++++++++++++++++++++++++++ $$$$$ ", - " %%%% ))))) **** ,,, ++++++++++++++++++++++++++++++++++ $$$$ ", - " %%%% )))))) *** ,,, ------ + +++++++++++++++ $$$$ ", - " %%%% )))))) ***** ,,,, ----------------------------- + ++++++ $$$$ ", - " %%%% ))))) *** ,,,, ----------------------------- + ++++ $$$$ ", + " %%%% )))))) **** ,,, +++++++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% ))))) **** ,,, +++++++++++++++++++++++++++++++++ $$$$ ", + " %%%% )))))) *** ,,, ------ +++++++++++++++ $$$$ ", + " %%%% )))))) *** ,,,, ----------------------------- ++++++ $$$$ ", + " %%%% ))))) *** ,,,, ----------------------------- + ++++ $$$$ ", " %%%% )))))) *** ,,, ----------------------------- ++++ $$$$ ", " %%%% )))))) **** ,,, ++++ $$$$ ", " %%%% ))))) **** ,,, ++++ $$$$ ", " %%%% )))))) *** ,,, ++++ $$$$ ", " %%%% )))))) *** ,,, +++ $$$$ ", - " %%%% )))))) *** ,,,, ................................. +++ $$$$ ", - " %%%% )))))))) *** ,,,, .......................................... +++ $$$$ ", - " %%%% )))))) ) **** ,,, ........................................... +++ $$$$ ", - " %%%% ))))) **** ,,, ................. . +++ $$$$ ", - " %%%% )))))) *** ,,, ..... . +++ $$$$ ", + " %%%% ))))) *** ,,,, ................................. +++ $$$$ ", + " %%%% )))))) *** ,,,, .......................................... +++ $$$$ ", + " %%%% )))))) **** ,,, ........................................... +++ $$$$ ", + " %%%% ))))) **** ,,, ................. . +++ $$$$ ", + " %%%% )))))) *** ,,, ..... +++ $$$$ ", " %%%% )))))) *** ,,, .... +++ $$$$ ", " %%%% ))))) *** ,,,, ... +++ $$$$ ", " %%%% )))))) //////// *** ,,,, ... +++ $$$$ ", " %%%% )))))) /////////////// *** ,,,, .... +++ $$$$ ", " %%%% ))))) ////////////////////// **** ,,, .... +++ $$$$ ", " %%%% )))))) ////// ////////////// **** ,,, ... +++ $$$$ ", - " %%%% )))))) ////// ///////// *** ,,, .... ++++ $$$$ ", - " %%%% ))))) ///// / //// *** ,,, ..... ++++ $$$$ ", - " %%%% )))))) ////// ///// *** ,,,,, ... 00000000000000000000000000000 ++++ $$$$ ", + " %%%% )))))) ////// ///////// *** ,,, ... ++++ $$$$ ", + " %%%% ))))) ///// / //// *** ,,, ... 0 ++++ $$$$ ", + " %%%% )))))) ////// ///// *** ,,,, ... 00000000000000000000000000000 ++++ $$$$ ", " %%%% )))))) ////// //// *** ,,,, ... 00000000000000000000000000000 +++ $$$$ ", " %%%% ))))) ///// //// ,,, ... 00000000000000000000000000000 +++ $$$$ ", - " %%%% ))))))) ////// //// ,,, ... +++ $$$$ ", - " %%%% ))) ) ////// ///// ,,, ... 0 +++ $$$$ ", - " %%%%% ) ///// //// ,,, ... ++++ $$$$ ", - " %%% /// / //// ,,, ... ++++ $$$$ ", + " %%%% ))))) ////// //// ,,, ... +++ $$$$ ", + " %%%% ))) ////// ///// ,,, ... +++ $$$$ ", + " %%% ) //// //// ,,, ... ++++ $$$$ ", + " %%% /// //// ,,, ... ++++ $$$$ ", " %%% /// //// ,,, ... +++ $$$$ ", " %%% /// ///// ... ++++ $$$$ ", - " %%% /// //// ... ++++++++++++++++ ++++ $$$$ ", + " %%% /// //// ... ++++++++++++++++ + ++++ $$$$ ", " %%% //// /// ... ++++++++++++++++++++++++++++++++++++++++++++ $$$$ ", - " %%% //// /// ..... +++++++++++++++++++++++++++++++++++++++++++ $$$$ ", - " %%% / /// //// ... + +++++++++++++++++++++++++++++++++ $$$$ ", - " %%% ///// //// ... + ++ $$$$ ", - " %%% /// //// .... + $$$$ ", + " %%% //// /// ... +++++++++++++++++++++++++++++++++++++++++++ $$$$ ", + " %%% /// //// ... +++++++++++++++++++++++++++++++++ $$$$ ", + " %%% /// //// ... $$$$ ", + " %%% /// //// .... $$$$ ", " %%% /// /// .... $$$$ ", " %%% //// /// .... $$$$ ", " %%% //// /// ..... $$$$ ", " %%% /// /// .... $$$$ ", " %%% /// //// ..... $$$$ ", - " %%% /// //// ...... $$$$ ", + " %%% /// //// ...... . $$$$ ", " %%% /// /// .......................................... $$$$ ", " %%% //// /// ........................................ $$$$ ", - " %%% //// /// ...................................... $$$$$ ", - " %%% //// /// . $$$$ ", - " %%% //// /// . $$$$ ", + " %%% //// /// ...................................... $$$$ ", + " %%% //// /// $$$$ ", + " %%% //// /// $$$$ ", " //// //// $$$$ ", - " //// ///// $$$$ ", + " ///// ///// $$$$ ", " ///// ///// ", " //// ////// ", " //// ////// ", - " //// ////// ", - " ///// ////// / ", - " ///// ////// ", + " //// ///// ", + " ///// ////// ", + " ////// / ////// ", " /////////// ///// ", " /////////////////////// 11111111111111111111111111111111111111111111111111 ", " //////////////////// 11111111111111111111111111111111111111111111111111 ", - " / //////////// 11111111111111111111111111111111111111111111111111 ", - " //// 1111111111 11 ", - " 1 1 ", + " //////////// 11111111111111111111111111111111111111111111111111 ", + " //// 1111111111 ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-100-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-100-100-1.0-grid-reference.json index ca0fd43d1..b633480e3 100644 --- a/tests/visual_tests/grids/list-100-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-100-100-1.0-grid-reference.json @@ -1,12 +1,12 @@ { "keys": [ "", - "2", + "1", + "3", "5", "7", "9", - "1", - "3", + "2", "4", "6", "8", @@ -23,15 +23,15 @@ " ", " ", " ", - " !!! !! ! # $ $ % ", - "! ! !!! ### $$$ %%% ", + "! ! # $ % % & ", + "!!! ## $$$ %%% &&& ", " ", - " & ! ' ( # ) $ * % +", + " ! ' # ( $ ) % * & +", " ", " ", - "& ) ** ++", - "& &&&&&& )) ** ++", - "& &&&&&&& ", + " '' ( ) ** ++", + " ' (( )) ** ++", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-150-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-150-100-1.0-grid-reference.json index 673bcc331..aacf5a57b 100644 --- a/tests/visual_tests/grids/list-150-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-150-100-1.0-grid-reference.json @@ -1,15 +1,15 @@ { "keys": [ "", - "2", "4", - "5", + "6", "7", "8", "9", + "2", "1", "3", - "6", + "5", "10" ], "data": {}, @@ -23,15 +23,15 @@ " ", " ", " ", - " !!!!!! ! # # $ % & & '' ", - " !! ! !!!! ## $$ %%% && ' ", + " !!!!!!!!! # $ % % && ", + " '' !! ! !! ###$$$ %% & ", " ", - " ( ! ) # $ * % & ' + ", + " ( ' ) ! * # $ % & + ", " ", " ", - " * * + +", - " ( ((( **** * * *** +++++ +", - " ( (( ((( ******* ***** +++++ + ", + " ) ) +++", + " ))))) ) )))) ++ ", + " ) ))))) )) )))) ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-250-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-250-100-1.0-grid-reference.json index 5b3b118ab..3ead5a120 100644 --- a/tests/visual_tests/grids/list-250-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-250-100-1.0-grid-reference.json @@ -1,14 +1,14 @@ { "keys": [ "", - "2", - "4", - "6", - "9", - "7", "1", "3", "5", + "7", + "9", + "2", + "4", + "6", "8", "10" ], @@ -23,16 +23,16 @@ " ", " ", " ", - " ! !!! ! #### # # $$$$ $$ %%% %%%% ", - " ! ! !!!! ## # ## # $ $ $$ && % % % %% ", + " ! ! ### #### # $$ $$$$ $ %% %% %%%%%% &&& &&& & ", + " !! # ## $$$$ $$$ %%%% %% %% & & & ", " ", - " ' ! ( # ) $ & * % + ", + " ! ' # ( $ ) % * & + ", " ", " ", - " ( * * * ", - "' ' ''''' (( )))) ))))) **** * **** ** ", - "''' '' ''' ))))) ) ))) ******* ***** *** ", - " ** ", + " ' ' ( ) ) * ", + " ''' ' ' '' ' (( ) ))) ) ) ))) * ", + " '''''' ' '' '' ) )))))) ))))) ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-300-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-300-100-1.0-grid-reference.json index 97fe502d2..91ac6b3da 100644 --- a/tests/visual_tests/grids/list-300-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-300-100-1.0-grid-reference.json @@ -1,15 +1,15 @@ { "keys": [ "", - "2", + "1", "3", "5", + "7", + "9", + "2", + "4", "6", "8", - "9", - "1", - "4", - "7", "10" ], "data": {}, @@ -23,15 +23,15 @@ " ", " ", " ", - " !! !!! !! # $$$ $$$$ % & && & &&& '' ", - " !!!! !!!! ## $ $ $$ %% &&& & && & ' ", + " !!! !!!! ### #### # $$$$$$$$ % %%% %%%%%% & &&& &&&& ", + " ! !! # ### $$ $ %%% % % % &&& & & & ", " ", - " ( ! # ) $ % * & ' + ", + " ! ' # ( $ ) % * & + ", " ", " ", - " ( ) * * + + + ", - "((( ( ( ((( ))))) )))) **** * * *** ***** ++++ + ++", - "(( ( ((( ((( ))))) ) ))))) ******* **** * ** * +++++++ + ", + " ' ' ' ( ) ) ", + " ' ''' ' ''' ' ( ) ))) ) ) ) * ", + " ' '''''' ' '' '' ) ))))) )) )) ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-400-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-400-100-1.0-grid-reference.json index d28f14388..ea336f358 100644 --- a/tests/visual_tests/grids/list-400-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-400-100-1.0-grid-reference.json @@ -1,16 +1,16 @@ { "keys": [ "", - "2", - "4", - "6", - "8", - "10", "1", "3", "5", "7", - "9" + "9", + "10", + "2", + "4", + "6", + "8" ], "data": {}, "grid": [ @@ -23,16 +23,16 @@ " ", " ", " ", - " !!!! !!!! ### ## ## $$$ $$$ %% %%% %%%% && &&&&&&", - " ! ! ! # # #### $$ $ $$$ %%%% %%%% % &&&& &&&&", + " !!!!! !! # ######## $$ $$$$ $ %%% %%% %%% &&& &&& & ' ''' ", + " !! ! ! ### # ## # $$ $ $$$ % % % %% & & && ''''' ", " ", - " ' ! ( # ) $ * % + & ", + " ! ( # ) $ * % + & ' ", " ", " ", - " ( ( (( ) * + ", - "''' ' ' ''' (((( ( (( ((((((( ))))) ))))) *** * * ** *** +++ + ++++ ++ ", - "''' ' '' ''' ((((((( (( ((((((( ))))) ) )) )) ***** * **** * *** +++++ +++ ++ ", - " ", + " ( ( ) * + ", + " ( ((( ( (((( ( ))))) )))) ***** * * ++ + ++ + ++ ", + " ( ((((( (( ((( ))))) ) ))))) * ***** ** * ++++ + ++ +++ + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-600-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-600-100-1.0-grid-reference.json index f77e4cd1f..a846513de 100644 --- a/tests/visual_tests/grids/list-600-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-600-100-1.0-grid-reference.json @@ -3,14 +3,14 @@ "", "2", "4", - "7", - "9", + "6", + "8", + "10", "1", "3", "5", - "6", - "8", - "10" + "7", + "9" ], "data": {}, "grid": [ @@ -23,16 +23,16 @@ " ", " ", " ", - " ! !!!! ! ## ####### $$$$$$ $ $ $ %%%%%% % % ", - " !!! !!!!! #### #### $ $$ $$$$ % %% % % ", - " ", - " & ! ' # ( ) $ * % + ", + " ! !!! !! ! ## #### # $$ $$$ $ %%% %%%%%% &&& &&& ", + " !! ! !!! #### ## # $$ $ $$$ % %%%%% & && ", + " % ", + " ' ! ( # ) $ * % + & ", " ", " ", - " & & ' ' ' ( ( ( ) * + + ", - " &&&& & &&& && ''''' ' ''' '''' (((( ( (( (( ))) ) ) ) **** *** ** +++ + + +++ ", - " &&&&&&& &&& && ''''' ' '''' '''' ((((((( (( ( (( ))))) )) )) ***** ** *** * +++++ + +++++ ", - " ** ", + " ' ( ( ( ) * + ", + " ''''' ' ' ''' ( ((( ( ( ((((( )) ) ) )) *** * * *** ***** +++++ +++ +++ ", + " '''' ' ''' ''' ( ((((( (( ((((( )))) ) ) ) )) ****** **** * ** * + +++++ +++ ++ ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/list-800-100-1.0-grid-reference.json b/tests/visual_tests/grids/list-800-100-1.0-grid-reference.json index 43a5b4a05..692e6adac 100644 --- a/tests/visual_tests/grids/list-800-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/list-800-100-1.0-grid-reference.json @@ -29,10 +29,10 @@ " ! # $ % & ' ( ) * + ", " ", " ", - " ! # # $ $ $$ % % % & ' ( ) ) ) * + ", - " !!!!! ! ! !!! ##### # #### $$$$ $ $$ $$$$$$$ %%%%%% %% % %% &&&&& &&&&& ''' ' ' ' ' ((( ( ( (( ((( )))) ) )))) ))) *** * **** ** +++ + ++ + ", - " !!!!! ! !! !!! ##### # ## ### $$$$$$$ $$ $$$$$$$ %%%%% % %%% %%% &&&&& & && && ''''' ' ''''' ((((( ( (((( ( ((( ))))))) ))))) ))) ***** *** ** +++++ +++ + ", - " )) ", + " ! ! # # $ $ % & & & ' ( ) * + + ", + " ! !!! ! !!!!!! # ### # #### # $$$$$ $ $$ $$$$ %%%%% %%%% & &&& & &&&&&& ''''' ' ' ((((( ((((((((( )) ) )) ) )) *** * * *** +++ + ++++++ ", + " ! !!!!! !!!!!!! # ##### ## ### $$$$ $ $$ $$ $$$$ %%%%% % %%%%% & &&&&& && &&& ' ''''' '' ' ( ((((( (( ((( ((( )))) ) )) ))) ) ****** * *** ++++++ + ++ + ", + " ) ", " ", " ", " ", diff --git a/tests/visual_tests/grids/rtl-point-200-200-1.0-grid-reference.json b/tests/visual_tests/grids/rtl-point-200-200-1.0-grid-reference.json index 0e3322262..aa24b0418 100644 --- a/tests/visual_tests/grids/rtl-point-200-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/rtl-point-200-200-1.0-grid-reference.json @@ -31,18 +31,15 @@ " ", " ", " ! ", + " ! ", + " ", + " !! ! ! ! ", + " ! ! ! ", " ", " ", + " ! ", " ", - " ! ", - " ", - " !!! ! ! ", - " ! ! ", - " ", - " ", - " ", - " !! ! ", - " !! ", + " ! ! ", " ", " ! ", " !!! ", @@ -54,6 +51,9 @@ " ", " ", " ", + " ", + " ", + " ", " " ] } \ No newline at end of file diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-495-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-495-100-1.0-grid-reference.json index 4c4313d2e..b0f75845b 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-495-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-495-100-1.0-grid-reference.json @@ -5,11 +5,11 @@ "5", "1", "2", + "3", "6", "7", "9", "10", - "3", "4" ], "data": {}, @@ -25,11 +25,11 @@ " ! ", " ! ! ", " ## ", - " $$$ % % #### & & ' ! ! ( (((( ) ", - " $ % % * + ## && ' ' ! ( ( ( )) ", - " $$ %% * ++ && '' !! (( (((( )) ", - " $ * ++++ ( ", - " *** ++ ", + " $$$ % % & #### ' ' ( ! ! ) )))) * ", + " $ % % & + ## '' ( ( ! ) ) ) ** ", + " $$ %% & ++ '' (( !! )) )))) ** ", + " $ & ++++ ) ", + " & & ++ ", " ! ", " ! ", " ! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-497-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-497-100-1.0-grid-reference.json index 71ae56865..b190871af 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-497-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-497-100-1.0-grid-reference.json @@ -5,11 +5,11 @@ "5", "1", "2", + "3", "6", "7", "9", "10", - "3", "4" ], "data": {}, @@ -25,11 +25,11 @@ " ! ", " # ! ! ", " ## ", - " $$$ %%% #### &&& ''' !!! ( (( ( ( ))) ", - " $ %% * + ### && '' ! ( (( ( ) ", - " $$ % * ++ & ' !! ( (( ( ) ", - " $ % * ++++ & ' ! ) ", - " *** ++ ", + " $$$ % % & #### ''' ((( !!! ) )) ) ) *** ", + " $ %% & + ### '' (( ! ) )) ) * ", + " $$ % & ++ ' ( !! ) )) ) * ", + " $ & ++++ ' ( ! * ", + " & & ++ ", " ! ", " ! ", " ! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-498-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-498-100-1.0-grid-reference.json index c15199f2c..ca0db3884 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-498-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-498-100-1.0-grid-reference.json @@ -5,11 +5,11 @@ "5", "1", "2", + "3", "6", "7", "9", "10", - "3", "4" ], "data": {}, @@ -25,11 +25,11 @@ " !! ", " # ! ", " ## ", - " $$$ %%% ##### &&& ''' ! (( ( ( )) ", - " $ %% * + ### && '' !! ( ( ( ) ", - " $$ % * ++ && '' !! (((( (( )) ", - " $ % * ++++ & ' ) ", - " *** ++ ", + " $$$ % % & ##### ''' ((( ! )) ) ) ** ", + " $ %% & + ### '' (( !! ) ) ) * ", + " $$ % & ++ '' (( !! )))) )) ** ", + " $ & ++++ ' ( * ", + " & & ++ ", " !! ", " ! ", " !! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-499-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-499-100-1.0-grid-reference.json index dcaab57d7..1b92a2855 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-499-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-499-100-1.0-grid-reference.json @@ -5,11 +5,11 @@ "5", "1", "2", + "3", "6", "7", "9", "10", - "3", "4" ], "data": {}, @@ -25,11 +25,11 @@ " !! ", " # ! ", " ## ", - " $$ %%% ##### && '' ! ( (((( ) ", - " $ %% * + ### && ''' !! (( ( (( )) ", - " $$ % ** ++ && '' !! (( ( (( )) ", - " $ % * ++++ & ' ( ", - " *** + ", + " $$ % % & ##### '' (( ! ) )))) * ", + " $ %% & + ### '' ((( !! )) ) )) ** ", + " $$ && ++ '' (( !! )) ) )) ** ", + " $ & ++++ ' ( ) ", + " & & + ", " !! ", " ! ", " !! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-500-100-1.0-grid-reference.json index 2b202543b..26459bd0f 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-500-100-1.0-grid-reference.json @@ -5,11 +5,11 @@ "5", "1", "2", + "3", "6", "7", "9", "10", - "3", "4" ], "data": {}, @@ -25,11 +25,11 @@ " ! ", " # ! ! ", " ## ", - " $$ %%% #### & ' ! ! ( (((( ( ) ) ", - " $ %% * + ## &&& ''' ! ( ( ( ) ", - " $$ % ** ++ && '' !! (( (((( )) ", - " $ % * ++++ ( ", - " *** + ", + " $$ % % & #### ' ( ! ! ) )))) ) * * ", + " $ %% & + ## ''' ((( ! ) ) ) * ", + " $$ && ++ '' (( !! )) )))) ** ", + " $ & ++++ ) ", + " & & + ", " ! ", " ! ", " !! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-501-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-501-100-1.0-grid-reference.json index 0513cfbae..88cc49451 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-501-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-501-100-1.0-grid-reference.json @@ -5,11 +5,11 @@ "5", "1", "2", + "3", "6", "7", "9", "10", - "3", "4" ], "data": {}, @@ -25,11 +25,11 @@ " ! ", " # ! ! ", " ## ", - " $$ %%% #### & ' !!! ( ( (( ( ))) ", - " $ %% * + ## && ' ' ! ( (( ( ) ", - " $$ % ** + && '' ! (( ) ", - " $ % ** ++++ ! ) ", - " *** + + ", + " $$ % % & #### ' ( !!! ) ) )) ) *** ", + " $ %% & + ## '' ( ( ! ) )) ) * ", + " $$ && + '' (( ! )) * ", + " $ && ++++ ! * ", + " & & + + ", " ! ! ", " ! ", " ! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-502-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-502-100-1.0-grid-reference.json index dfb9cfc19..050335c81 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-502-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-502-100-1.0-grid-reference.json @@ -25,10 +25,10 @@ " ! ", " ! ! ", " ## ", - " $$ %%% #### & & ' ' !!! ( (( ( ( ))) ", + " $$ % % #### & & ' ' !!! ( (( ( ( ))) ", " $ %% * + ## && ' ' ! ( ( ( ) ", " $$ % ** ++ && '' ! (((( (( )) ", - " $ % ** ++++ ! ) ", + " $ ** ++++ ! ) ", " * +++ ", " ! ", " ! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-505-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-505-100-1.0-grid-reference.json index 406a2478f..aa2e746c4 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-505-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-505-100-1.0-grid-reference.json @@ -25,10 +25,10 @@ " !! ", " ! ! ", " # ", - " $$ %%% #### &&& '' ! ( (((( ( ))) ", + " $$ % % #### &&& '' ! ( (((( ( ))) ", " $ %% * + ## && '' ! ( ( ( ) ", - " $$ %% ** ++ && '' !! (( (((( ) ", - " $ % ** +++++ & ' ( ) ", + " $$ %%% ** ++ && '' !! (( (((( ) ", + " $ % ** +++++ & ' ( ) ", " * +++ ", " ! ", " ! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-1-510-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-1-510-100-1.0-grid-reference.json index 982cc4fb7..f0706c77d 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-1-510-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-1-510-100-1.0-grid-reference.json @@ -25,10 +25,10 @@ " !! ", " ! ", " ## ", - " $ % #### & & ''' ! ( ( (( ( ))) ", + " $ % % #### & & ''' ! ( ( (( ( ))) ", " $$ %%% * + ## && '' ! ( (( ( ) ", - " $$ %% * ++ & ' !! ( (( ( ) ", - " * ++++ ' ) ", + " $$ %%% * ++ & ' !! ( (( ( ) ", + " % * ++++ ' ) ", " * * + ", " !! ", " ! ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-490-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-490-100-1.0-grid-reference.json index 9ff9c96f2..4066d9720 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-490-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-490-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " ! ! ", - " # ", - " $ $ % # #### & & ' ' ! ! ( ( (( ", - " $ % % ) * ### && '' ! ( ( ( + ", - " $ %% )) * & ' ! (( ( (( ", - " )) * **** ", - " ) * * ", - " ! ! ", - " ! + ", - " ! ++ + ", - " + ++++", - " + + ", + " !! ", + " !! ", + " ! ", + " # ", + " $ $ % % #### & & ' ! (( ( ( ", + " $ $ % %%% ) * # # # & & ' ' ! ! ((( ( (( + + ", + " $ %%% )) ** & '' !! (( ( (( + ", + " % )) **** ++++", + " ) * + ", + " !! ", + " ! ", + " !! + ", + " + ", + " + + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-495-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-495-100-1.0-grid-reference.json index 7401088de..a6dbaaddf 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-495-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-495-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " ! ! ", - " ## ", - " $ $ $ % % # #### & & ' ! ! ( ( (( ( ", - " $ $ % % ) * * ## && ' ' ! ( ( (( + ", - " $$ $ %% ) ** * && '' !! (( ((((( ", - " $ ) * ***** ( ", - " ) ) * * ", - " ! ", - " ! + ", - " ! ++ + ", - " + ++++", - " ++ + ", + " !! ", + " !! ", + " ! ", + " ## ", + " $$$ %% #### & ' ! (((( ( ", + " $ $ % %%% ) * * # ## & && ' '' ! !! ((( ( (( + + ", + " $ %%% )) ** && '' !! (( ( (( + ", + " $ % )) ***** ( ++++", + " ) ) *** + ", + " !! ", + " ! ", + " !! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-497-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-497-100-1.0-grid-reference.json index 856143ec3..8be5d102f 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-497-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-497-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " ! ", - " ! ! ", - " # ", - " $ $ $ % % # #### & & ' ' ! ! ! ( (( ( ( ", - " $ $ %% ) * * ### && '' ! ! ( (( (( + ", - " $$ $ % ) ** * & !! ! ( (( (( ", - " $ ) ******* ! ( ", - " ) ) ** * ", - " ! ", - " ! ", - " ! + ", - " + ++++ ", - " + + ", + " ! ", + " ! ", + " ! ! ", + " ## ", + " $$$ % #### & & ' ' !!! ( (((( ( ", + " $ $ % % ) * * # # & & ' ' ! ! ( ( (( ( + ", + " $ %% ) ** && '' ! (( (((( ", + " $ ) ***** ! ( ++++ ", + " ) ) ** ", + " ! ! ", + " ! ", + " ! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-498-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-498-100-1.0-grid-reference.json index 44e8f1c54..eb84ea687 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-498-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-498-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " ! ", - " # ", - " $ $ $ % % # #### & & & ' ' ' ! ! (( ( ( ", - " $ $ %% ) * * ### && & '' ' !! ! ( ( ( + ", - " $$ $ % ) ** * && & '' ' !! ! (((( (( ", - " $ ) * **** & ' ! ", - " ) ) ** * ", - " !! ", - " ! + ", - " !! ++ + ", - " + ++++ ", - " + + ", + " ! ", + " ! ", + " ! ! ", + " ## ", + " $$$ % #### &&& ''' !!! ( (( ( ( ", + " $ $ % % ) * * # # & & ' ' ! ! (( (( ( + + ", + " $ %% ) ** & ' ! ( (( ( + ", + " $ ) **** & ' ! ++++ ", + " ) ) ** + ", + " ! ", + " ! ", + " ! + ", + " + ", + " + + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-499-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-499-100-1.0-grid-reference.json index 753f5c7d5..22e4809d3 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-499-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-499-100-1.0-grid-reference.json @@ -5,10 +5,10 @@ "5", "1", "2", + "3", "6", "7", "9", - "3", "4", "10" ], @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " # ! ", - " # # ", - " $ $ % % # #### & & ' ' ! ! ( ( (( ", - " $ $ %% ) ) * ### # && & ''' ' !! ! (( ( (( + ", - " $$ $ )) ) ** && & '' ' !! ! (( (( ", - " $ ) ) * **** & ' ! ", - " ) ) ) * ", - " !! ", - " ! + ", - " !! ++ + ", - " ++ ++++", - " ++ + ", + " !! ", + " !! ", + " # ! ! ", + " ## ", + " $$$ % & #### ''' ((( !! )) ) ) ", + " $ $ % % & & * # ### ' ' ( ( ! ! )) ) ) + + ", + " $ %% & ** ' ( !! )))) )) + ", + " $ & **** ' ( ! ++++", + " & & ** + ", + " ! ", + " ! ", + " !! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-500-100-1.0-grid-reference.json index 06f5973d1..7b335c45f 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-500-100-1.0-grid-reference.json @@ -5,10 +5,10 @@ "5", "1", "2", + "3", "6", "7", "9", - "3", "4", "10" ], @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " ! ", - " # ! ! ", - " ## # ", - " $ $ % % # #### & & ' ' ! ! ( ( (( ( ", - " $ $ %% ) ) * ## # &&& & ''' ' ! ( ( (( + ", - " $$ $ )) ) ** && & '' ' !! (( ((((( ", - " $ ) ) * **** & ' ( ", - " ) ) ) * ", - " ! ", - " ! ", - " !! ++ ", - " + ++++", - " + ", + " !! ", + " !! ", + " # ", + " ## ", + " $$$ % % & #### '' (( ! ) )))) ", + " $ $ % % & & * # ### ' ' ( ( ! !! ))) ) )) + ", + " $ %% & ** '' (( !! )) ) )) ", + " $ & **** ' ( ) ++++", + " & & ** ", + " !! ", + " ! ", + " !! ++ ", + " ++ ", + " ++ ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-501-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-501-100-1.0-grid-reference.json index b9cfbcf4e..f31007658 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-501-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-501-100-1.0-grid-reference.json @@ -5,10 +5,10 @@ "5", "1", "2", + "3", "6", "7", "9", - "3", "4", "10" ], @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " # ! ! ", - " ## # ", - " $ $ % % # ##### & ' ! ! ( ( (( ( ", - " $ $ %% ) ) * ## # && ' ' ! ( (( (( + ", - " $$ $ )) ) * && '' ! (( ( ", - " $ )) ) * **** ( ", - " ) ) ) * * ", - " ! ! ", - " ! ", - " ! ", - " + ++++ ", - " + + ", + " !! ", + " !! ", + " # ! ! ", + " ## ", + " $$$ % % & ##### ' ( ! ) )))) ", + " $ $ % % & & * # ### ' '' ( (( ! ! ) ) ) ) + ", + " $ %% & ** '' (( !! )) )))) ", + " $ & **** ) ++++ ", + " & & ** ", + " ! ", + " ! ", + " !! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-502-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-502-100-1.0-grid-reference.json index 353078343..1bff658a2 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-502-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-502-100-1.0-grid-reference.json @@ -5,10 +5,10 @@ "5", "1", "2", + "3", "6", "7", "9", - "3", "4", "10" ], @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " # ! ! ", - " ## # ", - " $ $ % % # ##### & & ' ' ! ! ( (( ( ( ", - " $ $ %% ) ) * ## # && ' ' ! ( ( ( + ", - " $$ $ % )) ) * && '' ! (((( (( ", - " $ )) ) * **** ", - " ) ) * * ", - " ! ", - " ! + ", - " ! ++ + ", - " + ++++ ", - " + + ", + " ! ", + " ! ", + " # ! ! ", + " ## ", + " $$$ % % & ##### ' ( ! ! ) ) )) ) ", + " $ $ % % & & * # ## ' '' ( (( ! ! )) )) ) + + ", + " $ %% & ** '' (( ! ) )) ) + ", + " $ & **** ++++ ", + " & & * + ", + " ! ! ", + " ! ", + " ! ", + " + ", + " + + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-505-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-505-100-1.0-grid-reference.json index 507dc743a..29a07661d 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-505-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-505-100-1.0-grid-reference.json @@ -5,10 +5,10 @@ "5", "1", "2", + "3", "6", "7", "9", - "3", "4", "10" ], @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " ! ! ", - " # ", - " $ $ % % % # #### & & & ' ' ! ( ( (( ( ", - " $ $ %% % ) ) * * ## && & '' ' ! ( ( (( + ", - " $$ $ %% % )) ) ** * && & '' ' !! (( ((((( ", - " $ % )) ) * **** & ' ( ", - " ) ) * * * ", - " ! ", - " ! ", - " !! + ", - " + ++++ ", - " + + ", + " !! ", + " !! ", + " ! ", + " ## ", + " $$$ % % & #### ''' ((( ! ) )))) ", + " $ $ % % & & * * # ## ' ' ( ( ! !! ))) ) )) + ", + " $ % && ** ' ( !! )) ) )) ", + " $ && **** ' ( ) ++++ ", + " & & *** ", + " !! ", + " ! ", + " !! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-3-510-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-3-510-100-1.0-grid-reference.json index 2ce3bdbee..88023d694 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-3-510-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-3-510-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " # ! ", - " ## # ", - " $ $ % % # ##### & & ' ' ! ( ( (( ( ", - " $$ $ %%% % ) * ## # && '' ! ( (( (( + ", - " $$ $ %% % ) ** & ' !! ( (( (( ", - " $ % ) * **** ( ", - " ) ) * ", - " !! ", - " ! + ", - " !! + + ", - " + ++++ ", - " + + + ", + " !! ", + " !! ", + " # ! ", + " ## ", + " $$$ % % ##### & ' ' ! ( (((( ", + " $ $ % % ) * # ### & & ' ' ! !! ( ( ( ( + + ", + " $ % )) ** && ' !! (( ( (( + ", + " $ )) **** ( ++++ ", + " ) * + ", + " !! ", + " ! ", + " !! + ", + " + ", + " + + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-490-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-490-100-1.0-grid-reference.json index cce735e81..928f63174 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-490-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-490-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " ! ! ", - " # ", - " $ $ % % # & & & ' ' ! ! ( ( (( ) ", - " $ % % % * + ### && & '' ! ( ( ( ) ) ", - " $ %% % ** + & & ' ! (( ( (( ) ", - " % ** + & ) ", - " * + + ", - " ! ! ", - " ! ", - " ! )) ", - " ) ", - " ) ", + " !! ", + " !! ", + " ! ", + " # ", + " $ $ % % # & & ' ! (( ( ( ) ", + " $ $ % %%% * + # # # & && ' ' ! ! ((( ( (( ) ) ", + " $ %%% ** ++ && '' !! (( ( (( ) ", + " % ** + & ) ", + " * + ", + " !! ", + " ! ", + " !! ) ", + " ) ", + " ) ) ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-495-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-495-100-1.0-grid-reference.json index c9c622c00..c2cc58643 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-495-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-495-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " ! ! ", - " ## ", - " $ $ $ % %% & # ' ' ( ( ! ! ) ) )) ) * ", - " $ $ % % % + & & ## '' ( ( ( ! ) ) )) * * ", - " $$ $ %% % + && & '' (( ( !! )) ))))) * ", - " $ % + & & ( ) * ", - " + + & ", - " ! ", - " ! ", - " ! ** ", - " * ", - " ** ", + " !! ", + " !! ", + " ! ", + " ## ", + " $$$ %% & # ' ( ( ! )))) ) * ", + " $ $ % %%% + & & # ## ' '' ( ((( ! !! ))) ) )) * * ", + " $ %%% ++ && '' ((( !! )) ) )) * ", + " $ % ++ & ( ) * ", + " + + & & ", + " !! ", + " ! ", + " !! ** ", + " * ", + " * ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-497-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-497-100-1.0-grid-reference.json index af8ecdc35..d4fcc12d0 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-497-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-497-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " ! ", - " ! ! ", - " # ", - " $ $ $ % % & # ' ' ' ( ( ! ! ! ) )) ) ) ", - " $ $ %% * & & ### '' ' (( ! ! ) )) )) + ", - " $$ $ % * && & ' ' !! ! ) )) )) ", - " $ * && & ' ! ) ", - " * * && ", - " ! ", - " ! ", - " ! + ", - " + ", - " + + ", + " ! ", + " ! ", + " ! ! ", + " ## ", + " $$$ % & # ' ' ( ( !!! ) )))) ) ", + " $ $ % % * & & # # ' '' ( ( ! ! ) ) )) ) + ", + " $ %% * && ''' (( ! )) )))) ", + " $ * & ' ! ) ", + " * * & ", + " ! ! ", + " ! ", + " ! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-498-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-498-100-1.0-grid-reference.json index 7bf75be57..cbae7e74d 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-498-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-498-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " ! ", - " # ", - " $ $ $ % % & # ' ' ' ( ( ! ! )) ) ) * ", - " $ $ %% + & & ### '' ' (( !! ! ) ) ) * * ", - " $$ $ % + && & '' ' (( !! ! )))) )) * ", - " $ + & & ' ! * ", - " + + && ", - " !! ", - " ! ", - " !! ** ", - " * ", - " * ", + " ! ", + " ! ", + " ! ! ", + " ## ", + " $$$ % & # ' ' ( ( !!! ) )) ) ) * ", + " $ $ % % + & & # # ' '' ( ( ! ! )) )) ) * * ", + " $ %% + && ' ( ! ) )) ) * ", + " $ + & ' ! * ", + " + + & ", + " ! ", + " ! ", + " ! * ", + " * ", + " * * ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-499-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-499-100-1.0-grid-reference.json index f13785b12..4ae292bce 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-499-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-499-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " ! ", - " # ", - " $ $ % % & # # ' ' ( ! ! ) ) )) * ", - " $ $ %% & & + ### # '' ' ((( !! ! )) ) )) * * ", - " $$ $ && & ++ # '' ' (( !! ! )) )) * ", - " $ & & + # ' ! * ", - " & & + ", - " !! ", - " ! ", - " !! ** ", - " ** ", - " ** ", + " !! ", + " !! ", + " ! ! ", + " # ", + " $$$ % & # ' ' ( ( !! )) ) ) * ", + " $ $ % % & & + # ### ' '' ( ( ! ! )) ) ) * * ", + " $ %% & ++ # '' ( !! )))) )) * ", + " $ & + # ' ! * ", + " & & ++ ", + " ! ", + " ! ", + " !! ** ", + " * ", + " * ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-500-100-1.0-grid-reference.json index 716cbfae1..4b94c7b08 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-500-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " ! ", - " ! ! ", - " ## ", - " $ $ % % & # # ' ( ( ! ! ) ) )) ) ", - " $ $ %% & & * ## # ''' ((( ( ! ) ) )) + ", - " $$ $ && & ** # '' (( ( !! )) ))))) ", - " $ & & * # ( ) ", - " & & * ", - " ! ", - " ! ", - " !! ++ ", - " + ", - " + ", + " !! ", + " !! ", + " ", + " # ", + " $$$ % % & # ' ( ( ! ) )))) ", + " $ $ % % & & * # ### ' ' ( (( ! !! ))) ) )) + ", + " $ %% & ** # '' ((( !! )) ) )) ", + " $ & ** # ( ) ", + " & & ** ", + " !! ", + " ! ", + " !! ++ ", + " ++ ", + " ++ ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-501-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-501-100-1.0-grid-reference.json index c92247fed..e6f0ea08d 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-501-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-501-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " ! ! ", - " ## ", - " $ $ % % & # # ' ( ( ! ! ) ) )) ) ", - " $ $ %% & & * ## # '' ( ( ( ! ) )) )) + ", - " $$ $ && & * # '' (( ( ! )) ) ", - " $ && & * # ( ) ", - " & & * * ", - " ! ! ", - " ! ", - " ! ", - " + ", - " + + ", + " !! ", + " !! ", + " ! ! ", + " # ", + " $$$ % % & # ' ( ( ! ) )))) ", + " $ $ % % & & * # ### ' '' ( ((( ! ! ) ) ) ) + ", + " $ %% & ** # '' ((( !! )) )))) ", + " $ & * # ( ) ", + " & & ** ", + " ! ", + " ! ", + " !! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-502-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-502-100-1.0-grid-reference.json index 04c2daffb..f9161241f 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-502-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-502-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " ! ", - " ! ", - " ! ! ", - " ## ", - " $ $ % % & # # ' ' ( (( ! ! ) )) ) ) * ", - " $ $ %% & & + ## # '' ( ( ( ! ) ) ) * * ", - " $$ $ % && & + # '' (( ( ! )))) )) * ", - " $ && & + # ( * ", - " & + + ", - " ! ", - " ! ", - " ! ** ", - " * ", - " * ", + " ! ", + " ! ", + " ! ! ", + " ## ", + " $$$ % % & # ' (( ! ! ) ) )) ) * ", + " $ $ % % & & + # ## ' '' ( ((( ! ! )) )) ) * * ", + " $ %% & ++ # '' ((( ! ) )) ) * ", + " $ & + # ( * ", + " & & + ", + " ! ! ", + " ! ", + " ! ", + " * ", + " * * ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-505-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-505-100-1.0-grid-reference.json index 59f3886f5..c92737514 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-505-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-505-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " ! ! ", - " # ", - " $ $ % % & ' # ( ( ( ) ! * * ** * ", - " $ $ %% & & ' ' ## (( ( )) ! * * ** + ", - " $$ $ %% && & '' ' (( ( )) !! ** ***** ", - " $ && & ' ' ( * ", - " & ' ' ", - " ! ", - " ! ", - " !! + ", - " + ", - " + + ", + " !! ", + " !! ", + " ! ", + " ## ", + " $$$ % % & ' # ( ( ) ) ! * **** ", + " $ $ % % & & ' ' # ## ( (( ) ) ! !! *** * ** + ", + " $ % && '' (( ) !! ** * ** ", + " $ && ' ( * ", + " & & ' ' ", + " !! ", + " ! ", + " !! ++ ", + " + ", + " + ", " ", " ", " ", diff --git a/tests/visual_tests/grids/shieldsymbolizer-4-510-100-1.0-grid-reference.json b/tests/visual_tests/grids/shieldsymbolizer-4-510-100-1.0-grid-reference.json index f101fbdb2..931a1c616 100644 --- a/tests/visual_tests/grids/shieldsymbolizer-4-510-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/shieldsymbolizer-4-510-100-1.0-grid-reference.json @@ -21,20 +21,20 @@ " ", " ", " ", - " !! ", - " !! ", - " ! ", - " ## ", - " $ $ % # # & & ' ' ! ( ( (( ( ) ", - " $$ $ %%% * + ## # && '' ! ( (( (( ) ) ", - " $$ $ %% * ++ # & ' !! ( (( (( ) ", - " $ * + # ( ) ", - " * * + ", - " !! ", - " ! ", - " !! ) ", - " ) ", - " ) ) ", + " !! ", + " !! ", + " ! ", + " # ", + " $$$ % % # & ' ' ! ( (((( ) ", + " $ $ % % * + # ### & & ' ' ! !! ( ( ( ( ) ) ", + " $ % ** ++ # && ' !! (( ( (( ) ", + " $ ** + # ( ) ", + " * + ", + " !! ", + " ! ", + " !! ) ", + " ) ", + " ) ) ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-100-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-100-100-1.0-grid-reference.json index c2cc3d49d..d250023b9 100644 --- a/tests/visual_tests/grids/simple-100-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-100-100-1.0-grid-reference.json @@ -1,13 +1,14 @@ { "keys": [ "", - "1", - "6", - "9", - "3", "2", - "7", - "10" + "5", + "8", + "1", + "9", + "10", + "3", + "7" ], "data": {}, "grid": [ @@ -17,20 +18,20 @@ " ", " ", " ", - "! ", - "! !!!!!! # ### # ", - "! !!!!!!! # # ### $$$$$ ", + " ", + " !!! !!!! ", + " ! ! #### $$$$$ ", " ", " ", - " %% % % ", - " ! & % %%%%% %%% %%% ", - " %% % % %", - " %%% % ", + " %% ", + " % %% %%% %% %%%% & '", + " % % % %% ", + " % % % % ", " ", " ", - " & & ''''' (((( ", - "&&& & &&&& ( ( ", - "&& & &&&& && ", + " (( (((( ((( )))))) ", + " (((( ((( (( ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-150-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-150-100-1.0-grid-reference.json index 8e9f005f4..8b25d98e0 100644 --- a/tests/visual_tests/grids/simple-150-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-150-100-1.0-grid-reference.json @@ -1,16 +1,14 @@ { "keys": [ "", + "2", + "7", + "4", + "10", "1", "6", - "4", - "8", "3", - "9", - "2", - "5", - "7", - "10" + "8" ], "data": {}, "grid": [ @@ -21,19 +19,19 @@ " ", " ", " ", - " ! !!! ## #### ", - " ! !! !!! $$ $$ #### ## %%%%% ", + " !!! !!!! # ### # # # ", + " ! !$$ $$ ### # ### %%%", " ", " ", - " &&& & && ''' ", - " ! ( & &&&&&&& &&& &&& && ' ' ' ", - " && && && &&& '' ", - " && & & ' ", + " &&& & ''' ' ", + " & & &&&&&& &&&& && ' ' ''''' ' '' ", + " & & && &&& ' ''' ' ' ", + " && & ' ' ' ", " ", " ", - " ( ( )))) ****** + +", - "((( ( ( (( ( +++++ +", - "(((((( ( (( (( +++++ + ", + " ( ( ) ))) )))))) ", + " ((((( ( (((( ))) ) ))) ", + " ( ((((( (( (((( ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-250-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-250-100-1.0-grid-reference.json index 04956f7d5..f52fcbdfa 100644 --- a/tests/visual_tests/grids/simple-250-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-250-100-1.0-grid-reference.json @@ -1,16 +1,16 @@ { "keys": [ "", - "4", - "9", - "1", - "6", - "3", - "7", "2", + "5", "8", "10", - "5" + "1", + "4", + "7", + "3", + "6", + "9" ], "data": {}, "grid": [ @@ -20,22 +20,22 @@ " ", " ", " ", - " ! ! ! # # ", - "$ $ $$$$$ !!!! ! !! !! %%%% %% #### # ## # ### ", - "$$$ $$ $$$ !!!!!!! !!! !!! % % %% ####### ## # ### ", + " ! ! # # # $ $ $ ", + " !!! ! ! !! ! # ### # ####### $$$$$ $$ $ $$$$ ", + " !!!!!! ! !! !! # ###### ## #### $$$$ $ $$ $$$$ $ %%%% ", + " $ ", + " ", + " && ''' ' ' ((( ( ", + " & &&&&&& &&&& && ' ' '''''' '''' '''( ( ((((( ( (((((((( ", + " & && & & && ' ' '' '' ' '' ( ((( ( ((( ( (", + " & & & & '' ' ' ( ( ( ( ( ", " ", " ", - " &&& & ''' ", - " $ ( & &&&&&&& &&&&&&&&&& ' ''''''' ''''' ''''' ", - " && && & && & '' '' '' ' '' ", - " & & & & ' ' ' ' ' ", + " ) ) ) * * + ", + " ) ))) ) ) )))))) * *** * * *** +++++ + +++ ", + " ) ))))) )) )) )) * ****** ***** ++++ + + +++ ", " ", " ", - " ( ) ) ) **** ", - " ((( ( (( ( ( ++++ +++++ )))) ) )))) )) ", - " ((((( ( (( (( +++++ + +++ ))))))) ))))) ))) ", - " )) ", - " ", " ", " ", " " diff --git a/tests/visual_tests/grids/simple-300-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-300-100-1.0-grid-reference.json index 3228d2b17..3bf047bed 100644 --- a/tests/visual_tests/grids/simple-300-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-300-100-1.0-grid-reference.json @@ -1,16 +1,16 @@ { "keys": [ "", + "2", + "5", + "8", + "10", "1", "4", "7", - "10", "3", "6", - "9", - "2", - "5", - "8" + "9" ], "data": {}, "grid": [ @@ -20,22 +20,22 @@ " ", " ", " ", - " ! # $ $ % % % ", - "!!! ! ! !!! ##### #### $$$$ $ $ $$$ $$$$$ %%%% % %%", - "!! ! !!! !!! ##### # ##### $$$$$$$ $$$$ $ $$ $ %%%%%%% % ", + " ! ! ! # $ $ ", + " ! !!! ! !!! ! ##### #### $$$$$ $$$ $$ % %%% %%", + " ! !!!!!! ! !! !! # ##### # ## $ $$$$$ $$ $$$ $ %% % % ", + " $$ ", + " ", + " &&& & '' ' ((( ( ", + " & & &&&&& &&&& && ' '' ''' '''' ''' ( ( ((((( (((((((( ((% ", + " & && && & ' ' '' ' '' ( (( (( ((( ( ", + " &&& & & ' ' ' ' ((( ( (( ( ", " ", " ", - " &&& & '' ' ((( ", - " ! ) & &&& &&& &&&&&&&&&& ' ''''' '' '' ( ((( ((( (", - " && & & && & '' '' ' (( ( (", - " & & && & ''' ' ( ( ", + " ) ) )) * * + + ", + " ) ))) ) )) ))))))) * *** * * * + +++ + ++++ ++ ", + " ) )))))) )) ))))))) * ***** ** ** + +++++ +++ ++ ", " ", " ", - " ) * * * + + ", - " ))) ) )))) ) ****** * *** +++ + ++ + ++ ", - " ))))) )) ))) ***** * * * ** +++++ + ++ +++ + ", - " + ", - " ", " ", " ", " " diff --git a/tests/visual_tests/grids/simple-400-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-400-100-1.0-grid-reference.json index 974ad6861..b88c666e5 100644 --- a/tests/visual_tests/grids/simple-400-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-400-100-1.0-grid-reference.json @@ -1,16 +1,16 @@ { "keys": [ "", - "3", - "5", - "7", - "9", - "1", "2", "4", "6", "8", - "10" + "10", + "1", + "3", + "5", + "7", + "9" ], "data": {}, "grid": [ @@ -20,21 +20,21 @@ " ", " ", " ", - " ! ! !! # $ % ", - "&&& & & &&& !!!! ! !! !!!!!!! ##### ##### $$$ $ $ $$ $$$ %%% % %%%% %% ", - "&&& & && &&& !!!!!!! !! !!!!!!! ##### # ## ## $$$$$ $ $$$$ $ $$$ %%%%% %%% %% ", + " ! ! # $ % ", + " ! !!! ! !!!! ! ##### #### $$$$$ $ $ %% % %% % %% && &&&& &", + " ! !!!!! !! !!! ##### # ##### $ $$$$$ $$ $ %%%% % %% %%% % &&&& &&& ", + " % ", + " ", + " ''' ' ", + " ' '''''' '''' '' ( # ) $ * % + & ", + " ' '' ' ' ", + " ' ' ' '' ", " ", " ", + " ( ( ) ) ) * + ", + " ((((( ( (( (((( ) ))) ) )))))) ***** ********* +++ + + +++ ", + " (((( ( (( (( (((( ) ))))) )) ))) * ***** ** *** *** ++++++ + +++ ", " ", - " & ' ! ( # ) $ * % + ", - " ", - " ", - " ", - " ", - " ' ' ( ( ( ) * * * + ", - " ''''' ' '''' (((((( (( ( (( ))) ) ) ) ) **** * **** *** +++ + ++", - " ''''' ' '' ''' ((((( ( ((( ((( ))))) ) ))))) ******* ***** *** +++++ +++", - " ** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-600-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-600-100-1.0-grid-reference.json index b503f85f4..a6638f296 100644 --- a/tests/visual_tests/grids/simple-600-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-600-100-1.0-grid-reference.json @@ -4,13 +4,13 @@ "1", "3", "5", - "6", - "8", - "10", + "7", + "9", "2", "4", - "7", - "9" + "6", + "8", + "10" ], "data": {}, "grid": [ @@ -20,21 +20,21 @@ " ", " ", " ", - " ! ! # # # $ $ $ % & ' ' ", - " !!!! ! !!! !! ##### # ### #### $$$$ $ $$ $$ %%% % % % &&&& &&& && ''' ' ' ''' ", - " !!!!!!! !!! !! ##### # #### #### $$$$$$$ $$ $ $$ %%%%% %% %% &&&&& && &&& & ''''' ' ''''' ", - " && ", + " ! # # # $ % & ", + " !!!!! ! ! !!! # ### # # ##### $$ $ $ $$ %%% % % %%% %%%%% &&&&& &&& &&& ", + " !!!! ! !!! !!! # ##### ## ##### $$$$ $ $ $ $$ %%%%%% %%%% % %% % & &&&&& &&& && ", " ", " ", - " ! ( # ) $ % * & + ' ", + " ", + " ! ' # ( $ ) % * & + ", " ", " ", " ", " ", - " ( ( ( ) * + ", - " (((( ( ((( ( ))) ) ))) *** * * ****** * +++ + + ++++ ", - " ((((((( ( (( (( ))))) )))) ***** **** *** * +++++ + + +++ ", - " ", + " ' ' ( ( ( ) * * * + ", + " ''''' ' '''' ( ((( ( (( ( (( ))) ) ) ))) * *** * **** ** +++++ +++ ", + " '''' ' '''' '' ( (((((( ((( ((( )))))) ))))) * ***** ***** ** + +++++ ++++ ", + " ** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-800-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-800-100-1.0-grid-reference.json index cb9bb03ce..dbd1b4bca 100644 --- a/tests/visual_tests/grids/simple-800-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-800-100-1.0-grid-reference.json @@ -20,10 +20,10 @@ " ", " ", " ", - " ! # # $ $ $$ % % % & ' ( ) ) ) * + ", - " !!!!! ! ! !!! ##### # #### $$$$ $ $$ $$$$$$$ %%%%%% %% % %% &&&&& &&&&& ''' ' ' ' ' ((( ( ( (( ((( )))) ) )))) ))) *** * **** ** +++ + ++ + ", - " !!!!! ! !! !!! ##### # ## ### $$$$$$$ $$ $$$$$$$ %%%%% % %%% %%% &&&&& & && && ''''' ' ''''' ((((( ( (((( ( ((( ))))))) ))))) ))) ***** *** ** +++++ +++ + ", - " )) ", + " ! ! # # $ $ % & & & ' ( ) * + + ", + " ! !!! ! !!!!!! # ### # #### # $$$$$ $ $$ $$$$ %%%%% %%%% & &&& & &&&&&& ''''' ' ' ((((( ((((((((( )) ) )) ) )) *** * * *** +++ + ++++++ ", + " ! !!!!! !!!!!!! # ##### ## ### $$$$ $ $$ $$ $$$$ %%%%% % %%%%% & &&&&& && &&& ' ''''' '' ' ( ((((( (( ((( ((( )))) ) )) ))) ) ****** * *** ++++++ + ++ + ", + " ) ", " ", " ", " ! # $ % & ' ( ) * + ", diff --git a/tests/visual_tests/grids/simple-E-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-E-500-100-1.0-grid-reference.json index d9fb5c867..8a1b162de 100644 --- a/tests/visual_tests/grids/simple-E-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-E-500-100-1.0-grid-reference.json @@ -16,10 +16,10 @@ " ", " ", " ", - " !!! ! ! ", - " ! !!!!!!! !!! !!! ", - " !! !! ! ! ", - " ! ! !! ", + " !!! ! ", + " ! ! !!!!! !! !!! ", + " !! !! !!! ", + " ! ! ! ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-N-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-N-500-100-1.0-grid-reference.json index 330278dc8..b049b10d1 100644 --- a/tests/visual_tests/grids/simple-N-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-N-500-100-1.0-grid-reference.json @@ -12,10 +12,10 @@ " ", " ", " ", - " !! ! !! ", - " !!!!! !!!! ! ", - " !!! !!!! ", - " ! ! ! ", + " !!! ! !! ", + " !!!!!! !!! !! ", + " ! !! !! !! ", + " ! ! ! ", " ", " ! ", " ", diff --git a/tests/visual_tests/grids/simple-NE-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-NE-500-100-1.0-grid-reference.json index edb0a3262..aa030d211 100644 --- a/tests/visual_tests/grids/simple-NE-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-NE-500-100-1.0-grid-reference.json @@ -12,10 +12,10 @@ " ", " ", " ", - " !!! ! ! ", - " !!!!!!! !!! !!! ", - " !! !! ! ! ", - " ! ! !! ", + " !!! ! ", + " ! !!!!! !! !!! ", + " !! !! !!! ", + " ! ! ! ", " ", " ! ", " ", diff --git a/tests/visual_tests/grids/simple-NW-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-NW-500-100-1.0-grid-reference.json index 6e33f3651..1d054206d 100644 --- a/tests/visual_tests/grids/simple-NW-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-NW-500-100-1.0-grid-reference.json @@ -13,8 +13,8 @@ " ", " ", " !!! ! ", - " !!! !!! !! !!! ", - " !! ! ! !!! ", + " ! !!!!! !! !!! ", + " !! !! !!! ", " ! ! ! ", " ", " ! ", diff --git a/tests/visual_tests/grids/simple-S-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-S-500-100-1.0-grid-reference.json index 21768da44..28fb8011c 100644 --- a/tests/visual_tests/grids/simple-S-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-S-500-100-1.0-grid-reference.json @@ -20,10 +20,10 @@ " ! ", " ", " ", - " !! ! !! ", - " !!!!! !!!! ! ", - " !!! !!!! ", - " ! ! ! ", + " !!! ! !! ", + " !!!!!! !!! !! ", + " ! !! !! !! ", + " ! ! ! ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-SE-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-SE-500-100-1.0-grid-reference.json index b071e1782..691c6d843 100644 --- a/tests/visual_tests/grids/simple-SE-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-SE-500-100-1.0-grid-reference.json @@ -20,10 +20,10 @@ " ! ", " ", " ", - " !!! ! ! ", - " !!!!!!! !!! !!! ", - " !! !! ! ! ", - " ! ! !! ", + " !!! ! ", + " ! !!!!! !! !!! ", + " !! !! !!! ", + " ! ! ! ", " ", " ", " ", diff --git a/tests/visual_tests/grids/simple-SW-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-SW-500-100-1.0-grid-reference.json index afabb7f6e..6f39d2c38 100644 --- a/tests/visual_tests/grids/simple-SW-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-SW-500-100-1.0-grid-reference.json @@ -21,8 +21,8 @@ " ", " ", " !!! ! ", - " !!! !!! !! !!! ", - " !! ! ! !!! ", + " ! !!!!! !! !!! ", + " !! !! !!! ", " ! ! ! ", " ", " ", diff --git a/tests/visual_tests/grids/simple-W-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/simple-W-500-100-1.0-grid-reference.json index 808862b54..e52b12abb 100644 --- a/tests/visual_tests/grids/simple-W-500-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/simple-W-500-100-1.0-grid-reference.json @@ -17,8 +17,8 @@ " ", " ", " !!! ! ", - " !!! !!! !! !!! ! ", - " !! ! ! !!! ", + " ! !!!!! !! !!! ! ", + " !! !! !!! ", " ! ! ! ", " ", " ", diff --git a/tests/visual_tests/grids/text-bengali-800-100-1.0-grid-reference.json b/tests/visual_tests/grids/text-bengali-800-100-1.0-grid-reference.json index 2747de302..a46b5b1a9 100644 --- a/tests/visual_tests/grids/text-bengali-800-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-bengali-800-100-1.0-grid-reference.json @@ -16,16 +16,16 @@ " ", " ", " ", - " !! ! ## ", - " ! !! !!! # ### ", - " $ $$$$$$ $ $$$$$$$$$ $$ $ $$$$ !!!!! !!!!!!!!!!!!!!!!!!! ################### ", - " $ $ $ $ $ $$ $ $ $ $ $$ $$$ ! ! ! ! ! ! # # ## # # # ", - " $ $ $$ $ $ $ $ $ $ $ $ $$ $ !! ! !!! ! ! ! !!!! ! # # ## # # # # # ", - " $ $ $ $ $ $ $$ $ $ $$ !! !! ! ! ! ! ! ! ###### # ### # # ", - " $ $ $ $ $ $ $ ! ! ! ! !!! ! !! # # # # ## # ", - " $ $$ $ ! ! ! ## ## # ", - " ### ", - " # ", + " !! ! # ## ", + " ! !!! ## ## # ", + " $ $$$$ $ $$ $$$$$$$$$ $ $$ $$ $ $$$$$$$ !!! !!!!!!!!!!!!!!!!!!!!! ##################### ", + " $$ $ $ $ $$ $ $ $$ $$ $ $ $ $$ ! ! ! ! ! ! ! ## ## # # ", + " $$ $ $$ $ $ $ $$ $$ $$$ $$$ $ !! ! ! !!! ! ! ! !!!! ! # # ## # # ## # ", + " $ $ $ $$$ $ $ $$ $$ $$ $$ !! !! ! ! ! ! ! ! ! ######## # ## ", + " $ $$ $ $ $$$$ $$$ $ ! ! ! ! ! !!! ! !! # # # # # ", + " $ $ ! ! ! # # ", + " $ # # # ", + " $ # # ", " ", " ", " ", diff --git a/tests/visual_tests/grids/text-bug1820+0-600-300-1.0-grid-reference.json b/tests/visual_tests/grids/text-bug1820+0-600-300-1.0-grid-reference.json index e08a6b15f..a0dfaa29b 100644 --- a/tests/visual_tests/grids/text-bug1820+0-600-300-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-bug1820+0-600-300-1.0-grid-reference.json @@ -1,16 +1,16 @@ { "keys": [ "", - "10", - "9", - "8", - "7", - "6", - "5", - "4", - "3", + "1", "2", - "1" + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" ], "data": {}, "grid": [ @@ -35,40 +35,6 @@ " ", " ", " ", - " !!! ", - " ! ! !!! ", - " # # ### !! ! ", - " $ ##### ! ! ", - " %%% $$$$$ # ### # ", - " &&& %% % $$$$$ $ ", - " & & &&& %% % ", - " ' ' ''' && & ", - " ( ''''' & & ", - " ))) ((((( ' ''' ' ", - " *** )) ) ((((( ( ", - " * * *** )) ) ", - " + + +++ ** * ", - " +++++ * * ", - " + +++ + ", - " ", - " + * ) ( ' & % $ # ! ", - " ", - " ", - " ", - " ++++ ", - " + ++ ******* ", - " * ** ) ) ))) )) ", - " * ) ))))))) ( ", - " ) )) )))) (( ( (( '' ", - " ( ((((( '''' ", - " '''' && & ", - " & & % % %%%%% ", - " & %%%%%%%%%% $ $ ", - " %% %%% %%% $$ $ $$$$ ", - " $$ $$$$ $ ## # ### ! ", - " $ ## # ## ! ! !! ", - " !! ! ", - " ! ", " ", " ", " ", @@ -82,6 +48,40 @@ " ", " ", " ", + " !! ## $$ %% && '' (( )) ** ++ ", + " ! ! # # $ $ % % & & ' ' ( ( ) ) * * + + ", + " ! ! # # $ $ % % & & ' ' ( ( ) ) * * + + ", + " ! # $ % & ' ( ) * + ", + " ", + " ", + " ", + " ", + " ! !!!! ", + " ! ! !!! ", + " ! ! ! ", + " #### ", + " # ## ", + " $ $$$$$$$$ ", + " $ $$$$$$$ ", + " $ $$ $$$$ % ", + " % % %% ", + " % %%%% && ", + " &&& &&& ", + " &&&&& ", + " & & ", + " ' ' ", + " ' ' ", + " (( ( ((((( ", + " ((((( ((( ", + " (( ((( ((( ) ) ", + " ) ) )))) ", + " ) ) ))) ", + " ) ** ** ** ", + " ** * *** ", + " ** * *** + ", + " ++ + + ", + " ++ + + ", + " ", " ", " ", " ", diff --git a/tests/visual_tests/grids/text-bug1820+1-600-300-1.0-grid-reference.json b/tests/visual_tests/grids/text-bug1820+1-600-300-1.0-grid-reference.json index dad07fee6..2af93c118 100644 --- a/tests/visual_tests/grids/text-bug1820+1-600-300-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-bug1820+1-600-300-1.0-grid-reference.json @@ -52,42 +52,42 @@ " ", " ", " ! # $ % & ' ( ) * + ", - " !!! ### $$$ %%% &&& ''' ((( ))) *** +++ ", - " !! ! ## # $$ $ %% % && & '' ' (( ( )) ) ** * ++ + ", - " !! ! ## # $$ $ %% % && & '' ' (( ( )) ) ** * ++ + ", " ", " ", " ", " ", + " !! ! ", + " !!!! ! ## ", + " ## ### ", + " # # ", + " # # ", + " $$ $ ", + " $$$$ $ %% ", + " !!!!!! %% %%% ", + " ! ! !! % % ", + " ! ! % % ", + " && & ", + " &&&& & '' ", + " ####### '' ''' ", + " # ## ' ' ", + " # ' ' ", " ", - " ! !! ! ", - " ! ! !!! ", - " ! ! ! ", - " #### ", - " # ## ", - " $ $ $$$ $$ ", - " $ $$$$$$$ ", - " $ $$ $$$$ %% ", - " % % %% ", - " % %%%% && ", - " &&&& & ", - " &&&&& ", - " & & & ", - " ' ' ", - " ' ", - " ( ( ((((( ", - " (((((((((( ", - " (( ((( ((( ) ) ", - " ) ) )))) ", - " ) ) )))) ", - " ** ** ** ", - " ** * *** ", - " ** * *** + ", - " ++ +++ ", - " ++ + ", + " $ ", + " $ $$$$$$$$ ", + " $ $$$ ", + " $ $$ ", + " ", + " % ", + " %%%% %%% ", + " %% % %% ", + " % % ", + " ", + " && ", + " &&&&&&& ", + " &&&& ", + " & ", " ", " ", - " ", - " " + " '' ' " ] } \ No newline at end of file diff --git a/tests/visual_tests/grids/text-bug1820-1-600-300-1.0-grid-reference.json b/tests/visual_tests/grids/text-bug1820-1-600-300-1.0-grid-reference.json index 1eef7ef46..8ffa967ed 100644 --- a/tests/visual_tests/grids/text-bug1820-1-600-300-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-bug1820-1-600-300-1.0-grid-reference.json @@ -19,39 +19,39 @@ " ", " ", " ", - " ! ! !!! ", - " !!!!! ", - " ### ! !!! ! ", - " ## # ", - " ## # ", - " $ $ $$$ ", - " $$$$$ ", - " %%% $ $$$ $ ", - " %% % ", - " %% % ", - " & & &&& ", - " &&&&& ", - " ''' & &&& & ", - " '' ' ", - " '' ' ", - " ( ( ((( ", - " ((((( ", - " ))) ( ((( ( ", - " )) ) ", - " )) ) ", - " * * *** ", - " ***** ", - " +++ * *** * ", - " ++ + ", - " ++ + ", + " ! !!! ", + " !! ! ", + " ## !!! ! ", + " # # ", + " # ", + " $ $$$ ", + " $$ $ ", + " %% $$$ $ ", + " % % ", + " % ", + " & &&& ", + " && & ", + " '' &&& & ", + " ' ' ", + " ' ", + " ( ((( ", + " (( ( ", + " )) ((( ( ", + " ) ) ", + " ) ", + " * *** ", + " ** * ", + " ++ *** * ", + " + + ", + " + ", " ", " ", " ", " ", " ( '' $ ", - " + ++ + ***** * ) ) ))) )) ((( ((( '''' ' & & & % % %%%%% $$ $$$$$$ ## ## ## ! ! !! ", + " + ++ + ***** * ) ) ))) )) ((( ((( ''' ''' & & & % % %%%%% $$ $$$$$$ ## ## ## ! ! !! ", " + + +++ * ** ) ))))))) (( ( (( ''''' && & %%%%%%%%%% $$ $ $$$$ ## # ### !!!! ! ", - " + ++ + **** * ) )) )))) ( ((((( ''' ' &&&& & %% %%% %%% $$ $$$$ $ ## # ### ! !! ! ", + " + ++ + **** * ) )) )))) ( ((((( '' '' &&&& & %% %%% %%% $$ $$$$ $ ## # ### ! !! ! ", " $ ", " ", " ", diff --git a/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json b/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json index 26dd0e24e..433e387b8 100644 --- a/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json @@ -37,21 +37,21 @@ " ", " ", " ", + " ! ", + " ! ! ! ", " ", - " !!! !! ", - " ", - " ## #### $$ $$$$ !!!! ", - " ####### $$$$$$$ !!!! % % % ", - " ### $$$ %% %%%%%% ", - " ### $$$ !!!! ", + " ## #### $$ $$$$ !! ! ", + " ####### $$$$$$$ !!! %% ", + " ### $$$ % % %%% ", + " ### $$$ !!! ", " # $ %%%% %%%% ", " ####### $$$$$$$ ! !! %%%% %%% ", " #### $$$$ !!!!! % % ", " ! % % %%% ", " #### $$$$ ! !!!!! ", " %%%%%%%%%%% ", - " ### # $$$ $ !!!! %%%%%%%%%%% ", - " # ### $ $$$ !!!! ", + " ### # $$$ $ !!! %%%%%%%%%%% ", + " # ### $ $$$ ! ! ", " ! ", " !!!!! ! ", " ", diff --git a/tests/visual_tests/grids/text-malayalam-800-100-1.0-grid-reference.json b/tests/visual_tests/grids/text-malayalam-800-100-1.0-grid-reference.json index c7550907a..688080948 100644 --- a/tests/visual_tests/grids/text-malayalam-800-100-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-malayalam-800-100-1.0-grid-reference.json @@ -16,12 +16,12 @@ " ", " ", " ", - " ", - " !!!!! !!!!!! ! ", - " !!! ! ! ! ", - " !!! ! ! ! ! ", - " ! ! ! ", - " !!!!! ! ", + " ! ! !! ", + " !!!!! !!!!! !!!!! !!!! ", + " !!! ! ! ! ! ! ! ! ", + " !!! ! ! ! ! ! !! ", + " ! ! ! !! ", + " !!!!!! ", " ", " ", " ", diff --git a/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png b/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png index 72758f739..722fe4aa8 100644 Binary files a/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png and b/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/charspacing-200-400-2.0-cairo-reference.png b/tests/visual_tests/images/charspacing-200-400-2.0-cairo-reference.png index 609228df1..bdda636f3 100644 Binary files a/tests/visual_tests/images/charspacing-200-400-2.0-cairo-reference.png and b/tests/visual_tests/images/charspacing-200-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/charspacing-lines-300-300-1.0-agg-reference.png b/tests/visual_tests/images/charspacing-lines-300-300-1.0-agg-reference.png index 1eb6f19b9..1dcf92ca5 100644 Binary files a/tests/visual_tests/images/charspacing-lines-300-300-1.0-agg-reference.png and b/tests/visual_tests/images/charspacing-lines-300-300-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/charspacing-lines-300-300-1.0-cairo-reference.png b/tests/visual_tests/images/charspacing-lines-300-300-1.0-cairo-reference.png index afbbf0c50..e7a808663 100644 Binary files a/tests/visual_tests/images/charspacing-lines-300-300-1.0-cairo-reference.png and b/tests/visual_tests/images/charspacing-lines-300-300-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png b/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png index a4098efd8..a76b61acd 100644 Binary files a/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png and b/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/charspacing-lines-300-300-2.0-cairo-reference.png b/tests/visual_tests/images/charspacing-lines-300-300-2.0-cairo-reference.png index 6c36cb6d8..e5bab8be3 100644 Binary files a/tests/visual_tests/images/charspacing-lines-300-300-2.0-cairo-reference.png and b/tests/visual_tests/images/charspacing-lines-300-300-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png b/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png index c38a98ee4..814e37d31 100644 Binary files a/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png and b/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/collision-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/collision-600-400-1.0-cairo-reference.png index 3a6fe174b..c8a3eba8d 100644 Binary files a/tests/visual_tests/images/collision-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/collision-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png b/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png index ecc4dcdb8..d0e7a446f 100644 Binary files a/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png and b/tests/visual_tests/images/collision-600-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/collision-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/collision-600-400-2.0-cairo-reference.png index 9dc837ad1..d72f19440 100644 Binary files a/tests/visual_tests/images/collision-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/collision-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/expressionformat-500-100-1.0-agg-reference.png b/tests/visual_tests/images/expressionformat-500-100-1.0-agg-reference.png index 9257ed4ab..8cb572d99 100644 Binary files a/tests/visual_tests/images/expressionformat-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/expressionformat-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/expressionformat-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/expressionformat-500-100-1.0-cairo-reference.png index 44ce35818..cb49e42f1 100644 Binary files a/tests/visual_tests/images/expressionformat-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/expressionformat-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/expressionformat-500-100-2.0-agg-reference.png b/tests/visual_tests/images/expressionformat-500-100-2.0-agg-reference.png index f2f68f714..8d468f4f1 100644 Binary files a/tests/visual_tests/images/expressionformat-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/expressionformat-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/expressionformat-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/expressionformat-500-100-2.0-cairo-reference.png index 0ae38d625..d8237b302 100644 Binary files a/tests/visual_tests/images/expressionformat-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/expressionformat-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/formatting-1-500-100-1.0-agg-reference.png b/tests/visual_tests/images/formatting-1-500-100-1.0-agg-reference.png index 7e0c11f30..c3148b17a 100644 Binary files a/tests/visual_tests/images/formatting-1-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/formatting-1-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/formatting-1-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/formatting-1-500-100-1.0-cairo-reference.png index 38d2ef510..df73f3019 100644 Binary files a/tests/visual_tests/images/formatting-1-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/formatting-1-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/formatting-1-500-100-2.0-agg-reference.png b/tests/visual_tests/images/formatting-1-500-100-2.0-agg-reference.png index 50fe3a715..4c2ce1bef 100644 Binary files a/tests/visual_tests/images/formatting-1-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/formatting-1-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/formatting-1-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/formatting-1-500-100-2.0-cairo-reference.png index d0b2935ef..43f9fcf36 100644 Binary files a/tests/visual_tests/images/formatting-1-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/formatting-1-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/formatting-2-500-100-1.0-agg-reference.png b/tests/visual_tests/images/formatting-2-500-100-1.0-agg-reference.png index 7e0c11f30..c3148b17a 100644 Binary files a/tests/visual_tests/images/formatting-2-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/formatting-2-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/formatting-2-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/formatting-2-500-100-1.0-cairo-reference.png index 38d2ef510..df73f3019 100644 Binary files a/tests/visual_tests/images/formatting-2-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/formatting-2-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/formatting-2-500-100-2.0-agg-reference.png b/tests/visual_tests/images/formatting-2-500-100-2.0-agg-reference.png index 50fe3a715..4c2ce1bef 100644 Binary files a/tests/visual_tests/images/formatting-2-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/formatting-2-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/formatting-2-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/formatting-2-500-100-2.0-cairo-reference.png index d0b2935ef..43f9fcf36 100644 Binary files a/tests/visual_tests/images/formatting-2-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/formatting-2-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/formatting-3-500-100-1.0-agg-reference.png b/tests/visual_tests/images/formatting-3-500-100-1.0-agg-reference.png index 1e2e74ab1..3a5c837d1 100644 Binary files a/tests/visual_tests/images/formatting-3-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/formatting-3-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/formatting-3-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/formatting-3-500-100-1.0-cairo-reference.png index 26233a79c..fea311beb 100644 Binary files a/tests/visual_tests/images/formatting-3-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/formatting-3-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/formatting-3-500-100-2.0-agg-reference.png b/tests/visual_tests/images/formatting-3-500-100-2.0-agg-reference.png index 97d18d51d..cd4f34ec0 100644 Binary files a/tests/visual_tests/images/formatting-3-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/formatting-3-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/formatting-3-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/formatting-3-500-100-2.0-cairo-reference.png index d760bb2c0..e5e965c12 100644 Binary files a/tests/visual_tests/images/formatting-3-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/formatting-3-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png b/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png index 738f778e7..c936fc298 100644 Binary files a/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png b/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png index 064a1623a..6bc2d6af8 100644 Binary files a/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png b/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png index b6da1f8fa..c44bd495e 100644 Binary files a/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png b/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png index a9ec907d8..5897a5ab5 100644 Binary files a/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png and b/tests/visual_tests/images/harfbuzz-800-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png b/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png index 9625903da..4f704bcc9 100644 Binary files a/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png and b/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/hb-fontsets-800-200-1.0-cairo-reference.png b/tests/visual_tests/images/hb-fontsets-800-200-1.0-cairo-reference.png index 6b83f640e..13394581d 100644 Binary files a/tests/visual_tests/images/hb-fontsets-800-200-1.0-cairo-reference.png and b/tests/visual_tests/images/hb-fontsets-800-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/hb-fontsets-800-200-2.0-agg-reference.png b/tests/visual_tests/images/hb-fontsets-800-200-2.0-agg-reference.png index 294789129..1da2bed8b 100644 Binary files a/tests/visual_tests/images/hb-fontsets-800-200-2.0-agg-reference.png and b/tests/visual_tests/images/hb-fontsets-800-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/hb-fontsets-800-200-2.0-cairo-reference.png b/tests/visual_tests/images/hb-fontsets-800-200-2.0-cairo-reference.png index 51f8cda34..62025f69f 100644 Binary files a/tests/visual_tests/images/hb-fontsets-800-200-2.0-cairo-reference.png and b/tests/visual_tests/images/hb-fontsets-800-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png b/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png index 6fdfabc10..54b234cc1 100644 Binary files a/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png b/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png index 6fdfabc10..54b234cc1 100644 Binary files a/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png b/tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png index c35ef1184..931219b71 100644 Binary files a/tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png b/tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png index 4b51e78e5..245dada78 100644 Binary files a/tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png b/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png index 2d774d4f1..05e631d70 100644 Binary files a/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png b/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png index 69e4400c1..bcabab19f 100644 Binary files a/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/jalign-auto-200-200-1.0-agg-reference.png b/tests/visual_tests/images/jalign-auto-200-200-1.0-agg-reference.png index ba352b23a..74b8cc143 100644 Binary files a/tests/visual_tests/images/jalign-auto-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/jalign-auto-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/jalign-auto-200-200-1.0-cairo-reference.png b/tests/visual_tests/images/jalign-auto-200-200-1.0-cairo-reference.png index 8e07a3e91..24f4cc3f6 100644 Binary files a/tests/visual_tests/images/jalign-auto-200-200-1.0-cairo-reference.png and b/tests/visual_tests/images/jalign-auto-200-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/jalign-auto-200-200-2.0-agg-reference.png b/tests/visual_tests/images/jalign-auto-200-200-2.0-agg-reference.png index 22ef4262a..a53bce825 100644 Binary files a/tests/visual_tests/images/jalign-auto-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/jalign-auto-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/jalign-auto-200-200-2.0-cairo-reference.png b/tests/visual_tests/images/jalign-auto-200-200-2.0-cairo-reference.png index f62af81c6..c7f264dff 100644 Binary files a/tests/visual_tests/images/jalign-auto-200-200-2.0-cairo-reference.png and b/tests/visual_tests/images/jalign-auto-200-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png b/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png index 432181d46..0d1e25a6b 100644 Binary files a/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png and b/tests/visual_tests/images/khmer-800-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png b/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png index a5d532c34..623c2b4db 100644 Binary files a/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png and b/tests/visual_tests/images/khmer-800-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png b/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png index 39d56b9ca..29a906090 100644 Binary files a/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png and b/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png b/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png index 1b88b4145..5477142b9 100644 Binary files a/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png and b/tests/visual_tests/images/khmer-800-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line-offset-900-250-1.0-agg-reference.png b/tests/visual_tests/images/line-offset-900-250-1.0-agg-reference.png index bdcaa151b..19f85db78 100644 Binary files a/tests/visual_tests/images/line-offset-900-250-1.0-agg-reference.png and b/tests/visual_tests/images/line-offset-900-250-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-offset-900-250-1.0-cairo-reference.png b/tests/visual_tests/images/line-offset-900-250-1.0-cairo-reference.png index 5ca6880b1..51a7333be 100644 Binary files a/tests/visual_tests/images/line-offset-900-250-1.0-cairo-reference.png and b/tests/visual_tests/images/line-offset-900-250-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line-offset-900-250-2.0-agg-reference.png b/tests/visual_tests/images/line-offset-900-250-2.0-agg-reference.png index 12d963b78..53ffcc28c 100644 Binary files a/tests/visual_tests/images/line-offset-900-250-2.0-agg-reference.png and b/tests/visual_tests/images/line-offset-900-250-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-offset-900-250-2.0-cairo-reference.png b/tests/visual_tests/images/line-offset-900-250-2.0-cairo-reference.png index c4f7dfd55..b83bd731f 100644 Binary files a/tests/visual_tests/images/line-offset-900-250-2.0-cairo-reference.png and b/tests/visual_tests/images/line-offset-900-250-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png new file mode 100644 index 000000000..77c68f69e Binary files /dev/null and b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png new file mode 100644 index 000000000..7ab02a05f Binary files /dev/null and b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png new file mode 100644 index 000000000..5b1b3004b Binary files /dev/null and b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png new file mode 100644 index 000000000..0afbde7b7 Binary files /dev/null and b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line_break-800-800-1.0-agg-reference.png b/tests/visual_tests/images/line_break-800-800-1.0-agg-reference.png index 113d5ba18..d017b296c 100644 Binary files a/tests/visual_tests/images/line_break-800-800-1.0-agg-reference.png and b/tests/visual_tests/images/line_break-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line_break-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/line_break-800-800-1.0-cairo-reference.png index 9beb23376..b4bab7059 100644 Binary files a/tests/visual_tests/images/line_break-800-800-1.0-cairo-reference.png and b/tests/visual_tests/images/line_break-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/line_break-800-800-2.0-agg-reference.png b/tests/visual_tests/images/line_break-800-800-2.0-agg-reference.png index 72344f828..ef7352a6b 100644 Binary files a/tests/visual_tests/images/line_break-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/line_break-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line_break-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/line_break-800-800-2.0-cairo-reference.png index a22e3df6c..d1f69b0c4 100644 Binary files a/tests/visual_tests/images/line_break-800-800-2.0-cairo-reference.png and b/tests/visual_tests/images/line_break-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png index ddf38bc47..9c413b6bf 100644 Binary files a/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png index 4849cc4b3..e530c6cab 100644 Binary files a/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-400-400-1.0-agg-reference.png b/tests/visual_tests/images/lines-1-400-400-1.0-agg-reference.png index e00ba59a2..551ae51eb 100644 Binary files a/tests/visual_tests/images/lines-1-400-400-1.0-agg-reference.png and b/tests/visual_tests/images/lines-1-400-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png index 42ab61c69..e13624f98 100644 Binary files a/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png index 8c89f65c3..c15a2fd17 100644 Binary files a/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png index 88cef07ea..96518c5e9 100644 Binary files a/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-1-600-600-1.0-cairo-reference.png index 764ba5669..515daedab 100644 Binary files a/tests/visual_tests/images/lines-1-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-1-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png index cb5ec1a14..0d5e6efcc 100644 Binary files a/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-1-800-800-1.0-agg-reference.png index 82505c7f7..02209ef2b 100644 Binary files a/tests/visual_tests/images/lines-1-800-800-1.0-agg-reference.png and b/tests/visual_tests/images/lines-1-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-1-800-800-1.0-cairo-reference.png index cf99db2dc..425b01edf 100644 Binary files a/tests/visual_tests/images/lines-1-800-800-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-1-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-1-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-800-800-2.0-agg-reference.png index b552596aa..c4da4f388 100644 Binary files a/tests/visual_tests/images/lines-1-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png index 19c77a301..2c8d155eb 100644 Binary files a/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-200-200-1.0-cairo-reference.png b/tests/visual_tests/images/lines-2-200-200-1.0-cairo-reference.png index df1e249cf..05dbf909a 100644 Binary files a/tests/visual_tests/images/lines-2-200-200-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-200-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png index 4849cc4b3..e530c6cab 100644 Binary files a/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-400-400-1.0-agg-reference.png b/tests/visual_tests/images/lines-2-400-400-1.0-agg-reference.png index 48217212f..965ad6a45 100644 Binary files a/tests/visual_tests/images/lines-2-400-400-1.0-agg-reference.png and b/tests/visual_tests/images/lines-2-400-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png index 87353af6f..d7d86f4bb 100644 Binary files a/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png index 531676319..13847b39e 100644 Binary files a/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-400-400-2.0-cairo-reference.png b/tests/visual_tests/images/lines-2-400-400-2.0-cairo-reference.png index fa5f58825..ca17344c8 100644 Binary files a/tests/visual_tests/images/lines-2-400-400-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-400-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-2-600-600-1.0-agg-reference.png index d2d192474..4c81dc28c 100644 Binary files a/tests/visual_tests/images/lines-2-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-2-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-2-600-600-1.0-cairo-reference.png index 39e433afb..d7f2277cb 100644 Binary files a/tests/visual_tests/images/lines-2-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png index a19981b57..656c47933 100644 Binary files a/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-600-600-2.0-cairo-reference.png b/tests/visual_tests/images/lines-2-600-600-2.0-cairo-reference.png index f077c17d6..62a026b9e 100644 Binary files a/tests/visual_tests/images/lines-2-600-600-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-600-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-2-800-800-1.0-agg-reference.png index 2788b7f6c..132acbcaa 100644 Binary files a/tests/visual_tests/images/lines-2-800-800-1.0-agg-reference.png and b/tests/visual_tests/images/lines-2-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-2-800-800-1.0-cairo-reference.png index d6191e670..8a11d0236 100644 Binary files a/tests/visual_tests/images/lines-2-800-800-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png index 89281dd09..bbc953663 100644 Binary files a/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/lines-2-800-800-2.0-cairo-reference.png index 46b196ccd..e4cd18585 100644 Binary files a/tests/visual_tests/images/lines-2-800-800-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png index ddf38bc47..9c413b6bf 100644 Binary files a/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png index 4849cc4b3..e530c6cab 100644 Binary files a/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-400-400-1.0-agg-reference.png b/tests/visual_tests/images/lines-3-400-400-1.0-agg-reference.png index 1a7e12bd8..a552848a5 100644 Binary files a/tests/visual_tests/images/lines-3-400-400-1.0-agg-reference.png and b/tests/visual_tests/images/lines-3-400-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png index 2b1968b4d..1bd2dd9e4 100644 Binary files a/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png index 8c89f65c3..c15a2fd17 100644 Binary files a/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png index 850256335..673d083c8 100644 Binary files a/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-3-600-600-1.0-cairo-reference.png index 0091f40fd..c6ecf9c73 100644 Binary files a/tests/visual_tests/images/lines-3-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-3-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png index d21964fd8..69f87cc50 100644 Binary files a/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-3-800-800-1.0-agg-reference.png index 3fc46056b..3a9295667 100644 Binary files a/tests/visual_tests/images/lines-3-800-800-1.0-agg-reference.png and b/tests/visual_tests/images/lines-3-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-3-800-800-1.0-cairo-reference.png index e46ab9671..1d94e755c 100644 Binary files a/tests/visual_tests/images/lines-3-800-800-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-3-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-3-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-800-800-2.0-agg-reference.png index e75d2994f..a8bdfead8 100644 Binary files a/tests/visual_tests/images/lines-3-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png index ec483135d..a27bcbe66 100644 Binary files a/tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-200-200-1.0-cairo-reference.png b/tests/visual_tests/images/lines-5-200-200-1.0-cairo-reference.png index 394179e5e..a0609f580 100644 Binary files a/tests/visual_tests/images/lines-5-200-200-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-200-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png index 74b82f537..46cac92b5 100644 Binary files a/tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-200-200-2.0-cairo-reference.png b/tests/visual_tests/images/lines-5-200-200-2.0-cairo-reference.png index f7f4d4c4c..642b93cca 100644 Binary files a/tests/visual_tests/images/lines-5-200-200-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-200-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png b/tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png index fa4690e82..4d5e8eabf 100644 Binary files a/tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png and b/tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-5-400-400-1.0-cairo-reference.png index 9d278b786..d1df31ee5 100644 Binary files a/tests/visual_tests/images/lines-5-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png index dc35fd7e3..efe0bddbc 100644 Binary files a/tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-400-400-2.0-cairo-reference.png b/tests/visual_tests/images/lines-5-400-400-2.0-cairo-reference.png index 3d74fcfd3..a3cccfc05 100644 Binary files a/tests/visual_tests/images/lines-5-400-400-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-400-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png index fac6d7505..e332760b9 100644 Binary files a/tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-5-600-600-1.0-cairo-reference.png index f3dc03a8f..6d91cbaf0 100644 Binary files a/tests/visual_tests/images/lines-5-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png index 8853be6c8..dd2d84dac 100644 Binary files a/tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-600-600-2.0-cairo-reference.png b/tests/visual_tests/images/lines-5-600-600-2.0-cairo-reference.png index 764065406..7aeef51b8 100644 Binary files a/tests/visual_tests/images/lines-5-600-600-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-600-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png index 7e6ad0728..8ca5637cc 100644 Binary files a/tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png and b/tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-5-800-800-1.0-cairo-reference.png index e0ffc3dbb..f58365004 100644 Binary files a/tests/visual_tests/images/lines-5-800-800-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png index 32524a16b..3ef26e35d 100644 Binary files a/tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-5-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/lines-5-800-800-2.0-cairo-reference.png index c3852cdf5..311b77d8a 100644 Binary files a/tests/visual_tests/images/lines-5-800-800-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-5-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png index 0ede75596..ed4c47469 100644 Binary files a/tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-200-200-1.0-cairo-reference.png b/tests/visual_tests/images/lines-6-200-200-1.0-cairo-reference.png index 8f5017ab1..e2a602ff7 100644 Binary files a/tests/visual_tests/images/lines-6-200-200-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-200-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png index 451154733..df5b5f8a7 100644 Binary files a/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-200-200-2.0-cairo-reference.png b/tests/visual_tests/images/lines-6-200-200-2.0-cairo-reference.png index bd6888f14..54a7b2cbe 100644 Binary files a/tests/visual_tests/images/lines-6-200-200-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-200-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png b/tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png index d390d8c1d..b30f123cd 100644 Binary files a/tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png and b/tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-6-400-400-1.0-cairo-reference.png index 9726914f9..1d1d556f8 100644 Binary files a/tests/visual_tests/images/lines-6-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png index cc38fbeff..3b3bd1c75 100644 Binary files a/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-400-400-2.0-cairo-reference.png b/tests/visual_tests/images/lines-6-400-400-2.0-cairo-reference.png index 7b2f9820e..ad13779f9 100644 Binary files a/tests/visual_tests/images/lines-6-400-400-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-400-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png index 7252c44f5..2b88b5dd6 100644 Binary files a/tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-6-600-600-1.0-cairo-reference.png index 69a7efb93..3e1d7d470 100644 Binary files a/tests/visual_tests/images/lines-6-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png index 88042c602..b1f80b159 100644 Binary files a/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-600-600-2.0-cairo-reference.png b/tests/visual_tests/images/lines-6-600-600-2.0-cairo-reference.png index bf81038ca..7b3103c42 100644 Binary files a/tests/visual_tests/images/lines-6-600-600-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-600-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png b/tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png index 195cf723c..917d5b551 100644 Binary files a/tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png and b/tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-800-800-1.0-cairo-reference.png b/tests/visual_tests/images/lines-6-800-800-1.0-cairo-reference.png index 481eb326c..4125919f3 100644 Binary files a/tests/visual_tests/images/lines-6-800-800-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-800-800-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png index f5a670e2b..8cc116240 100644 Binary files a/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-800-800-2.0-cairo-reference.png b/tests/visual_tests/images/lines-6-800-800-2.0-cairo-reference.png index 53fbb50d9..5163ef848 100644 Binary files a/tests/visual_tests/images/lines-6-800-800-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-6-800-800-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png index 0ab97cb12..3da7cc662 100644 Binary files a/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png index d7ae2234d..90cc9dfc4 100644 Binary files a/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png index e4d817d6e..1de8a2c2f 100644 Binary files a/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-shield-400-400-2.0-agg-reference.png index e0d4f1527..75a0ec6a2 100644 Binary files a/tests/visual_tests/images/lines-shield-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-400-400-2.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-400-400-2.0-cairo-reference.png index 5c9ab2735..5f32ddaf0 100644 Binary files a/tests/visual_tests/images/lines-shield-400-400-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-400-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png index f8fdcadac..9c9f7bf18 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png index 20ba67d4e..ede0c0c3e 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png index 883957e23..bb72ab224 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png index f903dbe3c..4da5d5c92 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-100-100-1.0-agg-reference.png b/tests/visual_tests/images/list-100-100-1.0-agg-reference.png index 82ea9bde9..a4be38701 100644 Binary files a/tests/visual_tests/images/list-100-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-100-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-100-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-100-100-1.0-cairo-reference.png index fb1f16553..9a5f9a092 100644 Binary files a/tests/visual_tests/images/list-100-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-100-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-100-100-2.0-agg-reference.png b/tests/visual_tests/images/list-100-100-2.0-agg-reference.png index 4d731778d..8e890f1ed 100644 Binary files a/tests/visual_tests/images/list-100-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-100-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-100-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-100-100-2.0-cairo-reference.png index f8b7b3c10..2b90990f6 100644 Binary files a/tests/visual_tests/images/list-100-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-100-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-150-100-1.0-agg-reference.png b/tests/visual_tests/images/list-150-100-1.0-agg-reference.png index 973cd1a8a..35ac17223 100644 Binary files a/tests/visual_tests/images/list-150-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-150-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-150-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-150-100-1.0-cairo-reference.png index 775970cee..44929ff9f 100644 Binary files a/tests/visual_tests/images/list-150-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-150-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-150-100-2.0-agg-reference.png b/tests/visual_tests/images/list-150-100-2.0-agg-reference.png index c3c67470f..4aaf1e871 100644 Binary files a/tests/visual_tests/images/list-150-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-150-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-150-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-150-100-2.0-cairo-reference.png index bd6b1f9d2..99cc5c435 100644 Binary files a/tests/visual_tests/images/list-150-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-150-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-250-100-1.0-agg-reference.png b/tests/visual_tests/images/list-250-100-1.0-agg-reference.png index c976cebcb..b64483f6b 100644 Binary files a/tests/visual_tests/images/list-250-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-250-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-250-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-250-100-1.0-cairo-reference.png index fbb3b58ba..49eb5927f 100644 Binary files a/tests/visual_tests/images/list-250-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-250-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-250-100-2.0-agg-reference.png b/tests/visual_tests/images/list-250-100-2.0-agg-reference.png index ea762f7c3..569fd68ab 100644 Binary files a/tests/visual_tests/images/list-250-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-250-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-250-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-250-100-2.0-cairo-reference.png index 58f8c664f..d0845ea9e 100644 Binary files a/tests/visual_tests/images/list-250-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-250-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-300-100-1.0-agg-reference.png b/tests/visual_tests/images/list-300-100-1.0-agg-reference.png index 575d30ff7..acda52026 100644 Binary files a/tests/visual_tests/images/list-300-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-300-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-300-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-300-100-1.0-cairo-reference.png index 2baa67c67..e875b219d 100644 Binary files a/tests/visual_tests/images/list-300-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-300-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-300-100-2.0-agg-reference.png b/tests/visual_tests/images/list-300-100-2.0-agg-reference.png index 26439872c..369a6eba0 100644 Binary files a/tests/visual_tests/images/list-300-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-300-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-300-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-300-100-2.0-cairo-reference.png index 3f5116f33..b0c77c6ee 100644 Binary files a/tests/visual_tests/images/list-300-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-300-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-400-100-1.0-agg-reference.png b/tests/visual_tests/images/list-400-100-1.0-agg-reference.png index db651e2b0..52af55201 100644 Binary files a/tests/visual_tests/images/list-400-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-400-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-400-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-400-100-1.0-cairo-reference.png index 011c95683..ed891a4b5 100644 Binary files a/tests/visual_tests/images/list-400-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-400-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-400-100-2.0-agg-reference.png b/tests/visual_tests/images/list-400-100-2.0-agg-reference.png index 4e76d350c..e4a970605 100644 Binary files a/tests/visual_tests/images/list-400-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-400-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-400-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-400-100-2.0-cairo-reference.png index c82ed8443..a48084fd5 100644 Binary files a/tests/visual_tests/images/list-400-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-400-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-600-100-1.0-agg-reference.png b/tests/visual_tests/images/list-600-100-1.0-agg-reference.png index 7bdee6d63..5072a3e89 100644 Binary files a/tests/visual_tests/images/list-600-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-600-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-600-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-600-100-1.0-cairo-reference.png index 49478f430..5dd736041 100644 Binary files a/tests/visual_tests/images/list-600-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-600-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-600-100-2.0-agg-reference.png b/tests/visual_tests/images/list-600-100-2.0-agg-reference.png index c3bbf3e5e..1c5a781ac 100644 Binary files a/tests/visual_tests/images/list-600-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-600-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-600-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-600-100-2.0-cairo-reference.png index 203715c36..fd9551c83 100644 Binary files a/tests/visual_tests/images/list-600-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-600-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-800-100-1.0-agg-reference.png b/tests/visual_tests/images/list-800-100-1.0-agg-reference.png index 495838680..9ef86a2e8 100644 Binary files a/tests/visual_tests/images/list-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/list-800-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/list-800-100-1.0-cairo-reference.png index 7ebe758bb..a946fcb90 100644 Binary files a/tests/visual_tests/images/list-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/list-800-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/list-800-100-2.0-agg-reference.png b/tests/visual_tests/images/list-800-100-2.0-agg-reference.png index b6488b1cc..db55e2e1d 100644 Binary files a/tests/visual_tests/images/list-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/list-800-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/list-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/list-800-100-2.0-cairo-reference.png index 565602750..1fa3a7bdd 100644 Binary files a/tests/visual_tests/images/list-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/list-800-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png index 73860a615..b88cb1cb9 100644 Binary files a/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png index 374531638..8c71e2bfe 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png index ad535cf89..ff45b56c9 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png index 22de19afc..6dd0233ee 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png index bf26841e8..fd6b17440 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png index 761743e75..a02752e3c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png index 018a553b7..2b4a90221 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png index e991deb99..10431d233 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png index a4aec0749..db9e2a33c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png index a7bc35af6..3eb12e920 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png index 784c23c62..d541d3385 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png index 761743e75..a02752e3c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png index f6c31d6ca..2b4a90221 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png index e991deb99..10431d233 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png index a4aec0749..db9e2a33c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png index a7bc35af6..3eb12e920 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png index 784c23c62..d541d3385 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/raster-color-to-alpha2-512-512-1.0-agg-reference.png b/tests/visual_tests/images/raster-color-to-alpha2-512-512-1.0-agg-reference.png index c14a73108..316d8bd54 100644 Binary files a/tests/visual_tests/images/raster-color-to-alpha2-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/raster-color-to-alpha2-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/raster-color-to-alpha2-512-512-2.0-agg-reference.png b/tests/visual_tests/images/raster-color-to-alpha2-512-512-2.0-agg-reference.png index c14a73108..316d8bd54 100644 Binary files a/tests/visual_tests/images/raster-color-to-alpha2-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/raster-color-to-alpha2-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/raster-color-to-alpha3-512-512-1.0-agg-reference.png b/tests/visual_tests/images/raster-color-to-alpha3-512-512-1.0-agg-reference.png index c750b1f83..dd575b564 100644 Binary files a/tests/visual_tests/images/raster-color-to-alpha3-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/raster-color-to-alpha3-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/raster-color-to-alpha3-512-512-2.0-agg-reference.png b/tests/visual_tests/images/raster-color-to-alpha3-512-512-2.0-agg-reference.png index c750b1f83..dd575b564 100644 Binary files a/tests/visual_tests/images/raster-color-to-alpha3-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/raster-color-to-alpha3-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/rtl-point-200-200-1.0-agg-reference.png b/tests/visual_tests/images/rtl-point-200-200-1.0-agg-reference.png index ebdd266f0..398227b83 100644 Binary files a/tests/visual_tests/images/rtl-point-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/rtl-point-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/rtl-point-200-200-1.0-cairo-reference.png b/tests/visual_tests/images/rtl-point-200-200-1.0-cairo-reference.png index d2e968c8b..eb53cdf4d 100644 Binary files a/tests/visual_tests/images/rtl-point-200-200-1.0-cairo-reference.png and b/tests/visual_tests/images/rtl-point-200-200-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/rtl-point-200-200-2.0-agg-reference.png b/tests/visual_tests/images/rtl-point-200-200-2.0-agg-reference.png index 8a21b6117..f54e061e6 100644 Binary files a/tests/visual_tests/images/rtl-point-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/rtl-point-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/rtl-point-200-200-2.0-cairo-reference.png b/tests/visual_tests/images/rtl-point-200-200-2.0-cairo-reference.png index c8ceaed29..b028a222c 100644 Binary files a/tests/visual_tests/images/rtl-point-200-200-2.0-cairo-reference.png and b/tests/visual_tests/images/rtl-point-200-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png index fa852b991..7eea9485e 100644 Binary files a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png and b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-cairo-reference.png index ac9cbcf59..49bfde802 100644 Binary files a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png index 703f9c980..627acd957 100644 Binary files a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png and b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-cairo-reference.png index d7d42d1c6..61e332ddf 100644 Binary files a/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png b/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png index ba9369678..0a8560245 100644 Binary files a/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png and b/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png b/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png index a582dfa61..766296a41 100644 Binary files a/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png and b/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shield-on-polygon-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/shield-on-polygon-600-400-2.0-cairo-reference.png index a725433e4..0d4c6a74c 100644 Binary files a/tests/visual_tests/images/shield-on-polygon-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/shield-on-polygon-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-agg-reference.png index 16147ae23..2b9ba58dc 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-cairo-reference.png index 64d87f447..516b5f0f9 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-490-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png index 1d9d47380..01aa299f5 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-cairo-reference.png index c3655ffd2..2ee0bce91 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-agg-reference.png index 092cd5450..41f4b1363 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-cairo-reference.png index eadf46e29..35268e7a5 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-495-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png index 764f60ac4..897602d53 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png index 6997843b6..0733c98c4 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-agg-reference.png index a74481a0a..2ea1705cc 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png index e536e7d90..7149498ed 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png index eb2dadb4b..74245c9a0 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png index 5eebd0ea8..2b9caef0d 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-agg-reference.png index 28843ac5a..e287e8b0d 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-cairo-reference.png index 3596c4f7c..6a79ab4af 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-498-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png index 4415da8c4..1469d0d8f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-cairo-reference.png index 1b1a8072c..3bd5dd3a8 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-agg-reference.png index fec7a1062..9ebb529c1 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png index 8b5a1ac85..84e9256b3 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png index 72a8e526b..95ccef4fa 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png index 712c06e6d..f1db8764e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-agg-reference.png index b0957542f..0f8d25f06 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-cairo-reference.png index 768dc0408..544b04b5a 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png index 0debfbee9..dd78ddb7a 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-cairo-reference.png index 83607deb1..5cd94aba9 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-agg-reference.png index ac0d1616a..45d02d510 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-cairo-reference.png index 1d8c3828b..4b59f0cba 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-501-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png index 199e81982..96f39fd87 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-cairo-reference.png index d4323ea3d..f6bd195bb 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-agg-reference.png index bb8f6b507..cd21b7619 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png index 46ca7f188..84f65796e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png index 6143c0f8d..8d0883f79 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-cairo-reference.png index 844b54d6a..36cdec4a9 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-agg-reference.png index 849f15e03..e8d5231fd 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-cairo-reference.png index 9a82d7674..a1f5fb323 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-505-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png index 7cb714b7f..3497ebe59 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png index 0955f85c7..683159310 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-agg-reference.png index 6bd343faf..ea85f737f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-cairo-reference.png index e8724d55a..5e778dba7 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-510-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png index 9c2b4295e..977c209f7 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-cairo-reference.png index f468891e4..c1c030327 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-agg-reference.png index a34296842..cb0a17776 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-cairo-reference.png index 4c277eeac..ac38b017d 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-490-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png index fdc1b2395..0e5b6c17f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-cairo-reference.png index 53c151b4f..ea077ad9b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-agg-reference.png index 17ae1ff10..1b00129bb 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-cairo-reference.png index 1eea92b2e..250a360fb 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-495-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png index 416d38617..1bf79c91c 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-cairo-reference.png index 0eb73b684..b767d97ee 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-agg-reference.png index f6369ad18..5a4b7251b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-cairo-reference.png index 9b4da0282..64d685e53 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-497-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png index fa99ca9b3..459261e2a 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-cairo-reference.png index 10d900a9a..212e4f317 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-agg-reference.png index adbf7bc26..29d061166 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-cairo-reference.png index 70d5fe638..6d6970b5b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-498-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png index 1bdec7a93..4e2c63581 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-cairo-reference.png index 035d9b61f..23f82405c 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-agg-reference.png index 43124d8ae..0f9e39c0f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-cairo-reference.png index e7c8babd0..3e6bf67ac 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-499-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png index 78f113106..8a00b0fc1 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-cairo-reference.png index 87abc5732..0984199a3 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-agg-reference.png index c05fe0fec..ac1c154c6 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-cairo-reference.png index a736286e2..bc09ba373 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png index 81dab124f..4de3e244c 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-cairo-reference.png index 09ea7905b..08463478b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-agg-reference.png index 3df870869..759850b20 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-cairo-reference.png index 8e60a1470..2c8c843b2 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-501-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png index 6b322d2bd..4c55c966b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-cairo-reference.png index e3c424e71..17be8b94e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-agg-reference.png index 4da7bb720..f1d0869cc 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-cairo-reference.png index 6f4775eeb..f8a10f35b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-502-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png index bd8c97143..17d5ec82a 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-cairo-reference.png index 659076dfb..b32b6ff2e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-agg-reference.png index 2228674e4..4b049b90c 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-cairo-reference.png index b2af8d37a..1a57f78ce 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-505-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png index 222ac279c..baa551f68 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-cairo-reference.png index 8842b3034..579ea8639 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-agg-reference.png index 2a8bb3abe..3d66919b4 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-cairo-reference.png index 13d066386..1b8d83aec 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-510-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png index 87ec1d087..26ef36305 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-cairo-reference.png index 289a7ff34..47b0af7dd 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-agg-reference.png index d4cb8209a..b98fa4fad 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-cairo-reference.png index 06ee34ada..0e46722c0 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-490-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png index 26a4921cb..6b8ad7256 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-cairo-reference.png index 986dd9d89..c61683124 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-agg-reference.png index d44aa4774..da09fe22e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-cairo-reference.png index b3b30cb9c..ecc429d8a 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-495-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png index b1b370e22..816431116 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-cairo-reference.png index fef331d22..61f421e8f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-agg-reference.png index 6281519f2..b22ca1663 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-cairo-reference.png index 423cfdb4f..b09316160 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-497-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png index d8aac0abf..d6c3f5c1e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-cairo-reference.png index aaaef99d4..15fa99889 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-agg-reference.png index b1b014810..878bd1bc2 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-cairo-reference.png index 140a5cfa0..d968418fc 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-498-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png index 2e2658783..860574af0 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-cairo-reference.png index 8988be8db..16ae69f2f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-agg-reference.png index 9ed9478f3..2fb7b9516 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-cairo-reference.png index fff51cf11..663a5c664 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-499-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png index 3a8760089..ba68e2399 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-cairo-reference.png index 56be701bf..dc87542c5 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-agg-reference.png index 9707cc4ed..038c29757 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-cairo-reference.png index ed9a21630..50953735b 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png index 5877a02a5..11031f402 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-cairo-reference.png index 67c6618d8..7d54a98a8 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-agg-reference.png index 4f12cdfa3..ed42ec8d0 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-cairo-reference.png index 9096651ae..3892df4c9 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-501-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png index f9d4794b8..221ee2e52 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-cairo-reference.png index 2fa76b35c..fe05ffdcc 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-agg-reference.png index 1c41d4460..472af5626 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-cairo-reference.png index 71841d235..6835531a0 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-502-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png index 8ac787c1e..703584bdd 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-cairo-reference.png index 79dfe6563..af01a8b0a 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-agg-reference.png index 86dbaf0e5..ff3388935 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-cairo-reference.png index 4e84e05be..f85fefe93 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-505-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png index 6f56e1885..ea4f1cdfa 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-cairo-reference.png index 54263dce5..0734438b8 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-agg-reference.png index f78cb29a9..96832788d 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-cairo-reference.png index 06811afc7..94816641f 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-510-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png index 150ba1b75..fb7a29397 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-cairo-reference.png index 87693d256..2d0ba66ca 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-100-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-100-100-1.0-agg-reference.png index 04159d51b..3e1a7eff8 100644 Binary files a/tests/visual_tests/images/simple-100-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-100-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-100-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-100-100-1.0-cairo-reference.png index 9afd4fb20..aa9c9ac26 100644 Binary files a/tests/visual_tests/images/simple-100-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-100-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-100-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-100-100-2.0-agg-reference.png index 1f18e49d2..b72569843 100644 Binary files a/tests/visual_tests/images/simple-100-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-100-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-100-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-100-100-2.0-cairo-reference.png index d17885f93..e3cfc2be0 100644 Binary files a/tests/visual_tests/images/simple-100-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-100-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-150-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-150-100-1.0-agg-reference.png index ff5ce404c..8fa7ed8ae 100644 Binary files a/tests/visual_tests/images/simple-150-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-150-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-150-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-150-100-1.0-cairo-reference.png index e493d764a..22ebcedd4 100644 Binary files a/tests/visual_tests/images/simple-150-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-150-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-150-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-150-100-2.0-agg-reference.png index f5b870ebe..1348abcd6 100644 Binary files a/tests/visual_tests/images/simple-150-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-150-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-150-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-150-100-2.0-cairo-reference.png index 5000aabf8..6000140cb 100644 Binary files a/tests/visual_tests/images/simple-150-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-150-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-250-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-250-100-1.0-agg-reference.png index 09c654cf7..a43a48355 100644 Binary files a/tests/visual_tests/images/simple-250-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-250-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-250-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-250-100-1.0-cairo-reference.png index 28c933a06..e247fb3e0 100644 Binary files a/tests/visual_tests/images/simple-250-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-250-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-250-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-250-100-2.0-agg-reference.png index 8b1753d80..1c40458d5 100644 Binary files a/tests/visual_tests/images/simple-250-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-250-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-250-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-250-100-2.0-cairo-reference.png index 775e0e647..aa91d6a4c 100644 Binary files a/tests/visual_tests/images/simple-250-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-250-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-300-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-300-100-1.0-agg-reference.png index 8a24ad39b..79d388525 100644 Binary files a/tests/visual_tests/images/simple-300-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-300-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-300-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-300-100-1.0-cairo-reference.png index c030770ce..37650c72f 100644 Binary files a/tests/visual_tests/images/simple-300-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-300-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-300-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-300-100-2.0-agg-reference.png index 9407cb572..e86daa75f 100644 Binary files a/tests/visual_tests/images/simple-300-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-300-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-300-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-300-100-2.0-cairo-reference.png index 69d9791d5..901d45f9c 100644 Binary files a/tests/visual_tests/images/simple-300-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-300-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-400-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-400-100-1.0-agg-reference.png index 72d9bad0f..11b03ca05 100644 Binary files a/tests/visual_tests/images/simple-400-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-400-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-400-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-400-100-1.0-cairo-reference.png index 60fd46a7d..f34cb9a8e 100644 Binary files a/tests/visual_tests/images/simple-400-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-400-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-400-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-400-100-2.0-agg-reference.png index e8c493491..b9efaa379 100644 Binary files a/tests/visual_tests/images/simple-400-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-400-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-400-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-400-100-2.0-cairo-reference.png index 545eaf563..aab6f1a33 100644 Binary files a/tests/visual_tests/images/simple-400-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-400-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-600-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-600-100-1.0-agg-reference.png index e6f01b811..ba094f58c 100644 Binary files a/tests/visual_tests/images/simple-600-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-600-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-600-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-600-100-1.0-cairo-reference.png index 1f9b1d5a4..1a41fd780 100644 Binary files a/tests/visual_tests/images/simple-600-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-600-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-600-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-600-100-2.0-agg-reference.png index e2834faba..5f32ee63e 100644 Binary files a/tests/visual_tests/images/simple-600-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-600-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-600-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-600-100-2.0-cairo-reference.png index c463d795f..653b3e6de 100644 Binary files a/tests/visual_tests/images/simple-600-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-600-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-800-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-800-100-1.0-agg-reference.png index 0aff2c5f8..224f42e98 100644 Binary files a/tests/visual_tests/images/simple-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-800-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-800-100-1.0-cairo-reference.png index 9af8b2d60..2bf3a1b44 100644 Binary files a/tests/visual_tests/images/simple-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-800-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-800-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-800-100-2.0-agg-reference.png index 6b468fbb8..d1f9fcdf9 100644 Binary files a/tests/visual_tests/images/simple-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-800-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-800-100-2.0-cairo-reference.png index 00eb92b13..644d3549e 100644 Binary files a/tests/visual_tests/images/simple-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-800-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-E-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-E-500-100-1.0-agg-reference.png index 8cccada01..daba51ba2 100644 Binary files a/tests/visual_tests/images/simple-E-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-E-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-E-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-E-500-100-1.0-cairo-reference.png index 8cccada01..daba51ba2 100644 Binary files a/tests/visual_tests/images/simple-E-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-E-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-E-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-E-500-100-2.0-agg-reference.png index 9ef113803..c1d8dd1c7 100644 Binary files a/tests/visual_tests/images/simple-E-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-E-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-E-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-E-500-100-2.0-cairo-reference.png index 2391b4f83..08beb2951 100644 Binary files a/tests/visual_tests/images/simple-E-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-E-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-N-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-N-500-100-1.0-agg-reference.png index 0ce592ff2..49c6748ca 100644 Binary files a/tests/visual_tests/images/simple-N-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-N-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-N-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-N-500-100-1.0-cairo-reference.png index 6883c8b75..49c6748ca 100644 Binary files a/tests/visual_tests/images/simple-N-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-N-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-N-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-N-500-100-2.0-agg-reference.png index 7430976b8..71cb4abde 100644 Binary files a/tests/visual_tests/images/simple-N-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-N-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-N-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-N-500-100-2.0-cairo-reference.png index 0fcbf7930..e3b64c3f5 100644 Binary files a/tests/visual_tests/images/simple-N-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-N-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-NE-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-NE-500-100-1.0-agg-reference.png index 6b8fde734..bb993126a 100644 Binary files a/tests/visual_tests/images/simple-NE-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-NE-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-NE-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-NE-500-100-1.0-cairo-reference.png index 6b8fde734..bb993126a 100644 Binary files a/tests/visual_tests/images/simple-NE-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-NE-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-NE-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-NE-500-100-2.0-agg-reference.png index 5a231237d..e2b538a30 100644 Binary files a/tests/visual_tests/images/simple-NE-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-NE-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-NE-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-NE-500-100-2.0-cairo-reference.png index 16102b4f7..ff74eabfe 100644 Binary files a/tests/visual_tests/images/simple-NE-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-NE-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-NW-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-NW-500-100-1.0-agg-reference.png index a8a4be8ee..defbef89a 100644 Binary files a/tests/visual_tests/images/simple-NW-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-NW-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-NW-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-NW-500-100-1.0-cairo-reference.png index a8a4be8ee..defbef89a 100644 Binary files a/tests/visual_tests/images/simple-NW-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-NW-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-NW-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-NW-500-100-2.0-agg-reference.png index aec52ece5..20ea0281d 100644 Binary files a/tests/visual_tests/images/simple-NW-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-NW-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-NW-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-NW-500-100-2.0-cairo-reference.png index fa3b911dd..0b8241797 100644 Binary files a/tests/visual_tests/images/simple-NW-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-NW-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-S-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-S-500-100-1.0-agg-reference.png index 188351d63..e3cbe05dd 100644 Binary files a/tests/visual_tests/images/simple-S-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-S-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-S-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-S-500-100-1.0-cairo-reference.png index b364e2041..e3cbe05dd 100644 Binary files a/tests/visual_tests/images/simple-S-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-S-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-S-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-S-500-100-2.0-agg-reference.png index c4a6576b6..1cd7afd04 100644 Binary files a/tests/visual_tests/images/simple-S-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-S-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-S-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-S-500-100-2.0-cairo-reference.png index 1827c8a0e..a164caf35 100644 Binary files a/tests/visual_tests/images/simple-S-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-S-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-SE-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-SE-500-100-1.0-agg-reference.png index 67c389ad9..9c7cb25f7 100644 Binary files a/tests/visual_tests/images/simple-SE-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-SE-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-SE-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-SE-500-100-1.0-cairo-reference.png index 67c389ad9..9c7cb25f7 100644 Binary files a/tests/visual_tests/images/simple-SE-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-SE-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-SE-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-SE-500-100-2.0-agg-reference.png index b85dc5df6..9f151a464 100644 Binary files a/tests/visual_tests/images/simple-SE-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-SE-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-SE-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-SE-500-100-2.0-cairo-reference.png index 16c425035..02c19d92f 100644 Binary files a/tests/visual_tests/images/simple-SE-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-SE-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-SW-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-SW-500-100-1.0-agg-reference.png index c7f00cbda..558a45ae1 100644 Binary files a/tests/visual_tests/images/simple-SW-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-SW-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-SW-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-SW-500-100-1.0-cairo-reference.png index c7f00cbda..558a45ae1 100644 Binary files a/tests/visual_tests/images/simple-SW-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-SW-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-SW-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-SW-500-100-2.0-agg-reference.png index a71026188..fa17e300d 100644 Binary files a/tests/visual_tests/images/simple-SW-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-SW-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-SW-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-SW-500-100-2.0-cairo-reference.png index dc6aa59de..b71f444a6 100644 Binary files a/tests/visual_tests/images/simple-SW-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-SW-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-W-500-100-1.0-agg-reference.png b/tests/visual_tests/images/simple-W-500-100-1.0-agg-reference.png index 5900769d4..0a6b57622 100644 Binary files a/tests/visual_tests/images/simple-W-500-100-1.0-agg-reference.png and b/tests/visual_tests/images/simple-W-500-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-W-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/simple-W-500-100-1.0-cairo-reference.png index 5900769d4..0a6b57622 100644 Binary files a/tests/visual_tests/images/simple-W-500-100-1.0-cairo-reference.png and b/tests/visual_tests/images/simple-W-500-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/simple-W-500-100-2.0-agg-reference.png b/tests/visual_tests/images/simple-W-500-100-2.0-agg-reference.png index 52b5e3089..5a19d58c3 100644 Binary files a/tests/visual_tests/images/simple-W-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/simple-W-500-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/simple-W-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/simple-W-500-100-2.0-cairo-reference.png index c3e953717..e49aeef21 100644 Binary files a/tests/visual_tests/images/simple-W-500-100-2.0-cairo-reference.png and b/tests/visual_tests/images/simple-W-500-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png index 8ba187dd9..805282af1 100644 Binary files a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png index 8ba187dd9..805282af1 100644 Binary files a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png b/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png index 6da014f2e..42d4f7976 100644 Binary files a/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/text-bengali-800-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png index 391af55a2..02f30648e 100644 Binary files a/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/text-bengali-800-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png b/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png index cd5d2896f..0e449719b 100644 Binary files a/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png index 8560b271d..792c026c9 100644 Binary files a/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bengali-800-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1532-600-165-1.0-agg-reference.png b/tests/visual_tests/images/text-bug1532-600-165-1.0-agg-reference.png index 35a18a6ff..09a8e313c 100644 Binary files a/tests/visual_tests/images/text-bug1532-600-165-1.0-agg-reference.png and b/tests/visual_tests/images/text-bug1532-600-165-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+0-600-300-1.0-agg-reference.png b/tests/visual_tests/images/text-bug1820+0-600-300-1.0-agg-reference.png index 5ba6a8680..c0afa8b50 100644 Binary files a/tests/visual_tests/images/text-bug1820+0-600-300-1.0-agg-reference.png and b/tests/visual_tests/images/text-bug1820+0-600-300-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+0-600-300-1.0-cairo-reference.png b/tests/visual_tests/images/text-bug1820+0-600-300-1.0-cairo-reference.png index b260aa470..daf27e84b 100644 Binary files a/tests/visual_tests/images/text-bug1820+0-600-300-1.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1820+0-600-300-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+0-600-300-2.0-agg-reference.png b/tests/visual_tests/images/text-bug1820+0-600-300-2.0-agg-reference.png index 135eaa5b4..585f0ee9a 100644 Binary files a/tests/visual_tests/images/text-bug1820+0-600-300-2.0-agg-reference.png and b/tests/visual_tests/images/text-bug1820+0-600-300-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+0-600-300-2.0-cairo-reference.png b/tests/visual_tests/images/text-bug1820+0-600-300-2.0-cairo-reference.png index 1de636628..898e272be 100644 Binary files a/tests/visual_tests/images/text-bug1820+0-600-300-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1820+0-600-300-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+1-600-300-1.0-agg-reference.png b/tests/visual_tests/images/text-bug1820+1-600-300-1.0-agg-reference.png index 8f57bb2b3..a1eaa17f7 100644 Binary files a/tests/visual_tests/images/text-bug1820+1-600-300-1.0-agg-reference.png and b/tests/visual_tests/images/text-bug1820+1-600-300-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+1-600-300-1.0-cairo-reference.png b/tests/visual_tests/images/text-bug1820+1-600-300-1.0-cairo-reference.png index fb8d4295a..42b7c7396 100644 Binary files a/tests/visual_tests/images/text-bug1820+1-600-300-1.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1820+1-600-300-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+1-600-300-2.0-agg-reference.png b/tests/visual_tests/images/text-bug1820+1-600-300-2.0-agg-reference.png index 6871f8b7c..2dd565d7b 100644 Binary files a/tests/visual_tests/images/text-bug1820+1-600-300-2.0-agg-reference.png and b/tests/visual_tests/images/text-bug1820+1-600-300-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820+1-600-300-2.0-cairo-reference.png b/tests/visual_tests/images/text-bug1820+1-600-300-2.0-cairo-reference.png index 02e497574..fef1d8e5b 100644 Binary files a/tests/visual_tests/images/text-bug1820+1-600-300-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1820+1-600-300-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820-1-600-300-1.0-agg-reference.png b/tests/visual_tests/images/text-bug1820-1-600-300-1.0-agg-reference.png index 61f86e3a3..c1bf57814 100644 Binary files a/tests/visual_tests/images/text-bug1820-1-600-300-1.0-agg-reference.png and b/tests/visual_tests/images/text-bug1820-1-600-300-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820-1-600-300-1.0-cairo-reference.png b/tests/visual_tests/images/text-bug1820-1-600-300-1.0-cairo-reference.png index 6efce842b..56e6a9c0f 100644 Binary files a/tests/visual_tests/images/text-bug1820-1-600-300-1.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1820-1-600-300-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820-1-600-300-2.0-agg-reference.png b/tests/visual_tests/images/text-bug1820-1-600-300-2.0-agg-reference.png index fb69b0dc9..dd444f0bb 100644 Binary files a/tests/visual_tests/images/text-bug1820-1-600-300-2.0-agg-reference.png and b/tests/visual_tests/images/text-bug1820-1-600-300-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug1820-1-600-300-2.0-cairo-reference.png b/tests/visual_tests/images/text-bug1820-1-600-300-2.0-cairo-reference.png index 2b5850f91..e8e72e65b 100644 Binary files a/tests/visual_tests/images/text-bug1820-1-600-300-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bug1820-1-600-300-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png b/tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png index 4e596262e..79db9a82e 100644 Binary files a/tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png and b/tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png b/tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png index 5d1fddd95..3b7ad8555 100644 Binary files a/tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png and b/tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png b/tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png index fd1fb4cb5..815b816cd 100644 Binary files a/tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png and b/tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png b/tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png index 0acaf9d5f..ca28102d3 100644 Binary files a/tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png and b/tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-agg-reference.png b/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-agg-reference.png index fba47ff0b..c91f2bc08 100644 Binary files a/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-cairo-reference.png index e9ef9becf..997b923ce 100644 Binary files a/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/text-expressionformat-color-800-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-agg-reference.png b/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-agg-reference.png index c4447291f..a46b96803 100644 Binary files a/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-cairo-reference.png index 797dc8224..a40d9b1ca 100644 Binary files a/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/text-expressionformat-color-800-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png b/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png index 447b26053..6af3c041a 100644 Binary files a/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png b/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png index 447b26053..647a7a09f 100644 Binary files a/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png b/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png index 706a920e4..9dd395d7f 100644 Binary files a/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png b/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png index a2783c652..9dd395d7f 100644 Binary files a/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png and b/tests/visual_tests/images/text-malayalam-800-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/styles/line-smooth-and-offset.xml b/tests/visual_tests/styles/line-smooth-and-offset.xml new file mode 100755 index 000000000..9c432981e --- /dev/null +++ b/tests/visual_tests/styles/line-smooth-and-offset.xml @@ -0,0 +1,22 @@ + + + + + + + style + + shape + ../data/line.shp + + + diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index 6334ac3c8..94c6a7cd4 100755 --- a/tests/visual_tests/test.py +++ b/tests/visual_tests/test.py @@ -218,7 +218,9 @@ files = { 'tiff-nodata-rgb':{'sizes':[(512,512)]}, 'tiff-nodata-rgba':{'sizes':[(512,512)]}, 'tiff-nodata-tolerance':{'sizes':[(512,512)]}, - 'tiff-nodata-edge-rgba':{'sizes':[(512,512)]} + 'tiff-nodata-edge-rgba':{'sizes':[(512,512)]}, + # https://github.com/mapnik/mapnik/issues/2202 + 'line-smooth-and-offset':{'sizes':[(512,512)]} } class Reporting: