From 952c6befd67c906e80be80f53e8397f44f53a371 Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <chenghanngan.us@gmail.com>
Date: Sat, 24 Jun 2023 14:05:09 -0500
Subject: [PATCH] Disable useNumericalId

-Setting incorrectly converted old string numerical IDs into ints.
---
 tools/merge_out.py | 7 ++++---
 web/_js/config.js  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/merge_out.py b/tools/merge_out.py
index f6607f7e..e26e36ae 100644
--- a/tools/merge_out.py
+++ b/tools/merge_out.py
@@ -39,7 +39,8 @@
 filenames.append(permanent_patch_file)
 
 for filename in filenames:
-	if filename == permanent_patch_file:
+	is_permanent_file = filename == permanent_patch_file
+	if is_permanent_file:
 		f = filename
 	else:
 		f = os.path.join(patches_dir, filename)
@@ -91,7 +92,7 @@
 					entry['id'] = str(last_id)
 				elif isinstance(entry['id'], int):
 					entry['id'] = str(entry['id'])
-				elif entry['id'] not in out_ids:
+				elif not is_permanent_file and entry['id'] not in out_ids:
 					out_ids.append(entry['id'])
 
 				if entry['id'] in atlas_ids:
@@ -102,7 +103,7 @@
 					print(f"{filename}: Added {entry['id']}.")
 					atlas_data.append(entry)
 
-			if filename != permanent_patch_file:
+			if not is_permanent_file:
 				os.remove(f)
 
 	except:
diff --git a/web/_js/config.js b/web/_js/config.js
index 2a510f63..21d3a530 100644
--- a/web/_js/config.js
+++ b/web/_js/config.js
@@ -254,7 +254,7 @@ window.defaultVariation = defaultVariation
 let defaultPeriod = variationsConfig[defaultVariation].default
 window.defaultPeriod = defaultPeriod
 
-const useNumericalId = true
+const useNumericalId = false
 window.useNumericalId = useNumericalId
 
 console.info(`%cThe 2022 r/place Atlas