Revision 2613 org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.ogc/org.gvsig.raster.wmts.ogc.impl/src/main/java/org/gvsig/raster/wmts/ogc/impl/wmts_1_0_0/struct/WMTSLayer_1_0_0.java

View differences:

WMTSLayer_1_0_0.java
25 25

  
26 26
import org.gvsig.raster.wmts.ogc.impl.Tags;
27 27
import org.gvsig.raster.wmts.ogc.impl.base.WMTSServerDescription;
28
import org.gvsig.raster.wmts.ogc.impl.struct.WMTSBoundingBoxImpl;
29 28
import org.gvsig.raster.wmts.ogc.impl.struct.WMTSLayerImpl;
30 29
import org.gvsig.raster.wmts.ogc.impl.struct.WMTSTileMatrixSetLinkImpl;
31 30
import org.kxml2.io.KXmlParser;
......
60 59
					if (compareName(parser, Tags.WMTS_TITLE)) {
61 60
						setTitle(nextText(parser));
62 61
					} else if (compareName(parser, Tags.WMTS_WGS84BOUNDINGBOX)) {
63
						getWGS84BBox().parse(parser); 
62
						WMTSBoundingBox_1_0_0 bbox = new WMTSBoundingBox_1_0_0();
63
						//bbox.setForceLongitudeFirstAxisOrder(forceLongitudeFirstAxisOrder);
64
						bbox.parse(parser);  
65
						setWGS84BBox(bbox);
64 66
					} else if (compareName(parser, Tags.WMTS_IDENTIFIER)) {
65 67
						setIdentifier(nextText(parser)); 
66 68
					} else if (compareName(parser, Tags.WMTS_ABSTRACT)) {
......
70 72
						keywords.parse(parser);
71 73
						setKeywords(keywords.getKeywords());
72 74
					} else if (compareName(parser, Tags.WMTS_BOUNDINGBOX)) {
73
						getBBox().parse(parser);  
75
						WMTSBoundingBox_1_0_0 bbox = new WMTSBoundingBox_1_0_0();
76
						//bbox.setForceLongitudeFirstAxisOrder(forceLongitudeFirstAxisOrder);
77
						bbox.parse(parser);  
78
						setBBox(bbox);
74 79
					} else if (compareName(parser, Tags.WMTS_STYLE)) {
75 80
						WMTSStyle_1_0_0 style = new WMTSStyle_1_0_0();
76 81
						style.parse(parser); 
......
82 87
					} else if (compareName(parser, Tags.WMTS_DIMENSION)) {
83 88
						WMTSDimension_1_0_0 dimension = new WMTSDimension_1_0_0();
84 89
						dimension.parse(parser);  
85
						getDimension().add(dimension);
90
						getDimensions().add(dimension);
86 91
					} else if (compareName(parser, Tags.WMTS_METADATA)) {
87 92
						setMetadata(nextText(parser)); 
88 93
					} else if (compareName(parser, Tags.WMTS_TILEMATRIXSETLINK)) {
89 94
						WMTSTileMatrixSetLinkImpl tileMatrixSetLink = new WMTSTileMatrixSetLink_1_0_0();
90
						tileMatrixSetLink.setForceLongitudeFirstAxisOrder(forceLongitudeFirstAxisOrder);
95
						tileMatrixSetLink.setForceChangeAxisOrder(forceChangeAxisOrder);
91 96
						tileMatrixSetLink.parse(parser);
92 97
						getTileMatrixSetLink().add(tileMatrixSetLink); 
93 98
					} else if (compareName(parser, Tags.WMTS_RESOURCEURL)) {
......
110 115
    	
111 116
   		status.getLayerList().add(this);
112 117
    }
113
	
114
	public WMTSBoundingBoxImpl getWGS84BBox() {
115
		if(wgs84bbox == null) {
116
			wgs84bbox = new WMTSBoundingBox_1_0_0();
117
			wgs84bbox.setForceLongitudeFirstAxisOrder(forceLongitudeFirstAxisOrder);
118
		}
119
		return wgs84bbox;
120
	}
121
	
122
	public WMTSBoundingBoxImpl getBBox() {
123
		if(bbox == null) {
124
			bbox = new WMTSBoundingBox_1_0_0();
125
			bbox.setForceLongitudeFirstAxisOrder(forceLongitudeFirstAxisOrder);
126
		}
127
		return bbox;
128
	}
129 118
}

Also available in: Unified diff