qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Updated event_osm to v0.3.6 (#123)

Browse source 
* compress *.gpx files only

* fixed compressed *.gpx size bug

* using VectorImage instead of Vector

* updated event_osm to v0.3.6

Co-authored-by: surrim <surrim@happyhydro.org>
This commit is contained in:
surrim 2021-01-16 12:18:41 +01:00 committed by GitHub
parent 3eb50ed7c3
commit 852e266921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
serendipity_event_osm/ChangeLog
View file

@ -1,3 +1,10 @@
0.3.6:
---
* Using VectorImage instead of Vector
* Fixed compressed *.gpx size bug
* Compress *.gpx files only
0.3.5:
---

2
serendipity_event_osm/plugin_version.inc.php
View file

@ -1,4 +1,4 @@
<?php
@define('PLUGIN_EVENT_OSM_VERSION', '0.3.5');
@define('PLUGIN_EVENT_OSM_VERSION', '0.3.6');
@define('PLUGIN_EVENT_OSM_AUTHOR', 'Martin Sewelies');
?>

2
serendipity_event_osm/ressources/osm.js
View file

@ -56,7 +56,7 @@ window.addEventListener("load", () => {
.map(feature => ol.sphere.getLength(feature.getGeometry()))
.reduce((a, b) => a + b, 0);
});
const layer = new ol.layer.Vector({
const layer = new ol.layer.VectorImage({
source: source,
style: feature => feature.getGeometry().getType() === "MultiLineString"
? new ol.style.Style({

45
serendipity_event_osm/serendipity_event_static_osm.php
View file

@ -43,27 +43,36 @@
echo ' <link rel="stylesheet" href="'.$this->getFile('ressources/osm.css', 'serendipityHTTPPath').'" type="text/css" />'.PHP_EOL;
echo ' <script src="'.$this->getFile('ressources/ol.js', 'serendipityHTTPPath').'"></script>'.PHP_EOL;
echo ' <script src="'.$this->getFile('ressources/osm.js', 'serendipityHTTPPath').'"></script>'.PHP_EOL;
} else if ($event === 'backend_image_add' && $this->get_config('compress_gpx', true) === true) {
$fileName = $eventData;
$file = fopen($fileName.'.temp', 'wb');
fwrite($file, '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><gpx version="1.1" creator="surrim.org" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">');
$gpx = simplexml_load_file($fileName);
foreach ($gpx->trk as $trk) {
fwrite($file, '<trk>');
foreach($trk->trkseg as $seg) {
fwrite($file, '<trkseg>');
foreach($seg->trkpt as $pt) {
fwrite($file, '<trkpt lat="'.$pt['lat'].'" lon="'.$pt['lon'].'"><ele>'.$pt->ele.'</ele></trkpt>');
} else if ($event === 'backend_image_add') {
if (preg_match('/\\.gpx$/i', mb_strtolower($eventData)) && $this->get_config('compress_gpx', true) === true) {
$fileName = $eventData;
$tmpFile = tmpfile();
fwrite($tmpFile, '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><gpx version="1.1" creator="surrim.org" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">');
$gpx = simplexml_load_file($fileName);
foreach ($gpx->trk as $trk) {
fwrite($tmpFile, '<trk>');
foreach($trk->trkseg as $seg) {
fwrite($tmpFile, '<trkseg>');
foreach($seg->trkpt as $pt) {
fwrite($tmpFile, '<trkpt lat="'.$pt['lat'].'" lon="'.$pt['lon'].'"><ele>'.$pt->ele.'</ele></trkpt>');
}
fwrite($tmpFile, '</trkseg>');
}
fwrite($file, '</trkseg>');
fwrite($tmpFile, '</trk>');
}
fwrite($file, '</trk>');
fwrite($tmpFile, '</gpx>');
$fileSize = ftell($tmpFile);
unset($gpx);
rewind($tmpFile);
$file = fopen($fileName, 'w');
stream_copy_to_stream($tmpFile, $file, $fileSize);
fclose($file);
fclose($tmpFile);
$fileId = $addData['image_id'];
serendipity_updateImageInDatabase(array('size' => $fileSize), $fileId);
}
unset($gpx);
fwrite($file, '</gpx>');
fclose($file);
rename($fileName.'.temp', $fileName);
// TODO: serendipity_updateImageInDatabase(array('size' => @filesize($fileName)), $id);
}
}