fix: fix "hasWheelchairAccessibleEntrance" boolean field due to API c…

…hanges PiperOrigin-RevId: 609792119
googlemaps · Feb 23, 2024 · 3df3d09 · 3df3d09
1 parent 5fed3e7
commit 3df3d09
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/place_building_blocks/place_field_boolean/place_field_boolean.ts b/src/place_building_blocks/place_field_boolean/place_field_boolean.ts
@@ -99,7 +99,7 @@ function getFieldValue(place: Place, field: PlaceBooleanField): boolean|null|
     case 'hasTakeout':
       return place.hasTakeout;
     case 'hasWheelchairAccessibleEntrance':
-      return place.hasWheelchairAccessibleEntrance;
+      return place.accessibilityOptions?.hasWheelchairAccessibleEntrance;
     case 'isReservable':
       return place.isReservable;
     case 'servesBeer':
@@ -191,14 +191,17 @@ export class PlaceFieldBoolean extends PlaceDataConsumer {
   getRequiredFields(): Array<keyof Place> {
     if (!this.field) return [];
     const placeField = toPlaceBooleanField(this.field);
-    if (placeField === 'isOpen()') {
-      return [
-        'businessStatus',
-        'openingHours',
-        'utcOffsetMinutes',
-      ];
-    } else {
-      return [placeField];
+    switch (placeField) {
+      case 'isOpen()':
+        return [
+          'businessStatus',
+          'openingHours',
+          'utcOffsetMinutes',
+        ];
+      case 'hasWheelchairAccessibleEntrance':
+        return ['accessibilityOptions'];
+      default:
+        return [placeField];
     }
   }
 

diff --git a/src/place_building_blocks/place_field_boolean/place_field_boolean_test.ts b/src/place_building_blocks/place_field_boolean/place_field_boolean_test.ts
@@ -56,7 +56,7 @@ describe('place field boolean test', () => {
       hasDelivery: true,
       hasDineIn: true,
       hasTakeout: true,
-      hasWheelchairAccessibleEntrance: true,
+      accessibilityOptions: {hasWheelchairAccessibleEntrance: true},
       isReservable: true,
       servesBeer: true,
       servesBreakfast: true,
@@ -91,7 +91,7 @@ describe('place field boolean test', () => {
       hasDelivery: false,
       hasDineIn: false,
       hasTakeout: false,
-      hasWheelchairAccessibleEntrance: false,
+      accessibilityOptions: {hasWheelchairAccessibleEntrance: false},
       isReservable: false,
       servesBeer: false,
       servesBreakfast: false,
@@ -126,7 +126,7 @@ describe('place field boolean test', () => {
       hasDelivery: null,
       hasDineIn: null,
       hasTakeout: null,
-      hasWheelchairAccessibleEntrance: null,
+      accessibilityOptions: {hasWheelchairAccessibleEntrance: null},
       isReservable: null,
       servesBeer: null,
       servesBreakfast: null,
@@ -362,4 +362,4 @@ describe('place field boolean test', () => {
 
        expect(lifecycleSpy.hostUpdatedCount).toBe(2);
      });
-});
+});
diff --git a/src/utils/googlemaps_types.ts b/src/utils/googlemaps_types.ts
@@ -37,13 +37,15 @@ export declare interface SearchByTextRequest {
 }
 
 /** Updated Place class with new attribution schema. */
-export declare type Place =
-    Omit<google.maps.places.Place, 'photos'|'reviews'|'fetchFields'>& {
+export declare interface Place extends Omit<
+    google.maps.places.Place,
+    'photos'|'reviews'|'fetchFields'|'hasWheelchairAccessibleEntrance'> {
   photos?: Photo[];
   reviews?: Review[];
+  accessibilityOptions?: {hasWheelchairAccessibleEntrance: boolean|null}|null;
   fetchFields: (options: google.maps.places.FetchFieldsRequest) =>
       Promise<{place: Place}>;
-};
+}
 
 /** Places library. */
 export declare interface PlacesLibrary extends