start to break direct and indirect select apart

Author: mcwhittemore

src/events.js

@@ -1,13 +1,13 @@
 var ModeHandler = require('./modes/mode_handler');
-var browse = require('./modes/browse');
+var featureSelect = require('./modes/feature_select');
 var findTargetAt = require('./lib/find_target_at');
 
 module.exports = function(ctx) {
 
   var isDown = false;
 
   var events = {};
-  var currentMode = ModeHandler(browse(ctx));
+  var currentMode = ModeHandler(featureSelect(ctx));
 
   events.drag = function(event) {
     currentMode.drag(event);
@@ -71,9 +71,10 @@ module.exports = function(ctx) {
     startMode: function(mode) {
       currentMode.stop();
       currentMode = ModeHandler(mode);
+      ctx.store.render();
     },
     stopMode: function() {
-      api.startMode(browse(ctx));
+      api.startMode(featureSelect(ctx));
     },
     fire: function(name, event) {
       if (events[name]) {

src/feature_types/feature.js

@@ -10,7 +10,8 @@ var Feature = function(ctx, geojson) {
   this.drawProperties = {
     id: this.id,
     meta: 'feature',
-    selected: false
+    selected: false,
+    direct_selected: false
   }
 
   ctx.store.add(this);

src/feature_types/polygon.js

@@ -80,17 +80,19 @@ Polygon.prototype.getSourceFeatures = function() {
   var midpoints = [];
   var vertices = [];
 
-  for (var i = 0; i<geojson.geometry.coordinates.length; i++) {
-    var ring = geojson.geometry.coordinates[i];
-    for (var j = 0; j<ring.length; j++) {
-      var coord = ring[j];
-      var path = `${i}.${j}`;
-      vertices.push(toVertex(this.id, coord, path, this.selectedCoords[path] || false));
-
-      if (j > 0) {
-        var start = vertices[j-1];
-        var end = vertices[j];
-        midpoints.push(toMidpoint(this.id, start, end, this.ctx.map));
+  if (this.drawProperties.direct_selected) {
+    for (var i = 0; i<geojson.geometry.coordinates.length; i++) {
+      var ring = geojson.geometry.coordinates[i];
+      for (var j = 0; j<ring.length; j++) {
+        var coord = ring[j];
+        var path = `${i}.${j}`;
+        vertices.push(toVertex(this.id, coord, path, this.selectedCoords[path] || false));
+
+        if (j > 0) {
+          var start = vertices[j-1];
+          var end = vertices[j];
+          midpoints.push(toMidpoint(this.id, start, end, this.ctx.map));
+        }
       }
     }
   }

src/modes/browse.js

@@ -1,10 +1,10 @@
 module.exports = {
-  isOfMetaType: function(type, ctx) {
+  isOfMetaType: function(type) {
     return function(e) {
       var featureTarget = e.featureTarget;
       if (featureTarget) {
-        var feature = ctx.store.get(featureTarget.properties.id);
-        return featureTarget.properties.meta === type || (feature && type === 'vertex' && feature.type === 'Point');
+        console.log(featureTarget.properties.meta, type);
+        return featureTarget.properties.meta === type;
       }
       else {
         return false;
@@ -14,6 +14,9 @@ module.exports = {
   noFeature: function(e) {
     return e.featureTarget === undefined;
   },
+  isFeature: function(e) {
+    return e.featureTarget !== undefined && e.featureTarget.properties.meta === 'feature';
+  },
   isShiftDown: function(e) {
     return e.originalEvent.shiftKey === true;
   }

src/modes/common_selectors.js

@@ -0,0 +1,70 @@
+var dragVertex = require('./drag_vertex');
+var {noFeature, isOfMetaType, isShiftDown} = require('./common_selectors');
+
+module.exports = function(ctx, featureId) {
+  // This mode lets you select vertexes and move them around
+  // it only lets you do this for one feature
+  // the trash can, when you are in this mode, deletes vertecies if any are selected
+  // or this single feature otherwise.
+
+  var isThisFeature = function(e) {
+    return e.featureTarget && e.featureTarget.properties.parent == featureId;
+  }
+
+  var feature = ctx.store.get(featureId);
+
+  var onVertex = function(e) {
+    console.log('here');
+    if (isThisFeature(e)) {
+      var about = e.featureTarget.properties;
+      if (isShiftDown(e) === false) {
+        ctx.api.unselectAll();
+        // this shouldn't unselect if this this is selected
+      }
+
+      feature.selectCoordinate(about.path);
+      ctx.events.startMode(dragVertex(ctx, e.lngLat));
+    }
+  }
+
+  var selectVertex = function(e) {
+    var about = e.featureTarget.properties;
+    if (isShiftDown(e) === false) {
+      ctx.api.unselectAll();
+      // this shouldn't unselect if this this is selected
+    }
+
+    feature.selectCoordinate(about.path);
+  }
+
+  var onMidpoint = function(e) {
+    var about = e.featureTarget.properties;
+    feature.addCoordinate(about.path, about.lng, about.lat);
+    feature.selectCoordinate(about.path);
+    ctx.events.startMode(dragVertex(ctx, e.lngLat));
+  }
+
+  return {
+    start: function() {
+      feature.drawProperties.direct_selected = true;
+      this.on('mousedown', isOfMetaType('vertex'), onVertex);
+      this.on('mousedown', isOfMetaType('midpoint'), onMidpoint);
+      this.on('click', isOfMetaType('vertex'), selectVertex);
+      this.on('click', noFeature, function(e) {
+        ctx.api.unselectAll();
+        ctx.events.stopMode();
+      });
+      this.on('delete', function() {
+        if (feature.deleteSelectedCoords) {
+          feature.deleteSelectedCoords();
+          if (ctx.store.get(featureId) === undefined) {
+            ctx.events.stopMode();
+          }
+        }
+      });
+    },
+    stop: function() {
+      feature.drawProperties.direct_selected = false;
+    }
+  }
+}

src/modes/direct_select.js

@@ -0,0 +1,21 @@
+var {noFeature, isShiftDown, isFeature} = require('./common_selectors');
+
+var dragFeature = require('./drag_feature');
+var directSelect = require('./direct_select');
+
+module.exports = function(ctx) {
+
+  return {
+    start: function() {
+      this.on('click', noFeature, function(e) {
+        ctx.api.unselectAll();
+      });
+      this.on('doubleclick', isFeature, function(e) {
+        ctx.events.startMode(directSelect(ctx, e.featureTarget.properties.id));
+      });
+    },
+    stop: function() {
+      console.log('I guess you don\' want to browse any more');
+    }
+  }
+}