Revert "Fixes geometry type filter (maplibre#924)"

This reverts commit 2ed393e.
hyperknot · Jan 9, 2025 · 47ddb5d · 47ddb5d
1 parent 1aec430
commit 47ddb5d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/src/feature_filter/feature_filter.test.ts b/src/feature_filter/feature_filter.test.ts
@@ -171,30 +171,6 @@ describe('filter', () => {
         expect(withinFilter.filter({zoom: 3}, featureInTile, canonical)).toBe(false);
     });
 
-    test('expression, geomtery-type point', () => {
-        const withinFilter = featureFilter(['==', ['geometry-type'], 'Point']);
-        expect(withinFilter.needGeometry).toBe(true);
-        const canonical = {z: 3, x: 3, y: 3} as ICanonicalTileID;
-        const featureInTile = {
-            type: 1,
-            geometry: [[{x: 0, y: 0}]],
-            properties: {}
-        } as Feature;
-        expect(withinFilter.filter({zoom: 3}, featureInTile, canonical)).toBe(true);
-    });
-
-    test('expression, geomtery-type multipoint', () => {
-        const withinFilter = featureFilter(['==', ['geometry-type'], 'MultiPoint']);
-        expect(withinFilter.needGeometry).toBe(true);
-        const canonical = {z: 3, x: 3, y: 3} as ICanonicalTileID;
-        const featureInTile = {
-            type: 1,
-            geometry: [[{x: 0, y: 0}], [{x: 1, y: 1}]],
-            properties: {}
-        } as Feature;
-        expect(withinFilter.filter({zoom: 3}, featureInTile, canonical)).toBe(true);
-    });
-
     legacyFilterTests(featureFilter);
 
 });

diff --git a/src/feature_filter/index.ts b/src/feature_filter/index.ts
@@ -103,7 +103,7 @@ function compare(a, b) {
 
 function geometryNeeded(filter) {
     if (!Array.isArray(filter)) return false;
-    if (filter[0] === 'within' || filter[0] === 'distance' || filter[0] === 'geometry-type') return true;
+    if (filter[0] === 'within' || filter[0] === 'distance') return true;
     for (let index = 1; index < filter.length; index++) {
         if (geometryNeeded(filter[index])) return true;
     }