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

Only add done gpx tracks to the total sum

Browse source
This commit is contained in:
surrim 2023-01-30 14:59:38 +00:00
parent 1c78b21153
commit c3e5bcad44
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
serendipity_event_osm/ressources/osm.js
View file

@ -16,8 +16,10 @@ window.addEventListener("load", () => {
};
const dataset = divMap.dataset;
const articles = geo.articles.filter(article => ["all", "none"].includes(dataset.category) || article.categories.includes(parseInt(dataset.category)));
const tracks = geo.tracks.filter(track => dataset.path.split("\n").some(y => track.url.startsWith(y)));
const articles = geo.articles
.filter(article => ["all", "none"].includes(dataset.category) || article.categories.includes(parseInt(dataset.category)));
const tracks = geo.tracks
.filter(track => dataset.path.split("\n").some(y => track.url.startsWith(y)));
const features = articles.map((article, id) => {
const feature = new ol.Feature(new ol.geom.Point(ol.proj.fromLonLat(article.location.reverse())));
feature.setId(id);
@ -44,6 +46,7 @@ window.addEventListener("load", () => {
zIndex: Infinity
})
];
const unixTime = Date.now() / 1000;
for (const track of tracks) {
const source = new ol.source.Vector({
url: track.url,
@ -56,7 +59,7 @@ window.addEventListener("load", () => {
.reduce((a, b) => a + b, 0);
});
const color = dateToColor(new Date(track.date * 1000));
const lineDash = track.date * 1000 > Date.now() ? [3, 6] : undefined;
const lineDash = track.date > unixTime ? [3, 6] : undefined;
const layer = new ol.layer.VectorImage({
source: source,
style: feature => feature.getGeometry().getType() === "MultiLineString"
@ -109,9 +112,21 @@ window.addEventListener("load", () => {
a.setAttribute("title",
(object.author !== undefined ? object.author + ", " : "")
+
new Date(object.date * 1000).toLocaleString(undefined, {year: "numeric", month: "long", day: "2-digit", hour: "2-digit", minute: "2-digit"})
new Date(object.date * 1000).toLocaleString(undefined, {
year: "numeric",
month: "long",
day: "2-digit",
hour: "2-digit",
minute: "2-digit"
})
+
(object.distance !== undefined ? ", " + (object.distance / 1000).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) + "km" : "")
(object.distance !== undefined
? ", " + (object.distance / 1000).toLocaleString(undefined, {
minimumFractionDigits: 2,
maximumFractionDigits: 2
}) + "km"
: ""
)
);
return a;
})()
@ -141,11 +156,18 @@ window.addEventListener("load", () => {
ul.setAttribute("data-title", title);
return ul;
};
const ulArticles = foundArticles.map(x => makeItem(articles[x])).reduce((x, y) => {x.appendChild(y); return x;}, initUl("Articles"));
const ulTracks = foundTracks.map(x => makeItem(tracks[x])).reduce((x, y) => {x.appendChild(y); return x;}, initUl("Tracks"));
const ulArticles = foundArticles
.map(x => makeItem(articles[x]))
.reduce((x, y) => {x.appendChild(y); return x;}, initUl("Articles"));
const ulTracks = foundTracks
.map(x => makeItem(tracks[x]))
.reduce((x, y) => {x.appendChild(y); return x;}, initUl("Tracks"));
popup.innerHTML = (foundArticles.length ? ulArticles.outerHTML : "") + (foundTracks.length ? ulTracks.outerHTML : "");
overlay.setPosition(foundArticles.length ? ol.proj.fromLonLat(
[0, 1].map(latLon => foundArticles.map(x => articles[x].location[latLon]).reduce((x, y) => x + y, 0) / foundArticles.length)
[0, 1].map(latLon => foundArticles
.map(x => articles[x].location[latLon])
.reduce((x, y) => x + y, 0) / foundArticles.length
)
) : event.coordinate);
} else {
overlay.setPosition(undefined);
@ -157,9 +179,12 @@ window.addEventListener("load", () => {
divMap.style.cursor = hit ? "pointer" : "";
});
map.on("rendercomplete", event => {
const distance = tracks.map(track => track.distance).reduce((a, b) => a + b, 0);
const distance = tracks
.filter(track => track.date < unixTime)
.map(track => track.distance)
.reduce((a, b) => a + b, 0);
document.querySelectorAll("span.distance-counter[data-category=\"" + dataset.category + "\"]").forEach(span => {
span.innerHTML = (distance / 1000).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 0});
span.innerHTML = (distance / 1000).toFixed(0);
});
});
});