@mapcomponents/react-maplibre 0.1.57 → 0.1.59

package/src/components/MlTransitionGeoJsonLayer/util/transitionFunctions.js

@@ -1,221 +1,221 @@
 import * as turf from "@turf/turf";
 
 const _showNextTransitionSegment = function (
-  props,
-  map,
-  transitionInProgressRef,
-  transitionGeojsonDataRef,
-  transitionGeojsonCommonDataRef,
-  currentTransitionStepRef,
-  msPerStep,
-  transitionTimeoutRef,
-  setDisplayGeojson
+	props,
+	map,
+	transitionInProgressRef,
+	transitionGeojsonDataRef,
+	transitionGeojsonCommonDataRef,
+	currentTransitionStepRef,
+	msPerStep,
+	transitionTimeoutRef,
+	setDisplayGeojson
 ) {
-  if (typeof transitionGeojsonDataRef.current[currentTransitionStepRef.current] !== "undefined") {
-    // if at last transition step set to target geojson
-    // else to an assembled LineString from common geometry and the current transition step geometry
-    let newData =
-      currentTransitionStepRef.current + 1 === transitionGeojsonDataRef.current.length
-        ? props.geojson
-        : turf.lineString([
-            ...transitionGeojsonCommonDataRef.current,
-            ...transitionGeojsonDataRef.current[currentTransitionStepRef.current].geometry
-              .coordinates,
-          ]);
-
-    setDisplayGeojson(newData);
-
-    if (typeof props.onTransitionFrame === "function") {
-      props.onTransitionFrame(newData);
-    }
-
-    currentTransitionStepRef.current++;
-    if (
-      transitionInProgressRef.current &&
-      currentTransitionStepRef.current < transitionGeojsonDataRef.current.length
-    ) {
-      transitionTimeoutRef.current = setTimeout(
-        () => _showNextTransitionSegment(...arguments),
-        msPerStep
-      );
-    } else {
-      if (typeof props.onTransitionEnd === "function") {
-        props.onTransitionEnd(props.geojson);
-      }
-      transitionInProgressRef.current = false;
-    }
-  }
+	if (typeof transitionGeojsonDataRef.current[currentTransitionStepRef.current] !== "undefined") {
+		// if at last transition step set to target geojson
+		// else to an assembled LineString from common geometry and the current transition step geometry
+		let newData =
+			currentTransitionStepRef.current + 1 === transitionGeojsonDataRef.current.length
+				? props.geojson
+				: turf.lineString([
+						...transitionGeojsonCommonDataRef.current,
+						...transitionGeojsonDataRef.current[currentTransitionStepRef.current].geometry
+							.coordinates,
+					]);
+
+		setDisplayGeojson(newData);
+
+		if (typeof props.onTransitionFrame === "function") {
+			props.onTransitionFrame(newData);
+		}
+
+		currentTransitionStepRef.current++;
+		if (
+			transitionInProgressRef.current &&
+			currentTransitionStepRef.current < transitionGeojsonDataRef.current.length
+		) {
+			transitionTimeoutRef.current = setTimeout(
+				() => _showNextTransitionSegment(...arguments),
+				msPerStep
+			);
+		} else {
+			if (typeof props.onTransitionEnd === "function") {
+				props.onTransitionEnd(props.geojson);
+			}
+			transitionInProgressRef.current = false;
+		}
+	}
 };
 
 const _transitionToGeojson = (
-  props,
-  transitionGeojsonCommonDataRef,
-  transitionGeojsonDataRef,
-  transitionInProgressRef,
-  oldGeojsonRef,
-  msPerStep,
-  currentTransitionStepRef,
-  map,
-  transitionTimeoutRef,
-  setDisplayGeojson
+	props,
+	transitionGeojsonCommonDataRef,
+	transitionGeojsonDataRef,
+	transitionInProgressRef,
+	oldGeojsonRef,
+	msPerStep,
+	currentTransitionStepRef,
+	map,
+	transitionTimeoutRef,
+	setDisplayGeojson
 ) => {
-  // create the transition geojson between oldGeojsonRef.current and props.geojson
-
-  // create a geojson that contains no common point between the two line features
-  let transitionCoordinatesShort = [];
-  let transitionCoordinatesLong = [];
-  let targetCoordinates = [];
-  let srcCoordinates = [];
-  transitionGeojsonCommonDataRef.current = [];
-  let sourceGeojson = oldGeojsonRef.current || {
-    geometry: {
-      type: "LineString",
-      coordinates: [],
-    },
-    properties: {},
-    type: "Feature",
-  };
-
-  let targetGeojson = props.geojson;
-
-  let longerGeojson = targetGeojson;
-  let shorterGeojson = sourceGeojson;
-  let reverseOrder = false;
-  // In case one geojson is missing completely use the first two coordinates of the other geojson
-  if (
-    typeof longerGeojson.geometry === "undefined" &&
-    typeof shorterGeojson.geometry !== "undefined" &&
-    shorterGeojson.geometry.coordinates.length > 1
-  ) {
-    longerGeojson = turf.lineString(shorterGeojson.geometry.coordinates.slice(0, 2));
-  } else if (
-    typeof shorterGeojson.geometry === "undefined" &&
-    typeof longerGeojson.geometry !== "undefined" &&
-    longerGeojson.geometry.coordinates.length > 1
-  ) {
-    shorterGeojson = turf.lineString(longerGeojson.geometry.coordinates.slice(0, 2));
-  } else if (
-    typeof shorterGeojson.geometry === "undefined" &&
-    typeof longerGeojson.geometry === "undefined"
-  ) {
-    return;
-  }
-
-  if (longerGeojson.geometry.coordinates.length < shorterGeojson.geometry.coordinates.length) {
-    longerGeojson = sourceGeojson;
-    shorterGeojson = targetGeojson;
-    reverseOrder = true;
-  }
-
-  if (longerGeojson && shorterGeojson) {
-    for (var i = 0, len = longerGeojson.geometry.coordinates.length; i < len; i++) {
-      if (
-        typeof shorterGeojson.geometry.coordinates[i] !== "undefined" &&
-        longerGeojson.geometry.coordinates[i][0] === shorterGeojson.geometry.coordinates[i][0] &&
-        longerGeojson.geometry.coordinates[i][1] === shorterGeojson.geometry.coordinates[i][1]
-      ) {
-        // if coordinates are equal
-        transitionGeojsonCommonDataRef.current.push(longerGeojson.geometry.coordinates[i]);
-      } else {
-        if (typeof longerGeojson.geometry.coordinates[i] !== "undefined") {
-          transitionCoordinatesLong.push(longerGeojson.geometry.coordinates[i]);
-        }
-        if (typeof shorterGeojson.geometry.coordinates[i] !== "undefined") {
-          transitionCoordinatesShort.push(shorterGeojson.geometry.coordinates[i]);
-        }
-      }
-    }
-  }
-
-  if (reverseOrder) {
-    targetCoordinates = transitionCoordinatesShort;
-    srcCoordinates = transitionCoordinatesLong;
-  } else {
-    targetCoordinates = transitionCoordinatesLong;
-    srcCoordinates = transitionCoordinatesShort;
-  }
-
-  if (targetCoordinates.length < 2 && srcCoordinates < 2) return;
-  // create props.transitionTime / msPerStep (=: transitionSteps) Versions of transitionGeojsonCommonDataRef.current + transitionCoordinates making the transitionCoordinates transitionCoordinatesDistance / transitionSteps longer on each step
-
-  let transitionSteps = props.transitionTime / msPerStep;
-  let srcCoordinatesDistance =
-    srcCoordinates.length > 1 ? Math.round(turf.length(turf.lineString(srcCoordinates))) : 0;
-  let targetCoordinatesDistance =
-    targetCoordinates.length > 1 ? Math.round(turf.length(turf.lineString(targetCoordinates))) : 0;
-  let transitionDistance = targetCoordinatesDistance + srcCoordinatesDistance;
-
-  let srcCoordinatesShare = srcCoordinatesDistance / transitionDistance;
-  let srcTransitionSteps = Math.round(transitionSteps * srcCoordinatesShare);
-  let srcPerStepDistance = Math.round((srcCoordinatesDistance / srcTransitionSteps) * 100) / 100;
-
-  let targetCoordinatesShare = targetCoordinatesDistance / transitionDistance;
-  let targetTransitionSteps = Math.round(transitionSteps * targetCoordinatesShare);
-  let targetPerStepDistance =
-    Math.round((targetCoordinatesDistance / targetTransitionSteps) * 100) / 100;
-
-  // use srcPerStepDistance as src coordinates are always animated backwards
-  let loopStepDistance = srcCoordinatesDistance;
-  if (loopStepDistance <= 0) {
-    loopStepDistance = 0.1;
-  }
-
-  // create transition step data as an array of all required FeatureCollection states until the transition is complete
-  let transitionStepData;
-
-  transitionStepData = [
-    ...createTransitionSteps(srcCoordinates, srcPerStepDistance, srcTransitionSteps),
-  ];
-  transitionStepData.reverse();
-
-  transitionStepData = [
-    ...transitionStepData,
-    ...createTransitionSteps(targetCoordinates, targetPerStepDistance, targetTransitionSteps),
-  ];
-
-  transitionStepData.push(targetGeojson);
-
-  transitionGeojsonDataRef.current = transitionStepData;
-
-  currentTransitionStepRef.current = 1;
-  transitionInProgressRef.current = true;
-  transitionTimeoutRef.current = setTimeout(
-    () =>
-      _showNextTransitionSegment(
-        props,
-        map,
-        transitionInProgressRef,
-        transitionGeojsonDataRef,
-        transitionGeojsonCommonDataRef,
-        currentTransitionStepRef,
-        msPerStep,
-        transitionTimeoutRef,
-        setDisplayGeojson
-      ),
-    msPerStep
-  );
+	// create the transition geojson between oldGeojsonRef.current and props.geojson
+
+	// create a geojson that contains no common point between the two line features
+	let transitionCoordinatesShort = [];
+	let transitionCoordinatesLong = [];
+	let targetCoordinates = [];
+	let srcCoordinates = [];
+	transitionGeojsonCommonDataRef.current = [];
+	let sourceGeojson = oldGeojsonRef.current || {
+		geometry: {
+			type: "LineString",
+			coordinates: [],
+		},
+		properties: {},
+		type: "Feature",
+	};
+
+	let targetGeojson = props.geojson;
+
+	let longerGeojson = targetGeojson;
+	let shorterGeojson = sourceGeojson;
+	let reverseOrder = false;
+	// In case one geojson is missing completely use the first two coordinates of the other geojson
+	if (
+		typeof longerGeojson.geometry === "undefined" &&
+		typeof shorterGeojson.geometry !== "undefined" &&
+		shorterGeojson.geometry.coordinates.length > 1
+	) {
+		longerGeojson = turf.lineString(shorterGeojson.geometry.coordinates.slice(0, 2));
+	} else if (
+		typeof shorterGeojson.geometry === "undefined" &&
+		typeof longerGeojson.geometry !== "undefined" &&
+		longerGeojson.geometry.coordinates.length > 1
+	) {
+		shorterGeojson = turf.lineString(longerGeojson.geometry.coordinates.slice(0, 2));
+	} else if (
+		typeof shorterGeojson.geometry === "undefined" &&
+		typeof longerGeojson.geometry === "undefined"
+	) {
+		return;
+	}
+
+	if (longerGeojson.geometry.coordinates.length < shorterGeojson.geometry.coordinates.length) {
+		longerGeojson = sourceGeojson;
+		shorterGeojson = targetGeojson;
+		reverseOrder = true;
+	}
+
+	if (longerGeojson && shorterGeojson) {
+		for (var i = 0, len = longerGeojson.geometry.coordinates.length; i < len; i++) {
+			if (
+				typeof shorterGeojson.geometry.coordinates[i] !== "undefined" &&
+				longerGeojson.geometry.coordinates[i][0] === shorterGeojson.geometry.coordinates[i][0] &&
+				longerGeojson.geometry.coordinates[i][1] === shorterGeojson.geometry.coordinates[i][1]
+			) {
+				// if coordinates are equal
+				transitionGeojsonCommonDataRef.current.push(longerGeojson.geometry.coordinates[i]);
+			} else {
+				if (typeof longerGeojson.geometry.coordinates[i] !== "undefined") {
+					transitionCoordinatesLong.push(longerGeojson.geometry.coordinates[i]);
+				}
+				if (typeof shorterGeojson.geometry.coordinates[i] !== "undefined") {
+					transitionCoordinatesShort.push(shorterGeojson.geometry.coordinates[i]);
+				}
+			}
+		}
+	}
+
+	if (reverseOrder) {
+		targetCoordinates = transitionCoordinatesShort;
+		srcCoordinates = transitionCoordinatesLong;
+	} else {
+		targetCoordinates = transitionCoordinatesLong;
+		srcCoordinates = transitionCoordinatesShort;
+	}
+
+	if (targetCoordinates.length < 2 && srcCoordinates < 2) return;
+	// create props.transitionTime / msPerStep (=: transitionSteps) Versions of transitionGeojsonCommonDataRef.current + transitionCoordinates making the transitionCoordinates transitionCoordinatesDistance / transitionSteps longer on each step
+
+	let transitionSteps = props.transitionTime / msPerStep;
+	let srcCoordinatesDistance =
+		srcCoordinates.length > 1 ? Math.round(turf.length(turf.lineString(srcCoordinates))) : 0;
+	let targetCoordinatesDistance =
+		targetCoordinates.length > 1 ? Math.round(turf.length(turf.lineString(targetCoordinates))) : 0;
+	let transitionDistance = targetCoordinatesDistance + srcCoordinatesDistance;
+
+	let srcCoordinatesShare = srcCoordinatesDistance / transitionDistance;
+	let srcTransitionSteps = Math.round(transitionSteps * srcCoordinatesShare);
+	let srcPerStepDistance = Math.round((srcCoordinatesDistance / srcTransitionSteps) * 100) / 100;
+
+	let targetCoordinatesShare = targetCoordinatesDistance / transitionDistance;
+	let targetTransitionSteps = Math.round(transitionSteps * targetCoordinatesShare);
+	let targetPerStepDistance =
+		Math.round((targetCoordinatesDistance / targetTransitionSteps) * 100) / 100;
+
+	// use srcPerStepDistance as src coordinates are always animated backwards
+	let loopStepDistance = srcCoordinatesDistance;
+	if (loopStepDistance <= 0) {
+		loopStepDistance = 0.1;
+	}
+
+	// create transition step data as an array of all required FeatureCollection states until the transition is complete
+	let transitionStepData;
+
+	transitionStepData = [
+		...createTransitionSteps(srcCoordinates, srcPerStepDistance, srcTransitionSteps),
+	];
+	transitionStepData.reverse();
+
+	transitionStepData = [
+		...transitionStepData,
+		...createTransitionSteps(targetCoordinates, targetPerStepDistance, targetTransitionSteps),
+	];
+
+	transitionStepData.push(targetGeojson);
+
+	transitionGeojsonDataRef.current = transitionStepData;
+
+	currentTransitionStepRef.current = 1;
+	transitionInProgressRef.current = true;
+	transitionTimeoutRef.current = setTimeout(
+		() =>
+			_showNextTransitionSegment(
+				props,
+				map,
+				transitionInProgressRef,
+				transitionGeojsonDataRef,
+				transitionGeojsonCommonDataRef,
+				currentTransitionStepRef,
+				msPerStep,
+				transitionTimeoutRef,
+				setDisplayGeojson
+			),
+		msPerStep
+	);
 };
 
 let createTransitionSteps = (linestringCoordinates, perStepDistance, stepCnt) => {
-  let transitionSteps = [];
-
-  if (linestringCoordinates.length > 1) {
-    let tmpChunks = turf.lineChunk(turf.lineString(linestringCoordinates), perStepDistance);
-    // tmpLineString contains all coordinates of all previous plus current loop iteration
-    let tmpLinestring = tmpChunks.features[0];
-    for (let i = 0; i < stepCnt; i++) {
-      transitionSteps.push(tmpLinestring);
-      if (typeof tmpChunks.features[i] !== "undefined") {
-        tmpLinestring = turf.lineString([
-          ...tmpLinestring.geometry.coordinates,
-          ...tmpChunks.features[i].geometry.coordinates,
-        ]);
-      } else {
-        break;
-      }
-    }
-  }
-  return transitionSteps;
+	let transitionSteps = [];
+
+	if (linestringCoordinates.length > 1) {
+		let tmpChunks = turf.lineChunk(turf.lineString(linestringCoordinates), perStepDistance);
+		// tmpLineString contains all coordinates of all previous plus current loop iteration
+		let tmpLinestring = tmpChunks.features[0];
+		for (let i = 0; i < stepCnt; i++) {
+			transitionSteps.push(tmpLinestring);
+			if (typeof tmpChunks.features[i] !== "undefined") {
+				tmpLinestring = turf.lineString([
+					...tmpLinestring.geometry.coordinates,
+					...tmpChunks.features[i].geometry.coordinates,
+				]);
+			} else {
+				break;
+			}
+		}
+	}
+	return transitionSteps;
 };
 
 export { _showNextTransitionSegment, _transitionToGeojson };

