diff --git a/js/lcm_main.js b/js/lcm_main.js index 7758295..ef6fa3c 100644 --- a/js/lcm_main.js +++ b/js/lcm_main.js @@ -600,9 +600,9 @@ function makePopupOfFeature(feature) { * @param layer */ function eachFeature(feature, layer, stats) { - let outPowerGuessed = lcm_utils.guessOutputPowerFromFeature(feature); - const maxPowerFilter = parseInt($('#filter_max_output').val()) || lcm_config.filter_max_output_default_value; + const maxPowerFilter = parseInt($('#filter_max_output').val()) || lcm_config.filter_max_output_default_value; + let outPowerGuessed = lcm_utils.guessOutputPowerFromFeature(feature); // Filtrage par puissance if (outPowerGuessed === 0 || outPowerGuessed === null) { if (display_unknown_max_power_station === 'hide') { @@ -618,12 +618,10 @@ function eachFeature(feature, layer, stats) { // Incrémenter le compteur de stations affichées displayedStationsCount++; - let link_josm = createJOSMEditLink(feature); let popupContent = makePopupOfFeature(feature); layer.bindPopup(popupContent); - let displayOutPowerGuessed = '? kW'; // Vérifier les filtres activés if (lcm_config.filterCCS && !feature.properties.tags['socket:type2_combo']) { @@ -670,6 +668,7 @@ function eachFeature(feature, layer, stats) { } } + let displayOutPowerGuessed = '? kW'; if (outPowerGuessed) { displayOutPowerGuessed = outPowerGuessed + ' kW max'; if (display_unknown_max_power_station === 'show_only') { @@ -689,9 +688,6 @@ function eachFeature(feature, layer, stats) { ajoutez la dans OpenStreetMap!`; } - // 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`; - // contenu de la popup let html = `${displayOutPowerGuessed} @@ -819,30 +815,52 @@ function eachFeature(feature, layer, stats) { bindFullDetails(feature); // Remplir automatiquement #current_station_infos lors du clic + fillDetailsWithFeature(feature); + }, + }); - let content = ''; - let table_details = ''; - let count_features_in_table = 0; - table_details += '
' - // ne montrer que certains champs dans la popup - lcm_config.tags_to_display_in_popup.forEach(function (key) { - if (lcm_config.tags_to_display_in_popup.indexOf(key)) { - let value = feature.properties.tags[key] - if (value) { - if (value.indexOf('http') !== -1) { - value = '' + value + '' - } - table_details += '
' + key + ' :' + value + '' - count_features_in_table++; - } +} + +/** + * Remplit le contenu de #current_station_infos avec les informations de la station + * @param {*} feature + */ +function fillDetailsWithFeature(feature) { + + + // 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 link_josm = createJOSMEditLink(feature); + let outPowerGuessed = lcm_utils.guessOutputPowerFromFeature(feature); + let displayOutPowerGuessed = '? kW'; + if (outPowerGuessed) { + displayOutPowerGuessed = outPowerGuessed + ' kW max'; + } + let content = ''; + let table_details = ''; + let count_features_in_table = 0; + table_details += '
' + // ne montrer que certains champs dans la popup + lcm_config.tags_to_display_in_popup.forEach(function (key) { + if (lcm_config.tags_to_display_in_popup.indexOf(key)) { + let value = feature.properties.tags[key] + if (value) { + if (value.indexOf('http') !== -1) { + value = '' + value + '' } - }) - table_details += '
' - - if (!count_features_in_table) { - table_details += '
Aucune information renseignée
' + table_details += '
' + key + ' :' + value + '' + count_features_in_table++; } - content += ` ${displayOutPowerGuessed} + } + }) + table_details += '
' + + if (!count_features_in_table) { + table_details += '
Aucune information renseignée
' + } + content += ` ${displayOutPowerGuessed} 🚗 🚴‍♀️ @@ -862,10 +880,7 @@ function eachFeature(feature, layer, stats) { ${table_details} ` - $('#current_station_infos').html(`

Détails

${content}
`); - }, - }); - + $('#current_station_infos').html(`

Détails

${content}
`); } function bindFullDetails(feature) {