From e340111a2ac5856c3612627e4044a10dc3de6d64 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 23 Mar 2020 12:01:29 -0700
Subject: [PATCH] Fix issue where field geometry restrictions were not obeyed

---
 modules/ui/field.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/ui/field.js b/modules/ui/field.js
index c0496015c..09d18e6c4 100644
--- a/modules/ui/field.js
+++ b/modules/ui/field.js
@@ -296,7 +296,13 @@ export function uiField(context, presetField, entityIDs, options) {
     // A non-allowed field is hidden from the user altogether
     field.isAllowed = function() {
 
-        if (entityIDs && entityIDs.length > 1 && uiFields[field.type].supportsMultiselection === false) return;
+        if (entityIDs &&
+            entityIDs.length > 1 &&
+            uiFields[field.type].supportsMultiselection === false) return false;
+
+        if (field.geometry && entityIDs.some(function(entityID) {
+            return field.geometry.indexOf(context.graph().geometry(entityID)) === -1;
+        })) return false;
 
         if (field.countryCodes || field.notCountryCodes) {
             var extent = combinedEntityExtent();