iticket-seatingplan-dev 1.3.2 → 1.3.4

package/dist/components/SeatingPlan.js

@@ -335,7 +335,7 @@ const SeatingPlan = _ref => {
     const avgX = filteredSeats.reduce((acc, val) => {
       return acc + val.x / filteredSeats.length;
     }, 0);
-    return [height * 0.05 - avgY / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206), avgX * 0.3 + 0.15];
+    return [height * 0.05 - avgY / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201), avgX * 0.3 + 0.15];
   };
   const determineZoom = seats => {
     const filteredSeats = seats.filter(price => !priceSectionIds || priceSectionIds.includes(price.psId));
@@ -343,7 +343,10 @@ const SeatingPlan = _ref => {
     const y = filteredSeats.map(fs => fs.y);
     const maxX = Math.max(...x) - Math.min(...x);
     const maxY = Math.max(...y) - Math.min(...y);
-    if (maxY > 67.5) return 4;else return 6;
+
+    // if (maxY > 67.5) return 4
+    // else return 6
+    return 5;
   };
 
   // return seating plan
@@ -496,7 +499,7 @@ const SeatingPlan = _ref => {
     key: i
   }, /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
     url: "https://iticketseatingplan.blob.core.windows.net/embed/static/media/rippleload.08e6a08dd832819226ef.gif",
-    bounds: [[height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206) - 0.11, s.x * 0.3 + 0.15 - 0.11], [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206) + 0.11, s.x * 0.3 + 0.15 + 0.11]
+    bounds: [[(s.r.includes('NORTH') ? height / 33.33 - height / 33.33 * s.y * 0.0105 + 1.4 : height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.45 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201)) - 0.11, s.x * 0.3 + 0.15 - 0.11], [(s.r.includes('NORTH') ? height / 33.33 - height / 33.33 * s.y * 0.0105 + 1.4 : height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.45 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201)) + 0.11, s.x * 0.3 + 0.15 + 0.11]
     // [height * 0.0302 - s.y * 0.602 - 0.3, s.x * 0.61 - 0.3],
     // [height * 0.0302 - s.y * 0.602 + 0.3, s.x * 0.61 + 0.3],
     // [height * 0.0302 - s.y * 0.602 - 0.17, s.x * 0.61 - 0.17],
