@hisptz/dhis2-analytics 2.1.16 → 2.1.18

package/dist/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.js

@@ -3,8 +3,11 @@
 var jsxRuntime = require('react/jsx-runtime');
 var ui = require('@dhis2/ui');
 var reactLeaflet = require('react-leaflet');
-var map_js = require('../../../../../../utils/map.js');
+var utils = require('../../../../../../utils');
 var CustomTooltip = require('../CustomTooltip/index.js');
+var LabelMarker = require('../LabelMarker');
+var geolib = require('geolib');
+var lodash = require('lodash');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -20,16 +23,27 @@ function Choropleth({
   data,
   legends,
   customEventHandlers,
-  onLayerClick
+  onLayerClick,
+  labelConfig
 }) {
   const { orgUnit } = data;
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsx(
+  const color = utils.getColorFromLegendSet(legends, data.data);
+  const center = geolib.getCenter(
+    lodash.chunk(
+      lodash.flattenDeep(orgUnit.geoJSON.geometry.coordinates),
+      2
+    ).map(([latitude, longitude]) => ({
+      longitude,
+      latitude
+    }))
+  );
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsxs(
     reactLeaflet.GeoJSON,
     {
       data: orgUnit.geoJSON,
       eventHandlers: {
-        mouseover: (e) => map_js.highlightFeature(e, highlightStyle),
-        mouseout: (e) => map_js.resetHighlight(e, defaultStyle),
+        mouseover: (e) => utils.highlightFeature(e, highlightStyle),
+        mouseout: (e) => utils.resetHighlight(e, defaultStyle),
         ...customEventHandlers ?? {},
         mousedown: (e) => {
           if (onLayerClick) {
@@ -37,13 +51,27 @@ function Choropleth({
           }
         }
       },
+      interactive: true,
       pathOptions: {
-        fillColor: map_js.getColorFromLegendSet(legends, data.data),
+        fillColor: color,
         fillOpacity: 1,
         color: ui.colors.grey900,
+        fill: true,
         weight: 1
       },
-      children: /* @__PURE__ */ jsxRuntime.jsx(CustomTooltip__default.default, { data })
+      children: [
+        labelConfig && /* @__PURE__ */ jsxRuntime.jsx(
+          LabelMarker.LabelMarker,
+          {
+            layerColor: color,
+            labelConfig,
+            data: data.data,
+            orgUnit,
+            center: [center.longitude, center.latitude]
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(CustomTooltip__default.default, { data })
+      ]
     },
     `${data.dataItem.id}-layer`
   ) });

package/dist/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.tsx"],"names":["jsx","Fragment","GeoJSON","highlightFeature","resetHighlight","getColorFromLegendSet","colors","CustomTooltip"],"mappings":";;;;;;;;;;;;AAcA,MAAM,YAAe,GAAA;AAAA,EACpB,MAAQ,EAAA;AACT,CAAA;AACA,MAAM,cAAiB,GAAA;AAAA,EACtB,MAAQ,EAAA;AACT,CAAA;AAQe,SAAR,UAA4B,CAAA;AAAA,EAClC,IAAA;AAAA,EACA,OAAA;AAAA,EACA,mBAAA;AAAA,EACA;AACD,CAKG,EAAA;AACF,EAAM,MAAA,EAAE,SAAY,GAAA,IAAA;AACpB,EAAA,uBAEEA,cAAA,CAAAC,mBAAA,EAAA,EAAA,QAAA,kBAAAD,cAAA;AAAA,IAACE,oBAAA;AAAA,IAAA;AAAA,MACA,MAAM,OAAQ,CAAA,OAAA;AAAA,MACd,aAAe,EAAA;AAAA,QACd,SAAW,EAAA,CAAC,CAAM,KAAAC,uBAAA,CAAiB,GAAG,cAAc,CAAA;AAAA,QACpD,QAAU,EAAA,CAAC,CAAM,KAAAC,qBAAA,CAAe,GAAG,YAAY,CAAA;AAAA,QAC/C,GAAI,uBAAuB,EAAC;AAAA,QAC5B,SAAA,EAAW,CAAC,CAAM,KAAA;AACjB,UAAA,IAAI,YAAc,EAAA;AACjB,YAAA,YAAA,CAAa,GAAG,IAAI,CAAA;AAAA;AACrB;AACD,OACD;AAAA,MACA,WAAa,EAAA;AAAA,QACZ,SAAW,EAAAC,4BAAA,CAAsB,OAAS,EAAA,IAAA,CAAK,IAAI,CAAA;AAAA,QACnD,WAAa,EAAA,CAAA;AAAA,QACb,OAAOC,SAAO,CAAA,OAAA;AAAA,QACd,MAAQ,EAAA;AAAA,OACT;AAAA,MAGA,QAAA,kBAAAN,cAAA,CAACO,kCAAc,IAAY,EAAA;AAAA,KAAA;AAAA,IAFtB,CAAA,EAAG,IAAK,CAAA,QAAA,CAAS,EAAE,CAAA,MAAA;AAAA,GAI1B,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { colors } from \"@dhis2/ui\";\nimport type { Legend } from \"@hisptz/dhis2-utils\";\nimport React from \"react\";\nimport { GeoJSON } from \"react-leaflet\";\nimport { MapOrgUnit } from \"../../../../../../interfaces/index.js\";\nimport {\n\tgetColorFromLegendSet,\n\thighlightFeature,\n\tresetHighlight,\n} from \"../../../../../../utils/map.js\";\nimport { ThematicLayerDataItem } from \"../../../../interfaces/index.js\";\nimport CustomTooltip from \"../CustomTooltip/index.js\";\nimport type { LeafletEventHandlerFnMap, LeafletMouseEvent } from \"leaflet\";\n\nconst defaultStyle = {\n\tweight: 1,\n};\nconst highlightStyle = {\n\tweight: 2,\n};\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport default function Choropleth({\n\tdata,\n\tlegends,\n\tcustomEventHandlers,\n\tonLayerClick,\n}: {\n\tdata: LayerData;\n\tlegends: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n}) {\n\tconst { orgUnit } = data;\n\treturn (\n\t\t<>\n\t\t\t<GeoJSON\n\t\t\t\tdata={orgUnit.geoJSON}\n\t\t\t\teventHandlers={{\n\t\t\t\t\tmouseover: (e) => highlightFeature(e, highlightStyle),\n\t\t\t\t\tmouseout: (e) => resetHighlight(e, defaultStyle),\n\t\t\t\t\t...(customEventHandlers ?? {}),\n\t\t\t\t\tmousedown: (e) => {\n\t\t\t\t\t\tif (onLayerClick) {\n\t\t\t\t\t\t\tonLayerClick(e, data);\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t}}\n\t\t\t\tpathOptions={{\n\t\t\t\t\tfillColor: getColorFromLegendSet(legends, data.data),\n\t\t\t\t\tfillOpacity: 1,\n\t\t\t\t\tcolor: colors.grey900,\n\t\t\t\t\tweight: 1,\n\t\t\t\t}}\n\t\t\t\tkey={`${data.dataItem.id}-layer`}\n\t\t\t>\n\t\t\t\t<CustomTooltip data={data} />\n\t\t\t</GeoJSON>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.tsx"],"names":["getColorFromLegendSet","getCenter","chunk","flattenDeep","jsx","Fragment","jsxs","GeoJSON","highlightFeature","resetHighlight","colors","LabelMarker","CustomTooltip"],"mappings":";;;;;;;;;;;;;;;AAoBA,MAAM,YAAe,GAAA;AAAA,EACpB,MAAQ,EAAA;AACT,CAAA;AACA,MAAM,cAAiB,GAAA;AAAA,EACtB,MAAQ,EAAA;AACT,CAAA;AAQe,SAAR,UAA4B,CAAA;AAAA,EAClC,IAAA;AAAA,EACA,OAAA;AAAA,EACA,mBAAA;AAAA,EACA,YAAA;AAAA,EACA;AACD,CAMG,EAAA;AACF,EAAM,MAAA,EAAE,SAAY,GAAA,IAAA;AACpB,EAAA,MAAM,KAAQ,GAAAA,2BAAA,CAAsB,OAAS,EAAA,IAAA,CAAK,IAAI,CAAA;AAEtD,EAAA,MAAM,MAAS,GAAAC,gBAAA;AAAA,IACdC,YAAA;AAAA,MACCC,kBAAoB,CAAA,OAAA,CAAQ,OAAQ,CAAA,QAAA,CAAS,WAAW,CAAA;AAAA,MACxD;AAAA,MACC,GAAI,CAAA,CAAC,CAAC,QAAA,EAAU,SAAS,CAAiB,MAAA;AAAA,MAC3C,SAAA;AAAA,MACA;AAAA,KACC,CAAA;AAAA,GACH;AAKA,EAAA,uBAEEC,cAAA,CAAAC,mBAAA,EAAA,EAAA,QAAA,kBAAAC,eAAA;AAAA,IAACC,oBAAA;AAAA,IAAA;AAAA,MACA,MAAM,OAAQ,CAAA,OAAA;AAAA,MACd,aAAe,EAAA;AAAA,QACd,SAAW,EAAA,CAAC,CAAM,KAAAC,sBAAA,CAAiB,GAAG,cAAc,CAAA;AAAA,QACpD,QAAU,EAAA,CAAC,CAAM,KAAAC,oBAAA,CAAe,GAAG,YAAY,CAAA;AAAA,QAC/C,GAAI,uBAAuB,EAAC;AAAA,QAC5B,SAAA,EAAW,CAAC,CAAM,KAAA;AACjB,UAAA,IAAI,YAAc,EAAA;AACjB,YAAA,YAAA,CAAa,GAAG,IAAI,CAAA;AAAA;AACrB;AACD,OACD;AAAA,MACA,WAAW,EAAA,IAAA;AAAA,MACX,WAAa,EAAA;AAAA,QACZ,SAAW,EAAA,KAAA;AAAA,QACX,WAAa,EAAA,CAAA;AAAA,QACb,OAAOC,SAAO,CAAA,OAAA;AAAA,QACd,IAAM,EAAA,IAAA;AAAA,QACN,MAAQ,EAAA;AAAA,OACT;AAAA,MAGC,QAAA,EAAA;AAAA,QACA,WAAA,oBAAAN,cAAA;AAAA,UAACO,uBAAA;AAAA,UAAA;AAAA,YACA,UAAY,EAAA,KAAA;AAAA,YACZ,WAAA;AAAA,YACA,MAAM,IAAK,CAAA,IAAA;AAAA,YACX,OAAA;AAAA,YACA,MAAQ,EAAA,CAAC,MAAO,CAAA,SAAA,EAAW,OAAO,QAAQ;AAAA;AAAA,SAC3C;AAAA,wBAEDP,cAAA,CAACQ,kCAAc,IAAY,EAAA;AAAA;AAAA,KAAA;AAAA,IAXtB,CAAA,EAAG,IAAK,CAAA,QAAA,CAAS,EAAE,CAAA,MAAA;AAAA,GAa1B,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { colors } from \"@dhis2/ui\";\nimport type { Legend } from \"@hisptz/dhis2-utils\";\nimport React from \"react\";\nimport { GeoJSON } from \"react-leaflet\";\nimport { MapOrgUnit } from \"../../../../../../interfaces\";\nimport {\n\tgetColorFromLegendSet,\n\thighlightFeature,\n\tresetHighlight,\n} from \"../../../../../../utils\";\nimport {\n\ttype LayerLabelConfig,\n\tThematicLayerDataItem,\n} from \"../../../../interfaces\";\nimport CustomTooltip from \"../CustomTooltip/index.js\";\nimport { type LeafletEventHandlerFnMap, type LeafletMouseEvent } from \"leaflet\";\nimport { LabelMarker } from \"../LabelMarker\";\nimport { getCenter } from \"geolib\";\nimport { chunk, flattenDeep } from \"lodash\";\n\nconst defaultStyle = {\n\tweight: 1,\n};\nconst highlightStyle = {\n\tweight: 2,\n};\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport default function Choropleth({\n\tdata,\n\tlegends,\n\tcustomEventHandlers,\n\tonLayerClick,\n\tlabelConfig,\n}: {\n\tdata: LayerData;\n\tlegends: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tlabelConfig?: LayerLabelConfig;\n}) {\n\tconst { orgUnit } = data;\n\tconst color = getColorFromLegendSet(legends, data.data);\n\n\tconst center = getCenter(\n\t\tchunk<number>(\n\t\t\tflattenDeep<number>(orgUnit.geoJSON.geometry.coordinates),\n\t\t\t2,\n\t\t).map(([latitude, longitude]: number[]) => ({\n\t\t\tlongitude,\n\t\t\tlatitude,\n\t\t})),\n\t) as {\n\t\tlongitude: number;\n\t\tlatitude: number;\n\t};\n\n\treturn (\n\t\t<>\n\t\t\t<GeoJSON\n\t\t\t\tdata={orgUnit.geoJSON}\n\t\t\t\teventHandlers={{\n\t\t\t\t\tmouseover: (e) => highlightFeature(e, highlightStyle),\n\t\t\t\t\tmouseout: (e) => resetHighlight(e, defaultStyle),\n\t\t\t\t\t...(customEventHandlers ?? {}),\n\t\t\t\t\tmousedown: (e) => {\n\t\t\t\t\t\tif (onLayerClick) {\n\t\t\t\t\t\t\tonLayerClick(e, data);\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t}}\n\t\t\t\tinteractive\n\t\t\t\tpathOptions={{\n\t\t\t\t\tfillColor: color,\n\t\t\t\t\tfillOpacity: 1,\n\t\t\t\t\tcolor: colors.grey900,\n\t\t\t\t\tfill: true,\n\t\t\t\t\tweight: 1,\n\t\t\t\t}}\n\t\t\t\tkey={`${data.dataItem.id}-layer`}\n\t\t\t>\n\t\t\t\t{labelConfig && (\n\t\t\t\t\t<LabelMarker\n\t\t\t\t\t\tlayerColor={color}\n\t\t\t\t\t\tlabelConfig={labelConfig}\n\t\t\t\t\t\tdata={data.data}\n\t\t\t\t\t\torgUnit={orgUnit}\n\t\t\t\t\t\tcenter={[center.longitude, center.latitude]}\n\t\t\t\t\t/>\n\t\t\t\t)}\n\t\t\t\t<CustomTooltip data={data} />\n\t\t\t</GeoJSON>\n\t\t</>\n\t);\n}\n"]}

package/dist/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.js

@@ -0,0 +1,35 @@
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var reactLeaflet = require('react-leaflet');
+var label = require('../../utils/label');
+var L = require('leaflet');
+require('./label.css');
+var color = require('../../../../../../../DHIS2PivotTable/utils/color');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var L__default = /*#__PURE__*/_interopDefault(L);
+
+function LabelMarker({
+  labelConfig,
+  data,
+  orgUnit,
+  center,
+  layerColor
+}) {
+  const label$1 = label.getLabel({
+    labelConfig,
+    data,
+    orgUnit
+  });
+  const labelIcon = L__default.default.divIcon({
+    className: "label-icon",
+    html: `<span style="color: ${color.getTextColorFromBackgroundColor(layerColor)}; text-align: center; font-size: 12px">${label$1}</span>`
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(reactLeaflet.Marker, { zIndexOffset: 1e3, icon: labelIcon, position: center });
+}
+
+exports.LabelMarker = LabelMarker;
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/dist/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.tsx"],"names":["label","getLabel","L","getTextColorFromBackgroundColor","Marker"],"mappings":";;;;;;;;;;;;;AAOO,SAAS,WAAY,CAAA;AAAA,EAC3B,WAAA;AAAA,EACA,IAAA;AAAA,EACA,OAAA;AAAA,EACA,MAAA;AAAA,EACA;AACD,CAMG,EAAA;AACF,EAAA,MAAMA,UAAQC,cAAS,CAAA;AAAA,IACtB,WAAA;AAAA,IACA,IAAA;AAAA,IACA;AAAA,GACA,CAAA;AAED,EAAM,MAAA,SAAA,GAAYC,mBAAE,OAAQ,CAAA;AAAA,IAC3B,SAAW,EAAA,YAAA;AAAA,IACX,MAAM,CAAuB,oBAAA,EAAAC,qCAAA,CAAgC,UAAU,CAAC,0CAA0CH,OAAK,CAAA,OAAA;AAAA,GACvH,CAAA;AAED,EAAA,sCAAQI,mBAAO,EAAA,EAAA,YAAA,EAAc,KAAM,IAAM,EAAA,SAAA,EAAW,UAAU,MAAQ,EAAA,CAAA;AACvE","file":"index.js","sourcesContent":["import { Marker } from \"react-leaflet\";\nimport { getLabel } from \"../../utils/label\";\nimport type { LayerLabelConfig } from \"../../../../interfaces\";\nimport L, { type LatLngExpression } from \"leaflet\";\nimport \"./label.css\";\nimport { getTextColorFromBackgroundColor } from \"../../../../../../../DHIS2PivotTable/utils/color\";\n\nexport function LabelMarker({\n\tlabelConfig,\n\tdata,\n\torgUnit,\n\tcenter,\n\tlayerColor,\n}: {\n\tlabelConfig: LayerLabelConfig;\n\tdata: number | undefined;\n\torgUnit: { name: string };\n\tcenter: LatLngExpression;\n\tlayerColor: string;\n}) {\n\tconst label = getLabel({\n\t\tlabelConfig,\n\t\tdata,\n\t\torgUnit,\n\t});\n\n\tconst labelIcon = L.divIcon({\n\t\tclassName: \"label-icon\",\n\t\thtml: `<span style=\"color: ${getTextColorFromBackgroundColor(layerColor)}; text-align: center; font-size: 12px\">${label}</span>`,\n\t});\n\n\treturn <Marker zIndexOffset={1000} icon={labelIcon} position={center} />;\n}\n"]}

package/dist/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/label.css

@@ -0,0 +1,11 @@
+.label-icon {
+  background: transparent;
+  border: none;
+  font-size: 12px;
+  font-weight: bold;
+  text-align: center;
+  white-space: nowrap;
+  pointer-events: none;
+  margin: auto;
+}
+/*# sourceMappingURL=label.css.map */

package/dist/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/label.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/label.css"],"sourcesContent":[".label-icon {\n    background: transparent;\n    border: none;\n    font-size: 12px;\n    font-weight: bold;\n    text-align: center;\n    white-space: nowrap;\n    pointer-events: none; /* prevents label from blocking map clicks */\n    margin: auto\n}\n"],"mappings":"AAAA,CAAC;AACG,cAAY;AACZ,UAAQ;AACR,aAAW;AACX,eAAa;AACb,cAAY;AACZ,eAAa;AACb,kBAAgB;AAChB,UAAQ;AACZ;","names":[]}

package/dist/components/Map/components/MapLayer/components/ThematicLayer/index.js

@@ -44,6 +44,7 @@ function ThematicLayer({
           (datum) => type === "choropleth" ? /* @__PURE__ */ jsxRuntime.jsx(
             Choropleth__default.default,
             {
+              labelConfig: layer.labelConfig,
               customEventHandlers,
               onLayerClick,
               legends: legends ?? [],

package/dist/components/Map/components/MapLayer/components/ThematicLayer/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/index.tsx"],"names":["useThematicLayer","jsx","Fragment","LayersControl","Pane","LayerGroup","Choropleth","Bubble","last"],"mappings":";;;;;;;;;;;;;;;AAQe,SAAR,aAA+B,CAAA;AAAA,EACrC,OAAA;AAAA,EACA;AACD,CAGG,EAAA;AACF,EAAM,MAAA,KAAA,GAAQA,kCAAiB,OAAO,CAAA;AAEtC,EAAA,IAAI,CAAC,KAAO,EAAA;AACX,IAAO,OAAA,IAAA;AAAA;AAGR,EAAM,MAAA;AAAA,IACL,IAAA;AAAA,IACA,QAAA;AAAA,IACA,IAAA;AAAA,IACA,IAAA;AAAA,IACA,OAAA;AAAA,IACA,OAAA;AAAA,IACA,mBAAA;AAAA,IACA;AAAA,GACD,GAAI,SAAS,EAAC;AACd,EAAM,MAAA,UAAA,GAAa,QAAQ,QAAS,CAAA,WAAA;AACpC,EACC,uBAAAC,cAAA,CAAAC,mBAAA,EAAA,EACC,yCAACC,0BAAc,CAAA,OAAA,EAAd,EAAsB,OAAS,EAAA,OAAA,EAAS,MAAM,UAC9C,EAAA,QAAA,kBAAAF,cAAA;AAAA,IAACG,iBAAA;AAAA,IAAA;AAAA,MACA,KAAO,EAAA;AAAA,QACN,MAAQ,EAAA,IAAA,KAAS,QAAW,GAAA,GAAA,GAAM,OAAO,KAAQ,GAAA,CAAA;AAAA,OAClD;AAAA,MACA,IAAM,EAAA,UAAA;AAAA,MAEN,0CAACC,uBACC,EAAA,EAAA,QAAA,EAAA;AAAA,QAAM,IAAA,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,YACR,mBAAAJ,cAAA;AAAA,YAACK,2BAAA;AAAA,YAAA;AAAA,cACA,mBAAA;AAAA,cACA,YAAA;AAAA,cACA,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA,SACL;AAAA,QACC,IAAM,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,QACR,mBAAAL,cAAA;AAAA,YAACM,uBAAA;AAAA,YAAA;AAAA,cACA,QACE,KAA6B,EAAA,MAAA;AAAA,cAE/B,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,WAAa,EAAAC,WAAA,CAAK,IAAI,CAAA,EAAG,IAAQ,IAAA,CAAA;AAAA,cACjC,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA;AACL,OACD,EAAA;AAAA;AAAA,KAEF,CACD,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { last } from \"lodash\";\nimport React from \"react\";\nimport { LayerGroup, LayersControl, Pane } from \"react-leaflet\";\nimport { CustomBubbleLayer } from \"../../interfaces/index.js\";\nimport Bubble from \"./components/Bubble/index.js\";\nimport Choropleth from \"./components/Choropleth/index.js\";\nimport useThematicLayer from \"./hooks/config.js\";\n\nexport default function ThematicLayer({\n\tlayerId,\n\tindex,\n}: {\n\tlayerId: string;\n\tindex: number;\n}) {\n\tconst layer = useThematicLayer(layerId);\n\n\tif (!layer) {\n\t\treturn null;\n\t}\n\n\tconst {\n\t\ttype,\n\t\tdataItem,\n\t\tname,\n\t\tdata,\n\t\tenabled,\n\t\tlegends,\n\t\tcustomEventHandlers,\n\t\tonLayerClick,\n\t} = layer ?? {};\n\tconst uniqueName = name ?? dataItem.displayName;\n\treturn (\n\t\t<>\n\t\t\t<LayersControl.Overlay checked={enabled} name={uniqueName}>\n\t\t\t\t<Pane\n\t\t\t\t\tstyle={{\n\t\t\t\t\t\tzIndex: type === \"bubble\" ? 500 : 500 - (index + 1),\n\t\t\t\t\t}}\n\t\t\t\t\tname={uniqueName}\n\t\t\t\t>\n\t\t\t\t\t<LayerGroup>\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"choropleth\" ? (\n\t\t\t\t\t\t\t\t<Choropleth\n\t\t\t\t\t\t\t\t\tcustomEventHandlers={customEventHandlers}\n\t\t\t\t\t\t\t\t\tonLayerClick={onLayerClick}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"bubble\" ? (\n\t\t\t\t\t\t\t\t<Bubble\n\t\t\t\t\t\t\t\t\tradius={\n\t\t\t\t\t\t\t\t\t\t(layer as CustomBubbleLayer)?.radius\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\thighestData={last(data)?.data ?? 1}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t</LayerGroup>\n\t\t\t\t</Pane>\n\t\t\t</LayersControl.Overlay>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/index.tsx"],"names":["useThematicLayer","jsx","Fragment","LayersControl","Pane","LayerGroup","Choropleth","Bubble","last"],"mappings":";;;;;;;;;;;;;;;AAQe,SAAR,aAA+B,CAAA;AAAA,EACrC,OAAA;AAAA,EACA;AACD,CAGG,EAAA;AACF,EAAM,MAAA,KAAA,GAAQA,kCAAiB,OAAO,CAAA;AAEtC,EAAA,IAAI,CAAC,KAAO,EAAA;AACX,IAAO,OAAA,IAAA;AAAA;AAGR,EAAM,MAAA;AAAA,IACL,IAAA;AAAA,IACA,QAAA;AAAA,IACA,IAAA;AAAA,IACA,IAAA;AAAA,IACA,OAAA;AAAA,IACA,OAAA;AAAA,IACA,mBAAA;AAAA,IACA;AAAA,GACD,GAAI,SAAS,EAAC;AACd,EAAM,MAAA,UAAA,GAAa,QAAQ,QAAS,CAAA,WAAA;AACpC,EACC,uBAAAC,cAAA,CAAAC,mBAAA,EAAA,EACC,yCAACC,0BAAc,CAAA,OAAA,EAAd,EAAsB,OAAS,EAAA,OAAA,EAAS,MAAM,UAC9C,EAAA,QAAA,kBAAAF,cAAA;AAAA,IAACG,iBAAA;AAAA,IAAA;AAAA,MACA,KAAO,EAAA;AAAA,QACN,MAAQ,EAAA,IAAA,KAAS,QAAW,GAAA,GAAA,GAAM,OAAO,KAAQ,GAAA,CAAA;AAAA,OAClD;AAAA,MACA,IAAM,EAAA,UAAA;AAAA,MAEN,0CAACC,uBACC,EAAA,EAAA,QAAA,EAAA;AAAA,QAAM,IAAA,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,YACR,mBAAAJ,cAAA;AAAA,YAACK,2BAAA;AAAA,YAAA;AAAA,cACA,aAAa,KAAM,CAAA,WAAA;AAAA,cACnB,mBAAA;AAAA,cACA,YAAA;AAAA,cACA,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA,SACL;AAAA,QACC,IAAM,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,QACR,mBAAAL,cAAA;AAAA,YAACM,uBAAA;AAAA,YAAA;AAAA,cACA,QACE,KAA6B,EAAA,MAAA;AAAA,cAE/B,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,WAAa,EAAAC,WAAA,CAAK,IAAI,CAAA,EAAG,IAAQ,IAAA,CAAA;AAAA,cACjC,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA;AACL,OACD,EAAA;AAAA;AAAA,KAEF,CACD,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { last } from \"lodash\";\nimport React from \"react\";\nimport { LayerGroup, LayersControl, Pane } from \"react-leaflet\";\nimport { CustomBubbleLayer } from \"../../interfaces\";\nimport Bubble from \"./components/Bubble/index.js\";\nimport Choropleth from \"./components/Choropleth/index.js\";\nimport useThematicLayer from \"./hooks/config.js\";\n\nexport default function ThematicLayer({\n\tlayerId,\n\tindex,\n}: {\n\tlayerId: string;\n\tindex: number;\n}) {\n\tconst layer = useThematicLayer(layerId);\n\n\tif (!layer) {\n\t\treturn null;\n\t}\n\n\tconst {\n\t\ttype,\n\t\tdataItem,\n\t\tname,\n\t\tdata,\n\t\tenabled,\n\t\tlegends,\n\t\tcustomEventHandlers,\n\t\tonLayerClick,\n\t} = layer ?? {};\n\tconst uniqueName = name ?? dataItem.displayName;\n\treturn (\n\t\t<>\n\t\t\t<LayersControl.Overlay checked={enabled} name={uniqueName}>\n\t\t\t\t<Pane\n\t\t\t\t\tstyle={{\n\t\t\t\t\t\tzIndex: type === \"bubble\" ? 500 : 500 - (index + 1),\n\t\t\t\t\t}}\n\t\t\t\t\tname={uniqueName}\n\t\t\t\t>\n\t\t\t\t\t<LayerGroup>\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"choropleth\" ? (\n\t\t\t\t\t\t\t\t<Choropleth\n\t\t\t\t\t\t\t\t\tlabelConfig={layer.labelConfig}\n\t\t\t\t\t\t\t\t\tcustomEventHandlers={customEventHandlers}\n\t\t\t\t\t\t\t\t\tonLayerClick={onLayerClick}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"bubble\" ? (\n\t\t\t\t\t\t\t\t<Bubble\n\t\t\t\t\t\t\t\t\tradius={\n\t\t\t\t\t\t\t\t\t\t(layer as CustomBubbleLayer)?.radius\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\thighestData={last(data)?.data ?? 1}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t</LayerGroup>\n\t\t\t\t</Pane>\n\t\t\t</LayersControl.Overlay>\n\t\t</>\n\t);\n}\n"]}

package/dist/components/Map/components/MapLayer/components/ThematicLayer/utils/label.js

@@ -0,0 +1,20 @@
+'use strict';
+
+var lodash = require('lodash');
+
+const valueFormatter = Intl.NumberFormat(navigator.language).format;
+function getLabel({
+  orgUnit,
+  data,
+  labelConfig
+}) {
+  lodash.templateSettings.interpolate = /{([\s\S]+?)}/g;
+  return lodash.template(labelConfig.labelTemplate.replace(/\n/g, "<br />"))({
+    name: orgUnit.name,
+    value: data ? valueFormatter(data) : ""
+  });
+}
+
+exports.getLabel = getLabel;
+//# sourceMappingURL=label.js.map
+//# sourceMappingURL=label.js.map

package/dist/components/Map/components/MapLayer/components/ThematicLayer/utils/label.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/utils/label.ts"],"names":["templateSettings","template"],"mappings":";;;;AAGA,MAAM,cAAiB,GAAA,IAAA,CAAK,YAAa,CAAA,SAAA,CAAU,QAAQ,CAAE,CAAA,MAAA;AAEtD,SAAS,QAAS,CAAA;AAAA,EACxB,OAAA;AAAA,EACA,IAAA;AAAA,EACA;AACD,CAIG,EAAA;AACF,EAAAA,uBAAA,CAAiB,WAAc,GAAA,eAAA;AAE/B,EAAA,OAAOC,gBAAS,WAAY,CAAA,aAAA,CAAc,QAAQ,KAAO,EAAA,QAAQ,CAAC,CAAE,CAAA;AAAA,IACnE,MAAM,OAAQ,CAAA,IAAA;AAAA,IACd,KAAO,EAAA,IAAA,GAAO,cAAe,CAAA,IAAI,CAAI,GAAA;AAAA,GACrC,CAAA;AACF","file":"label.js","sourcesContent":["import { template, templateSettings } from \"lodash\";\nimport type { LayerLabelConfig } from \"../../../interfaces\";\n\nconst valueFormatter = Intl.NumberFormat(navigator.language).format;\n\nexport function getLabel({\n\torgUnit,\n\tdata,\n\tlabelConfig,\n}: {\n\tlabelConfig: LayerLabelConfig;\n\torgUnit: { name: string };\n\tdata?: number;\n}) {\n\ttemplateSettings.interpolate = /{([\\s\\S]+?)}/g;\n\n\treturn template(labelConfig.labelTemplate.replace(/\\n/g, \"<br />\"))({\n\t\tname: orgUnit.name,\n\t\tvalue: data ? valueFormatter(data) : \"\",\n\t});\n}\n"]}

