@blaze-cms/plugin-google-maps-fe 0.123.0-alpha.25 → 0.123.0-alpha.29

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"}

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

@@ -0,0 +1,134 @@
+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 flatten from 'lodash.flatten';
+import { IMAGE_ID, URL, ID } from '../../constants';
+
+const getPropValues = properties => properties.reduce((acc, property) => {
+  if (property.includes('.')) {
+    const [relationName, relationProp] = property.split('.');
+    return `${acc} ${relationName} { ${relationProp} }`;
+  }
+
+  return `${acc} ${property}`;
+}, '').trim();
+
+const getUpdatedPropsQuery = (propsQuery, entityData) => {
+  const {
+    properties = {},
+    dynamicProperties = {}
+  } = entityData;
+  const [url] = Object.keys(dynamicProperties).filter(prop => prop === URL);
+  const hasImage = !!Object.keys(properties).filter(prop => prop === IMAGE_ID).length;
+  let updatedPropsQuery = hasImage ? `${propsQuery} ${IMAGE_ID}` : propsQuery;
+  updatedPropsQuery = url ? `${updatedPropsQuery} ${URL}` : updatedPropsQuery;
+  return updatedPropsQuery;
+};
+
+const buildFilterQueryString = filter => {
+  const [filterKey, filterValue] = filter.split('/');
+  const filterKeyword = `${filterKey}.keyword`;
+  return {
+    bool: {
+      should: [{
+        match: {
+          [filterKeyword]: filterValue
+        }
+      }]
+    }
+  };
+};
+
+const buildFilters = filters => {
+  if (!filters || !filters.length) return null;
+  const filterQueryProps = filters.map(buildFilterQueryString);
+  return {
+    bool: {
+      should: filterQueryProps
+    }
+  };
+};
+
+const buiildShapeProps = (shape, shapeKey, dataSummaries, parentId, entityData, entityGroup) => {
+  const {
+    displayItems = [],
+    filterBy
+  } = shape;
+  const {
+    latProp,
+    lonProp,
+    entity
+  } = entityGroup;
+  const {
+    actions
+  } = entityData;
+  const action = actions ? actions.getAllPublished || actions.getAll : '';
+  const dataSummaryProps = dataSummaries.reduce((acc, {
+    propsToDisplay
+  }) => {
+    const propsToDisplayValues = flatten(propsToDisplay.map(({
+      propertiesToDisplay
+    }) => propertiesToDisplay));
+    const propsToDisplayString = getPropValues(propsToDisplayValues);
+    return `${acc} ${propsToDisplayString}`;
+  }, '').trim();
+  const ids = [];
+  displayItems.length ? ids.push(displayItems[0]) : ids.push(parentId);
+  const filtersObject = buildFilters(filterBy);
+  let propsQuery = dataSummaryProps ? `${dataSummaryProps}` : '';
+  propsQuery = getUpdatedPropsQuery(propsQuery, entityData);
+
+  if (latProp && lonProp) {
+    propsQuery = `${propsQuery} ${formatProp(latProp)} ${formatProp(lonProp)}`;
+  }
+
+  if (ids.length && !propsQuery.includes(ID)) propsQuery = `${propsQuery.trim()} ${ID}`;
+  return {
+    shapeKey,
+    entity,
+    propsQuery,
+    ids,
+    action,
+    filtersObject
+  };
+};
+
+const formatProp = prop => {
+  if (!prop.includes('.')) return prop;
+  const [mainProp, nestedProp] = prop.split('.');
+  return `${mainProp}{${nestedProp}}`;
+};
+
+const buildShapesConfig = (schemas, entityGroups, parent) => {
+  if (!schemas || !entityGroups) return [];
+  const {
+    itemId,
+    itemEntity
+  } = parent;
+  const shapeGroups = [];
+  entityGroups.forEach((entityGroup, i) => {
+    const {
+      entity,
+      shapes,
+      dataSummaries = []
+    } = entityGroup;
+    const parentId = entity === itemEntity && itemId;
+    if (!entity) return null;
+    const entityData = schemas[entity] || {};
+    shapes.filter(Boolean).forEach((shape, shapeIndex) => {
+      const shapeKey = `shape${i}${shapeIndex}`;
+      const shapeValues = buiildShapeProps(shape, shapeKey, dataSummaries, parentId, entityData, entityGroup);
+      shapeGroups.push(_objectSpread(_objectSpread({}, shapeValues), {}, {
+        shapeOptions: shape,
+        entityOptions: entityGroup
+      }));
+    });
+  });
+  return shapeGroups;
+};
+
+export default buildShapesConfig;
+//# sourceMappingURL=build-shapes-configs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/build-shapes-configs.js"],"names":["flatten","IMAGE_ID","URL","ID","getPropValues","properties","reduce","acc","property","includes","relationName","relationProp","split","trim","getUpdatedPropsQuery","propsQuery","entityData","dynamicProperties","url","Object","keys","filter","prop","hasImage","length","updatedPropsQuery","buildFilterQueryString","filterKey","filterValue","filterKeyword","bool","should","match","buildFilters","filters","filterQueryProps","map","buiildShapeProps","shape","shapeKey","dataSummaries","parentId","entityGroup","displayItems","filterBy","latProp","lonProp","entity","actions","action","getAllPublished","getAll","dataSummaryProps","propsToDisplay","propsToDisplayValues","propertiesToDisplay","propsToDisplayString","ids","push","filtersObject","formatProp","mainProp","nestedProp","buildShapesConfig","schemas","entityGroups","parent","itemId","itemEntity","shapeGroups","forEach","i","shapes","Boolean","shapeIndex","shapeValues","shapeOptions","entityOptions"],"mappings":";;;;;;AAAA,OAAOA,OAAP,MAAoB,gBAApB;AACA,SAASC,QAAT,EAAmBC,GAAnB,EAAwBC,EAAxB,QAAkC,iBAAlC;;AAEA,MAAMC,aAAa,GAAGC,UAAU,IAC9BA,UAAU,CACPC,MADH,CACU,CAACC,GAAD,EAAMC,QAAN,KAAmB;AACzB,MAAIA,QAAQ,CAACC,QAAT,CAAkB,GAAlB,CAAJ,EAA4B;AAC1B,UAAM,CAACC,YAAD,EAAeC,YAAf,IAA+BH,QAAQ,CAACI,KAAT,CAAe,GAAf,CAArC;AACA,WAAQ,GAAEL,GAAI,IAAGG,YAAa,MAAKC,YAAa,IAAhD;AACD;;AACD,SAAQ,GAAEJ,GAAI,IAAGC,QAAS,EAA1B;AACD,CAPH,EAOK,EAPL,EAQGK,IARH,EADF;;AAWA,MAAMC,oBAAoB,GAAG,CAACC,UAAD,EAAaC,UAAb,KAA4B;AACvD,QAAM;AAAEX,IAAAA,UAAU,GAAG,EAAf;AAAmBY,IAAAA,iBAAiB,GAAG;AAAvC,MAA8CD,UAApD;AAEA,QAAM,CAACE,GAAD,IAAQC,MAAM,CAACC,IAAP,CAAYH,iBAAZ,EAA+BI,MAA/B,CAAsCC,IAAI,IAAIA,IAAI,KAAKpB,GAAvD,CAAd;AACA,QAAMqB,QAAQ,GAAG,CAAC,CAACJ,MAAM,CAACC,IAAP,CAAYf,UAAZ,EAAwBgB,MAAxB,CAA+BC,IAAI,IAAIA,IAAI,KAAKrB,QAAhD,EAA0DuB,MAA7E;AAEA,MAAIC,iBAAiB,GAAGF,QAAQ,GAAI,GAAER,UAAW,IAAGd,QAAS,EAA7B,GAAiCc,UAAjE;AACAU,EAAAA,iBAAiB,GAAGP,GAAG,GAAI,GAAEO,iBAAkB,IAAGvB,GAAI,EAA/B,GAAmCuB,iBAA1D;AAEA,SAAOA,iBAAP;AACD,CAVD;;AAYA,MAAMC,sBAAsB,GAAGL,MAAM,IAAI;AACvC,QAAM,CAACM,SAAD,EAAYC,WAAZ,IAA2BP,MAAM,CAACT,KAAP,CAAa,GAAb,CAAjC;AACA,QAAMiB,aAAa,GAAI,GAAEF,SAAU,UAAnC;AACA,SAAO;AAAEG,IAAAA,IAAI,EAAE;AAAEC,MAAAA,MAAM,EAAE,CAAC;AAAEC,QAAAA,KAAK,EAAE;AAAE,WAACH,aAAD,GAAiBD;AAAnB;AAAT,OAAD;AAAV;AAAR,GAAP;AACD,CAJD;;AAMA,MAAMK,YAAY,GAAGC,OAAO,IAAI;AAC9B,MAAI,CAACA,OAAD,IAAY,CAACA,OAAO,CAACV,MAAzB,EAAiC,OAAO,IAAP;AACjC,QAAMW,gBAAgB,GAAGD,OAAO,CAACE,GAAR,CAAYV,sBAAZ,CAAzB;AACA,SAAO;AAAEI,IAAAA,IAAI,EAAE;AAAEC,MAAAA,MAAM,EAAEI;AAAV;AAAR,GAAP;AACD,CAJD;;AAMA,MAAME,gBAAgB,GAAG,CAACC,KAAD,EAAQC,QAAR,EAAkBC,aAAlB,EAAiCC,QAAjC,EAA2CzB,UAA3C,EAAuD0B,WAAvD,KAAuE;AAC9F,QAAM;AAAEC,IAAAA,YAAY,GAAG,EAAjB;AAAqBC,IAAAA;AAArB,MAAkCN,KAAxC;AACA,QAAM;AAAEO,IAAAA,OAAF;AAAWC,IAAAA,OAAX;AAAoBC,IAAAA;AAApB,MAA+BL,WAArC;AACA,QAAM;AAAEM,IAAAA;AAAF,MAAchC,UAApB;AACA,QAAMiC,MAAM,GAAGD,OAAO,GAAGA,OAAO,CAACE,eAAR,IAA2BF,OAAO,CAACG,MAAtC,GAA+C,EAArE;AAEA,QAAMC,gBAAgB,GAAGZ,aAAa,CACnClC,MADsB,CACf,CAACC,GAAD,EAAM;AAAE8C,IAAAA;AAAF,GAAN,KAA6B;AACnC,UAAMC,oBAAoB,GAAGtD,OAAO,CAClCqD,cAAc,CAACjB,GAAf,CAAmB,CAAC;AAAEmB,MAAAA;AAAF,KAAD,KAA6BA,mBAAhD,CADkC,CAApC;AAGA,UAAMC,oBAAoB,GAAGpD,aAAa,CAACkD,oBAAD,CAA1C;AAEA,WAAQ,GAAE/C,GAAI,IAAGiD,oBAAqB,EAAtC;AACD,GARsB,EAQpB,EARoB,EAStB3C,IATsB,EAAzB;AAUA,QAAM4C,GAAG,GAAG,EAAZ;AACAd,EAAAA,YAAY,CAACnB,MAAb,GAAsBiC,GAAG,CAACC,IAAJ,CAASf,YAAY,CAAC,CAAD,CAArB,CAAtB,GAAkDc,GAAG,CAACC,IAAJ,CAASjB,QAAT,CAAlD;AAEA,QAAMkB,aAAa,GAAG1B,YAAY,CAACW,QAAD,CAAlC;AACA,MAAI7B,UAAU,GAAGqC,gBAAgB,GAAI,GAAEA,gBAAiB,EAAvB,GAA2B,EAA5D;AACArC,EAAAA,UAAU,GAAGD,oBAAoB,CAACC,UAAD,EAAaC,UAAb,CAAjC;;AACA,MAAI6B,OAAO,IAAIC,OAAf,EAAwB;AACtB/B,IAAAA,UAAU,GAAI,GAAEA,UAAW,IAAG6C,UAAU,CAACf,OAAD,CAAU,IAAGe,UAAU,CAACd,OAAD,CAAU,EAAzE;AACD;;AACD,MAAIW,GAAG,CAACjC,MAAJ,IAAc,CAACT,UAAU,CAACN,QAAX,CAAoBN,EAApB,CAAnB,EAA4CY,UAAU,GAAI,GAAEA,UAAU,CAACF,IAAX,EAAkB,IAAGV,EAAG,EAAxC;AAE5C,SAAO;AACLoC,IAAAA,QADK;AAELQ,IAAAA,MAFK;AAGLhC,IAAAA,UAHK;AAIL0C,IAAAA,GAJK;AAKLR,IAAAA,MALK;AAMLU,IAAAA;AANK,GAAP;AAQD,CAnCD;;AAqCA,MAAMC,UAAU,GAAGtC,IAAI,IAAI;AACzB,MAAI,CAACA,IAAI,CAACb,QAAL,CAAc,GAAd,CAAL,EAAyB,OAAOa,IAAP;AAEzB,QAAM,CAACuC,QAAD,EAAWC,UAAX,IAAyBxC,IAAI,CAACV,KAAL,CAAW,GAAX,CAA/B;AACA,SAAQ,GAAEiD,QAAS,IAAGC,UAAW,GAAjC;AACD,CALD;;AAOA,MAAMC,iBAAiB,GAAG,CAACC,OAAD,EAAUC,YAAV,EAAwBC,MAAxB,KAAmC;AAC3D,MAAI,CAACF,OAAD,IAAY,CAACC,YAAjB,EAA+B,OAAO,EAAP;AAC/B,QAAM;AAAEE,IAAAA,MAAF;AAAUC,IAAAA;AAAV,MAAyBF,MAA/B;AACA,QAAMG,WAAW,GAAG,EAApB;AACAJ,EAAAA,YAAY,CAACK,OAAb,CAAqB,CAAC5B,WAAD,EAAc6B,CAAd,KAAoB;AACvC,UAAM;AAAExB,MAAAA,MAAF;AAAUyB,MAAAA,MAAV;AAAkBhC,MAAAA,aAAa,GAAG;AAAlC,QAAyCE,WAA/C;AACA,UAAMD,QAAQ,GAAGM,MAAM,KAAKqB,UAAX,IAAyBD,MAA1C;AACA,QAAI,CAACpB,MAAL,EAAa,OAAO,IAAP;AACb,UAAM/B,UAAU,GAAGgD,OAAO,CAACjB,MAAD,CAAP,IAAmB,EAAtC;AAEAyB,IAAAA,MAAM,CAACnD,MAAP,CAAcoD,OAAd,EAAuBH,OAAvB,CAA+B,CAAChC,KAAD,EAAQoC,UAAR,KAAuB;AACpD,YAAMnC,QAAQ,GAAI,QAAOgC,CAAE,GAAEG,UAAW,EAAxC;AACA,YAAMC,WAAW,GAAGtC,gBAAgB,CAClCC,KADkC,EAElCC,QAFkC,EAGlCC,aAHkC,EAIlCC,QAJkC,EAKlCzB,UALkC,EAMlC0B,WANkC,CAApC;AAQA2B,MAAAA,WAAW,CAACX,IAAZ,iCAAsBiB,WAAtB;AAAmCC,QAAAA,YAAY,EAAEtC,KAAjD;AAAwDuC,QAAAA,aAAa,EAAEnC;AAAvE;AACD,KAXD;AAYD,GAlBD;AAoBA,SAAO2B,WAAP;AACD,CAzBD;;AA2BA,eAAeN,iBAAf","sourcesContent":["import flatten from 'lodash.flatten';\nimport { IMAGE_ID, URL, ID } from '../../constants';\n\nconst getPropValues = properties =>\n  properties\n    .reduce((acc, property) => {\n      if (property.includes('.')) {\n        const [relationName, relationProp] = property.split('.');\n        return `${acc} ${relationName} { ${relationProp} }`;\n      }\n      return `${acc} ${property}`;\n    }, '')\n    .trim();\n\nconst getUpdatedPropsQuery = (propsQuery, entityData) => {\n  const { properties = {}, dynamicProperties = {} } = entityData;\n\n  const [url] = Object.keys(dynamicProperties).filter(prop => prop === URL);\n  const hasImage = !!Object.keys(properties).filter(prop => prop === IMAGE_ID).length;\n\n  let updatedPropsQuery = hasImage ? `${propsQuery} ${IMAGE_ID}` : propsQuery;\n  updatedPropsQuery = url ? `${updatedPropsQuery} ${URL}` : updatedPropsQuery;\n\n  return updatedPropsQuery;\n};\n\nconst buildFilterQueryString = filter => {\n  const [filterKey, filterValue] = filter.split('/');\n  const filterKeyword = `${filterKey}.keyword`;\n  return { bool: { should: [{ match: { [filterKeyword]: filterValue } }] } };\n};\n\nconst buildFilters = filters => {\n  if (!filters || !filters.length) return null;\n  const filterQueryProps = filters.map(buildFilterQueryString);\n  return { bool: { should: filterQueryProps } };\n};\n\nconst buiildShapeProps = (shape, shapeKey, dataSummaries, parentId, entityData, entityGroup) => {\n  const { displayItems = [], filterBy } = shape;\n  const { latProp, lonProp, entity } = entityGroup;\n  const { actions } = entityData;\n  const action = actions ? actions.getAllPublished || actions.getAll : '';\n\n  const dataSummaryProps = dataSummaries\n    .reduce((acc, { propsToDisplay }) => {\n      const propsToDisplayValues = flatten(\n        propsToDisplay.map(({ propertiesToDisplay }) => propertiesToDisplay)\n      );\n      const propsToDisplayString = getPropValues(propsToDisplayValues);\n\n      return `${acc} ${propsToDisplayString}`;\n    }, '')\n    .trim();\n  const ids = [];\n  displayItems.length ? ids.push(displayItems[0]) : ids.push(parentId);\n\n  const filtersObject = buildFilters(filterBy);\n  let propsQuery = dataSummaryProps ? `${dataSummaryProps}` : '';\n  propsQuery = getUpdatedPropsQuery(propsQuery, entityData);\n  if (latProp && lonProp) {\n    propsQuery = `${propsQuery} ${formatProp(latProp)} ${formatProp(lonProp)}`;\n  }\n  if (ids.length && !propsQuery.includes(ID)) propsQuery = `${propsQuery.trim()} ${ID}`;\n\n  return {\n    shapeKey,\n    entity,\n    propsQuery,\n    ids,\n    action,\n    filtersObject\n  };\n};\n\nconst formatProp = prop => {\n  if (!prop.includes('.')) return prop;\n\n  const [mainProp, nestedProp] = prop.split('.');\n  return `${mainProp}{${nestedProp}}`;\n};\n\nconst buildShapesConfig = (schemas, entityGroups, parent) => {\n  if (!schemas || !entityGroups) return [];\n  const { itemId, itemEntity } = parent;\n  const shapeGroups = [];\n  entityGroups.forEach((entityGroup, i) => {\n    const { entity, shapes, dataSummaries = [] } = entityGroup;\n    const parentId = entity === itemEntity && itemId;\n    if (!entity) return null;\n    const entityData = schemas[entity] || {};\n\n    shapes.filter(Boolean).forEach((shape, shapeIndex) => {\n      const shapeKey = `shape${i}${shapeIndex}`;\n      const shapeValues = buiildShapeProps(\n        shape,\n        shapeKey,\n        dataSummaries,\n        parentId,\n        entityData,\n        entityGroup\n      );\n      shapeGroups.push({ ...shapeValues, shapeOptions: shape, entityOptions: entityGroup });\n    });\n  });\n\n  return shapeGroups;\n};\n\nexport default buildShapesConfig;\n"],"file":"build-shapes-configs.js"}

