@orioro/react-maplibre-util 0.5.0 → 0.5.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @orioro/react-maplibre-util
 
+## 0.5.2
+
+### Patch Changes
+
+- fix TerrainControl position usage
+
+## 0.5.1
+
+### Patch Changes
+
+- fix unknown image ids
+
 ## 0.5.0
 
 ### Minor Changes

package/dist/Controls/TerrainControl/TerrainControl.d.ts

@@ -17,5 +17,5 @@ type TerrainControlProps = Omit<ControlContainerProps, 'children'> & {
     demSource?: SourceSpecInput;
     contourTileOptions?: Partial<GlobalContourTileOptions>;
 };
-export declare function TerrainControl({ value: externalValue, onSetValue: onSetExternalValue, demSourceId: DEM_SOURCE_ID, demSource: DEM_SOURCE_SPEC, contourTileOptions: contourTileOptionsInput, }: TerrainControlProps): React.JSX.Element;
+export declare function TerrainControl({ value: externalValue, onSetValue: onSetExternalValue, demSourceId: DEM_SOURCE_ID, demSource: DEM_SOURCE_SPEC, contourTileOptions: contourTileOptionsInput, ...controlContainerProps }: TerrainControlProps): React.JSX.Element;
 export {};

package/dist/DynamicImages/svgImages/index.d.ts

@@ -24,9 +24,17 @@ export declare function svgToMaplibreImage(svgString: string, pixelRatio?: numbe
     Partial<StyleImageMetadata>
 ]>;
 export declare function svgIconId(iconId: string, options?: IconPathToSvgOptions): string;
-export declare function svgIconGenerator(iconPathsById: Record<string, string>): (imageId: string) => Promise<[{
-    width: number;
-    height: number;
-    data: Uint8ClampedArray;
-}, Partial<StyleImageMetadata>]>;
+type SvgIconGeneratorReturn<T extends Record<string, string>> = {
+    (imageId: string): Promise<[
+        {
+            width: number;
+            height: number;
+            data: Uint8ClampedArray;
+        },
+        Partial<StyleImageMetadata>
+    ] | null>;
+} & {
+    [K in keyof T]: (options?: IconPathToSvgOptions) => string;
+};
+export declare function svgIconGenerator<T extends Record<string, string>>(iconPathsById: T): SvgIconGeneratorReturn<T>;
 export {};

package/dist/index.mjs

@@ -920,7 +920,7 @@ function DynamicImages(_a) {
               if (!map.hasImage(imageId)) {
                 if (Array.isArray(result)) {
                   map.addImage(imageId, result[0], result[1]);
-                } else {
+                } else if (result) {
                   map.addImage(imageId, result);
                 }
               }
@@ -1027,15 +1027,28 @@ function svgIconGenerator(iconPathsById) {
   var expr = strExpr({
     expressions: fns
   });
-  return function onGenerateSvgImage(imageId) {
+  function onGenerateSvgImage(imageId) {
     return __awaiter(this, void 0, void 0, function () {
-      var svg;
+      var imageExpr, svg;
       return __generator(this, function (_a) {
-        svg = expr.apply(imageId, undefined);
-        return [2 /*return*/, svgToMaplibreImage(svg)];
+        try {
+          imageExpr = expr.parse(imageId);
+          svg = expr.apply(imageExpr, undefined);
+          return [2 /*return*/, svgToMaplibreImage(svg)];
+        } catch (err) {
+          // console.log(`will skip: ${imageId}`)
+          return [2 /*return*/, null];
+        }
+        return [2 /*return*/];
       });
     });
-  };
+  }
+  Object.assign(onGenerateSvgImage, Object.fromEntries(Object.keys(iconPathsById).map(function (iconId) {
+    return [iconId, function (options) {
+      return svgIconId(iconId, options);
+    }];
+  })));
+  return onGenerateSvgImage;
 }
 
 var DEFAULT_MIN_K = 3;
@@ -1293,7 +1306,8 @@ function TerrainControl(_a) {
     _f = _a.demSource,
     DEM_SOURCE_SPEC = _f === void 0 ? DEFAULT_DEM_SOURCE_SPEC : _f,
     _g = _a.contourTileOptions,
-    contourTileOptionsInput = _g === void 0 ? DEFAULT_CONTOUR_TILE_OPTIONS : _g;
+    contourTileOptionsInput = _g === void 0 ? DEFAULT_CONTOUR_TILE_OPTIONS : _g,
+    controlContainerProps = __rest(_a, ["value", "onSetValue", "demSourceId", "demSource", "contourTileOptions"]);
   var _contourTileOptions = useMemo(function () {
     return __assign(__assign({}, contourTileOptionsInput), DEFAULT_CONTOUR_TILE_OPTIONS);
   }, [contourTileOptionsInput]);
@@ -1485,7 +1499,7 @@ function TerrainControl(_a) {
       return map.off('style.load', handleStyleLoad);
     };
   }, [(_c = mapRef.current) === null || _c === void 0 ? void 0 : _c.getMap(), settings && settings.enable3d]);
-  return /*#__PURE__*/React.createElement(ControlContainer, null, /*#__PURE__*/React.createElement(DropdownMenu, {
+  return /*#__PURE__*/React.createElement(ControlContainer, __assign({}, controlContainerProps), /*#__PURE__*/React.createElement(DropdownMenu, {
     size: "1",
     options: [{
       label: (/*#__PURE__*/React.createElement(React.Fragment, null, "Relevo", settings && (settings.hillshade || settings.enable3d) && (/*#__PURE__*/React.createElement(Icon, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orioro/react-maplibre-util",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/index.mjs",
@@ -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"