Merge branch 'Codixer:cleanup' into cleanup

CONTRIBUTING.md

@@ -32,4 +32,4 @@ To contribute to the map, we require a certain format for artwork region and lab
 
 ## Cleaning Contributions
 
-If you spot a duplicate, please PR against `/cleanup`. To help find duplicates, run the code locally, changing line 92 of `main.js` to `overlap`.
+If you spot a duplicate, please PR against `/cleanup`. To help find duplicates, append `?mode=overlap` to the url: [`https://place-atlas.stefanocoding.me?mode=overlap`](https://place-atlas.stefanocoding.me?mode=overlap).

README.md

@@ -35,9 +35,9 @@ To contribute to the map, we require a certain format for artwork region and lab
 ### Map Edits
 
 1. Create a fork of our repo.
-2. Enter your data into the `web/atlas.json` file, with the correct format and ID number.
+2. Enter your data into the `web/_js/atlas.json` file, with the correct format and ID number.
-3. Create a Pull Request against the `/cleanup` branch.
+3. Create a Pull Request against the `cleanup` branch.
 
 ### Cleaning Contributions
 
-If you spot a duplicate, please PR against `/cleanup`. To help find duplicates, append `?mode=overlap` to the url: [`https://place-atlas.stefanocoding.me?mode=overlap`](https://place-atlas.stefanocoding.me?mode=overlap).
+If you spot a duplicate, please PR against the `cleanup` branch. To help find duplicates, append `?mode=overlap` to the url: [`https://place-atlas.stefanocoding.me?mode=overlap`](https://place-atlas.stefanocoding.me?mode=overlap).

web/_js/main.js

@@ -135,6 +135,33 @@ async function init(){
 			initOverlap();
 		}
 	}
+	
+	function changeOverlapMode(){
+		console.log(mode)
+		switch(mode){
+			case "overlap":
+				window.location.href = "?mode=explore"
+				break;
+			case "explore":
+				window.location.href = "?"
+				break;
+			default:
+				window.location.href = "?mode=overlap"
+				break;
+		}
+
+		return false;
+	}
+
+	const modeMap = {
+		"view": "Overlap",
+		"overlap": "Explore",
+		"explore": "Atlas"
+	}
+
+	const toggleMode = document.getElementById("toggleMode");
+	toggleMode.onclick = changeOverlapMode;
+	toggleMode.innerHTML = modeMap[mode];
 
 	document.getElementById("loading").style.display = "none";
 

web/index.html

@@ -106,8 +106,8 @@ <h1 id="title">The /r/place Atlas</h1>
 			<div id="entriesListContainer">
 				<nav>
 					<a id="aboutLink" href="./about.html">About</a>
-					<a id="drawLink" href="./index.html?mode=draw">Contribute</a>
+					<a id="drawLink" href="./index.html?mode=draw">Draw</a>
-					<a id="overlapLink" href="./index.html?mode=overlap">Overlap</a>
+					<a id="toggleMode" onclick="return changeOverlapMode()">Overlap</a>
 					<button title="Discord" onclick="window.location.href='https://discord.gg/pJkm23b2nA'">
 						<img class="Discord" alt="Discord Logo" src="./_img/discord.svg">
 					</button>