Merge branch 'master' of github.com:openlayers/ol3 into vector

src/ol/parser/ogc/wmscapabilities.js

@@ -1,11 +1,18 @@
 goog.provide('ol.parser.ogc.WMSCapabilities');
 goog.require('ol.parser.ogc.Versioned');
+goog.require('ol.parser.ogc.WMSCapabilities_v1_0_0');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1_0');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1_1');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_1_1_WMSC');
 goog.require('ol.parser.ogc.WMSCapabilities_v1_3_0');
 
 
+/**
+ * @define {boolean} Whether to enable WMS Capabilities version 1.0.0.
+ */
+ol.ENABLE_WMSCAPS_1_0_0 = false;
+
+
 /**
  * @define {boolean} Whether to enable WMS Capabilities version 1.1.0.
  */
@@ -41,6 +48,9 @@ ol.parser.ogc.WMSCapabilities = function(opt_options) {
   opt_options = opt_options || {};
   opt_options['defaultVersion'] = '1.1.1';
   this.parsers = {};
+  if (ol.ENABLE_WMSCAPS_1_0_0) {
+    this.parsers['v1_0_0'] = ol.parser.ogc.WMSCapabilities_v1_0_0;
+  }
   if (ol.ENABLE_WMSCAPS_1_1_0) {
     this.parsers['v1_1_0'] = ol.parser.ogc.WMSCapabilities_v1_1_0;
   }

src/ol/parser/ogc/wmscapabilities_v1_0_0.js

@@ -0,0 +1,62 @@
+goog.provide('ol.parser.ogc.WMSCapabilities_v1_0_0');
+goog.require('goog.string');
+goog.require('ol.parser.ogc.WMSCapabilities_v1_1_0');
+
+
+
+/**
+ * @constructor
+ * @extends {ol.parser.ogc.WMSCapabilities_v1_1_0}
+ */
+ol.parser.ogc.WMSCapabilities_v1_0_0 = function() {
+  goog.base(this);
+  this.version = '1.0.0';
+  goog.object.extend(this.readers['http://www.opengis.net/wms'], {
+    'Format': function(node, obj) {
+      for (var i = 0, ii = node.childNodes.length; i < ii; i++) {
+        var child = node.childNodes[i];
+        var local = child.localName || child.nodeName.split(':').pop();
+        if (goog.isArray(obj['formats'])) {
+          obj['formats'].push(local);
+        } else {
+          obj['format'] = local;
+        }
+      }
+    },
+    'Keywords': function(node, obj) {
+      if (!goog.isDef(obj['keywords'])) {
+        obj['keywords'] = [];
+      }
+      var keywords = this.getChildValue(node).split(/ +/);
+      for (var i = 0, ii = keywords.length; i < ii; ++i) {
+        if (!goog.string.isEmpty(keywords[i])) {
+          obj['keywords'].push({'value': keywords[i]});
+        }
+      }
+    },
+    'OnlineResource': function(node, obj) {
+      obj['href'] = this.getChildValue(node);
+    },
+    'Get': function(node, obj) {
+      obj['get'] = {'href': node.getAttribute('onlineResource')};
+    },
+    'Post': function(node, obj) {
+      obj['post'] = {'href': node.getAttribute('onlineResource')};
+    },
+    'Map': function(node, obj) {
+      var reader = this.readers[this.defaultNamespaceURI]['GetMap'];
+      reader.apply(this, arguments);
+    },
+    'Capabilities': function(node, obj) {
+      var reader = this.readers[this.defaultNamespaceURI]['GetCapabilities'];
+      reader.apply(this, arguments);
+    },
+    'FeatureInfo': function(node, obj) {
+      var reader = this.readers[this.defaultNamespaceURI]['GetFeatureInfo'];
+      reader.apply(this, arguments);
+    }
+  });
+};
+goog.inherits(ol.parser.ogc.WMSCapabilities_v1_0_0,
+    ol.parser.ogc.WMSCapabilities_v1_1_0);
+

src/ol/parser/ogc/wmtscapabilities_v1_0_0.js

@@ -79,7 +79,7 @@ ol.parser.ogc.WMTSCapabilities_v1_0_0 = function() {
         var topLeftCorner = this.getChildValue(node);
         var coords = topLeftCorner.split(' ');
         var axisOrientation =
-            ol.projection.getFromCode(obj['supportedCRS']).getAxisOrientation();
+            ol.projection.get(obj['supportedCRS']).getAxisOrientation();
         obj['topLeftCorner'] = ol.Coordinate.fromProjectedArray(
             [parseFloat(coords[0]), parseFloat(coords[1])], axisOrientation);
       },