Add player last location on map

app/__init__.py

@@ -9,6 +9,7 @@ from flask_bootstrap import Bootstrap
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_login import LoginManager
+from flask_moment import Moment
 
 
 app = Flask(__name__)
@@ -18,6 +19,7 @@ db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 login = LoginManager(app)
 login.login_view = 'login'
+moment = Moment(app)
 
 from app import routes, models, errors
 

app/models.py

@@ -9,7 +9,9 @@ import json
 from json import JSONEncoder
 from datetime import datetime
 import pytz
+from flask_moment import Moment
 
+moment = Moment()
 
 class Role(Enum):
     none = 0
@@ -80,6 +82,9 @@ class Game(db.Model):
         lazy='select',
         backref=db.backref('game', lazy='joined'))
 
+    def last_player_locations(self):
+        return [player.last_location(self) for player in self.players if player.locations]
+
 class Player(UserMixin, db.Model):
     """ !Always call set_auth_hash() after creating new instance! """
     __tablename__ = 'player'
@@ -143,10 +148,11 @@ class Player(UserMixin, db.Model):
         if not self.locations:
             return None
         if game is None:
-            return max(location.timestamp for location in self.locations)
+            return max(location for location in self.locations)
         game_start = game.start_time or datetime.min
         game_end = game.end_time or datetime.max
-        return max(location.timestamp for location in self.locations if location.timestamp > game_start and location.timestamp < game_end)
+        return max((location for location in self.locations if location.timestamp > game_start and location.timestamp < game_end),
+                    key=lambda location: location.timestamp)
 
 @login.user_loader
 def load_user(id):
@@ -188,6 +194,18 @@ class Location(db.Model):
     latitude = db.Column(db.Numeric(precision=15, scale=10, asdecimal=False, decimal_return_scale=None),nullable=False)
     timestamp = db.Column(db.DateTime, server_default=func.now(), nullable=False)
 
+    def __str__(self):
+        return f'{self.longitude}, {self.latitude}'
+
+class LocationEncoder(JSONEncoder):
+    def default(self, location):
+        return {
+            'player_name' : location.player.name,
+            'longitude' : location.longitude,
+            'latitude' : location.latitude,
+            'timestamp_utc' : str(location.timestamp)
+        }
+
 class Notification(db.Model):
     __tablename__ = 'notification'
     id = db.Column(db.Integer, primary_key=True)

app/routes.py

@@ -2,7 +2,7 @@ from flask import render_template, flash, redirect, url_for, request, abort, sen
 from flask_login import login_user, logout_user, current_user, login_required
 from sqlalchemy import and_
 from app import app, db
-from app.models import Player, Game, Role, GamePlayer, Objective, ObjectiveMinimalEncoder
+from app.models import Player, Game, Role, GamePlayer, Objective, ObjectiveMinimalEncoder, LocationEncoder
 from app.forms import LoginForm, RegistrationForm, CreateGameForm, ObjectiveForm
 import json
 import qrcode
@@ -69,7 +69,7 @@ def game_dashboard(game_name):
     #game = Game.query.filter(Game.game_players.any(and_(GamePlayer.player.has(Player.name == current_user.name), GamePlayer.role == 'owner'))).first_or_404()
     game = Game.query.filter_by(name = game_name).first_or_404()
     if not is_game_owner(game): abort(403)
-    return render_template('game_dashboard.html', title = 'Game Dashboard', game=game, json=json, encoder=ObjectiveMinimalEncoder)
+    return render_template('game_dashboard.html', title = 'Game Dashboard', game=game, json=json, objective_encoder=ObjectiveMinimalEncoder, location_encoder=LocationEncoder)
 
 @app.route('/game/<game_name>/player/<player_name>')
 @login_required

app/templates/game_dashboard.html

@@ -32,7 +32,10 @@
                 <td>{{ player.found_objectives | selectattr('game', '==', game)|list|length}}</td>
                 <td>{{ player.caught_players | selectattr('game', '==', game)|list|length}}</td>
                 <td>{{ player.caught_by_players | selectattr('game', '==', game)|list|length}}</td>
-                <td>{{ player.last_location(game) }}<td>
+                <td>{% with location = player.last_location(game) %}
+                        {% if location %}{{ moment(location.timestamp).fromNow()}}: {% endif %}
+                        {{ location }}
+                <td>{% endwith %}
             </tr>
             {% endfor %}
         </tbody>
@@ -77,6 +80,7 @@
 
 {% block scripts %}
 {{ super() }}
+{{ moment.include_moment() }}
 <script type="text/javascript", crossorigin="anonymous">
     // Leaflet Map
     var map = L.map( 'map', {
@@ -92,7 +96,7 @@
         attribution: 'Kaartgegevens &copy; <a href="kadaster.nl">Kadaster</a>'
     }).addTo( map );
 
-    var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=encoder)|safe }}')
+    var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=objective_encoder)|safe }}')
 
     for (var i = 0; i < objectives.length; i++){
         var objectiveMarker = L.marker([
@@ -102,8 +106,27 @@
         objectiveMarker.bindTooltip(`<b>${objectives[i]['name']}</b><br>
                                     ${objectives[i]['hash']}`).openPopup();
     }
-    
 
+    var greenIcon = new L.Icon({
+        iconUrl: "{{ url_for('static', filename='assets/leaflet/images/marker-icon-2x-green.png') }}",
+        shadowUrl: "{{ url_for('static', filename='assets/leaflet/images/marker-shadow.png') }}",
+        iconSize: [25, 41],
+        iconAnchor: [12, 41],
+        popupAnchor: [1, -34],
+        shadowSize: [41, 41]
+    });
+    
+    var players = JSON.parse('{{ json.dumps(game.last_player_locations(), cls=location_encoder)|safe }}')
+    for (var i = 0; i < players.length; i++){
+        var playerMarker = L.marker([
+            players[i]['latitude'],
+            players[i]['longitude']
+        ], {icon: greenIcon}).addTo(map);
+        var timestamp_utc = moment.utc(players[i]['timestamp_utc']).toDate()
+        var timestamp_local = moment(timestamp_utc).local().format('YYYY-MM-DD HH:mm');
+        playerMarker.bindTooltip(`<b>${players[i]['player_name']}</b><br>
+                                    ${timestamp_local}`).openPopup();
+    }
 
 </script>
 {% endblock %}