package/dist/components/Map/components/MapLayer/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/components/Map/components/MapLayer/interfaces/index.ts"],"names":[],"mappings":";;AAUO,MAAM,6BAAgC,GAAA;AAAA,EAC5C,YAAA;AAAA,EACA,YAAA;AAAA,EACA,WAAA;AAAA,EACA;AACD","file":"index.js","sourcesContent":["import type { Legend } from \"@hisptz/dhis2-utils\";\nimport { MapOrgUnit, PointOrgUnit } from \"../../../interfaces/index.js\";\nimport { LegendColorScale } from \"../../../utils/colors.js\";\nimport { EarthEngineOptions } from \"../components/GoogleEngineLayer/interfaces/index.js\";\nimport { EarthEngine } from \"../components/GoogleEngineLayer/services/engine.js\";\nimport type { LeafletEventHandlerFnMap, LeafletMouseEvent } from \"leaflet\";\n\nexport type BoundaryLayerType = \"basemap\" | \"overlay\";\nexport type ThematicLayerType = \"choropleth\" | \"bubble\";\n\nexport const SUPPORTED_EARTH_ENGINE_LAYERS = [\n\t\"population\",\n\t\"footprints\",\n\t\"elevation\",\n\t\"landCover\",\n];\n\nexport type GoogleEngineLayerType =\n\t| \"population\"\n\t| \"footprints\"\n\t| \"elevation\"\n\t| \"landCover\";\n\nexport interface CustomBoundaryLayer extends CustomMapLayer {\n\tid: string;\n\ttype: BoundaryLayerType;\n\tenabled: boolean;\n}\n\nexport interface EarthEngineLayerConfig extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\taggregations?: string[];\n\tname?: string;\n\tfilters?: {\n\t\tperiod: string;\n\t};\n\tparams?: {\n\t\tmin: number;\n\t\tmax: number;\n\t\tpalette?: string;\n\t};\n}\n\nexport interface CustomGoogleEngineLayer extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\toptions: EarthEngineOptions;\n\taggregations?: string[];\n\tname: string;\n\turl: string;\n\tengine?: EarthEngine;\n}\n\nexport interface CustomPointLayer extends CustomMapLayer {\n\tid: string;\n\ttype: \"point\";\n\tlabel?: string;\n\tlevel?: string | number;\n\tgroup?: string;\n\tstyle?: {\n\t\ticon?: string;\n\t\tgroupSet?: string;\n\t\torgUnitGroups?: Array<{ name: string; symbol: string }>;\n\t};\n\tpoints?: Array<PointOrgUnit>;\n}\n\nexport type DataItemType = \"dataElement\" | \"indicator\" | \"programIndicator\";\n\nexport interface ThematicLayerDataItem {\n\tid: string;\n\tdisplayName: string;\n\ttype: DataItemType;\n\tlegendSet?: string;\n\tlegendConfig?: {\n\t\tcolorClass: LegendColorScale;\n\t\tscale: number;\n\t};\n}\n\nexport interface ThematicLayerControl {\n\tposition: \"topleft\" | \"topright\" | \"bottomleft\" | \"bottomright\";\n\tenabled: boolean;\n}\n\nexport interface ThematicLayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport interface ThematicLayerRawData {\n\torgUnit: string;\n\tdata?: number;\n\tdataItem: string;\n}\n\nexport interface CustomChoroplethLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"choropleth\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n}\n\nexport interface CustomBubbleLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"bubble\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport type CustomThematicLayer = CustomBubbleLayer | CustomChoroplethLayer;\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem?: ThematicLayerDataItem;\n}\n\nexport interface ThematicLayerConfig {\n\tid: string;\n\tdata?: ThematicLayerRawData[];\n\tenabled: boolean;\n\tname?: string;\n\tdataItem: ThematicLayerDataItem;\n\ttype: ThematicLayerType;\n\tcontrol?: ThematicLayerControl;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport interface CustomMapLayer {\n\tid: string;\n\ttype: string;\n\tenabled: boolean;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n}\n\nexport type MapLayer =\n\t| CustomBoundaryLayer\n\t| ThematicLayerConfig\n\t| CustomPointLayer\n\t| CustomGoogleEngineLayer;\n\nexport interface MapLayerProps {\n\tenabled: boolean;\n\ttype: \"boundary\" | \"thematic\" | \"external\" | \"point\" | \"earthEngine\";\n\tlayer: MapLayer;\n}\n"]}
+{"version":3,"sources":["../../../../../../src/components/Map/components/MapLayer/interfaces/index.ts"],"names":[],"mappings":";;AAUO,MAAM,6BAAgC,GAAA;AAAA,EAC5C,YAAA;AAAA,EACA,YAAA;AAAA,EACA,WAAA;AAAA,EACA;AACD","file":"index.js","sourcesContent":["import type { Legend } from \"@hisptz/dhis2-utils\";\nimport { MapOrgUnit, PointOrgUnit } from \"../../../interfaces\";\nimport { LegendColorScale } from \"../../../utils\";\nimport { EarthEngineOptions } from \"../components/GoogleEngineLayer/interfaces\";\nimport { EarthEngine } from \"../components/GoogleEngineLayer/services/engine.js\";\nimport type { LeafletEventHandlerFnMap, LeafletMouseEvent } from \"leaflet\";\n\nexport type BoundaryLayerType = \"basemap\" | \"overlay\";\nexport type ThematicLayerType = \"choropleth\" | \"bubble\";\n\nexport const SUPPORTED_EARTH_ENGINE_LAYERS = [\n\t\"population\",\n\t\"footprints\",\n\t\"elevation\",\n\t\"landCover\",\n];\n\nexport type GoogleEngineLayerType =\n\t| \"population\"\n\t| \"footprints\"\n\t| \"elevation\"\n\t| \"landCover\";\n\nexport interface CustomBoundaryLayer extends CustomMapLayer {\n\tid: string;\n\ttype: BoundaryLayerType;\n\tenabled: boolean;\n}\n\nexport interface EarthEngineLayerConfig extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\taggregations?: string[];\n\tname?: string;\n\tfilters?: {\n\t\tperiod: string;\n\t};\n\tparams?: {\n\t\tmin: number;\n\t\tmax: number;\n\t\tpalette?: string;\n\t};\n}\n\nexport interface CustomGoogleEngineLayer extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\toptions: EarthEngineOptions;\n\taggregations?: string[];\n\tname: string;\n\turl: string;\n\tengine?: EarthEngine;\n}\n\nexport interface CustomPointLayer extends CustomMapLayer {\n\tid: string;\n\ttype: \"point\";\n\tlabel?: string;\n\tlevel?: string | number;\n\tgroup?: string;\n\tstyle?: {\n\t\ticon?: string;\n\t\tgroupSet?: string;\n\t\torgUnitGroups?: Array<{ name: string; symbol: string }>;\n\t};\n\tpoints?: Array<PointOrgUnit>;\n}\n\nexport type DataItemType = \"dataElement\" | \"indicator\" | \"programIndicator\";\n\nexport interface ThematicLayerDataItem {\n\tid: string;\n\tdisplayName: string;\n\ttype: DataItemType;\n\tlegendSet?: string;\n\tlegendConfig?: {\n\t\tcolorClass: LegendColorScale;\n\t\tscale: number;\n\t};\n}\n\nexport interface ThematicLayerControl {\n\tposition: \"topleft\" | \"topright\" | \"bottomleft\" | \"bottomright\";\n\tenabled: boolean;\n}\n\nexport interface ThematicLayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport interface ThematicLayerRawData {\n\torgUnit: string;\n\tdata?: number;\n\tdataItem: string;\n}\n\nexport interface CustomChoroplethLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"choropleth\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n}\n\nexport interface CustomBubbleLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"bubble\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport type CustomThematicLayer = CustomBubbleLayer | CustomChoroplethLayer;\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem?: ThematicLayerDataItem;\n}\n\nexport type LayerLabelConfig = {\n\tlabels: boolean;\n\tlabelFontWeight: string;\n\tlabelTemplate: string;\n};\n\nexport interface ThematicLayerConfig {\n\tid: string;\n\tdata?: ThematicLayerRawData[];\n\tenabled: boolean;\n\tname?: string;\n\tdataItem: ThematicLayerDataItem;\n\ttype: ThematicLayerType;\n\tcontrol?: ThematicLayerControl;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tlabelConfig?: LayerLabelConfig;\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport interface CustomMapLayer {\n\tid: string;\n\ttype: string;\n\tenabled: boolean;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tlabelConfig?: LayerLabelConfig;\n}\n\nexport type MapLayer =\n\t| CustomBoundaryLayer\n\t| ThematicLayerConfig\n\t| CustomPointLayer\n\t| CustomGoogleEngineLayer;\n\nexport interface MapLayerProps {\n\tenabled: boolean;\n\ttype: \"boundary\" | \"thematic\" | \"external\" | \"point\" | \"earthEngine\";\n\tlayer: MapLayer;\n}\n"]}

package/dist/components/Map/components/MapProvider/index.js

@@ -6,9 +6,9 @@ var i18n = require('@dhis2/d2-i18n');
 var ui = require('@dhis2/ui');
 var lodash = require('lodash');
 var react = require('react');
-var index_js = require('../../state/index.js');
-var map_js = require('../../utils/map.js');
-var dhis2Utils = require('@hisptz/dhis2-utils');
+var state = require('../../state');
+var utils = require('../../utils');
+var src = require('@hisptz/dhis2-utils/src');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -23,10 +23,10 @@ const boundaryQuery = {
   },
   analytics: {
     resource: "analytics",
-    params: ({ orgUnitIds }) => ({
+    params: ({ orgUnitIds, periodIds }) => ({
       dimension: [
         `ou:${orgUnitIds.join(";")}`,
-        `pe:${(/* @__PURE__ */ new Date()).getFullYear()}`
+        `pe:${periodIds.join(";")}`
       ],
       skipData: true,
       hierarchyMeta: true
@@ -39,16 +39,20 @@ function MapProvider({
   periodSelection
 }) {
   const [orgUnits, setOrgUnits] = react.useState([]);
+  const [periods, setPeriods] = react.useState([]);
   const { refetch, loading, error } = appRuntime.useDataQuery(boundaryQuery, {
     lazy: true
   });
   react.useEffect(() => {
     async function getOrgUnits() {
-      const rawOrgUnitIds = map_js.getOrgUnitsSelection(orgUnitSelection);
-      const data = await refetch({ orgUnitIds: rawOrgUnitIds });
+      const rawOrgUnitIds = utils.getOrgUnitsSelection(orgUnitSelection);
+      const data = await refetch({
+        orgUnitIds: rawOrgUnitIds,
+        periodIds: periodSelection?.periods
+      });
       const { analytics, boundaries } = data ?? {};
-      const rawOrgUnits = map_js.sanitizeOrgUnits(analytics?.metaData);
-      const geoJSONObjects = map_js.toGeoJson(
+      const rawOrgUnits = utils.sanitizeOrgUnits(analytics?.metaData);
+      const geoJSONObjects = utils.toGeoJson(
         boundaries.filter((bound) => bound.co)
       );
       const orgUnits2 = lodash.compact(
@@ -67,6 +71,11 @@ function MapProvider({
           };
         })
       );
+      const periodIds = analytics?.metaData?.dimensions?.pe ?? periodSelection?.periods;
+      const periods2 = periodIds.map(
+        (pe) => src.PeriodUtility.getPeriodById(pe)
+      );
+      setPeriods(periods2);
       setOrgUnits(orgUnits2);
     }
     getOrgUnits().catch((error2) => console.log(error2));
@@ -81,12 +90,9 @@ function MapProvider({
       error.message
     ] }) }) });
   }
-  const periods = lodash.compact(
-    periodSelection?.periods?.map((pe) => dhis2Utils.PeriodUtility.getPeriodById(pe))
-  );
   if (!lodash.isEmpty(orgUnits)) {
-    return /* @__PURE__ */ jsxRuntime.jsx(index_js.MapOrgUnitContext.Provider, { value: { orgUnitSelection, orgUnits }, children: /* @__PURE__ */ jsxRuntime.jsx(
-      index_js.MapPeriodContext.Provider,
+    return /* @__PURE__ */ jsxRuntime.jsx(state.MapOrgUnitContext.Provider, { value: { orgUnitSelection, orgUnits }, children: /* @__PURE__ */ jsxRuntime.jsx(
+      state.MapPeriodContext.Provider,
       {
         value: { ...periodSelection, periods },
         children

package/dist/components/Map/components/MapProvider/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/components/Map/components/MapProvider/index.tsx"],"names":["useState","useDataQuery","useEffect","getOrgUnitsSelection","sanitizeOrgUnits","toGeoJson","orgUnits","compact","error","jsx","Center","CircularLoader","jsxs","i18n","PeriodUtility","isEmpty","MapOrgUnitContext","MapPeriodContext"],"mappings":"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","file":"index.js","sourcesContent":["import { useDataQuery } from \"@dhis2/app-runtime\";\nimport i18n from \"@dhis2/d2-i18n\";\nimport { Center, CircularLoader } from \"@dhis2/ui\";\nimport { compact, isEmpty } from \"lodash\";\nimport React, { useEffect, useState } from \"react\";\nimport { MapOrgUnit, MapProviderProps } from \"../../interfaces/index.js\";\nimport { MapOrgUnitContext, MapPeriodContext } from \"../../state/index.js\";\nimport {\n\tgetOrgUnitsSelection,\n\tsanitizeOrgUnits,\n\ttoGeoJson,\n} from \"../../utils/map.js\";\nimport { BasePeriod, PeriodUtility } from \"@hisptz/dhis2-utils\";\n\nconst boundaryQuery = {\n\tboundaries: {\n\t\tresource: \"geoFeatures\",\n\t\tparams: ({ orgUnitIds }: any) => ({\n\t\t\tou: `ou:${orgUnitIds?.join(\";\")}`,\n\t\t}),\n\t},\n\tanalytics: {\n\t\tresource: \"analytics\",\n\t\tparams: ({ orgUnitIds }: any) => ({\n\t\t\tdimension: [\n\t\t\t\t`ou:${orgUnitIds.join(\";\")}`,\n\t\t\t\t`pe:${new Date().getFullYear()}`,\n\t\t\t],\n\t\t\tskipData: true,\n\t\t\thierarchyMeta: true,\n\t\t}),\n\t},\n};\n\nexport function MapProvider({\n\tchildren,\n\torgUnitSelection,\n\tperiodSelection,\n}: MapProviderProps) {\n\tconst [orgUnits, setOrgUnits] = useState<MapOrgUnit[]>([]);\n\tconst { refetch, loading, error } = useDataQuery(boundaryQuery, {\n\t\tlazy: true,\n\t});\n\n\tuseEffect(() => {\n\t\tasync function getOrgUnits() {\n\t\t\tconst rawOrgUnitIds = getOrgUnitsSelection(orgUnitSelection);\n\t\t\tconst data = await refetch({ orgUnitIds: rawOrgUnitIds });\n\t\t\tconst { analytics, boundaries } = (data as any) ?? {};\n\t\t\tconst rawOrgUnits = sanitizeOrgUnits(analytics?.metaData);\n\t\t\tconst geoJSONObjects = toGeoJson(\n\t\t\t\tboundaries.filter((bound: any) => bound.co),\n\t\t\t);\n\t\t\tconst orgUnits: MapOrgUnit[] = compact(\n\t\t\t\trawOrgUnits.map((orgUnit: any) => {\n\t\t\t\t\tconst geoJSONObject: any = geoJSONObjects?.find(\n\t\t\t\t\t\t(geoJSON: any) => geoJSON.properties.id === orgUnit.id,\n\t\t\t\t\t);\n\n\t\t\t\t\tif (!geoJSONObject) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\t...orgUnit,\n\t\t\t\t\t\tgeoJSON: geoJSONObject,\n\t\t\t\t\t\tbounds: [],\n\t\t\t\t\t\tlevel: geoJSONObject.properties.level,\n\t\t\t\t\t};\n\t\t\t\t}),\n\t\t\t);\n\t\t\tsetOrgUnits(orgUnits);\n\t\t}\n\n\t\tgetOrgUnits().catch((error) => console.log(error));\n\t}, [orgUnitSelection, refetch]);\n\n\tif (loading) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<CircularLoader small />\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (error) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<h4>\n\t\t\t\t\t\t{i18n.t(\"Error\")}: {error.message}\n\t\t\t\t\t</h4>\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tconst periods: BasePeriod[] = compact(\n\t\tperiodSelection?.periods?.map((pe) => PeriodUtility.getPeriodById(pe)),\n\t);\n\n\tif (!isEmpty(orgUnits)) {\n\t\treturn (\n\t\t\t<MapOrgUnitContext.Provider value={{ orgUnitSelection, orgUnits }}>\n\t\t\t\t<MapPeriodContext.Provider\n\t\t\t\t\tvalue={{ ...periodSelection, periods }}\n\t\t\t\t>\n\t\t\t\t\t{children}\n\t\t\t\t</MapPeriodContext.Provider>\n\t\t\t</MapOrgUnitContext.Provider>\n\t\t);\n\t}\n\n\treturn null;\n}\n"]}
+{"version":3,"sources":["../../../../../src/components/Map/components/MapProvider/index.tsx"],"names":["useState","useDataQuery","useEffect","getOrgUnitsSelection","sanitizeOrgUnits","toGeoJson","orgUnits","compact","periods","PeriodUtility","error","jsx","Center","CircularLoader","jsxs","i18n","isEmpty","MapOrgUnitContext","MapPeriodContext"],"mappings":"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","file":"index.js","sourcesContent":["import { useDataQuery } from \"@dhis2/app-runtime\";\nimport i18n from \"@dhis2/d2-i18n\";\nimport { Center, CircularLoader } from \"@dhis2/ui\";\nimport { compact, isEmpty } from \"lodash\";\nimport React, { useEffect, useState } from \"react\";\nimport { MapOrgUnit, MapProviderProps } from \"../../interfaces\";\nimport { MapOrgUnitContext, MapPeriodContext } from \"../../state\";\nimport { getOrgUnitsSelection, sanitizeOrgUnits, toGeoJson } from \"../../utils\";\nimport { BasePeriod, PeriodUtility } from \"@hisptz/dhis2-utils/src\";\n\nconst boundaryQuery = {\n\tboundaries: {\n\t\tresource: \"geoFeatures\",\n\t\tparams: ({ orgUnitIds }: any) => ({\n\t\t\tou: `ou:${orgUnitIds?.join(\";\")}`,\n\t\t}),\n\t},\n\tanalytics: {\n\t\tresource: \"analytics\",\n\t\tparams: ({ orgUnitIds, periodIds }: any) => ({\n\t\t\tdimension: [\n\t\t\t\t`ou:${orgUnitIds.join(\";\")}`,\n\t\t\t\t`pe:${periodIds.join(\";\")}`,\n\t\t\t],\n\t\t\tskipData: true,\n\t\t\thierarchyMeta: true,\n\t\t}),\n\t},\n};\n\nexport function MapProvider({\n\tchildren,\n\torgUnitSelection,\n\tperiodSelection,\n}: MapProviderProps) {\n\tconst [orgUnits, setOrgUnits] = useState<MapOrgUnit[]>([]);\n\tconst [periods, setPeriods] = useState<BasePeriod[]>([]);\n\tconst { refetch, loading, error } = useDataQuery(boundaryQuery, {\n\t\tlazy: true,\n\t});\n\n\tuseEffect(() => {\n\t\tasync function getOrgUnits() {\n\t\t\tconst rawOrgUnitIds = getOrgUnitsSelection(orgUnitSelection);\n\t\t\tconst data = await refetch({\n\t\t\t\torgUnitIds: rawOrgUnitIds,\n\t\t\t\tperiodIds: periodSelection?.periods,\n\t\t\t});\n\t\t\tconst { analytics, boundaries } = (data as any) ?? {};\n\t\t\tconst rawOrgUnits = sanitizeOrgUnits(analytics?.metaData);\n\t\t\tconst geoJSONObjects = toGeoJson(\n\t\t\t\tboundaries.filter((bound: any) => bound.co),\n\t\t\t);\n\t\t\tconst orgUnits: MapOrgUnit[] = compact(\n\t\t\t\trawOrgUnits.map((orgUnit: any) => {\n\t\t\t\t\tconst geoJSONObject: any = geoJSONObjects?.find(\n\t\t\t\t\t\t(geoJSON: any) => geoJSON.properties.id === orgUnit.id,\n\t\t\t\t\t);\n\n\t\t\t\t\tif (!geoJSONObject) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\t...orgUnit,\n\t\t\t\t\t\tgeoJSON: geoJSONObject,\n\t\t\t\t\t\tbounds: [],\n\t\t\t\t\t\tlevel: geoJSONObject.properties.level,\n\t\t\t\t\t};\n\t\t\t\t}),\n\t\t\t);\n\t\t\tconst periodIds =\n\t\t\t\tanalytics?.metaData?.dimensions?.pe ?? periodSelection?.periods;\n\t\t\tconst periods = periodIds.map((pe: string) =>\n\t\t\t\tPeriodUtility.getPeriodById(pe),\n\t\t\t);\n\t\t\tsetPeriods(periods);\n\t\t\tsetOrgUnits(orgUnits);\n\t\t}\n\n\t\tgetOrgUnits().catch((error) => console.log(error));\n\t}, [orgUnitSelection, refetch]);\n\n\tif (loading) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<CircularLoader small />\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (error) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<h4>\n\t\t\t\t\t\t{i18n.t(\"Error\")}: {error.message}\n\t\t\t\t\t</h4>\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (!isEmpty(orgUnits)) {\n\t\treturn (\n\t\t\t<MapOrgUnitContext.Provider value={{ orgUnitSelection, orgUnits }}>\n\t\t\t\t<MapPeriodContext.Provider\n\t\t\t\t\tvalue={{ ...periodSelection, periods }}\n\t\t\t\t>\n\t\t\t\t\t{children}\n\t\t\t\t</MapPeriodContext.Provider>\n\t\t\t</MapOrgUnitContext.Provider>\n\t\t);\n\t}\n\n\treturn null;\n}\n"]}

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.js

@@ -1,8 +1,11 @@
-import { jsx, Fragment } from 'react/jsx-runtime';
+import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { colors } from '@dhis2/ui';
 import { GeoJSON } from 'react-leaflet';
-import { getColorFromLegendSet, resetHighlight, highlightFeature } from '../../../../../../utils/map.js';
+import { getColorFromLegendSet, resetHighlight, highlightFeature } from '../../../../../../utils';
 import CustomTooltip from '../CustomTooltip/index.js';
+import { LabelMarker } from '../LabelMarker';
+import { getCenter } from 'geolib';
+import { chunk, flattenDeep } from 'lodash';
 
 const defaultStyle = {
   weight: 1
@@ -14,10 +17,21 @@ function Choropleth({
   data,
   legends,
   customEventHandlers,
-  onLayerClick
+  onLayerClick,
+  labelConfig
 }) {
   const { orgUnit } = data;
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(
+  const color = getColorFromLegendSet(legends, data.data);
+  const center = getCenter(
+    chunk(
+      flattenDeep(orgUnit.geoJSON.geometry.coordinates),
+      2
+    ).map(([latitude, longitude]) => ({
+      longitude,
+      latitude
+    }))
+  );
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(
     GeoJSON,
     {
       data: orgUnit.geoJSON,
@@ -31,13 +45,27 @@ function Choropleth({
           }
         }
       },
+      interactive: true,
       pathOptions: {
-        fillColor: getColorFromLegendSet(legends, data.data),
+        fillColor: color,
         fillOpacity: 1,
         color: colors.grey900,
+        fill: true,
         weight: 1
       },
-      children: /* @__PURE__ */ jsx(CustomTooltip, { data })
+      children: [
+        labelConfig && /* @__PURE__ */ jsx(
+          LabelMarker,
+          {
+            layerColor: color,
+            labelConfig,
+            data: data.data,
+            orgUnit,
+            center: [center.longitude, center.latitude]
+          }
+        ),
+        /* @__PURE__ */ jsx(CustomTooltip, { data })
+      ]
     },
     `${data.dataItem.id}-layer`
   ) });

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.tsx"],"names":[],"mappings":";;;;;;AAcA,MAAM,YAAe,GAAA;AAAA,EACpB,MAAQ,EAAA;AACT,CAAA;AACA,MAAM,cAAiB,GAAA;AAAA,EACtB,MAAQ,EAAA;AACT,CAAA;AAQe,SAAR,UAA4B,CAAA;AAAA,EAClC,IAAA;AAAA,EACA,OAAA;AAAA,EACA,mBAAA;AAAA,EACA;AACD,CAKG,EAAA;AACF,EAAM,MAAA,EAAE,SAAY,GAAA,IAAA;AACpB,EAAA,uBAEE,GAAA,CAAA,QAAA,EAAA,EAAA,QAAA,kBAAA,GAAA;AAAA,IAAC,OAAA;AAAA,IAAA;AAAA,MACA,MAAM,OAAQ,CAAA,OAAA;AAAA,MACd,aAAe,EAAA;AAAA,QACd,SAAW,EAAA,CAAC,CAAM,KAAA,gBAAA,CAAiB,GAAG,cAAc,CAAA;AAAA,QACpD,QAAU,EAAA,CAAC,CAAM,KAAA,cAAA,CAAe,GAAG,YAAY,CAAA;AAAA,QAC/C,GAAI,uBAAuB,EAAC;AAAA,QAC5B,SAAA,EAAW,CAAC,CAAM,KAAA;AACjB,UAAA,IAAI,YAAc,EAAA;AACjB,YAAA,YAAA,CAAa,GAAG,IAAI,CAAA;AAAA;AACrB;AACD,OACD;AAAA,MACA,WAAa,EAAA;AAAA,QACZ,SAAW,EAAA,qBAAA,CAAsB,OAAS,EAAA,IAAA,CAAK,IAAI,CAAA;AAAA,QACnD,WAAa,EAAA,CAAA;AAAA,QACb,OAAO,MAAO,CAAA,OAAA;AAAA,QACd,MAAQ,EAAA;AAAA,OACT;AAAA,MAGA,QAAA,kBAAA,GAAA,CAAC,iBAAc,IAAY,EAAA;AAAA,KAAA;AAAA,IAFtB,CAAA,EAAG,IAAK,CAAA,QAAA,CAAS,EAAE,CAAA,MAAA;AAAA,GAI1B,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { colors } from \"@dhis2/ui\";\nimport type { Legend } from \"@hisptz/dhis2-utils\";\nimport React from \"react\";\nimport { GeoJSON } from \"react-leaflet\";\nimport { MapOrgUnit } from \"../../../../../../interfaces/index.js\";\nimport {\n\tgetColorFromLegendSet,\n\thighlightFeature,\n\tresetHighlight,\n} from \"../../../../../../utils/map.js\";\nimport { ThematicLayerDataItem } from \"../../../../interfaces/index.js\";\nimport CustomTooltip from \"../CustomTooltip/index.js\";\nimport type { LeafletEventHandlerFnMap, LeafletMouseEvent } from \"leaflet\";\n\nconst defaultStyle = {\n\tweight: 1,\n};\nconst highlightStyle = {\n\tweight: 2,\n};\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport default function Choropleth({\n\tdata,\n\tlegends,\n\tcustomEventHandlers,\n\tonLayerClick,\n}: {\n\tdata: LayerData;\n\tlegends: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n}) {\n\tconst { orgUnit } = data;\n\treturn (\n\t\t<>\n\t\t\t<GeoJSON\n\t\t\t\tdata={orgUnit.geoJSON}\n\t\t\t\teventHandlers={{\n\t\t\t\t\tmouseover: (e) => highlightFeature(e, highlightStyle),\n\t\t\t\t\tmouseout: (e) => resetHighlight(e, defaultStyle),\n\t\t\t\t\t...(customEventHandlers ?? {}),\n\t\t\t\t\tmousedown: (e) => {\n\t\t\t\t\t\tif (onLayerClick) {\n\t\t\t\t\t\t\tonLayerClick(e, data);\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t}}\n\t\t\t\tpathOptions={{\n\t\t\t\t\tfillColor: getColorFromLegendSet(legends, data.data),\n\t\t\t\t\tfillOpacity: 1,\n\t\t\t\t\tcolor: colors.grey900,\n\t\t\t\t\tweight: 1,\n\t\t\t\t}}\n\t\t\t\tkey={`${data.dataItem.id}-layer`}\n\t\t\t>\n\t\t\t\t<CustomTooltip data={data} />\n\t\t\t</GeoJSON>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.tsx"],"names":[],"mappings":";;;;;;;;;AAoBA,MAAM,YAAe,GAAA;AAAA,EACpB,MAAQ,EAAA;AACT,CAAA;AACA,MAAM,cAAiB,GAAA;AAAA,EACtB,MAAQ,EAAA;AACT,CAAA;AAQe,SAAR,UAA4B,CAAA;AAAA,EAClC,IAAA;AAAA,EACA,OAAA;AAAA,EACA,mBAAA;AAAA,EACA,YAAA;AAAA,EACA;AACD,CAMG,EAAA;AACF,EAAM,MAAA,EAAE,SAAY,GAAA,IAAA;AACpB,EAAA,MAAM,KAAQ,GAAA,qBAAA,CAAsB,OAAS,EAAA,IAAA,CAAK,IAAI,CAAA;AAEtD,EAAA,MAAM,MAAS,GAAA,SAAA;AAAA,IACd,KAAA;AAAA,MACC,WAAoB,CAAA,OAAA,CAAQ,OAAQ,CAAA,QAAA,CAAS,WAAW,CAAA;AAAA,MACxD;AAAA,MACC,GAAI,CAAA,CAAC,CAAC,QAAA,EAAU,SAAS,CAAiB,MAAA;AAAA,MAC3C,SAAA;AAAA,MACA;AAAA,KACC,CAAA;AAAA,GACH;AAKA,EAAA,uBAEE,GAAA,CAAA,QAAA,EAAA,EAAA,QAAA,kBAAA,IAAA;AAAA,IAAC,OAAA;AAAA,IAAA;AAAA,MACA,MAAM,OAAQ,CAAA,OAAA;AAAA,MACd,aAAe,EAAA;AAAA,QACd,SAAW,EAAA,CAAC,CAAM,KAAA,gBAAA,CAAiB,GAAG,cAAc,CAAA;AAAA,QACpD,QAAU,EAAA,CAAC,CAAM,KAAA,cAAA,CAAe,GAAG,YAAY,CAAA;AAAA,QAC/C,GAAI,uBAAuB,EAAC;AAAA,QAC5B,SAAA,EAAW,CAAC,CAAM,KAAA;AACjB,UAAA,IAAI,YAAc,EAAA;AACjB,YAAA,YAAA,CAAa,GAAG,IAAI,CAAA;AAAA;AACrB;AACD,OACD;AAAA,MACA,WAAW,EAAA,IAAA;AAAA,MACX,WAAa,EAAA;AAAA,QACZ,SAAW,EAAA,KAAA;AAAA,QACX,WAAa,EAAA,CAAA;AAAA,QACb,OAAO,MAAO,CAAA,OAAA;AAAA,QACd,IAAM,EAAA,IAAA;AAAA,QACN,MAAQ,EAAA;AAAA,OACT;AAAA,MAGC,QAAA,EAAA;AAAA,QACA,WAAA,oBAAA,GAAA;AAAA,UAAC,WAAA;AAAA,UAAA;AAAA,YACA,UAAY,EAAA,KAAA;AAAA,YACZ,WAAA;AAAA,YACA,MAAM,IAAK,CAAA,IAAA;AAAA,YACX,OAAA;AAAA,YACA,MAAQ,EAAA,CAAC,MAAO,CAAA,SAAA,EAAW,OAAO,QAAQ;AAAA;AAAA,SAC3C;AAAA,wBAED,GAAA,CAAC,iBAAc,IAAY,EAAA;AAAA;AAAA,KAAA;AAAA,IAXtB,CAAA,EAAG,IAAK,CAAA,QAAA,CAAS,EAAE,CAAA,MAAA;AAAA,GAa1B,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { colors } from \"@dhis2/ui\";\nimport type { Legend } from \"@hisptz/dhis2-utils\";\nimport React from \"react\";\nimport { GeoJSON } from \"react-leaflet\";\nimport { MapOrgUnit } from \"../../../../../../interfaces\";\nimport {\n\tgetColorFromLegendSet,\n\thighlightFeature,\n\tresetHighlight,\n} from \"../../../../../../utils\";\nimport {\n\ttype LayerLabelConfig,\n\tThematicLayerDataItem,\n} from \"../../../../interfaces\";\nimport CustomTooltip from \"../CustomTooltip/index.js\";\nimport { type LeafletEventHandlerFnMap, type LeafletMouseEvent } from \"leaflet\";\nimport { LabelMarker } from \"../LabelMarker\";\nimport { getCenter } from \"geolib\";\nimport { chunk, flattenDeep } from \"lodash\";\n\nconst defaultStyle = {\n\tweight: 1,\n};\nconst highlightStyle = {\n\tweight: 2,\n};\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport default function Choropleth({\n\tdata,\n\tlegends,\n\tcustomEventHandlers,\n\tonLayerClick,\n\tlabelConfig,\n}: {\n\tdata: LayerData;\n\tlegends: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tlabelConfig?: LayerLabelConfig;\n}) {\n\tconst { orgUnit } = data;\n\tconst color = getColorFromLegendSet(legends, data.data);\n\n\tconst center = getCenter(\n\t\tchunk<number>(\n\t\t\tflattenDeep<number>(orgUnit.geoJSON.geometry.coordinates),\n\t\t\t2,\n\t\t).map(([latitude, longitude]: number[]) => ({\n\t\t\tlongitude,\n\t\t\tlatitude,\n\t\t})),\n\t) as {\n\t\tlongitude: number;\n\t\tlatitude: number;\n\t};\n\n\treturn (\n\t\t<>\n\t\t\t<GeoJSON\n\t\t\t\tdata={orgUnit.geoJSON}\n\t\t\t\teventHandlers={{\n\t\t\t\t\tmouseover: (e) => highlightFeature(e, highlightStyle),\n\t\t\t\t\tmouseout: (e) => resetHighlight(e, defaultStyle),\n\t\t\t\t\t...(customEventHandlers ?? {}),\n\t\t\t\t\tmousedown: (e) => {\n\t\t\t\t\t\tif (onLayerClick) {\n\t\t\t\t\t\t\tonLayerClick(e, data);\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t}}\n\t\t\t\tinteractive\n\t\t\t\tpathOptions={{\n\t\t\t\t\tfillColor: color,\n\t\t\t\t\tfillOpacity: 1,\n\t\t\t\t\tcolor: colors.grey900,\n\t\t\t\t\tfill: true,\n\t\t\t\t\tweight: 1,\n\t\t\t\t}}\n\t\t\t\tkey={`${data.dataItem.id}-layer`}\n\t\t\t>\n\t\t\t\t{labelConfig && (\n\t\t\t\t\t<LabelMarker\n\t\t\t\t\t\tlayerColor={color}\n\t\t\t\t\t\tlabelConfig={labelConfig}\n\t\t\t\t\t\tdata={data.data}\n\t\t\t\t\t\torgUnit={orgUnit}\n\t\t\t\t\t\tcenter={[center.longitude, center.latitude]}\n\t\t\t\t\t/>\n\t\t\t\t)}\n\t\t\t\t<CustomTooltip data={data} />\n\t\t\t</GeoJSON>\n\t\t</>\n\t);\n}\n"]}

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.js

@@ -0,0 +1,29 @@
+import { jsx } from 'react/jsx-runtime';
+import { Marker } from 'react-leaflet';
+import { getLabel } from '../../utils/label';
+import L from 'leaflet';
+import './label.css';
+import { getTextColorFromBackgroundColor } from '../../../../../../../DHIS2PivotTable/utils/color';
+
+function LabelMarker({
+  labelConfig,
+  data,
+  orgUnit,
+  center,
+  layerColor
+}) {
+  const label = getLabel({
+    labelConfig,
+    data,
+    orgUnit
+  });
+  const labelIcon = L.divIcon({
+    className: "label-icon",
+    html: `<span style="color: ${getTextColorFromBackgroundColor(layerColor)}; text-align: center; font-size: 12px">${label}</span>`
+  });
+  return /* @__PURE__ */ jsx(Marker, { zIndexOffset: 1e3, icon: labelIcon, position: center });
+}
+
+export { LabelMarker };
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.tsx"],"names":[],"mappings":";;;;;;;AAOO,SAAS,WAAY,CAAA;AAAA,EAC3B,WAAA;AAAA,EACA,IAAA;AAAA,EACA,OAAA;AAAA,EACA,MAAA;AAAA,EACA;AACD,CAMG,EAAA;AACF,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACtB,WAAA;AAAA,IACA,IAAA;AAAA,IACA;AAAA,GACA,CAAA;AAED,EAAM,MAAA,SAAA,GAAY,EAAE,OAAQ,CAAA;AAAA,IAC3B,SAAW,EAAA,YAAA;AAAA,IACX,MAAM,CAAuB,oBAAA,EAAA,+BAAA,CAAgC,UAAU,CAAC,0CAA0C,KAAK,CAAA,OAAA;AAAA,GACvH,CAAA;AAED,EAAA,2BAAQ,MAAO,EAAA,EAAA,YAAA,EAAc,KAAM,IAAM,EAAA,SAAA,EAAW,UAAU,MAAQ,EAAA,CAAA;AACvE","file":"index.js","sourcesContent":["import { Marker } from \"react-leaflet\";\nimport { getLabel } from \"../../utils/label\";\nimport type { LayerLabelConfig } from \"../../../../interfaces\";\nimport L, { type LatLngExpression } from \"leaflet\";\nimport \"./label.css\";\nimport { getTextColorFromBackgroundColor } from \"../../../../../../../DHIS2PivotTable/utils/color\";\n\nexport function LabelMarker({\n\tlabelConfig,\n\tdata,\n\torgUnit,\n\tcenter,\n\tlayerColor,\n}: {\n\tlabelConfig: LayerLabelConfig;\n\tdata: number | undefined;\n\torgUnit: { name: string };\n\tcenter: LatLngExpression;\n\tlayerColor: string;\n}) {\n\tconst label = getLabel({\n\t\tlabelConfig,\n\t\tdata,\n\t\torgUnit,\n\t});\n\n\tconst labelIcon = L.divIcon({\n\t\tclassName: \"label-icon\",\n\t\thtml: `<span style=\"color: ${getTextColorFromBackgroundColor(layerColor)}; text-align: center; font-size: 12px\">${label}</span>`,\n\t});\n\n\treturn <Marker zIndexOffset={1000} icon={labelIcon} position={center} />;\n}\n"]}

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/label.css

@@ -0,0 +1,11 @@
+.label-icon {
+  background: transparent;
+  border: none;
+  font-size: 12px;
+  font-weight: bold;
+  text-align: center;
+  white-space: nowrap;
+  pointer-events: none;
+  margin: auto;
+}
+/*# sourceMappingURL=label.css.map */

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/label.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/label.css"],"sourcesContent":[".label-icon {\n    background: transparent;\n    border: none;\n    font-size: 12px;\n    font-weight: bold;\n    text-align: center;\n    white-space: nowrap;\n    pointer-events: none; /* prevents label from blocking map clicks */\n    margin: auto\n}\n"],"mappings":"AAAA,CAAC;AACG,cAAY;AACZ,UAAQ;AACR,aAAW;AACX,eAAa;AACb,cAAY;AACZ,eAAa;AACb,kBAAgB;AAChB,UAAQ;AACZ;","names":[]}

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/index.js

@@ -36,6 +36,7 @@ function ThematicLayer({
           (datum) => type === "choropleth" ? /* @__PURE__ */ jsx(
             Choropleth,
             {
+              labelConfig: layer.labelConfig,
               customEventHandlers,
               onLayerClick,
               legends: legends ?? [],

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/index.tsx"],"names":[],"mappings":";;;;;;;AAQe,SAAR,aAA+B,CAAA;AAAA,EACrC,OAAA;AAAA,EACA;AACD,CAGG,EAAA;AACF,EAAM,MAAA,KAAA,GAAQ,iBAAiB,OAAO,CAAA;AAEtC,EAAA,IAAI,CAAC,KAAO,EAAA;AACX,IAAO,OAAA,IAAA;AAAA;AAGR,EAAM,MAAA;AAAA,IACL,IAAA;AAAA,IACA,QAAA;AAAA,IACA,IAAA;AAAA,IACA,IAAA;AAAA,IACA,OAAA;AAAA,IACA,OAAA;AAAA,IACA,mBAAA;AAAA,IACA;AAAA,GACD,GAAI,SAAS,EAAC;AACd,EAAM,MAAA,UAAA,GAAa,QAAQ,QAAS,CAAA,WAAA;AACpC,EACC,uBAAA,GAAA,CAAA,QAAA,EAAA,EACC,8BAAC,aAAc,CAAA,OAAA,EAAd,EAAsB,OAAS,EAAA,OAAA,EAAS,MAAM,UAC9C,EAAA,QAAA,kBAAA,GAAA;AAAA,IAAC,IAAA;AAAA,IAAA;AAAA,MACA,KAAO,EAAA;AAAA,QACN,MAAQ,EAAA,IAAA,KAAS,QAAW,GAAA,GAAA,GAAM,OAAO,KAAQ,GAAA,CAAA;AAAA,OAClD;AAAA,MACA,IAAM,EAAA,UAAA;AAAA,MAEN,+BAAC,UACC,EAAA,EAAA,QAAA,EAAA;AAAA,QAAM,IAAA,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,YACR,mBAAA,GAAA;AAAA,YAAC,UAAA;AAAA,YAAA;AAAA,cACA,mBAAA;AAAA,cACA,YAAA;AAAA,cACA,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA,SACL;AAAA,QACC,IAAM,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,QACR,mBAAA,GAAA;AAAA,YAAC,MAAA;AAAA,YAAA;AAAA,cACA,QACE,KAA6B,EAAA,MAAA;AAAA,cAE/B,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,WAAa,EAAA,IAAA,CAAK,IAAI,CAAA,EAAG,IAAQ,IAAA,CAAA;AAAA,cACjC,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA;AACL,OACD,EAAA;AAAA;AAAA,KAEF,CACD,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { last } from \"lodash\";\nimport React from \"react\";\nimport { LayerGroup, LayersControl, Pane } from \"react-leaflet\";\nimport { CustomBubbleLayer } from \"../../interfaces/index.js\";\nimport Bubble from \"./components/Bubble/index.js\";\nimport Choropleth from \"./components/Choropleth/index.js\";\nimport useThematicLayer from \"./hooks/config.js\";\n\nexport default function ThematicLayer({\n\tlayerId,\n\tindex,\n}: {\n\tlayerId: string;\n\tindex: number;\n}) {\n\tconst layer = useThematicLayer(layerId);\n\n\tif (!layer) {\n\t\treturn null;\n\t}\n\n\tconst {\n\t\ttype,\n\t\tdataItem,\n\t\tname,\n\t\tdata,\n\t\tenabled,\n\t\tlegends,\n\t\tcustomEventHandlers,\n\t\tonLayerClick,\n\t} = layer ?? {};\n\tconst uniqueName = name ?? dataItem.displayName;\n\treturn (\n\t\t<>\n\t\t\t<LayersControl.Overlay checked={enabled} name={uniqueName}>\n\t\t\t\t<Pane\n\t\t\t\t\tstyle={{\n\t\t\t\t\t\tzIndex: type === \"bubble\" ? 500 : 500 - (index + 1),\n\t\t\t\t\t}}\n\t\t\t\t\tname={uniqueName}\n\t\t\t\t>\n\t\t\t\t\t<LayerGroup>\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"choropleth\" ? (\n\t\t\t\t\t\t\t\t<Choropleth\n\t\t\t\t\t\t\t\t\tcustomEventHandlers={customEventHandlers}\n\t\t\t\t\t\t\t\t\tonLayerClick={onLayerClick}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"bubble\" ? (\n\t\t\t\t\t\t\t\t<Bubble\n\t\t\t\t\t\t\t\t\tradius={\n\t\t\t\t\t\t\t\t\t\t(layer as CustomBubbleLayer)?.radius\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\thighestData={last(data)?.data ?? 1}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t</LayerGroup>\n\t\t\t\t</Pane>\n\t\t\t</LayersControl.Overlay>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/index.tsx"],"names":[],"mappings":";;;;;;;AAQe,SAAR,aAA+B,CAAA;AAAA,EACrC,OAAA;AAAA,EACA;AACD,CAGG,EAAA;AACF,EAAM,MAAA,KAAA,GAAQ,iBAAiB,OAAO,CAAA;AAEtC,EAAA,IAAI,CAAC,KAAO,EAAA;AACX,IAAO,OAAA,IAAA;AAAA;AAGR,EAAM,MAAA;AAAA,IACL,IAAA;AAAA,IACA,QAAA;AAAA,IACA,IAAA;AAAA,IACA,IAAA;AAAA,IACA,OAAA;AAAA,IACA,OAAA;AAAA,IACA,mBAAA;AAAA,IACA;AAAA,GACD,GAAI,SAAS,EAAC;AACd,EAAM,MAAA,UAAA,GAAa,QAAQ,QAAS,CAAA,WAAA;AACpC,EACC,uBAAA,GAAA,CAAA,QAAA,EAAA,EACC,8BAAC,aAAc,CAAA,OAAA,EAAd,EAAsB,OAAS,EAAA,OAAA,EAAS,MAAM,UAC9C,EAAA,QAAA,kBAAA,GAAA;AAAA,IAAC,IAAA;AAAA,IAAA;AAAA,MACA,KAAO,EAAA;AAAA,QACN,MAAQ,EAAA,IAAA,KAAS,QAAW,GAAA,GAAA,GAAM,OAAO,KAAQ,GAAA,CAAA;AAAA,OAClD;AAAA,MACA,IAAM,EAAA,UAAA;AAAA,MAEN,+BAAC,UACC,EAAA,EAAA,QAAA,EAAA;AAAA,QAAM,IAAA,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,YACR,mBAAA,GAAA;AAAA,YAAC,UAAA;AAAA,YAAA;AAAA,cACA,aAAa,KAAM,CAAA,WAAA;AAAA,cACnB,mBAAA;AAAA,cACA,YAAA;AAAA,cACA,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA,SACL;AAAA,QACC,IAAM,EAAA,GAAA;AAAA,UAAI,CAAC,KACX,KAAA,IAAA,KAAS,QACR,mBAAA,GAAA;AAAA,YAAC,MAAA;AAAA,YAAA;AAAA,cACA,QACE,KAA6B,EAAA,MAAA;AAAA,cAE/B,OAAA,EAAS,WAAW,EAAC;AAAA,cACrB,WAAa,EAAA,IAAA,CAAK,IAAI,CAAA,EAAG,IAAQ,IAAA,CAAA;AAAA,cACjC,IAAM,EAAA;AAAA,aAAA;AAAA,YACD,GAAG,KAAO,EAAA,QAAA,EAAU,EAAE,CAAI,CAAA,EAAA,KAAA,EAAO,SAAS,EAAE,CAAA,MAAA;AAAA,WAE/C,GAAA;AAAA;AACL,OACD,EAAA;AAAA;AAAA,KAEF,CACD,EAAA,CAAA;AAEF","file":"index.js","sourcesContent":["import { last } from \"lodash\";\nimport React from \"react\";\nimport { LayerGroup, LayersControl, Pane } from \"react-leaflet\";\nimport { CustomBubbleLayer } from \"../../interfaces\";\nimport Bubble from \"./components/Bubble/index.js\";\nimport Choropleth from \"./components/Choropleth/index.js\";\nimport useThematicLayer from \"./hooks/config.js\";\n\nexport default function ThematicLayer({\n\tlayerId,\n\tindex,\n}: {\n\tlayerId: string;\n\tindex: number;\n}) {\n\tconst layer = useThematicLayer(layerId);\n\n\tif (!layer) {\n\t\treturn null;\n\t}\n\n\tconst {\n\t\ttype,\n\t\tdataItem,\n\t\tname,\n\t\tdata,\n\t\tenabled,\n\t\tlegends,\n\t\tcustomEventHandlers,\n\t\tonLayerClick,\n\t} = layer ?? {};\n\tconst uniqueName = name ?? dataItem.displayName;\n\treturn (\n\t\t<>\n\t\t\t<LayersControl.Overlay checked={enabled} name={uniqueName}>\n\t\t\t\t<Pane\n\t\t\t\t\tstyle={{\n\t\t\t\t\t\tzIndex: type === \"bubble\" ? 500 : 500 - (index + 1),\n\t\t\t\t\t}}\n\t\t\t\t\tname={uniqueName}\n\t\t\t\t>\n\t\t\t\t\t<LayerGroup>\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"choropleth\" ? (\n\t\t\t\t\t\t\t\t<Choropleth\n\t\t\t\t\t\t\t\t\tlabelConfig={layer.labelConfig}\n\t\t\t\t\t\t\t\t\tcustomEventHandlers={customEventHandlers}\n\t\t\t\t\t\t\t\t\tonLayerClick={onLayerClick}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{data?.map((datum) =>\n\t\t\t\t\t\t\ttype === \"bubble\" ? (\n\t\t\t\t\t\t\t\t<Bubble\n\t\t\t\t\t\t\t\t\tradius={\n\t\t\t\t\t\t\t\t\t\t(layer as CustomBubbleLayer)?.radius\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tlegends={legends ?? []}\n\t\t\t\t\t\t\t\t\thighestData={last(data)?.data ?? 1}\n\t\t\t\t\t\t\t\t\tdata={datum}\n\t\t\t\t\t\t\t\t\tkey={`${datum?.dataItem?.id}-${datum?.orgUnit?.id}-layer`}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t) : null,\n\t\t\t\t\t\t)}\n\t\t\t\t\t</LayerGroup>\n\t\t\t\t</Pane>\n\t\t\t</LayersControl.Overlay>\n\t\t</>\n\t);\n}\n"]}

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/utils/label.js

@@ -0,0 +1,18 @@
+import { templateSettings, template } from 'lodash';
+
+const valueFormatter = Intl.NumberFormat(navigator.language).format;
+function getLabel({
+  orgUnit,
+  data,
+  labelConfig
+}) {
+  templateSettings.interpolate = /{([\s\S]+?)}/g;
+  return template(labelConfig.labelTemplate.replace(/\n/g, "<br />"))({
+    name: orgUnit.name,
+    value: data ? valueFormatter(data) : ""
+  });
+}
+
+export { getLabel };
+//# sourceMappingURL=label.js.map
+//# sourceMappingURL=label.js.map

package/dist/esm/components/Map/components/MapLayer/components/ThematicLayer/utils/label.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/utils/label.ts"],"names":[],"mappings":";;AAGA,MAAM,cAAiB,GAAA,IAAA,CAAK,YAAa,CAAA,SAAA,CAAU,QAAQ,CAAE,CAAA,MAAA;AAEtD,SAAS,QAAS,CAAA;AAAA,EACxB,OAAA;AAAA,EACA,IAAA;AAAA,EACA;AACD,CAIG,EAAA;AACF,EAAA,gBAAA,CAAiB,WAAc,GAAA,eAAA;AAE/B,EAAA,OAAO,SAAS,WAAY,CAAA,aAAA,CAAc,QAAQ,KAAO,EAAA,QAAQ,CAAC,CAAE,CAAA;AAAA,IACnE,MAAM,OAAQ,CAAA,IAAA;AAAA,IACd,KAAO,EAAA,IAAA,GAAO,cAAe,CAAA,IAAI,CAAI,GAAA;AAAA,GACrC,CAAA;AACF","file":"label.js","sourcesContent":["import { template, templateSettings } from \"lodash\";\nimport type { LayerLabelConfig } from \"../../../interfaces\";\n\nconst valueFormatter = Intl.NumberFormat(navigator.language).format;\n\nexport function getLabel({\n\torgUnit,\n\tdata,\n\tlabelConfig,\n}: {\n\tlabelConfig: LayerLabelConfig;\n\torgUnit: { name: string };\n\tdata?: number;\n}) {\n\ttemplateSettings.interpolate = /{([\\s\\S]+?)}/g;\n\n\treturn template(labelConfig.labelTemplate.replace(/\\n/g, \"<br />\"))({\n\t\tname: orgUnit.name,\n\t\tvalue: data ? valueFormatter(data) : \"\",\n\t});\n}\n"]}

package/dist/esm/components/Map/components/MapLayer/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/components/Map/components/MapLayer/interfaces/index.ts"],"names":[],"mappings":"AAUO,MAAM,6BAAgC,GAAA;AAAA,EAC5C,YAAA;AAAA,EACA,YAAA;AAAA,EACA,WAAA;AAAA,EACA;AACD","file":"index.js","sourcesContent":["import type { Legend } from \"@hisptz/dhis2-utils\";\nimport { MapOrgUnit, PointOrgUnit } from \"../../../interfaces/index.js\";\nimport { LegendColorScale } from \"../../../utils/colors.js\";\nimport { EarthEngineOptions } from \"../components/GoogleEngineLayer/interfaces/index.js\";\nimport { EarthEngine } from \"../components/GoogleEngineLayer/services/engine.js\";\nimport type { LeafletEventHandlerFnMap, LeafletMouseEvent } from \"leaflet\";\n\nexport type BoundaryLayerType = \"basemap\" | \"overlay\";\nexport type ThematicLayerType = \"choropleth\" | \"bubble\";\n\nexport const SUPPORTED_EARTH_ENGINE_LAYERS = [\n\t\"population\",\n\t\"footprints\",\n\t\"elevation\",\n\t\"landCover\",\n];\n\nexport type GoogleEngineLayerType =\n\t| \"population\"\n\t| \"footprints\"\n\t| \"elevation\"\n\t| \"landCover\";\n\nexport interface CustomBoundaryLayer extends CustomMapLayer {\n\tid: string;\n\ttype: BoundaryLayerType;\n\tenabled: boolean;\n}\n\nexport interface EarthEngineLayerConfig extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\taggregations?: string[];\n\tname?: string;\n\tfilters?: {\n\t\tperiod: string;\n\t};\n\tparams?: {\n\t\tmin: number;\n\t\tmax: number;\n\t\tpalette?: string;\n\t};\n}\n\nexport interface CustomGoogleEngineLayer extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\toptions: EarthEngineOptions;\n\taggregations?: string[];\n\tname: string;\n\turl: string;\n\tengine?: EarthEngine;\n}\n\nexport interface CustomPointLayer extends CustomMapLayer {\n\tid: string;\n\ttype: \"point\";\n\tlabel?: string;\n\tlevel?: string | number;\n\tgroup?: string;\n\tstyle?: {\n\t\ticon?: string;\n\t\tgroupSet?: string;\n\t\torgUnitGroups?: Array<{ name: string; symbol: string }>;\n\t};\n\tpoints?: Array<PointOrgUnit>;\n}\n\nexport type DataItemType = \"dataElement\" | \"indicator\" | \"programIndicator\";\n\nexport interface ThematicLayerDataItem {\n\tid: string;\n\tdisplayName: string;\n\ttype: DataItemType;\n\tlegendSet?: string;\n\tlegendConfig?: {\n\t\tcolorClass: LegendColorScale;\n\t\tscale: number;\n\t};\n}\n\nexport interface ThematicLayerControl {\n\tposition: \"topleft\" | \"topright\" | \"bottomleft\" | \"bottomright\";\n\tenabled: boolean;\n}\n\nexport interface ThematicLayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport interface ThematicLayerRawData {\n\torgUnit: string;\n\tdata?: number;\n\tdataItem: string;\n}\n\nexport interface CustomChoroplethLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"choropleth\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n}\n\nexport interface CustomBubbleLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"bubble\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport type CustomThematicLayer = CustomBubbleLayer | CustomChoroplethLayer;\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem?: ThematicLayerDataItem;\n}\n\nexport interface ThematicLayerConfig {\n\tid: string;\n\tdata?: ThematicLayerRawData[];\n\tenabled: boolean;\n\tname?: string;\n\tdataItem: ThematicLayerDataItem;\n\ttype: ThematicLayerType;\n\tcontrol?: ThematicLayerControl;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport interface CustomMapLayer {\n\tid: string;\n\ttype: string;\n\tenabled: boolean;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n}\n\nexport type MapLayer =\n\t| CustomBoundaryLayer\n\t| ThematicLayerConfig\n\t| CustomPointLayer\n\t| CustomGoogleEngineLayer;\n\nexport interface MapLayerProps {\n\tenabled: boolean;\n\ttype: \"boundary\" | \"thematic\" | \"external\" | \"point\" | \"earthEngine\";\n\tlayer: MapLayer;\n}\n"]}
+{"version":3,"sources":["../../../../../../../src/components/Map/components/MapLayer/interfaces/index.ts"],"names":[],"mappings":"AAUO,MAAM,6BAAgC,GAAA;AAAA,EAC5C,YAAA;AAAA,EACA,YAAA;AAAA,EACA,WAAA;AAAA,EACA;AACD","file":"index.js","sourcesContent":["import type { Legend } from \"@hisptz/dhis2-utils\";\nimport { MapOrgUnit, PointOrgUnit } from \"../../../interfaces\";\nimport { LegendColorScale } from \"../../../utils\";\nimport { EarthEngineOptions } from \"../components/GoogleEngineLayer/interfaces\";\nimport { EarthEngine } from \"../components/GoogleEngineLayer/services/engine.js\";\nimport type { LeafletEventHandlerFnMap, LeafletMouseEvent } from \"leaflet\";\n\nexport type BoundaryLayerType = \"basemap\" | \"overlay\";\nexport type ThematicLayerType = \"choropleth\" | \"bubble\";\n\nexport const SUPPORTED_EARTH_ENGINE_LAYERS = [\n\t\"population\",\n\t\"footprints\",\n\t\"elevation\",\n\t\"landCover\",\n];\n\nexport type GoogleEngineLayerType =\n\t| \"population\"\n\t| \"footprints\"\n\t| \"elevation\"\n\t| \"landCover\";\n\nexport interface CustomBoundaryLayer extends CustomMapLayer {\n\tid: string;\n\ttype: BoundaryLayerType;\n\tenabled: boolean;\n}\n\nexport interface EarthEngineLayerConfig extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\taggregations?: string[];\n\tname?: string;\n\tfilters?: {\n\t\tperiod: string;\n\t};\n\tparams?: {\n\t\tmin: number;\n\t\tmax: number;\n\t\tpalette?: string;\n\t};\n}\n\nexport interface CustomGoogleEngineLayer extends CustomMapLayer {\n\ttype: GoogleEngineLayerType;\n\toptions: EarthEngineOptions;\n\taggregations?: string[];\n\tname: string;\n\turl: string;\n\tengine?: EarthEngine;\n}\n\nexport interface CustomPointLayer extends CustomMapLayer {\n\tid: string;\n\ttype: \"point\";\n\tlabel?: string;\n\tlevel?: string | number;\n\tgroup?: string;\n\tstyle?: {\n\t\ticon?: string;\n\t\tgroupSet?: string;\n\t\torgUnitGroups?: Array<{ name: string; symbol: string }>;\n\t};\n\tpoints?: Array<PointOrgUnit>;\n}\n\nexport type DataItemType = \"dataElement\" | \"indicator\" | \"programIndicator\";\n\nexport interface ThematicLayerDataItem {\n\tid: string;\n\tdisplayName: string;\n\ttype: DataItemType;\n\tlegendSet?: string;\n\tlegendConfig?: {\n\t\tcolorClass: LegendColorScale;\n\t\tscale: number;\n\t};\n}\n\nexport interface ThematicLayerControl {\n\tposition: \"topleft\" | \"topright\" | \"bottomleft\" | \"bottomright\";\n\tenabled: boolean;\n}\n\nexport interface ThematicLayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem: ThematicLayerDataItem;\n}\n\nexport interface ThematicLayerRawData {\n\torgUnit: string;\n\tdata?: number;\n\tdataItem: string;\n}\n\nexport interface CustomChoroplethLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"choropleth\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n}\n\nexport interface CustomBubbleLayer extends CustomMapLayer {\n\tenabled: boolean;\n\tname?: string;\n\tdata: ThematicLayerData[];\n\tdataItem: ThematicLayerDataItem;\n\ttype: \"bubble\";\n\tcontrol?: ThematicLayerControl;\n\tlegends?: Legend[];\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport type CustomThematicLayer = CustomBubbleLayer | CustomChoroplethLayer;\n\ninterface LayerData {\n\torgUnit: MapOrgUnit;\n\tdata?: number;\n\tdataItem?: ThematicLayerDataItem;\n}\n\nexport type LayerLabelConfig = {\n\tlabels: boolean;\n\tlabelFontWeight: string;\n\tlabelTemplate: string;\n};\n\nexport interface ThematicLayerConfig {\n\tid: string;\n\tdata?: ThematicLayerRawData[];\n\tenabled: boolean;\n\tname?: string;\n\tdataItem: ThematicLayerDataItem;\n\ttype: ThematicLayerType;\n\tcontrol?: ThematicLayerControl;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tlabelConfig?: LayerLabelConfig;\n\tradius?: {\n\t\tmin: number;\n\t\tmax: number;\n\t};\n}\n\nexport interface CustomMapLayer {\n\tid: string;\n\ttype: string;\n\tenabled: boolean;\n\tcustomEventHandlers?: LeafletEventHandlerFnMap;\n\tonLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;\n\tlabelConfig?: LayerLabelConfig;\n}\n\nexport type MapLayer =\n\t| CustomBoundaryLayer\n\t| ThematicLayerConfig\n\t| CustomPointLayer\n\t| CustomGoogleEngineLayer;\n\nexport interface MapLayerProps {\n\tenabled: boolean;\n\ttype: \"boundary\" | \"thematic\" | \"external\" | \"point\" | \"earthEngine\";\n\tlayer: MapLayer;\n}\n"]}

