tykayn/libre-charge-map
1
0
Fork 0
mirror of https://forge.chapril.org/tykayn/libre-charge-map synced 2025-06-20 01:34:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add panoramax link, enable filter unknown, count displayed

Browse source
This commit is contained in:
Tykayn 2024-12-31 23:27:19 +01:00 • committed by tykayn
parent c194a858b1
commit 984cac9884
5 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
js/lcm_main.js
View file

@ -109,7 +109,7 @@ var baseLayers = {
'Transport': transport
}
let overlays = {
stations_bof: all_stations_markers
stations: all_stations_markers
}
const layerControl = L.control.layers(baseLayers, overlays, {collapsed: true}).addTo(map)
@ -180,6 +180,8 @@ function displayStatsFromGeoJson(resultAsGeojson) {
let count_found_type2combo = 0;
let count_found_type2 = 0;
$('#count_features_fond').html('⚡'+count+' stations');
resultAsGeojson.features.map(feature => {
let found_type2_combo = false;
let found_type2 = false;
@ -205,9 +207,6 @@ function displayStatsFromGeoJson(resultAsGeojson) {
// filtres
// filtrer les valeurs inconnues
if(filters_features.display_unknown_max_power_station === 'hide'){
return;
}
if (outputPower >= 200 && !found_type2_combo) {
count_estimated_type2combo++;
}
@ -296,8 +295,8 @@ function bindEventsOnJosmRemote() {
}
function displayPointsFromApi(points) {
if (points) {
function displayPointsFromApi(points, convert_to_osm_json) {
if (points && convert_to_osm_json) {
geojsondata = osmtogeojson(points);
}
@ -375,14 +374,35 @@ function eachFeature(feature, layer) {
let displayOutPowerGuessed = '? kW';
if (outPowerGuessed) {
displayOutPowerGuessed = outPowerGuessed + ' kW max';
if(display_unknown_max_power_station === 'show_only'){
return;
}
}
else{
// on cache cette station si on ne veut pas voir les stations à la puissance inconnue
if(display_unknown_max_power_station === 'hide'){
return;
}
}
if (!popupContent) {
popupContent = `<span class="no-data"> Aucune information renseignée,
<a class="edit-button" href="https://www.openstreetmap.org/edit?editor=remote&node=${feature.properties.id}">ajoutez la dans OpenStreetMap!</a></span>`;
}
let html = ` <a href="https://www.openstreetmap.org/directions?from=&to=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&engine=fossgis_osrm_car#map=14/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}" class="navigation-link by-car" title="itinéraire en voiture vers cette station"> 🚗</a><a href="https://www.openstreetmap.org/directions?from=&to=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&engine=fossgis_osrm_bike#map=14/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}" class="navigation-link by-car" title="itinéraire en vélo vers cette station">🚴‍♀️</a><a href="https://www.openstreetmap.org/directions?from=&to=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&engine=fossgis_osrm_foot#map=14/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}" class="navigation-link by-car" title="itinéraire à pied vers cette station">👠</a>
<a class="edit-button" href="https://www.openstreetmap.org/edit?editor=id&node=${feature.properties.id}">✏️</a><a class="edit-button josm" data-href="${link_josm}" href="#">JOSM</a> <span class="color-indication" style="background-color: ${color};">${displayOutPowerGuessed}</span><span class="popup-content">${popupContent}</span>`;
// Ajout du lien vers Panoramax
const panoramaxLink = `https://api.panoramax.xyz/#focus=map&map=16.7/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}&speed=250`;
let html = ` <a href="https://www.openstreetmap.org/directions?from=&to=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&engine=fossgis_osrm_car#map=14/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}" class="navigation-link by-car" title="itinéraire en voiture vers cette station"> 🚗</a>
<a href="https://www.openstreetmap.org/directions?from=&to=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&engine=fossgis_osrm_bike#map=14/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}" class="navigation-link by-car" title="itinéraire en vélo vers cette station">🚴‍♀️</a>
<a href="https://www.openstreetmap.org/directions?from=&to=${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}&engine=fossgis_osrm_foot#map=14/${feature.geometry.coordinates[1]}/${feature.geometry.coordinates[0]}" class="navigation-link by-car" title="itinéraire à pied vers cette station">👠</a>
<a class="edit-button" href="https://www.openstreetmap.org/edit?editor=id&node=${feature.properties.id}">✏️</a>
<a class="edit-button josm" data-href="${link_josm}" href="#">JOSM</a>
<a href="${panoramaxLink}" target="_blank" class="panoramax-link" title="Voir sur Panoramax">
<img src="styles/images/panoramax.ico" alt="icone"></a>
<span class="color-indication" style="background-color: ${color};">${displayOutPowerGuessed}</span>
<span class="popup-content">${popupContent}</span>`;
let zoom = map.getZoom();
let radius = 20;
@ -508,7 +528,7 @@ function loadOverpassQuery() {
$.get(overpassApiUrl, function (geoDataPointsFromApi) {
geojsondata = geoDataPointsFromApi;
refreshDisplay();
refreshDisplay(true);
$('#spinning_icon').fadeOut();
$('#message-loading').fadeOut();
isLoading = false;
@ -516,9 +536,9 @@ function loadOverpassQuery() {
}
}
function refreshDisplay() {
function refreshDisplay(convert_points_to_osm=false) {
supprimerMarqueurs();
displayPointsFromApi(geojsondata);
displayPointsFromApi(geojsondata,convert_points_to_osm);
}
@ -728,7 +748,10 @@ function copyCurrentUrl() {
document.body.removeChild(dummy);
}
function searchLocation() {
function searchLocation(event) {
event.preventDefault();
event.stopPropagation();
const location = document.getElementById('searchLocation').value;
if (!location) {
alert('Veuillez entrer un lieu à rechercher.');