pass GeoJSON in stringified form

This is a reapplication of #2001 without changing the API, and serves as the middle ground for improving `setData` performance as discussed in #1504.
mapbox · Mar 4, 2016 · c634d8c · c634d8c
1 parent 07838e4
commit c634d8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/js/source/geojson_source.js b/js/source/geojson_source.js
@@ -147,7 +147,7 @@ GeoJSONSource.prototype = util.inherit(Evented, /** @lends GeoJSONSource.prototy
             data = urlResolve(window.location.href, data);
         }
         this.workerID = this.dispatcher.send('parse geojson', {
-            data: data,
+            data: typeof data === 'object' ? JSON.stringify(data) : data,
             tileSize: this.tileSize,
             source: this.id,
             geojsonVtOptions: this.geojsonVtOptions,

diff --git a/js/source/worker.js b/js/source/worker.js
@@ -132,10 +132,10 @@ util.extend(Worker.prototype, {
         // explicit origin or absolute path.
         // ie: /foo/bar.json or http://example.com/bar.json
         // but not ../foo/bar.json
-        if (typeof params.data === 'string') {
-            ajax.getJSON(params.data, indexData);
+        if (params.data.charAt(0) === '{') {
+            indexData(null, JSON.parse(params.data));
         }
-        else indexData(null, params.data);
+        else ajax.getJSON(params.data, indexData);
     },
 
     'load geojson tile': function(params, callback) {