package/lib-es/GoogleMaps/helpers/get-center-coordinates.js

@@ -0,0 +1,31 @@
+import isNumber from 'lodash.isnumber';
+
+const getCenterCoordinates = (mapShapes, otherProps) => {
+  const centerCoordinates = [];
+  const {
+    centerLatitude,
+    centerLongitude
+  } = otherProps;
+  const useDefaultCenter = centerLatitude !== 0 && centerLongitude !== 0 && isNumber(centerLatitude) && isNumber(centerLongitude);
+  if (useDefaultCenter) return [{
+    latitude: centerLatitude,
+    longitude: centerLongitude
+  }];
+  const useAsCenterShapes = mapShapes.filter(({
+    useAsCenter
+  }) => useAsCenter);
+  const shapesForCenter = useAsCenterShapes.length ? useAsCenterShapes : mapShapes;
+  shapesForCenter.forEach(({
+    latitude,
+    longitude
+  }) => {
+    if (isNumber(latitude) && isNumber(longitude)) centerCoordinates.push({
+      latitude,
+      longitude
+    });
+  });
+  return centerCoordinates;
+};
+
+export default getCenterCoordinates;
+//# sourceMappingURL=get-center-coordinates.js.map

package/lib-es/GoogleMaps/helpers/get-center-coordinates.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/get-center-coordinates.js"],"names":["isNumber","getCenterCoordinates","mapShapes","otherProps","centerCoordinates","centerLatitude","centerLongitude","useDefaultCenter","latitude","longitude","useAsCenterShapes","filter","useAsCenter","shapesForCenter","length","forEach","push"],"mappings":"AAAA,OAAOA,QAAP,MAAqB,iBAArB;;AAEA,MAAMC,oBAAoB,GAAG,CAACC,SAAD,EAAYC,UAAZ,KAA2B;AACtD,QAAMC,iBAAiB,GAAG,EAA1B;AAEA,QAAM;AAAEC,IAAAA,cAAF;AAAkBC,IAAAA;AAAlB,MAAsCH,UAA5C;AACA,QAAMI,gBAAgB,GACpBF,cAAc,KAAK,CAAnB,IACAC,eAAe,KAAK,CADpB,IAEAN,QAAQ,CAACK,cAAD,CAFR,IAGAL,QAAQ,CAACM,eAAD,CAJV;AAMA,MAAIC,gBAAJ,EAAsB,OAAO,CAAC;AAAEC,IAAAA,QAAQ,EAAEH,cAAZ;AAA4BI,IAAAA,SAAS,EAAEH;AAAvC,GAAD,CAAP;AAEtB,QAAMI,iBAAiB,GAAGR,SAAS,CAACS,MAAV,CAAiB,CAAC;AAAEC,IAAAA;AAAF,GAAD,KAAqBA,WAAtC,CAA1B;AACA,QAAMC,eAAe,GAAGH,iBAAiB,CAACI,MAAlB,GAA2BJ,iBAA3B,GAA+CR,SAAvE;AACAW,EAAAA,eAAe,CAACE,OAAhB,CAAwB,CAAC;AAAEP,IAAAA,QAAF;AAAYC,IAAAA;AAAZ,GAAD,KAA6B;AACnD,QAAIT,QAAQ,CAACQ,QAAD,CAAR,IAAsBR,QAAQ,CAACS,SAAD,CAAlC,EAA+CL,iBAAiB,CAACY,IAAlB,CAAuB;AAAER,MAAAA,QAAF;AAAYC,MAAAA;AAAZ,KAAvB;AAChD,GAFD;AAIA,SAAOL,iBAAP;AACD,CAnBD;;AAqBA,eAAeH,oBAAf","sourcesContent":["import isNumber from 'lodash.isnumber';\n\nconst getCenterCoordinates = (mapShapes, otherProps) => {\n  const centerCoordinates = [];\n\n  const { centerLatitude, centerLongitude } = otherProps;\n  const useDefaultCenter =\n    centerLatitude !== 0 &&\n    centerLongitude !== 0 &&\n    isNumber(centerLatitude) &&\n    isNumber(centerLongitude);\n\n  if (useDefaultCenter) return [{ latitude: centerLatitude, longitude: centerLongitude }];\n\n  const useAsCenterShapes = mapShapes.filter(({ useAsCenter }) => useAsCenter);\n  const shapesForCenter = useAsCenterShapes.length ? useAsCenterShapes : mapShapes;\n  shapesForCenter.forEach(({ latitude, longitude }) => {\n    if (isNumber(latitude) && isNumber(longitude)) centerCoordinates.push({ latitude, longitude });\n  });\n\n  return centerCoordinates;\n};\n\nexport default getCenterCoordinates;\n"],"file":"get-center-coordinates.js"}