package/src/components/MlUseMapDebugger/MlUseMapDebugger.js

@@ -12,64 +12,64 @@ import useMapState from "../../hooks/useMapState";
  * @component
  */
 const MlUseMapDebugger = (props) => {
-  const map = useMapState({
-    mapId: props.mapId,
-    watch: {
-      layers: true,
-      sources: false, // not yet provided
-      viewport: false,
-      ...props.watch,
-    },
-    filter: {
-      ...props.filter,
-    },
-  });
-  const renderCounter = useRef(0);
-  renderCounter.current = renderCounter.current + 1;
+	const map = useMapState({
+		mapId: props.mapId,
+		watch: {
+			layers: true,
+			sources: false, // not yet provided
+			viewport: false,
+			...props.watch,
+		},
+		filter: {
+			...props.filter,
+		},
+	});
+	const renderCounter = useRef(0);
+	renderCounter.current = renderCounter.current + 1;
 
-  return (
-    <>
-      {/*
-      <IconButton
-        sx={{ zIndex: 10000 }}
-        aria-label="delete"
-        size="small"
-        onClick={() => setDebuggerOpen(!debuggerOpen)}
-      >
-        <CodeIcon fontSize="inherit" />
-      </IconButton>
-      <Drawer
-        anchor="top"
-        open={debuggerOpen}
-        onClose={() => setDebuggerOpen(!debuggerOpen)}
-        PaperProps={{
-          sx: {
-            opacity: 0.85,
-            maxHeight: "100px",
-            position: "relative",
-          },
-        }}
-        hideBackdrop={true}
-        variant="persistent"
-      ></Drawer>
-      */}
-      <div style={{ overflow: "hidden", width: "100px", height: "20px" }}>
-        Render: {renderCounter.current}
-        <br />
-        <pre>{JSON.stringify(map, null, " ")}</pre>
-      </div>
-    </>
-  );
+	return (
+		<>
+			{/*
+			<IconButton
+				sx={{ zIndex: 10000 }}
+				aria-label="delete"
+				size="small"
+				onClick={() => setDebuggerOpen(!debuggerOpen)}
+			>
+				<CodeIcon fontSize="inherit" />
+			</IconButton>
+			<Drawer
+				anchor="top"
+				open={debuggerOpen}
+				onClose={() => setDebuggerOpen(!debuggerOpen)}
+				PaperProps={{
+					sx: {
+						opacity: 0.85,
+						maxHeight: "100px",
+						position: "relative",
+					},
+				}}
+				hideBackdrop={true}
+				variant="persistent"
+			></Drawer>
+			*/}
+			<div style={{ overflow: "hidden", width: "100px", height: "20px" }}>
+				Render: {renderCounter.current}
+				<br />
+				<pre>{JSON.stringify(map, null, " ")}</pre>
+			</div>
+		</>
+	);
 };
 
 MlUseMapDebugger.defaultProps = {
-  mapId: undefined,
+	mapId: undefined,
 };
 
 MlUseMapDebugger.propTypes = {
-  /**
-   * Id of the target MapLibre instance in mapContext
-   */
-  mapId: PropTypes.string,
+	/**
+	 * Id of the target MapLibre instance in mapContext
+	 */
+	mapId: PropTypes.string,
 };
 export default MlUseMapDebugger;

