@mapcomponents/react-maplibre 0.1.51 → 0.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapcomponents/react-maplibre",
-  "version": "0.1.51",
+  "version": "0.1.52",
   "main": "index.js",
   "license": "MIT",
   "module": "dist/index.esm.js",

package/scripts/create-map-component.sh

@@ -18,14 +18,14 @@ if [ ! -d "$target_path$component_name" ]; then
 
   mv $target_path$component_name/$template_name.doc.de.md $target_path$component_name/$component_name.doc.de.md
 
-  mv $target_path$component_name/$template_name.js $target_path$component_name/$component_name.js
+  mv $target_path$component_name/$template_name.tsx $target_path$component_name/$component_name.tsx
 
   mv $target_path$component_name/$template_name.meta_.json $target_path$component_name/$component_name.meta_.json
 
   mv $target_path$component_name/$template_name.stories.js $target_path$component_name/$component_name.stories.js
 
   sed -i "s/$template_name/$component_name/g" $target_path$component_name/$component_name.doc.de.md
-  sed -i "s/$template_name/$component_name/g" $target_path$component_name/$component_name.js
+  sed -i "s/$template_name/$component_name/g" $target_path$component_name/$component_name.tsx
   sed -i "s/$template_name/$component_name/g" $target_path$component_name/$component_name.meta_.json
   sed -i "s/$template_name/$component_name/g" $target_path$component_name/$component_name.stories.js
 

package/src/components/MlCenterPosition/MlCenterPosition.doc.de.md

@@ -0,0 +1,3 @@
+# Component Beschreibung
+
+Beschreibungstext

package/src/components/MlCenterPosition/MlCenterPosition.meta_.json

@@ -0,0 +1,15 @@
+{
+  "name": "MlCenterPosition",
+  "title": "",
+  "description": "",
+  "i18n": {
+    "de": {
+      "title": "",
+      "description": ""
+    }
+  },
+  "tags": [],
+  "category": "",
+  "type": "component",
+  "price": 0
+}

package/src/components/MlCenterPosition/MlCenterPosition.stories.js

@@ -0,0 +1,21 @@
+import React from "react";
+
+import MlCenterPosition from "./MlCenterPosition";
+
+import mapContextDecorator from "../../decorators/MapContextDecorator";
+
+const storyoptions = {
+  title: "MapComponents/MlCenterPosition",
+  component: MlCenterPosition,
+  argTypes: {
+  },
+  decorators: mapContextDecorator,
+  parameters: { docs: { source: { type: 'code' } } }
+};
+export default storyoptions;
+
+const Template = (args) => <MlCenterPosition />;
+
+export const ExampleConfig = Template.bind({});
+ExampleConfig.parameters = {};
+ExampleConfig.args = {};

package/src/components/MlCenterPosition/MlCenterPosition.tsx

