hart-estate-widget 0.0.37 → 0.0.38

package/build/components/PanoramaTab.js

@@ -11,10 +11,10 @@ require("core-js/modules/es.regexp.exec.js");
 
 require("core-js/modules/es.string.replace.js");
 
-require("core-js/modules/web.dom-collections.iterator.js");
-
 require("core-js/modules/es.string.includes.js");
 
+require("core-js/modules/web.dom-collections.iterator.js");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _store = _interopRequireDefault(require("../store"));
@@ -47,15 +47,18 @@ const {
 } = PANOLENS.CONTROLS;
 const imgExtentions = ['.png', '.PNG', '.jpg', '.JPG'];
 const pathName = 'Panorama_0_0_';
+const cameraIdBeginning = 'CameraId';
+
+const removeExtention = str => imgExtentions.reduce((acc, extention) => {
+  return acc.replace(extention, '');
+}, str);
 
 const getCameraFromSrc = (json, src) => {
   var _json$Floors$0$Camera;
 
-  const cameraIdIndex = src.indexOf('CameraId');
+  const cameraIdIndex = src.indexOf(cameraIdBeginning);
   if (cameraIdIndex === -1) return null;
-  const cameraId = imgExtentions.reduce((acc, extention) => {
-    return acc.replace(extention, '');
-  }, src.substring(cameraIdIndex));
+  const cameraId = removeExtention(src.substring(cameraIdIndex));
   return ((_json$Floors$0$Camera = json.Floors[0].CameraPoints) === null || _json$Floors$0$Camera === void 0 ? void 0 : _json$Floors$0$Camera.find(_ref => {
     let {
       ID
@@ -82,11 +85,15 @@ const getPanoramas = (json, images, setLoadingState) => {
   if (!json) return images.map((image, index) => createPanorama(image, index, setLoadingState));
   return json.Floors[0].Units[0].Rooms.reduce((acc, jsonRoom, index) => {
     const roomImages = images.filter(img => {
-      const panoramaIdIndex = img.indexOf(pathName);
-      if (panoramaIdIndex === -1) return false;
-      const panoramaId = imgExtentions.reduce((acc, extention) => {
-        return acc.replace(extention, '');
-      }, img.substring(panoramaIdIndex + pathName.length));
+      const panoramaIdIndex = img.indexOf(pathName) + pathName.length;
+      if (panoramaIdIndex < pathName.length) return false;
+      let panoramaId = removeExtention(img.substring(panoramaIdIndex));
+
+      if (panoramaId.includes(cameraIdBeginning)) {
+        const cameraIdIndex = panoramaId.indexOf(cameraIdBeginning) - 1;
+        panoramaId = panoramaId.slice(0, cameraIdIndex);
+      }
+
       return Number(panoramaId) === index;
     });
     if (!roomImages.length) return acc;

package/package.json

@@ -3,7 +3,7 @@
   "description": "HART Estate widget",
   "author": "HART",
   "keywords": [],
-  "version": "0.0.37",
+  "version": "0.0.38",
   "private": false,
   "main": "build/index.js",
   "module": "build/index.js",