Fix nested $geometry

Author: GromNaN

generator/config/query/near.yaml

@@ -3,7 +3,7 @@ name: $near
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/near/'
 type:
     - fieldQuery
-encode: object
+encode: dollar_object
 description: |
     Returns geospatial objects in proximity to a point. Requires a geospatial index. The 2dsphere and 2d indexes support $near.
 arguments:
@@ -41,15 +41,3 @@ tests:
                                     - 40.78
                             $minDistance: 1000
                             $maxDistance: 5000
-
-    -
-        name: 'Query on Legacy Coordinates'
-        link: 'https://www.mongodb.com/docs/manual/reference/operator/query/near/#query-on-legacy-coordinates'
-        pipeline:
-            -
-                $match:
-                    location:
-                        $near:
-                            - -73.9667
-                            - 40.78
-                        $maxDistance: 0.1

generator/config/query/nearSphere.yaml

@@ -3,7 +3,7 @@ name: $nearSphere
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/nearSphere/'
 type:
     - fieldQuery
-encode: object
+encode: dollar_object
 description: |
     Returns geospatial objects in proximity to a point on a sphere. Requires a geospatial index. The 2dsphere and 2d indexes support $nearSphere.
 arguments:
@@ -36,19 +36,6 @@ tests:
                         $nearSphere:
                             $geometry:
                                 type: 'Point'
-                                coordinates:
-                                    - -73.9667
-                                    - 40.78
+                                coordinates: [-73.9667, 40.78]
                             $minDistance: 1000
                             $maxDistance: 5000
-    -
-        name: 'Specify Center Point Using Legacy Coordinates'
-        link: 'https://www.mongodb.com/docs/manual/reference/operator/query/nearSphere/#specify-center-point-using-legacy-coordinates'
-        pipeline:
-            -
-                $match:
-                    location:
-                        $nearSphere:
-                            - -73.9667
-                            - 40.78
-                        $maxDistance: 0.1

src/Builder/BuilderEncoder.php

@@ -26,6 +26,7 @@
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
+use function array_key_exists;
 use function array_key_first;
 use function assert;
 use function get_debug_type;
@@ -182,7 +183,19 @@ private function encodeAsDollarObject(OperatorInterface $value): stdClass
                 continue;
             }
 
-            $result->{'$' . $key} = $this->recursiveEncode($val);
+            $val = $this->recursiveEncode($val);
+
+            if ($key === 'geometry') {
+                if (is_object($val) && property_exists($val, '$geometry')) {
+                    $result->{'$geometry'} = $val->{'$geometry'};
+                } elseif (is_array($val) && array_key_exists('$geometry', $val)) {
+                    $result->{'$geometry'} = $val->{'$geometry'};
+                } else {
+                    $result->{'$geometry'} = $val;
+                }
+            } else {
+                $result->{'$' . $key} = $val;
+            }
         }
 
         return $this->wrap($value, $result);

src/Builder/Query/NearOperator.php

@@ -31,18 +31,4 @@ public function testQueryOnGeoJSONData(): void
 
         $this->assertSamePipeline(Pipelines::NearQueryOnGeoJSONData, $pipeline);
     }
-
-    public function testQueryOnLegacyCoordinates(): void
-    {
-        $pipeline = new Pipeline(
-            Stage::match(
-                location: Query::near(
-                    [-73.9667, 40.78],
-                    maxDistance: 0.10,
-                ),
-            ),
-        );
-
-        $this->assertSamePipeline(Pipelines::NearQueryOnLegacyCoordinates, $pipeline);
-    }
 }

src/Builder/Query/NearSphereOperator.php

@@ -5,6 +5,8 @@
 namespace MongoDB\Tests\Builder\Query;
 
 use MongoDB\Builder\Pipeline;
+use MongoDB\Builder\Query;
+use MongoDB\Builder\Stage;
 use MongoDB\Tests\Builder\PipelineTestCase;
 
 /**
@@ -14,15 +16,19 @@ class NearSphereOperatorTest extends PipelineTestCase
 {
     public function testSpecifyCenterPointUsingGeoJSON(): void
     {
-        $pipeline = new Pipeline();
+        $pipeline = new Pipeline(
+            Stage::match(
+                location: Query::nearSphere(
+                    Query::geometry(
+                        type: 'Point',
+                        coordinates: [-73.9667, 40.78],
+                    ),
+                    minDistance: 1000,
+                    maxDistance: 5000,
+                ),
+            ),
+        );
 
         $this->assertSamePipeline(Pipelines::NearSphereSpecifyCenterPointUsingGeoJSON, $pipeline);
     }
-
-    public function testSpecifyCenterPointUsingLegacyCoordinates(): void
-    {
-        $pipeline = new Pipeline();
-
-        $this->assertSamePipeline(Pipelines::NearSphereSpecifyCenterPointUsingLegacyCoordinates, $pipeline);
-    }
 }