@@ -0,0 +1,86 @@
+import React, { useState, useCallback } from "react";
+import useMap from "../../hooks/useMap";
+import { Button } from "@mui/material";
+import  GpsFixedIcon  from "@mui/icons-material/GpsFixed";
+
+interface MlCenterPositionProps {
+  /**
+   * Id of the target MapLibre instance in mapContext
+   */
+  mapId?: string;
+  /**
+   * Id of an existing layer in the mapLibre instance to help specify the layer order
+   * This layer will be visually beneath the layer with the "insertBeforeLayer" id.
+   */
+  insertBeforeLayer?: string;
+  /**
+   * Active button font color
+   */
+  onColor?: string;
+  /**
+   * Inactive button font color
+   */
+  offColor?: string;
+  /**
+   * CSS style object that is applied to the button component
+   */
+  style?: any;
+}
+
+/**
+ * Component template
+ *
+ */
+const MlCenterPosition = (props: MlCenterPositionProps) => {
+  const mapHook = useMap({
+    mapId: props.mapId,
+    waitForLayer: props.insertBeforeLayer,
+  });
+  const [locationAccessDenied, setLocationAccessDenied] = useState(false);
+
+  const centerCurrentLocation = () => {
+    navigator.geolocation.getCurrentPosition(getLocationSuccess, getLocationError);
+  };
+
+  const getLocationSuccess = useCallback((location) => {
+    mapHook.map?.map.setCenter?.([location.coords.longitude, location.coords.latitude]);
+  }, [mapHook.map]);
+
+  const getLocationError = () => {
+    console.log("Access of user location denied");
+    setLocationAccessDenied(true);
+  };
+  return <>
+      <Button 
+        sx={{
+          zIndex: 1002,
+          color: !locationAccessDenied ? props.onColor : props.offColor,
+          ...props.style,
+        }}
+       onClick={centerCurrentLocation} disabled={locationAccessDenied}>
+        <GpsFixedIcon sx={{ ...(props.style?.fontSize?{fontSize: props.style?.fontSize}:{}) }} />{" "}
+      </Button>
+  </>;
+
+};
+
+MlCenterPosition.defaultProps = {
+  mapId: undefined,
+  style: {
+    minWidth: "30px",
+    minHeight: "30px",
+    width: "30px",
+    height: "30px",
+    backgroundColor: "#414141",
+    borderRadius: "23%",
+    margin: 0.15,
+    fontSize: "1.3em",
+    ":hover": {
+      backgroundColor: "#515151",
+      color: "#ececec",
+    },
+  },
+  onColor: "#ececec",
+  offColor: "#666",
+};
+export default MlCenterPosition;

package/src/components/MlGeoJsonLayer/MlGeoJsonLayer.tsx

@@ -43,7 +43,7 @@ type MlGeoJsonLayerProps = {
    * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#circle
    * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#fill
    */
-  paint?: CircleLayerSpecification['paint'] | FillLayerSpecification['paint'] | LineLayerSpecification['layout'];
+  paint?: CircleLayerSpecification['paint'] | FillLayerSpecification['paint'] | LineLayerSpecification['paint'];
   /**
    * Layout property object, that is passed to the addLayer call.
    * Possible props depend on the layer type.

package/src/components/MlNavigationTools/MlNavigationTools.stories.js

@@ -15,8 +15,9 @@ const storyoptions = {
 };
 export default storyoptions;
 
-const Template = (args) => <MlNavigationTools />;
+const Template = (args) => <MlNavigationTools {...args} />;
 
 export const ExampleConfig = Template.bind({});
 ExampleConfig.parameters = {};
-ExampleConfig.args = {};
+ExampleConfig.args = {
+};

package/src/components/MlNavigationTools/MlNavigationTools.tsx

@@ -8,13 +8,29 @@ import MlNavigationCompass from "../MlNavigationCompass/MlNavigationCompass";
 import MlFollowGps from "../MlFollowGps/MlFollowGps";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import useMap from "../../hooks/useMap";
+import MlCenterPosition from "../MlCenterPosition/MlCenterPosition";
 
 interface MlNavigationToolsProps {
+  /**
+   * Id of the target MapLibre instance in mapContext
+   */
   mapId?: string;
+  /**
+   * The layerId of an existing layer this layer should be rendered visually beneath
+   * https://maplibre.org/maplibre-gl-js-docs/api/map/#map#addlayer - see "beforeId" property
+   */
   insertBeforeLayer?: string;
+  /**
+   * Show follow GPS button
+   */
+  showFollowGpsButton?: boolean;
+  /**
+   * Show center on current position button
+   */
+  showCenterLocationButton?: boolean;
 }
 
