@mapcomponents/react-maplibre 0.1.11 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapcomponents/react-maplibre",
-  "version": "0.1.11",
+  "version": "0.1.15",
   "license": "MIT",
   "private": false,
   "module": "dist/index.esm.js",
@@ -9,6 +9,7 @@
     "@emotion/css": "^11.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
+    "@fontsource/roboto": "^4.5.1",
     "@mapbox/mapbox-gl-draw": "^1.2.0",
     "@mapbox/mapbox-gl-sync-move": "^0.3.0",
     "@mapcomponents/react-core": "^0.1.1",
@@ -18,6 +19,7 @@
     "@turf/turf": "^6.5.0",
     "jspdf": "^2.3.0",
     "maplibre-gl": "^1.13.0-rc.5",
+    "react-i18next": "^11.14.3",
     "three": "^0.126.1",
     "uuid": "^8.3.2",
     "wms-capabilities": "^0.5.1",

package/rollup.config.js

@@ -23,6 +23,12 @@ const config = {
     css(),
     del({ targets: ["dist/*"] }),
   ],
-  external: ["prop-types",  "d3", ...Object.keys(pkg.peerDependencies || {})],
+  external: [
+    "prop-types",
+    "d3",
+    "@emotion/react",
+    "@emotion/styled",
+    ...Object.keys(pkg.peerDependencies || {}),
+  ],
 };
 export default config;

package/src/components/MapLibreMap/lib/MapLibreGlWrapper.js

@@ -1,3 +1,4 @@
+// @ts-ignore: TS export Problem to be fixed upstream
 import maplibregl from "maplibre-gl/dist/maplibre-gl";
 
 /**
@@ -41,7 +42,7 @@ const MapLibreGlWrapper = function (props) {
     on: (eventName, handler, options, componentId) => {
       if (!self.eventHandlers[eventName]) return;
 
-      if(typeof options === 'string'){
+      if (typeof options === "string") {
         componentId = options;
         options = {};
       }
@@ -91,7 +92,7 @@ const MapLibreGlWrapper = function (props) {
     /**
      * Array containing an object for each layer in the MapLibre instance providing information on visibility, loading state, order, paint & layout properties
      */
-    layerState: {},
+    layerState: [],
     /**
      * Maps layerIds to layerState in JSON string form for quick deep comparisons
      */
