@redus/georedus-ui 0.19.2 → 0.19.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @orioro/template-react
 
+## 0.19.3
+
+### Patch Changes
+
+- update dependency versions
+- Updated dependencies
+  - @orioro/react-maplibre-util@0.7.1
+  - @orioro/react-chart-util@0.3.1
+  - @orioro/vector-tile-util@0.3.1
+  - @orioro/react-dir-nav@0.2.1
+
 ## 0.19.2
 
 ### Patch Changes

package/dist/main.js

@@ -1,4 +1,4 @@
-import { get, isPlainObject, pick, omit, set, uniqBy, groupBy, uniq } from 'lodash';
+import { get, isPlainObject, pick, omit, set, uniqBy, groupBy, sortBy, uniq } from 'lodash';
 import { slugify, dataJoin, interpolate } from '@orioro/util';
 import { makeResolve, $$literal, withExpressionResolvers, expressions, ALL_EXPR, fetchExpr, resolve, resolveAsync } from '@orioro/resolve';
 import { __assign, __spreadArray, __awaiter, __generator, __makeTemplateObject } from 'tslib';
@@ -3631,12 +3631,12 @@ function influenceAreaLayers(_a) {
   };
 }
 
-var _excluded$8 = ["version"];
+var _excluded$9 = ["version"];
 function tableVectorSource(context, tableId) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     _ref$version = _ref.version,
     version = _ref$version === void 0 ? '1' : _ref$version,
-    override = _objectWithoutProperties(_ref, _excluded$8);
+    override = _objectWithoutProperties(_ref, _excluded$9);
   var VECTOR_TILE_SERVER_ENDPOINT = context.VECTOR_TILE_SERVER_ENDPOINT;
   return _objectSpread2({
     type: 'vector',
@@ -6315,7 +6315,7 @@ function cem_saude_2024(viewSpec, allViewSpecs, context) {
   }));
 }
 
