Menu
▾
▴
[Geotools-commits] svn - r38790 - in trunk/modules/extension/xsd: xsd-core/src/main/java/org/geotools/xml xsd-gml2/src/main/java/org/geotools/gml2 xsd-gml2/src/main/java/org/geotools/gml2/bindings xsd-gml3/src/main/java/org/geotools/gml3 xsd-gml3/src/main/java/org/geotools/gml3/bindings xsd-gml3/src/main/java/org/geotools/gml3/v3_2 xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings xsd-gml3/src/test/java/org/geotools/gml3 xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings xsd-wfs/src/main/java/org/geotools/wfs/v2_0
Author: jdeolive
Date: 2012-05-31 07:50:12 -0700 (Thu, 31 May 2012)
New Revision: 38790
Added:
trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java
Modified:
trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java
trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java
trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java
trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java
trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java
trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java
trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java
trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java
Log:
GEOT-3581, making GML srsName syntax configurable in GML encoding
Modified: trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-core/src/main/java/org/geotools/xml/Configuration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -375,6 +375,26 @@
}
/**
+ * Returns the first dependency of this configuration of the specified type.
+ * @since 8.0
+ */
+ public <C extends Configuration> C getDependency(Class<C> clazz) {
+ //first try straight dependencies
+ for (Configuration dep : (List<Configuration>)getDependencies()) {
+ if (clazz.isInstance(dep)) {
+ return (C) dep;
+ }
+ }
+ //fall back to all
+ for (Configuration dep : (List<Configuration>)allDependencies()) {
+ if (clazz.isInstance(dep)) {
+ return (C) dep;
+ }
+ }
+ return null;
+ }
+
+ /**
* Adds a dependent configuration.
* <p>
* This method should only be called from the constructor.
Modified: trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/GMLConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -84,6 +84,11 @@
public static final QName ENCODE_FEATURE_MEMBER = new QName( "org.geotools.gml", "encodeFeatureMember" );
/**
+ * Srs name style to encode srsName URI's with
+ */
+ protected SrsSyntax srsSyntax = SrsSyntax.OGC_HTTP_URL;
+
+ /**
* Creates the new gml configuration, with a depenendency
* on {@link XLINKConfiguration}
*/
@@ -99,6 +104,23 @@
getProperties().add(Parser.Properties.PARSE_UNKNOWN_ATTRIBUTES);
}
+ /**
+ * Sets the syntax to use for encoding srs uris.
+ * <p>
+ * If this method is not explicitly called {@link SrsSyntax#LEGACY} is used as the default.
+ * </p>
+ */
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ this.srsSyntax = srsSyntax;
+ }
+
+ /**
+ * Returns the syntax to use for encoding srs uris.
+ */
+ public SrsSyntax getSrsSyntax() {
+ return srsSyntax;
+ }
+
public void registerBindings(MutablePicoContainer container) {
//geometry
container.registerComponentImplementation(GML.AbstractGeometryCollectionBaseType,
@@ -182,5 +204,7 @@
CoordinateArraySequenceFactory.instance());
container.registerComponentImplementation(GeometryFactory.class);
container.registerComponentImplementation(DefaultFeatureCollections.class);
+
+ container.registerComponentInstance(srsSyntax);
}
}
Added: trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java (rev 0)
+++ trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/SrsSyntax.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -0,0 +1,69 @@
+/*
+ * GeoTools - The Open Source Java GIS Toolkit
+ * http://geotools.org
+ *
+ * (C) 2002-2012, Open Source Geospatial Foundation (OSGeo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
+package org.geotools.gml2;
+
+/**
+ * Enumeration describing the syntax to use for an srsName URI.
+ *
+ * @author Justin Deoliveira, OpenGeo
+ *
+ */
+public enum SrsSyntax {
+
+ /**
+ * Commonly used syntax outside of gml that follows the form: <pre>EPSG:1234</pre>.
+ */
+ EPSG_CODE ("EPSG:"),
+
+ /**
+ * First form of url syntax used by GML 2.1.2 that follows the form:
+ *
+ * <pre>http://www.opengis.net/gml/srs/epsg.xml#1234</pre>.
+ */
+ OGC_HTTP_URL ("http://www.opengis.net/gml/srs/epsg.xml#"),
+
+ /**
+ * First form of urn syntax used by GML 3 that follows the form:
+ *
+ * <pre>urn:x-ogc:def:crs:EPSG:1234</pre>.
+ */
+ OGC_URN_EXPERIMENTAL ("urn:x-ogc:def:crs:EPSG:"),
+
+ /**
+ * Revised form of urn syntax used by GML 3 that follows the form:
+ *
+ * <pre>urn:ogc:def:crs:EPSG::1234</pre>.
+ */
+ OGC_URN ("urn:ogc:def:crs:EPSG::"),
+
+ /**
+ * Newest form from OGC using a url syntax of the form:
+ *
+ * <pre>"http://www.opengis.net/def/crs/EPSG/0/1234</pre>.
+ */
+ OGC_HTTP_URI ("http://www.opengis.net/def/crs/EPSG/0/");
+
+ private String prefix;
+
+ private SrsSyntax(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+}
Modified: trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml2/src/main/java/org/geotools/gml2/bindings/GML2EncodingUtils.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -27,6 +27,7 @@
import org.eclipse.xsd.XSDElementDeclaration;
import org.eclipse.xsd.XSDTypeDefinition;
import org.geotools.gml2.GML;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.metadata.iso.citation.Citations;
import org.geotools.referencing.CRS;
import org.geotools.referencing.CRS.AxisOrder;
@@ -91,7 +92,7 @@
public static String toURI(CoordinateReferenceSystem crs) {
return toURI(crs,false);
}
-
+
/**
* Encodes the crs object as a uri.
* <p>
@@ -99,17 +100,30 @@
* </p>
*/
public static String toURI(CoordinateReferenceSystem crs, boolean forceOldStyle) {
+ return toURI(crs, forceOldStyle ? SrsSyntax.OGC_HTTP_URL : SrsSyntax.OGC_URN_EXPERIMENTAL);
+ }
+
+ /**
+ * Encodes the crs object as a uri using the specified syntax.
+ * <p>
+ * The axis order of the crs is taken into account. In cases where
+ * </p>
+ */
+ public static String toURI(CoordinateReferenceSystem crs, SrsSyntax srsSyntax) {
String code = epsgCode(crs);
AxisOrder axisOrder = CRS.getAxisOrder(crs, true);
if (code != null) {
- if (forceOldStyle ||( (axisOrder == AxisOrder.EAST_NORTH) ||
- (axisOrder == AxisOrder.INAPPLICABLE)) ) {
- return "http://www.opengis.net/gml/srs/epsg.xml#" + code;
- } else {
- //return "urn:x-ogc:def:crs:EPSG:6.11.2:" + code;
- return "urn:x-ogc:def:crs:EPSG:" + code;
+ //do an axis order check, if axisOrder is east/north or inapplicable force the legacy
+ // syntax since the newer syntaxes define a different axis ordering
+ //JD: TODO: perhaps we don't want to do this override and just want to use the specified
+ // syntax verbatim, maintaining this check for to maintain the excision behavior of this
+ // method
+ if (axisOrder == AxisOrder.EAST_NORTH || axisOrder == AxisOrder.INAPPLICABLE) {
+ srsSyntax = SrsSyntax.OGC_HTTP_URL;
}
+
+ return srsSyntax.getPrefix() + code;
}
return null;
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/GMLConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -19,6 +19,7 @@
import javax.xml.namespace.QName;
import org.geotools.gml2.FeatureTypeCache;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml2.bindings.GMLCoordTypeBinding;
import org.geotools.gml2.bindings.GMLCoordinatesTypeBinding;
import org.geotools.gml3.bindings.AbstractFeatureCollectionTypeBinding;
@@ -125,7 +126,12 @@
* extended support for arcs and surface flag
*/
boolean extArcSurfaceSupport = false;
-
+
+ /**
+ * Srs name style to encode srsName URI's with
+ */
+ protected SrsSyntax srsSyntax = SrsSyntax.OGC_URN_EXPERIMENTAL;
+
public GMLConfiguration() {
this(false);
}
@@ -148,6 +154,23 @@
}
/**
+ * Sets the syntax to use for encoding srs uris.
+ * <p>
+ * If this method is not explicitly called {@link SrsSyntax#URN} is used as the default.
+ * </p>
+ */
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ this.srsSyntax = srsSyntax;
+ }
+
+ /**
+ * Returns the syntax to use for encoding srs uris.
+ */
+ public SrsSyntax getSrsSyntax() {
+ return srsSyntax;
+ }
+
+ /**
* Flag that when set triggers extended support for arcs and surfaces.
*/
public void setExtendedArcSurfaceSupport(boolean arcSurfaceSupport) {
@@ -314,5 +337,7 @@
if (isExtendedArcSurfaceSupport()) {
container.registerComponentInstance(new ArcParameters());
}
+
+ container.registerComponentInstance(srsSyntax);
}
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/AbstractGeometryTypeBinding.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -19,6 +19,7 @@
import javax.xml.namespace.QName;
import org.geotools.geometry.jts.coordinatesequence.CoordinateSequences;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.GML;
import org.geotools.gml3.GMLConfiguration;
import org.geotools.xml.AbstractComplexBinding;
@@ -70,15 +71,21 @@
*/
public class AbstractGeometryTypeBinding extends AbstractComplexBinding {
Configuration config;
+ SrsSyntax srsSyntax;
- public AbstractGeometryTypeBinding(Configuration config) {
+ public AbstractGeometryTypeBinding(Configuration config, SrsSyntax srsSyntax) {
this.config = config;
+ this.srsSyntax = srsSyntax;
}
public void setConfiguration(Configuration config) {
this.config = config;
}
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ this.srsSyntax = srsSyntax;
+ }
+
/**
* @generated
*/
@@ -124,7 +131,7 @@
if ("srsName".equals(name.getLocalPart())) {
CoordinateReferenceSystem crs = GML3EncodingUtils.getCRS(geometry);
if (crs != null) {
- return GML3EncodingUtils.toURI(crs);
+ return GML3EncodingUtils.toURI(crs, srsSyntax);
}
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/EnvelopeTypeBinding.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -22,6 +22,7 @@
import org.geotools.geometry.jts.LiteCoordinateSequence;
import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.GML;
import org.geotools.gml3.GMLConfiguration;
import org.geotools.xml.AbstractComplexBinding;
@@ -89,9 +90,11 @@
*/
public class EnvelopeTypeBinding extends AbstractComplexBinding {
Configuration config;
-
- public EnvelopeTypeBinding(Configuration config) {
+ SrsSyntax srsSyntax;
+
+ public EnvelopeTypeBinding(Configuration config, SrsSyntax srsSyntax) {
this.config = config;
+ this.srsSyntax = srsSyntax;
}
/**
@@ -185,7 +188,7 @@
String localName = name.getLocalPart();
if (localName.equals("srsName")) {
return GML3EncodingUtils.toURI(((ReferencedEnvelope) envelope)
- .getCoordinateReferenceSystem());
+ .getCoordinateReferenceSystem(), srsSyntax);
} else if (localName.equals("srsDimension")) {
//check if srsDimension is turned off
if (config.hasProperty(GMLConfiguration.NO_SRS_DIMENSION)) {
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/bindings/GML3EncodingUtils.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -28,6 +28,7 @@
import org.eclipse.xsd.XSDElementDeclaration;
import org.geotools.feature.NameImpl;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml2.bindings.GML2EncodingUtils;
import org.geotools.gml2.bindings.GMLEncodingUtils;
import org.geotools.gml3.GML;
@@ -87,13 +88,13 @@
return line.getCoordinateSequence();
}
- static URI toURI(CoordinateReferenceSystem crs) {
+ static URI toURI(CoordinateReferenceSystem crs, SrsSyntax srsSyntax) {
if (crs == null) {
return null;
}
try {
- String crsCode = GML2EncodingUtils.crs(crs);
+ String crsCode = GML2EncodingUtils.toURI(crs, srsSyntax);
if (crsCode != null) {
return new URI(crsCode);
@@ -105,13 +106,6 @@
}
}
- /**
- * @deprecated use {@link #toURI(CoordinateReferenceSystem)}.
- */
- static URI crs(CoordinateReferenceSystem crs) {
- return toURI(crs);
- }
-
static CoordinateReferenceSystem getCRS(Geometry g) {
return GML2EncodingUtils.getCRS(g);
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/GMLConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -18,6 +18,7 @@
import javax.xml.namespace.QName;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml2.bindings.GMLCoordinatesTypeBinding;
import org.geotools.gml3.bindings.AbstractFeatureCollectionTypeBinding;
import org.geotools.gml3.bindings.AbstractFeatureTypeBinding;
@@ -92,6 +93,11 @@
public static final QName NO_SRS_DIMENSION = org.geotools.gml3.GMLConfiguration.NO_SRS_DIMENSION;
/**
+ * gml3 configuration used to delegate to for configuration
+ */
+ org.geotools.gml3.GMLConfiguration delegate;
+
+ /**
* Creates a new configuration.
*
* @generated
@@ -106,26 +112,39 @@
*/
public GMLConfiguration(boolean arcSurfaceSupport) {
super(GML.getInstance());
- this.extArcSurfaceSupport = arcSurfaceSupport;
+ delegate = new org.geotools.gml3.GMLConfiguration(arcSurfaceSupport);
+ delegate.setSrsSyntax(SrsSyntax.OGC_URN);
}
/**
- * extended support for arcs and surface flag
- */
- boolean extArcSurfaceSupport = false;
-
- /**
* Flag that when set triggers extended support for arcs and surfaces.
*/
public void setExtendedArcSurfaceSupport(boolean extArcSurfaceSupport) {
- this.extArcSurfaceSupport = extArcSurfaceSupport;
+ delegate.setExtendedArcSurfaceSupport(extArcSurfaceSupport);
}
public boolean isExtendedArcSurfaceSupport() {
- return extArcSurfaceSupport;
+ return delegate.isExtendedArcSurfaceSupport();
}
-
+
/**
+ * Sets the syntax to use for encoding srs uris.
+ * <p>
+ * If this method is not explicitly called {@link SrsSyntax#URN2} is used as the default.
+ * </p>
+ */
+ public void setSrsSyntax(SrsSyntax srsSyntax) {
+ delegate.setSrsSyntax(srsSyntax);
+ }
+
+ /**
+ * Returns the syntax to use for encoding srs uris.
+ */
+ public SrsSyntax getSrsSyntax() {
+ return delegate.getSrsSyntax();
+ }
+
+ /**
* Registers the bindings for the configuration.
*
* @generated
@@ -250,7 +269,8 @@
@Override
protected void configureContext(MutablePicoContainer container) {
super.configureContext(container);
- new org.geotools.gml3.GMLConfiguration(extArcSurfaceSupport).configureContext(container);
+
+ delegate.configureContext(container);
container.unregisterComponent(GML3EncodingUtils.class);
container.registerComponentInstance(new GML32EncodingUtils());
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/main/java/org/geotools/gml3/v3_2/bindings/EnvelopeTypeBinding.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -18,13 +18,14 @@
import javax.xml.namespace.QName;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.v3_2.GML;
import org.geotools.xml.Configuration;
public class EnvelopeTypeBinding extends org.geotools.gml3.bindings.EnvelopeTypeBinding {
- public EnvelopeTypeBinding(Configuration config) {
- super(config);
+ public EnvelopeTypeBinding(Configuration config, SrsSyntax srsSyntax) {
+ super(config, srsSyntax);
}
@Override
Modified: trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/GML3EncodingTest.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -28,6 +28,7 @@
import org.apache.xerces.parsers.SAXParser;
import org.eclipse.xsd.XSDSchema;
import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.gml2.SrsSyntax;
import org.geotools.gml3.bindings.GML3MockData;
import org.geotools.gml3.bindings.TEST;
import org.geotools.gml3.bindings.TestConfiguration;
@@ -203,4 +204,21 @@
dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
assertFalse(dom.getDocumentElement().hasAttribute("srsDimension"));
}
+
+ public void testEncodeSrsSyntax() throws Exception {
+ GMLConfiguration gml = new GMLConfiguration();
+ Document dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
+ assertTrue(dom.getDocumentElement().getAttribute("srsName")
+ .startsWith("urn:x-ogc:def:crs:EPSG:"));
+
+ gml.setSrsSyntax(SrsSyntax.OGC_URN);
+ dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
+ assertTrue(dom.getDocumentElement().getAttribute("srsName")
+ .startsWith("urn:ogc:def:crs:EPSG::"));
+
+ gml.setSrsSyntax(SrsSyntax.OGC_HTTP_URI);
+ dom = new Encoder(gml).encodeAsDOM(GML3MockData.point(), GML.Point);
+ assertTrue(dom.getDocumentElement().getAttribute("srsName")
+ .startsWith("http://www.opengis.net/def/crs/EPSG/0/"));
+ }
}
Modified: trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java
===================================================================
--- trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-gml3/src/test/java/org/geotools/gml3/v3_2/bindings/PointTypeBindingTest.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -48,7 +48,6 @@
assertEquals(1,
dom.getElementsByTagNameNS(GML.NAMESPACE, GML.pos.getLocalPart()).getLength());
- //assertEquals("urn:x-ogc:def:crs:EPSG:6.11.2:4326",
- assertEquals("urn:x-ogc:def:crs:EPSG:4326", dom.getDocumentElement().getAttribute("srsName"));
+ assertEquals("urn:ogc:def:crs:EPSG::4326", dom.getDocumentElement().getAttribute("srsName"));
}
}
Modified: trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java
===================================================================
--- trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFS.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -4,7 +4,6 @@
import javax.xml.namespace.QName;
import org.geotools.filter.v2_0.FES;
-import org.geotools.gml3.v3_2.GML;
import org.geotools.ows.v1_1.OWS;
import org.geotools.xml.XSD;
@@ -38,7 +37,6 @@
protected void addDependencies(Set dependencies) {
dependencies.add(OWS.getInstance());
dependencies.add(FES.getInstance());
- dependencies.add(GML.getInstance());
}
/**
Modified: trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java
===================================================================
--- trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java 2012-05-30 19:16:05 UTC (rev 38789)
+++ trunk/modules/extension/xsd/xsd-wfs/src/main/java/org/geotools/wfs/v2_0/WFSConfiguration.java 2012-05-31 14:50:12 UTC (rev 38790)
@@ -9,15 +9,11 @@
import net.opengis.wfs20.DropStoredQueryType;
import net.opengis.wfs20.ResolveValueType;
import net.opengis.wfs20.ResultTypeType;
-import net.opengis.wfs20.StoredQueryDescriptionType;
import net.opengis.wfs20.UpdateActionType;
-import net.opengis.wfs20.ValueReferenceType;
import net.opengis.wfs20.Wfs20Factory;
import org.geotools.filter.v2_0.FESConfiguration;
import org.geotools.gml3.XSDIdRegistry;
-import org.geotools.gml3.v3_2.GML;
-import org.geotools.gml3.v3_2.GMLConfiguration;
import org.geotools.ows.v1_1.OWSConfiguration;
import org.geotools.wfs.v2_0.bindings.EnvelopePropertyTypeBinding;
import org.geotools.wfs.v2_0.bindings.ParameterParserDelegate;
@@ -57,7 +53,6 @@
addDependency(new OWSConfiguration());
addDependency(new FESConfiguration());
- addDependency(new GMLConfiguration());
}
@Override
|
