From f7113df3760afdbb5d11b8717f6e2274c5feaafb Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 11 Jun 2010 14:38:42 +0000 Subject: [PATCH] Adding namespaces to versioned OWSCommon formats. Adding regExes to OWSCommon v1 prototype. r=bartvde (closes #2671) git-svn-id: http://svn.openlayers.org/trunk/openlayers@10387 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Format/OWSCommon/v1.js | 19 +++++++++++-------- lib/OpenLayers/Format/OWSCommon/v1_0_0.js | 9 +++++++++ lib/OpenLayers/Format/OWSCommon/v1_1_0.js | 9 +++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/lib/OpenLayers/Format/OWSCommon/v1.js b/lib/OpenLayers/Format/OWSCommon/v1.js index 83e0e125d2..422ea28b49 100644 --- a/lib/OpenLayers/Format/OWSCommon/v1.js +++ b/lib/OpenLayers/Format/OWSCommon/v1.js @@ -16,14 +16,17 @@ if (!OpenLayers.Format.OWSCommon) { */ OpenLayers.Format.OWSCommon.v1 = OpenLayers.Class(OpenLayers.Format.XML, { - /** - * Property: namespaces - * {Object} Mapping of namespace aliases to namespace URIs. - */ - namespaces: { - xlink: "http://www.w3.org/1999/xlink" - }, - + /** + * Property: regExes + * Compiled regular expressions for manipulating strings. + */ + regExes: { + trimSpace: (/^\s*|\s*$/g), + removeSpace: (/\s*/g), + splitSpace: (/\s+/), + trimComma: (/\s*,\s*/g) + }, + /** * Property: readers * Contains public functions, grouped by namespace prefix, that will diff --git a/lib/OpenLayers/Format/OWSCommon/v1_0_0.js b/lib/OpenLayers/Format/OWSCommon/v1_0_0.js index b767340031..7f2e7899e0 100644 --- a/lib/OpenLayers/Format/OWSCommon/v1_0_0.js +++ b/lib/OpenLayers/Format/OWSCommon/v1_0_0.js @@ -13,6 +13,15 @@ */ OpenLayers.Format.OWSCommon.v1_0_0 = OpenLayers.Class(OpenLayers.Format.OWSCommon.v1, { + /** + * Property: namespaces + * {Object} Mapping of namespace aliases to namespace URIs. + */ + namespaces: { + ows: "http://www.opengis.net/ows/1.0", + xlink: "http://www.w3.org/1999/xlink" + }, + /** * Property: readers * Contains public functions, grouped by namespace prefix, that will diff --git a/lib/OpenLayers/Format/OWSCommon/v1_1_0.js b/lib/OpenLayers/Format/OWSCommon/v1_1_0.js index c8423633d5..310dbe5269 100644 --- a/lib/OpenLayers/Format/OWSCommon/v1_1_0.js +++ b/lib/OpenLayers/Format/OWSCommon/v1_1_0.js @@ -12,6 +12,15 @@ * It is not intended to be used on its own. */ OpenLayers.Format.OWSCommon.v1_1_0 = OpenLayers.Class(OpenLayers.Format.OWSCommon.v1, { + + /** + * Property: namespaces + * {Object} Mapping of namespace aliases to namespace URIs. + */ + namespaces: { + ows: "http://www.opengis.net/ows/1.1", + xlink: "http://www.w3.org/1999/xlink" + }, /** * Property: readers