diff --git a/clientResources/amc/modules/MapPanel/Layer/NCWMS.js b/clientResources/amc/modules/MapPanel/Layer/NCWMS.js
index 76094b5..90dde9d 100644
--- a/clientResources/amc/modules/MapPanel/Layer/NCWMS.js
+++ b/clientResources/amc/modules/MapPanel/Layer/NCWMS.js
@@ -62,7 +62,7 @@ Atlas.Layer.NCWMS = OpenLayers.Class(Atlas.Layer.WMS, {
}
if (projectionCode !== null && projectionCode === 'EPSG:900913') {
- // ncWMS do not support EPSG:900913, but it support EPSG:3857 which is the same thing.
+ // ncWMS do not support EPSG:900913, but it supports EPSG:3857 which is the same thing.
layerOptions.projection = 'EPSG:3857';
}
}
diff --git a/clientResources/amc/modules/MapPanel/Layer/THREDDS.js b/clientResources/amc/modules/MapPanel/Layer/THREDDS.js
index da6ffff..7e19c9f 100644
--- a/clientResources/amc/modules/MapPanel/Layer/THREDDS.js
+++ b/clientResources/amc/modules/MapPanel/Layer/THREDDS.js
@@ -62,7 +62,7 @@ Atlas.Layer.THREDDS = OpenLayers.Class(Atlas.Layer.WMS, {
}
if (projectionCode !== null && projectionCode === 'EPSG:900913') {
- // THREDDS do not support EPSG:900913, but it support EPSG:3857 which is the same thing.
+ // THREDDS do not support EPSG:900913, but it supports EPSG:3857 which is the same thing.
layerOptions.projection = 'EPSG:3857';
}
}
diff --git a/pom.xml b/pom.xml
index cb2ef61..faff771 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
au.gov.aims
atlasmapper
war
- 2.4.1
+ 2.4.2
AtlasMapper server and clients
This application compiled as a single War, that can be deployed in Tomcat, without any other dependency.\n\
It contains:\n\
diff --git a/src/main/java/au/gov/aims/atlasmapperserver/Utils.java b/src/main/java/au/gov/aims/atlasmapperserver/Utils.java
index 248877f..9470893 100644
--- a/src/main/java/au/gov/aims/atlasmapperserver/Utils.java
+++ b/src/main/java/au/gov/aims/atlasmapperserver/Utils.java
@@ -112,19 +112,14 @@ public class Utils {
.put("maxResolution", 156543.033928)
.put("resolutions", new JSONArray("[156543.033928, 78271.5169639999, 39135.7584820001, 19567.8792409999, 9783.93962049996, 4891.96981024998, 2445.98490512499, 1222.99245256249, 611.49622628138, 305.748113140558, 152.874056570411, 76.4370282850732, 38.2185141425366, 19.1092570712683, 9.55462853563415, 4.77731426794937, 2.38865713397468, 1.19432856685505, 0.597164283559817, 0.298582141647617]")));
- /*
- // TODO Try with 3857
- // OpenLayers is not able to do the re-projection of EPSG:3785.
- SUPPORTED_PROJECTIONS.put("EPSG:3785", new JSONObject()
- .put("projectionName", "Mercator (EPSG:3785)")
+ SUPPORTED_PROJECTIONS.put("EPSG:3857", new JSONObject()
+ .put("projectionName", "Pseudo-Mercator (EPSG:3857)")
.put("maxExtent", new JSONArray("[-20037508.342787, -20037508.342787, 20037508.342787, 20037508.342787]"))
.put("units", "m")
.put("numZoomLevels", 20)
.put("maxResolution", 156543.033928)
.put("resolutions", new JSONArray("[156543.033928, 78271.5169639999, 39135.7584820001, 19567.8792409999, 9783.93962049996, 4891.96981024998, 2445.98490512499, 1222.99245256249, 611.49622628138, 305.748113140558, 152.874056570411, 76.4370282850732, 38.2185141425366, 19.1092570712683, 9.55462853563415, 4.77731426794937, 2.38865713397468, 1.19432856685505, 0.597164283559817, 0.298582141647617]")));
- */
- // TODO Add more projections
} catch (JSONException ex) {
LOGGER.log(Level.SEVERE, "Can not create the JSON map of supported projections: {0}", Utils.getExceptionMessage(ex));
LOGGER.log(Level.FINE, "Stack trace:", ex);