- /**
+/**
  * @component
  */
 const MlNavigationTools = (props: MlNavigationToolsProps) => {
@@ -45,21 +61,22 @@ const MlNavigationTools = (props: MlNavigationToolsProps) => {
   useEffect(() => {
     if (!mapHook.map) return;
 
-    mapHook.map.on("pitchend", () => {
-      if (!mapHook.map) return;
+    mapHook.map.on(
+      "pitchend",
+      () => {
+        if (!mapHook.map) return;
 
-      setPitch(mapHook.map.map.getPitch());
-    },mapHook.componentId);
+        setPitch(mapHook.map.map.getPitch());
+      },
+      mapHook.componentId
+    );
     setPitch(mapHook.map.map.getPitch());
   }, [mapHook.map, props.mapId]);
 
   const zoomIn = () => {
     if (!mapHook.map) return;
 
-    if (
-      mapHook.map.map.transform._zoom + 0.5 <=
-      mapHook.map.map.transform._maxZoom
-    ) {
+    if (mapHook.map.map.transform._zoom + 0.5 <= mapHook.map.map.transform._maxZoom) {
       mapHook.map.map.easeTo({ zoom: mapHook.map.map.transform._zoom + 0.5 });
     }
   };
@@ -67,10 +84,7 @@ const MlNavigationTools = (props: MlNavigationToolsProps) => {
   const zoomOut = () => {
     if (!mapHook.map) return;
 
-    if (
-      mapHook.map.map.transform._zoom - 0.5 >=
-      mapHook.map.map.transform._minZoom
-    ) {
+    if (mapHook.map.map.transform._zoom - 0.5 >= mapHook.map.map.transform._minZoom) {
       mapHook.map.map.easeTo({ zoom: mapHook.map.map.transform._zoom - 0.5 });
     }
   };
@@ -108,10 +122,18 @@ const MlNavigationTools = (props: MlNavigationToolsProps) => {
           boxShadow: "0px 0px 18px rgba(0,0,0,.5)",
         }}
       />
-      <Button sx={{ ...buttonStyle, fontSize:mediaIsMobile?'1.4em':'1em', fontWeight: 600 }} onClick={adjustPitch}>
+      <Button
+        sx={{ ...buttonStyle, fontSize: mediaIsMobile ? "1.4em" : "1em", fontWeight: 600 }}
+        onClick={adjustPitch}
+      >
         {pitch ? "2D" : "3D"}
       </Button>
+      {props.showFollowGpsButton &&
       <MlFollowGps style={{ ...(({ color, ...rest }) => rest)(buttonStyle) }} />
+      }
+      {props.showCenterLocationButton &&
+      <MlCenterPosition style={{ ...(({ color, ...rest }) => rest)(buttonStyle) }} />
+      }
       <ButtonGroup
         orientation="vertical"
         sx={{
@@ -122,18 +144,20 @@ const MlNavigationTools = (props: MlNavigationToolsProps) => {
         }}
       >
         <Button sx={{ ...buttonStyle, color: "#ececec" }} onClick={zoomIn}>
-          <ControlPointIcon
-            sx={{ fontSize: mediaIsMobile ? "1.5em" : "1.2em" }}
-          />
+          <ControlPointIcon sx={{ fontSize: mediaIsMobile ? "1.5em" : "1.2em" }} />
         </Button>
         <Button sx={{ ...buttonStyle, color: "#ececec" }} onClick={zoomOut}>
-          <RemoveCircleOutlineIcon
-            sx={{ fontSize: mediaIsMobile ? "1.5em" : "1.2em" }}
-          />
+          <RemoveCircleOutlineIcon sx={{ fontSize: mediaIsMobile ? "1.5em" : "1.2em" }} />
         </Button>
       </ButtonGroup>
     </div>
   );
 };
 
+MlNavigationTools.defaultProps = {
+  mapId: undefined,
+  showFollowGpsButton: true,
+  showCenterLocationButton: false,
+};
+
 export default MlNavigationTools;

package/src/components/MlTransitionGeoJsonLayer/MlTransitionGeoJsonLayer.tsx

@@ -32,7 +32,7 @@ interface MlTransitionGeoJsonLayerProps {
    * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#circle
    * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#fill
    */
-  paint?: CircleLayerSpecification['paint'] | FillLayerSpecification['paint'] | LineLayerSpecification['layout'];
+  paint?: CircleLayerSpecification['paint'] | FillLayerSpecification['paint'] | LineLayerSpecification['paint'];
   /**
    * Layout property object, that is passed to the addLayer call.
    * Possible props depend on the layer type.