From bec8e3afc68ad0d5f2e773dd862a94bf439e4be3 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 16 Nov 2021 14:49:59 +0100 Subject: [PATCH] updated map icon and css --- .../client/gis/LightOpenLayerMap.java | 22 +++++++++++------- .../client/resources/map.png | Bin 318 -> 500 bytes src/main/webapp/GeoportalDataViewer.css | 5 ++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerMap.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerMap.java index 5a54555..9d8be3b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerMap.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerMap.java @@ -29,6 +29,7 @@ import ol.MapOptions; import ol.OLFactory; import ol.View; import ol.ViewOptions; +import ol.color.Color; import ol.control.Attribution; import ol.event.EventListener; import ol.geom.Point; @@ -49,8 +50,12 @@ import ol.source.Osm; import ol.source.Source; import ol.source.Xyz; import ol.source.XyzOptions; +import ol.style.Fill; +import ol.style.FillOptions; import ol.style.Icon; import ol.style.IconOptions; +import ol.style.Stroke; +import ol.style.StrokeOptions; import ol.style.Style; import ol.style.Text; import ol.style.TextOptions; @@ -405,14 +410,15 @@ public class LightOpenLayerMap { if (showCoordinateText) { TextOptions textOptions = new TextOptions(); textOptions.setOffsetY(-25); -// StrokeOptions strokeOptions = new StrokeOptions(); -// strokeOptions.setColor(new Color(0, 0, 255, 0.0)); -// strokeOptions.setWidth(4); -// Stroke stroke = new Stroke(strokeOptions); -// textOptions.setStroke(stroke); -// FillOptions fillOptions = new FillOptions(); -// fillOptions.setColor(new Color(0, 0, 0, 0.0)); -// textOptions.setFill(new Fill(fillOptions)); + StrokeOptions strokeOptions = new StrokeOptions(); + strokeOptions.setColor(new Color(255, 255, 255, 1.0)); + strokeOptions.setWidth(4); + Stroke stroke = new Stroke(strokeOptions); + stroke.setWidth(5); + textOptions.setStroke(stroke); + FillOptions fillOptions = new FillOptions(); + fillOptions.setColor(new Color(0, 0, 255, 1.0)); + textOptions.setFill(new Fill(fillOptions)); Coordinate transfCoord = MapUtils.transformCoordiante(coordinate, MAP_PROJECTION.EPSG_3857.getName(), MAP_PROJECTION.EPSG_4326.getName()); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png index fc9aef5bb0708e23b4d0b4f696c074a094e544d4..da4854a01dbab38de8bfcc75803ecc7c778a2e60 100644 GIT binary patch delta 451 zcmV;!0X+V`0`vnRiBL{Q4GJ0x0000DNk~Le0000H0000F2nGNE00OZj5s@Jp3jlur z004ghxVFrRkwzzf0dYx0K~y-6ozgvPR8bJd@!#CU7!w03ifAVoQ}_X_gj7~`7QxEW zLR*lIj~{_Yy)YtJcsLkPFrj>mr> z;gvLkW4NjG#Dpu-f<*X?3up_UR5lgPOK+ssFi4X)ju+CJailNU5H4b}S6vzwE~$JK zMit%{byI-?(+X{qi3sPA{8K7^x~lE#XfUi4)eLZ^lfDjV_8Ge%AS8#U1}82Wep zCnV+mkZ72H_ETqfNLA+>RHZwqokm?Kgdfsd-A&w0DZR$JG$x(Jvl?1;Av>n9fi2;s zsB58;p5udX0xLG1R+y1a;vLq}H`?XAEUng=j|d-e7z-w>xgI}z-urpbwprZ4cym8i t@{o=>VFt@e58aLJJ=$b3&j_o(0D8}LtO+;OCIA2m002ovPDHLkV1h;0#LoZ# delta 267 zcmV+m0rdX#1HJ+wiBL{Q4GJ0x0000DNk~Le0000G0000F2nGNE0PS;6FOeY{3kt;m z01Cwcv?^dQkwzzf0J}*m+Z=*A0#US>52Gjqo_>`Hw!{BR+Sg!`|5DBKpyq%C1mN7`Q*|HgrIU1~~olywFE z1%F1cSXXd{VNLH<7)x)$Y&nSPy39jGTYA7ATEdg!*?CN>-c4@%a4NNh<|i+E$ RJ*WTx002ovPDHLkV1j3SZ!-V@ diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css index eadce10..e1e40e2 100644 --- a/src/main/webapp/GeoportalDataViewer.css +++ b/src/main/webapp/GeoportalDataViewer.css @@ -415,8 +415,9 @@ body { } .baseLayersMapLink .btn-link { - border: 1px solid #eee; - background-color: #fcfcfc; + /*border: 1px solid #eee;*/ + border: 1px solid #005580; + /*background-color: #fcfcfc;*/ margin: 1px; }