diff --git a/index.html b/index.html
index 9e2b32e..e159f8b 100644
--- a/index.html
+++ b/index.html
@@ -71,25 +71,7 @@
-
-
- filtres:
- prise: type 2, type CCS
- cable: attaché, à fournir
- puissance:
- min
-
-
-
-
-
-
-
-
-
+
?
@@ -113,19 +95,33 @@
> 300 kW
+
+
+
+
+ filtres:
+ prise: type 2, type CCS
+ cable: attaché, à fournir
+ puissance:
+ min
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Puissances des stations:
-
-
-
-
-
-
-
-
-
-
+
diff --git a/js/main.js b/js/main.js
index c3b064e..4c20d79 100644
--- a/js/main.js
+++ b/js/main.js
@@ -89,7 +89,7 @@ function createJOSMEditLink(feature) {
var right = coordinates[0] + margin_josm_bbox;
var bottom = 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;
}
@@ -298,7 +298,7 @@ function bindEventsOnJosmRemote () {
})
})
}
-
+const ratio_circle = 0.9
function displayPointsFromApi (points) {
geojsondata = osmtogeojson(points)
@@ -362,17 +362,17 @@ function displayPointsFromApi (points) {
let radius = 20
if (outPowerGuessed > 300) {
- radius = 200
+ radius = 70 * ratio_circle
} else if (outPowerGuessed > 200) {
- radius = 250
+ radius = 60 * ratio_circle
} else if (outPowerGuessed > 100) {
- radius = 150
+ radius = 50 * ratio_circle
} else if (outPowerGuessed > 50) {
- radius = 100
+ radius = 40 * ratio_circle
} else if (outPowerGuessed > 20) {
- radius = 50
+ radius = 30 * ratio_circle
} else if (outPowerGuessed > 7) {
- radius = 20
+ radius = 20 * ratio_circle
}
let circle = L.circle(layer._latlng, {
@@ -490,7 +490,7 @@ function onMapMoveEnd () {
}else{
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);
diff --git a/styles/style.css b/styles/style.css
index d93e3c1..6aaed74 100644
--- a/styles/style.css
+++ b/styles/style.css
@@ -133,7 +133,7 @@ a {
#spinning_icon {
position: fixed;
- top: 11rem;
+ bottom: 11rem;
left: 20.5rem;
z-index: 10;
background: white;