Don't render multipolygon members in yellow when the multipolygon is …

…selected (close #6558)
facebook · Jun 26, 2019 · 4ab9712 · 4ab9712
1 parent bfd2c13
commit 4ab9712
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/modes/select.js b/modules/modes/select.js
@@ -372,7 +372,7 @@ export function modeSelect(context, selectedIDs) {
                 }
             } else {
                 context.surface()
-                    .selectAll(utilDeepMemberSelector(selectedIDs, context.graph()))
+                    .selectAll(utilDeepMemberSelector(selectedIDs, context.graph(), true /* skipMultipolgonMembers */))
                     .classed('selected-member', true);
                 selection
                     .classed('selected', true);

diff --git a/modules/util/util.js b/modules/util/util.js
@@ -91,7 +91,7 @@ export function utilEntityOrDeepMemberSelector(ids, graph) {
 
 // returns an selector to select entity ids for:
 //  - deep descendant entityIDs for any of those entities that are relations
-export function utilDeepMemberSelector(ids, graph) {
+export function utilDeepMemberSelector(ids, graph, skipMultipolgonMembers) {
     var idsSet = new Set(ids);
     var seen = new Set();
     var returners = new Set();
@@ -108,7 +108,7 @@ export function utilDeepMemberSelector(ids, graph) {
 
         var entity = graph.hasEntity(id);
         if (!entity || entity.type !== 'relation') return;
-
+        if (skipMultipolgonMembers && entity.isMultipolygon()) return;
         entity.members
             .map(function(member) { return member.id; })
             .forEach(collectDeepDescendants);   // recurse