@cdek-it/widget 3.13.0 → 3.13.1

package/dist/cdek-widget.es.js

@@ -6597,30 +6597,11 @@ const map = defineStore("map", () => {
     left: config.map.defaultCenter,
     right: config.map.defaultCenter
   });
-  const polygonBounds = computed(() => {
-    const minLng = Math.min(bounds.left[0], bounds.right[0]);
-    const maxLng = Math.max(bounds.left[0], bounds.right[0]);
-    const minLat = Math.min(bounds.left[1], bounds.right[1]);
-    const maxLat = Math.max(bounds.left[1], bounds.right[1]);
-    return {
-      latitude_right_top: maxLat,
-      longitude_right_top: maxLng,
-      latitude_left_bottom: minLat,
-      longitude_left_bottom: minLng
-    };
-  });
-  const filteredOffices = computed(() => {
-    if (bounds.left[0] === bounds.right[0] && bounds.left[1] === bounds.right[1]) {
-      return packageSuitedOffices.value;
-    }
-    const minLng = Math.min(bounds.left[0], bounds.right[0]);
-    const maxLng = Math.max(bounds.left[0], bounds.right[0]);
-    const minLat = Math.min(bounds.left[1], bounds.right[1]);
-    const maxLat = Math.max(bounds.left[1], bounds.right[1]);
-    return packageSuitedOffices.value.filter(
-      (office) => office.location[0] >= minLng && office.location[0] <= maxLng && office.location[1] >= minLat && office.location[1] <= maxLat
-    );
-  });
+  const filteredOffices = computed(
+    () => packageSuitedOffices.value.filter(
+      (office) => office.location[0] <= bounds.right[0] && office.location[1] >= bounds.right[1] && office.location[0] >= bounds.left[0] && office.location[1] <= bounds.left[1]
+    )
+  );
   const searchedOffices = computed(() => {
     if (searchStorage.value.length === 0)
       return [];
@@ -6639,8 +6620,10 @@ const map = defineStore("map", () => {
     bounds.right = newBounds[1];
     location.center = updateObject.location.center;
     location.zoom = updateObject.location.zoom;
-  }, 500);
+    searchStorage.loading = false;
+  }, 2e3);
   const update2 = (updateObject) => {
+    searchStorage.loading = true;
     debouncedUpdate(updateObject);
   };
   const customClick = (_updateObject, event) => {
@@ -6687,7 +6670,6 @@ const map = defineStore("map", () => {
     packageSuitedOffices,
     update: update2,
     bounds,
-    polygonBounds,
     filteredOffices,
     fixedBounds,
     fixedParams,
@@ -20286,18 +20268,14 @@ class CdekApi extends AbstractApi {
   constructor(servicePath) {
     super();
     __publicField(this, "getOfficesAbort");
-    __publicField(this, "getOfficesByCoordinateAbort");
     __publicField(this, "getPriceAbort");
     __publicField(this, "servicePath");
-    this.getOfficesAbort = this.getPriceAbort = this.getOfficesByCoordinateAbort = null;
+    this.getOfficesAbort = this.getPriceAbort = null;
     this.servicePath = servicePath;
   }
   cancelOfficeRequest() {
     this.cancelRequest(this.getOfficesAbort, "offices");
   }
-  cancelOfficesByCoordinateRequest() {
-    this.cancelRequest(this.getOfficesByCoordinateAbort, "officesByCoordinate");
-  }
   cancelPriceRequest() {
     this.cancelRequest(this.getPriceAbort, "prices");
   }
@@ -20398,54 +20376,6 @@ class CdekApi extends AbstractApi {
     searchStorage.loading = false;
     return offices;
   }
-  async getOfficesByCoordinate(params) {
-    const searchStorage = search();
-    const coreStorage = core();
-    searchStorage.loading = true;
-    if (coreStorage.debug) {
-      console.debug("[CDEK] Loading points by coordinate from service", params);
-    }
-    const additionalParams = {};
-    if (coreStorage.params.sender) {
-      additionalParams.is_handout_only = false;
-      additionalParams.is_reception = true;
-    } else {
-      additionalParams.is_handout = true;
-    }
-    this.cancelOfficesByCoordinateRequest();
-    this.getOfficesByCoordinateAbort = new AbortController();
-    const offices = await axios.get(this.servicePath, {
-      params: {
-        ...searchStorage.filters,
-        ...additionalParams,
-        ...params,
-        action: "byCoordinate"
-      },
-      signal: this.getOfficesByCoordinateAbort.signal
-    }).then((r) => {
-      const data = typeof r.data === "string" ? JSON.parse(r.data) : r.data;
-      const officeList = Array.isArray(data) ? data : (data == null ? void 0 : data.delivery_points) || (data == null ? void 0 : data.items) || [];
-      return this.formatOffices(officeList);
-    }).catch((e) => {
-      if (axios.isCancel(e)) {
-        if (core().debug) {
-          console.debug("[CDEK] Offices by coordinate request cancelled");
-        }
-        throw e;
-      }
-      console.error("[CDEK] Service error", e);
-      map().mapLoadError = YandexMapErrorCode.SERVICE_ERROR;
-      return [];
-    });
-    if (coreStorage.debug) {
-      console.debug("[CDEK] Got points by coordinate", offices);
-    }
-    searchStorage.loading = false;
-    return offices;
-  }
-  async getOfficesByCoordinates(params) {
-    return this.getOfficesByCoordinate(params);
-  }
   async fetchOfficePage(additionalParams, pageNumber, sizeNumber) {
     return axios.get(this.servicePath, {
       params: {
@@ -20770,75 +20700,36 @@ class Widget {
       hideFilters: this.params.hideFilters,
       filters: this.params.forceFilters
     });
-    const initializeLocationAndOffices = async () => {
-      try {
-        if (typeof this.params.defaultLocation === "string") {
-          const geoData = await this.yandexApi.geocodeString(this.params.defaultLocation);
-          if (geoData.found < 1) {
-            throw new Error("[CDEK] Unable to geocode default location");
-          }
-          mapStorage.location.center = geoData.members[0].position;
-        } else {
-          mapStorage.location.center = this.params.defaultLocation;
-        }
-        await this.fixBounds();
-        if (coreStorage.params.offices !== null || coreStorage.params.officesRaw !== null) {
-          mapStorage.offices = await this.cdekApi.getOffices();
-        }
-        if (coreStorage.params.selected.office !== null) {
-          this.selectOffice(coreStorage.params.selected.office);
+    coreStorage.lockUi();
+    if (typeof this.params.defaultLocation === "string") {
+      this.yandexApi.geocodeString(this.params.defaultLocation).then((geoData) => {
+        if (geoData.found < 1) {
+          throw new Error("[CDEK] Unable to geocode default location");
         }
-      } catch (e) {
-        if (!isCancel(e)) {
-          console.error("[CDEK] Error initializing widget location/offices", e);
-        }
-      } finally {
-        coreStorage.unlockUi();
-      }
-    };
-    initializeLocationAndOffices().then();
-    const debouncedLoadOfficesByBounds = debounce(async () => {
-      if (coreStorage.params.offices !== null || coreStorage.params.officesRaw !== null) {
+        mapStorage.location.center = geoData.members[0].position;
+      }).then(this.fixBounds.bind(this)).finally(coreStorage.unlockUi);
+    } else {
+      mapStorage.location.center = this.params.defaultLocation;
+      this.fixBounds().then(coreStorage.unlockUi);
+    }
+    this.cdekApi.getOffices().then((offices) => mapStorage.offices = offices).then(() => {
+      if (coreStorage.params.selected.office === null)
         return;
-      }
-      searchStorage.loading = true;
-      this.cdekApi.cancelOfficesByCoordinateRequest();
-      try {
-        mapStorage.offices = await this.cdekApi.getOfficesByCoordinate(mapStorage.polygonBounds);
-        if (coreStorage.params.selected.office !== null && mapStorage.exactOffice === null) {
-          this.selectOffice(coreStorage.params.selected.office);
-        }
-      } catch (e) {
-        if (!isCancel(e))
-          throw e;
-      } finally {
-        searchStorage.loading = false;
-      }
-    }, 500);
+      this.selectOffice(coreStorage.params.selected.office);
+    }).finally(coreStorage.unlockUi);
     const debouncedUpdate = debounce(async (input, forceUpdate = false) => {
       try {
         if (forceUpdate) {
-          if (coreStorage.params.offices !== null || coreStorage.params.officesRaw !== null) {
-            mapStorage.offices = await this.cdekApi.getOffices();
-          } else {
-            mapStorage.offices = await this.cdekApi.getOfficesByCoordinate(mapStorage.polygonBounds);
-          }
+          mapStorage.offices = [];
+          mapStorage.offices = await this.cdekApi.getOffices();
         }
         searchStorage.searchResults = (await this.yandexApi.geocodeString(input)).members;
+        searchStorage.loading = false;
       } catch (e) {
         if (!isCancel(e))
           throw e;
-      } finally {
-        searchStorage.loading = false;
       }
-    }, 500);
-    watch(
-      () => [mapStorage.bounds.left, mapStorage.bounds.right],
-      () => {
-        debouncedLoadOfficesByBounds();
-      },
-      { deep: true }
-    );
+    }, 1e3);
     searchStorage.$subscribe(async (mutation, state) => {
       if (mutation.storeId !== "search" || mutation.type !== "patch object") {
         return;
@@ -20849,7 +20740,6 @@ class Widget {
       }
       searchStorage.loading = true;
       this.cdekApi.cancelOfficeRequest();
-      this.cdekApi.cancelOfficesByCoordinateRequest();
       this.yandexApi.cancelGeocodeStringRequest();
       await debouncedUpdate(state.value, forceUpdate);
     });
@@ -20947,7 +20837,7 @@ class Widget {
         if (store2.uiLoadLocksCounter > 0)
           return;
         if (store2.debug) {
-          console.debug("[CDEK] Widget 3.12.0 has been loaded");
+          console.debug("[CDEK] Widget 3.13.0 has been loaded");
         }
         (_a = this.params.onReady) == null ? void 0 : _a.bind(this)();
       });