-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
added dcc.Geolocation component #2349
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
4e4c10d
removed package-lock.json files
AnnMarieW ff9d095
added Geolocation and demo apps
AnnMarieW 5a50d0f
fixed test
AnnMarieW 01f1e40
updated test - check if geolocation available in CI
AnnMarieW 5cee1cb
added geolocation permissions
AnnMarieW b4514bb
skip geolocation test in CI
AnnMarieW b40d8e8
skip geolocation test in CI
AnnMarieW 4dc8374
fixed typo
AnnMarieW af4caec
update after review
AnnMarieW 4a7b79d
update after review
AnnMarieW aaae14f
Merge branch 'dev' of https://github.com/plotly/dash into GeoLocation
AnnMarieW a517360
Merge branch 'dev' into GeoLocation
AnnMarieW 0f780ae
Update components/dash-core-components/src/components/Geolocation.rea…
AnnMarieW 5300245
Update CHANGELOG.md
AnnMarieW File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
193 changes: 193 additions & 0 deletions
193
components/dash-core-components/src/components/Geolocation.react.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| import {Component} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| /** | ||
| * The CurrentLocation component gets geolocation of the device from the web browser. See more info here: | ||
| * https://developer.mozilla.org/en-US/docs/Web/API/Geolocation_API | ||
| */ | ||
|
|
||
| export default class Geolocation extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
| this.success = this.success.bind(this); | ||
| this.error = this.error.bind(this); | ||
| } | ||
| updatePosition() { | ||
| if (this.props.update_now) { | ||
| this.props.setProps({ | ||
| update_now: false, | ||
| }); | ||
| } | ||
| if (!navigator.geolocation) { | ||
| this.error({ | ||
| code: 999, | ||
| message: 'Your browser does not support Geolocation', | ||
| }); | ||
| if (this.props.show_alert) { | ||
| alert(`ERROR(${this.error.code}): ${this.error.message}`); | ||
| } | ||
|
AnnMarieW marked this conversation as resolved.
Outdated
|
||
| } else { | ||
| const positionOptions = { | ||
| enableHighAccuracy: this.props.high_accuracy, | ||
| maximumAge: this.props.maximum_age, | ||
| timeout: this.props.timeout, | ||
| }; | ||
|
|
||
| navigator.geolocation.getCurrentPosition( | ||
| this.success, | ||
| this.error, | ||
| positionOptions | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| this.updatePosition(); | ||
| } | ||
|
|
||
| componentDidUpdate(prevProps) { | ||
| if ( | ||
| this.props.update_now || | ||
| prevProps.maximum_age !== this.props.maximum_age || | ||
| prevProps.timeout !== this.props.timeout || | ||
| prevProps.high_accuracy !== this.props.high_accuracy | ||
| ) { | ||
| this.updatePosition(); | ||
| } | ||
| } | ||
|
|
||
| success(pos) { | ||
| const crd = pos.coords; | ||
| const position_obj = { | ||
| lat: crd.latitude ?? null, | ||
| lon: crd.longitude ?? null, | ||
| accuracy: crd.accuracy ?? null, | ||
| alt: crd.altitude ?? null, | ||
| alt_accuracy: crd.altitudeAccuracy ?? null, | ||
| speed: crd.speed ?? null, | ||
| heading: crd.heading ?? null, | ||
| }; | ||
|
|
||
| this.props.setProps({ | ||
| local_date: new Date(pos.timestamp).toLocaleString(), | ||
| timestamp: pos.timestamp, | ||
| position: position_obj, | ||
| position_error: null, | ||
| }); | ||
| } | ||
|
|
||
| error(err) { | ||
| if (this.props.show_alert) { | ||
| alert(`ERROR(${err.code}): ${err.message}`); | ||
| } | ||
| this.props.setProps({ | ||
| position: null, | ||
| position_error: { | ||
| code: err.code, | ||
| message: err.message, | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| render() { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| Geolocation.defaultProps = { | ||
| update_now: false, | ||
| high_accuracy: false, | ||
| position_error: null, | ||
| maximum_age: 0, | ||
| timeout: Infinity, | ||
| show_alert: false, | ||
| }; | ||
|
|
||
| Geolocation.propTypes = { | ||
| /** | ||
| * The ID used to identify this component in Dash callbacks. | ||
| */ | ||
| id: PropTypes.string, | ||
|
|
||
| /** | ||
| * The local date and time when the device position was updated. | ||
| * Format: MM/DD/YYYY, hh:mm:ss p where p is AM or PM | ||
| */ | ||
| local_date: PropTypes.string, | ||
|
|
||
| /** | ||
| * The Unix timestamp from when the position was updated | ||
| */ | ||
| timestamp: PropTypes.number, | ||
|
|
||
| /** | ||
| * The position of the device. `lat`, `lon`, and `accuracy` will always be returned. The other data will be included | ||
| * when available, otherwise it will be NaN. | ||
| * | ||
| * `lat` is latitude in degrees. | ||
| * `lon` is longitude in degrees. | ||
| * `accuracy` is the accuracy of the lat/lon in meters. * | ||
| * | ||
| * `alt` is altitude above mean sea level in meters. | ||
| * `alt_accuracy` is the accuracy of the altitude in meters. | ||
| * `heading` is the compass heading in degrees. | ||
| * `speed` is the speed in meters per second. | ||
| * | ||
| */ | ||
| position: PropTypes.shape({ | ||
| lat: PropTypes.number, | ||
| lon: PropTypes.number, | ||
| accuracy: PropTypes.number, | ||
| alt: PropTypes.number, | ||
| alt_accuracy: PropTypes.number, | ||
| heading: PropTypes.number, | ||
| speed: PropTypes.number, | ||
| }), | ||
|
|
||
| /** | ||
| * Position error | ||
| */ | ||
| position_error: PropTypes.shape({ | ||
| code: PropTypes.number, | ||
| message: PropTypes.string, | ||
| }), | ||
|
|
||
| /** | ||
| * If true, error messages will be displayed as an alert | ||
| */ | ||
| show_alert: PropTypes.bool, | ||
|
|
||
| /** | ||
| * Forces a one-time update of the position data. If set to True in a callback, the browser | ||
| * will update the position data and reset update_now back to False. This can, for example, be used to update the | ||
| * position with a button or an interval timer. | ||
| */ | ||
| update_now: PropTypes.bool, | ||
|
|
||
| /** | ||
| * If true and if the device is able to provide a more accurate position, | ||
| * it will do so. Note that this can result in slower response times or increased power consumption (with a GPS | ||
| * chip on a mobile device for example). If false (the default value), the device can save resources by | ||
| * responding more quickly and/or using less power. | ||
| */ | ||
| high_accuracy: PropTypes.bool, | ||
|
|
||
| /** | ||
| * The maximum age in milliseconds of a possible cached position that is acceptable to return. If set to 0, | ||
| * it means that the device cannot use a cached position and must attempt to retrieve the real current position. | ||
| * If set to Infinity the device must return a cached position regardless of its age. Default: 0. | ||
| */ | ||
| maximum_age: PropTypes.number, | ||
|
|
||
| /** | ||
| * The maximum length of time (in milliseconds) the device is allowed to take in order to return a position. | ||
| * The default value is Infinity, meaning that data will not be return until the position is available. | ||
| */ | ||
| timeout: PropTypes.number, | ||
|
|
||
| /** | ||
| * Dash-assigned callback that should be called to report property changes | ||
| * to Dash, to make them available for callbacks. | ||
| */ | ||
| setProps: PropTypes.func, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
components/dash-core-components/tests/integration/geolocation/test_geolocation.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| import time | ||
| import os | ||
| import pytest | ||
| from dash import Dash, dcc, html, Input, Output | ||
|
|
||
|
|
||
| @pytest.mark.skipif( | ||
| os.getenv("CIRCLECI") is not None, reason="geolocation is disabled on CI" | ||
| ) | ||
| def test_geol001_position(dash_dcc): | ||
| dash_dcc.driver.execute_cdp_cmd( | ||
| "Emulation.setGeolocationOverride", | ||
| {"latitude": 45.527, "longitude": -73.5968, "accuracy": 100}, | ||
| ) | ||
|
|
||
| app = Dash(__name__) | ||
| app.layout = html.Div( | ||
| [ | ||
| dcc.Geolocation(id="geolocation"), | ||
| html.Div(id="text_position"), | ||
| ] | ||
| ) | ||
|
|
||
| @app.callback( | ||
| Output("text_position", "children"), | ||
| Input("geolocation", "position"), | ||
| Input("geolocation", "position_error"), | ||
| ) | ||
| def display_output(pos, err): | ||
| if err: | ||
| return f"Error {err['code']} : {err['message']}" | ||
| if pos: | ||
| return ( | ||
| f"lat {pos['lat']},lon {pos['lon']}, accuracy {pos['accuracy']} meters" | ||
| ) | ||
| return "No position data available" | ||
|
|
||
| dash_dcc.start_server(app) | ||
|
|
||
| time.sleep(1) | ||
|
|
||
| dash_dcc.wait_for_text_to_equal( | ||
| "#text_position", "lat 45.527,lon -73.5968, accuracy 100 meters" | ||
| ) | ||
|
|
||
| assert dash_dcc.get_logs() == [] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.