Pass all properties when creating midpoints and vertices, close mapbo…

…x#846
drewbo · Dec 13, 2018 · f03ce78 · f03ce78
1 parent e252c53
commit f03ce78
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/lib/create_midpoint.js b/src/lib/create_midpoint.js
@@ -20,8 +20,9 @@ module.exports = function(parent, startVertex, endVertex, map) {
   return {
     type: Constants.geojsonTypes.FEATURE,
     properties: {
+      ...parent.properties,
       meta: Constants.meta.MIDPOINT,
-      parent: parent,
+      parent: parent.id,
       lng: mid.lng,
       lat: mid.lat,
       coord_path: endVertex.properties.coord_path
@@ -31,4 +32,6 @@ module.exports = function(parent, startVertex, endVertex, map) {
       coordinates: [mid.lng, mid.lat]
     }
   };
+
+
 };
diff --git a/src/lib/create_supplementary_points.js b/src/lib/create_supplementary_points.js
@@ -10,7 +10,7 @@ function createSupplementaryPoints(geojson, options = {}, basePath = null) {
 
   if (type === Constants.geojsonTypes.POINT) {
     // For points, just create a vertex
-    supplementaryPoints.push(createVertex(featureId, coordinates, basePath, isSelectedPath(basePath)));
+    supplementaryPoints.push(createVertex(geojson, coordinates, basePath, isSelectedPath(basePath)));
   } else if (type === Constants.geojsonTypes.POLYGON) {
     // Cycle through a Polygon's rings and
     // process each line
@@ -28,13 +28,13 @@ function createSupplementaryPoints(geojson, options = {}, basePath = null) {
     let lastVertex = null;
     line.forEach((point, pointIndex) => {
       const pointPath = (lineBasePath !== undefined && lineBasePath !== null) ? `${lineBasePath}.${pointIndex}` : String(pointIndex);
-      const vertex = createVertex(featureId, point, pointPath, isSelectedPath(pointPath));
+      const vertex = createVertex(geojson, point, pointPath, isSelectedPath(pointPath));
 
       // If we're creating midpoints, check if there was a
       // vertex before this one. If so, add a midpoint
       // between that vertex and this one.
       if (options.midpoints && lastVertex) {
-        const midpoint = createMidpoint(featureId, lastVertex, vertex, options.map);
+        const midpoint = createMidpoint(geojson, lastVertex, vertex, options.map);
         if (midpoint) {
           supplementaryPoints.push(midpoint);
         }

diff --git a/src/lib/create_vertex.js b/src/lib/create_vertex.js
@@ -11,12 +11,13 @@ const Constants = require('../constants');
  * @param {boolean} selected
  * @return {GeoJSON} Point
  */
-module.exports = function(parentId, coordinates, path, selected) {
+module.exports = function(parent, coordinates, path, selected) {
   return {
     type: Constants.geojsonTypes.FEATURE,
     properties: {
+      ...parent.properties,
       meta: Constants.meta.VERTEX,
-      parent: parentId,
+      parent: parent.id,
       coord_path: path,
       active: (selected) ? Constants.activeStates.ACTIVE : Constants.activeStates.INACTIVE
     },