package/lib-es/GoogleMaps/helpers/get-image-ids.js

@@ -1,18 +1,13 @@
-const getImageIds = (entityConfigs, entityData) => {
-  const images = [];
-  Object.keys(entityConfigs).forEach(entityConfig => {
-    const {
-      imageIds
-    } = entityConfigs[entityConfig];
-    images.push(...imageIds);
-
-    if (entityData[entityConfig] && entityData[entityConfig].length) {
-      entityData[entityConfig].forEach(entity => {
-        if (entity.imageId) images.push(entity.imageId);
-      });
-    }
+const getImageIds = mapShapes => {
+  const ids = [];
+  mapShapes.forEach(({
+    shapeData,
+    imageId
+  }) => {
+    if (imageId) ids.push(imageId);
+    if (shapeData.imageId) ids.push(shapeData.imageId);
   });
-  return images;
+  return [...new Set(ids)];
 };
 
 export default getImageIds;

package/lib-es/GoogleMaps/helpers/get-image-ids.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/GoogleMaps/helpers/get-image-ids.js"],"names":["getImageIds","entityConfigs","entityData","images","Object","keys","forEach","entityConfig","imageIds","push","length","entity","imageId"],"mappings":"AAAA,MAAMA,WAAW,GAAG,CAACC,aAAD,EAAgBC,UAAhB,KAA+B;AACjD,QAAMC,MAAM,GAAG,EAAf;AAEAC,EAAAA,MAAM,CAACC,IAAP,CAAYJ,aAAZ,EAA2BK,OAA3B,CAAmCC,YAAY,IAAI;AACjD,UAAM;AAAEC,MAAAA;AAAF,QAAeP,aAAa,CAACM,YAAD,CAAlC;AAEAJ,IAAAA,MAAM,CAACM,IAAP,CAAY,GAAGD,QAAf;;AAEA,QAAIN,UAAU,CAACK,YAAD,CAAV,IAA4BL,UAAU,CAACK,YAAD,CAAV,CAAyBG,MAAzD,EAAiE;AAC/DR,MAAAA,UAAU,CAACK,YAAD,CAAV,CAAyBD,OAAzB,CAAiCK,MAAM,IAAI;AACzC,YAAIA,MAAM,CAACC,OAAX,EAAoBT,MAAM,CAACM,IAAP,CAAYE,MAAM,CAACC,OAAnB;AACrB,OAFD;AAGD;AACF,GAVD;AAYA,SAAOT,MAAP;AACD,CAhBD;;AAkBA,eAAeH,WAAf","sourcesContent":["const getImageIds = (entityConfigs, entityData) => {\n  const images = [];\n\n  Object.keys(entityConfigs).forEach(entityConfig => {\n    const { imageIds } = entityConfigs[entityConfig];\n\n    images.push(...imageIds);\n\n    if (entityData[entityConfig] && entityData[entityConfig].length) {\n      entityData[entityConfig].forEach(entity => {\n        if (entity.imageId) images.push(entity.imageId);\n      });\n    }\n  });\n\n  return images;\n};\n\nexport default getImageIds;\n"],"file":"get-image-ids.js"}
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/get-image-ids.js"],"names":["getImageIds","mapShapes","ids","forEach","shapeData","imageId","push","Set"],"mappings":"AAAA,MAAMA,WAAW,GAAGC,SAAS,IAAI;AAC/B,QAAMC,GAAG,GAAG,EAAZ;AACAD,EAAAA,SAAS,CAACE,OAAV,CAAkB,CAAC;AAAEC,IAAAA,SAAF;AAAaC,IAAAA;AAAb,GAAD,KAA4B;AAC5C,QAAIA,OAAJ,EAAaH,GAAG,CAACI,IAAJ,CAASD,OAAT;AACb,QAAID,SAAS,CAACC,OAAd,EAAuBH,GAAG,CAACI,IAAJ,CAASF,SAAS,CAACC,OAAnB;AACxB,GAHD;AAIA,SAAO,CAAC,GAAG,IAAIE,GAAJ,CAAQL,GAAR,CAAJ,CAAP;AACD,CAPD;;AASA,eAAeF,WAAf","sourcesContent":["const getImageIds = mapShapes => {\n  const ids = [];\n  mapShapes.forEach(({ shapeData, imageId }) => {\n    if (imageId) ids.push(imageId);\n    if (shapeData.imageId) ids.push(shapeData.imageId);\n  });\n  return [...new Set(ids)];\n};\n\nexport default getImageIds;\n"],"file":"get-image-ids.js"}

package/lib-es/GoogleMaps/helpers/index.js

@@ -1,7 +1,9 @@
 import addZoomListener from './add-zoom-listener';
 import buildQuery from './build-query';
 import getImageIds from './get-image-ids';
-import setEntityConfigs from './set-entity-configs';
+import buildShapesConfig from './build-shapes-configs';
 import setMapOptions from './set-map-options';
-export { addZoomListener, buildQuery, getImageIds, setEntityConfigs, setMapOptions };
+import getCenterCoordinates from './get-center-coordinates';
+import buildMapShapes from './build-map-shapes';
+export { addZoomListener, buildQuery, getImageIds, buildShapesConfig, setMapOptions, getCenterCoordinates, buildMapShapes };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/GoogleMaps/helpers/index.js"],"names":["addZoomListener","buildQuery","getImageIds","setEntityConfigs","setMapOptions"],"mappings":"AAAA,OAAOA,eAAP,MAA4B,qBAA5B;AACA,OAAOC,UAAP,MAAuB,eAAvB;AACA,OAAOC,WAAP,MAAwB,iBAAxB;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,OAAOC,aAAP,MAA0B,mBAA1B;AAEA,SAASJ,eAAT,EAA0BC,UAA1B,EAAsCC,WAAtC,EAAmDC,gBAAnD,EAAqEC,aAArE","sourcesContent":["import addZoomListener from './add-zoom-listener';\nimport buildQuery from './build-query';\nimport getImageIds from './get-image-ids';\nimport setEntityConfigs from './set-entity-configs';\nimport setMapOptions from './set-map-options';\n\nexport { addZoomListener, buildQuery, getImageIds, setEntityConfigs, setMapOptions };\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/GoogleMaps/helpers/index.js"],"names":["addZoomListener","buildQuery","getImageIds","buildShapesConfig","setMapOptions","getCenterCoordinates","buildMapShapes"],"mappings":"AAAA,OAAOA,eAAP,MAA4B,qBAA5B;AACA,OAAOC,UAAP,MAAuB,eAAvB;AACA,OAAOC,WAAP,MAAwB,iBAAxB;AACA,OAAOC,iBAAP,MAA8B,wBAA9B;AACA,OAAOC,aAAP,MAA0B,mBAA1B;AACA,OAAOC,oBAAP,MAAiC,0BAAjC;AACA,OAAOC,cAAP,MAA2B,oBAA3B;AAEA,SACEN,eADF,EAEEC,UAFF,EAGEC,WAHF,EAIEC,iBAJF,EAKEC,aALF,EAMEC,oBANF,EAOEC,cAPF","sourcesContent":["import addZoomListener from './add-zoom-listener';\nimport buildQuery from './build-query';\nimport getImageIds from './get-image-ids';\nimport buildShapesConfig from './build-shapes-configs';\nimport setMapOptions from './set-map-options';\nimport getCenterCoordinates from './get-center-coordinates';\nimport buildMapShapes from './build-map-shapes';\n\nexport {\n  addZoomListener,\n  buildQuery,\n  getImageIds,\n  buildShapesConfig,\n  setMapOptions,\n  getCenterCoordinates,\n  buildMapShapes\n};\n"],"file":"index.js"}

package/lib-es/GoogleMaps/helpers/set-shapes.js

@@ -30,22 +30,21 @@ const closeInfoWindows = () => {
   }
 };
 
-const addShapeListeners = (map, router, shape, entityData, imageData, shapeInstance) => {
+const addShapeListeners = (map, router, shape, imageData, shapeInstance) => {
   const {
-    displayItems,
-    entity,
     enableInfoPane = false,
-    dataSummaries = []
+    dataSummaries = [],
+    url,
+    shapeData
   } = shape;
-  const url = getEntityUrl(displayItems, entity, entityData);
 
   if (enableInfoPane) {
     const infoWindow = new window.google.maps.InfoWindow({
       content: ''
     });
-    shapeInstance.addListener(CLICK, event => {
+    shapeInstance.addListener(CLICK, async event => {
       closeInfoWindows();
-      const content = ReactDOMServer.renderToString(InfoWindowContent(entityData, imageData, displayItems, dataSummaries, url));
+      const content = ReactDOMServer.renderToString(await infoWindowContent(imageData, dataSummaries, url, shapeData));
       infoWindow.setContent(content);
       infoWindow.setPosition(event.latLng);
       infoWindow.open(map, shapeInstance);
@@ -86,47 +85,17 @@ const areRectangleBoundsNumbers = bounds => bounds.every(bound => isNumber(bound
 
 const isPositionCorrect = (lat, lng) => isNumber(lat) && isNumber(lng);
 
-const getEntityUrl = (displayItems, entity, entityData) => {
-  let url = '';
-
-  if (entity && displayItems) {
-    const [entityId] = displayItems;
-    const [entityRecord] = entityData.filter(({
-      id
-    }) => id === entityId);
-
-    if (entityRecord) {
-      ({
-        url = ''
-      } = entityRecord);
-    }
-  }
-
-  return url;
-};
-
-const getImageUrl = (imageData, imageId) => {
-  const [image] = imageData.getFiles.filter(({
+const getIconUrl = (imageId, imageData) => {
+  if (!imageId) return '';
+  const image = imageData.find(({
     id
   }) => id === imageId);
-  if (image) return image.url;
-  return '';
+  if (!image || !image.url) return '';
+  return image.url;
 };
 
-const getIconUrl = (shape, imageData) => {
-  const {
-    imageId
-  } = shape;
-  if (!imageData.getFiles) return '';
-  return imageId ? getImageUrl(imageData, imageId) : '';
-};
-
-const InfoWindowContent = (entityData, imageData, displayItems, dataSummaries, url) => {
-  const [entityId] = displayItems;
-  const [entityRecordData] = entityData.filter(({
-    id
-  }) => id === entityId);
-  const summariesWithContent = dataSummaries.map(dataSummary => {
+const infoWindowContent = async (imageData, dataSummaries, url, shapeData) => {
+  const summariesWithContent = await Promise.all(dataSummaries.map(async dataSummary => {
     const {
       elementTitle,
       type,
@@ -135,13 +104,12 @@ const InfoWindowContent = (entityData, imageData, displayItems, dataSummaries, u
           otherProps = _objectWithoutProperties(dataSummary, _excluded);
 
     const isTypeHeading = type === HEADING_LARGE;
-    const summaryPropsWithContent = buildPropsToDisplayWithContent(entityRecordData, propsToDisplay);
+    const summaryPropsWithContent = buildPropsToDisplayWithContent(shapeData, propsToDisplay);
     const modifier = getClassModifiers(LIST, otherProps);
     const SummaryComponent = summaryComponents[type];
+    await SummaryComponent.render.preload(); // preload dynamic nextjs component
 
-    if (!summaryPropsWithContent.length) {
-      return null;
-    }
+    if (!summaryPropsWithContent.length) return null;
 
     const getDataSummaryComponent = () => {
       const component = /*#__PURE__*/React.createElement(SummaryComponent, {
@@ -157,12 +125,11 @@ const InfoWindowContent = (entityData, imageData, displayItems, dataSummaries, u
     };
 
     return getDataSummaryComponent();
-  });
-  let image = {};
+  }));
   const {
     imageId
-  } = entityRecordData || {};
-  if (imageId) [image] = imageData.getFiles.filter(({
+  } = shapeData || {};
+  const image = imageData.find(({
     id
   }) => id === imageId);
   const shouldShowImage = image && image.url;
@@ -186,19 +153,18 @@ const InfoWindowContent = (entityData, imageData, displayItems, dataSummaries, u
   return /*#__PURE__*/React.createElement(React.Fragment, null, shouldShowImage && getImageElement(), summariesWithContent);
 };
 
-const setMarker = (map, router, shape, data, imageData) => {
+const setMarker = (map, router, shape, imageData) => {
   const {
-    latitude,
-    longitude,
-    entity,
     label = '',
     markerWidth = 50,
-    markerHeight = 50
+    markerHeight = 50,
+    latitude,
+    longitude,
+    imageId
   } = shape;
 
   if (isPositionCorrect(latitude, longitude)) {
-    const entityData = entity ? data[entity] || [] : [];
-    const iconUrl = getIconUrl(shape, imageData);
+    const iconUrl = getIconUrl(imageId, imageData);
     const icon = iconUrl ? {
       url: iconUrl,
       scaledSize: new window.google.maps.Size(markerWidth || 50, markerHeight || 50)
@@ -212,60 +178,54 @@ const setMarker = (map, router, shape, data, imageData) => {
       icon,
       title: label || ''
     });
-    addShapeListeners(map, router, shape, entityData, imageData, marker);
+    addShapeListeners(map, router, shape, imageData, marker);
     shapesArray.push(marker);
     marker.setMap(map);
   }
 };
 
-const setPolyline = (map, router, shape, data, imageData) => {
+const setPolyline = (map, router, shape, imageData) => {
   const {
-    paths,
-    entity
+    paths
   } = shape;
   const path = getPath(paths);
 
   if (path.length) {
-    const entityData = entity ? data[entity] || [] : [];
     const polyline = new window.google.maps.Polyline(_objectSpread({
       path,
       geodesic: true
     }, setStyleOptions(shape)));
-    addShapeListeners(map, router, shape, entityData, imageData, polyline);
+    addShapeListeners(map, router, shape, imageData, polyline);
     shapesArray.push(polyline);
     polyline.setMap(map);
   }
 };
 
-const setPolygon = (map, router, shape, data, imageData) => {
+const setPolygon = (map, router, shape, imageData) => {
   const {
-    paths: unParsedPaths,
-    entity
+    paths: unParsedPaths
   } = shape;
   const paths = getPath(unParsedPaths);
 
   if (paths.length) {
-    const entityData = entity ? data[entity] || [] : [];
     const polygon = new window.google.maps.Polygon(_objectSpread({
       paths
     }, setStyleOptions(shape)));
-    addShapeListeners(map, router, shape, entityData, imageData, polygon);
+    addShapeListeners(map, router, shape, imageData, polygon);
     shapesArray.push(polygon);
     polygon.setMap(map);
   }
 };
 
-const setRectangle = (map, router, shape, data, imageData) => {
+const setRectangle = (map, router, shape, imageData) => {
   const {
     northBound,
     southBound,
     eastBound,
-    westBound,
-    entity
+    westBound
   } = shape;
 
   if (areRectangleBoundsNumbers([northBound, southBound, eastBound, westBound])) {
-    const entityData = entity ? data[entity] || [] : [];
     const rectangle = new window.google.maps.Rectangle(_objectSpread(_objectSpread({}, setStyleOptions(shape)), {}, {
       map,
       bounds: {
@@ -275,22 +235,20 @@ const setRectangle = (map, router, shape, data, imageData) => {
         west: westBound
       }
     }));
-    addShapeListeners(map, router, shape, entityData, imageData, rectangle);
+    addShapeListeners(map, router, shape, imageData, rectangle);
     shapesArray.push(rectangle);
     rectangle.setMap(map);
   }
 };
 
-const setCircle = (map, router, shape, data, imageData) => {
+const setCircle = (map, router, shape, imageData) => {
   const {
     latitude,
     longitude,
-    radius,
-    entity
+    radius
   } = shape;
 
   if (isPositionCorrect(latitude, longitude) && isNumber(radius)) {
-    const entityData = entity ? data[entity] || [] : [];
     const circle = new window.google.maps.Circle(_objectSpread(_objectSpread({}, setStyleOptions(shape)), {}, {
       map,
       center: {
@@ -299,62 +257,59 @@ const setCircle = (map, router, shape, data, imageData) => {
       },
       radius
     }));
-    addShapeListeners(map, router, shape, entityData, imageData, circle);
+    addShapeListeners(map, router, shape, imageData, circle);
     shapesArray.push(circle);
     circle.setMap(map);
   }
 };
 
-const setShapes = (map, router, shapes, data, imageData) => {
+const setShapes = (map, router, shapes, imageData) => {
   const mapZoom = map.getZoom();
   clearShapes();
+  shapes.forEach(shape => {
+    const {
+      type,
+      minZoom,
+      maxZoom
+    } = shape;
+
+    if (mapZoom >= minZoom && mapZoom <= maxZoom) {
+      switch (type) {
+        case MARKER:
+          {
+            setMarker(map, router, shape, imageData);
+            break;
+          }
+
+        case POLYLINE:
+          {
+            setPolyline(map, router, shape, imageData);
+            break;
+          }
 
-  if (shapes.length) {
-    shapes.forEach(shape => {
-      const {
-        type: shapeType,
-        minZoom,
-        maxZoom
-      } = shape;
-
-      if (mapZoom >= minZoom && mapZoom <= maxZoom) {
-        switch (shapeType) {
-          case MARKER:
-            {
-              setMarker(map, router, shape, data, imageData);
-              break;
-            }
-
-          case POLYLINE:
-            {
-              setPolyline(map, router, shape, data, imageData);
-              break;
-            }
-
-          case POLYGON:
-            {
-              setPolygon(map, router, shape, data, imageData);
-              break;
-            }
-
-          case RECTANGLE:
-            {
-              setRectangle(map, router, shape, data, imageData);
-              break;
-            }
-
-          case CIRCLE:
-            {
-              setCircle(map, router, shape, data, imageData);
-              break;
-            }
-
-          default:
+        case POLYGON:
+          {
+            setPolygon(map, router, shape, imageData);
             break;
-        }
+          }
+
+        case RECTANGLE:
+          {
+            setRectangle(map, router, shape, imageData);
+            break;
+          }
+
+        case CIRCLE:
+          {
+            setCircle(map, router, shape, imageData);
+            break;
+          }
+
+        default:
+          break;
       }
-    });
-  }
+    }
+  });
 };
 
 export default setShapes;