@redus/georedus-ui 0.7.0 → 0.8.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @orioro/template-react
 
+## 0.8.1
+
+### Patch Changes
+
+- fix municipio maxzoom
+
+## 0.8.0
+
+### Minor Changes
+
+- integrate vtx protocol into censo data
+
+### Patch Changes
+
+- Updated dependencies
+  - @orioro/vector-tile-util@0.2.0
+
 ## 0.7.0
 
 ### Minor Changes

package/dist/DevControls/importViewSpecsFromCsv/index.d.ts

@@ -1,4 +1,4 @@
-export function importViewSpecsFromCsv(dialogs: any): Promise<typeof CANCELLED | Record<string, any>[]>;
+export function importViewSpecsFromCsv(dialogs: any): Promise<Record<string, any>[] | typeof CANCELLED>;
 export namespace COLLECTION_SCHEMAS {
     export { ibge_malha_br_setor_censitario_2010 };
     export { ibge_malha_br_setor_censitario_2022 };

package/dist/index.d.ts

@@ -1 +1,2 @@
 export * from './GeoReDUS';
+export * from './vtxProtocol';

package/dist/main.js

@@ -29,6 +29,8 @@ import { saveAs } from 'file-saver';
 import initGdalJs from 'gdal3.js';
 import queryString from 'query-string';
 import { wrap } from 'comlink';
+import { dataMergeProtocol } from '@orioro/vector-tile-util';
+import maplibregl from 'maplibre-gl';
 import { get as get$1 } from '@orioro/get';
 import { validate } from '@orioro/validate';
 import { buffer } from '@turf/turf';
@@ -1304,6 +1306,7 @@ function LeftPanel(_ref) {
   , {
     style: {
       position: 'absolute',
+      zIndex: 1000,
       top: {
         xs: "".concat(1.2 * HEADER_HEIGHT, "px"),
         md: "".concat(HEADER_HEIGHT * (2 / 3), "px")
@@ -4261,6 +4264,21 @@ var worker = typeof Worker !== 'undefined' && new Worker(new URL('./GeoReDUSWork
 });
 var GeoReDUSWorker = worker ? wrap(worker) : null;
 
+var vtx = dataMergeProtocol();
+var memoFetchData = vtx.memoFetchData;
+var VTX_PROTOCOL = 'vtx';
+function vtxUrl(_a) {
+  var tiles = _a.tiles,
+    data = _a.data;
+  return "".concat(VTX_PROTOCOL, "://").concat(JSON.stringify({
+    t: tiles,
+    d: data
+  }));
+}
+function vtxSetup() {
+  maplibregl.addProtocol('vtx', vtx.protocolHandler);
+}
+
 // export const $workerGet: ExpressionSpec<[any, any?]> = {
 //   parseArgs: ([arg1, arg2], { parseNodeInput }) =>
 //     typeof arg2 === 'undefined'
@@ -4280,7 +4298,10 @@ var $naturalBreaks = function $naturalBreaks(_a) {
   }, isPlainObject(opt) ? pick(opt, ['scalesByK', 'k', 'minK', 'maxK', 'defaultColor']) : {}));
   return breaks;
 };
-// export const $test = ()
+var $vtxUrl = function $vtxUrl(_a) {
+  var options = _a[0];
+  return vtxUrl(options);
+};
 var $urlSearch = function $urlSearch(_a) {
   var searchParams = _a[0];
   return Array.isArray(searchParams) ? queryString.stringify(searchParams[0], searchParams[1]) : queryString.stringify(
@@ -4303,7 +4324,8 @@ var $urlSearch = function $urlSearch(_a) {
 var CUSTOM_EXPR = /*#__PURE__*/Object.freeze({
   __proto__: null,
   $naturalBreaks: $naturalBreaks,
-  $urlSearch: $urlSearch
+  $urlSearch: $urlSearch,
+  $vtxUrl: $vtxUrl
 });
 
 var _a;
@@ -4326,7 +4348,18 @@ var _b = makeResolve({
       // @ts-ignore
       exps: __assign(__assign(__assign({}, ALL_EXPR), CUSTOM_EXPR), {
         $fetch: fetchExpr({
-          isFetchAllowed: isFetchAllowed
+          isFetchAllowed: isFetchAllowed,
+          //
+          // memoFetchData already parses
+          // response to json
+          //
+          // TODO: review integration techniques
+          // for better API
+          //
+          fetchFn: vtx.memoFetchData,
+          handleResponse: function handleResponse(data) {
+            return data;
+          }
         })
       })
     }).resolver),
@@ -4707,7 +4740,7 @@ function globalResources(context) {
       global_municipio: tableVectorSource(context, MUNICIPIO_MALHA_TABLE_ID, {
         absoluteId: MUNICIPIO_MALHA_TABLE_ID,
         minzoom: 4,
-        maxzoom: 20
+        maxzoom: 12
       })
     },
     layers: _objectSpread2({
@@ -5345,6 +5378,15 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
   //
   var _vectorSourceFillColor = ['$flat', [['step', ['coalesce', ['get', ['$get', 'view.conf.data.variableId']], -1]], ['$get', 'view.metadata.colorScaleStops']]];
   var sourceLabel = "CENSO ".concat(year);
+  var _resolveDataUrl = resolve.fn(function (context) {
+    var _variableId = get$1(context, 'view.conf.data.variableId');
+    var _variant = variantsByVariableId[_variableId];
+    var url = "".concat(METADATA_API_ENDPOINT, "/").concat(_variant.source_table_id, "?").concat($urlSearch([{
+      select: ['cd_setor', _variableId].join(','),
+      cd_mun: "eq.".concat(context.app.municipioId)
+    }]));
+    return url;
+  });
   return {
     // debug: true,
     id: viewId,
@@ -5438,18 +5480,9 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
       }
     },
     metadata: {
-      _dependencies: function _dependencies(_ref2) {
-        _ref2.viewConfState;
-        // console.log('run dependencies', omit(viewConfState.byId, [viewId]))
-
-        // return omit(viewConfState.byId, [viewId])
-        return 'STABLE';
-
-        // return omit(viewConfState.byId, [viewId])
-      },
       _value: ['$let', {
         customGeoJSON: ['$if', ['$empty', ['$get', 'view.conf.data.customSpatialAggregationUnit']], null, resolveAsync.fn(/*#__PURE__*/function () {
-          var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(context) {
+          var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(context) {
             var contents, BASE, POINTS, LINE_STRINGS, AREAS_FEATURES, AREAS_BASE, AREAS;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
@@ -5534,15 +5567,11 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
             }, _callee, null, [[0, 25]]);
           }));
           return function (_x) {
-            return _ref3.apply(this, arguments);
+            return _ref2.apply(this, arguments);
           };
         }())]
       }, ['$let', {
-        variableValues: ['$if', ['$empty', ['$get', 'customGeoJSON.AREAS']], ['$get', ['$template', '[].${0}', ['$get', 'view.conf.data.variableId']], ['$fetch', ['$template', "".concat(METADATA_API_ENDPOINT) + '/${source_table_id}?select=' + '${variableId}' + '&cd_mun=eq.' + '${municipioId}', {
-          variableId: ['$get', 'view.conf.data.variableId'],
-          municipioId: ['$context', 'municipioId'],
-          source_table_id: ['$get', ['$template', '${0}.source_table_id', ['$get', 'view.conf.data.variableId']], variantsByVariableId]
-        }]]], ['$fetch', {
+        variableValues: ['$if', ['$empty', ['$get', 'customGeoJSON.AREAS']], ['$get', ['$template', '[].${0}', ['$get', 'view.conf.data.variableId']], ['$fetch', _resolveDataUrl]], ['$fetch', {
           href: METADATA_API_ENDPOINT,
           pathname: 'rpc/aggregate_by_geojson'
         }, {
@@ -5562,20 +5591,6 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
         measureUnits: measureUnits,
         variableValues: ['$get', 'variableValues'],
         customGeoJSON: ['$get', 'customGeoJSON'],
-        customGeoJSON2: resolveAsync.fn(/*#__PURE__*/function () {
-          var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(context) {
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
-                case 0:
-                case "end":
-                  return _context2.stop();
-              }
-            }, _callee2);
-          }));
-          return function (_x2) {
-            return _ref4.apply(this, arguments);
-          };
-        }()),
         colorScaleStops: ['$naturalBreaks', ['$get', 'variableValues'], _objectSpread2(_objectSpread2({}, _color_scheme), {}, {
           minK: 5
         })]
@@ -5612,7 +5627,6 @@ 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) {
-        // ['$get', 'view.metadata.customGeoJSON'],
         var _context$view$metadat = context.view.metadata,
           customGeoJSON = _context$view$metadat.customGeoJSON,
           variableValues = _context$view$metadat.variableValues;
@@ -5639,44 +5653,43 @@ function cem_censo_2010_2022(viewSpec, allViewSpecs, context) {
       type: 'vector',
       attribution: sourceLabel,
       minzoom: 8,
-      maxzoom: 20,
+      //
+      // Prevent system from fetching data beyond necessary detail
+      //
+      maxzoom: BUILDINGS_MIN_ZOOM,
       promoteId: 'cd_setor',
-      tiles: [['$join', ["".concat(VECTOR_TILE_SERVER_ENDPOINT, "/dvt/{z}/{x}/{y}?"), ['$urlSearch', {
-        view: ['$get', ['$template', '${0}.collection_id', ['$get', 'view.conf.data.variableId']], variantsByVariableId],
-        select: ['cd_setor'],
-        join_view: ['$get', ['$template', '${0}.source_table_id', ['$get', 'view.conf.data.variableId']], variantsByVariableId],
-        join_source_column: 'cd_setor',
-        join_target_column: 'cd_setor',
-        join_select: [['$get', 'view.conf.data.variableId']],
-        where: {
-          cd_mun: [['$get', 'municipioId']]
-        }
-      }]]]]
+      tiles: [resolve.fn(function (context) {
+        var _variableId = get$1(context, 'view.conf.data.variableId');
+        var _variant = variantsByVariableId[_variableId];
+        return ['$vtxUrl', {
+          tiles: "".concat(VECTOR_TILE_SERVER_ENDPOINT, "/dvt/{z}/{x}/{y}?").concat($urlSearch([{
+            view: _variant.collection_id,
+            select: ['cd_setor'],
+            where: {
+              cd_mun: [context.app.municipioId]
+            }
+          }])),
+          data: [['cd_setor', _resolveDataUrl]]
+        }];
+      })]
     }), "".concat(VECTOR_SOURCE_ID, "_buildings"), {
       type: 'vector',
       attribution: sourceLabel,
-      minzoom: 6,
-      maxzoom: 20,
-      tiles: [['$join', ["".concat(VECTOR_TILE_SERVER_ENDPOINT, "/dvt/{z}/{x}/{y}?"), ['$urlSearch', {
-        view: 'overture_br_buildings',
-        // view: [
-        //   '$get',
-        //   [
-        //     '$template',
-        //     '${0}.collection_id',
-        //     ['$get', 'view.conf.data.variableId'],
-        //   ],
-        //   variantsByVariableId,
-        // ],
-        select: ['height', 'subtype'],
-        join_view: ['$get', ['$template', '${0}.source_table_id', ['$get', 'view.conf.data.variableId']], variantsByVariableId],
-        join_source_column: "setor_".concat(year, "_id"),
-        join_target_column: 'cd_setor',
-        join_select: [['$get', 'view.conf.data.variableId']],
-        where: {
-          municipio_id: [['$get', 'municipioId']]
-        }
-      }]]]]
+      minzoom: BUILDINGS_MIN_ZOOM,
+      maxzoom: BUILDINGS_MIN_ZOOM,
+      // Zoom levels make no real difference, buildings
+      // are pretty square
+      // maxzoom: 20,
+      tiles: [resolve.fn(function (context) {
+        return ['$vtxUrl', {
+          tiles: "".concat(VECTOR_TILE_SERVER_ENDPOINT, "/dvt/{z}/{x}/{y}?").concat($urlSearch([{
+            view: 'overture_br_buildings',
+            select: ["setor_".concat(year, "_id")],
+            where: _defineProperty({}, "municipio_id", [context.app.municipioId])
+          }])),
+          data: [["setor_".concat(year, "_id:cd_setor"), _resolveDataUrl]]
+        }];
+      })]
     })),
     layers: _objectSpread2(_objectSpread2({}, globalRes.layers), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
       customGeoJSON_Areas_fill: {
@@ -5847,38 +5860,38 @@ 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 _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
+          var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
             var data, geometries;
-            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _ref5.variableIds, _ref5.options;
-                  _context3.next = 3;
+                  _ref3.variableIds, _ref3.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'],
                     municipioId: ['$context', 'municipioId'],
                     source_table_id: ['$get', ['$template', '${0}.source_table_id', ['$get', 'view.conf.data.variableId']], variantsByVariableId]
                   }]], context);
                 case 3:
-                  data = _context3.sent;
-                  _context3.next = 6;
+                  data = _context2.sent;
+                  _context2.next = 6;
                   return resolveExprAsync(['$fetch', ['$template', "".concat(METADATA_API_ENDPOINT) + '/${collection_id}?select=geom,cd_setor' + '&cd_mun=eq.' + '${municipioId}', {
                     municipioId: ['$context', 'municipioId'],
                     collection_id: ['$get', ['$template', '${0}.collection_id', ['$get', 'view.conf.data.variableId']], variantsByVariableId]
                   }]], context);
                 case 6:
-                  geometries = _context3.sent;
-                  return _context3.abrupt("return", dataJoin([geometries, data], {
+                  geometries = _context2.sent;
+                  return _context2.abrupt("return", dataJoin([geometries, data], {
                     key: 'cd_setor'
                   }));
                 case 8:
                 case "end":
-                  return _context3.stop();
+                  return _context2.stop();
               }
-            }, _callee3);
+            }, _callee2);
           }));
