@open-pioneer/geolocation 0.4.4 → 0.7.0
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/CHANGELOG.md +31 -0
- package/Geolocation.d.ts +2 -5
- package/Geolocation.js +2 -2
- package/Geolocation.js.map +1 -1
- package/package.json +12 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
# @open-pioneer/geolocation
|
|
2
2
|
|
|
3
|
+
## 0.7.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 310800c: Switch from `peerDependencies` to normal `dependencies`. Peer dependencies have some usability problems when used at scale.
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- 310800c: Update core packages version.
|
|
12
|
+
- 583f1d6: The `mapId` or `map` properties are now optional on individual components.
|
|
13
|
+
You can use the `DefaultMapProvider` to configure an implicit default value.
|
|
14
|
+
|
|
15
|
+
Note that configuring _neither_ a default _nor_ an explicit `map` or `mapId` will trigger a runtime error.
|
|
16
|
+
|
|
17
|
+
- 583f1d6: All UI components in this project now accept the `mapId` (a `string`) _or_ the `map` (a `MapModel`) directly.
|
|
18
|
+
- a8b3449: Switch to a new versioning strategy.
|
|
19
|
+
From now on, packages released by this repository share a common version number.
|
|
20
|
+
- 900eb11: Update dependencies.
|
|
21
|
+
- Updated dependencies [310800c]
|
|
22
|
+
- Updated dependencies [2502050]
|
|
23
|
+
- Updated dependencies [583f1d6]
|
|
24
|
+
- Updated dependencies [583f1d6]
|
|
25
|
+
- Updated dependencies [397d617]
|
|
26
|
+
- Updated dependencies [a8b3449]
|
|
27
|
+
- Updated dependencies [310800c]
|
|
28
|
+
- Updated dependencies [900eb11]
|
|
29
|
+
- Updated dependencies [583f1d6]
|
|
30
|
+
- Updated dependencies [397d617]
|
|
31
|
+
- @open-pioneer/map-ui-components@0.7.0
|
|
32
|
+
- @open-pioneer/map@0.7.0
|
|
33
|
+
|
|
3
34
|
## 0.4.4
|
|
4
35
|
|
|
5
36
|
### Patch Changes
|
package/Geolocation.d.ts
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
|
+
import { MapModelProps } from "@open-pioneer/map";
|
|
1
2
|
import { CommonComponentProps } from "@open-pioneer/react-utils";
|
|
2
3
|
import { StyleLike } from "ol/style/Style";
|
|
3
4
|
import { FC, RefAttributes } from "react";
|
|
4
5
|
/**
|
|
5
6
|
* These are properties supported by the {@link Geolocation} component.
|
|
6
7
|
*/
|
|
7
|
-
export interface GeolocationProps extends CommonComponentProps, RefAttributes<HTMLButtonElement
|
|
8
|
-
/**
|
|
9
|
-
* The id of the map.
|
|
10
|
-
*/
|
|
11
|
-
mapId: string;
|
|
8
|
+
export interface GeolocationProps extends CommonComponentProps, RefAttributes<HTMLButtonElement>, MapModelProps {
|
|
12
9
|
/**
|
|
13
10
|
* The default maximal zoom level
|
|
14
11
|
*/
|
package/Geolocation.js
CHANGED
|
@@ -9,8 +9,8 @@ import { MdMyLocation } from 'react-icons/md';
|
|
|
9
9
|
import { GeolocationController } from './GeolocationController.js';
|
|
10
10
|
|
|
11
11
|
const Geolocation = forwardRef(function Geolocation2(props, ref) {
|
|
12
|
-
const {
|
|
13
|
-
const { map } = useMapModel(
|
|
12
|
+
const { maxZoom, positionFeatureStyle, accuracyFeatureStyle, trackingOptions } = props;
|
|
13
|
+
const { map } = useMapModel(props);
|
|
14
14
|
const controller = useController(
|
|
15
15
|
map,
|
|
16
16
|
maxZoom,
|
package/Geolocation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Geolocation.js","sources":["Geolocation.tsx"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport { MapModel, useMapModel } from \"@open-pioneer/map\";\nimport { ToolButton } from \"@open-pioneer/map-ui-components\";\nimport { NotificationService } from \"@open-pioneer/notifier\";\nimport { CommonComponentProps, useCommonComponentProps } from \"@open-pioneer/react-utils\";\nimport { useReactiveSnapshot } from \"@open-pioneer/reactivity\";\nimport { StyleLike } from \"ol/style/Style\";\nimport { useIntl, useService } from \"open-pioneer:react-hooks\";\nimport { FC, ForwardedRef, RefAttributes, forwardRef, useEffect, useState } from \"react\";\nimport { MdMyLocation } from \"react-icons/md\";\nimport { GeolocationController, OnErrorCallback } from \"./GeolocationController\";\n\n/**\n * These are properties supported by the {@link Geolocation} component.\n */\nexport interface GeolocationProps
|
|
1
|
+
{"version":3,"file":"Geolocation.js","sources":["Geolocation.tsx"],"sourcesContent":["// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport { MapModel, MapModelProps, useMapModel } from \"@open-pioneer/map\";\nimport { ToolButton } from \"@open-pioneer/map-ui-components\";\nimport { NotificationService } from \"@open-pioneer/notifier\";\nimport { CommonComponentProps, useCommonComponentProps } from \"@open-pioneer/react-utils\";\nimport { useReactiveSnapshot } from \"@open-pioneer/reactivity\";\nimport { StyleLike } from \"ol/style/Style\";\nimport { useIntl, useService } from \"open-pioneer:react-hooks\";\nimport { FC, ForwardedRef, RefAttributes, forwardRef, useEffect, useState } from \"react\";\nimport { MdMyLocation } from \"react-icons/md\";\nimport { GeolocationController, OnErrorCallback } from \"./GeolocationController\";\n\n/**\n * These are properties supported by the {@link Geolocation} component.\n */\nexport interface GeolocationProps\n extends CommonComponentProps,\n RefAttributes<HTMLButtonElement>,\n MapModelProps {\n /**\n * The default maximal zoom level\n */\n maxZoom?: number;\n /**\n * Style to be applied for the positioning highlight feature.\n */\n positionFeatureStyle?: StyleLike;\n /**\n * Style to be applied for the accuracy highlight of the positioning feature.\n */\n accuracyFeatureStyle?: StyleLike;\n /**\n * Position options for the Geolocation-Object.\n * See [PositionOptions](https://www.w3.org/TR/geolocation/#position_options_interface) for more details.\n *\n * NOTE: Changing the tracking options at runtime will reset the component's state.\n */\n trackingOptions?: PositionOptions;\n}\n\nexport const Geolocation: FC<GeolocationProps> = forwardRef(function Geolocation(\n props: GeolocationProps,\n ref: ForwardedRef<HTMLButtonElement>\n) {\n const { maxZoom, positionFeatureStyle, accuracyFeatureStyle, trackingOptions } = props;\n const { map } = useMapModel(props);\n const controller = useController(\n map,\n maxZoom,\n trackingOptions,\n positionFeatureStyle,\n accuracyFeatureStyle\n );\n return controller && <GeolocationImpl {...props} controller={controller} ref={ref} />;\n});\n\n// This is a separate component so we can act like the controller is always present.\n// This is the case in practice (except for the initial loading phase where the component is not-yet-mounted).\nconst GeolocationImpl = forwardRef(function GeolocationImpl(\n props: GeolocationProps & { controller: GeolocationController },\n ref: ForwardedRef<HTMLButtonElement>\n) {\n const { controller } = props;\n const { containerProps } = useCommonComponentProps(\"geolocation\", props);\n const { isLoading, isActive } = useReactiveSnapshot(() => {\n return {\n isLoading: controller.loading,\n isActive: controller.active\n };\n }, [controller]);\n\n const intl = useIntl();\n const label = (() => {\n if (!controller.supported) {\n return intl.formatMessage({ id: \"locateNotSupported\" });\n }\n\n if (isActive) {\n return intl.formatMessage({ id: \"locateMeEnd\" });\n } else {\n return intl.formatMessage({ id: \"locateMeStart\" });\n }\n })();\n\n const toggleActiveState = () => {\n if (controller.active) {\n controller.stopGeolocation();\n } else {\n controller.startGeolocation();\n }\n };\n\n return (\n <ToolButton\n ref={ref}\n label={label}\n icon={<MdMyLocation />}\n onClick={() => toggleActiveState()}\n isActive={isActive}\n isLoading={isLoading}\n isDisabled={!controller.supported}\n {...containerProps}\n />\n );\n});\n\nfunction useController(\n map: MapModel | undefined,\n maxZoom: number | undefined,\n trackingOptions: PositionOptions | undefined,\n positionFeatureStyle: StyleLike | undefined,\n accuracyFeatureStyle: StyleLike | undefined\n): GeolocationController | undefined {\n const intl = useIntl();\n const notificationService = useService<NotificationService>(\"notifier.NotificationService\");\n const [controller, setController] = useState<GeolocationController>();\n useEffect(() => {\n if (!map) {\n return;\n }\n\n const onError: OnErrorCallback = (error) => {\n const title = intl.formatMessage({ id: \"error\" });\n const description = (() => {\n switch (error) {\n case \"permission-denied\":\n return intl.formatMessage({ id: \"permissionDenied\" });\n case \"position-unavailable\":\n return intl.formatMessage({ id: \"positionUnavailable\" });\n case \"timeout\":\n return intl.formatMessage({ id: \"timeout\" });\n case \"unknown\":\n return intl.formatMessage({ id: \"unknownError\" });\n }\n })();\n\n notificationService.notify({\n level: \"error\",\n title: title,\n message: description\n });\n };\n\n const geolocationController = new GeolocationController(\n map.olMap,\n onError,\n trackingOptions\n );\n setController(geolocationController);\n\n return () => {\n geolocationController.destroy();\n setController(undefined);\n };\n }, [map, trackingOptions, intl, notificationService]);\n useEffect(() => {\n controller?.setPositionFeatureStyle(positionFeatureStyle);\n }, [controller, positionFeatureStyle]);\n useEffect(() => {\n controller?.setAccuracyFeatureStyle(accuracyFeatureStyle);\n }, [controller, accuracyFeatureStyle]);\n useEffect(() => {\n controller?.setMaxZoom(maxZoom);\n }, [controller, maxZoom]);\n return controller;\n}\n"],"names":["Geolocation","GeolocationImpl"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"type": "module",
|
|
3
3
|
"name": "@open-pioneer/geolocation",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.7.0",
|
|
5
5
|
"description": "This package provides a component to locate a user's position.",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"open-pioneer-trails"
|
|
@@ -13,19 +13,19 @@
|
|
|
13
13
|
"url": "https://github.com/open-pioneer/trails-openlayers-base-packages",
|
|
14
14
|
"directory": "src/packages/geolocation"
|
|
15
15
|
},
|
|
16
|
-
"
|
|
17
|
-
"@conterra/reactivity-core": "^0.4.
|
|
18
|
-
"@open-pioneer/chakra-integration": "^
|
|
19
|
-
"@open-pioneer/core": "^
|
|
20
|
-
"@open-pioneer/notifier": "^
|
|
21
|
-
"@open-pioneer/react-utils": "^
|
|
22
|
-
"@open-pioneer/reactivity": "^
|
|
23
|
-
"@open-pioneer/runtime": "^2.
|
|
16
|
+
"dependencies": {
|
|
17
|
+
"@conterra/reactivity-core": "^0.4.3",
|
|
18
|
+
"@open-pioneer/chakra-integration": "^2.3.0",
|
|
19
|
+
"@open-pioneer/core": "^2.3.0",
|
|
20
|
+
"@open-pioneer/notifier": "^2.3.0",
|
|
21
|
+
"@open-pioneer/react-utils": "^2.3.0",
|
|
22
|
+
"@open-pioneer/reactivity": "^2.3.0",
|
|
23
|
+
"@open-pioneer/runtime": "^2.3.0",
|
|
24
24
|
"ol": "^9.2.4",
|
|
25
25
|
"react": "^18.3.1",
|
|
26
|
-
"react-icons": "^5.
|
|
27
|
-
"@open-pioneer/map-ui-components": "^0.
|
|
28
|
-
"@open-pioneer/map": "^0.
|
|
26
|
+
"react-icons": "^5.3.0",
|
|
27
|
+
"@open-pioneer/map-ui-components": "^0.7.0",
|
|
28
|
+
"@open-pioneer/map": "^0.7.0"
|
|
29
29
|
},
|
|
30
30
|
"exports": {
|
|
31
31
|
"./package.json": "./package.json",
|