refacto naming exports js librechargemap with lcm_ prefix

js/lcm_color_utils.js

@@ -1,4 +1,4 @@
-import utils from './utils.js'
+import lcm_utils from './lcm_utils.js'
 
 let unknown_color = '#c0b1b1' // color for unknown power output of the station
 const colors = [
@@ -14,14 +14,14 @@ const error_color = '#ff1414'
 // 2024-12-16: au delà d'une valeur de 400kW on peut dire qu'il existe une erreur de saisie, nous n'avons pas de chargeur de 1800kW en production.
 const max_out_legit_power = 400
 
-const colorUtils = {
+const lcm_color_utils = {
 	colors,
 	/**
 	 * trouver une couleur correspondant
 	 */
 	getColor: (feature) => {
 
-		let outputPower = utils.guessOutputPowerFromFeature(feature)
+		let outputPower = lcm_utils.guessOutputPowerFromFeature(feature)
 		feature.properties.tags.has_output_of_irve_specified = outputPower
 		if (outputPower) {
 
@@ -50,4 +50,4 @@ const colorUtils = {
 	},
 }
 
-export default colorUtils
+export default lcm_color_utils

js/lcm_config.js

@@ -1,4 +1,4 @@
-const config = {
+const lcm_config = {
 	osmMention:'&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 	showHighPower : true,
 	overrideQuery : true,
@@ -41,4 +41,4 @@ const config = {
 	]
 } 
 
-export default config
+export default lcm_config

js/lcm_main.js

@@ -4,12 +4,10 @@
  * lister les bornes trouvées dans la page
  * @type {boolean}
  */
-import config from './config.js'
-import utils from './utils.js'
-import colorUtils from './color-utils.js'
-import { sendToJOSM, createJOSMEditLink } from './editor.js'
-import {isContentEditable} from "@testing-library/user-event/dist/utils";
-
+import lcm_config from './lcm_config.js'
+import lcm_utils from './lcm_utils.js'
+import lcm_color_utils from './lcm_color_utils.js'
+import { sendToJOSM, createJOSMEditLink } from './lcm_editor.js'
 let geojsondata;
 let lastLatLng;
 
@@ -34,6 +32,9 @@ L.control.scale().addTo(map)
  */
 let filterStatesAvailable = ['hide', 'show', 'showOnly']
 
+let filters_features = {
+    display_unknown_max_power_station : filterStatesAvailable[1]
+}
 let display_type2_sockets = 'show';
 let display_type2_combo_sockets = 'show';
 let display_unknown_max_power_station = 'show';
@@ -47,8 +48,8 @@ let display_chelou = 'show'; // les stations avec une valeur suspecte, plus de 4
 
 
 function setRandomView() {
-    let randomCity = utils.cities[Math.floor(Math.random() * utils.cities.length)];
-    map = map.setView(randomCity.coords, config.initialZoom);
+    let randomCity = lcm_utils.cities[Math.floor(Math.random() * lcm_utils.cities.length)];
+    map = map.setView(randomCity.coords, lcm_config.initialZoom);
 }
 
 function setCoordinatesOfLeafletMapFromQueryParameters() {
@@ -80,25 +81,25 @@ function updateURLWithMapCoordinatesAndZoom() {
 let all_stations_markers = L.layerGroup().addTo(map) // layer group pour tous les marqueurs
 // let stations_much_speed_wow = L.layerGroup().addTo(map) // layer group des stations rapides
 
-var osm = L.tileLayer(config.tileServers.osm, {
-    attribution: config.osmMention + '&copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors'
+var osm = L.tileLayer(lcm_config.tileServers.osm, {
+    attribution: lcm_config.osmMention + '&copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors'
 })
 
-var cycle = L.tileLayer(config.tileServers.cycle, {
-    attribution: config.osmMention + '&copy; <a href="https://www.opencyclemap.org/">OpenCycleMap</a> contributors'
+var cycle = L.tileLayer(lcm_config.tileServers.cycle, {
+    attribution: lcm_config.osmMention + '&copy; <a href="https://www.opencyclemap.org/">OpenCycleMap</a> contributors'
 })
 
-var transport = L.tileLayer(config.tileServers.transport, {
-    attribution: config.osmMention
+var transport = L.tileLayer(lcm_config.tileServers.transport, {
+    attribution: lcm_config.osmMention
 })
 
 let tileGrey =
-    L.tileLayer(config.tileServers.cartodb, {
-        attribution: config.osmMention
+    L.tileLayer(lcm_config.tileServers.cartodb, {
+        attribution: lcm_config.osmMention
     })
 let stamen =
-    L.tileLayer(config.tileServers.stamen, {
-        attribution: config.osmMention
+    L.tileLayer(lcm_config.tileServers.stamen, {
+        attribution: lcm_config.osmMention
     })
 var baseLayers = {
     'Grey': tileGrey,
@@ -126,7 +127,7 @@ function buildOverpassApiUrl(map, overpassQuery) {
     let bounds = south + ',' + west + ',' + north + ',' + east;
     let resultUrl, query = '';
 
-    if (config.overrideQuery) {
+    if (lcm_config.overrideQuery) {
         query = `?data=[out:json][timeout:15];(
    nwr[amenity=charging_station](${bounds});
    );out body geom;`;
@@ -191,7 +192,7 @@ function displayStatsFromGeoJson(resultAsGeojson) {
                 found_type2 = true;
             }
         });
-        let outputPower = utils.guessOutputPowerFromFeature(feature);
+        let outputPower = lcm_utils.guessOutputPowerFromFeature(feature);
         if (found_type2_combo) {
             count_found_type2combo++;
         }
@@ -201,6 +202,12 @@ function displayStatsFromGeoJson(resultAsGeojson) {
         if (outputPower == 0) {
             count_output_unknown++;
         }
+        // filtres
+        // filtrer les valeurs inconnues
+
+        if(filters_features.display_unknown_max_power_station === 'hide'){
+            return;
+        }
         if (outputPower >= 200 && !found_type2_combo) {
             count_estimated_type2combo++;
         }
@@ -342,8 +349,8 @@ function makePopupOfFeature(feature) {
     popupContent += '</div>'
     popupContent += '<div class="key-values" >'
     // ne montrer que certains champs dans la popup
-    config.tags_to_display_in_popup.forEach(function (key) {
-        if (config.tags_to_display_in_popup.indexOf(key)) {
+    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) {
@@ -363,8 +370,8 @@ function eachFeature(feature, layer) {
     let popupContent = makePopupOfFeature(feature);
     layer.bindPopup(popupContent);
 
-    let outPowerGuessed = utils.guessOutputPowerFromFeature(feature);
-    let color = colorUtils.getColor(feature);
+    let outPowerGuessed = lcm_utils.guessOutputPowerFromFeature(feature);
+    let color = lcm_color_utils.getColor(feature);
     let displayOutPowerGuessed = '? kW';
     if (outPowerGuessed) {
         displayOutPowerGuessed = outPowerGuessed + ' kW max';
@@ -403,9 +410,13 @@ function eachFeature(feature, layer) {
     if (!outPowerGuessed) {
         radius = radius * ratio_circle;
     } else {
-        if(outPowerGuessed> config.max_possible_station_output ){
+        /**
+         * limiter la taille du cercle pour les valeurs aberrantes
+         * les mettre en valeur en les plafonnant à 1 de plus que le maximum attendu en lcm_config
+         */
+        if(outPowerGuessed> lcm_config.max_possible_station_output ){
             console.error("valeur suspecte outPowerGuessed",outPowerGuessed, feature)
-            outPowerGuessed =  config.max_possible_station_output +1
+            outPowerGuessed =  lcm_config.max_possible_station_output +1
         }
 
         radius = outPowerGuessed * ratio_circle;

js/lcm_utils.js

@@ -1,4 +1,4 @@
-const utils = {
+const lcm_utils = {
     /**
      * fouiller dans les tags les valeurs explicites de puissance déclarée.
      * Deviner aussi les puissances non déclarées:
@@ -87,4 +87,4 @@ const utils = {
         {name: 'Reims', coords: [49.2500, 4.0333]}
     ]
 }
-export default utils
+export default lcm_utils