@@ -108,38 +109,38 @@ const MapLibreGlWrapper = function (props) {
      */
     buildLayerObject: (layer) => {
       //if (self.baseLayers.indexOf(layer.id) === -1) {
-        let paint = {};
-        let values = layer.paint?._values;
-        Object.keys(values || {}).map((propName) => {
-          paint[propName] =
-            typeof values[propName].value !== "undefined"
-              ? values[propName].value.value
-              : values[propName];
-        });
-        let layout = {};
-        values = layer.layout?._values;
-        Object.keys(values || {}).map((propName) => {
-          layout[propName] =
-            typeof values[propName].value !== "undefined"
-              ? values[propName].value.value
-              : values[propName];
-        });
-        return {
-          id: layer.id,
-          type: layer.type,
-          visible: layer.visibility === "none" ? false : true,
-          baseLayer: self.baseLayers.indexOf(layer.id) !== -1,
-          paint,
-          layout,
-          //filter: layers[layerId].filter,
-          //layout: layers[layerId].layout,
-          //maxzoom: layers[layerId].maxzoom,
-          //metadata: layers[layerId].metadata,
-          //minzoom: layers[layerId].minzoom,
-          //paint: layers[layerId].paint.get(),
-          //source: layers[layerId].source,
-          //sourceLayer: layers[layerId].sourceLayer,
-        };
+      let paint = {};
+      let values = layer.paint?._values;
+      Object.keys(values || {}).map((propName) => {
+        paint[propName] =
+          typeof values[propName].value !== "undefined"
+            ? values[propName].value.value
+            : values[propName];
+      });
+      let layout = {};
+      values = layer.layout?._values;
+      Object.keys(values || {}).map((propName) => {
+        layout[propName] =
+          typeof values[propName].value !== "undefined"
+            ? values[propName].value.value
+            : values[propName];
+      });
+      return {
+        id: layer.id,
+        type: layer.type,
+        visible: layer.visibility === "none" ? false : true,
+        baseLayer: self.baseLayers.indexOf(layer.id) !== -1,
+        paint,
+        layout,
+        //filter: layers[layerId].filter,
+        //layout: layers[layerId].layout,
+        //maxzoom: layers[layerId].maxzoom,
+        //metadata: layers[layerId].metadata,
+        //minzoom: layers[layerId].minzoom,
+        //paint: layers[layerId].paint.get(),
+        //source: layers[layerId].source,
+        //sourceLayer: layers[layerId].sourceLayer,
+      };
       //}
     },
     /**
@@ -159,7 +160,7 @@ const MapLibreGlWrapper = function (props) {
      */
     refreshLayerState: () => {
       self.wrapper.layerState = self.wrapper.buildLayerObjects();
-      self.wrapper.layerStateStrings = self.wrapper.layerState.map(el => JSON.stringify(el));
+      self.wrapper.layerStateStrings = self.wrapper.layerState.map((el) => JSON.stringify(el));
     },
     /**
      * Object containing information on the current viewport state
@@ -173,29 +174,17 @@ const MapLibreGlWrapper = function (props) {
      * Previous version of viewportStateString
      */
     oldViewportStateString: "{}",
-    getViewport: () => (typeof self.map.getCenter === 'function'?{
-      center: (({ lng, lat, ...rest }) => ({ lng, lat }))(self.map.getCenter()),
-      zoom: self.map.getZoom(),
-      bearing: self.map.getBearing(),
-      pitch: self.map.getPitch(),
-    }:{}),
-    viewportRefreshEnabled: true,
-    viewportRefreshWaiting: false,
-    refreshViewport: (force) => {
-      if (self.wrapper.viewportRefreshEnabled || force) {
-        self.wrapper.viewportRefreshEnabled = false;
-        self.wrapper.viewportState = self.wrapper.getViewport();
-        self.wrapper.viewportStateString = JSON.stringify(self.wrapper.viewportState);
-        setTimeout(() => {
-          self.wrapper.viewportRefreshEnabled = true;
-          if (self.wrapper.viewportRefreshWaiting) {
-            self.wrapper.viewportRefreshWaiting = false;
-            self.wrapper.refreshViewport();
+    getViewport: () =>
+      typeof self.map.getCenter === "function"
+        ? {
+            center: (({ lng, lat, ...rest }) => ({ lng, lat }))(self.map.getCenter()),
+            zoom: self.map.getZoom(),
+            bearing: self.map.getBearing(),
+            pitch: self.map.getPitch(),
           }
-        }, 50);
-      }else{
-          self.wrapper.viewportRefreshWaiting = true;
-      }
+        : {},
+    refreshViewport: () => {
+      self.wrapper.viewportState = self.wrapper.getViewport();
     },
   };
 
@@ -484,10 +473,10 @@ const MapLibreGlWrapper = function (props) {
     ) {
       await fetch(props.mapOptions.style)
         .then((response) => {
-          if(response.ok){
-            return response.json()
-          }else{
-            throw new Error('error loading map style.json')
+          if (response.ok) {
+            return response.json();
+          } else {
+            throw new Error("error loading map style.json");
           }
         })
         .then((styleJson) => {
@@ -508,15 +497,12 @@ const MapLibreGlWrapper = function (props) {
     self.map = new maplibregl.Map(props.mapOptions);
 
     self.addNativeMaplibreFunctionsAndProps();
-    self.wrapper.refreshViewport(true);
+    self.wrapper.refreshViewport();
     self.wrapper.fire("viewportchange");
 
     self.map.on("move", () => {
-      self.wrapper.refreshViewport();
-      if (self.wrapper.viewportStateString !== self.wrapper.oldViewportStateString) {
-        self.wrapper.oldViewportStateString = self.wrapper.viewportStateString;
-        self.wrapper.fire("viewportchange");
-      }
+      self.wrapper.viewportState = self.wrapper.getViewport();
+      self.wrapper.fire("viewportchange");
     });
     self.map.on("data", () => {
       self.wrapper.refreshLayerState();

package/src/components/MlCreatePdfButton/MlCreatePdfButton.meta.json

@@ -1,6 +1,6 @@
 {
   "name": "MlCreatePdfButton",
-  "title": "Sinmple Map print",
+  "title": "Export PDF",
   "description": "Creates a PDF file with the current map view.",
   "i18n": {
     "de": {

package/src/components/MlFeatureEditor/MlFeatureEditor.meta.json

@@ -1,6 +1,6 @@
 {
   "name": "MlFeatureEditor",
-  "title": "Sketch Tool",
+  "title": "Sketch tools",
   "description": "Enables the editing of Point, Linestring and Polygon GeoJSON Files.",
   "i18n": {
     "de": {
@@ -8,7 +8,7 @@
       "description": "Ermöglicht das Bearbeiten von Punkt, Linestring und Polygon GeoJSON Daten."
     }
   },
-  "tags": [ "Map add-on" ],
+  "tags": ["Map add-on"],
   "category": "add-ons",
   "type": "component",
   "price": 0

package/src/components/MlFollowGps/MlFollowGps.js

@@ -5,10 +5,12 @@ import {MapContext} from "@mapcomponents/react-core";
 import {v4 as uuidv4} from "uuid";
 import Button from "@mui/material/Button";
 import RoomIcon from "@mui/icons-material/Room";
-import {point} from "@turf/turf"
+import {point, circle} from "@turf/turf"
 import MlGeoJsonLayer from "../MlGeoJsonLayer/MlGeoJsonLayer";
 import MlImageMarkerLayer from "../MlImageMarkerLayer/MlImageMarkerLayer";
 
+import marker from "./assets/marker.png";
+
 /**
  * Adds a button that makes the map follow the users GPS position using
  * navigator.geolocation.watchPosition if activated
@@ -29,12 +31,11 @@ const MlFollowGps = (props) => {
   const initializedRef = useRef(false);
   const mapRef = useRef(undefined);
   const componentId = useRef((props.idPrefix ? props.idPrefix : "MlFollowGps-") + uuidv4());
-  const [accuracyRadius, setAccuracyRadius] = useState(30);
+  const [accuracyGeoJson, setAccuracyGeoJson] = useState();
 
   useEffect(() => {
     let _componentId = componentId.current;
 
-
     return () => {
       // This is the cleanup function, it is called when this react component is removed from react-dom
       // try to remove anything this component has added to the MapLibre-gl instance
@@ -61,14 +62,14 @@ const MlFollowGps = (props) => {
     initializedRef.current = true;
     mapRef.current = mapContext.getMap(props.mapId);
     mapRef.current.setCenter([7.132122000552613, 50.716405378037706]);
-
   }, [mapContext.mapIds, mapContext, props.mapId]);
 
   const getLocationSuccess = (pos) => {
     if (!mapRef.current) return;
     mapRef.current.setCenter([pos.coords.longitude, pos.coords.latitude]);
-    setAccuracyRadius(pos.coords.accuracy)
-    setGeoJson(point([pos.coords.longitude, pos.coords.latitude]));
+    const geoJsonPoint = point([pos.coords.longitude, pos.coords.latitude])
+    setGeoJson(geoJsonPoint);
+    setAccuracyGeoJson(circle(geoJsonPoint, pos.coords.accuracy/1000))
   };
 
   const getLocationError = (err) => {
@@ -78,47 +79,38 @@ const MlFollowGps = (props) => {
 
   return (
     <>
-      {isFollowed && geoJson &&
-      <MlGeoJsonLayer geojson={geoJson} type={"circle"}
-                      paint={{
-                        "circle-radius": {
-                          stops: [
-                            [0, 0],
-                            [
-                              20,
-                              (accuracyRadius) /
-                              0.075 /
-                              Math.cos((geoJson.geometry.coordinates[1] * Math.PI) / 180),
-                            ],
-                          ],
-                          base: 2,
-                        },
-                        "circle-color": "#ee7700",
-                        "circle-opacity": 0.5,
-                      }}
-      />
-      }
-
-      {isFollowed && geoJson &&
-      <MlImageMarkerLayer
-        options={{
-          type: "symbol",
-          source: {
-            type: "geojson",
-            data: geoJson
-          },
-          layout: {
-            "icon-size": 0.1,
-            "icon-offset": [0, -340]
-          },
-        }
-        }
-        imgSrc={"/assets/marker.png"}
-      />
-      }
+      {isFollowed && geoJson && (
+        <MlGeoJsonLayer
+          geojson={accuracyGeoJson}
+          type={"fill"}
+          paint={{
+            "fill-color": "#ee7700",
+            "fill-opacity": 0.5,
+          }}
+          insertBeforeLayer={"MlFollowGpsMarker"}
+        />
+      )}
+
+      {isFollowed && geoJson && (
+        <MlImageMarkerLayer
+          layerId={"MlFollowGpsMarker"}
+          options={{
+            type: "symbol",
+            source: {
+              type: "geojson",
+              data: geoJson,
+            },
+            layout: {
+              "icon-size": 0.1,
+              "icon-offset": [0, -340],
+            },
+          }}
+          imgSrc={marker}
+        />
+      )}
 
       <Button
-        sx={{zIndex: 1002, color: isFollowed ? "#bbb" : "#666", ...props.style}}
+        sx={{ zIndex: 1002, color: isFollowed ? props.onColor : props.offColor, ...props.style }}
         disabled={locationAccessDenied}
         onClick={() => {
           if (isFollowed) {
@@ -133,7 +125,7 @@ const MlFollowGps = (props) => {
         }}
       >
         {" "}
-        <RoomIcon sx={{}}/>{" "}
+        <RoomIcon sx={{ fontSize: props.style.fontSize }} />{" "}
       </Button>
     </>
   );
@@ -149,11 +141,14 @@ MlFollowGps.defaultProps = {
     backgroundColor: "#414141",
     borderRadius: "23%",
     margin: 0.15,
+    fontSize: "1.3em",
     ":hover": {
       backgroundColor: "#515151",
       color: "#ececec",
     },
   },
+  onColor: "#ececec",
+  offColor: "#666"
 };
 
 MlFollowGps.propTypes = {
@@ -165,5 +160,13 @@ MlFollowGps.propTypes = {
    * CSS style object that is applied to the button component
    */
   style: PropTypes.object,
+  /**
+   * Active button font color
+   */
+  onColor: PropTypes.string,
+  /**
+   * Inactive button font color
+   */
+  offColor: PropTypes.string,
 };
 export default MlFollowGps;

package/src/components/MlFollowGps/MlFollowGps.meta.json

@@ -1,6 +1,6 @@
 {
-  "name": "MlFollowGPS",
-  "title": "GPS-Tracker",
+  "name": "MlFollowGps",
+  "title": "GPS tracker",
   "description": "",
   "i18n": {
     "de": {

package/src/components/MlGPXViewer/MlGPXViewer.js

@@ -1,21 +1,22 @@
-import React, { useContext, useRef, useEffect, useState } from "react";
+import React, {useContext, useRef, useEffect, useState} from "react";
 import PropTypes from "prop-types";
-import { MapContext } from "@mapcomponents/react-core";
-import { bbox } from "@turf/turf";
+import {MapContext} from "@mapcomponents/react-core";
+import {bbox} from "@turf/turf";
 import Divider from "@mui/material/Divider";
 import Typography from "@mui/material/Typography";
 import Drawer from "@mui/material/Drawer";
 import IconButton from "@mui/material/IconButton";
 import InfoIcon from "@mui/icons-material/Info";
 import FileCopy from "@mui/icons-material/FileCopy";
-import { Popup } from "maplibre-gl";
+import {Popup} from "maplibre-gl";
 import List from "@mui/material/List";
 import ListItem from "@mui/material/ListItem";
 import ListItemText from "@mui/material/ListItemText";
 import GeoJsonContext from "./util/GeoJsonContext";
 import toGeoJSON from "./gpxConverter";
+import useMediaQuery from "@mui/material/useMediaQuery";
 
-import { v4 as uuidv4 } from "uuid";
+import {v4 as uuidv4} from "uuid";
 
 /**
  * MlGPXViewer returns a dropzone and a button to load a GPX Track into the map.
@@ -38,6 +39,7 @@ const MlGPXViewer = (props) => {
   const [zIndex, setZIndex] = useState(0);
   const [metaData, setMetaData] = useState([]);
   const fileupload = useRef(null);
+  const mediaIsMobile = useMediaQuery("(max-width:900px)");
 
   const popup = useRef(
     new Popup({
@@ -255,42 +257,42 @@ const MlGPXViewer = (props) => {
   };
   return (
     <>
-      <IconButton
-        onClick={manualUpload}
-        style={{
-          position: "absolute",
-          right: "5px",
-          bottom: "75px",
-          backgroundColor: "rgba(255,255,255,1)",
-
-          zIndex: 1000,
-        }}
-        size="large"
-      >
-        <input
-          ref={fileupload}
-          onChange={fileUploadOnChange}
-          type="file"
-          id="input"
-          multiple
-          style={{ display: "none" }}
-        ></input>
-        <FileCopy />
-      </IconButton>
-      <IconButton
-        onClick={toogleDrawer}
-        style={{
-          position: "absolute",
-          right: "5px",
-          bottom: "25px",
-          backgroundColor: "rgba(255,255,255,1)",
-
-          zIndex: 1000,
-        }}
-        size="large"
-      >
-        <InfoIcon />
-      </IconButton>
+      <div style={{
+        position: "fixed",
+        right: "5px",
+        bottom: mediaIsMobile ? "40px" : "25px",
+        display: "flex",
+        flexDirection: "column",
+        gap: "5px",
+        zIndex: 1000,
+      }}>
+        <IconButton
+          onClick={manualUpload}
+          style={{
+            backgroundColor: "rgba(255,255,255,1)",
+          }}
+          size="large"
+        >
+          <input
+            ref={fileupload}
+            onChange={fileUploadOnChange}
+            type="file"
+            id="input"
+            multiple
+            style={{display: "none"}}
+          ></input>
+          <FileCopy/>
+        </IconButton>
+        <IconButton
+          onClick={toogleDrawer}
+          style={{
+            backgroundColor: "rgba(255,255,255,1)",
+          }}
+          size="large"
+        >
+          <InfoIcon/>
+        </IconButton>
+      </div>
       <Drawer variant="persistent" anchor="left" open={open}>
         <Typography
           variant="h6"
@@ -302,11 +304,11 @@ const MlGPXViewer = (props) => {
         >
           Informationen zur Route
         </Typography>
-        <Divider />
+        <Divider/>
         <List>
           {metaData.map((item) => (
             <ListItem key={`item--${item.id}`}>
-              <ListItemText primary={item.value} />
+              <ListItemText primary={item.value}/>
             </ListItem>
           ))}
         </List>

package/src/components/MlGPXViewer/gpxConverter.js

@@ -1,3 +1,16 @@
+/**
+ * https://github.com/mapbox/togeojson
+ *
+ * Copyright (c) 2016 Mapbox All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 var toGeoJSON = (function () {
   var removeSpace = /\s*/g,
     trimSpace = /^\s*|\s*$/g,
@@ -145,15 +158,11 @@ var toGeoJSON = (function () {
         styleByHash[hash] = styles[k];
       }
       for (var l = 0; l < styleMaps.length; l++) {
-        styleIndex["#" + attr(styleMaps[l], "id")] = okhash(
-          xml2str(styleMaps[l])
-        ).toString(16);
+        styleIndex["#" + attr(styleMaps[l], "id")] = okhash(xml2str(styleMaps[l])).toString(16);
         var pairs = get(styleMaps[l], "Pair");
         var pairsMap = {};
         for (var m = 0; m < pairs.length; m++) {
-          pairsMap[nodeVal(get1(pairs[m], "key"))] = nodeVal(
-            get1(pairs[m], "styleUrl")
-          );
+          pairsMap[nodeVal(get1(pairs[m], "key"))] = nodeVal(get1(pairs[m], "styleUrl"));
         }
         styleMapIndex["#" + attr(styleMaps[l], "id")] = pairsMap;
       }
@@ -183,8 +192,7 @@ var toGeoJSON = (function () {
           coords = [],
           times = [];
         if (elems.length === 0) elems = get(root, "gx:coord");
-        for (var i = 0; i < elems.length; i++)
-          coords.push(gxCoord(nodeVal(elems[i])));
+        for (var i = 0; i < elems.length; i++) coords.push(gxCoord(nodeVal(elems[i])));
         var timeElems = get(root, "when");
         for (var j = 0; j < timeElems.length; j++) times.push(nodeVal(timeElems[j]));
         return {
@@ -322,26 +330,19 @@ var toGeoJSON = (function () {
             outline = nodeVal(get1(polyStyle, "outline"));
           if (pcolor) properties.fill = pcolor;
           if (!isNaN(popacity)) properties["fill-opacity"] = popacity;
-          if (fill)
-            properties["fill-opacity"] =
-              fill === "1" ? properties["fill-opacity"] || 1 : 0;
+          if (fill) properties["fill-opacity"] = fill === "1" ? properties["fill-opacity"] || 1 : 0;
           if (outline)
-            properties["stroke-opacity"] =
-              outline === "1" ? properties["stroke-opacity"] || 1 : 0;
+            properties["stroke-opacity"] = outline === "1" ? properties["stroke-opacity"] || 1 : 0;
         }
         if (extendedData) {
           var datas = get(extendedData, "Data"),
             simpleDatas = get(extendedData, "SimpleData");
 
           for (i = 0; i < datas.length; i++) {
-            properties[datas[i].getAttribute("name")] = nodeVal(
-              get1(datas[i], "value")
-            );
+            properties[datas[i].getAttribute("name")] = nodeVal(get1(datas[i], "value"));
           }
           for (i = 0; i < simpleDatas.length; i++) {
-            properties[simpleDatas[i].getAttribute("name")] = nodeVal(
-              simpleDatas[i]
-            );
+            properties[simpleDatas[i].getAttribute("name")] = nodeVal(simpleDatas[i]);
           }
         }
         if (visibility) {
@@ -444,8 +445,7 @@ var toGeoJSON = (function () {
         if (track.length === 0) return;
         var properties = getProperties(node);
         extend(properties, getLineStyle(get1(node, "extensions")));
-        if (times.length)
-          properties.coordTimes = track.length === 1 ? times[0] : times;
+        if (times.length) properties.coordTimes = track.length === 1 ? times[0] : times;
         if (heartRates.length)
           properties.heartRates = track.length === 1 ? heartRates[0] : heartRates;
         return {
@@ -501,14 +501,7 @@ var toGeoJSON = (function () {
         return style;
       }
       function getProperties(node) {
-        var prop = getMulti(node, [
-            "name",
-            "cmt",
-            "desc",
-            "type",
-            "time",
-            "keywords",
-          ]),
+        var prop = getMulti(node, ["name", "cmt", "desc", "type", "time", "keywords"]),
           links = get(node, "link");
         if (links.length) prop.links = [];
         for (var i = 0, link; i < links.length; i++) {