Skip to content

Reinstate AR code. #418

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.

Sign up for GitHub

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

Draft
na9da wants to merge 2 commits into
base: mobx
Choose a base branch
from
Draft

Reinstate AR code. #418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e786ba5
Reinstate AR code.
na9da Feb 17, 2020
bcfd695
Merge branch 'mobx' into mobx-ar
na9da Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions lib/Views/UserInterface.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ import version from "../../version";

import "./global.scss";

// function loadAugmentedVirtuality(callback) {
// require.ensure(
// "terriajs/lib/ReactViews/Map/Navigation/AugmentedVirtualityTool",
// () => {
// const AugmentedVirtualityTool = require("terriajs/lib/ReactViews/Map/Navigation/AugmentedVirtualityTool");
// callback(AugmentedVirtualityTool);
// },
// "AugmentedVirtuality"
// );
// }
function loadAugmentedVirtuality(callback) {
require.ensure(
"terriajs/lib/ReactViews/Map/Navigation/AugmentedVirtualityTool",
() => {
const AugmentedVirtualityTool = require("terriajs/lib/ReactViews/Map/Navigation/AugmentedVirtualityTool")
.default;
callback(AugmentedVirtualityTool);
},
"AugmentedVirtuality"
);
}

// function isBrowserSupportedAV() {
// return /Android|iPhone|iPad/i.test(navigator.userAgent);
// }
function isBrowserSupportedAV() {
return /Android|iPhone|iPad/i.test(navigator.userAgent);
}

export default function UserInterface(props) {
return (
Expand All @@ -40,14 +41,14 @@ export default function UserInterface(props) {
{/* <MeasureTool terria={props.viewState.terria} key="measure-tool" /> */}
</Nav>
<ExperimentalMenu>
{/* <If condition={isBrowserSupportedAV()}>
<If condition={isBrowserSupportedAV()}>
<SplitPoint
loadComponent={loadAugmentedVirtuality}
viewState={props.viewState}
terria={props.viewState.terria}
experimentalWarning={true}
/>
</If> */}
</If>
</ExperimentalMenu>
</StandardUserInterface>
);
Expand Down