Merge pull request #280 from RickMohr/filters-respect-permissions

Don't show a filter if user lacks permissions to read its field

Author: RickMohr

OpenTreeMap/resources/MainStoryboard_iPhone.storyboard

@@ -298,7 +298,7 @@
                                 <action selector="clearFilters:" destination="hZa-Zz-ezt" id="pkm-i2-3of"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" title="Done" style="done" id="50L-7V-eyE">
+                        <barButtonItem key="rightBarButtonItem" title="Search" style="done" id="50L-7V-eyE">
                             <connections>
                                 <action selector="updateFilters:" destination="hZa-Zz-ezt" id="IFD-Fh-Bcb"/>
                             </connections>

OpenTreeMap/src/OTM/OTMEnvironment.m

@@ -213,7 +213,8 @@ - (void)updateEnvironmentWithDictionary:(NSDictionary *)dict {
     NSArray *regFilters = [self filtersFromDictArray:missingAndStandardFilters[@"standard"]
                                          usingFields:[dict objectForKey:@"fields"]];
 
-    NSArray *missingFilters = [self missingFiltersFromDictArray:missingAndStandardFilters[@"missing"]];
+    NSArray *missingFilters = [self missingFiltersFromDictArray:missingAndStandardFilters[@"missing"]
+                                                    usingFields:[dict objectForKey:@"fields"]];
 
     self.filters = [regFilters arrayByAddingObjectsFromArray:missingFilters];
 
@@ -260,12 +261,16 @@ - (void)updateEnvironmentWithDictionary:(NSDictionary *)dict {
  * All missing filters are boolean filters with "existenceFilter"
  * set to true.
  */
-- (NSArray *)missingFiltersFromDictArray:(NSArray *)filterlist {
+- (NSArray *)missingFiltersFromDictArray:(NSArray *)filterlist usingFields:(NSDictionary *)fieldDict {
     NSMutableArray *filterArray = [NSMutableArray array];
 
     [filterlist enumerateObjectsUsingBlock:^(NSDictionary *filter, NSUInteger idx, BOOL *stop) {
             NSString *fieldKey = filter[@"identifier"];
             NSString *fieldName = filter[@"label"];
+        
+            if ([fieldDict objectForKey:fieldKey] == nil) {
+                return;  // Skip field because user lacks read permission
+            }
 
             OTMFilter *afilter = [[OTMBoolFilter alloc] initWithName:fieldName
                                                                  key:fieldKey
@@ -287,6 +292,10 @@ - (NSArray *)filtersFromDictArray:(NSArray *)filterlist usingFields:(NSDictionar
             NSString *fieldName = filter[@"label"];
             NSString *filterType = filter[@"search_type"];
 
+            if ([fDict objectForKey:fieldKey] == nil) {
+                return;  // Skip field because user lacks read permission
+            }
+        
             OTMFilter *afilter = nil;
 
             if ([filterType isEqualToString:@"CHOICE"] || [filterType isEqualToString:@"MULTICHOICE"]) {