fix: point

Soontao · Nov 15, 2022 · 723e095 · 723e095
1 parent 3df5422
commit 723e095
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/src/primitiveLiteral.ts b/src/primitiveLiteral.ts
@@ -160,7 +160,7 @@ export function int64Value(value: SourceArray, index: number): Lexer.Token {
     if (
       val >= '0' &&
       val <=
-        (value[start] === 0x2d ? '9223372036854775808' : '9223372036854775807')
+      (value[start] === 0x2d ? '9223372036854775808' : '9223372036854775807')
     ) {
       return Lexer.tokenize(
         value,
@@ -645,12 +645,14 @@ export function pointData(value: SourceArray, index: number): Lexer.Token {
 export function lineStringData(value: SourceArray, index: number): Lexer.Token {
   return multiGeoLiteralFactory(value, index, '', positionLiteral);
 }
+
 export function ringLiteral(value: SourceArray, index: number): Lexer.Token {
   return multiGeoLiteralFactory(value, index, '', positionLiteral);
   // Within each ringLiteral, the first and last positionLiteral elements MUST be an exact syntactic match to each other.
   // Within the polygonData, the ringLiterals MUST specify their points in appropriate winding order.
   // In order of traversal, points to the left side of the ring are interpreted as being in the polygon.
 }
+
 export function polygonData(value: SourceArray, index: number): Lexer.Token {
   return multiGeoLiteralFactory(value, index, '', ringLiteral);
 }
@@ -682,7 +684,12 @@ export function sridLiteral(value: SourceArray, index: number): Lexer.Token {
   return Lexer.tokenize(value, start, index, 'SRID', Lexer.TokenType.Literal);
 }
 export function pointLiteral(value: SourceArray, index: number): Lexer.Token {
-  if (!Utils.equals(value, index, 'Point')) {
+  if (
+    !(
+      Utils.equals(value, index, 'Point') ||
+      Utils.equals(value, index, 'POINT')
+    )
+  ) {
     return;
   }
   const start = index;
@@ -1033,13 +1040,8 @@ export function geographyMultiPolygon(
   );
 }
 export function geographyPoint(value: SourceArray, index: number): Lexer.Token {
-  return geoLiteralFactory(
-    value,
-    index,
-    'Edm.GeographyPoint',
-    Lexer.geographyPrefix,
-    fullPointLiteral
-  );
+  return geoLiteralFactory(value, index, 'Edm.GeographyPoint', Lexer.geographyPrefix, fullPointLiteral)
+    || geoLiteralFactory(value, index, 'Edm.GeographyPoint', Lexer.geographyPrefix, pointLiteral);
 }
 export function geographyPolygon(
   value: SourceArray,

diff --git a/test/issue.spec.ts b/test/issue.spec.ts
@@ -10,9 +10,13 @@ describe('Issue Related Test Suite', () => {
   });
 
   it('should support parser uri with geography - POLYGON', () => {
-
     const t = defaultParser.odataUri("/Products?$filter=geo.intersects(Location, geography'SRID=12345;POLYGON((-127.89734578345 45.234534534,-127.89734578345 45.234534534,-127.89734578345 45.234534534,-127.89734578345 45.234534534))')");
     expect(t).not.toBeUndefined();
+  });
 
+
+  it('should support parse filter with not full POINT', () => {
+    defaultParser.filter("geo.distance(location,geography'POINT(-1.702 48.113)') le 200");
   });
+
 });
diff --git a/test/primitiveLiteral.spec.ts b/test/primitiveLiteral.spec.ts
@@ -41,6 +41,20 @@ describe('Primitive literals from json', () => {
     expect(t).not.toBeUndefined();
   });
 
+
+  it('should support geography - POINT', () => {
+    const t = defaultParser.literal("geography'POINT(-127.89734578345 45.234534534)'");
+    expect(t.value).toBe('Edm.GeographyPoint');
+    expect(t).not.toBeUndefined();
+  });
+
+  it('should support geography - FULL POINT', () => {
+    const t = defaultParser.literal("geography'SRID=12345;POINT(-127.89734578345 45.234534534)'");
+    expect(t.value).toBe('Edm.GeographyPoint');
+    expect(t).not.toBeUndefined();
+  });
+
+
 });
 
 function getLiteralFunctionName(itemRule) {