-var _excluded$7 = ["label", "color", "line", "fill", "tiles", "source_layer", "sources", "layers"];
+var _excluded$8 = ["label", "color", "line", "fill", "tiles", "source_layer", "sources", "layers"];
 function _parseTiles$2(tiles, context) {
   tiles = Array.isArray(tiles) ? tiles : typeof tiles === 'string' ? [tiles] : null;
   if (!tiles) {
@@ -6338,7 +6338,7 @@ function vector_polygon(_ref, allViewSpecs, context) {
     sources = _ref$sources === void 0 ? {} : _ref$sources,
     _ref$layers = _ref.layers,
     layers = _ref$layers === void 0 ? {} : _ref$layers,
-    props = _objectWithoutProperties(_ref, _excluded$7);
+    props = _objectWithoutProperties(_ref, _excluded$8);
   if (!source_layer) {
     throw new Error('source_layer must be defined');
   }
@@ -6392,7 +6392,7 @@ function vector_polygon(_ref, allViewSpecs, context) {
   });
 }
 
-var _excluded$6 = ["line", "color", "tiles", "source_layer", "sources", "layers"];
+var _excluded$7 = ["line", "color", "tiles", "source_layer", "sources", "layers"];
 function _parseTiles$1(tiles, context) {
   tiles = Array.isArray(tiles) ? tiles : typeof tiles === 'string' ? [tiles] : null;
   if (!tiles) {
@@ -6412,7 +6412,7 @@ function vector_line(_ref, allViewSpecs, context) {
     sources = _ref$sources === void 0 ? {} : _ref$sources,
     _ref$layers = _ref.layers,
     layers = _ref$layers === void 0 ? {} : _ref$layers,
-    props = _objectWithoutProperties(_ref, _excluded$6);
+    props = _objectWithoutProperties(_ref, _excluded$7);
   if (!source_layer) {
     throw new Error('source_layer must be defined');
   }
@@ -6449,7 +6449,7 @@ function vector_line(_ref, allViewSpecs, context) {
   });
 }
 
-var _excluded$5 = ["circle", "color", "tiles", "source_layer", "sources", "layers"];
+var _excluded$6 = ["circle", "color", "tiles", "source_layer", "sources", "layers"];
 function _parseTiles(tiles, context) {
   tiles = Array.isArray(tiles) ? tiles : typeof tiles === 'string' ? [tiles] : null;
   if (!tiles) {
@@ -6469,7 +6469,7 @@ function vector_circle(_ref, allViewSpecs, context) {
     sources = _ref$sources === void 0 ? {} : _ref$sources,
     _ref$layers = _ref.layers,
     layers = _ref$layers === void 0 ? {} : _ref$layers,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    props = _objectWithoutProperties(_ref, _excluded$6);
   if (!source_layer) {
     throw new Error('source_layer must be defined');
   }
@@ -8051,6 +8051,217 @@ function temperatura_superficie(_ref7) {
   }));
 }
 
+var _excluded$5 = ["circle", "color", "tiles", "source_layer", "sources", "layers", "VECTOR_TILE_SERVER_ENDPOINT", "METADATA_API_ENDPOINT"],
+  _excluded2$1 = ["geom"];
+var ISOCHRONE_COLORS = [{
+  value: 15,
+  label: '15 min',
+  color: '#2ECC71'
+}, {
+  value: 30,
+  label: '30 min',
+  color: '#F1C40F'
+}, {
+  value: 45,
+  label: '45 min',
+  color: '#E67E22'
+}, {
+  value: 60,
+  label: '60 min',
+  color: '#E74C3C'
+}];
+function piloto_mobilidade_stops(_ref) {
+  var _ref$circle = _ref.circle,
+    circle = _ref$circle === void 0 ? {} : _ref$circle,
+    color = _ref.color,
+    tiles = _ref.tiles,
+    source_layer = _ref.source_layer,
+    _ref$sources = _ref.sources,
+    sources = _ref$sources === void 0 ? {} : _ref$sources,
+    _ref$layers = _ref.layers,
+    layers = _ref$layers === void 0 ? {} : _ref$layers;
+    _ref.VECTOR_TILE_SERVER_ENDPOINT;
+    var METADATA_API_ENDPOINT = _ref.METADATA_API_ENDPOINT,
+    props = _objectWithoutProperties(_ref, _excluded$5);
+  if (!source_layer) {
+    throw new Error('source_layer must be defined');
+  }
+  return _objectSpread2(_objectSpread2({}, props), {}, {
+    // confSchema: {
+    //   data: {
+    //     isocrona_origem_stop_id: {
+    //       label: 'ID do ponto de ônibus analisado',
+    //       type: 'text',
+    //     },
+    //   },
+    // },
+    metadata: {
+      isocrona_origem_polygons_geojson: resolveAsync.fn(/*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(context) {
+          var _context$view;
+          var stop_id, isocrona_origem_polygons;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                stop_id = context === null || context === void 0 || (_context$view = context.view) === null || _context$view === void 0 || (_context$view = _context$view.conf) === null || _context$view === void 0 || (_context$view = _context$view.data) === null || _context$view === void 0 ? void 0 : _context$view.isocrona_origem_stop_id;
+                if (stop_id) {
+                  _context.next = 3;
+                  break;
+                }
+                return _context.abrupt("return", null);
+              case 3:
+                _context.next = 5;
+                return fetch("".concat(METADATA_API_ENDPOINT, "/fnp_piloto_mobilidade_2026_isocronas_origem?id=eq.").concat(stop_id)).then(function (res) {
+                  return res.json();
+                });
+              case 5:
+                isocrona_origem_polygons = _context.sent;
+                return _context.abrupt("return", {
+                  type: 'FeatureCollection',
+                  features: sortBy(isocrona_origem_polygons, 'isochrone').reverse().map(function (_ref3) {
+                    var geom = _ref3.geom,
+                      properties = _objectWithoutProperties(_ref3, _excluded2$1);
+                    return {
+                      type: 'Feature',
+                      properties: properties,
+                      geometry: geom
+                    };
+                  })
+                });
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        return function (_x) {
+          return _ref2.apply(this, arguments);
+        };
+      }())
+    },
+    sources: _objectSpread2({
+      main: {
+        promoteId: 'id',
+        type: 'vector',
+        tiles: tiles
+      },
+      isocrona_origem_polygons: resolve.fn(function (context) {
+        var _context$view2;
+        var isocrona_origem_polygons_geojson = context === null || context === void 0 || (_context$view2 = context.view) === null || _context$view2 === void 0 || (_context$view2 = _context$view2.metadata) === null || _context$view2 === void 0 ? void 0 : _context$view2.isocrona_origem_polygons_geojson;
+        if (!isocrona_origem_polygons_geojson) {
+          return null;
+        }
+        return {
+          type: 'geojson',
+          data: isocrona_origem_polygons_geojson
+        };
+      })
+    }, sources),
+    layers: _objectSpread2(_defineProperty(_defineProperty({}, "main_circle", _objectSpread2(_objectSpread2({
+      zIndex: Z_OVERLAY_TOP_3000,
+      source: 'main',
+      'source-layer': source_layer,
+      type: 'circle'
+    }, circle), {}, {
+      filter: resolve.fn(function (context) {
+        var _context$view3;
+        var isocrona_origem_stop_id = context === null || context === void 0 || (_context$view3 = context.view) === null || _context$view3 === void 0 || (_context$view3 = _context$view3.conf) === null || _context$view3 === void 0 || (_context$view3 = _context$view3.data) === null || _context$view3 === void 0 ? void 0 : _context$view3.isocrona_origem_stop_id;
+        return isocrona_origem_stop_id ? ['==', ['get', 'stop_id'], isocrona_origem_stop_id] : ['all'];
+      }),
+      paint: resolve.fn(function (context) {
+        var _context$view4;
+        var PAINT_BASE = {
+          'circle-color': color,
+          'circle-stroke-color': '#000000',
+          'circle-radius': 6
+        };
+        var isocrona_origem_stop_id = context === null || context === void 0 || (_context$view4 = context.view) === null || _context$view4 === void 0 || (_context$view4 = _context$view4.conf) === null || _context$view4 === void 0 || (_context$view4 = _context$view4.data) === null || _context$view4 === void 0 ? void 0 : _context$view4.isocrona_origem_stop_id;
+        return isocrona_origem_stop_id ? _objectSpread2(_objectSpread2({}, PAINT_BASE), {}, {
+          'circle-stroke-width': 3,
+          'circle-radius': 10
+          // 'circle-color': 'red',
+        }) : _objectSpread2(_objectSpread2({}, PAINT_BASE), {}, {
+          'circle-radius': 4,
+          'circle-stroke-width': 1,
+          'circle-stroke-opacity': ['interpolate', ['linear'], ['zoom'], 12, 0, 16, 0.8],
+          'circle-opacity': ['interpolate', ['linear'], ['zoom'], 10, 0.2, 16, 0.9]
+        });
+      }),
+      onClick: resolve.fn(function (ctx) {
+        return function (e) {
+          var _ctx$view;
+          var isocrona_origem_stop_id = ctx === null || ctx === void 0 || (_ctx$view = ctx.view) === null || _ctx$view === void 0 || (_ctx$view = _ctx$view.conf) === null || _ctx$view === void 0 || (_ctx$view = _ctx$view.data) === null || _ctx$view === void 0 ? void 0 : _ctx$view.isocrona_origem_stop_id;
+          ctx.app.viewConfDispatch({
+            type: 'SET_VIEW',
+            payload: {
+              viewConf: _objectSpread2(_objectSpread2({}, ctx.view.conf), {}, {
+                data: _objectSpread2(_objectSpread2({}, ctx.view.conf), {}, {
+                  isocrona_origem_stop_id: isocrona_origem_stop_id ? null : e.properties.stop_id
+                })
+              })
+            }
+          });
+        };
+      }),
+      tooltip: {
+        title: ['$literal', resolve.fn(function (ctx) {
+          var _ctx$feature;
+          return ctx === null || ctx === void 0 || (_ctx$feature = ctx.feature) === null || _ctx$feature === void 0 || (_ctx$feature = _ctx$feature.properties) === null || _ctx$feature === void 0 ? void 0 : _ctx$feature.stop_name;
+        })],
+        entries: ['$literal', resolve.fn(function (ctx) {
+          var _ctx$feature2;
+          console.log(ctx.feature.properties);
+          return _typeof((_ctx$feature2 = ctx.feature) === null || _ctx$feature2 === void 0 ? void 0 : _ctx$feature2.properties) === 'object' ? Object.entries({
+            Linhas: ctx.feature.properties.routes ? JSON.parse(ctx.feature.properties.routes).join(', ') : null,
+            ID: ctx.feature.properties.stop_id
+          }) : [];
+        })]
+      }
+    })), "isocrona_origem_polygons", resolve.fn(function (context) {
+      var _context$view5;
+      var isocrona_origem_polygons_geojson = context === null || context === void 0 || (_context$view5 = context.view) === null || _context$view5 === void 0 || (_context$view5 = _context$view5.metadata) === null || _context$view5 === void 0 ? void 0 : _context$view5.isocrona_origem_polygons_geojson;
+      if (!isocrona_origem_polygons_geojson) {
+        return null;
+      }
+      return {
+        source: 'isocrona_origem_polygons',
+        type: 'fill',
+        paint: {
+          'fill-opacity': 1,
+          'fill-color': ['match', ['get', 'isochrone']].concat(_toConsumableArray(ISOCHRONE_COLORS.flatMap(function (item) {
+            return [item.value, item.color];
+          })), ['#CCCCCC' // fallback
+          ])
+        },
+        // tooltip: {
+        //   title: [
+        //     '$literal',
+        //     resolve.fn((ctx) => {
+        //       return ctx?.feature?.properties?.name
+        //     }),
+        //   ],
+        //   entries: [
+        //     '$literal',
+        //     resolve.fn((ctx) => {
+        //       return typeof ctx.feature?.properties === 'object'
+        //         ? Object.entries({
+        //             'Tempo de deslocamento':
+        //               ctx.feature.properties.isochrone + ' min',
+        //           })
+        //         : []
+        //     }),
+        //   ],
+        // },
+        legends: [{
+          type: 'CategoricalLegend',
+          title: 'Tempo de deslocamento',
+          items: ISOCHRONE_COLORS
+        }]
+      };
+    })), layers)
+  });
+}
+
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
   STAGE_SPECIAL_KEYS: STAGE_SPECIAL_KEYS,
@@ -8071,6 +8282,7 @@ var index = /*#__PURE__*/Object.freeze({
   fetchViewSpecs: fetchViewSpecs,
   hand: hand,
   overture_places_poc: overture_places_poc,
+  piloto_mobilidade_stops: piloto_mobilidade_stops,
   redus_mutirao_cop_2025: redus_mutirao_cop_2025,
   resolveConfSchema: resolveConfSchema,
   resolveControls: resolveControls,
@@ -11706,6 +11918,7 @@ function GeoReDUSInner(_ref2) {
     return {
       municipioId: municipioId,
       baseMapStyle: baseMapStyle,
+      viewConfDispatch: viewConfDispatch,
       //
       // Pass only zoomLevel instead of zoom itself
       // in order for views not recompute on every zoom change
@@ -11714,7 +11927,7 @@ function GeoReDUSInner(_ref2) {
       regional: regional,
       mapBounds: mapBounds
     };
-  }, [municipioId, baseMapStyle, zoomLevel, regional, mapBounds]);
+  }, [municipioId, baseMapStyle, viewConfDispatch, zoomLevel, regional, mapBounds]);
   var _useViews = useViews({
       viewSpecs: viewSpecsQuery.data,
       viewConfState: viewConfState,
@@ -12158,9 +12371,6 @@ function GeoReDUSInner(_ref2) {
       right: '20px',
       zIndex: 20
     },
-    spinnerProps: {
-      size: 20
-    },
     message: null
   })), children);
 }

package/dist/viewSpecs/development/index.d.ts

@@ -6,3 +6,4 @@ export * from "./hand";
 export * from "./overture_places_poc";
 export * from "./redus_mutirao_cop_2025";
 export * from "./temperatura_superficie";
+export * from "./piloto_mobilidade_stops";

package/dist/viewSpecs/development/piloto_mobilidade_stops.d.ts

@@ -0,0 +1,103 @@
+export function piloto_mobilidade_stops({ circle, color, tiles, source_layer, sources, layers, VECTOR_TILE_SERVER_ENDPOINT, METADATA_API_ENDPOINT, ...props }: {
+    [x: string]: any;
+    circle?: {} | undefined;
+    color: any;
+    tiles: any;
+    source_layer: any;
+    sources?: {} | undefined;
+    layers?: {} | undefined;
+    VECTOR_TILE_SERVER_ENDPOINT: any;
+    METADATA_API_ENDPOINT: any;
+}): {
+    metadata: {
+        isocrona_origem_polygons_geojson: {
+            [x: string]: any;
+            $$resolver: symbol;
+            $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+            dependencies: any;
+            value: (...args: any[]) => any;
+            defaultValue?: any;
+            context?: any;
+        };
+    };
+    sources: {
+        main: {
+            promoteId: string;
+            type: string;
+            tiles: any;
+        };
+        isocrona_origem_polygons: {
+            [x: string]: any;
+            $$resolver: symbol;
+            $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+            dependencies: any;
+            value: (...args: any[]) => any;
+            defaultValue?: any;
+            context?: any;
+        };
+    };
+    layers: {
+        main_circle: {
+            filter: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            paint: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            onClick: {
+                [x: string]: any;
+                $$resolver: symbol;
+                $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+                dependencies: any;
+                value: (...args: any[]) => any;
+                defaultValue?: any;
+                context?: any;
+            };
+            tooltip: {
+                title: (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;
+                })[];
+                entries: (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;
+                })[];
+            };
+            zIndex: number;
+            source: string;
+            'source-layer': any;
+            type: string;
+        };
+        isocrona_origem_polygons: {
+            [x: string]: any;
+            $$resolver: symbol;
+            $$unresolved?: Record<string | number, import("@orioro/resolve").ResolutionNode> | undefined;
+            dependencies: any;
+            value: (...args: any[]) => any;
+            defaultValue?: any;
+            context?: any;
+        };
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redus/georedus-ui",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/main.js",
@@ -31,7 +31,7 @@
     "react-map-gl": "^8.0.0"
   },
   "devDependencies": {
-    "@orioro/dev": "^0.0.5",
+    "@orioro/dev": "^0.0.6",
     "@orioro/react-versioned-state": "^0.0.2",
     "@radix-ui/themes": "^3.0.1",
     "@types/geojson": "^7946.0.16",
@@ -49,21 +49,21 @@
     "@mapbox/tilebelt": "2.0.0",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
-    "@orioro/cast": "^0.0.11",
-    "@orioro/get": "^0.0.2",
-    "@orioro/react-chart-util": "^0.3.0",
-    "@orioro/react-csv": "^0.0.11",
-    "@orioro/react-dialogs": "^0.0.10",
-    "@orioro/react-dir-nav": "^0.2.0",
-    "@orioro/react-maplibre-util": "^0.7.0",
-    "@orioro/react-sortable": "^0.0.10",
-    "@orioro/react-ui-core": "^0.0.14",
-    "@orioro/resolve": "^0.1.9",
-    "@orioro/scale-util": "^0.0.9",
-    "@orioro/tree-model": "^0.0.2",
-    "@orioro/util": "^0.14.0",
-    "@orioro/validate": "^0.0.2",
-    "@orioro/vector-tile-util": "^0.3.0",
+    "@orioro/cast": "^0.0.12",
+    "@orioro/get": "^0.0.12",
+    "@orioro/react-chart-util": "^0.3.1",
+    "@orioro/react-csv": "^0.0.17",
+    "@orioro/react-dialogs": "^0.1.5",
+    "@orioro/react-dir-nav": "^0.2.1",
+    "@orioro/react-maplibre-util": "^0.7.1",
+    "@orioro/react-sortable": "^0.0.16",
+    "@orioro/react-ui-core": "^0.0.20",
+    "@orioro/resolve": "^0.1.12",
+    "@orioro/scale-util": "^0.0.12",
+    "@orioro/tree-model": "^0.0.10",
+    "@orioro/util": "^0.16.0",
+    "@orioro/validate": "^0.0.10",
+    "@orioro/vector-tile-util": "^0.3.1",
     "@radix-ui/react-collapsible": "^1.1.3",
     "@tanstack/react-query": "^5.18.0",
     "@turf/turf": "^7.1.0",