ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #356 from bbinet/issue-356

Browse Source 
Can't parse http://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml
This commit is contained in:
Bruno Binet
2013-03-21 02:10:56 -07:00
parent 92a34824e6 641e492c95
commit 7038ac0c81
8 changed files with 594 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/parser/ogc/owscommon_v1.js
View File

@@ -178,7 +178,7 @@ ol.parser.ogc.OWSCommon_v1 = function() {
// LowerCorner = "min_x min_y"
// UpperCorner = "max_x max_y"
// It should normally depend on the projection
var readers = this.readers['http://www.opengis.net/ows'];
var readers = this.readers[node.namespaceURI];
readers['WGS84BoundingBox'].apply(this, [node, obj]);
},
'LowerCorner': function(node, obj) {

3
src/ol/projection/epsg3857.js
View File

@@ -57,7 +57,8 @@ ol.projection.EPSG3857.CODES = [
'EPSG:3857',
'EPSG:102100',
'EPSG:102113',
'EPSG:900913'
'EPSG:900913',
'urn:ogc:def:crs:EPSG:6.18:3:3857'
];

3
src/ol/projection/epsg4326.js
View File

@@ -44,7 +44,8 @@ ol.projection.EPSG4326.PROJECTIONS = [
new ol.projection.EPSG4326('CRS:84'),
new ol.projection.EPSG4326('EPSG:4326', 'neu'),
new ol.projection.EPSG4326('urn:ogc:def:crs:EPSG:6.6:4326', 'neu'),
new ol.projection.EPSG4326('urn:ogc:def:crs:OGC:1.3:CRS84')
new ol.projection.EPSG4326('urn:ogc:def:crs:OGC:1.3:CRS84'),
new ol.projection.EPSG4326('urn:ogc:def:crs:OGC:2:84')
];

1
src/ol/projection/projection.exports
View File

@@ -13,6 +13,7 @@
@exportProperty ol.ProjectionUnits.METERS
@exportSymbol ol.projection.addProjection
@exportSymbol ol.projection.addCommonProjections
@exportSymbol ol.projection.get
@exportSymbol ol.projection.getTransform
@exportSymbol ol.projection.getTransformFromProjections

3
src/ol/projection/projection.js
View File

@@ -336,7 +336,6 @@ ol.projection.addProj4jsProjection_ = function(proj4jsProjection) {
ol.projection.addProjection = function(projection) {
var projections = ol.projection.projections_;
var code = projection.getCode();
goog.asserts.assert(!goog.object.containsKey(projections, code));
projections[code] = projection;
ol.projection.addTransform(
projection, projection, ol.projection.cloneTransform);
@@ -397,8 +396,6 @@ ol.projection.addTransform = function(source, destination, transformFn) {
if (!goog.object.containsKey(transforms, sourceCode)) {
transforms[sourceCode] = {};
}
goog.asserts.assert(
!goog.object.containsKey(transforms[sourceCode], destinationCode));
transforms[sourceCode][destinationCode] = transformFn;
};