VectorLayer - Bug fix unittests fail after last changes

Author: LucasDworschak

gl_engine/shaders/vector_layer.frag

@@ -440,10 +440,6 @@ void main() {
                         if(check_next_geometry)
                             continue;
 
-                        // TODO tile extent depends on zoom level
-                        // highp int tmp = tile_extent;
-                        // tmp = tmp >> (18-int(tile_id.z));
-
 
                         highp float thickness = layer_style.current_layer_style.outline_width / tile_extent;
                         d = sdLine(uv, v0, v1) - thickness;

nucleus/vector_layer/Preprocessor.cpp

@@ -112,6 +112,8 @@ std::vector<GeometryData> parse_tile(tile::Id id, const QByteArray& vector_tile_
 
                 // qDebug() << layer_name << styles.size();
 
+                // TODO performance -> might be more efficient to find out if the style is the same and the alpha is full -> only visualize the higher layer_index
+
                 for (const auto& style : styles)
                     data.emplace_back(vertices, extent, style.first, style.second, true, all_edges, 0);
                 // data.emplace_back(std::vector<glm::vec2>(vertices), extent, styles[0].first, styles[0].second, true, std::vector<glm::ivec2>(edges), 0);

unittests/nucleus/vector_style.cpp

@@ -187,16 +187,27 @@ TEST_CASE("nucleus/vector_style")
 
         CHECK(style_buffer[feature_to_style.at("fill__building__null__null_0")].x == s.parse_color("#d9d0c9ff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__farmland__farmland_0")].x == s.parse_color("#eef0d5ff"));
-        CHECK(style_buffer[feature_to_style.at("fill__landcover__farmland__vineyard_0")].x == s.parse_color("#aedfa3ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__farmland__farmland_1")].x == s.parse_color("#eef0d5ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__farmland__vineyard_0")].x == s.parse_color("#eef0d5ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__farmland__vineyard_1")].x == s.parse_color("#aedfa3ff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__grass_0")].x == s.parse_color("#cdebb0ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__grass_1")].x == s.parse_color("#cdebb0ff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__grassland_0")].x == s.parse_color("#cdebb0ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__grassland_1")].x == s.parse_color("#cdebb0ff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__meadow_0")].x == s.parse_color("#cdebb0ff"));
-        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__park_0")].x == s.parse_color("#c8faccff"));
-        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__scrub_0")].x == s.parse_color("#c8d7abff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__meadow_1")].x == s.parse_color("#cdebb0ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__park_0")].x == s.parse_color("#cdebb0ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__park_1")].x == s.parse_color("#c8faccff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__scrub_0")].x == s.parse_color("#cdebb0ff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__grass__scrub_1")].x == s.parse_color("#c8d7abff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__rock__bare_rock_0")].x == s.parse_color("#eee5dcff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__rock__bare_rock_1")].x == s.parse_color("#eee5dcff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__wetland__wetland_0")].x == s.parse_color("#add19eff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__wetland__wetland_1")].x == s.parse_color("#add19eff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__wood__forest_0")].x == s.parse_color("#add19eff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__wood__forest_1")].x == s.parse_color("#add19eff"));
         CHECK(style_buffer[feature_to_style.at("fill__landcover__wood__wood_0")].x == s.parse_color("#add19eff"));
+        CHECK(style_buffer[feature_to_style.at("fill__landcover__wood__wood_1")].x == s.parse_color("#add19eff"));
         CHECK(style_buffer[feature_to_style.at("fill__landuse__commercial__null_0")].x == s.parse_color("#f2dad9ff"));
         CHECK(style_buffer[feature_to_style.at("fill__landuse__industrial__null_0")].x == s.parse_color("#ebdbe8ff"));
         CHECK(style_buffer[feature_to_style.at("fill__landuse__pitch__null_0")].x == s.parse_color("#aae0cbff"));