Changeset 35063 for main

Timestamp:

2021-04-12T17:30:09+12:00 (3 years ago)

Author:

davidb

Message:

Fixed bug in transpose_i() -- how to transpose a ragged-ended array is tricker than first appears\!

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/js/eurovision.js (modified) (5 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/js/eurovision.js

@@ -6 +6 @@
 var glob_voting_country_and_points_width = (180+35); 
 
-function transpose_i(i,num_cols, num_rows)
-{
+
+var pp_country_lookup = {
+    "BosniaandHerzegovina":        "Bosnia and Herzegovina",
+    "CzechRepublic":               "Czech Republic",
+    "FederalRepublicofYugoslavia": "Federal Republic of Yugoslavia",
+    "NorthMacedonia":              "North Macedonia",
+    "RepublicofMacedonia":         "Republic of Macedonia",
+    "SanMarino":                   "San Marino",
+    "SerbiaandMontenegro":         "Serbia and Montenegro", 
+    "UnitedKingdom":               "United Kingdom",
+};
+
+function transpose_i(i,num_cols,num_rows,num_countries)
+{
+    if (i >= num_countries) {
+    // out of range to tanspose, just return original value
+    return i;
+    }
+    
+    var num_filler_gaps = (num_cols * num_rows) - num_countries;
+    var full_cols_until = num_cols - num_filler_gaps;
+    //console.log("full cols until = " + full_cols_until);
+    
     // Map 'i' to (x,y) position in grid layout
     var x = (i % num_cols);
-    var y = Math.floor(i / num_cols); // affect int division
-    
+    var y = Math.floor(i / num_cols); // effectively int division
+
     // Transpose, and then reverse engineer what value of 'i' the transposed position needs to be
     var trans_x = y;
@@ -18 +39 @@
     var trans_i = trans_y * num_rows + trans_x;
 
+    // Filler correction
+    //if ((x > full_cols_until) && (trans_y < (num_cols-1))) {
+    if (x > full_cols_until) {
+    trans_i = trans_i - (num_cols - x)
+    }
+    
     return trans_i;
 }
@@ -50 +77 @@
 
     for (var i=0; i<num_cells; i++) {
-        var trans_i = transpose_i(i,num_cols, num_rows);
+        var trans_i = transpose_i(i,num_cols, num_rows, num_countries);
 
         // By default, they country and points are set to be empty divs
@@ -70 +97 @@
         if (typeof from_country_points !== 'undefined') {
             var from_country_base = from_country.replace(/-(T|J)$/,"");
-            var pp_from_country = from_country_base; // in future look to putting spacing back in for countries like United Kingdom
+
+            var pp_from_country = from_country_base;
+            if (pp_country_lookup[pp_from_country]) {
+            pp_from_country = pp_country_lookup[pp_from_country];
+            }
 
             var hyphen_vote_type = from_country.match(/-(?:T|J)$/);
@@ -160 +191 @@
     for (var i=0; i<num_cells; i++) {
 
-        var trans_i = transpose_i(i,num_cols, num_rows);
+        var trans_i = transpose_i(i,num_cols, num_rows, num_countries);
 
         var $to_country_name = $('<div>').attr("class","voting voting-country").append("");