package/src/components/MlUseMapDebugger/MlUseMapDebugger.stories.js

@@ -5,26 +5,26 @@ import MlUseMapDebugger from "./MlUseMapDebugger";
 import mapContextDecorator from "../../decorators/MapContextDecorator";
 
 const storyoptions = {
-  title: "MapComponents/MlUseMapDebugger",
-  component: MlUseMapDebugger,
-  argTypes: {
-    url: {},
-    layer: {},
-  },
-  decorators: mapContextDecorator,
+	title: "MapComponents/MlUseMapDebugger",
+	component: MlUseMapDebugger,
+	argTypes: {
+		url: {},
+		layer: {},
+	},
+	decorators: mapContextDecorator,
 };
 export default storyoptions;
 
 const Template = (props) => {
-  return (
-    <>
-      <MlUseMapDebugger {...props} />
-    </>
-  );
+	return (
+		<>
+			<MlUseMapDebugger {...props} />
+		</>
+	);
 };
 
 export const ExampleConfig = Template.bind({});
 ExampleConfig.parameters = {};
 ExampleConfig.args = {
-  mapId: "map_1",
+	mapId: "map_1",
 };

package/src/components/MlVectorTileLayer/MlVectorTileLayer.stories.js

@@ -6,41 +6,41 @@ import TopToolbar from "../../ui_components/TopToolbar";
 import mapContextDecorator from "../../decorators/MapContextDecorator";
 
 const storyoptions = {
-  title: "MapComponents/MlVectorTileLayer",
-  component: MlVectorTileLayer,
-  argTypes: {
-    url: {},
-    layer: {},
-  },
-  decorators: mapContextDecorator,
+	title: "MapComponents/MlVectorTileLayer",
+	component: MlVectorTileLayer,
+	argTypes: {
+		url: {},
+		layer: {},
+	},
+	decorators: mapContextDecorator,
 };
 export default storyoptions;
 
 const Template = (args) => (
-  <TopToolbar>
-    <MlVectorTileLayer {...args} />
-  </TopToolbar>
+	<TopToolbar>
+		<MlVectorTileLayer {...args} />
+	</TopToolbar>
 );
 
 export const ExampleConfig = Template.bind({});
 ExampleConfig.parameters = {};
 ExampleConfig.args = {
-  mapId: "map_1",
-  url:
-    "https://wms.wheregroup.com/tileserver/tile/tileserver.php?/europe-0-14/index.json?/europe-0-14/{z}/{x}/{y}.pbf",
-  layers: {
-    landuseLine: {
-      "source-layer": "landuse",
-      layout: {
-        "line-cap": "round",
-        "line-join": "round",
-      },
-      paint: { "line-width": 2, "line-color": "#ff0000" },
-    },
-  },
-  sourceOptions: {
-    minzoom: 0,
-    maxzoom: 20,
-  },
+	mapId: "map_1",
+	url:
+		"https://wms.wheregroup.com/tileserver/tile/tileserver.php?/europe-0-14/index.json?/europe-0-14/{z}/{x}/{y}.pbf",
+	layers: {
+		landuseLine: {
+			"source-layer": "landuse",
+			layout: {
+				"line-cap": "round",
+				"line-join": "round",
+			},
+			paint: { "line-width": 2, "line-color": "#ff0000" },
+		},
+	},
+	sourceOptions: {
+		minzoom: 0,
+		maxzoom: 20,
+	},
 };
 //