Compare commits

..
Author SHA1 Message Date
bence 22f4abd82d MAPG-80 mark guessable area on static maps
default-pipeline default-pipeline #198
2021-01-01 22:41:17 +01:00
bence bf27f15709 Merge pull request 'MAPG-2020 run PHPStan with 1G memory limit' (#4) from bugfix/MAPG-2020-phpstan-needs-bigger-memory-limit into develop
default-pipeline default-pipeline #12
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/4
2021-01-01 22:36:56 +01:00
bence db3094eb62 MAPG-2020 run PHPStan with 1G memory limit
default-pipeline default-pipeline #11
2021-01-01 22:34:32 +01:00
bence 77c71ab2da Merge pull request 'MAPG-201 update Git link to gitea.e5tv.hu' (#2) from feature/MAPG-201-migrate-to-own-git-server into develop
Check 2 Check 2 was successful
Check 3 Check 3 was not successful
Check 4 Check 4 was successful
Check 5 Check 5 was successful
Check Check was successful
Pipeline Pipeline #1
test_pipeline test_pipeline #3
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/2
2020-12-27 22:12:33 +00:00
bence 8327cd975a MAPG-201 update Git link to gitea.e5tv.hu 2020-12-27 23:08:30 +01:00
3 changed files with 8 additions and 5 deletions

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ This is the MapGuesser Application project. This is a game about guessing where
The first step is obviously cloning the repository to your machine: The first step is obviously cloning the repository to your machine:
``` ```
git clone https://bitbucket.org/esoko/mapguesser.git git clone https://gitea.e5tv.hu/esoko/mapguesser.git
``` ```
All the commands listed here should be executed from the repository root. All the commands listed here should be executed from the repository root.
+1 -1
View File
@@ -23,4 +23,4 @@ pipelines:
- apt-get update && apt-get install -y unzip - apt-get update && apt-get install -y unzip
- curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
- composer install - composer install
- vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json - php -d memory_limit=1G vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json
+6 -3
View File
@@ -8,9 +8,12 @@
var imgContainer = imgContainers[i]; var imgContainer = imgContainers[i];
var imgSrc = 'https://maps.googleapis.com/maps/api/staticmap?size=350x175&' + var imgSrc = 'https://maps.googleapis.com/maps/api/staticmap?size=350x175&' +
'scale=' + (window.devicePixelRatio >= 2 ? 2 : 1) + '&' + 'scale=' + (window.devicePixelRatio >= 2 ? 2 : 1) + '&path=color:0x0000ff40|weight:3|fillcolor:0x0000ff20|' +
'visible=' + imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundWestLng + '|' + imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundWestLng + '|' +
imgContainer.dataset.boundNorthLat + ',' + imgContainer.dataset.boundEastLng + imgContainer.dataset.boundNorthLat + ',' + imgContainer.dataset.boundWestLng + '|' +
imgContainer.dataset.boundNorthLat + ',' + imgContainer.dataset.boundEastLng + '|' +
imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundEastLng + '|' +
imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundWestLng +
'&key=' + GOOGLE_MAPS_JS_API_KEY; '&key=' + GOOGLE_MAPS_JS_API_KEY;
imgContainer.style.backgroundImage = 'url("' + imgSrc + '")'; imgContainer.style.backgroundImage = 'url("' + imgSrc + '")';