Skip to content

Commit 6a36429

Browse files
paulosousadiaspaulosousadias
committed
Merge branch 'fix/map-providers' into develop
2 parents 54b36aa + 7d1b284 commit 6a36429

File tree

9 files changed

+50
-27
lines changed

9 files changed

+50
-27
lines changed

‎plugins-dev/arcgis-maps/src/java/pt/lsts/neptus/renderer2d/tiles/TileArcGisOcean.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public class TileArcGisOcean extends TileHttpFetcher implements ConfigurationLis
5555

5656
private static Map<String, TileArcGisOcean> tilesMap = Collections.synchronizedMap(new HashMap<String, TileArcGisOcean>());
5757

58-
private static final int MAX_LEVEL_OF_DETAIL = 13;
59-
60-
private static String BASE_URL = "http://services.arcgisonline.com/ArcGIS/rest/services/";
61-
private static String LAYER_MAP = "Ocean_Basemap";
58+
private static final int MAX_LEVEL_OF_DETAIL = 10;
59+
60+
private static String BASE_URL = "https://services.arcgisonline.com/arcgis/rest/services/";
61+
private static String LAYER_MAP = "Ocean/World_Ocean_Base";
6262
private static String BASE_URL_END = "/MapServer/tile/";
6363

6464
public TileArcGisOcean(Integer levelOfDetail, Integer tileX, Integer tileY, BufferedImage image)
@@ -104,7 +104,8 @@ protected float getTransparencyToApplyToImage() {
104104
protected String createTileRequestURL() {
105105
if (levelOfDetail > MAX_LEVEL_OF_DETAIL)
106106
return "http://non-existing-url.nope/";
107-
107+
108+
// https://services.arcgisonline.com/arcgis/rest/services/Ocean/World_Ocean_Base/MapServer/tile/4/6/6
108109
// http://services.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/tile/10/399/169
109110
String urlGet = BASE_URL + LAYER_MAP + BASE_URL_END + levelOfDetail + "/" + tileY + "/" + (tileX);
110111
NeptusLog.pub().debug("<###> "+urlGet);

‎plugins-dev/nvmaps/src/java/pt/lsts/neptus/renderer2d/tiles/TileNVMaps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* @author pdias
4848
*
4949
*/
50-
@MapTileProvider(name = "NV Map Overlay", isBaseMapOrLayer = true)
50+
@MapTileProvider(name = "NV Map Overlay", isBaseMapOrLayer = true, isExperimental = true)
5151
public class TileNVMaps extends TileHttpFetcher implements ConfigurationListener {
5252

5353
//TODO put copyright text to show in renderer "© NVMap contributors"

‎plugins-dev/tiles-extra/src/java/pt/lsts/neptus/renderer2d/tiles/TileGEBCO.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,10 @@ protected String createTileRequestURL() {
116116
lon1 = Math.min(ret1[1], ret2[1]);
117117
lon2 = Math.max(ret1[1], ret2[1]);
118118

119-
String urlGet = "http://www.gebco.net/data_and_products/gebco_web_services/" +
120-
"web_map_service/mapserv?request=getmap&service=wms&" +
121-
"BBOX=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2 +
122-
"&srs=EPSG:4326&format=image/jpeg&layers=gebco_08_grid&" +
123-
"width=256&height=256&version=1.1.1";
119+
String urlGet = "https://wms.gebco.net/mapserv?request=getmap&service=wms&" +
120+
"BBOX=" + lat1 + "," + lon1 + "," + lat2 + "," + lon2 +
121+
"&crs=EPSG:4326&format=image/jpeg&layers=gebco_latest&" +
122+
"width=256&height=256&version=1.3.0";
124123
NeptusLog.pub().info("<###> "+urlGet);
125124
return urlGet;
126125
}

‎plugins-dev/tiles-extra/src/java/pt/lsts/neptus/renderer2d/tiles/TileOpenPtMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public static int getMaxLevelOfDetail() {
7979
@Override
8080
protected String createTileRequestURL() {
8181
// zoom/x/y
82-
// http://c.tile.openstreetmap.org/14/7801/6129.png
83-
String urlGet = "http://www.openptmap.org/tiles/" + levelOfDetail + "/" + tileX + "/" + tileY + ".png";
82+
// https://pt.facilmap.org/tile/14/7801/6129.png
83+
String urlGet = "https://pt.facilmap.org/tile/" + levelOfDetail + "/" + tileX + "/" + tileY + ".png";
8484
return urlGet;
8585
}
8686

‎plugins-dev/tiles-extra/src/java/pt/lsts/neptus/renderer2d/tiles/TileOpenSeaMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected String createTileRequestURL() {
8282
// http://c.tile.openstreetmap.org/14/7801/6129.png
8383
// http://tiles.openseamap.org/seamark/15/17485/10492.png
8484
String urlGet = "http://www.openptmap.org/tiles/" + levelOfDetail + "/" + tileX + "/" + tileY + ".png";
85-
urlGet = "http://tiles.openseamap.org/seamark/" + levelOfDetail + "/" + tileX + "/" + tileY + ".png";
85+
urlGet = "https://tiles.openseamap.org/seamark/" + levelOfDetail + "/" + tileX + "/" + tileY + ".png";
8686
return urlGet;
8787
}
8888

‎plugins-dev/transas-maps/src/java/pt/lsts/neptus/renderer2d/tiles/TransasNauticalCharts.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* @author pdias
4747
*
4848
*/
49-
@MapTileProvider(name = "Transas Nautical Charts", isBaseMapOrLayer = false)
49+
@MapTileProvider(name = "Transas Nautical Charts", isBaseMapOrLayer = false, isExperimental = true)
5050
public class TransasNauticalCharts extends TileHttpFetcher implements ConfigurationListener {
5151

5252
private static final long serialVersionUID = -6223894220961990645L;
@@ -56,14 +56,13 @@ public class TransasNauticalCharts extends TileHttpFetcher implements Configurat
5656
private static Map<String, TransasNauticalCharts> tilesMap = Collections.synchronizedMap(new HashMap<String, TransasNauticalCharts>());
5757

5858
private static final int MAX_LEVEL_OF_DETAIL = 18;
59-
private static String BASE_URL = "http://wms.transas.com/TMS/1.0.0/TX97-transp/";
60-
private static String TOKEN = "9e53bcb2-01d0-46cb-8aff-512e681185a4";
59+
private static String BASE_URL = "https://wms.transas.com/TMS/1.0.0/TX97-transp/";
6160

6261
@NeptusProperty(name = "Base URL", description = "The first URL part")
6362
private static String baseUrl = BASE_URL;
6463

6564
@NeptusProperty(name = "Token", description = "Transas token key")
66-
private static String token = TOKEN;
65+
private static String token = "";
6766

6867
public TransasNauticalCharts(Integer levelOfDetail, Integer tileX, Integer tileY, BufferedImage image)
6968
throws Exception {
@@ -88,7 +87,7 @@ public void propertiesChanged() {
8887
if (baseUrl.length() == 0)
8988
baseUrl = BASE_URL;
9089
if (token.length() == 0)
91-
token = TOKEN;
90+
token = "";
9291
}
9392

9493
public static int getMaxLevelOfDetail() {
@@ -113,12 +112,14 @@ protected String createTileRequestURL() {
113112
if (baseUrl.length() == 0)
114113
baseUrl = BASE_URL;
115114
if (token.length() == 0)
116-
token = TOKEN;
115+
token = "";
117116

118-
if (levelOfDetail > 17)
117+
if (token.isEmpty() || levelOfDetail > 17) {
119118
return "http://non-existing-url.nope/";
120-
int max = (int) Math.pow(2, levelOfDetail)-1;
121-
119+
}
120+
int max = (int) Math.pow(2, levelOfDetail) - 1;
121+
122+
// https://wms.transas.com/TMS/1.0.0/TX97-transp/14/7801/10254.png?token=9e53bcb2-01d0-46cb-8aff-512e681185a4
122123
String urlGet = baseUrl + levelOfDetail + "/" + tileX + "/" + (max-tileY) + ".png?token="+token;
123124
return urlGet;
124125
}

‎src/java/pt/lsts/neptus/plugins/MapTileProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,9 @@
124124
* layer maps, not base maps.
125125
*/
126126
public short layerPriority() default 0;
127+
128+
/**
129+
* @return if the map provider is experimental or not.
130+
*/
131+
public boolean isExperimental() default false;
127132
}

‎src/java/pt/lsts/neptus/renderer2d/WorldRenderPainter.java

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ private enum PropertiesOrCustomOptionsDialogEnum { None, PropertiesDialog, Custo
201201
private static Map<String, MapPainterProvider> mapPainterHolderList = Collections.synchronizedMap(new LinkedHashMap<String, MapPainterProvider>());
202202
private static Map<String, Map<String, Tile>> tileHolderList = Collections.synchronizedMap(new LinkedHashMap<String, Map<String, Tile>>());
203203
private static Map<String, Class<? extends Tile>> tileClassList = Collections.synchronizedMap(new LinkedHashMap<String, Class<? extends Tile>>());
204-
204+
private static List<String> isExperimentalHolderList = Collections.synchronizedList(new ArrayList<>());
205+
205206
private static List<String> mapsOrderedForPainting = Collections.synchronizedList(new ArrayList<String>());
206207

207208
static {
@@ -213,13 +214,19 @@ private enum PropertiesOrCustomOptionsDialogEnum { None, PropertiesDialog, Custo
213214
mapLayerPrioriryHolderList.put(mapId, TileMercatorSVG.class.getAnnotation(MapTileProvider.class).layerPriority());
214215
tileHolderList.put(mapId, TileMercatorSVG.getTilesMap());
215216
tileClassList.put(mapId, TileMercatorSVG.class);
217+
if (TileMercatorSVG.class.getAnnotation(MapTileProvider.class).isExperimental()) {
218+
isExperimentalHolderList.add(mapId);
219+
}
216220

217221
mapId = TileOpenStreetMap.class.getAnnotation(MapTileProvider.class).name();
218222
mapActiveHolderList.put(mapId, false); //TileOpenStreetMap.getTileStyleID()
219223
mapBaseOrLayerHolderList.put(mapId, TileMercatorSVG.class.getAnnotation(MapTileProvider.class).isBaseMapOrLayer());
220224
mapLayerPrioriryHolderList.put(mapId, TileMercatorSVG.class.getAnnotation(MapTileProvider.class).layerPriority());
221225
tileHolderList.put(mapId, TileOpenStreetMap.getTilesMap());
222226
tileClassList.put(mapId, TileOpenStreetMap.class);
227+
if (TileOpenStreetMap.class.getAnnotation(MapTileProvider.class).isExperimental()) {
228+
isExperimentalHolderList.add(mapId);
229+
}
223230

224231
Vector<Class<? extends MapTileProvider>> lst = new Vector<Class<? extends MapTileProvider>>();
225232
for (Class<? extends MapTileProvider> clazz : PluginsRepository.getTileProviders().values()) {
@@ -265,6 +272,9 @@ else if (i == lst.size() - 1) {
265272
mapLayerPrioriryHolderList.put(id, clazz.getAnnotation(MapTileProvider.class).layerPriority());
266273
tileHolderList.put(id, map);
267274
tileClassList.put(id, cz);
275+
if (clazz.getAnnotation(MapTileProvider.class).isExperimental()) {
276+
isExperimentalHolderList.add(id);
277+
}
268278
}
269279
catch (ClassCastException e) {
270280
e.printStackTrace();
@@ -279,6 +289,9 @@ else if (i == lst.size() - 1) {
279289
mapBaseOrLayerHolderList.put(id, clazz.getAnnotation(MapTileProvider.class).isBaseMapOrLayer());
280290
mapLayerPrioriryHolderList.put(id, clazz.getAnnotation(MapTileProvider.class).layerPriority());
281291
mapPainterHolderList.put(id, instance);
292+
if (clazz.getAnnotation(MapTileProvider.class).isExperimental()) {
293+
isExperimentalHolderList.add(id);
294+
}
282295
}
283296
catch (ClassCastException e1) {
284297
e1.printStackTrace();
@@ -1172,10 +1185,14 @@ public void createChooseMapStyleDialog() {
11721185
}
11731186

11741187
final JToggleButton rButton;
1188+
String mapText = ms;
1189+
if (isExperimentalHolderList.contains(ms)) {
1190+
mapText += " (" + I18n.text("experimental") + ")";
1191+
}
11751192
if (mapBaseOrLayerHolderList.containsKey(ms) && mapBaseOrLayerHolderList.get(ms))
1176-
rButton = new JRadioButton(ms.toString());
1193+
rButton = new JRadioButton(mapText);
11771194
else
1178-
rButton = new JCheckBox(ms.toString());
1195+
rButton = new JCheckBox(mapText);
11791196
rButton.setActionCommand(ms);
11801197
if (mapActiveHolderList.containsKey(ms) && mapActiveHolderList.get(ms))
11811198
rButton.setSelected(true);

‎src/java/pt/lsts/neptus/renderer2d/tiles/TileOpenStreetMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected String createTileRequestURL() {
121121
// urlGet = "http://" + sv + "." + "tile.opencyclemap.org/cycle/" + levelOfDetail + "/"
122122
// + tileX + "/" + tileY + ".png";
123123
// else
124-
String urlGet = "http://" + sv + "." + "tile.openstreetmap.org/" + levelOfDetail + "/"
124+
String urlGet = "https://" + sv + "." + "tile.openstreetmap.org/" + levelOfDetail + "/"
125125
+ tileX + "/" + tileY + ".png";
126126

127127
return urlGet;

0 commit comments

Comments
 (0)