Fix filters to extend NitriteFilter and properly handle non-indexed queries

Co-authored-by: anidotnet <[email protected]>

Author: Copilot

packages/nitrite_spatial/lib/src/filter.dart

@@ -100,16 +100,27 @@ class IntersectsIndexFilter extends SpatialFilter {
 }
 
 ///@nodoc
-class WithinFilter extends Filter implements FlattenableFilter {
+class WithinFilter extends NitriteFilter implements FlattenableFilter {
   final String field;
   final Geometry geometry;
 
   WithinFilter(this.field, this.geometry);
 
   @override
   bool apply(Document doc) {
-    // This should not be called directly as the filter is flattened
-    return false;
+    // For non-indexed queries, apply the validation filter directly
+    var validationFilter = _GeometryValidationFilter(
+      field,
+      geometry,
+      (docGeom, filterGeom) => docGeom.within(filterGeom),
+    );
+    // Copy context if available
+    if (nitriteConfig != null) {
+      validationFilter.nitriteConfig = nitriteConfig;
+      validationFilter.collectionName = collectionName;
+      validationFilter.objectFilter = objectFilter;
+    }
+    return validationFilter.apply(doc);
   }
 
   @override
@@ -132,16 +143,27 @@ class WithinFilter extends Filter implements FlattenableFilter {
 }
 
 ///@nodoc
-class IntersectsFilter extends Filter implements FlattenableFilter {
+class IntersectsFilter extends NitriteFilter implements FlattenableFilter {
   final String field;
   final Geometry geometry;
 
   IntersectsFilter(this.field, this.geometry);
 
   @override
   bool apply(Document doc) {
-    // This should not be called directly as the filter is flattened
-    return false;
+    // For non-indexed queries, apply the validation filter directly
+    var validationFilter = _GeometryValidationFilter(
+      field,
+      geometry,
+      (docGeom, filterGeom) => docGeom.intersects(filterGeom),
+    );
+    // Copy context if available
+    if (nitriteConfig != null) {
+      validationFilter.nitriteConfig = nitriteConfig;
+      validationFilter.collectionName = collectionName;
+      validationFilter.objectFilter = objectFilter;
+    }
+    return validationFilter.apply(doc);
   }
 
   @override
@@ -164,7 +186,7 @@ class IntersectsFilter extends Filter implements FlattenableFilter {
 }
 
 ///@nodoc
-class NearFilter extends Filter implements FlattenableFilter {
+class NearFilter extends NitriteFilter implements FlattenableFilter {
   final String field;
   final Geometry circle;
   final Coordinate center;
@@ -185,8 +207,15 @@ class NearFilter extends Filter implements FlattenableFilter {
 
   @override
   bool apply(Document doc) {
-    // This should not be called directly as the filter is flattened
-    return false;
+    // For non-indexed queries, apply the validation filter directly
+    var validationFilter = _NearValidationFilter(field, center, radius);
+    // Copy context if available
+    if (nitriteConfig != null) {
+      validationFilter.nitriteConfig = nitriteConfig;
+      validationFilter.collectionName = collectionName;
+      validationFilter.objectFilter = objectFilter;
+    }
+    return validationFilter.apply(doc);
   }
 
   @override
@@ -205,7 +234,7 @@ class NearFilter extends Filter implements FlattenableFilter {
 }
 
 /// Validation filter for near queries that checks actual distance.
-class _NearValidationFilter extends Filter {
+class _NearValidationFilter extends NitriteFilter {
   final String field;
   final Coordinate center;
   final double radius;

packages/nitrite_spatial/test/index_test.dart

@@ -1,7 +1,6 @@
 import 'package:dart_jts/dart_jts.dart';
 import 'package:nitrite/nitrite.dart' as no2;
 import 'package:nitrite/nitrite.dart' hide where;
-import 'package:nitrite/src/filters/filter.dart' as filter;
 import 'package:nitrite_spatial/nitrite_spatial.dart';
 import 'package:nitrite_spatial/src/filter.dart';
 import 'package:test/test.dart';