up remote link

This commit is contained in:
Tykayn 2024-12-12 09:50:54 +01:00 committed by tykayn
parent a073e0887d
commit ff00ee6e2c
3 changed files with 35 additions and 39 deletions

View File

@ -71,25 +71,7 @@
<!--test télécommande josm--> <!--test télécommande josm-->
<!-- </a>--> <!-- </a>-->
<div id="round_power_legend">
<div id="infos_carte"></div>
<div id="filter">
filtres: <br>
prise: type 2, type CCS<br>
cable: attaché, à fournir<br>
puissance:
min
<!-- <button class="button" id="toggleMinPower_50">-->
<!-- keep cool, montre les stations entre 3 et 50kW max-->
<!-- </button>-->
<!-- ,-->
<!-- <button class="button" id="toggleMinPower_100">-->
<!-- 100kW-->
<!-- </button>-->
<!-- ,-->
<button class="button" id="toggle_high_power">
fais voir les plus de 100kW, j'ai pas le time!
</button>
<br> <br>
<span class="marker-demo"> <span class="marker-demo">
<span class="map-marker-circle-demo color-unknown"></span> ? <span class="map-marker-circle-demo color-unknown"></span> ?
@ -113,19 +95,33 @@
<span class="map-marker-circle-demo color-6"></span> > 300 kW <span class="map-marker-circle-demo color-6"></span> > 300 kW
</span> </span>
</div> </div>
<div id="bars_power">
</div>
<div id="infos_carte"></div>
<div id="filter">
filtres: <br>
prise: type 2, type CCS<br>
cable: attaché, à fournir<br>
puissance:
min
<!-- <button class="button" id="toggleMinPower_50">-->
<!-- keep cool, montre les stations entre 3 et 50kW max-->
<!-- </button>-->
<!-- ,-->
<!-- <button class="button" id="toggleMinPower_100">-->
<!-- 100kW-->
<!-- </button>-->
<!-- ,-->
<!-- TODO filtrer les bornes selon la puissance -->
<!-- <button class="button" id="toggle_high_power">-->
<!-- fais voir les plus de 100kW, j'ai pas le time!-->
<!-- </button>-->
</div>
<h2> <h2>
Puissances des stations: Puissances des stations:
</h2> </h2>
<div id="bars_power">
<!-- <div class="bars-proportion">-->
<!-- <div class="bar color-unknown" style="width: 50%">10</div>-->
<!-- <div class="bar color-power-lesser-than-50" style="width: 10%">3</div>-->
<!-- <div class="bar color-power-lesser-than-100" style="width: 30%"></div>-->
<!-- <div class="bar color-power-lesser-than-200" style="width: 40%"></div>-->
<!-- <div class="bar color-power-lesser-than-300" style="width: 20%"></div>-->
<!-- <div class="bar color-power-lesser-than-max" style="width: 10%"></div>-->
<!-- </div>-->
</div>
<div id="found_charging_stations"> <div id="found_charging_stations">
</div> </div>

View File

@ -89,7 +89,7 @@ function createJOSMEditLink(feature) {
var right = coordinates[0] + margin_josm_bbox; var right = coordinates[0] + margin_josm_bbox;
var bottom = coordinates[1] - margin_josm_bbox; var bottom = coordinates[1] - margin_josm_bbox;
var top = coordinates[1] + margin_josm_bbox; var top = coordinates[1] + margin_josm_bbox;
var josmUrl = `http://127.0.0.1:8111/load_and_zoom?left=${left}&top=${top}&right=${right}&bottom=${bottom}&select=${nodeId}`; var josmUrl = `http://127.0.0.1:8111/load_and_zoom?changeset_hashtags=IRVE&layer_name=irve-depuis-OSM&left=${left}&top=${top}&right=${right}&bottom=${bottom}&select=${nodeId}`;
return josmUrl; return josmUrl;
} }
@ -298,7 +298,7 @@ function bindEventsOnJosmRemote () {
}) })
}) })
} }
const ratio_circle = 0.9
function displayPointsFromApi (points) { function displayPointsFromApi (points) {
geojsondata = osmtogeojson(points) geojsondata = osmtogeojson(points)
@ -362,17 +362,17 @@ function displayPointsFromApi (points) {
let radius = 20 let radius = 20
if (outPowerGuessed > 300) { if (outPowerGuessed > 300) {
radius = 200 radius = 70 * ratio_circle
} else if (outPowerGuessed > 200) { } else if (outPowerGuessed > 200) {
radius = 250 radius = 60 * ratio_circle
} else if (outPowerGuessed > 100) { } else if (outPowerGuessed > 100) {
radius = 150 radius = 50 * ratio_circle
} else if (outPowerGuessed > 50) { } else if (outPowerGuessed > 50) {
radius = 100 radius = 40 * ratio_circle
} else if (outPowerGuessed > 20) { } else if (outPowerGuessed > 20) {
radius = 50 radius = 30 * ratio_circle
} else if (outPowerGuessed > 7) { } else if (outPowerGuessed > 7) {
radius = 20 radius = 20 * ratio_circle
} }
let circle = L.circle(layer._latlng, { let circle = L.circle(layer._latlng, {
@ -490,7 +490,7 @@ function onMapMoveEnd () {
}else{ }else{
infos += "(zoomez au niveau 11 ou plus pour charger les stations en vous déplaçant)" infos += "(zoomez au niveau 11 ou plus pour charger les stations en vous déplaçant)"
} }
$("#infos_carte").html(); $("#infos_carte").html(infos);
} }
map.on('moveend', onMapMoveEnd); map.on('moveend', onMapMoveEnd);

View File

@ -133,7 +133,7 @@ a {
#spinning_icon { #spinning_icon {
position: fixed; position: fixed;
top: 11rem; bottom: 11rem;
left: 20.5rem; left: 20.5rem;
z-index: 10; z-index: 10;
background: white; background: white;