@blaze-cms/plugin-google-maps-fe 0.123.0-alpha.24 → 0.123.0-alpha.28

package/lib-es/GoogleMaps/GoogleMaps.js

@@ -1,35 +1,67 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-const _excluded = ["router", "data", "type", "name", "modifier", "elementTitle", "entityGroups", "imageData", "onMount", "onMountProps"];
+const _excluded = ["type", "name", "modifier", "elementTitle", "imageData", "onMount", "onMountProps", "parent", "mapShapes", "centerCoordinates"];
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { withRouter } from 'next/router';
+import { useRouter } from 'next/router';
 import { withTitle } from '@blaze-cms/react-page-builder';
 import { useInView } from '@blaze-react/utils/lib/customHooks';
 import { functions, isEqual, omit } from 'lodash';
 import { setMapOptions, addZoomListener } from './helpers';
 import { GOOGLE_MAPS_SCRIPT, LOAD, SCRIPT, IN_VIEW_CONFIG } from '../constants';
 
+const shouldNotUpdate = (props, nextProps) => {
+  const [funcs, nextFuncs] = [functions(props), functions(nextProps)];
+  const noPropChange = isEqual(omit(props, funcs), omit(nextProps, nextFuncs));
+  const noFuncChange = funcs.length === nextFuncs.length && funcs.every(fn => props[fn].toString() === nextProps[fn].toString());
+  return noPropChange && noFuncChange;
+};
+
 const GoogleMaps = _ref => {
   let {
-    router,
-    data,
     type,
     name,
     modifier,
     elementTitle,
-    entityGroups,
     imageData,
     onMount,
-    onMountProps
+    onMountProps,
+    parent,
+    mapShapes,
+    centerCoordinates
   } = _ref,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
+  const router = useRouter();
   const [isIntersecting, mapRef] = useInView(IN_VIEW_CONFIG);
   const [map, setMap] = useState();
   useEffect(() => {
     const options = setMapOptions(otherProps);
 
-    const onLoad = () => setMap(new window.google.maps.Map(mapRef.current, options));
+    const onLoad = () => {
+      const initialMap = new window.google.maps.Map(mapRef.current, options);
+
+      if (centerCoordinates.length === 1) {
+        const [{
+          latitude: lat,
+          longitude: lng
+        }] = centerCoordinates;
+        initialMap.setCenter({
+          lat,
+          lng
+        });
+      } else {
+        const bounds = new window.google.maps.LatLngBounds();
+        centerCoordinates.forEach(({
+          latitude,
+          longitude
+        }) => {
+          bounds.extend(new window.google.maps.LatLng(latitude, longitude));
+        });
+        initialMap.fitBounds(bounds);
+      }
+
+      setMap(initialMap);
+    };
 
     if (!window.google) {
       const script = document.createElement(SCRIPT);
@@ -62,42 +94,36 @@ const GoogleMaps = _ref => {
     return () => {}; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   if (map && typeof onMount === `function`) onMount(map, onMountProps);
-  if (isIntersecting) addZoomListener(map, router, data, imageData, entityGroups);
+  if (isIntersecting) addZoomListener(map, router, mapShapes, imageData);
   return /*#__PURE__*/React.createElement("div", {
     className: "google-maps",
     ref: mapRef
   });
 };
 
-const shouldNotUpdate = (props, nextProps) => {
-  const [funcs, nextFuncs] = [functions(props), functions(nextProps)];
-  const noPropChange = isEqual(omit(props, funcs), omit(nextProps, nextFuncs));
-  const noFuncChange = funcs.length === nextFuncs.length && funcs.every(fn => props[fn].toString() === nextProps[fn].toString());
-  return noPropChange && noFuncChange;
-};
-
 GoogleMaps.propTypes = {
-  router: PropTypes.object.isRequired,
-  data: PropTypes.object,
-  imageData: PropTypes.object,
+  mapShapes: PropTypes.array,
+  imageData: PropTypes.array,
   type: PropTypes.string,
   name: PropTypes.string,
   modifier: PropTypes.string,
   elementTitle: PropTypes.string,
-  entityGroups: PropTypes.array,
   onMount: PropTypes.func,
-  onMountProps: PropTypes.object
+  onMountProps: PropTypes.object,
+  parent: PropTypes.object,
+  centerCoordinates: PropTypes.array
 };
 GoogleMaps.defaultProps = {
-  data: {},
-  imageData: {},
+  mapShapes: [],
+  imageData: [],
+  centerCoordinates: [],
   type: '',
   name: '',
   modifier: '',
   elementTitle: '',
-  entityGroups: [],
   onMount: null,
-  onMountProps: null
+  onMountProps: null,
+  parent: {}
 };
-export default React.memo(withRouter(withTitle(GoogleMaps)), shouldNotUpdate);
+export default React.memo(withTitle(GoogleMaps), shouldNotUpdate);
 //# sourceMappingURL=GoogleMaps.js.map

package/lib-es/GoogleMaps/GoogleMaps.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/GoogleMaps/GoogleMaps.js"],"names":["React","useEffect","useState","PropTypes","withRouter","withTitle","useInView","functions","isEqual","omit","setMapOptions","addZoomListener","GOOGLE_MAPS_SCRIPT","LOAD","SCRIPT","IN_VIEW_CONFIG","GoogleMaps","router","data","type","name","modifier","elementTitle","entityGroups","imageData","onMount","onMountProps","otherProps","isIntersecting","mapRef","map","setMap","options","onLoad","window","google","maps","Map","current","script","document","createElement","src","process","env","GOOGLE_MAPS_API_KEY","head","append","addEventListener","removeEventListener","setOptions","enableGeolocation","shouldActivateGeolocation","navigator","geolocation","getCurrentPosition","position","center","lat","coords","latitude","lng","longitude","setCenter","shouldNotUpdate","props","nextProps","funcs","nextFuncs","noPropChange","noFuncChange","length","every","fn","toString","propTypes","object","isRequired","string","array","func","defaultProps","memo"],"mappings":"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","sourcesContent":["import React, { useEffect, useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { withRouter } from 'next/router';\nimport { withTitle } from '@blaze-cms/react-page-builder';\nimport { useInView } from '@blaze-react/utils/lib/customHooks';\nimport { functions, isEqual, omit } from 'lodash';\nimport { setMapOptions, addZoomListener } from './helpers';\nimport { GOOGLE_MAPS_SCRIPT, LOAD, SCRIPT, IN_VIEW_CONFIG } from '../constants';\n\nconst GoogleMaps = ({\n  router,\n  data,\n  type,\n  name,\n  modifier,\n  elementTitle,\n  entityGroups,\n  imageData,\n  onMount,\n  onMountProps,\n  ...otherProps\n}) => {\n  const [isIntersecting, mapRef] = useInView(IN_VIEW_CONFIG);\n  const [map, setMap] = useState();\n\n  useEffect(() => {\n    const options = setMapOptions(otherProps);\n    const onLoad = () => setMap(new window.google.maps.Map(mapRef.current, options));\n\n    if (!window.google) {\n      const script = document.createElement(SCRIPT);\n      script.src = `${GOOGLE_MAPS_SCRIPT}${process.env.GOOGLE_MAPS_API_KEY}`;\n      document.head.append(script);\n      script.addEventListener(LOAD, onLoad);\n      return () => script.removeEventListener(LOAD, onLoad);\n    }\n\n    onLoad();\n\n    if (map) {\n      map.setOptions(options);\n\n      const { enableGeolocation } = otherProps;\n      const shouldActivateGeolocation = enableGeolocation && navigator.geolocation;\n      if (shouldActivateGeolocation) {\n        navigator.geolocation.getCurrentPosition(\n          position => {\n            const center = {\n              lat: position.coords.latitude,\n              lng: position.coords.longitude\n            };\n\n            map.setCenter(center);\n          },\n          () => {}\n        );\n      }\n    }\n\n    return () => {};\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n\n  if (map && typeof onMount === `function`) onMount(map, onMountProps);\n\n  if (isIntersecting) addZoomListener(map, router, data, imageData, entityGroups);\n\n  return <div className=\"google-maps\" ref={mapRef} />;\n};\n\nconst shouldNotUpdate = (props, nextProps) => {\n  const [funcs, nextFuncs] = [functions(props), functions(nextProps)];\n  const noPropChange = isEqual(omit(props, funcs), omit(nextProps, nextFuncs));\n  const noFuncChange =\n    funcs.length === nextFuncs.length &&\n    funcs.every(fn => props[fn].toString() === nextProps[fn].toString());\n  return noPropChange && noFuncChange;\n};\n\nGoogleMaps.propTypes = {\n  router: PropTypes.object.isRequired,\n  data: PropTypes.object,\n  imageData: PropTypes.object,\n  type: PropTypes.string,\n  name: PropTypes.string,\n  modifier: PropTypes.string,\n  elementTitle: PropTypes.string,\n  entityGroups: PropTypes.array,\n  onMount: PropTypes.func,\n  onMountProps: PropTypes.object\n};\n\nGoogleMaps.defaultProps = {\n  data: {},\n  imageData: {},\n  type: '',\n  name: '',\n  modifier: '',\n  elementTitle: '',\n  entityGroups: [],\n  onMount: null,\n  onMountProps: null\n};\n\nexport default React.memo(withRouter(withTitle(GoogleMaps)), shouldNotUpdate);\n"],"file":"GoogleMaps.js"}
+{"version":3,"sources":["../../src/GoogleMaps/GoogleMaps.js"],"names":["React","useEffect","useState","PropTypes","useRouter","withTitle","useInView","functions","isEqual","omit","setMapOptions","addZoomListener","GOOGLE_MAPS_SCRIPT","LOAD","SCRIPT","IN_VIEW_CONFIG","shouldNotUpdate","props","nextProps","funcs","nextFuncs","noPropChange","noFuncChange","length","every","fn","toString","GoogleMaps","type","name","modifier","elementTitle","imageData","onMount","onMountProps","parent","mapShapes","centerCoordinates","otherProps","router","isIntersecting","mapRef","map","setMap","options","onLoad","initialMap","window","google","maps","Map","current","latitude","lat","longitude","lng","setCenter","bounds","LatLngBounds","forEach","extend","LatLng","fitBounds","script","document","createElement","src","process","env","GOOGLE_MAPS_API_KEY","head","append","addEventListener","removeEventListener","setOptions","enableGeolocation","shouldActivateGeolocation","navigator","geolocation","getCurrentPosition","position","center","coords","propTypes","array","string","func","object","defaultProps","memo"],"mappings":";;AAAA,OAAOA,KAAP,IAAgBC,SAAhB,EAA2BC,QAA3B,QAA2C,OAA3C;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,SAASC,SAAT,QAA0B,aAA1B;AACA,SAASC,SAAT,QAA0B,+BAA1B;AACA,SAASC,SAAT,QAA0B,oCAA1B;AACA,SAASC,SAAT,EAAoBC,OAApB,EAA6BC,IAA7B,QAAyC,QAAzC;AACA,SAASC,aAAT,EAAwBC,eAAxB,QAA+C,WAA/C;AACA,SAASC,kBAAT,EAA6BC,IAA7B,EAAmCC,MAAnC,EAA2CC,cAA3C,QAAiE,cAAjE;;AAEA,MAAMC,eAAe,GAAG,CAACC,KAAD,EAAQC,SAAR,KAAsB;AAC5C,QAAM,CAACC,KAAD,EAAQC,SAAR,IAAqB,CAACb,SAAS,CAACU,KAAD,CAAV,EAAmBV,SAAS,CAACW,SAAD,CAA5B,CAA3B;AACA,QAAMG,YAAY,GAAGb,OAAO,CAACC,IAAI,CAACQ,KAAD,EAAQE,KAAR,CAAL,EAAqBV,IAAI,CAACS,SAAD,EAAYE,SAAZ,CAAzB,CAA5B;AACA,QAAME,YAAY,GAChBH,KAAK,CAACI,MAAN,KAAiBH,SAAS,CAACG,MAA3B,IACAJ,KAAK,CAACK,KAAN,CAAYC,EAAE,IAAIR,KAAK,CAACQ,EAAD,CAAL,CAAUC,QAAV,OAAyBR,SAAS,CAACO,EAAD,CAAT,CAAcC,QAAd,EAA3C,CAFF;AAGA,SAAOL,YAAY,IAAIC,YAAvB;AACD,CAPD;;AASA,MAAMK,UAAU,GAAG,QAYb;AAAA,MAZc;AAClBC,IAAAA,IADkB;AAElBC,IAAAA,IAFkB;AAGlBC,IAAAA,QAHkB;AAIlBC,IAAAA,YAJkB;AAKlBC,IAAAA,SALkB;AAMlBC,IAAAA,OANkB;AAOlBC,IAAAA,YAPkB;AAQlBC,IAAAA,MARkB;AASlBC,IAAAA,SATkB;AAUlBC,IAAAA;AAVkB,GAYd;AAAA,MADDC,UACC;;AACJ,QAAMC,MAAM,GAAGnC,SAAS,EAAxB;AACA,QAAM,CAACoC,cAAD,EAAiBC,MAAjB,IAA2BnC,SAAS,CAACS,cAAD,CAA1C;AACA,QAAM,CAAC2B,GAAD,EAAMC,MAAN,IAAgBzC,QAAQ,EAA9B;AAEAD,EAAAA,SAAS,CAAC,MAAM;AACd,UAAM2C,OAAO,GAAGlC,aAAa,CAAC4B,UAAD,CAA7B;;AACA,UAAMO,MAAM,GAAG,MAAM;AACnB,YAAMC,UAAU,GAAG,IAAIC,MAAM,CAACC,MAAP,CAAcC,IAAd,CAAmBC,GAAvB,CAA2BT,MAAM,CAACU,OAAlC,EAA2CP,OAA3C,CAAnB;;AACA,UAAIP,iBAAiB,CAACd,MAAlB,KAA6B,CAAjC,EAAoC;AAClC,cAAM,CAAC;AAAE6B,UAAAA,QAAQ,EAAEC,GAAZ;AAAiBC,UAAAA,SAAS,EAAEC;AAA5B,SAAD,IAAsClB,iBAA5C;AACAS,QAAAA,UAAU,CAACU,SAAX,CAAqB;AAAEH,UAAAA,GAAF;AAAOE,UAAAA;AAAP,SAArB;AACD,OAHD,MAGO;AACL,cAAME,MAAM,GAAG,IAAIV,MAAM,CAACC,MAAP,CAAcC,IAAd,CAAmBS,YAAvB,EAAf;AACArB,QAAAA,iBAAiB,CAACsB,OAAlB,CAA0B,CAAC;AAAEP,UAAAA,QAAF;AAAYE,UAAAA;AAAZ,SAAD,KAA6B;AACrDG,UAAAA,MAAM,CAACG,MAAP,CAAc,IAAIb,MAAM,CAACC,MAAP,CAAcC,IAAd,CAAmBY,MAAvB,CAA8BT,QAA9B,EAAwCE,SAAxC,CAAd;AACD,SAFD;AAGAR,QAAAA,UAAU,CAACgB,SAAX,CAAqBL,MAArB;AACD;;AACDd,MAAAA,MAAM,CAACG,UAAD,CAAN;AACD,KAbD;;AAeA,QAAI,CAACC,MAAM,CAACC,MAAZ,EAAoB;AAClB,YAAMe,MAAM,GAAGC,QAAQ,CAACC,aAAT,CAAuBnD,MAAvB,CAAf;AACAiD,MAAAA,MAAM,CAACG,GAAP,GAAc,GAAEtD,kBAAmB,GAAEuD,OAAO,CAACC,GAAR,CAAYC,mBAAoB,EAArE;AACAL,MAAAA,QAAQ,CAACM,IAAT,CAAcC,MAAd,CAAqBR,MAArB;AACAA,MAAAA,MAAM,CAACS,gBAAP,CAAwB3D,IAAxB,EAA8BgC,MAA9B;AACA,aAAO,MAAMkB,MAAM,CAACU,mBAAP,CAA2B5D,IAA3B,EAAiCgC,MAAjC,CAAb;AACD;;AAEDA,IAAAA,MAAM;;AAEN,QAAIH,GAAJ,EAAS;AACPA,MAAAA,GAAG,CAACgC,UAAJ,CAAe9B,OAAf;AACA,YAAM;AAAE+B,QAAAA;AAAF,UAAwBrC,UAA9B;AACA,YAAMsC,yBAAyB,GAAGD,iBAAiB,IAAIE,SAAS,CAACC,WAAjE;;AACA,UAAIF,yBAAJ,EAA+B;AAC7BC,QAAAA,SAAS,CAACC,WAAV,CAAsBC,kBAAtB,CACEC,QAAQ,IAAI;AACV,gBAAMC,MAAM,GAAG;AACb5B,YAAAA,GAAG,EAAE2B,QAAQ,CAACE,MAAT,CAAgB9B,QADR;AAEbG,YAAAA,GAAG,EAAEyB,QAAQ,CAACE,MAAT,CAAgB5B;AAFR,WAAf;AAKAZ,UAAAA,GAAG,CAACc,SAAJ,CAAcyB,MAAd;AACD,SARH,EASE,MAAM,CAAE,CATV;AAWD;AACF;;AAED,WAAO,MAAM,CAAE,CAAf,CA9Cc,CA+Cd;AACD,GAhDQ,EAgDN,EAhDM,CAAT;AAkDA,MAAIvC,GAAG,IAAI,OAAOT,OAAP,KAAoB,UAA/B,EAA0CA,OAAO,CAACS,GAAD,EAAMR,YAAN,CAAP;AAC1C,MAAIM,cAAJ,EAAoB7B,eAAe,CAAC+B,GAAD,EAAMH,MAAN,EAAcH,SAAd,EAAyBJ,SAAzB,CAAf;AAEpB,sBAAO;AAAK,IAAA,SAAS,EAAC,aAAf;AAA6B,IAAA,GAAG,EAAES;AAAlC,IAAP;AACD,CAvED;;AAyEAd,UAAU,CAACwD,SAAX,GAAuB;AACrB/C,EAAAA,SAAS,EAAEjC,SAAS,CAACiF,KADA;AAErBpD,EAAAA,SAAS,EAAE7B,SAAS,CAACiF,KAFA;AAGrBxD,EAAAA,IAAI,EAAEzB,SAAS,CAACkF,MAHK;AAIrBxD,EAAAA,IAAI,EAAE1B,SAAS,CAACkF,MAJK;AAKrBvD,EAAAA,QAAQ,EAAE3B,SAAS,CAACkF,MALC;AAMrBtD,EAAAA,YAAY,EAAE5B,SAAS,CAACkF,MANH;AAOrBpD,EAAAA,OAAO,EAAE9B,SAAS,CAACmF,IAPE;AAQrBpD,EAAAA,YAAY,EAAE/B,SAAS,CAACoF,MARH;AASrBpD,EAAAA,MAAM,EAAEhC,SAAS,CAACoF,MATG;AAUrBlD,EAAAA,iBAAiB,EAAElC,SAAS,CAACiF;AAVR,CAAvB;AAaAzD,UAAU,CAAC6D,YAAX,GAA0B;AACxBpD,EAAAA,SAAS,EAAE,EADa;AAExBJ,EAAAA,SAAS,EAAE,EAFa;AAGxBK,EAAAA,iBAAiB,EAAE,EAHK;AAIxBT,EAAAA,IAAI,EAAE,EAJkB;AAKxBC,EAAAA,IAAI,EAAE,EALkB;AAMxBC,EAAAA,QAAQ,EAAE,EANc;AAOxBC,EAAAA,YAAY,EAAE,EAPU;AAQxBE,EAAAA,OAAO,EAAE,IARe;AASxBC,EAAAA,YAAY,EAAE,IATU;AAUxBC,EAAAA,MAAM,EAAE;AAVgB,CAA1B;AAaA,eAAenC,KAAK,CAACyF,IAAN,CAAWpF,SAAS,CAACsB,UAAD,CAApB,EAAkCX,eAAlC,CAAf","sourcesContent":["import React, { useEffect, useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { useRouter } from 'next/router';\nimport { withTitle } from '@blaze-cms/react-page-builder';\nimport { useInView } from '@blaze-react/utils/lib/customHooks';\nimport { functions, isEqual, omit } from 'lodash';\nimport { setMapOptions, addZoomListener } from './helpers';\nimport { GOOGLE_MAPS_SCRIPT, LOAD, SCRIPT, IN_VIEW_CONFIG } from '../constants';\n\nconst shouldNotUpdate = (props, nextProps) => {\n  const [funcs, nextFuncs] = [functions(props), functions(nextProps)];\n  const noPropChange = isEqual(omit(props, funcs), omit(nextProps, nextFuncs));\n  const noFuncChange =\n    funcs.length === nextFuncs.length &&\n    funcs.every(fn => props[fn].toString() === nextProps[fn].toString());\n  return noPropChange && noFuncChange;\n};\n\nconst GoogleMaps = ({\n  type,\n  name,\n  modifier,\n  elementTitle,\n  imageData,\n  onMount,\n  onMountProps,\n  parent,\n  mapShapes,\n  centerCoordinates,\n  ...otherProps\n}) => {\n  const router = useRouter();\n  const [isIntersecting, mapRef] = useInView(IN_VIEW_CONFIG);\n  const [map, setMap] = useState();\n\n  useEffect(() => {\n    const options = setMapOptions(otherProps);\n    const onLoad = () => {\n      const initialMap = new window.google.maps.Map(mapRef.current, options);\n      if (centerCoordinates.length === 1) {\n        const [{ latitude: lat, longitude: lng }] = centerCoordinates;\n        initialMap.setCenter({ lat, lng });\n      } else {\n        const bounds = new window.google.maps.LatLngBounds();\n        centerCoordinates.forEach(({ latitude, longitude }) => {\n          bounds.extend(new window.google.maps.LatLng(latitude, longitude));\n        });\n        initialMap.fitBounds(bounds);\n      }\n      setMap(initialMap);\n    };\n\n    if (!window.google) {\n      const script = document.createElement(SCRIPT);\n      script.src = `${GOOGLE_MAPS_SCRIPT}${process.env.GOOGLE_MAPS_API_KEY}`;\n      document.head.append(script);\n      script.addEventListener(LOAD, onLoad);\n      return () => script.removeEventListener(LOAD, onLoad);\n    }\n\n    onLoad();\n\n    if (map) {\n      map.setOptions(options);\n      const { enableGeolocation } = otherProps;\n      const shouldActivateGeolocation = enableGeolocation && navigator.geolocation;\n      if (shouldActivateGeolocation) {\n        navigator.geolocation.getCurrentPosition(\n          position => {\n            const center = {\n              lat: position.coords.latitude,\n              lng: position.coords.longitude\n            };\n\n            map.setCenter(center);\n          },\n          () => {}\n        );\n      }\n    }\n\n    return () => {};\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n\n  if (map && typeof onMount === `function`) onMount(map, onMountProps);\n  if (isIntersecting) addZoomListener(map, router, mapShapes, imageData);\n\n  return <div className=\"google-maps\" ref={mapRef} />;\n};\n\nGoogleMaps.propTypes = {\n  mapShapes: PropTypes.array,\n  imageData: PropTypes.array,\n  type: PropTypes.string,\n  name: PropTypes.string,\n  modifier: PropTypes.string,\n  elementTitle: PropTypes.string,\n  onMount: PropTypes.func,\n  onMountProps: PropTypes.object,\n  parent: PropTypes.object,\n  centerCoordinates: PropTypes.array\n};\n\nGoogleMaps.defaultProps = {\n  mapShapes: [],\n  imageData: [],\n  centerCoordinates: [],\n  type: '',\n  name: '',\n  modifier: '',\n  elementTitle: '',\n  onMount: null,\n  onMountProps: null,\n  parent: {}\n};\n\nexport default React.memo(withTitle(GoogleMaps), shouldNotUpdate);\n"],"file":"GoogleMaps.js"}

package/lib-es/GoogleMaps/GoogleMapsFactory.js

@@ -1,15 +1,16 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-const _excluded = ["entityGroups"];
+const _excluded = ["entityGroups", "parent"];
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useGetEntitySchemasAsObj } from '@blaze-cms/react-page-builder';
-import { setEntityConfigs } from './helpers';
+import { buildShapesConfig } from './helpers';
 import GoogleMapsRender from './GoogleMapsRender';
 
 const GoogleMapsFactory = _ref => {
   let {
-    entityGroups
+    entityGroups,
+    parent
   } = _ref,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
@@ -22,17 +23,20 @@ const GoogleMapsFactory = _ref => {
   }) => entity));
   if (loading) return '';
   if (error) return error.message;
-  const entityConfigs = setEntityConfigs(data, entityGroups);
+  const shapeConfigs = buildShapesConfig(data, entityGroups, parent);
   return /*#__PURE__*/React.createElement(GoogleMapsRender, _extends({
-    entityConfigs: entityConfigs,
-    entityGroups: entityGroups
+    shapeConfigs: shapeConfigs,
+    entityGroups: entityGroups,
+    parent: parent
   }, otherProps));
 };
 
 GoogleMapsFactory.propTypes = {
+  parent: PropTypes.object,
   entityGroups: PropTypes.array
 };
 GoogleMapsFactory.defaultProps = {
+  parent: {},
   entityGroups: []
 };
 export default GoogleMapsFactory;

package/lib-es/GoogleMaps/GoogleMapsFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/GoogleMaps/GoogleMapsFactory.js"],"names":["React","PropTypes","useGetEntitySchemasAsObj","setEntityConfigs","GoogleMapsRender","GoogleMapsFactory","entityGroups","otherProps","data","loading","error","map","entity","message","entityConfigs","propTypes","array","defaultProps"],"mappings":";;;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,SAASC,wBAAT,QAAyC,+BAAzC;AACA,SAASC,gBAAT,QAAiC,WAAjC;AACA,OAAOC,gBAAP,MAA6B,oBAA7B;;AAEA,MAAMC,iBAAiB,GAAG,QAAqC;AAAA,MAApC;AAAEC,IAAAA;AAAF,GAAoC;AAAA,MAAjBC,UAAiB;;AAC7D,QAAM;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,OAAR;AAAiBC,IAAAA;AAAjB,MAA2BR,wBAAwB,CACvDI,YAAY,CAACK,GAAb,CAAiB,CAAC;AAAEC,IAAAA;AAAF,GAAD,KAAgBA,MAAjC,CADuD,CAAzD;AAIA,MAAIH,OAAJ,EAAa,OAAO,EAAP;AACb,MAAIC,KAAJ,EAAW,OAAOA,KAAK,CAACG,OAAb;AAEX,QAAMC,aAAa,GAAGX,gBAAgB,CAACK,IAAD,EAAOF,YAAP,CAAtC;AAEA,sBACE,oBAAC,gBAAD;AAAkB,IAAA,aAAa,EAAEQ,aAAjC;AAAgD,IAAA,YAAY,EAAER;AAA9D,KAAgFC,UAAhF,EADF;AAGD,CAbD;;AAeAF,iBAAiB,CAACU,SAAlB,GAA8B;AAC5BT,EAAAA,YAAY,EAAEL,SAAS,CAACe;AADI,CAA9B;AAIAX,iBAAiB,CAACY,YAAlB,GAAiC;AAC/BX,EAAAA,YAAY,EAAE;AADiB,CAAjC;AAIA,eAAeD,iBAAf","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { useGetEntitySchemasAsObj } from '@blaze-cms/react-page-builder';\nimport { setEntityConfigs } from './helpers';\nimport GoogleMapsRender from './GoogleMapsRender';\n\nconst GoogleMapsFactory = ({ entityGroups, ...otherProps }) => {\n  const { data, loading, error } = useGetEntitySchemasAsObj(\n    entityGroups.map(({ entity }) => entity)\n  );\n\n  if (loading) return '';\n  if (error) return error.message;\n\n  const entityConfigs = setEntityConfigs(data, entityGroups);\n\n  return (\n    <GoogleMapsRender entityConfigs={entityConfigs} entityGroups={entityGroups} {...otherProps} />\n  );\n};\n\nGoogleMapsFactory.propTypes = {\n  entityGroups: PropTypes.array\n};\n\nGoogleMapsFactory.defaultProps = {\n  entityGroups: []\n};\n\nexport default GoogleMapsFactory;\n"],"file":"GoogleMapsFactory.js"}
+{"version":3,"sources":["../../src/GoogleMaps/GoogleMapsFactory.js"],"names":["React","PropTypes","useGetEntitySchemasAsObj","buildShapesConfig","GoogleMapsRender","GoogleMapsFactory","entityGroups","parent","otherProps","data","loading","error","map","entity","message","shapeConfigs","propTypes","object","array","defaultProps"],"mappings":";;;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,SAASC,wBAAT,QAAyC,+BAAzC;AACA,SAASC,iBAAT,QAAkC,WAAlC;AACA,OAAOC,gBAAP,MAA6B,oBAA7B;;AAEA,MAAMC,iBAAiB,GAAG,QAA6C;AAAA,MAA5C;AAAEC,IAAAA,YAAF;AAAgBC,IAAAA;AAAhB,GAA4C;AAAA,MAAjBC,UAAiB;;AACrE,QAAM;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,OAAR;AAAiBC,IAAAA;AAAjB,MAA2BT,wBAAwB,CACvDI,YAAY,CAACM,GAAb,CAAiB,CAAC;AAAEC,IAAAA;AAAF,GAAD,KAAgBA,MAAjC,CADuD,CAAzD;AAIA,MAAIH,OAAJ,EAAa,OAAO,EAAP;AACb,MAAIC,KAAJ,EAAW,OAAOA,KAAK,CAACG,OAAb;AAEX,QAAMC,YAAY,GAAGZ,iBAAiB,CAACM,IAAD,EAAOH,YAAP,EAAqBC,MAArB,CAAtC;AAEA,sBACE,oBAAC,gBAAD;AACE,IAAA,YAAY,EAAEQ,YADhB;AAEE,IAAA,YAAY,EAAET,YAFhB;AAGE,IAAA,MAAM,EAAEC;AAHV,KAIMC,UAJN,EADF;AAQD,CAlBD;;AAoBAH,iBAAiB,CAACW,SAAlB,GAA8B;AAC5BT,EAAAA,MAAM,EAAEN,SAAS,CAACgB,MADU;AAE5BX,EAAAA,YAAY,EAAEL,SAAS,CAACiB;AAFI,CAA9B;AAKAb,iBAAiB,CAACc,YAAlB,GAAiC;AAC/BZ,EAAAA,MAAM,EAAE,EADuB;AAE/BD,EAAAA,YAAY,EAAE;AAFiB,CAAjC;AAKA,eAAeD,iBAAf","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { useGetEntitySchemasAsObj } from '@blaze-cms/react-page-builder';\nimport { buildShapesConfig } from './helpers';\nimport GoogleMapsRender from './GoogleMapsRender';\n\nconst GoogleMapsFactory = ({ entityGroups, parent, ...otherProps }) => {\n  const { data, loading, error } = useGetEntitySchemasAsObj(\n    entityGroups.map(({ entity }) => entity)\n  );\n\n  if (loading) return '';\n  if (error) return error.message;\n\n  const shapeConfigs = buildShapesConfig(data, entityGroups, parent);\n\n  return (\n    <GoogleMapsRender\n      shapeConfigs={shapeConfigs}\n      entityGroups={entityGroups}\n      parent={parent}\n      {...otherProps}\n    />\n  );\n};\n\nGoogleMapsFactory.propTypes = {\n  parent: PropTypes.object,\n  entityGroups: PropTypes.array\n};\n\nGoogleMapsFactory.defaultProps = {\n  parent: {},\n  entityGroups: []\n};\n\nexport default GoogleMapsFactory;\n"],"file":"GoogleMapsFactory.js"}

package/lib-es/GoogleMaps/GoogleMapsRender.js

@@ -1,78 +1,70 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-const _excluded = ["entityConfigs", "entityGroups", "id", "parent"];
+const _excluded = ["shapeConfigs", "entityGroups", "id"];
 import React from 'react';
 import PropTypes from 'prop-types';
 import isNumber from 'lodash.isnumber';
 import { useQuery } from '@apollo/client';
 import { getAction } from '@blaze-cms/react-page-builder';
 import { useGetImages } from './hooks';
-import { buildQuery, getImageIds } from './helpers';
+import { buildQuery, getImageIds, getCenterCoordinates, buildMapShapes } from './helpers';
 import GoogleMaps from './GoogleMaps';
 const defaultQuery = getAction('getPublishedPages', 'id');
 
 const GoogleMapsRender = _ref => {
   let {
-    entityConfigs,
+    shapeConfigs,
     entityGroups,
-    id,
-    parent
+    id
   } = _ref,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   const {
-    centerLatitude,
-    centerLongitude,
     defaultZoom
   } = otherProps;
   const {
-    query,
-    ids
-  } = buildQuery(entityConfigs);
-  const shouldDisplayMap = [centerLatitude, centerLongitude, defaultZoom].every(value => isNumber(value));
+    query
+  } = buildQuery(shapeConfigs);
   const {
-    data = {},
+    data,
     loading,
     error
   } = useQuery(query || defaultQuery, {
-    variables: {
-      where: {
-        id: {
-          _in: ids
-        }
-      }
-    },
-    skip: !(ids.length && query)
+    skip: !query
   });
-  const imageIds = getImageIds(entityConfigs, data);
+  const mapShapes = buildMapShapes(shapeConfigs, data);
+  const imageIds = getImageIds(mapShapes);
   const {
-    data: imageData = {},
-    loading: _loading,
-    error: _error
+    data: {
+      getFiles: imageData
+    } = {},
+    loading: imagesLoading,
+    error: imagesError
   } = useGetImages(imageIds);
-  if (loading || _loading) return '';
-  if (error || _error) return null;
+  if (loading || imagesLoading) return '';
+  if (error || imagesError) return null;
+  const centerCoordinates = getCenterCoordinates(mapShapes, otherProps);
+  const shouldDisplayMap = isNumber(defaultZoom) && !!centerCoordinates.length && !!mapShapes.length;
   if (!shouldDisplayMap) return null;
   return /*#__PURE__*/React.createElement(GoogleMaps, _extends({
     key: otherProps.slug,
-    data: data,
-    imageData: imageData,
-    entityGroups: entityGroups
+    centerCoordinates: centerCoordinates,
+    mapShapes: mapShapes,
+    imageData: imageData
   }, otherProps));
 };
 
 GoogleMapsRender.propTypes = {
-  parent: PropTypes.object.isRequired,
   entityGroups: PropTypes.array,
   id: PropTypes.string,
-  entityConfigs: PropTypes.object,
+  shapeConfigs: PropTypes.array,
   centerLatitude: PropTypes.number,
   centerLongitude: PropTypes.number,
   defaultZoom: PropTypes.number
 };
 GoogleMapsRender.defaultProps = {
   entityGroups: [],
-  entityConfigs: {},
+  shapeConfigs: [],
   id: '',
   centerLatitude: null,
   centerLongitude: null,

package/lib-es/GoogleMaps/GoogleMapsRender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/GoogleMaps/GoogleMapsRender.js"],"names":["React","PropTypes","isNumber","useQuery","getAction","useGetImages","buildQuery","getImageIds","GoogleMaps","defaultQuery","GoogleMapsRender","entityConfigs","entityGroups","id","parent","otherProps","centerLatitude","centerLongitude","defaultZoom","query","ids","shouldDisplayMap","every","value","data","loading","error","variables","where","_in","skip","length","imageIds","imageData","_loading","_error","slug","propTypes","object","isRequired","array","string","number","defaultProps"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport isNumber from 'lodash.isnumber';\nimport { useQuery } from '@apollo/client';\nimport { getAction } from '@blaze-cms/react-page-builder';\nimport { useGetImages } from './hooks';\nimport { buildQuery, getImageIds } from './helpers';\nimport GoogleMaps from './GoogleMaps';\n\nconst defaultQuery = getAction('getPublishedPages', 'id');\n\nconst GoogleMapsRender = ({ entityConfigs, entityGroups, id, parent, ...otherProps }) => {\n  const { centerLatitude, centerLongitude, defaultZoom } = otherProps;\n  const { query, ids } = buildQuery(entityConfigs);\n  const shouldDisplayMap = [centerLatitude, centerLongitude, defaultZoom].every(value =>\n    isNumber(value)\n  );\n\n  const { data = {}, loading, error } = useQuery(query || defaultQuery, {\n    variables: { where: { id: { _in: ids } } },\n    skip: !(ids.length && query)\n  });\n\n  const imageIds = getImageIds(entityConfigs, data);\n  const { data: imageData = {}, loading: _loading, error: _error } = useGetImages(imageIds);\n\n  if (loading || _loading) return '';\n  if (error || _error) return null;\n  if (!shouldDisplayMap) return null;\n\n  return (\n    <GoogleMaps\n      key={otherProps.slug}\n      data={data}\n      imageData={imageData}\n      entityGroups={entityGroups}\n      {...otherProps}\n    />\n  );\n};\n\nGoogleMapsRender.propTypes = {\n  parent: PropTypes.object.isRequired,\n  entityGroups: PropTypes.array,\n  id: PropTypes.string,\n  entityConfigs: PropTypes.object,\n  centerLatitude: PropTypes.number,\n  centerLongitude: PropTypes.number,\n  defaultZoom: PropTypes.number\n};\n\nGoogleMapsRender.defaultProps = {\n  entityGroups: [],\n  entityConfigs: {},\n  id: '',\n  centerLatitude: null,\n  centerLongitude: null,\n  defaultZoom: null\n};\n\nexport default GoogleMapsRender;\n"],"file":"GoogleMapsRender.js"}
+{"version":3,"sources":["../../src/GoogleMaps/GoogleMapsRender.js"],"names":["React","PropTypes","isNumber","useQuery","getAction","useGetImages","buildQuery","getImageIds","getCenterCoordinates","buildMapShapes","GoogleMaps","defaultQuery","GoogleMapsRender","shapeConfigs","entityGroups","id","otherProps","defaultZoom","query","data","loading","error","skip","mapShapes","imageIds","getFiles","imageData","imagesLoading","imagesError","centerCoordinates","shouldDisplayMap","length","slug","propTypes","array","string","centerLatitude","number","centerLongitude","defaultProps"],"mappings":";;;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,OAAOC,QAAP,MAAqB,iBAArB;AACA,SAASC,QAAT,QAAyB,gBAAzB;AACA,SAASC,SAAT,QAA0B,+BAA1B;AACA,SAASC,YAAT,QAA6B,SAA7B;AACA,SAASC,UAAT,EAAqBC,WAArB,EAAkCC,oBAAlC,EAAwDC,cAAxD,QAA8E,WAA9E;AACA,OAAOC,UAAP,MAAuB,cAAvB;AAEA,MAAMC,YAAY,GAAGP,SAAS,CAAC,mBAAD,EAAsB,IAAtB,CAA9B;;AAEA,MAAMQ,gBAAgB,GAAG,QAAuD;AAAA,MAAtD;AAAEC,IAAAA,YAAF;AAAgBC,IAAAA,YAAhB;AAA8BC,IAAAA;AAA9B,GAAsD;AAAA,MAAjBC,UAAiB;;AAC9E,QAAM;AAAEC,IAAAA;AAAF,MAAkBD,UAAxB;AACA,QAAM;AAAEE,IAAAA;AAAF,MAAYZ,UAAU,CAACO,YAAD,CAA5B;AACA,QAAM;AAAEM,IAAAA,IAAF;AAAQC,IAAAA,OAAR;AAAiBC,IAAAA;AAAjB,MAA2BlB,QAAQ,CAACe,KAAK,IAAIP,YAAV,EAAwB;AAC/DW,IAAAA,IAAI,EAAE,CAACJ;AADwD,GAAxB,CAAzC;AAGA,QAAMK,SAAS,GAAGd,cAAc,CAACI,YAAD,EAAeM,IAAf,CAAhC;AACA,QAAMK,QAAQ,GAAGjB,WAAW,CAACgB,SAAD,CAA5B;AACA,QAAM;AACJJ,IAAAA,IAAI,EAAE;AAAEM,MAAAA,QAAQ,EAAEC;AAAZ,QAA0B,EAD5B;AAEJN,IAAAA,OAAO,EAAEO,aAFL;AAGJN,IAAAA,KAAK,EAAEO;AAHH,MAIFvB,YAAY,CAACmB,QAAD,CAJhB;AAKA,MAAIJ,OAAO,IAAIO,aAAf,EAA8B,OAAO,EAAP;AAC9B,MAAIN,KAAK,IAAIO,WAAb,EAA0B,OAAO,IAAP;AAE1B,QAAMC,iBAAiB,GAAGrB,oBAAoB,CAACe,SAAD,EAAYP,UAAZ,CAA9C;AACA,QAAMc,gBAAgB,GACpB5B,QAAQ,CAACe,WAAD,CAAR,IAAyB,CAAC,CAACY,iBAAiB,CAACE,MAA7C,IAAuD,CAAC,CAACR,SAAS,CAACQ,MADrE;AAGA,MAAI,CAACD,gBAAL,EAAuB,OAAO,IAAP;AAEvB,sBACE,oBAAC,UAAD;AACE,IAAA,GAAG,EAAEd,UAAU,CAACgB,IADlB;AAEE,IAAA,iBAAiB,EAAEH,iBAFrB;AAGE,IAAA,SAAS,EAAEN,SAHb;AAIE,IAAA,SAAS,EAAEG;AAJb,KAKMV,UALN,EADF;AASD,CA/BD;;AAiCAJ,gBAAgB,CAACqB,SAAjB,GAA6B;AAC3BnB,EAAAA,YAAY,EAAEb,SAAS,CAACiC,KADG;AAE3BnB,EAAAA,EAAE,EAAEd,SAAS,CAACkC,MAFa;AAG3BtB,EAAAA,YAAY,EAAEZ,SAAS,CAACiC,KAHG;AAI3BE,EAAAA,cAAc,EAAEnC,SAAS,CAACoC,MAJC;AAK3BC,EAAAA,eAAe,EAAErC,SAAS,CAACoC,MALA;AAM3BpB,EAAAA,WAAW,EAAEhB,SAAS,CAACoC;AANI,CAA7B;AASAzB,gBAAgB,CAAC2B,YAAjB,GAAgC;AAC9BzB,EAAAA,YAAY,EAAE,EADgB;AAE9BD,EAAAA,YAAY,EAAE,EAFgB;AAG9BE,EAAAA,EAAE,EAAE,EAH0B;AAI9BqB,EAAAA,cAAc,EAAE,IAJc;AAK9BE,EAAAA,eAAe,EAAE,IALa;AAM9BrB,EAAAA,WAAW,EAAE;AANiB,CAAhC;AASA,eAAeL,gBAAf","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport isNumber from 'lodash.isnumber';\nimport { useQuery } from '@apollo/client';\nimport { getAction } from '@blaze-cms/react-page-builder';\nimport { useGetImages } from './hooks';\nimport { buildQuery, getImageIds, getCenterCoordinates, buildMapShapes } from './helpers';\nimport GoogleMaps from './GoogleMaps';\n\nconst defaultQuery = getAction('getPublishedPages', 'id');\n\nconst GoogleMapsRender = ({ shapeConfigs, entityGroups, id, ...otherProps }) => {\n  const { defaultZoom } = otherProps;\n  const { query } = buildQuery(shapeConfigs);\n  const { data, loading, error } = useQuery(query || defaultQuery, {\n    skip: !query\n  });\n  const mapShapes = buildMapShapes(shapeConfigs, data);\n  const imageIds = getImageIds(mapShapes);\n  const {\n    data: { getFiles: imageData } = {},\n    loading: imagesLoading,\n    error: imagesError\n  } = useGetImages(imageIds);\n  if (loading || imagesLoading) return '';\n  if (error || imagesError) return null;\n\n  const centerCoordinates = getCenterCoordinates(mapShapes, otherProps);\n  const shouldDisplayMap =\n    isNumber(defaultZoom) && !!centerCoordinates.length && !!mapShapes.length;\n\n  if (!shouldDisplayMap) return null;\n\n  return (\n    <GoogleMaps\n      key={otherProps.slug}\n      centerCoordinates={centerCoordinates}\n      mapShapes={mapShapes}\n      imageData={imageData}\n      {...otherProps}\n    />\n  );\n};\n\nGoogleMapsRender.propTypes = {\n  entityGroups: PropTypes.array,\n  id: PropTypes.string,\n  shapeConfigs: PropTypes.array,\n  centerLatitude: PropTypes.number,\n  centerLongitude: PropTypes.number,\n  defaultZoom: PropTypes.number\n};\n\nGoogleMapsRender.defaultProps = {\n  entityGroups: [],\n  shapeConfigs: [],\n  id: '',\n  centerLatitude: null,\n  centerLongitude: null,\n  defaultZoom: null\n};\n\nexport default GoogleMapsRender;\n"],"file":"GoogleMapsRender.js"}

