Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
b9d86eb8
by Tony Chemit at 2020-12-18T10:14:17+01:00
3 changed files:
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java
- client/datasource/editor/ps/src/main/resources/map/ps-style.xml
Changes:
| ... | ... | @@ -83,7 +83,7 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil |
| 83 | 83 |
protected static final String LOGBOOK_LINES_LAYER_NAME = "Logbook lines";
|
| 84 | 84 |
protected static final String LOGBOOK_POINTS_LAYER_NAME = "Logbook points";
|
| 85 | 85 |
|
| 86 |
- protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM");
|
|
| 86 |
+ protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd");
|
|
| 87 | 87 |
|
| 88 | 88 |
protected final List<ObserveMapPaneLegendItem> legendItems;
|
| 89 | 89 |
protected final List<TripMapPoint> notValidPoints = new LinkedList<>();
|
| ... | ... | @@ -123,16 +123,16 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { |
| 123 | 123 |
if (zoomRatio != 1 && !rendererRunning) {
|
| 124 | 124 |
|
| 125 | 125 |
JMapPane mapPane = getObserveMapPane();
|
| 126 |
- log.info("Zoom ratio: " + zoomRatio);
|
|
| 126 |
+ log.debug("Zoom ratio: " + zoomRatio);
|
|
| 127 | 127 |
ReferencedEnvelope displayArea = mapPane.getDisplayArea();
|
| 128 | 128 |
|
| 129 | 129 |
double deltaWidth = displayArea.getWidth() * (zoomRatio - 1);
|
| 130 | 130 |
double deltaHeight = displayArea.getHeight() * (zoomRatio - 1);
|
| 131 | 131 |
|
| 132 |
- double ratioLeft = zoomCenter.getX() * 1d / mapPane.getWidth();
|
|
| 132 |
+ double ratioLeft = zoomCenter.getX() / mapPane.getWidth();
|
|
| 133 | 133 |
|
| 134 | 134 |
// l'axe de Y est inversé entre le référentiel du composant swing et le référentiel géographique
|
| 135 |
- double ratioTop = 1 - (zoomCenter.getY() * 1d / mapPane.getHeight());
|
|
| 135 |
+ double ratioTop = 1 - (zoomCenter.getY() / mapPane.getHeight());
|
|
| 136 | 136 |
|
| 137 | 137 |
double deltaLeft = deltaWidth * ratioLeft;
|
| 138 | 138 |
double deltaRight = deltaLeft - deltaWidth;
|
| ... | ... | @@ -58,7 +58,7 @@ |
| 58 | 58 |
<Font>
|
| 59 | 59 |
<CssParameter name="font-size">14</CssParameter>
|
| 60 | 60 |
<CssParameter name="font-style">normal</CssParameter>
|
| 61 |
- <CssParameter name="font-weight">bold</CssParameter>
|
|
| 61 |
+ <CssParameter name="font-family">Sans-Serif</CssParameter>
|
|
| 62 | 62 |
</Font>
|
| 63 | 63 |
</TextSymbolizer>
|
| 64 | 64 |
</Rule>
|