@xyo-network/react-map 2.41.3 → 2.41.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Components/{AnimatedHetaMapLoaded.d.ts → AnimatedHeatMapLoaded.d.ts} +1 -1
- package/dist/{esm/Components/AnimatedHetaMapLoaded.d.ts.map → cjs/Components/AnimatedHeatMapLoaded.d.ts.map} +1 -1
- package/dist/cjs/Components/{AnimatedHetaMapLoaded.js → AnimatedHeatMapLoaded.js} +1 -1
- package/dist/cjs/Components/{AnimatedHetaMapLoaded.js.map → AnimatedHeatMapLoaded.js.map} +1 -1
- package/dist/cjs/Components/MapBoxPoints.d.ts.map +1 -1
- package/dist/cjs/Components/MapBoxPoints.js +16 -4
- package/dist/cjs/Components/MapBoxPoints.js.map +1 -1
- package/dist/cjs/Components/index.d.ts +1 -1
- package/dist/cjs/Components/index.js +1 -1
- package/dist/docs.json +251 -251
- package/dist/esm/Components/{AnimatedHetaMapLoaded.d.ts → AnimatedHeatMapLoaded.d.ts} +1 -1
- package/dist/{cjs/Components/AnimatedHetaMapLoaded.d.ts.map → esm/Components/AnimatedHeatMapLoaded.d.ts.map} +1 -1
- package/dist/esm/Components/{AnimatedHetaMapLoaded.js → AnimatedHeatMapLoaded.js} +1 -1
- package/dist/esm/Components/{AnimatedHetaMapLoaded.js.map → AnimatedHeatMapLoaded.js.map} +1 -1
- package/dist/esm/Components/MapBoxPoints.d.ts.map +1 -1
- package/dist/esm/Components/MapBoxPoints.js +16 -4
- package/dist/esm/Components/MapBoxPoints.js.map +1 -1
- package/dist/esm/Components/index.d.ts +1 -1
- package/dist/esm/Components/index.js +1 -1
- package/package.json +5 -5
- package/src/Components/{AnimatedHetaMapLoaded.tsx → AnimatedHeatMapLoaded.tsx} +0 -0
- package/src/Components/MapBoxPoints.tsx +18 -4
- package/src/Components/index.ts +1 -1
|
@@ -4,4 +4,4 @@ export interface AnimatedHeatMapLoadedProps extends FlexBoxProps {
|
|
|
4
4
|
accessToken: string;
|
|
5
5
|
}
|
|
6
6
|
export declare const AnimatedHeatMapLoaded: React.FC<AnimatedHeatMapLoadedProps>;
|
|
7
|
-
//# sourceMappingURL=
|
|
7
|
+
//# sourceMappingURL=AnimatedHeatMapLoaded.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"AnimatedHeatMapLoaded.d.ts","sourceRoot":"","sources":["../../../src/Components/AnimatedHeatMapLoaded.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAW,MAAM,uBAAuB,CAAA;AAU7D,MAAM,WAAW,0BAA2B,SAAQ,YAAY;IAC9D,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,0BAA0B,CAkCtE,CAAA"}
|
|
@@ -17,4 +17,4 @@ export const AnimatedHeatMapLoaded = ({ accessToken, ...props }) => {
|
|
|
17
17
|
};
|
|
18
18
|
return (_jsxs(FlexCol, { alignItems: "stretch", ...props, children: [xyoError ? (_jsxs(Alert, { sx: { mt: 2 }, children: [_jsx(AlertTitle, { children: "Error Loading Map" }), xyoError.message ? `Error: ${xyoError.message}` : null, "You might try authenticating again."] })) : null, hashes !== undefined ? (_jsx(AnimatedHeatMap, { accessToken: accessToken, defaultMapSettings: AnimatedHeatMapSettings, animatedFeatureSets: multipleFeatureSets.slice(1, multipleFeatureSets.length), staticFeatureSet: multipleFeatureSets[0], heatMapColorProps: heatMapColorProps, ...MapBoxHeatProps })) : (_jsx(Alert, { children: "Missing answer hash for heat map query" }))] }));
|
|
19
19
|
};
|
|
20
|
-
//# sourceMappingURL=
|
|
20
|
+
//# sourceMappingURL=AnimatedHeatMapLoaded.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"AnimatedHeatMapLoaded.js","sourceRoot":"","sources":["../../../src/Components/AnimatedHeatMapLoaded.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAgB,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAG9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAExF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAMhD,MAAM,CAAC,MAAM,qBAAqB,GAAyC,CAAC,EAAE,WAAW,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACvG,MAAM,MAAM,GAAG,aAAa,EAAE,CAAA;IAC9B,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,eAAe,CAAgD,MAAM,CAAC,CAAA;IACnG,MAAM,EAAE,mBAAmB,EAAE,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAA;IACtE,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAAA;IAE7D,MAAM,eAAe,GAAG;QACtB,QAAQ,EAAE,CAAC;QACX,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,KAAC,qBAAqB,OAAK,WAAW,GAAI,CAAC,CAAC,CAAC,IAAI;KACxE,CAAA;IAED,OAAO,CACL,MAAC,OAAO,IAAC,UAAU,EAAC,SAAS,KAAK,KAAK,aACpC,QAAQ,CAAC,CAAC,CAAC,CACV,MAAC,KAAK,IAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,aAClB,KAAC,UAAU,oCAA+B,EACzC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,2CAEjD,CACT,CAAC,CAAC,CAAC,IAAI,EACP,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CACtB,KAAC,eAAe,IACd,WAAW,EAAE,WAAW,EACxB,kBAAkB,EAAE,uBAAuB,EAC3C,mBAAmB,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAyB,EACrG,gBAAgB,EAAE,mBAAmB,CAAC,CAAC,CAAuB,EAC9D,iBAAiB,EAAE,iBAAiB,KAChC,eAAe,GACnB,CACH,CAAC,CAAC,CAAC,CACF,KAAC,KAAK,yDAA+C,CACtD,IACO,CACX,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapBoxPoints.d.ts","sourceRoot":"","sources":["../../../src/Components/MapBoxPoints.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"MapBoxPoints.d.ts","sourceRoot":"","sources":["../../../src/Components/MapBoxPoints.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAKxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAA;AAK9C,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAyExE,CAAA"}
|
|
@@ -10,6 +10,18 @@ export const XyoMapboxPointsFlexBox = ({ accessToken, features, layers, fitToPoi
|
|
|
10
10
|
const [MapPoints, setMapPoints] = useState();
|
|
11
11
|
const { mapSettings } = useMapSettings();
|
|
12
12
|
const { map, mapInitialized } = useMapBoxInstance();
|
|
13
|
+
/**
|
|
14
|
+
* Needed because of a bug in mapbox taking undefined values for the config options of fitToBounds
|
|
15
|
+
* see - https://github.com/mapbox/mapbox-gl-js/issues/10013
|
|
16
|
+
*/
|
|
17
|
+
const customFitToBoundsOptions = (zoom) => {
|
|
18
|
+
if (zoom !== undefined) {
|
|
19
|
+
return {
|
|
20
|
+
maxZoom: zoom,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
return {};
|
|
24
|
+
};
|
|
13
25
|
const updateFeatures = useCallback(() => {
|
|
14
26
|
if (MapPoints?.isMapReady && features?.length) {
|
|
15
27
|
layers?.forEach((layer) => {
|
|
@@ -21,14 +33,14 @@ export const XyoMapboxPointsFlexBox = ({ accessToken, features, layers, fitToPoi
|
|
|
21
33
|
const { fitToPoints } = mapSettings || {};
|
|
22
34
|
if (MapPoints && map) {
|
|
23
35
|
if (fitToPoints?.value === true) {
|
|
24
|
-
MapPoints.initialMapPositioning({ padding: fitToPointsPadding });
|
|
36
|
+
MapPoints.initialMapPositioning({ padding: fitToPointsPadding, ...customFitToBoundsOptions(zoom) });
|
|
25
37
|
}
|
|
26
38
|
}
|
|
27
|
-
}, [MapPoints, map,
|
|
39
|
+
}, [mapSettings, MapPoints, map, fitToPointsPadding, zoom]);
|
|
28
40
|
const reInitializeMap = useCallback(() => {
|
|
29
|
-
MapPoints?.initialMapPositioning({ padding: fitToPointsPadding });
|
|
41
|
+
MapPoints?.initialMapPositioning({ padding: fitToPointsPadding, ...customFitToBoundsOptions(zoom) });
|
|
30
42
|
updateFeatures();
|
|
31
|
-
}, [MapPoints, fitToPointsPadding, updateFeatures]);
|
|
43
|
+
}, [MapPoints, fitToPointsPadding, updateFeatures, zoom]);
|
|
32
44
|
useEffect(() => {
|
|
33
45
|
if (map && features?.length) {
|
|
34
46
|
setMapPoints(new XyoMapPoints({ features, map, zoom }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapBoxPoints.js","sourceRoot":"","sources":["../../../src/Components/MapBoxPoints.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"MapBoxPoints.js","sourceRoot":"","sources":["../../../src/Components/MapBoxPoints.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/react-flexbox": "^2.15.2",
|
|
14
14
|
"@xylabs/react-shared": "^2.15.2",
|
|
15
|
-
"@xyo-network/react-app-settings": "^2.41.
|
|
16
|
-
"@xyo-network/react-archivist": "^2.41.
|
|
17
|
-
"@xyo-network/react-network": "^2.41.
|
|
18
|
-
"@xyo-network/react-shared": "^2.41.
|
|
15
|
+
"@xyo-network/react-app-settings": "^2.41.4",
|
|
16
|
+
"@xyo-network/react-archivist": "^2.41.4",
|
|
17
|
+
"@xyo-network/react-network": "^2.41.4",
|
|
18
|
+
"@xyo-network/react-shared": "^2.41.4",
|
|
19
19
|
"@xyo-network/sdk-geo": "^2.7.0",
|
|
20
20
|
"geojson": "^0.5.0",
|
|
21
21
|
"mapbox-gl": "^2.11.1",
|
|
@@ -80,5 +80,5 @@
|
|
|
80
80
|
},
|
|
81
81
|
"sideEffects": false,
|
|
82
82
|
"types": "dist/esm/index.d.ts",
|
|
83
|
-
"version": "2.41.
|
|
83
|
+
"version": "2.41.4"
|
|
84
84
|
}
|
|
File without changes
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Alert } from '@mui/material'
|
|
2
2
|
import { FlexCol } from '@xylabs/react-flexbox'
|
|
3
3
|
import { Feature, Point } from 'geojson'
|
|
4
|
+
import { FitBoundsOptions } from 'mapbox-gl'
|
|
4
5
|
import { useCallback, useEffect, useState } from 'react'
|
|
5
6
|
|
|
6
7
|
import { useMapBoxInstance, useMapSettings } from '../Contexts'
|
|
@@ -26,6 +27,19 @@ export const XyoMapboxPointsFlexBox: React.FC<XyoMapboxPointsFlexBoxProps> = ({
|
|
|
26
27
|
const { mapSettings } = useMapSettings()
|
|
27
28
|
const { map, mapInitialized } = useMapBoxInstance()
|
|
28
29
|
|
|
30
|
+
/**
|
|
31
|
+
* Needed because of a bug in mapbox taking undefined values for the config options of fitToBounds
|
|
32
|
+
* see - https://github.com/mapbox/mapbox-gl-js/issues/10013
|
|
33
|
+
*/
|
|
34
|
+
const customFitToBoundsOptions = (zoom?: number): FitBoundsOptions => {
|
|
35
|
+
if (zoom !== undefined) {
|
|
36
|
+
return {
|
|
37
|
+
maxZoom: zoom,
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return {}
|
|
41
|
+
}
|
|
42
|
+
|
|
29
43
|
const updateFeatures = useCallback(() => {
|
|
30
44
|
if (MapPoints?.isMapReady && features?.length) {
|
|
31
45
|
layers?.forEach((layer) => {
|
|
@@ -39,15 +53,15 @@ export const XyoMapboxPointsFlexBox: React.FC<XyoMapboxPointsFlexBoxProps> = ({
|
|
|
39
53
|
|
|
40
54
|
if (MapPoints && map) {
|
|
41
55
|
if (fitToPoints?.value === true) {
|
|
42
|
-
MapPoints.initialMapPositioning({ padding: fitToPointsPadding })
|
|
56
|
+
MapPoints.initialMapPositioning({ padding: fitToPointsPadding, ...customFitToBoundsOptions(zoom) })
|
|
43
57
|
}
|
|
44
58
|
}
|
|
45
|
-
}, [MapPoints, map,
|
|
59
|
+
}, [mapSettings, MapPoints, map, fitToPointsPadding, zoom])
|
|
46
60
|
|
|
47
61
|
const reInitializeMap = useCallback(() => {
|
|
48
|
-
MapPoints?.initialMapPositioning({ padding: fitToPointsPadding })
|
|
62
|
+
MapPoints?.initialMapPositioning({ padding: fitToPointsPadding, ...customFitToBoundsOptions(zoom) })
|
|
49
63
|
updateFeatures()
|
|
50
|
-
}, [MapPoints, fitToPointsPadding, updateFeatures])
|
|
64
|
+
}, [MapPoints, fitToPointsPadding, updateFeatures, zoom])
|
|
51
65
|
|
|
52
66
|
useEffect(() => {
|
|
53
67
|
if (map && features?.length) {
|
package/src/Components/index.ts
CHANGED