MirrorHub/atlas
0
0
Fork 0
mirror of https://github.com/placeAtlas/atlas.git synced 2024-09-25 11:39:02 +02:00
Code Issues Projects Releases Wiki Activity

Remove 161 duplicate entries

Browse source
This commit is contained in:
Roland Rytz 2017-04-09 02:08:35 +02:00
parent 94a20f2b34
commit 21fe85128e
8 changed files with 1631 additions and 1139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1431
combined.js
View file

File diff suppressed because it is too large Load diff

62
web/_css/style.css
View file

@ -167,7 +167,7 @@ header.aboutHeader{
header > a{ header > a{
display: flex; display: flex;
color: #FFFFFF; color: #FFFFFF;
align-items: center; /*align-items: center;*/
} }
header > a:hover{ header > a:hover{
@ -181,10 +181,14 @@ #logo{
} }
h1{ h1{
font-weight: 200; font-weight: lighter;
padding: 0px 10px; padding: 0px 10px;
display: inline-block; display: inline-block;
margin-top: -5px; margin-top: 0px;
line-height: 45px;
position: absolute;
top: 0px;
left: 50px;
text-shadow: 1px 1px 0px #000000; text-shadow: 1px 1px 0px #000000;
} }
@ -277,13 +281,46 @@ #highlightCanvas{
} }
#objectsList{ #objectsList{
width: 300px; max-width: 300px;
width: calc(100% - 10px);
position: absolute; position: absolute;
right: 0px; right: 0px;
top: 0px; top: 0px;
padding: 0px; padding: 0px;
max-height: calc(100% - 40px); max-height: calc(100% - 40px);
overflow-y: auto; overflow-y: auto;
z-index: 0;
}
#closeObjectsListButton{
height: 40px;
width: 40px;
position: absolute;
top: 10px;
right: 310px;
background-image: url("data:image/svg+xml;utf8,%3Csvg%0A%20%20%20xmlns%3Adc%3D%22http%3A//purl.org/dc/elements/1.1/%22%0A%20%20%20xmlns%3Acc%3D%22http%3A//creativecommons.org/ns%23%22%0A%20%20%20xmlns%3Ardf%3D%22http%3A//www.w3.org/1999/02/22-rdf-syntax-ns%23%22%0A%20%20%20xmlns%3Asvg%3D%22http%3A//www.w3.org/2000/svg%22%0A%20%20%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%0A%20%20%20version%3D%221.1%22%0A%20%20%20width%3D%22192.84375%22%0A%20%20%20height%3D%22192.875%22%0A%20%20%20id%3D%22svg2%22%3E%0A%20%20%3Cdefs%0A%20%20%20%20%20id%3D%22defs4%22%20/%3E%0A%20%20%3Cmetadata%0A%20%20%20%20%20id%3D%22metadata7%22%3E%0A%20%20%20%20%3Crdf%3ARDF%3E%0A%20%20%20%20%20%20%3Ccc%3AWork%0A%20%20%20%20%20%20%20%20%20rdf%3Aabout%3D%22%22%3E%0A%20%20%20%20%20%20%20%20%3Cdc%3Aformat%3Eimage/svg+xml%3C/dc%3Aformat%3E%0A%20%20%20%20%20%20%20%20%3Cdc%3Atype%0A%20%20%20%20%20%20%20%20%20%20%20rdf%3Aresource%3D%22http%3A//purl.org/dc/dcmitype/StillImage%22%20/%3E%0A%20%20%20%20%20%20%20%20%3Cdc%3Atitle%3E%3C/dc%3Atitle%3E%0A%20%20%20%20%20%20%3C/cc%3AWork%3E%0A%20%20%20%20%3C/rdf%3ARDF%3E%0A%20%20%3C/metadata%3E%0A%20%20%3Cg%0A%20%20%20%20%20transform%3D%22matrix%281.2121574%2C0%2C0%2C1.2121574%2C-20.456139%2C-20.460051%29%22%0A%20%20%20%20%20id%3D%22g3804%22%0A%20%20%20%20%20style%3D%22stroke%3A%23ffffff%3Bstroke-opacity%3A1%22%3E%0A%20%20%20%20%3Cg%0A%20%20%20%20%20%20%20transform%3D%22translate%28-156.4375%2C-398.78125%29%22%0A%20%20%20%20%20%20%20id%3D%22layer1%22%0A%20%20%20%20%20%20%20style%3D%22stroke%3A%23ffffff%3Bstroke-opacity%3A1%22%3E%0A%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20d%3D%22M%20195.27845%2C552.79802%20310.43583%2C437.64064%22%0A%20%20%20%20%20%20%20%20%20id%3D%22path2985%22%0A%20%20%20%20%20%20%20%20%20style%3D%22fill%3Anone%3Bstroke%3A%23ffffff%3Bstroke-width%3A24.74926186%3Bstroke-linecap%3Asquare%3Bstroke-linejoin%3Amiter%3Bstroke-miterlimit%3A4%3Bstroke-opacity%3A1%3Bstroke-dasharray%3Anone%22%20/%3E%0A%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20d%3D%22M%20310.43583%2C552.79802%20195.27845%2C437.64064%22%0A%20%20%20%20%20%20%20%20%20id%3D%22path3802%22%0A%20%20%20%20%20%20%20%20%20style%3D%22fill%3Anone%3Bstroke%3A%23ffffff%3Bstroke-width%3A24.74926186%3Bstroke-linecap%3Asquare%3Bstroke-linejoin%3Amiter%3Bstroke-miterlimit%3A4%3Bstroke-opacity%3A1%3Bstroke-dasharray%3Anone%22%20/%3E%0A%20%20%20%20%3C/g%3E%0A%20%20%3C/g%3E%0A%3C/svg%3E")
,linear-gradient(to bottom, #666666, #444444);
background-size: 15px, cover;
background-position: center, 0 0;
background-repeat: no-repeat, no-repeat;
}
#closeObjectsListButton.hidden{
display: none;
}
#closeObjectsListButton:hover{
background-image: url("data:image/svg+xml;utf8,%3Csvg%0A%20%20%20xmlns%3Adc%3D%22http%3A//purl.org/dc/elements/1.1/%22%0A%20%20%20xmlns%3Acc%3D%22http%3A//creativecommons.org/ns%23%22%0A%20%20%20xmlns%3Ardf%3D%22http%3A//www.w3.org/1999/02/22-rdf-syntax-ns%23%22%0A%20%20%20xmlns%3Asvg%3D%22http%3A//www.w3.org/2000/svg%22%0A%20%20%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%0A%20%20%20version%3D%221.1%22%0A%20%20%20width%3D%22192.84375%22%0A%20%20%20height%3D%22192.875%22%0A%20%20%20id%3D%22svg2%22%3E%0A%20%20%3Cdefs%0A%20%20%20%20%20id%3D%22defs4%22%20/%3E%0A%20%20%3Cmetadata%0A%20%20%20%20%20id%3D%22metadata7%22%3E%0A%20%20%20%20%3Crdf%3ARDF%3E%0A%20%20%20%20%20%20%3Ccc%3AWork%0A%20%20%20%20%20%20%20%20%20rdf%3Aabout%3D%22%22%3E%0A%20%20%20%20%20%20%20%20%3Cdc%3Aformat%3Eimage/svg+xml%3C/dc%3Aformat%3E%0A%20%20%20%20%20%20%20%20%3Cdc%3Atype%0A%20%20%20%20%20%20%20%20%20%20%20rdf%3Aresource%3D%22http%3A//purl.org/dc/dcmitype/StillImage%22%20/%3E%0A%20%20%20%20%20%20%20%20%3Cdc%3Atitle%3E%3C/dc%3Atitle%3E%0A%20%20%20%20%20%20%3C/cc%3AWork%3E%0A%20%20%20%20%3C/rdf%3ARDF%3E%0A%20%20%3C/metadata%3E%0A%20%20%3Cg%0A%20%20%20%20%20transform%3D%22matrix%281.2121574%2C0%2C0%2C1.2121574%2C-20.456139%2C-20.460051%29%22%0A%20%20%20%20%20id%3D%22g3804%22%0A%20%20%20%20%20style%3D%22stroke%3A%23ffffff%3Bstroke-opacity%3A1%22%3E%0A%20%20%20%20%3Cg%0A%20%20%20%20%20%20%20transform%3D%22translate%28-156.4375%2C-398.78125%29%22%0A%20%20%20%20%20%20%20id%3D%22layer1%22%0A%20%20%20%20%20%20%20style%3D%22stroke%3A%23ffffff%3Bstroke-opacity%3A1%22%3E%0A%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20d%3D%22M%20195.27845%2C552.79802%20310.43583%2C437.64064%22%0A%20%20%20%20%20%20%20%20%20id%3D%22path2985%22%0A%20%20%20%20%20%20%20%20%20style%3D%22fill%3Anone%3Bstroke%3A%23ffffff%3Bstroke-width%3A24.74926186%3Bstroke-linecap%3Asquare%3Bstroke-linejoin%3Amiter%3Bstroke-miterlimit%3A4%3Bstroke-opacity%3A1%3Bstroke-dasharray%3Anone%22%20/%3E%0A%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20d%3D%22M%20310.43583%2C552.79802%20195.27845%2C437.64064%22%0A%20%20%20%20%20%20%20%20%20id%3D%22path3802%22%0A%20%20%20%20%20%20%20%20%20style%3D%22fill%3Anone%3Bstroke%3A%23ffffff%3Bstroke-width%3A24.74926186%3Bstroke-linecap%3Asquare%3Bstroke-linejoin%3Amiter%3Bstroke-miterlimit%3A4%3Bstroke-opacity%3A1%3Bstroke-dasharray%3Anone%22%20/%3E%0A%20%20%20%20%3C/g%3E%0A%20%20%3C/g%3E%0A%3C/svg%3E")
,linear-gradient(to bottom, #777777, #555555);
}
@media (max-width: 750px) {
div:not(.listHidden) > #objectsList{
display: none;
}
div:not(.listHidden) > #closeObjectsListButton{
display: none;
}
} }
@media (max-width: 700px) { @media (max-width: 700px) {
@ -293,11 +330,24 @@ @media (max-width: 700px) {
} }
} }
@media (max-width: 500px) { @media (max-width: 750px) {
#closeObjectsListButton{
top: 60px;
}
}
@media (max-width: 530px) {
#objectsList{ #objectsList{
top: 80px; top: 80px;
max-height: calc(100% - 130px); max-height: calc(100% - 130px);
} }
#closeObjectsListButton{
top: 55px;
right: 10px;
height: 30px;
width: 30px;
}
} }
.object{ .object{
@ -321,7 +371,7 @@ .object:hover h2{
background-color: #777777; background-color: #777777;
} }
.object *{ .object > *{
display: block; display: block;
} }

995
web/_js/atlas.js
View file

File diff suppressed because it is too large Load diff

6
web/_js/main.js
View file

@ -55,6 +55,7 @@ function applyView(){
innerContainer.style.left = ~~(container.clientWidth/2 - innerContainer.clientWidth/2 + zoomOrigin[0] + container.offsetLeft)+"px"; innerContainer.style.left = ~~(container.clientWidth/2 - innerContainer.clientWidth/2 + zoomOrigin[0] + container.offsetLeft)+"px";
innerContainer.style.top = ~~(container.clientHeight/2 - innerContainer.clientHeight/2 + zoomOrigin[1] + container.offsetTop)+"px"; innerContainer.style.top = ~~(container.clientHeight/2 - innerContainer.clientHeight/2 + zoomOrigin[1] + container.offsetTop)+"px";
} }
init(); init();
@ -174,6 +175,7 @@ function init(){
document.getElementById("zoomResetButton").addEventListener("click", function(e){ document.getElementById("zoomResetButton").addEventListener("click", function(e){
zoom = 1; zoom = 1;
zoomOrigin = [0, 0]; zoomOrigin = [0, 0];
updateLines();
applyView(); applyView();
}); });
@ -302,6 +304,7 @@ function init(){
} }
window.addEventListener("mousemove", function(e){ window.addEventListener("mousemove", function(e){
updateLines();
mousemove(e.clientX, e.clientY); mousemove(e.clientX, e.clientY);
e.preventDefault(); e.preventDefault();
}); });
@ -319,12 +322,15 @@ function init(){
scaleZoomOrigin[0] += deltaX/zoom; scaleZoomOrigin[0] += deltaX/zoom;
scaleZoomOrigin[1] += deltaY/zoom; scaleZoomOrigin[1] += deltaY/zoom;
updateLines();
applyView(); applyView();
} }
} }
function touchmove(e){ function touchmove(e){
updateLines();
if(e.touches.length == 1){ if(e.touches.length == 1){
mousemove(e.touches[0].clientX, e.touches[0].clientY); mousemove(e.touches[0].clientX, e.touches[0].clientY);

2
web/_js/minified.js
View file

File diff suppressed because one or more lines are too long

24
web/_js/view.js
View file

@ -37,6 +37,8 @@ function updateLines(){
for(var i = 0; i < hovered.length; i++){ for(var i = 0; i < hovered.length; i++){
var element = hovered[i].element; var element = hovered[i].element;
if(element.getBoundingClientRect().left != 0){
linesContext.beginPath(); linesContext.beginPath();
//linesContext.moveTo(element.offsetLeft + element.clientWidth - 10, element.offsetTop + 20); //linesContext.moveTo(element.offsetLeft + element.clientWidth - 10, element.offsetTop + 20);
linesContext.moveTo( linesContext.moveTo(
@ -48,6 +50,8 @@ function updateLines(){
,~~(hovered[i].center[1]*zoom) + innerContainer.offsetTop ,~~(hovered[i].center[1]*zoom) + innerContainer.offsetTop
); );
linesContext.stroke(); linesContext.stroke();
}
} }
linesContext.lineWidth = Math.max(Math.min(zoom, 16), 4); linesContext.lineWidth = Math.max(Math.min(zoom, 16), 4);
@ -56,6 +60,8 @@ function updateLines(){
for(var i = 0; i < hovered.length; i++){ for(var i = 0; i < hovered.length; i++){
var element = hovered[i].element; var element = hovered[i].element;
if(element.getBoundingClientRect().left != 0){
linesContext.beginPath(); linesContext.beginPath();
linesContext.moveTo( linesContext.moveTo(
element.getBoundingClientRect().left + document.documentElement.scrollLeft + element.clientWidth/2 element.getBoundingClientRect().left + document.documentElement.scrollLeft + element.clientWidth/2
@ -68,12 +74,14 @@ function updateLines(){
linesContext.stroke(); linesContext.stroke();
} }
} }
}
function initView(){ function initView(){
var wrapper = document.getElementById("wrapper"); var wrapper = document.getElementById("wrapper");
var objectsContainer = document.getElementById("objectsList"); var objectsContainer = document.getElementById("objectsList");
var closeObjectsListButton = document.getElementById("closeObjectsListButton");
var backgroundCanvas = document.createElement("canvas"); var backgroundCanvas = document.createElement("canvas");
backgroundCanvas.width = 1000; backgroundCanvas.width = 1000;
@ -173,6 +181,15 @@ function initView(){
return false; return false;
}); });
closeObjectsListButton.addEventListener("click", function(e){
hovered = [];
objectsContainer.innerHTML = "";
updateLines();
closeObjectsListButton.className = "hidden";
fixed = false;
render();
});
function createInfoBlock(entry){ function createInfoBlock(entry){
var element = document.createElement("div"); var element = document.createElement("div");
element.className = "object"; element.className = "object";
@ -241,6 +258,7 @@ function initView(){
hovered = [entry]; hovered = [entry];
render(); render();
hovered[0].element = infoElement; hovered[0].element = infoElement;
closeObjectsListButton.className = "";
updateLines(); updateLines();
fixed = true; fixed = true;
} }
@ -287,6 +305,12 @@ function initView(){
hovered[i].element = element; hovered[i].element = element;
} }
if(hovered.length > 0){
closeObjectsListButton.className = "";
} else {
closeObjectsListButton.className = "hidden";
}
render(); render();
} }

5
web/about.html
View file

@ -68,7 +68,7 @@ <h2>How to contribute</h2>
<p>Please read <a href="https://reddit.com/r/placeAtlas/comments/63afic/how_to_contribute/" target="_blank">this post on reddit</a> to learn how to submit a new entry.</p> <p>Please read <a href="https://reddit.com/r/placeAtlas/comments/63afic/how_to_contribute/" target="_blank">this post on reddit</a> to learn how to submit a new entry.</p>
<p>The <a href="https://reddit.com/r/placeAtlas/" target="_blank">/r/placeAtlas</a> subreddit is also the place to submit all bug reports, feature requests or questions.</p> <p>The <a href="https://reddit.com/r/placeAtlas/" target="_blank">/r/placeAtlas</a> subreddit is also the place to submit all bug reports, feature requests or questions.</p>
<h2>Contributors</h2> <h2>Contributors</h2>
<p>The Atlas would not have been possible without the help of the following 704 reddit users.</p> <p>The Atlas would not have been possible without the help of the following 707 reddit users.</p>
<p>Thank you to everyone who contributed.</p> <p>Thank you to everyone who contributed.</p>
<div id="contributors"> <div id="contributors">
<a href="https://reddit.com/user/-Chowder-" target="_blank">-Chowder-</a> <a href="https://reddit.com/user/-Chowder-" target="_blank">-Chowder-</a>
@ -145,6 +145,7 @@ <h2>Contributors</h2>
<a href="https://reddit.com/user/BiBoetzke" target="_blank">BiBoetzke</a> <a href="https://reddit.com/user/BiBoetzke" target="_blank">BiBoetzke</a>
<a href="https://reddit.com/user/Bigfoot_727" target="_blank">Bigfoot_727</a> <a href="https://reddit.com/user/Bigfoot_727" target="_blank">Bigfoot_727</a>
<a href="https://reddit.com/user/biggiemac42" target="_blank">biggiemac42</a> <a href="https://reddit.com/user/biggiemac42" target="_blank">biggiemac42</a>
<a href="https://reddit.com/user/Bigmatti" target="_blank">Bigmatti</a>
<a href="https://reddit.com/user/bilwis" target="_blank">bilwis</a> <a href="https://reddit.com/user/bilwis" target="_blank">bilwis</a>
<a href="https://reddit.com/user/Birdenchops" target="_blank">Birdenchops</a> <a href="https://reddit.com/user/Birdenchops" target="_blank">Birdenchops</a>
<a href="https://reddit.com/user/BlackSynder" target="_blank">BlackSynder</a> <a href="https://reddit.com/user/BlackSynder" target="_blank">BlackSynder</a>
@ -413,6 +414,7 @@ <h2>Contributors</h2>
<a href="https://reddit.com/user/Kulpas" target="_blank">Kulpas</a> <a href="https://reddit.com/user/Kulpas" target="_blank">Kulpas</a>
<a href="https://reddit.com/user/kumochisonan" target="_blank">kumochisonan</a> <a href="https://reddit.com/user/kumochisonan" target="_blank">kumochisonan</a>
<a href="https://reddit.com/user/Kunfuxu" target="_blank">Kunfuxu</a> <a href="https://reddit.com/user/Kunfuxu" target="_blank">Kunfuxu</a>
<a href="https://reddit.com/user/kyclef" target="_blank">kyclef</a>
<a href="https://reddit.com/user/LacsiraxAriscal" target="_blank">LacsiraxAriscal</a> <a href="https://reddit.com/user/LacsiraxAriscal" target="_blank">LacsiraxAriscal</a>
<a href="https://reddit.com/user/ladala99" target="_blank">ladala99</a> <a href="https://reddit.com/user/ladala99" target="_blank">ladala99</a>
<a href="https://reddit.com/user/laikamonkey" target="_blank">laikamonkey</a> <a href="https://reddit.com/user/laikamonkey" target="_blank">laikamonkey</a>
@ -646,6 +648,7 @@ <h2>Contributors</h2>
<a href="https://reddit.com/user/Subvs" target="_blank">Subvs</a> <a href="https://reddit.com/user/Subvs" target="_blank">Subvs</a>
<a href="https://reddit.com/user/suihcta" target="_blank">suihcta</a> <a href="https://reddit.com/user/suihcta" target="_blank">suihcta</a>
<a href="https://reddit.com/user/sunnyotakuu" target="_blank">sunnyotakuu</a> <a href="https://reddit.com/user/sunnyotakuu" target="_blank">sunnyotakuu</a>
<a href="https://reddit.com/user/SuperFreakonomics" target="_blank">SuperFreakonomics</a>
<a href="https://reddit.com/user/SuperKickClyde" target="_blank">SuperKickClyde</a> <a href="https://reddit.com/user/SuperKickClyde" target="_blank">SuperKickClyde</a>
<a href="https://reddit.com/user/Susto" target="_blank">Susto</a> <a href="https://reddit.com/user/Susto" target="_blank">Susto</a>
<a href="https://reddit.com/user/SwagettiYolognesse" target="_blank">SwagettiYolognesse</a> <a href="https://reddit.com/user/SwagettiYolognesse" target="_blank">SwagettiYolognesse</a>

13
web/index.html
View file

@ -26,7 +26,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link href="./_css/style.css?version=1.0.15" rel="stylesheet" type="text/css" media="all"> <link href="./_css/style.css?version=1.0.18" rel="stylesheet" type="text/css" media="all">
<title> <title>
The /r/place Atlas The /r/place Atlas
</title> </title>
@ -140,6 +140,7 @@ <h1>The /r/place Atlas</h1>
</div> </div>
</div> </div>
<button class="hidden" id="closeObjectsListButton"></button>
<div id="objectsList"> <div id="objectsList">
<!--div class="object"> <!--div class="object">
<h2>Tux</h2> <h2>Tux</h2>
@ -165,17 +166,21 @@ <h2>Tux</h2>
</div> </div>
<!--
<script type="text/javascript" src="./_js/pointInPolygon.js?version=1.0"></script> <script type="text/javascript" src="./_js/pointInPolygon.js?version=1.0"></script>
<script type="text/javascript" src="./_js/atlas.js?version=1.0.49"></script> <script type="text/javascript" src="./_js/atlas.js?version=1.0.49"></script>
<script type="text/javascript" src="./_js/view.js?version=1.0.4"></script> <script type="text/javascript" src="./_js/view.js?version=1.0.4"></script>
<script type="text/javascript" src="./_js/overlap.js?version=1.0.4"></script> <script type="text/javascript" src="./_js/overlap.js?version=1.0.4"></script>
<script type="text/javascript" src="./_js/draw.js?version=1.0.3"></script> <script type="text/javascript" src="./_js/draw.js?version=1.0.3"></script>
<script type="text/javascript" src="./_js/main.js?version=1.0.3"></script> <script type="text/javascript" src="./_js/main.js?version=1.0.3"></script>
<!--
<script type="text/javascript" src="./_js/minified.js?version=1.0.8"></script>
--> -->
<script type="text/javascript" src="./_js/minified.js?version=1.0.60"></script>
</body> </body>
</html> </html>