@redus/georedus-ui 0.8.1 → 0.8.6

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @orioro/template-react
 
+## 0.8.6
+
+### Patch Changes
+
+- update dev metadata api url
+
+## 0.8.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @orioro/react-maplibre-util@0.5.2
+
+## 0.8.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @orioro/react-maplibre-util@0.5.1
+
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @orioro/react-maplibre-util@0.5.0
+
+## 0.8.2
+
+### Patch Changes
+
+- apply bounds to censo 2010 and 2022 sources
+
 ## 0.8.1
 
 ### Patch Changes

package/dist/main.js

@@ -18,6 +18,7 @@ import { CsvImportDialog } from '@orioro/react-csv';
 import Highlighter from 'react-highlight-words';
 import { makeSortableMultiList } from '@orioro/react-sortable';
 import { fmtLayerAbsoluteId, makeSyncedMaps, LayeredMap, HoverTooltip, ControlContainer, InspectControl, MapWindow, TerrainControl, fitGeometry } from '@orioro/react-maplibre-util';
+import '@maplibre/maplibre-gl-inspect/dist/maplibre-gl-inspect.css';
 import { Legend } from '@orioro/react-chart-util';
 import 'maplibre-gl/dist/maplibre-gl.css';
 import { useQueries, useQuery } from '@tanstack/react-query';
@@ -4332,7 +4333,7 @@ var _a;
 //
 // TODO: set dynamic values
 //
-var HARD_CODED_ALLOW_FETCH_SOURCES = (_a = {}, _a['https://dev-geoapi-metadata.orioro.design'] = ['GET', 'POST'], _a['http://localhost:6001'] = ['GET', 'POST'], _a);
+var HARD_CODED_ALLOW_FETCH_SOURCES = (_a = {}, _a['https://dev-geoapi-metadata.orioro.design'] = ['GET', 'POST'], _a['http://localhost:8001'] = ['GET', 'POST'], _a);
 console.warn('TODO: remove HARD_CODED_ALLOW_FETCH_SOURCES');
 function isFetchAllowed(resource, options) {
   return __awaiter(this, void 0, void 0, function () {
@@ -5243,9 +5244,11 @@ var DEFAULT_BUFFER_SIZE = 200;
 var INSUFFICIENT_DATA_COLOR = 'red';
 var BUILDINGS_MIN_ZOOM = 14;
 var BUILDINGS_3D_MIN_ZOOM = 16;
+var UNBOUNDED_BOUNDS = [-180, -90, 180, 90];
 
 //
-//
+// TODO: deprecate in favor of applying buffers
+// inside worker
 //
 function _applyBuffers(geometry) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -5387,6 +5390,26 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
     }]));
     return url;
   });
+  var _resolveSourceBounds = resolve.fn(function (context) {
+    try {
+      var _context$view$metadat;
+      var coordinates = (_context$view$metadat = context.view.metadata.municipioData) === null || _context$view$metadat === void 0 || (_context$view$metadat = _context$view$metadat.bbox) === null || _context$view$metadat === void 0 ? void 0 : _context$view$metadat.coordinates;
+      if (!coordinates) {
+        return UNBOUNDED_BOUNDS;
+      }
+      var _coordinates$0$ = _slicedToArray(coordinates[0][0], 2),
+        west = _coordinates$0$[0],
+        south = _coordinates$0$[1]; // first point: lower-left (southwest)
+      var _coordinates$0$2 = _slicedToArray(coordinates[0][2], 2),
+        east = _coordinates$0$2[0],
+        north = _coordinates$0$2[1]; // third point: upper-right (northeast)
+
+      return [west, south, east, north]; // [minX, minY, maxX, maxY]
+    } catch (err) {
+      console.warn("error while retrieving bounds", err);
+      return UNBOUNDED_BOUNDS;
+    }
+  });
   return {
     // debug: true,
     id: viewId,
@@ -5585,18 +5608,29 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
             agg_column: ['$get', 'view.conf.data.variableId'],
             agg_type: ['$if', ['$endsWith', ['$get', 'view.conf.data.variableId'], '_pct'], 'weighted_avg', 'sum']
           }
-        }]]
+        }]],
+        municipioData: ['$get', '0', ['$fetch', resolve.fn(function (context) {
+          return "".concat(METADATA_API_ENDPOINT, "/ibge_malha_br_municipio?select=bbox&id=eq.").concat(context.app.municipioId);
+        })]]
       }, {
         labels: labels,
         measureUnits: measureUnits,
         variableValues: ['$get', 'variableValues'],
+        municipioData: ['$get', 'municipioData'],
         customGeoJSON: ['$get', 'customGeoJSON'],
         colorScaleStops: ['$naturalBreaks', ['$get', 'variableValues'], _objectSpread2(_objectSpread2({}, _color_scheme), {}, {
           minK: 5
         })]
       }]]
     },
-    sources: _objectSpread2(_objectSpread2({}, globalRes.sources), {}, _defineProperty(_defineProperty({
+    sources: _objectSpread2(_objectSpread2({}, Object.fromEntries(Object.entries(globalRes.sources).map(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        key = _ref4[0],
+        spec = _ref4[1];
+      return [key, _objectSpread2(_objectSpread2({}, spec), {}, {
+        bounds: _resolveSourceBounds
+      })];
+    }))), {}, _defineProperty(_defineProperty({
       //
       // Points in custom GeoJson
       //
@@ -5627,9 +5661,9 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
       // The area of customGeoJson
       //
       customGeoJSON_Areas: ['$if', [['$empty', ['$get', 'view.metadata.customGeoJSON.AREAS']]], null, resolve.fn(function (context) {
-        var _context$view$metadat = context.view.metadata,
-          customGeoJSON = _context$view$metadat.customGeoJSON,
-          variableValues = _context$view$metadat.variableValues;
+        var _context$view$metadat2 = context.view.metadata,
+          customGeoJSON = _context$view$metadat2.customGeoJSON,
+          variableValues = _context$view$metadat2.variableValues;
         if (!(customGeoJSON !== null && customGeoJSON !== void 0 && customGeoJSON.AREAS)) {
           return null;
         }
@@ -5658,6 +5692,7 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
       //
       maxzoom: BUILDINGS_MIN_ZOOM,
       promoteId: 'cd_setor',
+      bounds: _resolveSourceBounds,
       tiles: [resolve.fn(function (context) {
         var _variableId = get$1(context, 'view.conf.data.variableId');
         var _variant = variantsByVariableId[_variableId];
@@ -5677,6 +5712,7 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
       attribution: sourceLabel,
       minzoom: BUILDINGS_MIN_ZOOM,
       maxzoom: BUILDINGS_MIN_ZOOM,
+      bounds: _resolveSourceBounds,
       // Zoom levels make no real difference, buildings
       // are pretty square
       // maxzoom: 20,
@@ -5860,12 +5896,12 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
       // availableVariableIds: [variable_id, 'str_nome_fantasia', 'id_cnes'],
       fetchData: resolve.fn(function (context) {
         return /*#__PURE__*/function () {
-          var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+          var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
             var data, geometries;
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _ref3.variableIds, _ref3.options;
+                  _ref5.variableIds, _ref5.options;
                   _context2.next = 3;
                   return resolveExprAsync(['$fetch', ['$template', "".concat(METADATA_API_ENDPOINT) + '/${source_table_id}?select=' + '${variableId},' + 'cd_setor' + '&cd_mun=eq.' + '${municipioId}', {
                     variableId: ['$get', 'view.conf.data.variableId'],
@@ -5891,7 +5927,7 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
             }, _callee2);
           }));
           return function (_x2) {
-            return _ref4.apply(this, arguments);
+            return _ref6.apply(this, arguments);
           };
         }();
       })

package/dist/viewSpecs/presets/cem_censo_2010_2022/index.d.ts

@@ -135,6 +135,15 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
                 href?: undefined;
                 pathname?: undefined;
             })[])[];
+            municipioData: (string | (string | {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            })[])[];
             labels?: undefined;
             measureUnits?: undefined;
             customGeoJSON?: undefined;
@@ -143,11 +152,95 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
             labels: any;
             measureUnits: any;
             variableValues: string[];
+            municipioData: string[];
             customGeoJSON: string[];
             colorScaleStops: any[];
         })[])[];
     };
     sources: {
+        [x: string]: {
+            bounds: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            type: string;
+            tiles: string[];
+            minzoom: number;
+            maxzoom: number;
+        } | {
+            bounds: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            type: string;
+            tiles: string[];
+        } | (string | {
+            [x: string]: any;
+            $$resolver: symbol;
+            $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+            dependencies: any;
+            value: (...args: any[]) => any;
+            defaultValue?: any;
+            context?: any;
+        } | (string | string[])[][] | null)[] | {
+            type: string;
+            attribution: string;
+            minzoom: number;
+            maxzoom: number;
+            promoteId: string;
+            bounds: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            tiles: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            }[];
+        } | {
+            type: string;
+            attribution: string;
+            minzoom: number;
+            maxzoom: number;
+            bounds: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            tiles: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            }[];
+            promoteId?: undefined;
+        };
         customGeoJSON_Points: (string | {
             [x: string]: any;
             $$resolver: symbol;
@@ -175,16 +268,6 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
             defaultValue?: any;
             context?: any;
         } | (string | string[])[][] | null)[];
-        planet: {
-            type: string;
-            tiles: string[];
-        };
-        global_municipio: {
-            type: string;
-            tiles: string[];
-            minzoom: number;
-            maxzoom: number;
-        };
     };
     layers: {
         customGeoJSON_Areas_fill: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redus/georedus-ui",
-  "version": "0.8.1",
+  "version": "0.8.6",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/main.js",
@@ -52,7 +52,7 @@
     "@orioro/react-csv": "^0.0.2",
     "@orioro/react-dialogs": "^0.0.2",
     "@orioro/react-dir-nav": "^0.1.0",
-    "@orioro/react-maplibre-util": "^0.4.0",
+    "@orioro/react-maplibre-util": "^0.5.2",
     "@orioro/react-sortable": "^0.0.2",
     "@orioro/react-ui-core": "^0.0.6",
     "@orioro/resolve": "^0.1.2",