package/lib-es/GoogleMaps/helpers/add-zoom-listener.js

@@ -1,30 +1,10 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { ZOOM_CHANGED } from '../../constants';
 import setShapes from './set-shapes';
 
-const addZoomListener = (map, router, data, imageData, entityGroups = []) => {
+const addZoomListener = (map, router, shapes, imageData) => {
   if (!map) return;
-  const shapes = entityGroups.reduce((acc, entityGroup) => {
-    const {
-      entity,
-      shapes: entityShapes,
-      enableInfoPane = false,
-      dataSummaries = []
-    } = entityGroup;
-    acc.push(...entityShapes.map(entityShape => _objectSpread(_objectSpread({}, entityShape), {}, {
-      entity,
-      enableInfoPane,
-      dataSummaries
-    })));
-    return acc;
-  }, []);
-  setShapes(map, router, shapes, data, imageData);
-  map.addListener(ZOOM_CHANGED, () => setShapes(map, router, shapes, data, imageData));
+  setShapes(map, router, shapes, imageData);
+  map.addListener(ZOOM_CHANGED, () => setShapes(map, router, shapes, imageData));
 };
 
 export default addZoomListener;

package/lib-es/GoogleMaps/helpers/add-zoom-listener.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/GoogleMaps/helpers/add-zoom-listener.js"],"names":["ZOOM_CHANGED","setShapes","addZoomListener","map","router","data","imageData","entityGroups","shapes","reduce","acc","entityGroup","entity","entityShapes","enableInfoPane","dataSummaries","push","entityShape","addListener"],"mappings":";;;;;;AAAA,SAASA,YAAT,QAA6B,iBAA7B;AACA,OAAOC,SAAP,MAAsB,cAAtB;;AAEA,MAAMC,eAAe,GAAG,CAACC,GAAD,EAAMC,MAAN,EAAcC,IAAd,EAAoBC,SAApB,EAA+BC,YAAY,GAAG,EAA9C,KAAqD;AAC3E,MAAI,CAACJ,GAAL,EAAU;AACV,QAAMK,MAAM,GAAGD,YAAY,CAACE,MAAb,CAAoB,CAACC,GAAD,EAAMC,WAAN,KAAsB;AACvD,UAAM;AACJC,MAAAA,MADI;AAEJJ,MAAAA,MAAM,EAAEK,YAFJ;AAGJC,MAAAA,cAAc,GAAG,KAHb;AAIJC,MAAAA,aAAa,GAAG;AAJZ,QAKFJ,WALJ;AAMAD,IAAAA,GAAG,CAACM,IAAJ,CACE,GAAGH,YAAY,CAACV,GAAb,CAAiBc,WAAW,oCAC1BA,WAD0B;AAE7BL,MAAAA,MAF6B;AAG7BE,MAAAA,cAH6B;AAI7BC,MAAAA;AAJ6B,MAA5B,CADL;AAQA,WAAOL,GAAP;AACD,GAhBc,EAgBZ,EAhBY,CAAf;AAkBAT,EAAAA,SAAS,CAACE,GAAD,EAAMC,MAAN,EAAcI,MAAd,EAAsBH,IAAtB,EAA4BC,SAA5B,CAAT;AAEAH,EAAAA,GAAG,CAACe,WAAJ,CAAgBlB,YAAhB,EAA8B,MAAMC,SAAS,CAACE,GAAD,EAAMC,MAAN,EAAcI,MAAd,EAAsBH,IAAtB,EAA4BC,SAA5B,CAA7C;AACD,CAvBD;;AAyBA,eAAeJ,eAAf","sourcesContent":["import { ZOOM_CHANGED } from '../../constants';\nimport setShapes from './set-shapes';\n\nconst addZoomListener = (map, router, data, imageData, entityGroups = []) => {\n  if (!map) return;\n  const shapes = entityGroups.reduce((acc, entityGroup) => {\n    const {\n      entity,\n      shapes: entityShapes,\n      enableInfoPane = false,\n      dataSummaries = []\n    } = entityGroup;\n    acc.push(\n      ...entityShapes.map(entityShape => ({\n        ...entityShape,\n        entity,\n        enableInfoPane,\n        dataSummaries\n      }))\n    );\n    return acc;\n  }, []);\n\n  setShapes(map, router, shapes, data, imageData);\n\n  map.addListener(ZOOM_CHANGED, () => setShapes(map, router, shapes, data, imageData));\n};\n\nexport default addZoomListener;\n"],"file":"add-zoom-listener.js"}
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/add-zoom-listener.js"],"names":["ZOOM_CHANGED","setShapes","addZoomListener","map","router","shapes","imageData","addListener"],"mappings":"AAAA,SAASA,YAAT,QAA6B,iBAA7B;AACA,OAAOC,SAAP,MAAsB,cAAtB;;AAEA,MAAMC,eAAe,GAAG,CAACC,GAAD,EAAMC,MAAN,EAAcC,MAAd,EAAsBC,SAAtB,KAAoC;AAC1D,MAAI,CAACH,GAAL,EAAU;AACVF,EAAAA,SAAS,CAACE,GAAD,EAAMC,MAAN,EAAcC,MAAd,EAAsBC,SAAtB,CAAT;AACAH,EAAAA,GAAG,CAACI,WAAJ,CAAgBP,YAAhB,EAA8B,MAAMC,SAAS,CAACE,GAAD,EAAMC,MAAN,EAAcC,MAAd,EAAsBC,SAAtB,CAA7C;AACD,CAJD;;AAMA,eAAeJ,eAAf","sourcesContent":["import { ZOOM_CHANGED } from '../../constants';\nimport setShapes from './set-shapes';\n\nconst addZoomListener = (map, router, shapes, imageData) => {\n  if (!map) return;\n  setShapes(map, router, shapes, imageData);\n  map.addListener(ZOOM_CHANGED, () => setShapes(map, router, shapes, imageData));\n};\n\nexport default addZoomListener;\n"],"file":"add-zoom-listener.js"}

package/lib-es/GoogleMaps/helpers/build-map-shapes.js

@@ -0,0 +1,86 @@
+const getLatLonValues = (keys, data) => {
+  if (keys.length === 1) return data[keys];
+  const key = keys.shift();
+  return getLatLonValues(keys, data[key]);
+};
+
+const getLatLong = (latProp, lonProp, shape, data) => {
+  const {
+    latitude,
+    longitude
+  } = shape;
+  if (!latProp || !lonProp) return {
+    latitude,
+    longitude
+  };
+  const latKeys = latProp.split('.');
+  const lonKeys = lonProp.split('.');
+  const lat = getLatLonValues(latKeys, data);
+  const lon = getLatLonValues(lonKeys, data);
+  return {
+    latitude: lat,
+    longitude: lon
+  };
+};
+
+const buildMapShapes = (shapesOptions, shapesData) => {
+  if (!shapesData) return [];
+  const mapShapes = [];
+  shapesOptions.forEach(shape => {
+    const {
+      shapeKey,
+      entityOptions,
+      shapeOptions
+    } = shape;
+    const {
+      dataSummaries,
+      enableInfoPane
+    } = entityOptions;
+    const {
+      imageId,
+      label,
+      markerHeight,
+      markerWidth,
+      maxZoom,
+      minZoom,
+      type,
+      useAsCenter
+    } = shapeOptions;
+    const shapeData = Array.isArray(shapesData[shapeKey]) ? shapesData[shapeKey] : shapesData[shapeKey].results;
+    if (!shapeData) return;
+    const {
+      latProp,
+      lonProp
+    } = entityOptions;
+    shapeData.forEach(data => {
+      const {
+        url
+      } = data;
+      const {
+        latitude,
+        longitude
+      } = getLatLong(latProp, lonProp, shapeOptions, data);
+      const formatedShape = {
+        latitude,
+        longitude,
+        dataSummaries,
+        enableInfoPane,
+        imageId,
+        label,
+        markerHeight,
+        markerWidth,
+        maxZoom,
+        minZoom,
+        type,
+        url,
+        useAsCenter,
+        shapeData: data
+      };
+      mapShapes.push(formatedShape);
+    });
+  });
+  return mapShapes;
+};
+
+export default buildMapShapes;
+//# sourceMappingURL=build-map-shapes.js.map

package/lib-es/GoogleMaps/helpers/build-map-shapes.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/build-map-shapes.js"],"names":["getLatLonValues","keys","data","length","key","shift","getLatLong","latProp","lonProp","shape","latitude","longitude","latKeys","split","lonKeys","lat","lon","buildMapShapes","shapesOptions","shapesData","mapShapes","forEach","shapeKey","entityOptions","shapeOptions","dataSummaries","enableInfoPane","imageId","label","markerHeight","markerWidth","maxZoom","minZoom","type","useAsCenter","shapeData","Array","isArray","results","url","formatedShape","push"],"mappings":"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","sourcesContent":["const getLatLonValues = (keys, data) => {\n  if (keys.length === 1) return data[keys];\n  const key = keys.shift();\n  return getLatLonValues(keys, data[key]);\n};\n\nconst getLatLong = (latProp, lonProp, shape, data) => {\n  const { latitude, longitude } = shape;\n\n  if (!latProp || !lonProp) return { latitude, longitude };\n  const latKeys = latProp.split('.');\n  const lonKeys = lonProp.split('.');\n  const lat = getLatLonValues(latKeys, data);\n  const lon = getLatLonValues(lonKeys, data);\n\n  return { latitude: lat, longitude: lon };\n};\n\nconst buildMapShapes = (shapesOptions, shapesData) => {\n  if (!shapesData) return [];\n  const mapShapes = [];\n  shapesOptions.forEach(shape => {\n    const { shapeKey, entityOptions, shapeOptions } = shape;\n    const { dataSummaries, enableInfoPane } = entityOptions;\n    const {\n      imageId,\n      label,\n      markerHeight,\n      markerWidth,\n      maxZoom,\n      minZoom,\n      type,\n      useAsCenter\n    } = shapeOptions;\n\n    const shapeData = Array.isArray(shapesData[shapeKey])\n      ? shapesData[shapeKey]\n      : shapesData[shapeKey].results;\n    if (!shapeData) return;\n    const { latProp, lonProp } = entityOptions;\n\n    shapeData.forEach(data => {\n      const { url } = data;\n      const { latitude, longitude } = getLatLong(latProp, lonProp, shapeOptions, data);\n\n      const formatedShape = {\n        latitude,\n        longitude,\n        dataSummaries,\n        enableInfoPane,\n        imageId,\n        label,\n        markerHeight,\n        markerWidth,\n        maxZoom,\n        minZoom,\n        type,\n        url,\n        useAsCenter,\n        shapeData: data\n      };\n\n      mapShapes.push(formatedShape);\n    });\n  });\n\n  return mapShapes;\n};\n\nexport default buildMapShapes;\n"],"file":"build-map-shapes.js"}

package/lib-es/GoogleMaps/helpers/build-query.js

@@ -1,20 +1,29 @@
-import { generateQuery, generateQueryString } from '../queries';
+import { generateQuery, generateIdsQuery, generateFiltersQuery } from '../queries';
 
 const buildQuery = entityConfigs => {
   const entityIds = [];
-  const queryString = Object.keys(entityConfigs).reduce((acc, entityConfig) => {
+  const rawQueryStringified = '';
+  const queryString = entityConfigs.map(entityConfig => {
     const {
       action,
       ids,
-      propsQuery
-    } = entityConfigs[entityConfig];
+      entity,
+      propsQuery,
+      shapeKey,
+      filtersObject
+    } = entityConfig;
+    if (!action) return '';
+    const formatedEntity = `${entity[0].toUpperCase()}${entity.slice(1)}`;
+    const filterQueryKey = action.indexOf('Published') !== -1 ? `Published${formatedEntity}` : formatedEntity;
     entityIds.push(...ids);
-    const singleItemQuery = action ? generateQueryString(action, entityConfig, propsQuery.trim() || 'id') : '';
-    return `${acc}${singleItemQuery}`;
-  }, '');
+    const props = propsQuery.trim() || 'id';
+    const singleItemQuery = filtersObject ? generateFiltersQuery(shapeKey, props, JSON.stringify(filtersObject), filterQueryKey) : generateIdsQuery(shapeKey, props, action, ids);
+    return singleItemQuery;
+  }).join(' ');
   return {
     query: queryString ? generateQuery(queryString) : '',
-    ids: entityIds
+    ids: entityIds,
+    rawQueryStringified
   };
 };
 

