Merge pull request #1438 from placeAtlas/cleanup

Cleanup sync

.all-contributorsrc

@@ -54,9 +54,9 @@
     },
     {
       "login": "AnonymousRandomPerson",
-      "name": "Cheng Hann Gan",
+      "name": "AnonymousRandomPerson",
       "avatar_url": "https://avatars.githubusercontent.com/u/6516839?v=4",
-      "profile": "https://www.linkedin.com/in/chenghanngan/",
+      "profile": "https://github.com/AnonymousRandomPerson",
       "contributions": [
         "data",
         "content",

README.md

@@ -41,7 +41,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://stefanocoding.me"><img src="https://avatars.githubusercontent.com/u/25939526?v=4?s=100" width="100px;" alt="Stefano"/><br /><sub><b>Stefano</b></sub></a><br /><a href="#business-Codixer" title="Business development">💼</a> <a href="https://github.com/placeAtlas/atlas/commits?author=Codixer" title="Code">💻</a> <a href="#content-Codixer" title="Content">🖋</a> <a href="#data-Codixer" title="Data">🔣</a> <a href="#design-Codixer" title="Design">🎨</a> <a href="#fundingFinding-Codixer" title="Funding Finding">🔍</a> <a href="#infra-Codixer" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Codixer" title="Maintenance">🚧</a> <a href="#projectManagement-Codixer" title="Project Management">📆</a> <a href="#question-Codixer" title="Answering Questions">💬</a> <a href="#security-Codixer" title="Security">🛡️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ab-gh"><img src="https://avatars.githubusercontent.com/u/18347932?v=4?s=100" width="100px;" alt="ash"/><br /><sub><b>ash</b></sub></a><br /><a href="#business-ab-gh" title="Business development">💼</a> <a href="#content-ab-gh" title="Content">🖋</a> <a href="#data-ab-gh" title="Data">🔣</a> <a href="#projectManagement-ab-gh" title="Project Management">📆</a> <a href="https://github.com/placeAtlas/atlas/pulls?q=is%3Apr+reviewed-by%3Aab-gh" title="Reviewed Pull Requests">👀</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linktr.ee/aeywoo"><img src="https://avatars.githubusercontent.com/u/65846594?v=4?s=100" width="100px;" alt="Aeywoo"/><br /><sub><b>Aeywoo</b></sub></a><br /><a href="#business-Aeywoo" title="Business development">💼</a> <a href="https://github.com/placeAtlas/atlas/issues?q=author%3AAeywoo" title="Bug reports">🐛</a> <a href="#blog-Aeywoo" title="Blogposts">📝</a> <a href="#content-Aeywoo" title="Content">🖋</a> <a href="#maintenance-Aeywoo" title="Maintenance">🚧</a> <a href="#research-Aeywoo" title="Research">🔬</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/chenghanngan/"><img src="https://avatars.githubusercontent.com/u/6516839?v=4?s=100" width="100px;" alt="Cheng Hann Gan"/><br /><sub><b>Cheng Hann Gan</b></sub></a><br /><a href="#data-AnonymousRandomPerson" title="Data">🔣</a> <a href="#content-AnonymousRandomPerson" title="Content">🖋</a> <a href="#research-AnonymousRandomPerson" title="Research">🔬</a> <a href="https://github.com/placeAtlas/atlas/commits?author=AnonymousRandomPerson" title="Code">💻</a> <a href="https://github.com/placeAtlas/atlas/pulls?q=is%3Apr+reviewed-by%3AAnonymousRandomPerson" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AnonymousRandomPerson"><img src="https://avatars.githubusercontent.com/u/6516839?v=4?s=100" width="100px;" alt="AnonymousRandomPerson"/><br /><sub><b>AnonymousRandomPerson</b></sub></a><br /><a href="#data-AnonymousRandomPerson" title="Data">🔣</a> <a href="#content-AnonymousRandomPerson" title="Content">🖋</a> <a href="#research-AnonymousRandomPerson" title="Research">🔬</a> <a href="https://github.com/placeAtlas/atlas/commits?author=AnonymousRandomPerson" title="Code">💻</a> <a href="https://github.com/placeAtlas/atlas/pulls?q=is%3Apr+reviewed-by%3AAnonymousRandomPerson" title="Reviewed Pull Requests">👀</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mxdanger"><img src="https://avatars.githubusercontent.com/u/32040254?v=4?s=100" width="100px;" alt="mxdanger"/><br /><sub><b>mxdanger</b></sub></a><br /><a href="https://github.com/placeAtlas/atlas/commits?author=mxdanger" title="Code">💻</a> <a href="#a11y-mxdanger" title="Accessibility">️️️️♿️</a> <a href="https://github.com/placeAtlas/atlas/issues?q=author%3Amxdanger" title="Bug reports">🐛</a> <a href="#design-mxdanger" title="Design">🎨</a> <a href="#ideas-mxdanger" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-mxdanger" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-mxdanger" title="Maintenance">🚧</a> <a href="#tool-mxdanger" title="Tools">🔧</a> <a href="#userTesting-mxdanger" title="User Testing">📓</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/artillect"><img src="https://avatars.githubusercontent.com/u/8906201?v=4?s=100" width="100px;" alt="Riley"/><br /><sub><b>Riley</b></sub></a><br /><a href="#data-artillect" title="Data">🔣</a> <a href="#design-artillect" title="Design">🎨</a> <a href="https://github.com/placeAtlas/atlas/commits?author=artillect" title="Documentation">📖</a></td>
     </tr>

data/read-ids.txt

@@ -12428,3 +12428,119 @@ zznclm
 139750p
 1396rq0
 1396qh3
+139wliz
+139wkmg
+139wjth
+139win7
+139what
+139w6dx
+139w0dh
+139vkgm
+139x6q4
+139xofp
+139y7xc
+139y728
+139y4rq
+139xuo3
+139yrf8
+139yn8c
+139z0j3
+139zq2j
+13a03ls
+13a01du
+139zygq
+13a0c0u
+13a4aaj
+13a0kev
+13avsr7
+13avdmn
+13avbsh
+13b11x8
+13b0xy9
+13b0w09
+13b0uc2
+13b08t4
+13b06h3
+13b03y1
+13azjxp
+13c4o37
+13bvrmh
+13bbziq
+13bbvd1
+13c6z07
+13c6xr4
+13c6wlj
+13c6l1x
+13ca1kf
+13cbab1
+13cb6v0
+13cb4yy
+13cb3pc
+13da1zp
+13d9zrw
+13d9yx5
+13d9y0u
+13d9wlp
+13d9u5j
+13d9sou
+13dad21
+13e8ko4
+13e8hw8
+13e8fnb
+13e8943
+13e7l9n
+13e9oxm
+13e9nef
+13e9j4h
+13e9iaq
+13e9gpo
+13e9fsg
+13e9em9
+13e9d6p
+13e96oj
+13e91fk
+13e8tpk
+13e8o1k
+13eaf5d
+13eacvv
+13eablm
+13eb65e
+13eazw4
+13eaxib
+13f4got
+13f4aqb
+13f688x
+13f6met
+13f6jy4
+13fxyob
+13f6pgw
+13g3og4
+13g3c5j
+13g4sgv
+13g4n8g
+13g4el8
+13g4e06
+13g4cuu
+13g486r
+13go1p1
+13gqfuf
+13gq8is
+13himoo
+13hikya
+13hik47
+13hij9x
+13hiikh
+13hhxl5
+13hhuag
+13hhqe8
+13hhnl3
+13hga6l
+13hl0t9
+13hkwy4
+13hktj5
+13hks74
+13hkf6u
+13hk919
+13hk6vp
+13hl6p7
+13hlqjg

web/_js/main/draw.js

@@ -578,7 +578,7 @@ function initDraw() {
 			inputButton.className = "btn btn-outline-secondary"
 			inputButton.title = "Remove website"
 			inputButton.innerHTML = '<i class="bi bi-trash-fill" aria-hidden="true"></i>'
-			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, array, index))
+			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, websiteGroupElements, index))
 		}
 		inputGroup.appendChild(inputButton)
 	}
