hart-estate-widget 0.0.34 → 0.0.37

package/build/components/Application.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 require("core-js/modules/web.dom-collections.iterator.js");
 
+require("core-js/modules/es.promise.js");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _mobxReactLite = require("mobx-react-lite");
@@ -56,6 +58,19 @@ const Application = (0, _mobxReactLite.observer)(_ref => {
     _store.default.dispatchEvent('enterComponent');
   };
 
+  const openPanorama = async () => {
+    try {
+      if (DeviceOrientationEvent.requestPermission) {
+        await DeviceOrientationEvent.requestPermission();
+      }
+    } catch (e) {
+      console.error(e);
+      console.log('Device motion not allowed');
+    }
+
+    hideTabPanes();
+  };
+
   const tabsList = {
     'planImage': /*#__PURE__*/_react.default.createElement(_ImageTab.default, {
       image: config.planImage,
@@ -85,7 +100,7 @@ const Application = (0, _mobxReactLite.observer)(_ref => {
       image: _store.default.hallRoomImage,
       title: "Panoramic tour",
       text: ['Use mouse to rotate', 'To move through the rooms, click on the layout thumbnail'],
-      onStart: hideTabPanes
+      onStart: openPanorama
     }, /*#__PURE__*/_react.default.createElement(_PanoramaTab.default, {
       json: config.json,
       planImage: config.planImage,

package/build/components/PanoramaTab.js

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("core-js/modules/es.array.reduce.js");
+
 require("core-js/modules/es.regexp.exec.js");
 
-require("core-js/modules/es.string.match.js");
+require("core-js/modules/es.string.replace.js");
 
-require("core-js/modules/es.array.reduce.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"));
@@ -45,15 +45,17 @@ const {
   DEVICEORIENTATION,
   ORBIT
 } = PANOLENS.CONTROLS;
+const imgExtentions = ['.png', '.PNG', '.jpg', '.JPG'];
 const pathName = 'Panorama_0_0_';
-(0, _panoramaHelpers.imageToUri)(_spotIcon.default, img => PANOLENS.DataImage.Spot = img);
-(0, _panoramaHelpers.imageToUri)(_doorIcon.default, img => PANOLENS.DataImage.Door = img);
 
 const getCameraFromSrc = (json, src) => {
   var _json$Floors$0$Camera;
 
-  const cameraIdTimestamp = src.match(/(?<=CameraId)[\s\S]*?(?=\.png)/);
-  const cameraId = "CameraId".concat(cameraIdTimestamp);
+  const cameraIdIndex = src.indexOf('CameraId');
+  if (cameraIdIndex === -1) return null;
+  const cameraId = imgExtentions.reduce((acc, extention) => {
+    return acc.replace(extention, '');
+  }, 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
@@ -79,7 +81,14 @@ const createPanorama = (image, index, setLoadingState) => {
 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 => img.includes(pathName + 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;
+    });
     if (!roomImages.length) return acc;
     roomImages.forEach(image => {
       const panorama = createPanorama(image, index, setLoadingState);
@@ -109,6 +118,7 @@ const getPanoramaRooms = (json, panoramas) => {
     };
     const currentRoom = json.Floors[0].Units[0].Rooms.find(room => room.ID === panorama['room_id']);
     let [left, top] = (0, _geometric.polygonMean)((0, _panoramaHelpers.getRoomCoordinates)(currentRoom, json.Floors[0].Walls, json.Vertices));
+    panorama['roomType'] = currentRoom.Type;
 
     if (!panorama.linkedSpots.length) {
       if (panorama.src.includes('_CameraId')) {
@@ -173,16 +183,18 @@ const connectPanorama = function connectPanorama(panorama, connectedPanorama, lo
   let isDoorLink = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   const locationX = location.Y - center[1];
   const locationY = location.X - center[0];
-  const locationZ = isDoorLink ? -10 : -50;
-  const icon = isDoorLink ? PANOLENS.DataImage.Door : PANOLENS.DataImage.Spot;
+  const locationZ = isDoorLink ? -10 : -100;
+  const icon = isDoorLink ? _doorIcon.default : _spotIcon.default;
+  const iconUrl = "".concat(icon, "?id=").concat(panorama['panorama_index'], "-").concat(panorama['panorama_id'], "-").concat(Math.random());
   const defaultScale = 20;
   const maxScale = 50;
   const defaultLength = 120;
   const length = (0, _geometric.lineLength)([[0, 0], [locationX, locationY]]);
   const scale = length / defaultLength * defaultScale;
   const finalScale = scale > maxScale ? maxScale : scale;
+  const resultScale = isDoorLink ? finalScale : finalScale - 15;
   const position = new THREE.Vector3(locationX, locationZ, locationY);
-  panorama.link(connectedPanorama, position, finalScale, icon);
+  panorama.link(connectedPanorama, position, resultScale, iconUrl);
 };
 
 const initPanorama = () => {
@@ -199,11 +211,6 @@ const initPanorama = () => {
   };
 
   animate();
-
-  if (DeviceOrientationEvent.requestPermission) {
-    DeviceOrientationEvent.requestPermission().catch(() => console.log('Device motion not allowed'));
-  }
-
   return {
     camera,
     controls
@@ -325,6 +332,7 @@ const PanoramaTab = _ref5 => {
     src: planImage,
     className: isMapActive ? 'active' : '',
     onClick: toggleMap,
+    onLoad: setScale,
     alt: "plan"
   }), !isMapDisabled && panoramaRooms.map((room, index) => /*#__PURE__*/_react.default.createElement("div", {
     key: index,

package/build/utils/panoramaHelpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.imageToUri = exports.getScale = exports.getRoomCoordinates = exports.findWallVertices = void 0;
+exports.getScale = exports.getRoomCoordinates = exports.findWallVertices = void 0;
 
 require("core-js/modules/es.array.reduce.js");
 
@@ -49,21 +49,4 @@ const getScale = (image, json) => {
   };
 };
 
-exports.getScale = getScale;
-
-const imageToUri = (url, callback) => {
-  const canvas = document.createElement('canvas');
-  const ctx = canvas.getContext('2d');
-  const image = new Image();
-  image.src = url;
-
-  image.onload = () => {
-    canvas.width = image.width;
-    canvas.height = image.height;
-    ctx.drawImage(image, 0, 0);
-    callback(canvas.toDataURL('image/png'));
-    canvas.remove();
-  };
-};
-
-exports.imageToUri = imageToUri;
+exports.getScale = getScale;

package/package.json

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