| ... |
... |
@@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.util.tripMap; |
|
23
|
23
|
*/
|
|
24
|
24
|
|
|
25
|
25
|
import com.google.common.collect.Lists;
|
|
26
|
|
-import org.apache.logging.log4j.Logger;
|
|
27
|
26
|
import org.apache.logging.log4j.LogManager;
|
|
|
27
|
+import org.apache.logging.log4j.Logger;
|
|
28
|
28
|
import org.geotools.geometry.jts.ReferencedEnvelope;
|
|
29
|
29
|
import org.geotools.renderer.lite.RendererUtilities;
|
|
30
|
30
|
import org.geotools.styling.FeatureTypeStyle;
|
| ... |
... |
@@ -68,6 +68,7 @@ public class ObserveMapPane extends JMapPane { |
|
68
|
68
|
protected String labelScaleUp;
|
|
69
|
69
|
|
|
70
|
70
|
protected double rotation;
|
|
|
71
|
+ private long scaleInMiles;
|
|
71
|
72
|
|
|
72
|
73
|
public ObserveMapPane() {
|
|
73
|
74
|
labelScaleUp = "0 m";
|
| ... |
... |
@@ -84,6 +85,16 @@ public class ObserveMapPane extends JMapPane { |
|
84
|
85
|
}
|
|
85
|
86
|
|
|
86
|
87
|
|
|
|
88
|
+ public long getScaleInMiles() {
|
|
|
89
|
+ return scaleInMiles;
|
|
|
90
|
+ }
|
|
|
91
|
+
|
|
|
92
|
+ public void setScaleInMiles(long scaleInMiles) {
|
|
|
93
|
+ long oldValue = getScaleInMiles();
|
|
|
94
|
+ this.scaleInMiles = scaleInMiles;
|
|
|
95
|
+ firePropertyChange("scaleInMiles", oldValue, scaleInMiles);
|
|
|
96
|
+ }
|
|
|
97
|
+
|
|
87
|
98
|
protected void updateScale() {
|
|
88
|
99
|
ReferencedEnvelope displayArea = getDisplayArea();
|
|
89
|
100
|
double dpi = 2.54 / 100; // pour avoir l'echélle en metre/pixel
|
| ... |
... |
@@ -109,9 +120,9 @@ public class ObserveMapPane extends JMapPane { |
|
109
|
120
|
useFirstDigit = 1;
|
|
110
|
121
|
}
|
|
111
|
122
|
|
|
112
|
|
- long scaleInMiles = useFirstDigit * (long) Math.pow(10, nbDigit);
|
|
|
123
|
+ setScaleInMiles(useFirstDigit * (long) Math.pow(10, nbDigit));
|
|
113
|
124
|
|
|
114
|
|
- scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel);
|
|
|
125
|
+ this.scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel);
|
|
115
|
126
|
|
|
116
|
127
|
labelScaleUp = String.format("%,d " + t("observe.content.map.miles"), scaleInMiles);
|
|
117
|
128
|
|
| ... |
... |
@@ -297,7 +308,6 @@ public class ObserveMapPane extends JMapPane { |
|
297
|
308
|
|
|
298
|
309
|
}
|
|
299
|
310
|
|
|
300
|
|
-
|
|
301
|
311
|
@Override
|
|
302
|
312
|
public void paint(Graphics graphics) {
|
|
303
|
313
|
|