me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 03:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add location to organisations

Browse Source
This commit is contained in:
James Graham
2021-01-15 13:44:20 +00:00
parent 95fda6a3d5
commit 2d85ab4370
5 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
people/static/js/map.js
View File

@@ -15,7 +15,16 @@ let selected_marker_info = null;
function createMarker(map, marker_data) {
// Get the lat-long position from the data
const lat_lng = new google.maps.LatLng(marker_data.lat, marker_data.lng);
let lat_lng;
if (marker_data.lat != null && marker_data.lng != null) {
lat_lng = new google.maps.LatLng(marker_data.lat, marker_data.lng);
} else if (marker_data.org_lat != null && marker_data.org_lng != null) {
lat_lng = new google.maps.LatLng(marker_data.org_lat, marker_data.org_lng);
} else {
throw new Error(`No lat/lng set for marker '${marker_data.name}'`)
}
const marker = new google.maps.Marker({
position: lat_lng,
@@ -52,36 +61,6 @@ function createMarker(map, marker_data) {
return marker;
}
function search_missing_locations(map, markers_data) {
service = new google.maps.places.PlacesService(map)
for (let data of markers_data) {
if (data.organisation !== null && (data.lat === null || data.lng === null)) {
let query = data.organisation;
if (data.country !== null) {
query += ' ' + data.country;
}
const request = {
query: query,
fields: ['name', 'geometry'],
};
service.findPlaceFromQuery(request, (results, status) => {
if (status === google.maps.places.PlacesServiceStatus.OK) {
for (let i = 0; i < results.length; i++) {
// createMarker(results[i]);
console.log(results[i])
}
map.setCenter(results[0].geometry.location);
}
});
break;
}
}
}
// The function called when Google Maps starts up
function initMap() {
map = new google.maps.Map(
@@ -91,12 +70,16 @@ function initMap() {
const bounds = new google.maps.LatLngBounds()
const markers_data = JSON.parse(
document.getElementById('map-markers').textContent)
search_missing_locations(map, markers_data);
// For each data entry in the json...
for (const marker_data of markers_data) {
const marker = createMarker(map, marker_data);
bounds.extend(marker.position)
try {
const marker = createMarker(map, marker_data);
bounds.extend(marker.position);
} catch (exc) {
// Just skip and move on to next
}
}
map.fitBounds(bounds)