esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in develop (pull request #22)

Browse Source 
Develop
This commit is contained in:
Bence Pőcze 2020-05-21 12:09:37 +00:00
commit f6582900c2
2 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/static/css/mapguesser.css
View File

@ -114,6 +114,8 @@ div.buttonContainer.bottom {
#resultMap {
height: 70%;
width: 100%;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
}
#resultInfo {

86
public/static/js/mapguesser.js
View File

@ -9,6 +9,7 @@
guessMarker: null,
resultMap: null,
resultMarkers: { guess: null, real: null },
resultLine: null,
googleLink: null,
getNewPosition: function () {
@ -43,14 +44,15 @@
}
Core.panorama.setVisible(true);
Core.panorama.setPov({ heading: 0, pitch: 0, zoom: 0 });
Core.panorama.setPov({ heading: 0, pitch: 0 });
Core.panorama.setZoom(0);
Core.panorama.setPano(data.location.pano);
},
calculateScore: function (distance) {
var goodness = 1.0 - distance / Math.sqrt(mapArea);
return Math.pow(Core.MAX_SCORE, goodness);
return Math.round(Math.pow(Core.MAX_SCORE, goodness));
},
calculateScoreBarProperties: function (score) {
@ -163,7 +165,8 @@
Core.panorama = new google.maps.StreetViewPanorama(document.getElementById('panorama'), {
disableDefaultUI: true,
linksControl: true,
showRoadLabels: false
showRoadLabels: false,
motionTracking: false
});
Core.panorama.addListener('position_changed', function () {
@ -179,6 +182,48 @@
clickableIcons: false,
});
Core.resultMarkers.real = new google.maps.Marker({
map: Core.resultMap,
clickable: true,
draggable: false
});
Core.resultMarkers.real.addListener('click', function () {
window.open('https://www.google.com/maps/search/?api=1&query=' + this.getPosition().lat() + ',' + this.getPosition().lng(), '_blank');
});
Core.resultMarkers.guess = new google.maps.Marker({
map: Core.resultMap,
clickable: false,
draggable: false,
label: {
color: '#ffffff',
fontFamily: 'Roboto',
fontSize: '18px',
fontWeight: '500',
text: '?'
}
});
Core.resultLine = new google.maps.Polyline({
map: Core.resultMap,
geodesic: true,
strokeOpacity: 0,
icons: [{
icon: {
path: 'M 0,-1 0,1',
strokeOpacity: 1,
strokeWeight: 2,
scale: 2
},
offset: '0',
repeat: '10px'
}],
clickable: false,
draggable: false,
editable: false
});
Core.getNewPosition();
document.getElementById('showGuessButton').onclick = function () {
@ -213,36 +258,20 @@
Core.resultMap.fitBounds(resultBounds);
Core.resultMarkers.real = new google.maps.Marker({
map: Core.resultMap,
position: Core.realPosition,
clickable: true,
draggable: false
});
Core.resultMarkers.guess = new google.maps.Marker({
map: Core.resultMap,
position: guessedPosition,
clickable: false,
draggable: false,
label: {
color: '#ffffff',
fontFamily: 'Roboto',
fontSize: '18px',
fontWeight: '500',
text: '?'
}
});
Core.resultMarkers.real.setPosition(Core.realPosition);
Core.resultMarkers.guess.setPosition(guessedPosition);
Core.resultMarkers.real.addListener('click', function () {
window.open('https://www.google.com/maps/search/?api=1&query=' + Core.realPosition.lat + ',' + Core.realPosition.lng, '_blank');
});
Core.resultLine.setPath([
Core.realPosition,
guessedPosition
]);
document.getElementById('distance').innerHTML = Util.printDistanceForHuman(distance);
var score = Core.calculateScore(distance);
var scoreBarProperties = Core.calculateScoreBarProperties(score);
document.getElementById('score').innerHTML = Number.parseFloat(score).toFixed(0);
document.getElementById('score').innerHTML = score;
var scoreBar = document.getElementById('scoreBar');
scoreBar.style.backgroundColor = scoreBarProperties.backgroundColor;
@ -252,11 +281,6 @@
document.getElementById('continueButton').onclick = function () {
document.getElementById('scoreBar').style.width = null;
Core.resultMarkers.real.setMap(null);
Core.resultMarkers.real = null;
Core.resultMarkers.guess.setMap(null);
Core.resultMarkers.guess = null;
if (Core.adaptGuess) {
document.getElementById('guess').classList.remove('adapt');
}