-          return function (_x3) {
-            return _ref6.apply(this, arguments);
+          return function (_x2) {
+            return _ref4.apply(this, arguments);
           };
         }();
       })
@@ -7104,6 +7117,11 @@ function useMapStyle(input, modifier) {
 
 var _excluded = ["layerId", "__filterFeaturesForStep"];
 var _templateObject, _templateObject2, _templateObject3;
+
+//
+// Sets up vtx:// protocol
+//
+vtxSetup();
 var LegendContainer = styled(Flex)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-shadow:\n    rgba(0, 0, 0, 0.1) 0px 4px 6px -1px,\n    rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;\n  background-color: white;\n  border-radius: 4px;\n"])));
 var SyncedMaps = makeSyncedMaps({
   components: {
@@ -7843,4 +7861,4 @@ function GeoReDUS(props) {
   }, /*#__PURE__*/React.createElement(DialogsProvider, null, /*#__PURE__*/React.createElement(GeoReDUSInner, props))));
 }
 
-export { GeoReDUS };
+export { GeoReDUS, VTX_PROTOCOL, memoFetchData, vtx, vtxSetup, vtxUrl };

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

@@ -96,9 +96,6 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
         };
     };
     metadata: {
-        _dependencies: ({ viewConfState }: {
-            viewConfState: any;
-        }) => string;
         _value: (string | {
             customGeoJSON: (string | (string | string[])[] | {
                 [x: string]: any;
@@ -110,11 +107,15 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
                 context?: any;
             } | null)[];
         } | (string | {
-            variableValues: (string | (string | (string | (string | {
-                variableId: string[];
-                municipioId: string[];
-                source_table_id: any[];
-            })[])[])[] | (string | {
+            variableValues: (string | (string | (string | 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 | {
                 href: any;
                 pathname: string;
                 method?: undefined;
@@ -137,22 +138,12 @@ export function cem_censo_2010_2022(viewSpec: any, allViewSpecs: any, context: a
             labels?: undefined;
             measureUnits?: undefined;
             customGeoJSON?: undefined;
-            customGeoJSON2?: undefined;
             colorScaleStops?: undefined;
         } | {
             labels: any;
             measureUnits: any;
             variableValues: string[];
             customGeoJSON: string[];
-            customGeoJSON2: {
-                [x: string]: any;
-                $$resolver: symbol;
-                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
-                dependencies: any;
-                value: (...args: any[]) => any;
-                defaultValue?: any;
-                context?: any;
-            };
             colorScaleStops: any[];
         })[])[];
     };

package/dist/viewSpecs/resolveView/customExpr.d.ts

@@ -1,11 +1,13 @@
 import { ExpressionFn } from '@orioro/resolve/dist/resolvers/expressions/types';
 import { StringifyOptions } from 'query-string';
 import { ScaleNaturalBreaksProps } from '@orioro/react-maplibre-util';
+import { vtxUrl } from '../../vtxProtocol';
 type SearchParams = Record<string, any>;
 export declare const $naturalBreaks: ExpressionFn<[
     number[],
     opt?: Pick<ScaleNaturalBreaksProps, 'k' | 'scalesByK'>
 ]>;
+export declare const $vtxUrl: ExpressionFn<Parameters<typeof vtxUrl>>;
 export declare const $urlSearch: ExpressionFn<[
     SearchParams | [SearchParams, StringifyOptions]
 ]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redus/georedus-ui",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/main.js",
@@ -17,6 +17,7 @@
   },
   "license": "ISC",
   "scripts": {
+    "prepublish": "yarn build",
     "build": "rm -rf dist && rollup --config ./rollup.config.mjs",
     "dev": "storybook dev -p 6006",
     "build-storybook": "storybook build"
@@ -57,8 +58,9 @@
     "@orioro/resolve": "^0.1.2",
     "@orioro/scale-util": "^0.0.2",
     "@orioro/tree-model": "^0.0.2",
-    "@orioro/util": "^0.11.2",
+    "@orioro/util": "^0.13.0",
     "@orioro/validate": "^0.0.2",
+    "@orioro/vector-tile-util": "^0.2.0",
     "@radix-ui/react-collapsible": "^1.1.3",
     "@tanstack/react-query": "^5.18.0",
     "@turf/turf": "^7.1.0",