@@ -621,7 +621,7 @@ function initDraw() {
 			inputButton.className = "btn btn-outline-secondary"
 			inputButton.title = "Remove subreddit"
 			inputButton.innerHTML = '<i class="bi bi-trash-fill" aria-hidden="true"></i>'
-			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, array, index))
+			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, subredditGroupElements, index))
 		}
 
 		inputField.addEventListener('paste', event => {
@@ -666,7 +666,7 @@ function initDraw() {
 			inputButton.className = "btn btn-outline-secondary"
 			inputButton.title = "Remove Discord invite"
 			inputButton.innerHTML = '<i class="bi bi-trash-fill" aria-hidden="true"></i>'
-			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, array, index))
+			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, discordGroupElements, index))
 		}
 
 		inputField.addEventListener('paste', event => {
@@ -705,7 +705,7 @@ function initDraw() {
 			inputButton.className = "btn btn-outline-secondary"
 			inputButton.title = "Remove wiki page"
 			inputButton.innerHTML = '<i class="bi bi-trash-fill" aria-hidden="true"></i>'
-			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, array, index))
+			inputButton.addEventListener('click', () => removeFieldButton(inputGroup, wikiGroupElements, index))
 		}
 		inputGroup.appendChild(inputButton)
 	}
@@ -878,12 +878,12 @@ function initPeriodGroups() {
 			if (path.length >= 3) {
 				periodCenter = calculateCenter(path)
 				// @instance-only
-				if ((periodCenter[1] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[1])) {
+				if ((periodCenter[1] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[1])) {
 					// Second expansion
-					startPeriodEl.value = variationsConfig[variation].expansions[1];
-				} else if ((periodCenter[0] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[0])) {
+					startPeriodEl.value = variationsConfig[getCurrentVariation()].expansions[1];
+				} else if ((periodCenter[0] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[0])) {
 					// First expansion
-					startPeriodEl.value = variationsConfig[variation].expansions[0];
+					startPeriodEl.value = variationsConfig[getCurrentVariation()].expansions[0];
 				}
 			}
 			startPeriodUpdate(startPeriodEl.value)
@@ -897,20 +897,24 @@ function initPeriodGroups() {
 			startPeriodUpdate(startPeriodEl.value)
 		})
 		startPeriodViewEl.addEventListener('click', () => {
-			updateTime(parseInt(startPeriodEl.value), variation)
+			updateTime(parseInt(startPeriodEl.value), getCurrentVariation())
 
 			// Set zoom view
 			periodCenter = calculateCenter(path)
 			setView(periodCenter[0], periodCenter[1], setZoomByPath(path))
 		})
+
+		function getCurrentVariation() {
+			return periodVariationEl[periodVariationEl.selectedIndex].value
+		}
 
 		function startPeriodUpdate(value) {
 			endPeriodListEl.innerHTML = '<option value="' + (parseInt(value) + 1) + '"></option>'
 
 			// Update time only when value changes
 			if (startPeriodEl.value !== timelineSlider.value) {
 				timelineSlider.value = value
-				updateTime(parseInt(value), variation)
+				updateTime(parseInt(value), getCurrentVariation())
 			}
 
 			// Set start incremental button disabled states
@@ -924,11 +928,11 @@ function initPeriodGroups() {
 				if (path.length >= 3) {
 					periodCenter = calculateCenter(path)
 					// @instance-only
-					if ((periodCenter[1] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[1])) {
+					if ((periodCenter[1] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[1])) {
 						// Second expansion
 						startPeriodLeftEl.disabled = true
 						startPeriodRightEl.disabled = false
-					} else if ((periodCenter[0] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[0])) {
+					} else if ((periodCenter[0] > 1000) && (startPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[0])) {
 						// First expansion
 						startPeriodLeftEl.disabled = true
 						startPeriodRightEl.disabled = false
@@ -945,12 +949,12 @@ function initPeriodGroups() {
 			if (path.length >= 3) {
 				periodCenter = calculateCenter(path)
 				// @instance-only
-				if ((periodCenter[1] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[1])) {
+				if ((periodCenter[1] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[1])) {
 					// Second expansion
-					endPeriodEl.value = variationsConfig[variation].expansions[1];
-				} else if ((periodCenter[0] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[0])) {
+					endPeriodEl.value = variationsConfig[getCurrentVariation()].expansions[1];
+				} else if ((periodCenter[0] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[0])) {
 					// First expansion
-					endPeriodEl.value = variationsConfig[variation].expansions[0];
+					endPeriodEl.value = variationsConfig[getCurrentVariation()].expansions[0];
 				}
 			}
 			endPeriodUpdate(endPeriodEl.value)
@@ -964,7 +968,7 @@ function initPeriodGroups() {
 			endPeriodUpdate(endPeriodEl.value)
 		})
 		endPeriodViewEl.addEventListener('click', () => {
-			updateTime(parseInt(endPeriodEl.value), variation)
+			updateTime(parseInt(endPeriodEl.value), getCurrentVariation())
 
 			// Set zoom view
 			periodCenter = calculateCenter(path)
@@ -976,8 +980,8 @@ function initPeriodGroups() {
 			// Update time only when value changes
 			if (endPeriodEl.value !== timelineSlider.value) {
 				timelineSlider.value = value
-				updateTime(parseInt(value), variation)
 			}
+			updateTime(parseInt(value), getCurrentVariation(), true)
 
 			// Set end incremental button disabled states
 			if (endPeriodEl.value === endPeriodEl.min) {
@@ -990,11 +994,11 @@ function initPeriodGroups() {
 				if (path.length >= 3) {
 					periodCenter = calculateCenter(path)
 					// @instance-only
-					if (periodCenter && (periodCenter[1] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[1])) {
+					if (periodCenter && (periodCenter[1] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[1])) {
 						// Second expansion
 						endPeriodLeftEl.disabled = true
 						endPeriodRightEl.disabled = false
-					} else if (periodCenter && (periodCenter[0] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[variation].expansions[0])) {
+					} else if (periodCenter && (periodCenter[0] > 1000) && (endPeriodEl.valueAsNumber <= variationsConfig[getCurrentVariation()].expansions[0])) {
 						// First expansion
 						endPeriodLeftEl.disabled = true
 						endPeriodRightEl.disabled = false

web/_js/main/infoblock.js

@@ -155,7 +155,7 @@ function createInfoBlock(entry, isPreview) {
 			if (!link) return
 			const wikiLinkElement = baseLinkElement.cloneNode()
 			wikiLinkElement.href = "https://place-wiki.stefanocoding.me/wiki/" + link.replace(/ /g, '_')
-			wikiLinkElement.innerHTML = `<i class="bi bi-book" aria-hidden="true"></i> Wiki Article`
+			wikiLinkElement.innerHTML = `<i class="bi bi-book" aria-hidden="true"></i>r/place Wiki Article`
 			wikiGroupElement.appendChild(wikiLinkElement)
 		})
 	}