Revert "Support filtering on addLayer (flutter-mapbox-gl#1024)"

This reverts commit 71c4de4.
FreeGrow · Sep 21, 2023 · a9bf86f · a9bf86f
1 parent 43391dc
commit a9bf86f
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 241 deletions.
diff --git a/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java b/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java
@@ -404,9 +404,6 @@ private void addSymbolLayer(
     if (maxZoom != null) {
       symbolLayer.setMaxZoom(maxZoom);
     }
-    if (filter != null) {
-      symbolLayer.setFilter(filter);
-    }
     if (belowLayerId != null) {
       style.addLayerBelow(symbolLayer, belowLayerId);
     } else {
@@ -438,9 +435,6 @@ private void addLineLayer(
     if (maxZoom != null) {
       lineLayer.setMaxZoom(maxZoom);
     }
-    if (filter != null) {
-      lineLayer.setFilter(filter);
-    }
     if (belowLayerId != null) {
       style.addLayerBelow(lineLayer, belowLayerId);
     } else {
@@ -472,9 +466,6 @@ private void addFillLayer(
     if (maxZoom != null) {
       fillLayer.setMaxZoom(maxZoom);
     }
-    if (filter != null) {
-      fillLayer.setFilter(filter);
-    }
     if (belowLayerId != null) {
       style.addLayerBelow(fillLayer, belowLayerId);
     } else {
@@ -506,9 +497,6 @@ private void addCircleLayer(
     if (maxZoom != null) {
       circleLayer.setMaxZoom(maxZoom);
     }
-    if (filter != null) {
-      circleLayer.setFilter(filter);
-    }
     if (belowLayerId != null) {
       style.addLayerBelow(circleLayer, belowLayerId);
     } else {
@@ -517,12 +505,7 @@ private void addCircleLayer(
     if (enableInteraction) {
       interactiveFeatureLayerIds.add(layerName);
     }
-  }
-
-  private Expression parseFilter(String filter) {
-    JsonParser parser = new JsonParser();
-    JsonElement filterJsonElement = parser.parse(filter);
-    return filterJsonElement.isJsonNull() ? null : Expression.Converter.convert(filterJsonElement);
+    ;
   }
 
   private void addRasterLayer(
@@ -842,13 +825,9 @@ public void onError(@NonNull String message) {
           final String sourceLayer = call.argument("sourceLayer");
           final Double minzoom = call.argument("minzoom");
           final Double maxzoom = call.argument("maxzoom");
-          final String filter = call.argument("filter");
           final boolean enableInteraction = call.argument("enableInteraction");
           final PropertyValue[] properties =
               LayerPropertyConverter.interpretSymbolLayerProperties(call.argument("properties"));
-
-          Expression filterExpression = parseFilter(filter);
-
           addSymbolLayer(
               layerId,
               sourceId,
@@ -858,7 +837,7 @@ public void onError(@NonNull String message) {
               maxzoom != null ? maxzoom.floatValue() : null,
               properties,
               enableInteraction,
-              filterExpression);
+              null);
           updateLocationComponentLayer();
 
           result.success(null);
@@ -872,13 +851,9 @@ public void onError(@NonNull String message) {
           final String sourceLayer = call.argument("sourceLayer");
           final Double minzoom = call.argument("minzoom");
           final Double maxzoom = call.argument("maxzoom");
-          final String filter = call.argument("filter");
           final boolean enableInteraction = call.argument("enableInteraction");
           final PropertyValue[] properties =
               LayerPropertyConverter.interpretLineLayerProperties(call.argument("properties"));
-
-          Expression filterExpression = parseFilter(filter);
-
           addLineLayer(
               layerId,
               sourceId,
@@ -888,7 +863,7 @@ public void onError(@NonNull String message) {
               maxzoom != null ? maxzoom.floatValue() : null,
               properties,
               enableInteraction,
-              filterExpression);
+              null);
           updateLocationComponentLayer();
 
           result.success(null);
@@ -902,13 +877,9 @@ public void onError(@NonNull String message) {
           final String sourceLayer = call.argument("sourceLayer");
           final Double minzoom = call.argument("minzoom");
           final Double maxzoom = call.argument("maxzoom");
-          final String filter = call.argument("filter");
           final boolean enableInteraction = call.argument("enableInteraction");
           final PropertyValue[] properties =
               LayerPropertyConverter.interpretFillLayerProperties(call.argument("properties"));
-
-          Expression filterExpression = parseFilter(filter);
-
           addFillLayer(
               layerId,
               sourceId,
@@ -918,7 +889,7 @@ public void onError(@NonNull String message) {
               maxzoom != null ? maxzoom.floatValue() : null,
               properties,
               enableInteraction,
-              filterExpression);
+              null);
           updateLocationComponentLayer();
 
           result.success(null);
@@ -932,13 +903,9 @@ public void onError(@NonNull String message) {
           final String sourceLayer = call.argument("sourceLayer");
           final Double minzoom = call.argument("minzoom");
           final Double maxzoom = call.argument("maxzoom");
-          final String filter = call.argument("filter");
           final boolean enableInteraction = call.argument("enableInteraction");
           final PropertyValue[] properties =
               LayerPropertyConverter.interpretCircleLayerProperties(call.argument("properties"));
-
-          Expression filterExpression = parseFilter(filter);
-
           addCircleLayer(
               layerId,
               sourceId,
@@ -948,7 +915,7 @@ public void onError(@NonNull String message) {
               maxzoom != null ? maxzoom.floatValue() : null,
               properties,
               enableInteraction,
-              filterExpression);
+              null);
           updateLocationComponentLayer();
 
           result.success(null);

diff --git a/example/lib/layer.dart b/example/lib/layer.dart
@@ -82,7 +82,6 @@ class LayerState extends State {
         'green'
       ], fillOpacity: 0.4),
       belowLayerId: "water",
-      filter: ['==', 'id', filteredId],
     );
 
     await controller.addLineLayer(
@@ -144,6 +143,7 @@ class LayerState extends State {
       controller.setGeoJsonSource("moving", _movingFeature(t.tick / 2000));
     });
 
+    controller.setFilter('fills', ['==', 'id', filteredId]);
     filterTimer = Timer.periodic(Duration(seconds: 3), (t) {
       filteredId = filteredId == 0 ? 1 : 0;
       controller.setFilter('fills', ['==', 'id', filteredId]);