diff --git a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
index e16910c2..5942a679 100644
--- a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
+++ b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
@@ -69,7 +69,7 @@ import java.util.zip.ZipInputStream;
public static String getVersion() {
String version = GlobalUtil.class.getPackage().getImplementationVersion();
if (version == null || version.equals("")) {
- version = "3.9.11";
+ version = "4.0";
}
return version;
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AHybridMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AHybridMapInfo.java
index 02a651e5..c600cdc6 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AHybridMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AHybridMapInfo.java
@@ -19,8 +19,7 @@ public class AHybridMapInfo extends TileFactoryInfo {
public AHybridMapInfo() {
super("AHybridMap", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://wprd03.is.autonavi.com/appmaptile?style=8&x=%1$d&y=%2$d&z=%3$d",
- "x", "y", "z");
+ "http://wprd03.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}");
}
// //
// //
@@ -28,11 +27,11 @@ public class AHybridMapInfo extends TileFactoryInfo {
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AMapInfo.java
index 894dcf92..24988cda 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/AMapInfo.java
@@ -19,8 +19,7 @@ public class AMapInfo extends TileFactoryInfo {
public AMapInfo() {
super("AMap", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://wprd03.is.autonavi.com/appmaptile?style=7&x=%1$d&y=%2$d&z=%3$d",
- "x", "y", "z");
+ "http://wprd03.is.autonavi.com/appmaptile?style=7&x={x}&y={y}&z={z}");
}
// //
// //
@@ -28,11 +27,11 @@ public class AMapInfo extends TileFactoryInfo {
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ASatelliteMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ASatelliteMapInfo.java
index 0add8094..42af2e10 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ASatelliteMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ASatelliteMapInfo.java
@@ -19,8 +19,7 @@ public class ASatelliteMapInfo extends TileFactoryInfo {
public ASatelliteMapInfo() {
super("ASatelliteMap", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://wprd03.is.autonavi.com/appmaptile?style=6&x=%1$d&y=%2$d&z=%3$d",
- "x", "y", "z");
+ "http://wprd03.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}");
}
// //
// //
@@ -28,11 +27,11 @@ public class ASatelliteMapInfo extends TileFactoryInfo {
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ArcGISImageInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ArcGISImageInfo.java
index 4e716482..6f6aa9ed 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ArcGISImageInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/ArcGISImageInfo.java
@@ -19,19 +19,18 @@ public class ArcGISImageInfo extends TileFactoryInfo {
public ArcGISImageInfo() {
super("ArcGISImage", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/%1$d/%2$d/%3$d",
- "x", "y", "z");
+ "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/{z}/{y}/{x}");
}
// //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, zoom, y, x);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingHybridMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingHybridMapInfo.java
index d8228586..4ad402b5 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingHybridMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingHybridMapInfo.java
@@ -21,8 +21,7 @@ public class BingHybridMapInfo extends TileFactoryInfo {
public BingHybridMapInfo() {
super("BingHybridMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://ecn.t%1$d.tiles.virtualearth.net/tiles/h%2$s.jpeg?g=%3$s&mkt=%4$s&n=z%5$s",
- "x", "y", "z");
+ "http://ecn.t%1$d.tiles.virtualearth.net/tiles/h%2$s.jpeg?g=%3$s&mkt=%4$s&n=z%5$s");
}
// //
// //
@@ -37,7 +36,7 @@ public class BingHybridMapInfo extends TileFactoryInfo {
String ckey = this.clientKey;
if (ckey == null)
ckey = "";
- String url = String.format(this.baseURL, serverNum, key, version, this.getLanguage(), zoom, x, y);
+ String url = String.format(this.baseURL, serverNum, key, version, this.getLanguage(), zoom);
return url;
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingMapInfo.java
index 9ca803ec..53db6939 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingMapInfo.java
@@ -22,12 +22,7 @@ public class BingMapInfo extends TileFactoryInfo {
public BingMapInfo() {
super("BingMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://ecn.t%1$d.tiles.virtualearth.net/tiles/r%2$s?g=%3$s&mkt=%4$s&lbl=l1&stl=h&shading=hill&n=z%5$s",
- "x", "y", "z");
-// super("BingMap", 1, 17, 19,
-// 256, true, true, // tile size is 256 and x/y orientation is normal
-// "http://t%1$d.tiles.ditu.live.com/tiles/r%2$s.png?g=%3$s&mkt=%4$s&n=z%5$s",
-// "x", "y", "z");
+ "http://ecn.t%1$d.tiles.virtualearth.net/tiles/r%2$s?g=%3$s&mkt=%4$s&lbl=l1&stl=h&shading=hill&n=z%5$s");
if (this.getLanguage().equals("zh-cn"))
this.baseURL = "http://t%1$d.tiles.ditu.live.com/tiles/r%2$s.png?g=%3$s&mkt=%4$s&n=z%5$s";
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingSatelliteMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingSatelliteMapInfo.java
index 529a785a..47cfc054 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingSatelliteMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/BingSatelliteMapInfo.java
@@ -21,8 +21,7 @@ public class BingSatelliteMapInfo extends TileFactoryInfo {
public BingSatelliteMapInfo() {
super("BingSatelliteMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://ecn.t%1$d.tiles.virtualearth.net/tiles/a%2$s.jpeg?g=%3$s&mkt=%4$s&n=z%5$s",
- "x", "y", "z");
+ "http://ecn.t%1$d.tiles.virtualearth.net/tiles/a%2$s.jpeg?g=%3$s&mkt=%4$s&n=z%5$s");
}
// //
// //
@@ -37,7 +36,7 @@ public class BingSatelliteMapInfo extends TileFactoryInfo {
String ckey = this.clientKey;
if (ckey == null)
ckey = "";
- String url = String.format(this.baseURL, serverNum, key, version, this.getLanguage(), zoom, x, y);
+ String url = String.format(this.baseURL, serverNum, key, version, this.getLanguage(), zoom);
return url;
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMACvaMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMACvaMapInfo.java
index a6b42f2a..7ace7778 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMACvaMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMACvaMapInfo.java
@@ -15,20 +15,19 @@ public class CMACvaMapInfo extends TileFactoryInfo {
public CMACvaMapInfo() {
super("CMA_CVA_MAP", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://10.1.64.154/DataServer?T=cva_w&X=%1$d&Y=%2$d&L=%3$d",
- "x", "y", "z");
+ "http://10.1.64.154/DataServer?T=cva_w&X={x}&Y={y}&L={z}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAImgMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAImgMapInfo.java
index 7ee156dc..9634fb2d 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAImgMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAImgMapInfo.java
@@ -15,20 +15,19 @@ public class CMAImgMapInfo extends TileFactoryInfo {
public CMAImgMapInfo() {
super("CMA_IMG_MAP", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://10.1.64.154/DataServer?T=img_w&X=%1$d&Y=%2$d&L=%3$d",
- "x", "y", "z");
+ "http://10.1.64.154/DataServer?T=img_w&X={x}&Y={y}&L={z}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAVecMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAVecMapInfo.java
index ab542f33..23df79e9 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAVecMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/CMAVecMapInfo.java
@@ -15,20 +15,19 @@ public class CMAVecMapInfo extends TileFactoryInfo {
public CMAVecMapInfo() {
super("CMA_VEC_MAP", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://10.1.64.154/DataServer?T=vec_w&X=%1$d&Y=%2$d&L=%3$d",
- "x", "y", "z");
+ "http://10.1.64.154/DataServer?T=vec_w&X={x}&Y={y}&L={z}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQBlueMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQBlueMapInfo.java
index 3e50a594..d2746776 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQBlueMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQBlueMapInfo.java
@@ -19,20 +19,19 @@ public class GeoQBlueMapInfo extends TileFactoryInfo {
public GeoQBlueMapInfo() {
super("GeoQMap", 0, 16, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/%1$d/%2$d/%3$d",
- "x", "y", "z");
+ "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, zoom, y, x);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQGrayMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQGrayMapInfo.java
index 488511be..206d96c6 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQGrayMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQGrayMapInfo.java
@@ -19,20 +19,19 @@ public class GeoQGrayMapInfo extends TileFactoryInfo {
public GeoQGrayMapInfo() {
super("GeoQMap", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetGray/MapServer/tile/%1$d/%2$d/%3$d",
- "x", "y", "z");
+ "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetGray/MapServer/tile/{z}/{y}/{x}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, zoom, y, x);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQMapInfo.java
index f6471a63..8c90b083 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQMapInfo.java
@@ -19,20 +19,19 @@ public class GeoQMapInfo extends TileFactoryInfo {
public GeoQMapInfo() {
super("GeoQMap", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineCommunity/MapServer/tile/%1$d/%2$d/%3$d",
- "x", "y", "z");
+ "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineCommunity/MapServer/tile/{z}/{y}/{x}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, zoom, y, x);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQWarmMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQWarmMapInfo.java
index 4eb97aa3..a7208c49 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQWarmMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GeoQWarmMapInfo.java
@@ -19,20 +19,19 @@ public class GeoQWarmMapInfo extends TileFactoryInfo {
public GeoQWarmMapInfo() {
super("GeoQMap", 0, 18, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer/tile/%1$d/%2$d/%3$d",
- "x", "y", "z");
+ "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer/tile/{z}/{y}/{x}");
}
-// //
+ //
// //
// //
// //
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, zoom, y, x);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNMapInfo.java
index fa19c567..124580cc 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNMapInfo.java
@@ -22,18 +22,17 @@ public class GoogleCNMapInfo extends TileFactoryInfo {
public GoogleCNMapInfo() {
super("GoogleCNMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=m&x=%1$d&y=%2$d&z=%3$d",
- "x", "y", "z");
+ "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=m&x={x}&y={y}&z={z}");
}
//
//
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNSatelliteMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNSatelliteMapInfo.java
index fbfdfd86..1d80463c 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNSatelliteMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNSatelliteMapInfo.java
@@ -22,18 +22,17 @@ public class GoogleCNSatelliteMapInfo extends TileFactoryInfo {
public GoogleCNSatelliteMapInfo() {
super("GoogleCNSatelliteMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=s&x=%1$d&y=%2$d&z=%3$d",
- "x", "y", "z");
+ "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}");
}
//
//
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNTerrainMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNTerrainMapInfo.java
index bdba27d6..e392065b 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNTerrainMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleCNTerrainMapInfo.java
@@ -22,18 +22,17 @@ public class GoogleCNTerrainMapInfo extends TileFactoryInfo {
public GoogleCNTerrainMapInfo() {
super("GoogleCNTerrainMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=p&x=%1$d&y=%2$d&z=%3$d",
- "x", "y", "z");
+ "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=p&x={x}&y={y}&z={z}");
}
//
//
- @Override
+ /*@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, x, y, zoom);
return url;
- }
+ }*/
//
}
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridMapInfo.java
index a9b25536..cc16cc74 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridMapInfo.java
@@ -19,8 +19,7 @@ public class GoogleHybridMapInfo extends TileFactoryInfo {
public GoogleHybridMapInfo() {
super("GoogleHybridMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://mt1.google.cn/vt/lyrs=y&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil",
- "x", "y", "z");
+ "http://mt1.google.cn/vt/lyrs=y&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil");
}
// //
// //
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridTerrainMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridTerrainMapInfo.java
index 7b4b5936..e58adbbf 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridTerrainMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleHybridTerrainMapInfo.java
@@ -19,8 +19,7 @@ public class GoogleHybridTerrainMapInfo extends TileFactoryInfo {
public GoogleHybridTerrainMapInfo() {
super("GoogleHybridTerrainMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://mt2.google.cn/vt/lyrs=p&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil",
- "x", "y", "z");
+ "http://mt2.google.cn/vt/lyrs=p&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil");
}
// //
// //
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleMapInfo.java
index 83290a45..3917859a 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleMapInfo.java
@@ -22,10 +22,7 @@ public class GoogleMapInfo extends TileFactoryInfo {
public GoogleMapInfo() {
super("GoogleMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://mt2.google.cn/vt/lyrs=m&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil",
- "x", "y", "z");
- //String url = "http://mt1.google.com/vt/lyrs=m@129&hl=%1$s&x=%2$d&y=%3$d&z=%4$d&s=Galileo";
- //this.baseURL = url;
+ "http://mt2.google.cn/vt/lyrs=m&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil");
}
// //
// //
@@ -36,7 +33,6 @@ public class GoogleMapInfo extends TileFactoryInfo {
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, this.getLanguage(), x, y, zoom);
- //String url = String.format(this.baseURL, x, y, zoom, this.getLanguage());
return url;
}
///
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleSatelliteMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleSatelliteMapInfo.java
index 5040acb5..a7e0b130 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleSatelliteMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleSatelliteMapInfo.java
@@ -9,8 +9,7 @@ package org.meteoinfo.data.mapdata.webmap;
* @author yaqiang
*/
public class GoogleSatelliteMapInfo extends TileFactoryInfo {
- //
- //
+
//
/**
@@ -19,20 +18,16 @@ public class GoogleSatelliteMapInfo extends TileFactoryInfo {
public GoogleSatelliteMapInfo() {
super("GoogleSatelliteMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://mt3.google.cn/vt/lyrs=s&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil",
- "x", "y", "z");
+ "http://mt3.google.cn/vt/lyrs=s&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil");
}
-// //
-// //
-
-// //
-// //
+ //
+
+ //
@Override
public String getTileUrl(int x, int y, int zoom) {
zoom = this.getTotalMapZoom() - zoom;
String url = String.format(this.baseURL, this.getLanguage(), x, y, zoom);
- //String url = String.format(this.baseURL, x, y, zoom);
return url;
}
//
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleTerrainMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleTerrainMapInfo.java
index c48b8a92..c814e3ca 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleTerrainMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/GoogleTerrainMapInfo.java
@@ -9,8 +9,7 @@ package org.meteoinfo.data.mapdata.webmap;
* @author yaqiang
*/
public class GoogleTerrainMapInfo extends TileFactoryInfo {
- //
- //
+
//
/**
@@ -19,14 +18,11 @@ public class GoogleTerrainMapInfo extends TileFactoryInfo {
public GoogleTerrainMapInfo() {
super("GoogleTerrainMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://mt0.google.cn/vt/lyrs=t&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil",
- "x", "y", "z");
+ "http://mt0.google.cn/vt/lyrs=t&hl=%1$s&gl=cn&x=%2$d&y=%3$d&z=%4$d&s=Galil");
}
-// //
-// //
-
-// //
-// //
+ //
+
+ //
@Override
public String getTileUrl(int x, int y, int zoom) {
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapInfo.java
index 4e008f99..14fd1317 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapInfo.java
@@ -19,8 +19,11 @@ public class OpenStreetMapInfo extends TileFactoryInfo {
public OpenStreetMapInfo() {
super("OpenStreetMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "https://tile.openstreetmap.de/%1$d/%2$d/%3$d.png",//5/15/10.png",
- "x", "y", "z");
+ "https://tile.openstreetmap.de/{z}/{x}/{y}.png");
+// super("OpenStreetMap", 1, 17, 19,
+// 256, true, true, // tile size is 256 and x/y orientation is normal
+// "https://tile.openstreetmap.de/%1$d/%2$d/%3$d.png",//5/15/10.png",
+// "x", "y", "z");
}
// //
// //
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapQuestSatelliteInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapQuestSatelliteInfo.java
index eecf2678..a9678d12 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapQuestSatelliteInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OpenStreetMapQuestSatelliteInfo.java
@@ -19,8 +19,7 @@ public class OpenStreetMapQuestSatelliteInfo extends TileFactoryInfo {
public OpenStreetMapQuestSatelliteInfo() {
super("OpenStreetMapQuestSatellite", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://otile%1$d.mqcdn.com/tiles/1.0.0/sat/%2$d/%3$d/%4$d.jpg",//5/15/10.png",
- "x", "y", "z");
+ "http://otile%1$d.mqcdn.com/tiles/1.0.0/sat/%2$d/%3$d/%4$d.jpg");
}
// //
// //
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviHybridMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviHybridMapInfo.java
index cb3d971d..378c5a8d 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviHybridMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviHybridMapInfo.java
@@ -20,13 +20,11 @@ public class OviHybridMapInfo extends TileFactoryInfo {
public OviHybridMapInfo() {
super("OviHybridMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/hybrid.day/%2$d/%3$d/%4$d/256/png8",//5/15/10.png",
- "x", "y", "z");
+ "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/hybrid.day/%2$d/%3$d/%4$d/256/png8");
}
-// //
-// //
-// //
-// //
+ //
+
+ //
@Override
public String getTileUrl(int x, int y, int zoom) {
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviMapInfo.java
index ec24861c..3c292cad 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviMapInfo.java
@@ -20,13 +20,11 @@ public class OviMapInfo extends TileFactoryInfo {
public OviMapInfo() {
super("OviMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/normal.day/%2$d/%3$d/%4$d/256/png8",//5/15/10.png",
- "x", "y", "z");
+ "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/normal.day/%2$d/%3$d/%4$d/256/png8");
}
-// //
-// //
-// //
-// //
+ //
+
+ //
@Override
public String getTileUrl(int x, int y, int zoom) {
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviSatelliteMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviSatelliteMapInfo.java
index e6c96696..16b511f0 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviSatelliteMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviSatelliteMapInfo.java
@@ -20,13 +20,11 @@ public class OviSatelliteMapInfo extends TileFactoryInfo {
public OviSatelliteMapInfo() {
super("OviSatelliteMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/satellite.day/%2$d/%3$d/%4$d/256/png8",//5/15/10.png",
- "x", "y", "z");
+ "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/satellite.day/%2$d/%3$d/%4$d/256/png8");
}
-// //
-// //
-// //
-// //
+ //
+
+ //
@Override
public String getTileUrl(int x, int y, int zoom) {
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviTerrainMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviTerrainMapInfo.java
index e9a16294..7fc9559d 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviTerrainMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/OviTerrainMapInfo.java
@@ -20,13 +20,11 @@ public class OviTerrainMapInfo extends TileFactoryInfo {
public OviTerrainMapInfo() {
super("OviTerrainMap", 1, 17, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/terrain.day/%2$d/%3$d/%4$d/256/png8",//5/15/10.png",
- "x", "y", "z");
+ "http://%1$s.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/terrain.day/%2$d/%3$d/%4$d/256/png8");
}
-// //
-// //
-// //
-// //
+ //
+
+ //
@Override
public String getTileUrl(int x, int y, int zoom) {
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TencentMapInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TencentMapInfo.java
index ea73a13a..03d6192f 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TencentMapInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TencentMapInfo.java
@@ -19,8 +19,7 @@ public class TencentMapInfo extends TileFactoryInfo {
public TencentMapInfo() {
super("TencentMap", 0, 16, 19,
256, true, true, // tile size is 256 and x/y orientation is normal
- "http://rt1.map.gtimg.com/tile?z=%1$d&x=%2$d&y=%3$d&styleid=1&version=117",
- "x", "y", "z");
+ "http://rt1.map.gtimg.com/tile?z=%1$d&x=%2$d&y=%3$d&styleid=1&version=117");
}
// //
// //
diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TileFactoryInfo.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TileFactoryInfo.java
index b8e0a02f..6356a0f8 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TileFactoryInfo.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/webmap/TileFactoryInfo.java
@@ -21,9 +21,9 @@ import java.util.Locale;
*/
public class TileFactoryInfo {
- protected int minimumZoomLevel;
- protected int maximumZoomLevel;
- protected int totalMapZoom;
+ protected int minimumZoomLevel = 0;
+ protected int maximumZoomLevel = 18;
+ protected int totalMapZoom = 19;
// the size of each tile (assumes they are square)
private int tileSize = 256;
/*
@@ -50,9 +50,9 @@ public class TileFactoryInfo {
* The base url for loading tiles from.
*/
protected String baseURL;
- private String xparam;
- private String yparam;
- private String zparam;
+ private String xparam = "x";
+ private String yparam = "y";
+ private String zparam = "z";
private boolean xr2l = true;
private boolean yt2b = true;
private int defaultZoomLevel = 1;
@@ -65,8 +65,71 @@ public class TileFactoryInfo {
/**
* Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo
- * should be considered invariate, meaning that subclasses should ensure all
- * of the properties stay the same after the class is constructed. Returning
+ * should be considered invariant, meaning that subclasses should ensure all
+ * the properties stay the same after the class is constructed. Returning
+ * different values of getTileSize() for example is considered an error and
+ * may result in unexpected behavior.
+ *
+ * @param minimumZoomLevel The minimum zoom level
+ * @param maximumZoomLevel the maximum zoom level
+ * @param tileSize the size of the tiles in pixels (must be square)
+ * @param baseURL the base url for grabbing tiles
+ */
+ public TileFactoryInfo(int minimumZoomLevel, int maximumZoomLevel,
+ int tileSize, String baseURL) {
+ this(minimumZoomLevel, maximumZoomLevel,
+ 19, tileSize, true, true, baseURL, "x", "y",
+ "z");
+ }
+
+ /**
+ * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo
+ * should be considered invariant, meaning that subclasses should ensure all
+ * the properties stay the same after the class is constructed. Returning
+ * different values of getTileSize() for example is considered an error and
+ * may result in unexpected behavior.
+ *
+ * @param name The name
+ * @param minimumZoomLevel The minimum zoom level
+ * @param maximumZoomLevel the maximum zoom level
+ * @param tileSize the size of the tiles in pixels (must be square)
+ * @param baseURL the base url for grabbing tiles
+ */
+ public TileFactoryInfo(String name, int minimumZoomLevel, int maximumZoomLevel,
+ int tileSize, String baseURL) {
+ this(name, minimumZoomLevel, maximumZoomLevel,
+ 19, tileSize, true, true, baseURL, "x", "y",
+ "z");
+ }
+
+ /**
+ * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo
+ * should be considered invariant, meaning that subclasses should ensure all
+ * the properties stay the same after the class is constructed. Returning
+ * different values of getTileSize() for example is considered an error and
+ * may result in unexpected behavior.
+ *
+ * @param minimumZoomLevel The minimum zoom level
+ * @param maximumZoomLevel the maximum zoom level
+ * @param totalMapZoom the top zoom level, essentially the height of the
+ * pyramid
+ * @param tileSize the size of the tiles in pixels (must be square)
+ * @param xr2l if the x goes r to l (is this backwards?)
+ * @param yt2b if the y goes top to bottom
+ * @param baseURL the base url for grabbing tiles
+ */
+ public TileFactoryInfo(int minimumZoomLevel, int maximumZoomLevel, int totalMapZoom,
+ int tileSize, boolean xr2l, boolean yt2b,
+ String baseURL) {
+ this(minimumZoomLevel, maximumZoomLevel,
+ totalMapZoom, tileSize, xr2l, yt2b, baseURL, "x", "y",
+ "z");
+ }
+
+ /**
+ * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo
+ * should be considered invariant, meaning that subclasses should ensure all
+ * the properties stay the same after the class is constructed. Returning
* different values of getTileSize() for example is considered an error and
* may result in unexpected behavior.
*
@@ -82,12 +145,6 @@ public class TileFactoryInfo {
* @param yparam the y parameter for the tile url
* @param zparam the z parameter for the tile url
*/
- /*
- * @param xr2l true if tile x is measured from the far left of the map to the far right, or
- * else false if based on the center line.
- * @param yt2b true if tile y is measured from the top (north pole) to the bottom (south pole)
- * or else false if based on the equator.
- */
public TileFactoryInfo(int minimumZoomLevel, int maximumZoomLevel, int totalMapZoom,
int tileSize, boolean xr2l, boolean yt2b,
String baseURL, String xparam, String yparam, String zparam) {
@@ -98,8 +155,32 @@ public class TileFactoryInfo {
/**
* Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo
- * should be considered invariate, meaning that subclasses should ensure all
- * of the properties stay the same after the class is constructed. Returning
+ * should be considered invariant, meaning that subclasses should ensure all
+ * the properties stay the same after the class is constructed. Returning
+ * different values of getTileSize() for example is considered an error and
+ * may result in unexpected behavior.
+ *
+ * @param name A name to identify this information.
+ * @param minimumZoomLevel The minimum zoom level
+ * @param maximumZoomLevel the maximum zoom level
+ * @param totalMapZoom the top zoom level, essentially the height of the
+ * pyramid
+ * @param tileSize the size of the tiles in pixels (must be square)
+ * @param xr2l if the x goes r to l (is this backwards?)
+ * @param yt2b if the y goes top to bottom
+ * @param baseURL the base url for grabbing tiles
+ */
+ public TileFactoryInfo(String name, int minimumZoomLevel, int maximumZoomLevel, int totalMapZoom,
+ int tileSize, boolean xr2l, boolean yt2b,
+ String baseURL) {
+ this(name, minimumZoomLevel, maximumZoomLevel, totalMapZoom, tileSize, xr2l, yt2b, baseURL,
+ "x", "y", "z");
+ }
+
+ /**
+ * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo
+ * should be considered invariant, meaning that subclasses should ensure all
+ * the properties stay the same after the class is constructed. Returning
* different values of getTileSize() for example is considered an error and
* may result in unexpected behavior.
*
@@ -116,12 +197,6 @@ public class TileFactoryInfo {
* @param yparam the y parameter for the tile url
* @param zparam the z parameter for the tile url
*/
- /*
- * @param xr2l true if tile x is measured from the far left of the map to the far right, or
- * else false if based on the center line.
- * @param yt2b true if tile y is measured from the top (north pole) to the bottom (south pole)
- * or else false if based on the equator.
- */
public TileFactoryInfo(String name, int minimumZoomLevel, int maximumZoomLevel, int totalMapZoom,
int tileSize, boolean xr2l, boolean yt2b,
String baseURL, String xparam, String yparam, String zparam) {
@@ -172,9 +247,15 @@ public class TileFactoryInfo {
return minimumZoomLevel;
}
-// public void setMinimumZoomLevel(int minimumZoomLevel) {
-// this.minimumZoomLevel = minimumZoomLevel;
-// }
+ /**
+ * Set minimum zoom level
+ *
+ * @param minimumZoomLevel Minimum zoom level
+ */
+ public void setMinimumZoomLevel(int minimumZoomLevel) {
+ this.minimumZoomLevel = minimumZoomLevel;
+ }
+
/**
* Get maximum zoom level
*
@@ -183,24 +264,33 @@ public class TileFactoryInfo {
public int getMaximumZoomLevel() {
return maximumZoomLevel;
}
-//
-// public void setMaximumZoomLevel(int maximumZoomLevel) {
-// this.maximumZoomLevel = maximumZoomLevel;
-// }
/**
- * Get total map zoom
- *
- * @return Total map zoom
+ * Set maximum zoom level
+ *
+ * @param maximumZoomLevel Maximum zoom level
+ */
+ public void setMaximumZoomLevel(int maximumZoomLevel) {
+ this.maximumZoomLevel = maximumZoomLevel;
+ }
+
+ /**
+ * Get total map zoom level number
+ *
+ * @return Total map zoom level number
*/
public int getTotalMapZoom() {
return totalMapZoom;
}
- /*
- public void setTotalMapZoom(int totalMapZoom) {
- this.totalMapZoom = totalMapZoom;
- }
+
+ /**
+ * Set total map zoom level number
+ *
+ * @param totalMapZoom Total map zoom level number
*/
+ public void setTotalMapZoom(int totalMapZoom) {
+ this.totalMapZoom = totalMapZoom;
+ }
/**
* Get map width in tiles at zoom
@@ -224,7 +314,7 @@ public class TileFactoryInfo {
/**
* Returns the tile url for the specified tile at the specified zoom level.
- * By default it will generate a tile url using the base url and parameters
+ * By default, it will generate a tile url using the base url and parameters
* specified in the constructor. Thus if
*
*