Merge pull request #76 from scottaames/master (53bb2c5e) · Commits · aflab / astrogeology / Asc Geostac

app/src/.gitignore

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		.cache/
		coverage/
		dist/
		dist/*
		.dist/
		node_modules
		package-lock.json
		*.log
		app/package-lock.json
		app/node_modules
		app/docs

		# OS generated files
		.DS_Store
		.DS_Store?
		._*
		.Spotlight-V100
		.Trashes
		ehthumbs.db
		Thumbs.db

app/src/components/container/App.jsx

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ import ConsoleContainer from "./ConsoleContainer.jsx";
		import MapContainer from "./MapContainer.jsx";
		import ListSubheader from "@material-ui/core/ListSubheader";
		import WellKnownTextInput from "../presentational/WellKnownTextInput.jsx";
		import CreditsDisplay from "../presentational/CreditsDisplay.jsx";

		/**
		* Controls css styling for this component using js to css
		@@ -87,6 +88,7 @@ export default function App() {
		<ConsoleContainer target={targetPlanet} />
		<MapContainer target={targetPlanet} />
		<WellKnownTextInput />
		<CreditsDisplay style={{ width: 800, maxWidth: 800 }} />
		</Paper>
		</div>
		);

app/src/components/container/MapContainer.jsx

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ export default class MapContainer extends Component {
		let map = new AstroMap("map-container", this.props.target, {});
		new Projection().addTo(map);
		new MousePosition({
		numDigits: 2
		numDigits: 3
		}).addTo(map);

		let drawnItems = new L.FeatureGroup();

app/src/components/presentational/ConsoleAppBar.jsx

+7 −9

Original line number	Diff line number	Diff line
		@@ -43,7 +43,12 @@ export default function ConsoleAppBar(props) {

		return (
		<div className={classes.root}>
		<AppBar className={classes.appbar} position="static" color="inherit">
		<AppBar
		className={classes.appbar}
		variant="outlined"
		position="static"
		color="inherit"
		>
		<Toolbar className={classes.toolbar}>
		<Grid
		className={classes.grid}
		@@ -55,14 +60,7 @@ export default function ConsoleAppBar(props) {
		<Divider orientation="vertical" />
		<Grid container item direction="column" xs>
		<ConsoleTargetInfo target={props.target} />
		<Grid
		container
		item
		xs
		justify="center"
		wrap="nowrap"
		spacing={1}
		>
		<Grid container item xs justify="center" wrap="nowrap">
		<ConsoleLonLatSelects />
		<ConsoleCoordinates />
		</Grid>

app/src/components/presentational/ConsoleCoordinates.jsx

+55 −10

Original line number	Diff line number	Diff line
		@@ -4,18 +4,42 @@ import Typography from "@material-ui/core/Typography";
		import { makeStyles, withStyles } from "@material-ui/core/styles";
		import Tooltip from "@material-ui/core/Tooltip";
		import Zoom from "@material-ui/core/Zoom";
		import Paper from "@material-ui/core/Paper";
		import Divider from "@material-ui/core/Divider";

		/**
		* Controls css styling for this component using js to css
		*/
		const useStyles = makeStyles({
		grid: {
		width: "100%",
		height: "100%",
		maxHeight: 60
		},
		title: {
		color: "#343a40"
		color: "#343a40",
		fontSize: "0.7rem",
		lineHeight: "1rem",
		fontWeight: 600
		},
		coords: {
		color: "#343a40",
		lineHeight: "1.5rem"
		//fontSize: "0.7rem"
		},
		container: {
		display: "flex",
		flexWrap: "noWrap",
		//maxHeight: 60,
		"& > *": {
		margin: 0,
		padding: 0,
		width: "47.5%",
		height: "100%",
		maxHeight: "3rem",
		maxWidth: "47.5%",
		backgroundColor: "#f1f3f5",
		textAlign: "center"
		}
		}
		});

		@@ -48,13 +72,14 @@ export default function ConsoleCoordinates() {
		justify="flex-end"
		alignItems="center"
		item
		xs={2}
		xs={3}
		>
		<Grid item xs>
		<StyledTooltip
		title={
		<Typography variant="subtitle1">
		Displays coordinates in the form: (Lon, Lat).
		Displays the longitude and latitude of the area on the map
		underneath the cursor.
		</Typography>
		}
		enterDelay={800}
		@@ -62,12 +87,32 @@ export default function ConsoleCoordinates() {
		arrow
		TransitionComponent={Zoom}
		>
		<div className={classes.container}>
		<Paper variant="outlined" square>
		<Typography variant="overline" className={classes.title}>
		Longitude
		</Typography>
		<Divider variant="fullWidth" />
		<Typography
		noWrap
		className={classes.coords}
		id="lonCoordinateDisplay"
		variant="subtitle2"
		/>
		</Paper>
		<Paper variant="outlined" square>
		<Typography variant="overline" className={classes.title}>
		Latitude
		</Typography>
		<Divider variant="fullWidth" />
		<Typography
		noWrap
		className={classes.title}
		id="coordinateDisplay"
		variant="subtitle1"
		className={classes.coords}
		id="latCoordinateDisplay"
		variant="subtitle2"
		/>
		</Paper>
		</div>
		</StyledTooltip>
		</Grid>
		</Grid>