Make the piece-was-moved detection more robust, so that it works correctly with drag...

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 96acdd514aae54f5f49e8be636311a2ab428481d..60468bd5af305c2573724c42bf7464c9f91cd1a0 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -560,8 +560,8 @@ var compare_by_sort_key = function(refutation_lines, invert, a, b) {
 };
 
 var compare_by_score = function(refutation_lines, invert, a, b) {
-       var sa = compute_score_sort_key(refutation_lines[b]['score'], invert);
-       var sb = compute_score_sort_key(refutation_lines[a]['score'], invert);
+       var sa = compute_score_sort_key(refutation_lines[b]['score'], refutation_lines[b]['depth'], invert);
+       var sb = compute_score_sort_key(refutation_lines[a]['score'], refutation_lines[a]['depth'], invert);
        return sa - sb;
 }
 
@@ -583,14 +583,15 @@ var find_nonstupid_moves = function(data, margin, invert) {
        var best_score = undefined;
        var pv_score = undefined;
        for (var move in data['refutation_lines']) {
-               var score = compute_score_sort_key(data['refutation_lines'][move]['score'], invert);
+               var line = data['refutation_lines'][move];
+               var score = compute_score_sort_key(line['score'], line['depth'], invert);
                if (move == data['pv_uci'][0]) {
                        pv_score = score;
                }
                if (best_score === undefined || score > best_score) {
                        best_score = score;
                }
-               if (!(data['refutation_lines'][move]['depth'] >= 8)) {
+               if (line['depth'] < 8) {
                        return [];
                }
        }
@@ -603,7 +604,8 @@ var find_nonstupid_moves = function(data, margin, invert) {
        // The PV move will always be first.
        var moves = [];
        for (var move in data['refutation_lines']) {
-               var score = compute_score_sort_key(data['refutation_lines'][move]['score'], invert);
+               var line = data['refutation_lines'][move];
+               var score = compute_score_sort_key(line['score'], line['depth'], invert);
                if (move != data['pv_uci'][0] && best_score - score <= margin) {
                        moves.push(move);
                }
@@ -897,13 +899,15 @@ var update_game_list = function(games) {
                        // This game.
                        game_span.appendChild(game_name);
 
-                       var score;
-                       if (current_analysis_data['position']['result']) {
-                               score = " (" + current_analysis_data['position']['result'] + ")";
-                       } else {
-                               score = " (" + format_short_score(current_analysis_data['score']) + ")";
+                       if (current_analysis_data && current_analysis_data['position']) {
+                               var score;
+                               if (current_analysis_data['position']['result']) {
+                                       score = " (" + current_analysis_data['position']['result'] + ")";
+                               } else {
+                                       score = " (" + format_short_score(current_analysis_data['score']) + ")";
+                               }
+                               game_span.appendChild(document.createTextNode(score));
                        }
-                       game_span.appendChild(document.createTextNode(score));
                } else {
                        // Some other game.
                        var game_a = document.createElement("a");
@@ -1289,6 +1293,8 @@ var update_clock = function() {
        clearTimeout(clock_timer);
 
        var data = displayed_analysis_data || current_analysis_data;
+       if (!data) return;
+
        if (data['position']) {
                var result = data['position']['result'];
                if (result === '1-0') {
@@ -1675,12 +1681,17 @@ var find_display_line_matching_num = function() {
        return null;
 }
 
+/** Update the board based on the currently displayed line.
+ * 
+ * TODO: This should really be called only whenever something changes,
+ * instead of all the time.
+ */
 var update_displayed_line = function() {
        if (current_display_line === null) {
                $("#linenav").hide();
                $("#linemsg").show();
                display_fen = base_fen;
-               board.position(base_fen);
+               set_board_position(base_fen);
                update_imbalance(base_fen);
                return;
        }
@@ -1700,18 +1711,23 @@ var update_displayed_line = function() {
        }
 
        var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move);
+       set_board_position(hiddenboard.fen());
+       if (display_fen !== hiddenboard.fen() && !current_display_line_is_history) {
+               // Fire off a hash request, since we're now off the main position
+               // and it just changed.
+               explore_hash(hiddenboard.fen());
+       }
        display_fen = hiddenboard.fen();
+       update_imbalance(hiddenboard.fen());
+}
+
+var set_board_position = function(new_fen) {
        board_is_animating = true;
        var old_fen = board.fen();
-       board.position(hiddenboard.fen());
+       board.position(new_fen);
        if (board.fen() === old_fen) {
                board_is_animating = false;
-       } else if (!current_display_line_is_history) {
-               // Fire off a hash request, since we're now off the main position
-               // and it just changed.
-               explore_hash(display_fen);
        }
-       update_imbalance(hiddenboard.fen());
 }
 
 /**
@@ -1882,7 +1898,7 @@ var get_best_move = function(game, source, target, invert) {
                }
                var first_move = line['pv_pretty'][0];
                if (move_hash[first_move]) {
-                       var score = compute_score_sort_key(line['score'], invert);
+                       var score = compute_score_sort_key(line['score'], line['depth'], invert);
                        if (best_move_score === null || score > best_move_score) {
                                best_move = move_hash[first_move];
                                best_move_score = score;
@@ -2024,10 +2040,11 @@ var compute_plot_score = function(score) {
 
 /**
  * @param score The score digest tuple.
+ * @param {?number} depth Depth the move has been computed to, or null.
  * @param {boolean} invert Whether black is to play.
  * @return {number}
  */
-var compute_score_sort_key = function(score, invert) {
+var compute_score_sort_key = function(score, depth, invert) {
        var s;
        if (!score) {
                return -10000000;
@@ -2040,14 +2057,17 @@ var compute_score_sort_key = function(score, invert) {
                        // Black mates (note the double negative for score[1]).
                        s = -99999 - score[1];
                }
-               if (invert) s = -s;
-               return s;
        } else if (score[0] === 'd') {
-               return 0;
+               s = 0;
        } else if (score[0] === 'cp') {
-               return invert ? -score[1] : score[1];
+               s = score[1];
+       }
+       if (s) {
+               if (invert) s = -s;
+               return s * 200 + (depth || 0);
+       } else {
+               return null;
        }
-       return null;
 }
 
 /**