From e129c8174582fd13180ae2f392636efd141ae065 Mon Sep 17 00:00:00 2001 From: Arne Hamann Date: Sat, 18 Jan 2020 15:43:02 +0100 Subject: [PATCH 1/2] fixed an Typo which was spamming a log Signed-off-by: Arne Hamann --- lib/Service/GeophotoService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Service/GeophotoService.php b/lib/Service/GeophotoService.php index 00f7631cb..a677b03d2 100644 --- a/lib/Service/GeophotoService.php +++ b/lib/Service/GeophotoService.php @@ -95,7 +95,7 @@ public function getAllFromDB($userId) { $file_object->type = $file->getType(); $file_object->mime = $file->getMimetype(); $file_object->lastmod = $file->getMTime(); - $file_object->size = $file->getSize; + $file_object->size = $file->getSize(); $file_object->path = $path; $file_object->hasPreview = in_array($cacheEntry->getMimeType(), $previewEnableMimetypes); $filesById[] = $file_object; From 147fc874f20399344361db3009749715e68ed521 Mon Sep 17 00:00:00 2001 From: Arne Hamann Date: Sat, 18 Jan 2020 16:56:59 +0100 Subject: [PATCH 2/2] Fixed issue 239 Signed-off-by: Arne Hamann --- js/script.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/js/script.js b/js/script.js index 060518a73..8c8f4521d 100644 --- a/js/script.js +++ b/js/script.js @@ -195,7 +195,20 @@ $('#display-slider').prop('checked', true); } - if (optionsValues.hasOwnProperty('mapboxAPIKEY') && optionsValues.mapboxAPIKEY !== '') { + //detect Webgl + var canvas = document.createElement('canvas'); + var experimental = false; + var gl; + + try { gl = canvas.getContext("webgl"); } + catch (x) { gl = null; } + + if (gl == null) { + try { gl = canvas.getContext("experimental-webgl"); experimental = true; } + catch (x) { gl = null; } + } + + if (optionsValues.hasOwnProperty('mapboxAPIKEY') && optionsValues.mapboxAPIKEY !== '' && gl == null) { // change "button" layers delete mapController.baseLayers['OpenStreetMap']; delete mapController.baseLayers['ESRI Aerial'];