@@ -516,7 +519,7 @@ const SeatingPlan = _ref => {
     //   height * 0.0302 - s.y * 0.602 + 0.17,
     //   s.x * 0.61 + 0.17,
     // ],
-    [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206) - 0.11, s.x * 0.3 + 0.15 - 0.11], [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206) + 0.11, s.x * 0.3 + 0.15 + 0.11]],
+    [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201) - 0.11, s.x * 0.3 + 0.15 - 0.11], [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201) + 0.11, s.x * 0.3 + 0.15 + 0.11]],
     zIndex: 10
   }) : s.s === 4 && s.m ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
     url: 'data:image/svg+xml;base64,PHN2ZyBpZD0iaWNvbnMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDEyOCAxMjgiPjxkZWZzPjxzdHlsZT4uY2xzLTF7ZmlsbDojZmZmO30uY2xzLTJ7ZmlsbDojZjU0YjU1O30uY2xzLTN7ZmlsbDojMzAzNDQyO29wYWNpdHk6MC4wODt9LmNscy00e2ZpbGw6bm9uZTtzdHJva2U6IzMwMzQ0MjtzdHJva2UtbGluZWNhcDpyb3VuZDtzdHJva2UtbGluZWpvaW46cm91bmQ7c3Ryb2tlLXdpZHRoOjRweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPnVzZXI8L3RpdGxlPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTgzLjMyLDg5LjZjMy45MSwyLjI3LDguMzksNC44NywxMS42LDguNDZhNDYuMDA1NDQsNDYuMDA1NDQsMCwwLDEtNjEuODQsMGMzLjIxLTMuNTksNy42OS02LjE5LDExLjYtOC40Niw0LjgtMi43OSw4Ljk1LTUuMiw4Ljk1LTguMjJhMTAuNTQ3LDEwLjU0NywwLDAsMC0zLjktOC40M2MtMi4yOS0uMzgtMy40OS00LjY4LTMuNDktNy4wNGEzLjI4Mzg2LDMuMjgzODYsMCwwLDEsLjk4LTIuNzdjLTEuNjYtNS4zOS0xLjYzLTEyLjg3LDIuMTQtMTguMTYsMi45NS00LjE0LDcuODEtNi4zNCwxNC4wNi02LjM2YTEzLjM1MDU1LDEzLjM1MDU1LDAsMCwxLDEyLjg3LDIuNzFjMi44MSwyLjUzLDcuMDgsOC43LDQuNDcsMjEuNzUuNTQuMzgsMS4wNiwxLjE3LDEuMDYsMi44MywwLDIuMzYtMS4yLDYuNjctMy41LDcuMDRhMTAuNDY3NjksMTAuNDY3NjksMCwwLDAtMy45NSw4LjQzQzc0LjM3LDg0LjQsNzguNTIsODYuODEsODMuMzIsODkuNloiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik02NCwxOEE0Ni4wMDEzMiw0Ni4wMDEzMiwwLDAsMSw5NC45Miw5OC4wNmMtMy4yMS0zLjU5LTcuNjktNi4xOS0xMS42LTguNDYtNC44LTIuNzktOC45NS01LjItOC45NS04LjIyYTEwLjQ2NzY5LDEwLjQ2NzY5LDAsMCwxLDMuOTUtOC40M2MyLjMtLjM3LDMuNS00LjY4LDMuNS03LjA0LDAtMS42Ni0uNTItMi40NS0xLjA2LTIuODMsMi42MS0xMy4wNS0xLjY2LTE5LjIyLTQuNDctMjEuNzVhMTMuMzUwNTUsMTMuMzUwNTUsMCwwLDAtMTIuODctMi43MWMtNi4yNS4wMi0xMS4xMSwyLjIyLTE0LjA2LDYuMzYtMy43Nyw1LjI5LTMuOCwxMi43Ny0yLjE0LDE4LjE2YTMuMjgzODYsMy4yODM4NiwwLDAsMC0uOTgsMi43N2MwLDIuMzYsMS4yLDYuNjYsMy40OSw3LjA0YTEwLjU0NywxMC41NDcsMCwwLDEsMy45LDguNDNjMCwzLjAyLTQuMTUsNS40My04Ljk1LDguMjItMy45MSwyLjI3LTguMzksNC44Ny0xMS42LDguNDZBNDYuMDAxMzIsNDYuMDAxMzIsMCwwLDEsNjQsMThaIi8+PHBhdGggY2xhc3M9ImNscy0zIiBkPSJNNjQsMTAwQTQ1Ljk5NDk0LDQ1Ljk5NDk0LDAsMCwxLDE4LjI3NSw1OSw0Ni40OTk1Miw0Ni40OTk1MiwwLDAsMCwxOCw2NGE0Niw0NiwwLDAsMCw5MiwwLDQ2LjQ5OTUyLDQ2LjQ5OTUyLDAsMCwwLS4yNzUtNUE0NS45OTQ5NCw0NS45OTQ5NCwwLDAsMSw2NCwxMDBaIi8+PHBhdGggY2xhc3M9ImNscy00IiBkPSJNMzMuMDgsOTguMDZjMy4yMS0zLjU5LDcuNjktNi4xOSwxMS42LTguNDYsNC44LTIuNzksOC45NS01LjIsOC45NS04LjIyYTEwLjU0NywxMC41NDcsMCwwLDAtMy45LTguNDNjLTIuMjktLjM4LTMuNDktNC42OC0zLjQ5LTcuMDRhMy4yODM4NiwzLjI4Mzg2LDAsMCwxLC45OC0yLjc3Yy0xLjY2LTUuMzktMS42My0xMi44NywyLjE0LTE4LjE2LDIuOTUtNC4xNCw3LjgxLTYuMzQsMTQuMDYtNi4zNmExMy4zNTA1NSwxMy4zNTA1NSwwLDAsMSwxMi44NywyLjcxYzIuODEsMi41Myw3LjA4LDguNyw0LjQ3LDIxLjc1LjU0LjM4LDEuMDYsMS4xNywxLjA2LDIuODMsMCwyLjM2LTEuMiw2LjY3LTMuNSw3LjA0YTEwLjQ2NzY5LDEwLjQ2NzY5LDAsMCwwLTMuOTUsOC40M2MwLDMuMDIsNC4xNSw1LjQzLDguOTUsOC4yMiwzLjkxLDIuMjcsOC4zOSw0Ljg3LDExLjYsOC40NiIvPjxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTMzLjA4LDk4LjA2QTQ2LjAwNTQ0LDQ2LjAwNTQ0LDAsMSwxLDY0LDExMCw0NS44OTEzNCw0NS44OTEzNCwwLDAsMSwzMy4wOCw5OC4wNloiLz48L3N2Zz4=',
