added images, added styles, record lat/lng onClick()
This commit is contained in:
parent
a19b738c26
commit
f8b998cf52
|
@ -1,3 +1,7 @@
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
header + div > div {
|
||||||
|
height: 92% !important;
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
Binary file not shown.
After Width: | Height: | Size: 72 KiB |
|
@ -1,4 +1,4 @@
|
||||||
import React, { Component } from 'react';
|
import React, { Component, Fragment } from 'react';
|
||||||
import { Map, InfoWindow, Marker, GoogleApiWrapper } from 'google-maps-react';
|
import { Map, InfoWindow, Marker, GoogleApiWrapper } from 'google-maps-react';
|
||||||
import Typography from '@material-ui/core/Typography';
|
import Typography from '@material-ui/core/Typography';
|
||||||
|
|
||||||
|
@ -55,13 +55,20 @@ export class MapContainer extends Component {
|
||||||
|
|
||||||
// When the user clicks on the map, if a info window is visible then close it
|
// When the user clicks on the map, if a info window is visible then close it
|
||||||
// and 'unactive' that marker
|
// and 'unactive' that marker
|
||||||
onMapClick = () => {
|
onMapClick = (props, map, e) => {
|
||||||
if (this.state.showingInfoWindow) {
|
if (this.state.showingInfoWindow) {
|
||||||
this.setState({
|
this.setState({
|
||||||
showingInfoWindow: false,
|
showingInfoWindow: false,
|
||||||
activeMarker: null
|
activeMarker: null
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let lat = e.latLng.lat();
|
||||||
|
let lng = e.latLng.lng();
|
||||||
|
console.log(`
|
||||||
|
latitude: ${lat}
|
||||||
|
longitude: ${lng}
|
||||||
|
`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the state of the component to contain user coordinates and initial
|
// Set the state of the component to contain user coordinates and initial
|
||||||
|
@ -77,38 +84,53 @@ export class MapContainer extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
||||||
|
// TODO: This line is used by the custom marker icon
|
||||||
|
//const { google } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
// Render the Google Map, Marker, and InfoWindow components
|
// Render the Google Map, Marker, and InfoWindow components
|
||||||
<Map
|
<Map
|
||||||
style={ style }
|
style = { style }
|
||||||
google={ this.props.google }
|
google = { this.props.google }
|
||||||
initialCenter={ this.state.myLatLng }
|
initialCenter = { this.state.myLatLng }
|
||||||
center={ this.state.myLatLng }
|
center = { this.state.myLatLng }
|
||||||
defaultZoom={ 15 }
|
defaultZoom = { 15 }
|
||||||
onClick = { this.onMapClick } >
|
onClick = { this.onMapClick } >
|
||||||
|
|
||||||
<Marker
|
<Marker
|
||||||
position={ this.state.myLatLng }
|
position = { this.state.myLatLng }
|
||||||
onClick = { this.onMarkerClick }
|
onClick = { this.onMarkerClick }
|
||||||
title = { 'Title 1!' }
|
title = { 'Sighting Type: Roadkill' }
|
||||||
name = { 'Name 1!' }
|
name = { 'blah blah blah' }
|
||||||
|
// FIXME: fix custom icon
|
||||||
|
// icon={{
|
||||||
|
// url: "../images/marten-icon.png",
|
||||||
|
// anchor: new google.maps.Point(32,32),
|
||||||
|
// scaledSize: new google.maps.Size(64,64)
|
||||||
|
// }}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Marker
|
<Marker
|
||||||
position={{ lat: 46.5089994, lng: -122.8543421 }}
|
position = {{ lat: 46.5089994, lng: -122.8543421 }}
|
||||||
onClick = { this.onMarkerClick }
|
onClick = { this.onMarkerClick }
|
||||||
title = { 'Title 2!' }
|
title = { 'Sighting Type: Alive' }
|
||||||
name = { 'Name 2!' }
|
name = { 'blah' }
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<InfoWindow
|
<InfoWindow
|
||||||
marker = { this.state.activeMarker }
|
marker = { this.state.activeMarker }
|
||||||
visible = { this.state.showingInfoWindow } >
|
visible = { this.state.showingInfoWindow } >
|
||||||
<Typography variant="display1" gutterBottom>
|
|
||||||
|
<Fragment>
|
||||||
|
<Typography variant = "display1" gutterBottom>
|
||||||
{ this.state.selectedPlace.title }
|
{ this.state.selectedPlace.title }
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="subheading" gutterBottom>
|
<Typography variant = "subheading" gutterBottom>
|
||||||
{ this.state.selectedPlace.name }
|
{ this.state.selectedPlace.name }
|
||||||
</Typography>
|
</Typography>
|
||||||
|
</Fragment>
|
||||||
|
|
||||||
</InfoWindow>
|
</InfoWindow>
|
||||||
</Map>
|
</Map>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue