iticket-seatingplan-dev 1.8.9 → 1.8.10

package/dist/components/Map.js

@@ -19,6 +19,7 @@ var _TicketIcon = _interopRequireDefault(require("./icons/TicketIcon"));
 var _FlexiIcon = _interopRequireDefault(require("./icons/FlexiIcon"));
 var _HoverPopup = _interopRequireDefault(require("./HoverPopup"));
 var _Controls = _interopRequireDefault(require("./Controls"));
+var _constants = require("../utils/constants");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -79,16 +80,11 @@ function SeatMap(_ref) {
   const resetTooltipTimeoutRef = (0, _react.useRef)(null);
   const hideTooltipTimeoutRef = (0, _react.useRef)(null);
   const map = (0, _reactLeaflet.useMap)();
+  const imgBounds = [[0, 0], [-_constants.SCALE, width / height * _constants.SCALE]];
   const seatsMap = (0, _react.useMemo)(() => new Map(seats.seats.map(s => {
-    const isIcon = (!priceSectionIds || priceSectionIds.includes(s.psId)) && (s.s === _utils.statuses.WHEELCHAIR_ACCESS || s.s === _utils.statuses.USER_PENDING && s.m);
-    const latlng = (0, _utils.getSeatCenterLatLng)(s, isIcon, height);
-    const lat = s.r.includes("NORTH") ? (0, _utils.getNorthSeatLat)(s, height) : latlng.lat;
-    const seatCenter = {
-      lat,
-      lng: latlng.lng
-    };
+    const latlng = (0, _utils.getSeatCenterLatLng)(s, height, width, imgBounds);
     return [s.sId, _objectSpread(_objectSpread({}, s), {}, {
-      center: seatCenter
+      center: latlng
     })];
   })), [seats.seats, height, priceSectionIds]);
   const isOrphanMode = (seats === null || seats === void 0 ? void 0 : seats.preventOrphanedSeats) && desiredSeatQuantity > 0;
@@ -288,8 +284,8 @@ function SeatMap(_ref) {
       }
       if (isTouchScreen && (clickedSeat === null || clickedSeat === void 0 ? void 0 : clickedSeat.ssId) !== s.ssId) {
         setClickedSeat(_objectSpread(_objectSpread({}, s), {}, {
-          offset: (0, _utils.getSeatRadius)(e, map),
-          xy: (0, _utils.getSeatXy)(e, map)
+          offset: _constants.RADIUS,
+          xy: map.latLngToContainerPoint(e.target.getLatLng())
         }));
         handleHighlightSeats(e, s);
         setIsHoveringOnSeat(true);
@@ -422,7 +418,7 @@ function SeatMap(_ref) {
     hasBookedSeats: (bookedSeats === null || bookedSeats === void 0 ? void 0 : bookedSeats.length) > 0
   }), (seats === null || seats === void 0 ? void 0 : seats.background) && /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
     url: seats === null || seats === void 0 ? void 0 : seats.background,
-    bounds: [[0, 0], [height * 0.03, width * 0.03]],
+    bounds: imgBounds,
     zIndex: 10,
     eventHandlers: {
       error: i => {
@@ -433,11 +429,14 @@ function SeatMap(_ref) {
     var _seatsMap$get2, _seats$pricing3, _chosenSeat$seat, _chosenSeat$seat2, _chosenSeat$seat3;
     const seatCenter = ((_seatsMap$get2 = seatsMap.get(s.sId)) === null || _seatsMap$get2 === void 0 ? void 0 : _seatsMap$get2.center) || {
       lat: s.y,
-      lng: s.x
+      lng: s.x,
+      radius: 110
     };
     const seatPrices = ((_seats$pricing3 = seats.pricing) === null || _seats$pricing3 === void 0 ? void 0 : _seats$pricing3.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && price.psId === s.psId)) || [];
     const hasSeatPrices = (seatPrices === null || seatPrices === void 0 ? void 0 : seatPrices.length) > 0;
     const isSingleFlexi = seatPrices.length === 1 && !!seatPrices[0].pMax && !!seatPrices[0].pMin && seatPrices[0].pMax > seatPrices[0].pMin;
+    const radiusInDeg = seatCenter.radius / _constants.ONE_DEG_LAT_IN_METERS;
+    const iconBounds = [[seatCenter.lat - radiusInDeg, seatCenter.lng - radiusInDeg], [seatCenter.lat + radiusInDeg, seatCenter.lng + radiusInDeg]];
     const eventHandlers = {
       click: e => {
         onClickSeat(e, s, isSingleFlexi, hasSeatPrices);
@@ -465,21 +464,21 @@ function SeatMap(_ref) {
       key: i
     }, (s.loading || ticketPopupOpen && (chosenSeat === null || chosenSeat === void 0 || (_chosenSeat$seat = chosenSeat.seat) === null || _chosenSeat$seat === void 0 ? void 0 : _chosenSeat$seat.ssId) === s.ssId) && /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
       url: "https://iticketseatingplan.blob.core.windows.net/embed/static/media/rippleload.08e6a08dd832819226ef.gif",
-      bounds: [[seatCenter.lat - 0.11, seatCenter.lng - 0.11], [seatCenter.lat + 0.11, seatCenter.lng + 0.11]],
+      bounds: iconBounds,
       opacity: s.loading || ticketPopupOpen && (chosenSeat === null || chosenSeat === void 0 || (_chosenSeat$seat2 = chosenSeat.seat) === null || _chosenSeat$seat2 === void 0 ? void 0 : _chosenSeat$seat2.ssId) === s.ssId ? 100 : 0,
       zIndex: 10
     }), !priceSectionIds || priceSectionIds.includes(s.psId) ? s.s === _utils.statuses.WHEELCHAIR_ACCESS ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
       url: _encodedSvgs.wheelchairIcon,
-      bounds: [[seatCenter.lat - 0.11, seatCenter.lng - 0.11], [seatCenter.lat + 0.11, seatCenter.lng + 0.11]],
+      bounds: iconBounds,
       zIndex: 10
     }) : s.s === _utils.statuses.USER_PENDING && s.m ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
       url: _encodedSvgs.userIcon,
-      bounds: [[seatCenter.lat - 0.11, seatCenter.lng - 0.15], [seatCenter.lat + 0.11, seatCenter.lng + 0.15]],
+      bounds: iconBounds,
       zIndex: 10
     }) : /*#__PURE__*/_react.default.createElement(_reactLeaflet.Circle, {
       center: [seatCenter.lat, seatCenter.lng],
       pathOptions: (0, _utils.getInitialColor)(s, price, s.loading || ticketPopupOpen && (chosenSeat === null || chosenSeat === void 0 || (_chosenSeat$seat3 = chosenSeat.seat) === null || _chosenSeat$seat3 === void 0 ? void 0 : _chosenSeat$seat3.ssId) === s.ssId, !hasSeatPrices, (selectedSeats.some(selectedSeat => selectedSeat.ssId === s.ssId) || highlightedSeats.some(hs => hs.ssId === s.ssId)) && isHoveringOnSeat, greyedOutSeats.some(gs => gs.ssId === s.ssId)),
-      radius: 12000,
+      radius: seatCenter.radius,
       eventHandlers: eventHandlers
     }, s.s === _utils.statuses.UNSOLD && hasSeatPrices ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, {
       className: "ticket-popup popup-".concat(s.sId)

package/dist/components/SeatingPlan.js

@@ -9,6 +9,7 @@ require("./styles/pos.css");
 require("./styles/flexi.css");
 var _react = _interopRequireWildcard(require("react"));
 var _Map = _interopRequireDefault(require("./Map"));
+var L = _interopRequireWildcard(require("leaflet"));
 var _reactLeaflet = require("react-leaflet");
 var _utils = require("../utils");
 var _reactDom = require("react-dom");
@@ -16,6 +17,7 @@ var _PricingPopup = _interopRequireDefault(require("./PricingPopup"));
 var _SelectQuantityPopup = _interopRequireDefault(require("./SelectQuantityPopup"));
 var _RemoveMultipleSeatsPopup = _interopRequireDefault(require("./RemoveMultipleSeatsPopup"));
 var _InvalidSeatsPopup = _interopRequireDefault(require("./InvalidSeatsPopup"));
+var _constants = require("../utils/constants");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -24,8 +26,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-const SEATINGPLAN_MAX_RETRIES = 5;
-const BOOKING_MAX_RETRIES = 2;
 const SeatingPlan = _ref => {
   var _document, _document2, _document3;
   let {
@@ -147,7 +147,7 @@ const SeatingPlan = _ref => {
         }
       });
       if ((response === null || response === void 0 ? void 0 : response.status) === 429) {
-        if (retryCount < BOOKING_MAX_RETRIES) {
+        if (retryCount < _constants.BOOKING_MAX_RETRIES) {
           setRetrying(prev => [...prev, s.ssId]);
           const delay = (0, _utils.getRetryDelay)(response);
           await new Promise(resolve => setTimeout(resolve, delay));
@@ -276,7 +276,7 @@ const SeatingPlan = _ref => {
           }
         });
         if (res.status === 429) {
-          if (retryCount < BOOKING_MAX_RETRIES) {
+          if (retryCount < _constants.BOOKING_MAX_RETRIES) {
             setRetrying(prev => [...prev, seatToBook.seat.ssId]);
             const delay = (0, _utils.getRetryDelay)(res);
             await new Promise(resolve => setTimeout(resolve, delay));
@@ -455,7 +455,7 @@ const SeatingPlan = _ref => {
         }
       });
       if (response.status === 429) {
-        if (retryCount >= SEATINGPLAN_MAX_RETRIES) {
+        if (retryCount >= _constants.SEATINGPLAN_MAX_RETRIES) {
           throw new Error("We're experiencing high demand. Please try again later.");
         }
         const delay = (0, _utils.getRetryDelay)(response);
@@ -484,13 +484,17 @@ const SeatingPlan = _ref => {
         paName: s.paName
       })));
       const img = new Image();
-      const setupSeats = (height, width) => {
-        const southwest = [0, 0];
-        const northeast = [height * 0.015, width * 0.015];
+      const setupSeats = (h, w) => {
+        const lat1 = 0;
+        const lng1 = 0;
+        const lat2 = lat1 - _constants.SCALE;
+        const lng2 = lng1 + w / h * _constants.SCALE; // maintain aspect ratio
+        const southwest = [lat1, lng1];
+        const northeast = [lat2, lng2];
         setBounds([southwest, northeast]);
-        setPosition([height * 0.005, width * 0.005]);
-        setHeight(height * 0.5);
-        setWidth(width * 0.5);
+        setPosition([h, w]);
+        setHeight(h);
+        setWidth(w);
         setSeats(data);
         if (data.preventOrphanedSeats && !isReload) {
           setSelectQuantityPopupOpen(true);
@@ -578,7 +582,7 @@ const SeatingPlan = _ref => {
   }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement(_reactLeaflet.MapContainer, {
     zoomSnap: 0,
     zoomDelta: 1,
-    center: (0, _utils.calculateCenterOfMap)(height, seats.seats),
+    center: bounds && new L.LatLngBounds(bounds).getCenter(),
     zoom: undefined,
     zoomControl: true,
     scrollWheelZoom: true,

package/dist/utils/constants.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SEAT_WIDTH = exports.SEATINGPLAN_MAX_RETRIES = exports.SCALE = exports.RADIUS = exports.ONE_DEG_LAT_IN_METERS = exports.BOOKING_MAX_RETRIES = void 0;
+const SEAT_WIDTH = exports.SEAT_WIDTH = 20;
+const RADIUS = exports.RADIUS = 8;
+const SEATINGPLAN_MAX_RETRIES = exports.SEATINGPLAN_MAX_RETRIES = 5;
+const BOOKING_MAX_RETRIES = exports.BOOKING_MAX_RETRIES = 2;
+const SCALE = exports.SCALE = 0.1;
+const ONE_DEG_LAT_IN_METERS = exports.ONE_DEG_LAT_IN_METERS = 111320;

package/dist/utils/helpers.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.groupSeatsByPriceSection = exports.getValidSeats = exports.getSeatXy = exports.getSeatRadius = exports.getSeatCenterLatLng = exports.getRowSection = exports.getRetryDelay = exports.getNorthSeatLat = exports.getIsTouchScreen = exports.getInitialColor = exports.getAdjacentBookedSeats = exports.createsOrphan = exports.canSelectSingleSeatGivenOrphanRules = exports.calculateCenterOfMap = exports.NZDollar = void 0;
+exports.groupSeatsByPriceSection = exports.getValidSeats = exports.getSeatCenterLatLng = exports.getRowSection = exports.getRetryDelay = exports.getIsTouchScreen = exports.getInitialColor = exports.getAdjacentBookedSeats = exports.createsOrphan = exports.canSelectSingleSeatGivenOrphanRules = exports.NZDollar = void 0;
 var _enums = require("./enums");
+var _constants = require("./constants");
 const getIsTouchScreen = () => {
   let hasTouchScreen = false;
   if (typeof window !== "undefined") {
@@ -43,17 +44,6 @@ const getInitialColor = (s, price, loading, disabled, selected, greyedOut) => {
   };
 };
 exports.getInitialColor = getInitialColor;
-const calculateCenterOfMap = (height, seats, priceSectionIds) => {
-  const filteredSeats = (seats === null || seats === void 0 ? void 0 : seats.filter(price => !priceSectionIds || priceSectionIds.includes(price.psId))) || [];
-  const avgY = filteredSeats.reduce((acc, val) => {
-    return acc + val.y / filteredSeats.length;
-  }, 0);
-  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 > 587 ? height * 0.0201 : height > 399 ? height * 0.02035 : height * 0.0207), avgX * 0.3 + 0.15];
-};
-exports.calculateCenterOfMap = calculateCenterOfMap;
 const NZDollar = exports.NZDollar = new Intl.NumberFormat("en-NZ", {
   style: "currency",
   currency: "NZD"
@@ -283,29 +273,19 @@ const groupSeatsByPriceSection = (seats, pricing, priceSectionIds) => {
   return groupedSeats;
 };
 exports.groupSeatsByPriceSection = groupSeatsByPriceSection;
-const getNorthSeatLat = (seat, height) => {
-  return height / 33.33 - height / 33.33 * seat.y * 0.0105 + 1.4;
-};
-exports.getNorthSeatLat = getNorthSeatLat;
-const getSeatXy = (e, map) => {
-  const latlng = e.target.getLatLng();
-  const clickedSeatXy = map.latLngToContainerPoint(latlng);
-  return clickedSeatXy;
-};
-exports.getSeatXy = getSeatXy;
-const getSeatRadius = (e, map) => {
-  const latlng = e.target.getLatLng();
-  const radius = e.target.getRadius();
-  const point1 = map.latLngToLayerPoint(latlng);
-  const point2 = map.latLngToLayerPoint([latlng.lat, latlng.lng + radius / 111320]); // Approx. conversion
-  const pixelRadius = Math.abs(point2.x - point1.x);
-  return pixelRadius;
-};
-exports.getSeatRadius = getSeatRadius;
-const getSeatCenterLatLng = (seat, isIcon, height) => {
+const getSeatCenterLatLng = (seat, imgHeight, imgWidth, imgBounds) => {
+  const x = seat.x * _constants.SEAT_WIDTH + _constants.SEAT_WIDTH / 2;
+  const y = seat.y * _constants.SEAT_WIDTH + _constants.SEAT_WIDTH / 2;
+  const [lat1, lng1] = imgBounds[0];
+  const [lat2, lng2] = imgBounds[1];
+  const lat = lat1 + (lat2 - lat1) * (y / imgHeight);
+  const lng = lng1 + (lng2 - lng1) * (x / imgWidth);
+  const radius = Math.abs(lat1 + (lat2 - lat1) * (_constants.RADIUS / imgHeight) * _constants.ONE_DEG_LAT_IN_METERS); // Circle requires radius in meters
+
   return {
-    lat: height * 0.05 - seat.y / (height > 800 ? height > 999 ? isIcon ? 3.5 : 3.45 : 3.3 : 3.35) - (height > 800 ? height > 999 ? height * 0.0201 : height * 0.0198 : height > 587 ? height * 0.0201 : height > 399 ? height * 0.02035 : height * 0.0207),
-    lng: seat.x * 0.3 + 0.15
+    lat,
+    lng,
+    radius
   };
 };
 exports.getSeatCenterLatLng = getSeatCenterLatLng;

package/package.json

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