package/lib-es/GoogleMaps/helpers/build-query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/GoogleMaps/helpers/build-query.js"],"names":["generateQuery","generateQueryString","buildQuery","entityConfigs","entityIds","queryString","Object","keys","reduce","acc","entityConfig","action","ids","propsQuery","push","singleItemQuery","trim","query"],"mappings":"AAAA,SAASA,aAAT,EAAwBC,mBAAxB,QAAmD,YAAnD;;AAEA,MAAMC,UAAU,GAAGC,aAAa,IAAI;AAClC,QAAMC,SAAS,GAAG,EAAlB;AACA,QAAMC,WAAW,GAAGC,MAAM,CAACC,IAAP,CAAYJ,aAAZ,EAA2BK,MAA3B,CAAkC,CAACC,GAAD,EAAMC,YAAN,KAAuB;AAC3E,UAAM;AAAEC,MAAAA,MAAF;AAAUC,MAAAA,GAAV;AAAeC,MAAAA;AAAf,QAA8BV,aAAa,CAACO,YAAD,CAAjD;AACAN,IAAAA,SAAS,CAACU,IAAV,CAAe,GAAGF,GAAlB;AACA,UAAMG,eAAe,GAAGJ,MAAM,GAC1BV,mBAAmB,CAACU,MAAD,EAASD,YAAT,EAAuBG,UAAU,CAACG,IAAX,MAAqB,IAA5C,CADO,GAE1B,EAFJ;AAGA,WAAQ,GAAEP,GAAI,GAAEM,eAAgB,EAAhC;AACD,GAPmB,EAOjB,EAPiB,CAApB;AAQA,SAAO;AAAEE,IAAAA,KAAK,EAAEZ,WAAW,GAAGL,aAAa,CAACK,WAAD,CAAhB,GAAgC,EAApD;AAAwDO,IAAAA,GAAG,EAAER;AAA7D,GAAP;AACD,CAXD;;AAaA,eAAeF,UAAf","sourcesContent":["import { generateQuery, generateQueryString } from '../queries';\n\nconst buildQuery = entityConfigs => {\n  const entityIds = [];\n  const queryString = Object.keys(entityConfigs).reduce((acc, entityConfig) => {\n    const { action, ids, propsQuery } = entityConfigs[entityConfig];\n    entityIds.push(...ids);\n    const singleItemQuery = action\n      ? generateQueryString(action, entityConfig, propsQuery.trim() || 'id')\n      : '';\n    return `${acc}${singleItemQuery}`;\n  }, '');\n  return { query: queryString ? generateQuery(queryString) : '', ids: entityIds };\n};\n\nexport default buildQuery;\n"],"file":"build-query.js"}
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/build-query.js"],"names":["generateQuery","generateIdsQuery","generateFiltersQuery","buildQuery","entityConfigs","entityIds","rawQueryStringified","queryString","map","entityConfig","action","ids","entity","propsQuery","shapeKey","filtersObject","formatedEntity","toUpperCase","slice","filterQueryKey","indexOf","push","props","trim","singleItemQuery","JSON","stringify","join","query"],"mappings":"AAAA,SAASA,aAAT,EAAwBC,gBAAxB,EAA0CC,oBAA1C,QAAsE,YAAtE;;AAEA,MAAMC,UAAU,GAAGC,aAAa,IAAI;AAClC,QAAMC,SAAS,GAAG,EAAlB;AACA,QAAMC,mBAAmB,GAAG,EAA5B;AACA,QAAMC,WAAW,GAAGH,aAAa,CAC9BI,GADiB,CACbC,YAAY,IAAI;AACnB,UAAM;AAAEC,MAAAA,MAAF;AAAUC,MAAAA,GAAV;AAAeC,MAAAA,MAAf;AAAuBC,MAAAA,UAAvB;AAAmCC,MAAAA,QAAnC;AAA6CC,MAAAA;AAA7C,QAA+DN,YAArE;AACA,QAAI,CAACC,MAAL,EAAa,OAAO,EAAP;AACb,UAAMM,cAAc,GAAI,GAAEJ,MAAM,CAAC,CAAD,CAAN,CAAUK,WAAV,EAAwB,GAAEL,MAAM,CAACM,KAAP,CAAa,CAAb,CAAgB,EAApE;AACA,UAAMC,cAAc,GAClBT,MAAM,CAACU,OAAP,CAAe,WAAf,MAAgC,CAAC,CAAjC,GAAsC,YAAWJ,cAAe,EAAhE,GAAoEA,cADtE;AAGAX,IAAAA,SAAS,CAACgB,IAAV,CAAe,GAAGV,GAAlB;AACA,UAAMW,KAAK,GAAGT,UAAU,CAACU,IAAX,MAAqB,IAAnC;AACA,UAAMC,eAAe,GAAGT,aAAa,GACjCb,oBAAoB,CAACY,QAAD,EAAWQ,KAAX,EAAkBG,IAAI,CAACC,SAAL,CAAeX,aAAf,CAAlB,EAAiDI,cAAjD,CADa,GAEjClB,gBAAgB,CAACa,QAAD,EAAWQ,KAAX,EAAkBZ,MAAlB,EAA0BC,GAA1B,CAFpB;AAIA,WAAOa,eAAP;AACD,GAfiB,EAgBjBG,IAhBiB,CAgBZ,GAhBY,CAApB;AAkBA,SAAO;AACLC,IAAAA,KAAK,EAAErB,WAAW,GAAGP,aAAa,CAACO,WAAD,CAAhB,GAAgC,EAD7C;AAELI,IAAAA,GAAG,EAAEN,SAFA;AAGLC,IAAAA;AAHK,GAAP;AAKD,CA1BD;;AA4BA,eAAeH,UAAf","sourcesContent":["import { generateQuery, generateIdsQuery, generateFiltersQuery } from '../queries';\n\nconst buildQuery = entityConfigs => {\n  const entityIds = [];\n  const rawQueryStringified = '';\n  const queryString = entityConfigs\n    .map(entityConfig => {\n      const { action, ids, entity, propsQuery, shapeKey, filtersObject } = entityConfig;\n      if (!action) return '';\n      const formatedEntity = `${entity[0].toUpperCase()}${entity.slice(1)}`;\n      const filterQueryKey =\n        action.indexOf('Published') !== -1 ? `Published${formatedEntity}` : formatedEntity;\n\n      entityIds.push(...ids);\n      const props = propsQuery.trim() || 'id';\n      const singleItemQuery = filtersObject\n        ? generateFiltersQuery(shapeKey, props, JSON.stringify(filtersObject), filterQueryKey)\n        : generateIdsQuery(shapeKey, props, action, ids);\n\n      return singleItemQuery;\n    })\n    .join(' ');\n\n  return {\n    query: queryString ? generateQuery(queryString) : '',\n    ids: entityIds,\n    rawQueryStringified\n  };\n};\n\nexport default buildQuery;\n"],"file":"build-query.js"}