diff --git a/app/static/assets/leaflet/images/person-marker-icon-2x-blue.png b/app/static/assets/leaflet/images/person-marker-icon-2x-blue.png new file mode 100755 index 0000000..c29320a Binary files /dev/null and b/app/static/assets/leaflet/images/person-marker-icon-2x-blue.png differ diff --git a/app/static/assets/leaflet/images/person-marker-icon-2x-gold.png b/app/static/assets/leaflet/images/person-marker-icon-2x-gold.png new file mode 100755 index 0000000..ff7966c Binary files /dev/null and b/app/static/assets/leaflet/images/person-marker-icon-2x-gold.png differ diff --git a/app/static/assets/leaflet/images/person-marker-icon-2x-green.png b/app/static/assets/leaflet/images/person-marker-icon-2x-green.png new file mode 100755 index 0000000..f4f56a4 Binary files /dev/null and b/app/static/assets/leaflet/images/person-marker-icon-2x-green.png differ diff --git a/app/static/assets/leaflet/utils.js b/app/static/assets/leaflet/utils.js index c9563e1..086f093 100644 --- a/app/static/assets/leaflet/utils.js +++ b/app/static/assets/leaflet/utils.js @@ -16,13 +16,30 @@ var goldIcon = new L.Icon({ shadowSize: [41, 41] }); +var bluePlayerIcon = new L.Icon({ + iconUrl: '/static/assets/leaflet/images/person-marker-icon-2x-blue.png', + shadowUrl: '/static/assets/leaflet/images/marker-shadow.png', + iconSize: [25, 41], + iconAnchor: [12, 41], + popupAnchor: [1, -34], + shadowSize: [41, 41] +}); + +var greenPlayerIcon = new L.Icon({ + iconUrl: '/static/assets/leaflet/images/person-marker-icon-2x-green.png', + shadowUrl: '/static/assets/leaflet/images/marker-shadow.png', + iconSize: [25, 41], + iconAnchor: [12, 41], + popupAnchor: [1, -34], + shadowSize: [41, 41] +}); + function addObjectiveMarker(map, objective){ var objectiveMarker = L.marker([ objective['latitude'], objective['longitude'] - ]) + ], {icon: greenIcon}) if(objective['found']){ - console.log('test') objectiveMarker.setIcon(goldIcon) } objectiveMarker.addTo(map); @@ -35,11 +52,11 @@ function addObjectiveMarker(map, objective){ } } -function addPlayerMarker(map, player){ +function addPlayerMarker(map, player, icon=bluePlayerIcon){ var playerMarker = L.marker([ player['latitude'], player['longitude'] - ], {icon: greenIcon}).addTo(map); + ], {icon: icon}).addTo(map); var timestamp_utc = moment.utc(player['timestamp_utc']).toDate() var timestamp_local = moment(timestamp_utc).local().format('YYYY-MM-DD HH:mm'); playerMarker.bindTooltip(`${player['username']}