@redus/georedus-ui 0.19.4 → 0.19.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @orioro/template-react
 
+## 0.19.5
+
+### Patch Changes
+
+- fix custom geojson aggregation
+
 ## 0.19.4
 
 ### Patch Changes

package/dist/main.js

@@ -4165,6 +4165,7 @@ var VIEW_TYPE_SURFACE_CHOROPLETH = 'surface_choropleth';
 
 function parseSchema(viewSpec, allViewSpecs, context) {
   var collection_id = viewSpec.collection_id,
+    source_table_id = viewSpec.source_table_id,
     indicator_path = viewSpec.indicator_path,
     indicator_id = viewSpec.indicator_id,
     indicator_label = viewSpec.indicator_label,
@@ -4199,6 +4200,7 @@ function parseSchema(viewSpec, allViewSpecs, context) {
   var sourceLabel = "CENSO ".concat(year);
   return {
     viewId: viewId,
+    source_table_id: source_table_id,
     path: indicator_path,
     label: indicator_label,
     metodology: metodology,
@@ -5203,7 +5205,7 @@ function _customGeoJSON_metadata() {
           });
           variableId = context.view.conf.data.variableId;
           variant = PARSED_SCHEMA.variantsByVariableId[variableId]; //
-          // Fetch variable values using rpc aggregate_by_geojson
+          // Fetch variable values using rpc aggregate_by_geojson with join
           //
           _context.next = 13;
           return fetch("".concat(GLOBAL_CONTEXT.METADATA_API_ENDPOINT, "/rpc/aggregate_by_geojson"), {
@@ -5215,9 +5217,12 @@ function _customGeoJSON_metadata() {
               geometries: AREAS_FEATURES.map(function (feat) {
                 return feat.geometry;
               }),
-              view: "ibge_malha_br_setor_censitario_".concat(PARSED_SCHEMA.year, "_spatial_agg"),
+              view: "".concat(PARSED_SCHEMA.source_table_id),
+              // no more need to generate a single unique table with all variables, since we are now sending the source table id in the body of the request to perform the join and aggregation in the backend
+              join_table: "ibge_malha_br_setor_censitario_".concat(PARSED_SCHEMA.year),
+              // added in order to perform the join in the backend
               agg_column: variableId,
-              agg_type: variableId.endsWith('_pct') ? 'weighted_avg' : 'sum'
+              agg_type: variableId.endsWith('_2') ? 'weighted_avg' : 'sum' // _2 is the new suffix to indicate percentage variables
             })
           }).then(function (res) {
             return res.json();
@@ -5541,7 +5546,7 @@ function setor_censitario_layers(opts) {
           }
         } else {
           var value = get$1(context, 'feature.properties.value');
-          var isPercentage = variableId.endsWith('_pct');
+          var isPercentage = variableId.endsWith('_2'); // _2 is the new suffix to indicate percentage variables
           var format = isPercentage ? {
             style: 'percent'
           } : {};

package/dist/viewSpecs/presets/cem_censo/2010_2022/parseSchema.d.ts

@@ -1,5 +1,6 @@
 export function parseSchema(viewSpec: any, allViewSpecs: any, context: any): {
     viewId: string;
+    source_table_id: any;
     path: any;
     label: any;
     metodology: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redus/georedus-ui",
-  "version": "0.19.4",
+  "version": "0.19.5",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/main.js",