From 190db934eefe62ed5cf4814a24e81382fe89e7d4 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Wed, 2 Jul 2014 15:56:48 +0200
Subject: [PATCH] Always use goog.json.parse and set
 goog.json.USE_NATIVE_JSON=true

---
 build.py                           | 1 +
 buildcfg/examples-all.json         | 1 +
 buildcfg/ol.json                   | 1 +
 src/ol/browserfeature.js           | 8 --------
 src/ol/format/jsonfeatureformat.js | 8 +-------
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/build.py b/build.py
index 2c394c5c76..4b30d64173 100755
--- a/build.py
+++ b/build.py
@@ -236,6 +236,7 @@ def examples_star_json(name, match):
             ],
             "define": [
               "goog.dom.ASSUME_STANDARDS_MODE=true",
+              "goog.json.USE_NATIVE_JSON=true",
               "goog.DEBUG=false"
             ],
             "jscomp_error": [
diff --git a/buildcfg/examples-all.json b/buildcfg/examples-all.json
index 55deb4037f..599762fffd 100644
--- a/buildcfg/examples-all.json
+++ b/buildcfg/examples-all.json
@@ -18,6 +18,7 @@
     ],
     "define": [
       "goog.dom.ASSUME_STANDARDS_MODE=true",
+      "goog.json.USE_NATIVE_JSON=true",
       "goog.DEBUG=false"
     ],
     "jscomp_error": [
diff --git a/buildcfg/ol.json b/buildcfg/ol.json
index cb5cb4d117..bd721f5b31 100644
--- a/buildcfg/ol.json
+++ b/buildcfg/ol.json
@@ -14,6 +14,7 @@
     ],
     "define": [
       "goog.dom.ASSUME_STANDARDS_MODE=true",
+      "goog.json.USE_NATIVE_JSON=true",
       "goog.DEBUG=false"
     ],
     "jscomp_error": [
diff --git a/src/ol/browserfeature.js b/src/ol/browserfeature.js
index 74baa0f400..078e14a269 100644
--- a/src/ol/browserfeature.js
+++ b/src/ol/browserfeature.js
@@ -89,14 +89,6 @@ ol.BrowserFeature.HAS_DOM = ol.ENABLE_DOM;
 ol.BrowserFeature.HAS_GEOLOCATION = 'geolocation' in goog.global.navigator;
 
 
-/**
- * @const
- * @type {boolean}
- */
-ol.BrowserFeature.HAS_JSON_PARSE =
-    'JSON' in goog.global && 'parse' in goog.global.JSON;
-
-
 /**
  * True if browser supports touch events.
  * @const
diff --git a/src/ol/format/jsonfeatureformat.js b/src/ol/format/jsonfeatureformat.js
index 912c6f01c5..8997b4f9ff 100644
--- a/src/ol/format/jsonfeatureformat.js
+++ b/src/ol/format/jsonfeatureformat.js
@@ -2,7 +2,6 @@ goog.provide('ol.format.JSONFeature');
 
 goog.require('goog.asserts');
 goog.require('goog.json');
-goog.require('ol.BrowserFeature');
 goog.require('ol.format.Feature');
 goog.require('ol.format.FormatType');
 
@@ -32,12 +31,7 @@ ol.format.JSONFeature.prototype.getObject_ = function(source) {
   if (goog.isObject(source)) {
     return source;
   } else if (goog.isString(source)) {
-    var object;
-    if (ol.BrowserFeature.HAS_JSON_PARSE) {
-      object = /** @type {Object} */ (JSON.parse(source));
-    } else {
-      object = goog.json.parse(source);
-    }
+    var object = goog.json.parse(source);
     return goog.isDef(object) ? object : null;
   } else {
     goog.asserts.fail();