hart-estate-widget 0.0.37 → 0.0.40

package/build/components/PanoramaTab.js

@@ -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,12 +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));
-      return Number(panoramaId) === index;
+      const panoramaIdIndex = img.indexOf(pathName) + pathName.length;
+      if (panoramaIdIndex < pathName.length) return false;
+      const indexAsString = String(index);
+      const panoramaId = String(removeExtention(img.substring(panoramaIdIndex)));
+      const maxIndexLength = Math.max(indexAsString.length, panoramaId.length);
+      const imageInRoom = (0, _panoramaHelpers.getArrayFromNumber)(maxIndexLength).every(i => {
+        return panoramaId[i] === indexAsString[i];
+      });
+      return imageInRoom;
     });
     if (!roomImages.length) return acc;
     roomImages.forEach(image => {

package/build/store/index.js

@@ -59,9 +59,10 @@ class Store {
       json,
       panoramaImages
     } = this.config;
+    if (!json) return panoramaImages[0] || null;
     const roomIndex = json.Floors[0].Units[0].Rooms.findIndex(room => room.ID === this.hallRoomId);
     const image = panoramaImages.find(url => url.includes("".concat(roomIndex, ".png")));
-    return image || panoramaImages[0];
+    return image || panoramaImages[0] || null;
   }
 
   setConfig(config) {

package/build/utils/panoramaHelpers.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getScale = exports.getRoomCoordinates = exports.findWallVertices = void 0;
+exports.getScale = exports.getRoomCoordinates = exports.getArrayFromNumber = exports.findWallVertices = void 0;
+
+require("core-js/modules/web.dom-collections.iterator.js");
 
 require("core-js/modules/es.array.reduce.js");
 
@@ -11,6 +13,10 @@ var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const getArrayFromNumber = num => [...Array(num).keys()];
+
+exports.getArrayFromNumber = getArrayFromNumber;
+
 const findWallVertices = (walls, wall, vertices) => {
   const currentWall = walls.find(el => el.ID === wall);
   return currentWall.Vertices.map(vertexId => {

package/package.json

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