Rename WGS84 enum for longitude

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
index 5b0707e10a89293e7d4795251f0616b5d3bddbac..2e33c3487a04e6a2d9c2bd411557aa7103fd9a46 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
@@ -50,7 +50,7 @@ public interface EntityNames {
        @Deprecated
        final String GEO_LAT = WGS84PosName.lat.get();
        @Deprecated
-       final String GEO_LONG = WGS84PosName.lng.get();
+       final String GEO_LONG = WGS84PosName.lon.get();
        @Deprecated
        final String GEO_ALT = WGS84PosName.alt.get();
 

diff --git a/org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java b/org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java
index 49de2d8fe25453571e33856416c16e67d024c961..4ba1a1307f9d10fb3fb54eb12ed8ea760dc4c4f1 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/WGS84PosName.java
@@ -8,7 +8,7 @@ import org.argeo.api.acr.QNamed;
  * @see https://www.w3.org/2003/01/geo/
  */
 public enum WGS84PosName implements QNamed {
-       lat, lng("long"), alt;
+       lat, lon("long"), alt;
 
        private final String localName;
 

diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java b/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java
index d60d51d788249af5d334f4b632d7095da2e606a3..92f41ac1ab9088c52f8f755508b7efb614389eff 100644 (file)
--- a/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java
+++ b/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java
@@ -171,7 +171,7 @@ public class WfsHttpHandler implements HttpHandler {
        protected Geometry getDefaultGeometry(Content content) {
                if (content.hasContentClass(EntityType.geopoint)) {
                        double latitude = content.get(WGS84PosName.lat, Double.class).get();
-                       double longitude = content.get(WGS84PosName.lng, Double.class).get();
+                       double longitude = content.get(WGS84PosName.lon, Double.class).get();
 
                        Coordinate coordinate = new Coordinate(longitude, latitude);
                        Point the_geom = JTS.GEOMETRY_FACTORY.createPoint(coordinate);
@@ -283,7 +283,7 @@ public class WfsHttpHandler implements HttpHandler {
                                                return;
 
                                        double latitude = c.get(WGS84PosName.lat, Double.class).get();
-                                       double longitude = c.get(WGS84PosName.lng, Double.class).get();
+                                       double longitude = c.get(WGS84PosName.lon, Double.class).get();
 
                                        Coordinate coordinate = new Coordinate(longitude, latitude);
                                        the_geom = geometryFactory.createPoint(coordinate);
@@ -355,7 +355,7 @@ public class WfsHttpHandler implements HttpHandler {
 //                     } else {
                        if (c.hasContentClass(EntityType.geopoint)) {
                                double latitude = c.get(WGS84PosName.lat, Double.class).get();
-                               double longitude = c.get(WGS84PosName.lng, Double.class).get();
+                               double longitude = c.get(WGS84PosName.lon, Double.class).get();
 
                                Coordinate coordinate = new Coordinate(longitude, latitude);
                                the_geom = JTS.GEOMETRY_FACTORY.createPoint(coordinate);

diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
index 6cc71d6f97716188ff36d3b55f1d8cee706e9b7c..de88a232fc57db372c6f9e62f3ba918415e07ae1 100644 (file)
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
@@ -165,7 +165,7 @@ public class OdkManifestServlet extends HttpServlet {
                                                Node field = row.getNode("geopoint");
                                                if (field != null && field.isNodeType(EntityType.geopoint.get())) {
                                                        double lat = field.getProperty(WGS84PosName.lat.get()).getDouble();
-                                                       double lon = field.getProperty(WGS84PosName.lng.get()).getDouble();
+                                                       double lon = field.getProperty(WGS84PosName.lon.get()).getDouble();
                                                        double alt = field.hasProperty(WGS84PosName.alt.get())
                                                                        ? field.getProperty(WGS84PosName.alt.get()).getDouble()
                                                                        : Double.NaN;