Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b9d86eb8 by Tony Chemit at 2020-12-18T10:14:17+01:00 Lisibilité de la carte - police de la date - Closes #1640 - - - - - 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: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java ===================================== @@ -83,7 +83,7 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil protected static final String LOGBOOK_LINES_LAYER_NAME = "Logbook lines"; protected static final String LOGBOOK_POINTS_LAYER_NAME = "Logbook points"; - protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM"); + protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd"); protected final List<ObserveMapPaneLegendItem> legendItems; protected final List<TripMapPoint> notValidPoints = new LinkedList<>(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java ===================================== @@ -123,16 +123,16 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { if (zoomRatio != 1 && !rendererRunning) { JMapPane mapPane = getObserveMapPane(); - log.info("Zoom ratio: " + zoomRatio); + log.debug("Zoom ratio: " + zoomRatio); ReferencedEnvelope displayArea = mapPane.getDisplayArea(); double deltaWidth = displayArea.getWidth() * (zoomRatio - 1); double deltaHeight = displayArea.getHeight() * (zoomRatio - 1); - double ratioLeft = zoomCenter.getX() * 1d / mapPane.getWidth(); + double ratioLeft = zoomCenter.getX() / mapPane.getWidth(); // l'axe de Y est inversé entre le référentiel du composant swing et le référentiel géographique - double ratioTop = 1 - (zoomCenter.getY() * 1d / mapPane.getHeight()); + double ratioTop = 1 - (zoomCenter.getY() / mapPane.getHeight()); double deltaLeft = deltaWidth * ratioLeft; double deltaRight = deltaLeft - deltaWidth; ===================================== client/datasource/editor/ps/src/main/resources/map/ps-style.xml ===================================== @@ -58,7 +58,7 @@ <Font> <CssParameter name="font-size">14</CssParameter> <CssParameter name="font-style">normal</CssParameter> - <CssParameter name="font-weight">bold</CssParameter> + <CssParameter name="font-family">Sans-Serif</CssParameter> </Font> </TextSymbolizer> </Rule> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b9d86eb83242e40585297e2bc8... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b9d86eb83242e40585297e2bc8... You're receiving this email because of your account on gitlab.com.