@@ -529,7 +532,7 @@ const SeatingPlan = _ref => {
     //   height * 0.0302 - s.y * 0.602 + 0.17,
     //   s.x * 0.61 + 0.17,
     // ],
-    [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206) - 0.11, s.x * 0.3 + 0.15 - 0.15], [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0206) + 0.11, s.x * 0.3 + 0.15 + 0.15]],
+    [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201) - 0.11, s.x * 0.3 + 0.15 - 0.15], [height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201) + 0.11, s.x * 0.3 + 0.15 + 0.15]],
     zIndex: 10
   }) : /*#__PURE__*/_react.default.createElement(_reactLeaflet.Circle, {
     center: [
@@ -537,12 +540,20 @@ const SeatingPlan = _ref => {
     //   s.y * 0.57 -
     //   height * (height > 700 ? 0.0001 : 0.0006),
     // s.x * 0.6 + 0.25,
-
-    height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.5 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201), s.x * 0.3 + 0.15
+    //experimental
+    // 14.42,
+    // (height / 33.33 - 0.3 * s.y).toFixed(1)
+    // height / 33.33 - (height / 33.33) * s.y * 0.01, //29, //3 27, // height / 33.33 - s.y, // s.y * 0.3, //+ (height / 0.503) * 0.01, //11.66, // 5.2,
+    //working
+    s.r.includes('NORTH') ? height / 33.33 - height / 33.33 * s.y * 0.0105 + 1.4 : height * 0.05 - s.y / (height > 800 ? height > 999 ? 3.45 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height * 0.0201),
+    // s.r.includes('NORTH')
+    //   ? 0
+    //   : 0,
+    s.x * 0.3 + 0.15
 
     // height * 0.04 -
     //   s.y / (height > 800 ? 3.5 : 3.35) -
-    //   (height > 800 ? height * 0.0101 : height * 0.0206),
+    //   (height > 800 ? height * 0.0101 : height * 0.0201),
     // s.x * 0.3 + 0.15,
 
     // -s.y * (height * 0.00037) + 24.2,
@@ -558,7 +569,7 @@ const SeatingPlan = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_reactLeaflet.Tooltip, {
     direction: 'top',
     offset: [0, height * 0.03 + -30]
-  }, s.r + '-' + s.c, ' '), s.s === 1 && /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, null, /*#__PURE__*/_react.default.createElement("p", {
+  }, s.r + '-' + s.c), s.s === 1 && /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, null, /*#__PURE__*/_react.default.createElement("p", {
     style: {
       marginTop: '0.2rem',
       marginBottom: '0.2rem',

package/package.json

@@ -2,7 +2,7 @@
   "name": "iticket-seatingplan-dev",
   "description": "Seating plan with FLEXi pricing",
   "author": "gedwyne",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "private": false,
   "keywords": [
     "iticket",