package/dist/esm/components/Map/components/MapProvider/index.js

@@ -2,11 +2,11 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { useDataQuery } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { Center, CircularLoader } from '@dhis2/ui';
-import { compact, isEmpty } from 'lodash';
+import { isEmpty, compact } from 'lodash';
 import { useState, useEffect } from 'react';
-import { MapOrgUnitContext, MapPeriodContext } from '../../state/index.js';
-import { getOrgUnitsSelection, sanitizeOrgUnits, toGeoJson } from '../../utils/map.js';
-import { PeriodUtility } from '@hisptz/dhis2-utils';
+import { MapOrgUnitContext, MapPeriodContext } from '../../state';
+import { getOrgUnitsSelection, sanitizeOrgUnits, toGeoJson } from '../../utils';
+import { PeriodUtility } from '@hisptz/dhis2-utils/src';
 
 const boundaryQuery = {
   boundaries: {
@@ -17,10 +17,10 @@ const boundaryQuery = {
   },
   analytics: {
     resource: "analytics",
-    params: ({ orgUnitIds }) => ({
+    params: ({ orgUnitIds, periodIds }) => ({
       dimension: [
         `ou:${orgUnitIds.join(";")}`,
-        `pe:${(/* @__PURE__ */ new Date()).getFullYear()}`
+        `pe:${periodIds.join(";")}`
       ],
       skipData: true,
       hierarchyMeta: true
@@ -33,13 +33,17 @@ function MapProvider({
   periodSelection
 }) {
   const [orgUnits, setOrgUnits] = useState([]);
+  const [periods, setPeriods] = useState([]);
   const { refetch, loading, error } = useDataQuery(boundaryQuery, {
     lazy: true
   });
   useEffect(() => {
     async function getOrgUnits() {
       const rawOrgUnitIds = getOrgUnitsSelection(orgUnitSelection);
-      const data = await refetch({ orgUnitIds: rawOrgUnitIds });
+      const data = await refetch({
+        orgUnitIds: rawOrgUnitIds,
+        periodIds: periodSelection?.periods
+      });
       const { analytics, boundaries } = data ?? {};
       const rawOrgUnits = sanitizeOrgUnits(analytics?.metaData);
       const geoJSONObjects = toGeoJson(
@@ -61,6 +65,11 @@ function MapProvider({
           };
         })
       );
+      const periodIds = analytics?.metaData?.dimensions?.pe ?? periodSelection?.periods;
+      const periods2 = periodIds.map(
+        (pe) => PeriodUtility.getPeriodById(pe)
+      );
+      setPeriods(periods2);
       setOrgUnits(orgUnits2);
     }
     getOrgUnits().catch((error2) => console.log(error2));
@@ -75,9 +84,6 @@ function MapProvider({
       error.message
     ] }) }) });
   }
-  const periods = compact(
-    periodSelection?.periods?.map((pe) => PeriodUtility.getPeriodById(pe))
-  );
   if (!isEmpty(orgUnits)) {
     return /* @__PURE__ */ jsx(MapOrgUnitContext.Provider, { value: { orgUnitSelection, orgUnits }, children: /* @__PURE__ */ jsx(
       MapPeriodContext.Provider,

package/dist/esm/components/Map/components/MapProvider/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/components/Map/components/MapProvider/index.tsx"],"names":["orgUnits","error"],"mappings":"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","file":"index.js","sourcesContent":["import { useDataQuery } from \"@dhis2/app-runtime\";\nimport i18n from \"@dhis2/d2-i18n\";\nimport { Center, CircularLoader } from \"@dhis2/ui\";\nimport { compact, isEmpty } from \"lodash\";\nimport React, { useEffect, useState } from \"react\";\nimport { MapOrgUnit, MapProviderProps } from \"../../interfaces/index.js\";\nimport { MapOrgUnitContext, MapPeriodContext } from \"../../state/index.js\";\nimport {\n\tgetOrgUnitsSelection,\n\tsanitizeOrgUnits,\n\ttoGeoJson,\n} from \"../../utils/map.js\";\nimport { BasePeriod, PeriodUtility } from \"@hisptz/dhis2-utils\";\n\nconst boundaryQuery = {\n\tboundaries: {\n\t\tresource: \"geoFeatures\",\n\t\tparams: ({ orgUnitIds }: any) => ({\n\t\t\tou: `ou:${orgUnitIds?.join(\";\")}`,\n\t\t}),\n\t},\n\tanalytics: {\n\t\tresource: \"analytics\",\n\t\tparams: ({ orgUnitIds }: any) => ({\n\t\t\tdimension: [\n\t\t\t\t`ou:${orgUnitIds.join(\";\")}`,\n\t\t\t\t`pe:${new Date().getFullYear()}`,\n\t\t\t],\n\t\t\tskipData: true,\n\t\t\thierarchyMeta: true,\n\t\t}),\n\t},\n};\n\nexport function MapProvider({\n\tchildren,\n\torgUnitSelection,\n\tperiodSelection,\n}: MapProviderProps) {\n\tconst [orgUnits, setOrgUnits] = useState<MapOrgUnit[]>([]);\n\tconst { refetch, loading, error } = useDataQuery(boundaryQuery, {\n\t\tlazy: true,\n\t});\n\n\tuseEffect(() => {\n\t\tasync function getOrgUnits() {\n\t\t\tconst rawOrgUnitIds = getOrgUnitsSelection(orgUnitSelection);\n\t\t\tconst data = await refetch({ orgUnitIds: rawOrgUnitIds });\n\t\t\tconst { analytics, boundaries } = (data as any) ?? {};\n\t\t\tconst rawOrgUnits = sanitizeOrgUnits(analytics?.metaData);\n\t\t\tconst geoJSONObjects = toGeoJson(\n\t\t\t\tboundaries.filter((bound: any) => bound.co),\n\t\t\t);\n\t\t\tconst orgUnits: MapOrgUnit[] = compact(\n\t\t\t\trawOrgUnits.map((orgUnit: any) => {\n\t\t\t\t\tconst geoJSONObject: any = geoJSONObjects?.find(\n\t\t\t\t\t\t(geoJSON: any) => geoJSON.properties.id === orgUnit.id,\n\t\t\t\t\t);\n\n\t\t\t\t\tif (!geoJSONObject) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\t...orgUnit,\n\t\t\t\t\t\tgeoJSON: geoJSONObject,\n\t\t\t\t\t\tbounds: [],\n\t\t\t\t\t\tlevel: geoJSONObject.properties.level,\n\t\t\t\t\t};\n\t\t\t\t}),\n\t\t\t);\n\t\t\tsetOrgUnits(orgUnits);\n\t\t}\n\n\t\tgetOrgUnits().catch((error) => console.log(error));\n\t}, [orgUnitSelection, refetch]);\n\n\tif (loading) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<CircularLoader small />\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (error) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<h4>\n\t\t\t\t\t\t{i18n.t(\"Error\")}: {error.message}\n\t\t\t\t\t</h4>\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tconst periods: BasePeriod[] = compact(\n\t\tperiodSelection?.periods?.map((pe) => PeriodUtility.getPeriodById(pe)),\n\t);\n\n\tif (!isEmpty(orgUnits)) {\n\t\treturn (\n\t\t\t<MapOrgUnitContext.Provider value={{ orgUnitSelection, orgUnits }}>\n\t\t\t\t<MapPeriodContext.Provider\n\t\t\t\t\tvalue={{ ...periodSelection, periods }}\n\t\t\t\t>\n\t\t\t\t\t{children}\n\t\t\t\t</MapPeriodContext.Provider>\n\t\t\t</MapOrgUnitContext.Provider>\n\t\t);\n\t}\n\n\treturn null;\n}\n"]}
+{"version":3,"sources":["../../../../../../src/components/Map/components/MapProvider/index.tsx"],"names":["orgUnits","periods","error"],"mappings":"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","file":"index.js","sourcesContent":["import { useDataQuery } from \"@dhis2/app-runtime\";\nimport i18n from \"@dhis2/d2-i18n\";\nimport { Center, CircularLoader } from \"@dhis2/ui\";\nimport { compact, isEmpty } from \"lodash\";\nimport React, { useEffect, useState } from \"react\";\nimport { MapOrgUnit, MapProviderProps } from \"../../interfaces\";\nimport { MapOrgUnitContext, MapPeriodContext } from \"../../state\";\nimport { getOrgUnitsSelection, sanitizeOrgUnits, toGeoJson } from \"../../utils\";\nimport { BasePeriod, PeriodUtility } from \"@hisptz/dhis2-utils/src\";\n\nconst boundaryQuery = {\n\tboundaries: {\n\t\tresource: \"geoFeatures\",\n\t\tparams: ({ orgUnitIds }: any) => ({\n\t\t\tou: `ou:${orgUnitIds?.join(\";\")}`,\n\t\t}),\n\t},\n\tanalytics: {\n\t\tresource: \"analytics\",\n\t\tparams: ({ orgUnitIds, periodIds }: any) => ({\n\t\t\tdimension: [\n\t\t\t\t`ou:${orgUnitIds.join(\";\")}`,\n\t\t\t\t`pe:${periodIds.join(\";\")}`,\n\t\t\t],\n\t\t\tskipData: true,\n\t\t\thierarchyMeta: true,\n\t\t}),\n\t},\n};\n\nexport function MapProvider({\n\tchildren,\n\torgUnitSelection,\n\tperiodSelection,\n}: MapProviderProps) {\n\tconst [orgUnits, setOrgUnits] = useState<MapOrgUnit[]>([]);\n\tconst [periods, setPeriods] = useState<BasePeriod[]>([]);\n\tconst { refetch, loading, error } = useDataQuery(boundaryQuery, {\n\t\tlazy: true,\n\t});\n\n\tuseEffect(() => {\n\t\tasync function getOrgUnits() {\n\t\t\tconst rawOrgUnitIds = getOrgUnitsSelection(orgUnitSelection);\n\t\t\tconst data = await refetch({\n\t\t\t\torgUnitIds: rawOrgUnitIds,\n\t\t\t\tperiodIds: periodSelection?.periods,\n\t\t\t});\n\t\t\tconst { analytics, boundaries } = (data as any) ?? {};\n\t\t\tconst rawOrgUnits = sanitizeOrgUnits(analytics?.metaData);\n\t\t\tconst geoJSONObjects = toGeoJson(\n\t\t\t\tboundaries.filter((bound: any) => bound.co),\n\t\t\t);\n\t\t\tconst orgUnits: MapOrgUnit[] = compact(\n\t\t\t\trawOrgUnits.map((orgUnit: any) => {\n\t\t\t\t\tconst geoJSONObject: any = geoJSONObjects?.find(\n\t\t\t\t\t\t(geoJSON: any) => geoJSON.properties.id === orgUnit.id,\n\t\t\t\t\t);\n\n\t\t\t\t\tif (!geoJSONObject) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\treturn {\n\t\t\t\t\t\t...orgUnit,\n\t\t\t\t\t\tgeoJSON: geoJSONObject,\n\t\t\t\t\t\tbounds: [],\n\t\t\t\t\t\tlevel: geoJSONObject.properties.level,\n\t\t\t\t\t};\n\t\t\t\t}),\n\t\t\t);\n\t\t\tconst periodIds =\n\t\t\t\tanalytics?.metaData?.dimensions?.pe ?? periodSelection?.periods;\n\t\t\tconst periods = periodIds.map((pe: string) =>\n\t\t\t\tPeriodUtility.getPeriodById(pe),\n\t\t\t);\n\t\t\tsetPeriods(periods);\n\t\t\tsetOrgUnits(orgUnits);\n\t\t}\n\n\t\tgetOrgUnits().catch((error) => console.log(error));\n\t}, [orgUnitSelection, refetch]);\n\n\tif (loading) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<CircularLoader small />\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (error) {\n\t\treturn (\n\t\t\t<div style={{ height: \"100%\", width: \"100%\" }}>\n\t\t\t\t<Center>\n\t\t\t\t\t<h4>\n\t\t\t\t\t\t{i18n.t(\"Error\")}: {error.message}\n\t\t\t\t\t</h4>\n\t\t\t\t</Center>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (!isEmpty(orgUnits)) {\n\t\treturn (\n\t\t\t<MapOrgUnitContext.Provider value={{ orgUnitSelection, orgUnits }}>\n\t\t\t\t<MapPeriodContext.Provider\n\t\t\t\t\tvalue={{ ...periodSelection, periods }}\n\t\t\t\t>\n\t\t\t\t\t{children}\n\t\t\t\t</MapPeriodContext.Provider>\n\t\t\t</MapOrgUnitContext.Provider>\n\t\t);\n\t}\n\n\treturn null;\n}\n"]}

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.d.ts

@@ -1,17 +1,18 @@
 import type { Legend } from "@hisptz/dhis2-utils";
-import { MapOrgUnit } from "../../../../../../interfaces/index.js";
-import { ThematicLayerDataItem } from "../../../../interfaces/index.js";
-import type { LeafletEventHandlerFnMap, LeafletMouseEvent } from "leaflet";
+import { MapOrgUnit } from "../../../../../../interfaces";
+import { type LayerLabelConfig, ThematicLayerDataItem } from "../../../../interfaces";
+import { type LeafletEventHandlerFnMap, type LeafletMouseEvent } from "leaflet";
 interface LayerData {
     orgUnit: MapOrgUnit;
     data?: number;
     dataItem: ThematicLayerDataItem;
 }
-export default function Choropleth({ data, legends, customEventHandlers, onLayerClick, }: {
+export default function Choropleth({ data, legends, customEventHandlers, onLayerClick, labelConfig, }: {
     data: LayerData;
     legends: Legend[];
     customEventHandlers?: LeafletEventHandlerFnMap;
     onLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;
-}): import("react/jsx-runtime.js").JSX.Element;
+    labelConfig?: LayerLabelConfig;
+}): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAMnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,KAAK,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAS3E,UAAU,SAAS;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,qBAAqB,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAClC,IAAI,EACJ,OAAO,EACP,mBAAmB,EACnB,YAAY,GACZ,EAAE;IACF,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,mBAAmB,CAAC,EAAE,wBAAwB,CAAC;IAC/C,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;CAC/D,8CA4BA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/Choropleth/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAM1D,OAAO,EACN,KAAK,gBAAgB,EACrB,qBAAqB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAYhF,UAAU,SAAS;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,qBAAqB,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAClC,IAAI,EACJ,OAAO,EACP,mBAAmB,EACnB,YAAY,EACZ,WAAW,GACX,EAAE;IACF,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,mBAAmB,CAAC,EAAE,wBAAwB,CAAC;IAC/C,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/D,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAC/B,2CAsDA"}

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.d.ts

@@ -0,0 +1,13 @@
+import type { LayerLabelConfig } from "../../../../interfaces";
+import { type LatLngExpression } from "leaflet";
+import "./label.css";
+export declare function LabelMarker({ labelConfig, data, orgUnit, center, layerColor, }: {
+    labelConfig: LayerLabelConfig;
+    data: number | undefined;
+    orgUnit: {
+        name: string;
+    };
+    center: LatLngExpression;
+    layerColor: string;
+}): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=index.d.ts.map

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/components/LabelMarker/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAU,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,aAAa,CAAC;AAGrB,wBAAgB,WAAW,CAAC,EAC3B,WAAW,EACX,IAAI,EACJ,OAAO,EACP,MAAM,EACN,UAAU,GACV,EAAE;IACF,WAAW,EAAE,gBAAgB,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACnB,2CAaA"}

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/index.d.ts

@@ -1,5 +1,5 @@
 export default function ThematicLayer({ layerId, index, }: {
     layerId: string;
     index: number;
-}): import("react/jsx-runtime.js").JSX.Element | null;
+}): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=index.d.ts.map

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/index.tsx"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACrC,OAAO,EACP,KAAK,GACL,EAAE;IACF,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACd,qDAyDA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/index.tsx"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACrC,OAAO,EACP,KAAK,GACL,EAAE;IACF,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACd,kDA0DA"}

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/utils/label.d.ts

@@ -0,0 +1,9 @@
+import type { LayerLabelConfig } from "../../../interfaces";
+export declare function getLabel({ orgUnit, data, labelConfig, }: {
+    labelConfig: LayerLabelConfig;
+    orgUnit: {
+        name: string;
+    };
+    data?: number;
+}): string;
+//# sourceMappingURL=label.d.ts.map

package/dist/types/components/Map/components/MapLayer/components/ThematicLayer/utils/label.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/components/Map/components/MapLayer/components/ThematicLayer/utils/label.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,wBAAgB,QAAQ,CAAC,EACxB,OAAO,EACP,IAAI,EACJ,WAAW,GACX,EAAE;IACF,WAAW,EAAE,gBAAgB,CAAC;IAC9B,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,UAOA"}

package/dist/types/components/Map/components/MapLayer/interfaces/index.d.ts

@@ -1,7 +1,7 @@
 import type { Legend } from "@hisptz/dhis2-utils";
-import { MapOrgUnit, PointOrgUnit } from "../../../interfaces/index.js";
-import { LegendColorScale } from "../../../utils/colors.js";
-import { EarthEngineOptions } from "../components/GoogleEngineLayer/interfaces/index.js";
+import { MapOrgUnit, PointOrgUnit } from "../../../interfaces";
+import { LegendColorScale } from "../../../utils";
+import { EarthEngineOptions } from "../components/GoogleEngineLayer/interfaces";
 import { EarthEngine } from "../components/GoogleEngineLayer/services/engine.js";
 import type { LeafletEventHandlerFnMap, LeafletMouseEvent } from "leaflet";
 export type BoundaryLayerType = "basemap" | "overlay";
@@ -104,6 +104,11 @@ interface LayerData {
     data?: number;
     dataItem?: ThematicLayerDataItem;
 }
+export type LayerLabelConfig = {
+    labels: boolean;
+    labelFontWeight: string;
+    labelTemplate: string;
+};
 export interface ThematicLayerConfig {
     id: string;
     data?: ThematicLayerRawData[];
@@ -114,6 +119,7 @@ export interface ThematicLayerConfig {
     control?: ThematicLayerControl;
     customEventHandlers?: LeafletEventHandlerFnMap;
     onLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;
+    labelConfig?: LayerLabelConfig;
     radius?: {
         min: number;
         max: number;
@@ -125,6 +131,7 @@ export interface CustomMapLayer {
     enabled: boolean;
     customEventHandlers?: LeafletEventHandlerFnMap;
     onLayerClick?: (e: LeafletMouseEvent, data: LayerData) => void;
+    labelConfig?: LayerLabelConfig;
 }
 export type MapLayer = CustomBoundaryLayer | ThematicLayerConfig | CustomPointLayer | CustomGoogleEngineLayer;
 export interface MapLayerProps {

package/dist/types/components/Map/components/MapLayer/interfaces/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/Map/components/MapLayer/interfaces/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/Map/components/MapLayer/interfaces/index.ts"],"names":[],"mappings":"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"}

package/dist/types/components/Map/components/MapProvider/index.d.ts

@@ -1,3 +1,3 @@
-import { MapProviderProps } from "../../interfaces/index.js";
-export declare function MapProvider({ children, orgUnitSelection, periodSelection, }: MapProviderProps): import("react/jsx-runtime.js").JSX.Element | null;
+import { MapProviderProps } from "../../interfaces";
+export declare function MapProvider({ children, orgUnitSelection, periodSelection, }: MapProviderProps): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=index.d.ts.map

package/dist/types/components/Map/components/MapProvider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Map/components/MapProvider/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAc,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AA6BzE,wBAAgB,WAAW,CAAC,EAC3B,QAAQ,EACR,gBAAgB,EAChB,eAAe,GACf,EAAE,gBAAgB,qDA6ElB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Map/components/MapProvider/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAc,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAyBhE,wBAAgB,WAAW,CAAC,EAC3B,QAAQ,EACR,gBAAgB,EAChB,eAAe,GACf,EAAE,gBAAgB,kDAmFlB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hisptz/dhis2-analytics",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -41,8 +41,8 @@
     "tsup": "^8.4.0",
     "typescript": "^5.3.3",
     "usehooks-ts": "^2.16.0",
-    "@repo/typescript-config": "0.0.2",
-    "@repo/eslint-config": "0.0.0"
+    "@repo/eslint-config": "0.0.0",
+    "@repo/typescript-config": "0.0.2"
   },
   "dependencies": {
     "@google/earthengine": "^1.5.21",
@@ -53,6 +53,7 @@
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
     "file-saver": "^2.0.5",
+    "geolib": "^3.3.4",
     "highcharts": "^12.2.0",
     "highcharts-react-official": "^3.2.1",
     "jotai-devtools": "^0.10.1",
@@ -72,8 +73,8 @@
     "react-to-print": "^3.0.1",
     "screenfull": "^6.0.2",
     "xlsx": "^0.18.5",
-    "@hisptz/dhis2-ui": "2.0.48",
-    "@hisptz/dhis2-utils": "2.0.18"
+    "@hisptz/dhis2-utils": "2.0.18",
+    "@hisptz/dhis2-ui": "2.0.48"
   },
   "peerDependencies": {
     "@dhis2/app-runtime": "^3",