From c2e243e4cef0860dd61f9513f0d3d355838b709a Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Sun, 31 Jul 2022 21:00:50 +0100
Subject: [PATCH] Stop running the visual screenshot diff test.

It's too flaky. For reasons I can't explain, there's often a slight diff
on every single screenshot, making it useless.

Even when it works, the workflow is painful. I end up using
data/diff_changed_map.sh and the full power of the UI to flip back and
forth between a before/after. My new workflow will just see when a file
changes, then use this script.
---
 apps/game/compare_screencaps.sh | 31 -------------------------------
 apps/game/confirm_screencap.sh  | 13 -------------
 data/MANIFEST.json              | 27 +--------------------------
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100755 apps/game/compare_screencaps.sh
 delete mode 100755 apps/game/confirm_screencap.sh

diff --git a/apps/game/compare_screencaps.sh b/apps/game/compare_screencaps.sh
deleted file mode 100755
index 0a10ab07d3..0000000000
--- a/apps/game/compare_screencaps.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-country=$1
-city=$2;
-map=$3;
-
-mkdir screens_before;
-cd screens_before;
-unzip ../../../data/input/${country}/${city}/screenshots/${map}.zip;
-cd ..;
-before=screens_before;
-after=screenshots/${country}/${city}/${map};
-
-rm -rf diff
-mkdir diff
-
-for file in `ls $before | grep -v full.png | grep -v combine.sh`; do
-	# For whatever reason, the intersection annotation doesn't seem to
-	# always match up between two captures.
-	prefix=`echo $file | sed 's/_.*//' | sed 's/.png//' | sed 's/.gif//'`;
-
-	diff $before/${prefix}* $after/${prefix}*;
-	if [ $? -eq 1 ]; then
-		compare $before/${prefix}* $after/${prefix}* diff/${prefix}.png;
-		feh diff/${prefix}.png $before/${prefix}* $after/${prefix}*;
-		# Handle interrupts by killing the script entirely
-		if [ $? -ne 0 ]; then
-			exit;
-		fi
-	fi
-done
diff --git a/apps/game/confirm_screencap.sh b/apps/game/confirm_screencap.sh
deleted file mode 100755
index 378f09d295..0000000000
--- a/apps/game/confirm_screencap.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-country=$1
-city=$2;
-map=$3;
-
-rm -rf ../../data/input/${country}/${city}/screenshots/${map}.zip diff screens_before;
-cd screenshots/${country}/${city}/${map};
-zip ${map}.zip *;
-mkdir -p ../../../../../../data/input/${country}/${city}/screenshots/;
-mv ${map}.zip ../../../../../../data/input/${country}/${city}/screenshots/;
-cd ../../../../;
-rm -rf screenshots/${country}/${city}/${map};
diff --git a/data/MANIFEST.json b/data/MANIFEST.json
index 1584985fe9..ad759faa8f 100644
--- a/data/MANIFEST.json
+++ b/data/MANIFEST.json
@@ -656,7 +656,7 @@
       "compressed_size_bytes": 4518353
     },
     "data/input/gb/bristol/raw_maps/east.bin": {
-      "checksum": "0241add58f24a385ed5574dbacc5d3e6",
+      "checksum": "727d09b7eade8cdfb4dc3680e80ecb4a",
       "uncompressed_size_bytes": 16926656,
       "compressed_size_bytes": 2820658
     },
@@ -1470,11 +1470,6 @@
       "uncompressed_size_bytes": 20709954,
       "compressed_size_bytes": 3852860
     },
-    "data/input/gb/london/screenshots/kennington.zip": {
-      "checksum": "4b9f19fda88f44e4fa5913c9c46024cc",
-      "uncompressed_size_bytes": 6525593,
-      "compressed_size_bytes": 6524461
-    },
     "data/input/gb/long_marston/osm/center.osm": {
       "checksum": "c7c25ca197870b843ac79c591c1275f3",
       "uncompressed_size_bytes": 28581269,
@@ -2120,11 +2115,6 @@
       "uncompressed_size_bytes": 15803509,
       "compressed_size_bytes": 3133959
     },
-    "data/input/pl/krakow/screenshots/center.zip": {
-      "checksum": "2b9cf22e51d57790caf2eee157ff970d",
-      "uncompressed_size_bytes": 36730442,
-      "compressed_size_bytes": 36726765
-    },
     "data/input/pl/warsaw/osm/center.osm": {
       "checksum": "b41830dd375674ffc9f7ec15d6cf9c0c",
       "uncompressed_size_bytes": 99007263,
@@ -2765,11 +2755,6 @@
       "uncompressed_size_bytes": 2234604,
       "compressed_size_bytes": 381513
     },
-    "data/input/us/phoenix/screenshots/tempe.zip": {
-      "checksum": "5a02f263568dc21d5136c84d8f0016a5",
-      "uncompressed_size_bytes": 10087046,
-      "compressed_size_bytes": 10085268
-    },
     "data/input/us/providence/osm/downtown.osm": {
       "checksum": "463b986adc83ae4d1174496a4ce744d1",
       "uncompressed_size_bytes": 28835517,
@@ -3115,16 +3100,6 @@
       "uncompressed_size_bytes": 25614395,
       "compressed_size_bytes": 5006156
     },
-    "data/input/us/seattle/screenshots/downtown.zip": {
-      "checksum": "bfa8b1b33ddd7b3e41aa4d3961eab4bc",
-      "uncompressed_size_bytes": 28357172,
-      "compressed_size_bytes": 28349822
-    },
-    "data/input/us/seattle/screenshots/montlake.zip": {
-      "checksum": "d1b3e4be11f42c22f3be0476ec4860a8",
-      "uncompressed_size_bytes": 5403126,
-      "compressed_size_bytes": 5403061
-    },
     "data/input/us/seattle/trips_2014.csv": {
       "checksum": "d4a8e733045b28c0385fb81359d6df03",
       "uncompressed_size_bytes": 3047098014,