mirror of
https://github.com/placeAtlas/atlas.git
synced 2024-12-24 04:24:17 +01:00
Merge branch 'master' into patch-1
This commit is contained in:
commit
f6cddc2065
12 changed files with 78 additions and 1893 deletions
23
CONTRIBUTING.md
Normal file
23
CONTRIBUTING.md
Normal file
|
@ -0,0 +1,23 @@
|
|||
# How To Contribute
|
||||
|
||||
## Contributing to the Map
|
||||
|
||||
To contribute to the map, we require a certain format for artwork region and labels. This can be generated on the [contributing page](/index.html?mode=draw) on the website.
|
||||
|
||||
You can either post this contribution to the subreddit, or make a Pull Request on the GitHub repo.
|
||||
|
||||
### Reddit Submission
|
||||
|
||||
1. Follow the instructions on the [contributing page](/index.html?mode=draw), then click "Post Direct to Reddit".
|
||||
2. Flair your post with the "New Entry" tag.
|
||||
3. A moderator will accept your contribution shortly.
|
||||
|
||||
### GitHub Submission
|
||||
|
||||
1. Create a fork of our repo.
|
||||
2. Enter your data into the `web/_js/atlas.js` file, with the correct format and ID number.
|
||||
3. Create a Pull Request.
|
||||
|
||||
## Contributing to the Project
|
||||
|
||||
This project is open source. You may contribute to the project by submitting a Pull Request on the GitHub repo.
|
|
@ -41,6 +41,11 @@ html, body {
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
p {
|
||||
line-height: 1.5em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
body {
|
||||
overflow: hidden;
|
||||
overflow-x: hidden;
|
||||
|
@ -125,7 +130,7 @@ header {
|
|||
background-color: #555;
|
||||
border-right: 1px #000 solid;
|
||||
border-bottom: 1px #000 solid;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
|
@ -310,10 +315,10 @@ .listHidden #container {
|
|||
}
|
||||
|
||||
#innerContainer {
|
||||
height: 1000px;
|
||||
width: 1000px;
|
||||
height: 2000px;
|
||||
width: 2000px;
|
||||
position: absolute;
|
||||
z-index: -1000;
|
||||
z-index: -2000;
|
||||
}
|
||||
|
||||
#image {
|
||||
|
@ -869,7 +874,7 @@ .listHidden #hideListButton {
|
|||
border-top: 1px #333 solid;
|
||||
width: 130px;
|
||||
height: 35px;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
}
|
||||
|
||||
#hideListButton:focus {
|
||||
|
@ -947,7 +952,7 @@ #aboutContainer {
|
|||
bottom: 0;
|
||||
background-color: #333;
|
||||
display: block;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
|
@ -980,10 +985,15 @@ #about h2 {
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#about h3 {
|
||||
line-height: 1.4em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#contributors {
|
||||
text-align: justify;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 60px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
#contributors a {
|
||||
|
|
BIN
web/_img/place-indexed-3.png
Normal file
BIN
web/_img/place-indexed-3.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 2.4 MiB |
|
@ -48,7 +48,7 @@ function initDraw(){
|
|||
|
||||
var backgroundCanvas = document.createElement("canvas");
|
||||
backgroundCanvas.width = 2000;
|
||||
backgroundCanvas.height = 1000;
|
||||
backgroundCanvas.height = 2000;
|
||||
var backgroundContext = backgroundCanvas.getContext("2d");
|
||||
|
||||
var highlightUncharted = true;
|
||||
|
|
|
@ -61,11 +61,11 @@ function applyView(){
|
|||
//console.log(scaleZoomOrigin[0]);
|
||||
|
||||
scaleZoomOrigin[0] = Math.max(-1000, Math.min(1000, scaleZoomOrigin[0]));
|
||||
scaleZoomOrigin[1] = Math.max(-500, Math.min(500, scaleZoomOrigin[1]));
|
||||
scaleZoomOrigin[1] = Math.max(-1000, Math.min(1000, scaleZoomOrigin[1]));
|
||||
|
||||
zoomOrigin = [scaleZoomOrigin[0]*zoom, scaleZoomOrigin[1]*zoom];
|
||||
|
||||
innerContainer.style.height = (~~(zoom*1000))+"px";
|
||||
innerContainer.style.height = (~~(zoom*2000))+"px";
|
||||
innerContainer.style.width = (~~(zoom*2000))+"px";
|
||||
|
||||
innerContainer.style.left = ~~(container.clientWidth/2 - innerContainer.clientWidth/2 + zoomOrigin[0] + container.offsetLeft)+"px";
|
||||
|
|
1850
web/_js/minified.js
1850
web/_js/minified.js
File diff suppressed because it is too large
Load diff
|
@ -34,7 +34,7 @@ function initOverlap(){
|
|||
|
||||
var backgroundCanvas = document.createElement("canvas");
|
||||
backgroundCanvas.width = 2000;
|
||||
backgroundCanvas.height = 1000;
|
||||
backgroundCanvas.height = 2000;
|
||||
var backgroundContext = backgroundCanvas.getContext("2d");
|
||||
|
||||
var filterInput = document.getElementById("searchList");
|
||||
|
@ -72,12 +72,12 @@ function initOverlap(){
|
|||
highlightEntryFromUrl();
|
||||
}*/
|
||||
|
||||
if(document.documentElement.clientWidth > 1000){
|
||||
if(document.documentElement.clientWidth > 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000){
|
||||
if(document.documentElement.clientWidth < 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
@ -546,12 +546,12 @@ function initOverlap(){
|
|||
window.addEventListener("resize", function(){
|
||||
//console.log(document.documentElement.clientWidth, document.documentElement.clientHeight);
|
||||
|
||||
if(document.documentElement.clientWidth > 1000 && viewportWidth <= 1000){
|
||||
if(document.documentElement.clientWidth > 2000 && viewportWidth <= 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000 && viewportWidth >= 1000){
|
||||
if(document.documentElement.clientWidth < 2000 && viewportWidth >= 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ var previousScaleZoomOrigin = [0, 0];
|
|||
|
||||
var backgroundCanvas = document.createElement("canvas");
|
||||
backgroundCanvas.width = 2000;
|
||||
backgroundCanvas.height = 1000;
|
||||
backgroundCanvas.height = 2000;
|
||||
var backgroundContext = backgroundCanvas.getContext("2d");
|
||||
|
||||
function updateLines(){
|
||||
|
@ -162,12 +162,12 @@ function initView(){
|
|||
highlightEntryFromUrl();
|
||||
}*/
|
||||
|
||||
if(document.documentElement.clientWidth > 1000){
|
||||
if(document.documentElement.clientWidth > 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000){
|
||||
if(document.documentElement.clientWidth < 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
@ -330,7 +330,7 @@ function initView(){
|
|||
];
|
||||
|
||||
scaleZoomOrigin = [
|
||||
1000/2 - entry.center[0]// + container.offsetLeft
|
||||
2000/2 - entry.center[0]// + container.offsetLeft
|
||||
,2000/2 - entry.center[1]// + container.offsetTop
|
||||
];
|
||||
|
||||
|
@ -539,7 +539,7 @@ function initView(){
|
|||
]
|
||||
|
||||
scaleZoomOrigin = [
|
||||
1000/2 - this.entry.center[0]
|
||||
2000/2 - this.entry.center[0]
|
||||
,2000/2 - this.entry.center[1]
|
||||
]
|
||||
|
||||
|
@ -579,7 +579,7 @@ function initView(){
|
|||
]
|
||||
|
||||
scaleZoomOrigin = [
|
||||
1000/2 - this.entry.center[0]
|
||||
2000/2 - this.entry.center[0]
|
||||
,2000/2 - this.entry.center[1]
|
||||
]
|
||||
|
||||
|
@ -761,12 +761,12 @@ function initView(){
|
|||
|
||||
var viewportWidth = document.documentElement.clientWidth;
|
||||
|
||||
if(document.documentElement.clientWidth > 1000 && viewportWidth <= 1000){
|
||||
if(document.documentElement.clientWidth > 2000 && viewportWidth <= 2000){
|
||||
entriesListShown = true;
|
||||
wrapper.className = wrapper.className.replace(/ listHidden/g, "");
|
||||
}
|
||||
|
||||
if(document.documentElement.clientWidth < 1000 && viewportWidth >= 1000){
|
||||
if(document.documentElement.clientWidth < 2000 && viewportWidth >= 2000){
|
||||
entriesListShown = false;
|
||||
wrapper.className += " listHidden";
|
||||
}
|
||||
|
|
|
@ -67,30 +67,32 @@ <h2>My Bitcoin Address</h2>
|
|||
<div id="aboutContainer">
|
||||
<a id="aboutBackButton" href="./">< Back to the Atlas</a>
|
||||
<div id="about">
|
||||
<h2 id="abouth2">The /r/place Atlas</h2>
|
||||
<p>This is an Atlas aiming to chart all the artworks created during the <a href="https://www.reddit.com/r/place/">/r/place</a> April's fools event on <a href="https://www.reddit.com/" target="_blank">Reddit</a> in 2022.</p>
|
||||
<p>The code was developed by <a href="/" target="_blank" rel="author">Roland Rytz</a> (<a href="mailto:roland.rytz@gmail.com" target="_blank">mail</a>, <a href="https://reddit.com/user/draemmli/" target="_blank">reddit</a>) and is available under the free <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">AGPL license</a> on <a target="_blank" href="https://github.com/RolandR/place-atlas">GitHub</a>. (<a target="_blank" href="https://github.com/Codixer/place-atlas">Modified GitHub for 2022 version</a>) | Image's provided by <a target="_blank" href="https://place.thatguyalex.com/">Alex Tsernoh</a></p>
|
||||
<h2 id="abouth2">The /r/Place Atlas</h2>
|
||||
<h3>The /r/Place Atlas project aims to chart all the artworks created during the <a href="https://www.reddit.com/r/place/">/r/place</a> April Fools's day event on <a href="https://www.reddit.com/" target="_blank">Reddit</a> in 2022.</h3>
|
||||
<br>
|
||||
<p>Roland Rytz worked on the Atlas full-time (and more!) for over two weeks.</p>
|
||||
<p>If you'd like to support Roland, you can do so by <a target="_blank" href="https://paypal.me/draemmli">PayPal</a> or via <a title="Click to see his address." id="bitcoinButton" role="button">Bitcoin</a>.</p>
|
||||
<p>If you donate more than 10(€/$/CHF/mBTC), He'll (hopefully) send you a nice sticker of the Place canvas! (2017 one)</p>
|
||||
<p id="bitcoinNotice">If you donate by Bitcoin and want a 2017 sticker, please send him a<br>message with your Bitcoin address <i>before</i> you make the transaction!</a>
|
||||
<p>The first incarnation of r/Place Atlas for 2017 was developed by <a href="https://draemm.li" target="_blank" rel="author">Roland Rytz</a> (<a href="mailto:roland.rytz@gmail.com" target="_blank">mail</a>, <a href="https://reddit.com/user/draemmli/" target="_blank">reddit</a>) and is available under the free <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">AGPL license</a> on <a target="_blank" href="https://github.com/RolandR/place-atlas">GitHub</a>. If you'd like to support Roland, you can do so by <a target="_blank" href="https://paypal.me/draemmli">PayPal</a> or via <a title="Click to see his address." id="bitcoinButton" role="button">Bitcoin</a>. If you donate more than 10(€/$/CHF/mBTC), He'll (hopefully) send you a nice sticker of the 2017 r/Place canvas! <span id="bitcoinNotice">If you donate by Bitcoin and want a 2017 sticker, please send him a message with your Bitcoin address <i>before</i> you make the transaction!</span></p>
|
||||
The project was started again for the second incarnation or r/Place for 2022 April Fools by <a href="https://stefanocoding.me" target="_blank" rel="author">Stefano Haagmans</a>, and is also available on <a target="_blank" href="https://github.com/Codixer/place-atlas">GitHub</a>.</p>
|
||||
Images are provided by <a target="_blank" href="https://place.thatguyalex.com/">Alex Tsernoh</a>.</p>
|
||||
|
||||
<h2>How to contribute</h2>
|
||||
<p>Everybody is encouraged to collaborate in mapping all of /r/place on the Atlas.</p>
|
||||
<p>Please read <a href="https://www.reddit.com/r/placeAtlas2/comments/tu203o/how_to_contribute/" target="_blank">this post on reddit</a> to learn how to submit a new entry.</p>
|
||||
<p>The /r/Place Atlas project relies on user contributions.</p>
|
||||
<p>To contribute a label for an artwork, please read <a href="https://www.reddit.com/r/placeAtlas2/comments/tu203o/how_to_contribute/" target="_blank">this post on reddit</a> to learn how to submit a new entry.</p>
|
||||
<p>Alternatively, contributions can be made directly on <a href="https://github.com/Codixer/place-atlas/blob/master/CONTRIBUTING.md">GitHub</a>.</p>
|
||||
<p>The <a href="https://reddit.com/r/placeAtlas2/" target="_blank">/r/placeAtlas2</a> subreddit is also the place to submit all bug reports, feature requests or questions.</p>
|
||||
<h2>r/placeAtlas2 (Current) Contributors</h2>
|
||||
<p>The 2022 Atlas would not have been possible without the help of the following (number still not known) reddit users.</p>
|
||||
<p>Thank you to everyone who submitted new entries, amended existing ones, reported bugs and just supported the project in general.</p>
|
||||
|
||||
<h2>r/placeAtlas2 (Current) Contributors and Maintainers</h2>
|
||||
<div id="contributors">
|
||||
<a href="https://reddit.com/user/TCOOfficiall" target="_blank">TCOOfficiall (Current Maintainer)</a>
|
||||
<a href="https://reddit.com/user/prosto_sanja" target="_blank">prosto_sanja (Provided Images)</a> - <a href="https://place.thatguyalex.com/" target="_blank">Website</a>
|
||||
<a href="https://reddit.com/user/electric-blue" target="_blank">electric-blue</a>
|
||||
<a href="https://reddit.com/user/m654zy" target="_blank">m654zy</a>
|
||||
<a href="https://reddit.com/user/xXLInkster17Xx" target="_blank">xXLInkster17Xx</a>
|
||||
<a href="https://reddit.com/user/TCOOfficiall" target="_blank">TCOOfficiall (Current Maintainer)</a> ·
|
||||
<a href="https://reddit.com/user/prosto_sanja" target="_blank">prosto_sanja (Provided Images)</a> - <a href="https://place.thatguyalex.com/" target="_blank">Website</a> ·
|
||||
<a href="https://reddit.com/user/electric-blue" target="_blank">electric-blue</a> ·
|
||||
<a href="https://reddit.com/user/m654zy" target="_blank">m654zy</a> ·
|
||||
<a href="https://reddit.com/user/xXLInkster17Xx" target="_blank">xXLInkster17Xx</a>
|
||||
</div>
|
||||
<p>The 2022 Atlas would not have been possible without the help of our reddit contributors. This section will be updated with all of the contributor's usernames.</p>
|
||||
<p>Thank you to everyone who submitted new entries, amended existing ones, reported bugs and just supported the project in general.</p>
|
||||
|
||||
<h2>r/placeAtlas Contributors</h2>
|
||||
<p>The (original) Atlas would not have been possible without the help of the following 775 reddit users.</p>
|
||||
<p>The original Atlas project would not have been possible without the help of the following 775 reddit users.</p>
|
||||
<p>Thank you to everyone who submitted new entries, amended existing ones, reported bugs and just supported the project in general.</p>
|
||||
<div id="contributors">
|
||||
<a href="https://reddit.com/user/0011110000110011" target="_blank">0011110000110011</a>
|
||||
|
|
BIN
web/favicon.ico
Normal file
BIN
web/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
|
@ -98,8 +98,8 @@ <h1 id="title">The /r/place Atlas</h1>
|
|||
</div>
|
||||
<canvas id="linesCanvas"></canvas>
|
||||
<div id="innerContainer">
|
||||
<canvas id="highlightCanvas" width="2000" height="1000"></canvas>
|
||||
<img id="image" src="./_img/place-indexed.png" width="2000" height="1000" alt="Canvas of /r/place in the state of when the experiment was concluded." />
|
||||
<canvas id="highlightCanvas" width="2000" height="2000"></canvas>
|
||||
<img id="image" src="./_img/place-indexed.png" width="2000" height="2000" alt="Canvas of /r/place in the state of when the experiment was concluded." />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue