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

Do not translate projections using regular expressions

Browse Source
This commit is contained in:
ahocevar
2013-07-29 16:17:26 +02:00
parent e32da90f5a
commit 023d3faf3c
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/parser/ogc/gml.js
+7 -11
View File
@@ -490,23 +490,19 @@ goog.inherits(ol.parser.ogc.GML, ol.parser.XML);
/** /**
* Constants for regExes. * @return {string?} Axis orientation.
* @enum {RegExp}
*/ */
ol.parser.ogc.GML.regExes = { ol.parser.ogc.GML.prototype.getAxisOrientation = function() {
epsg: new RegExp('(http:\/\/www\.opengis\.net\/gml\/srs\/epsg.xml#|' + return goog.isDef(this.axisOrientation_) ? this.axisOrientation_ : 'enu';
'urn:x-ogc:def:crs:EPSG:)', 'i')
}; };
/** /**
* @return {string?} Axis orientation of the data that is currently being * @return {string?} SRS name.
* parsed.
*/ */
ol.parser.ogc.GML.prototype.getAxisOrientation = function() { ol.parser.ogc.GML.prototype.getSrsName = function() {
return goog.isDef(this.axisOrientation_) ? return this.srsName_;
this.axisOrientation_ : this.axisOrientation; }
};
/** /**
src/ol/proj/epsg4326projection.js
+3 -1
View File
@@ -44,7 +44,9 @@ ol.proj.EPSG4326.PROJECTIONS = [
new ol.proj.EPSG4326('EPSG:4326', 'neu'), new ol.proj.EPSG4326('EPSG:4326', 'neu'),
new ol.proj.EPSG4326('urn:ogc:def:crs:EPSG:6.6:4326', 'neu'), new ol.proj.EPSG4326('urn:ogc:def:crs:EPSG:6.6:4326', 'neu'),
new ol.proj.EPSG4326('urn:ogc:def:crs:OGC:1.3:CRS84'), new ol.proj.EPSG4326('urn:ogc:def:crs:OGC:1.3:CRS84'),
new ol.proj.EPSG4326('urn:ogc:def:crs:OGC:2:84') new ol.proj.EPSG4326('urn:ogc:def:crs:OGC:2:84'),
new ol.proj.EPSG4326('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'),
new ol.proj.EPSG4326('urn:x-ogc:def:crs:EPSG:4326', 'neu')
]; ];