fix mapbox#194

bensleveritt · Jan 29, 2016 · f770392 · f770392
1 parent eddb319
commit f770392
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/feature_types/feature.js b/src/feature_types/feature.js
@@ -90,15 +90,15 @@ export default class Geometry {
    * @return {Object} GeoJSON feature
    */
   toGeoJSON() {
-    return {
+    return JSON.parse(JSON.stringify({
       type: 'Feature',
       id: this.drawId,
       properties: this.properties,
       geometry: {
         type: this.type,
         coordinates: this.coordinates
       }
-    };
+    }));
   }
 
   /**
@@ -119,7 +119,6 @@ export default class Geometry {
 
   setProperties(props) {
     props = JSON.parse(JSON.stringify(props));
-    props.drawId = this.drawId;
     this.properties = props;
     return this;
   }

diff --git a/src/store.js b/src/store.js
@@ -173,15 +173,14 @@ export default class Store {
     if (isStillAlive) { // checks to make sure we still have a map
       var featureBuckets = Object.keys(this._features).reduce((buckets, id) => {
         if (this._features[id].ready) {
+          let geojson = this._features[id].toGeoJSON();
+          geojson.properties.drawId = id;
+
           if (this._features[id].selected === true) {
-            let geojson = this._features[id].toGeoJSON();
-            geojson.properties.drawId = id;
             buckets.selected.push(geojson);
             buckets.selected = buckets.selected.concat(createMidpoints([this._features[id]], this._map), createVertices([this._features[id]]));
           }
           else {
-            let geojson = this._features[id].toGeoJSON();
-            geojson.properties.drawId = id;
             buckets.unselected.push(geojson);
           }
         }