Merge pull request #342 from RickMohr/use-treephoto-meta-perm

Use correct info to enable/disable adding tree photos

Author: RickMohr

OpenTreeMap/src/OTM/Controllers/OTMTreeDetailViewController.m

@@ -277,7 +277,7 @@ - (void)setKeys:(NSArray *)k
         speciesRow.detailDataKey = @"tree.sci_name";
     }
 
-    if ([[OTMEnvironment sharedEnvironment] photoFieldIsWritable]) {
+    if ([[OTMEnvironment sharedEnvironment] canAddTreePhoto]) {
         pictureRow = [[OTMStaticClickCellRenderer alloc]
                       initWithName:@"Tree Picture"
                                key:@""

OpenTreeMap/src/OTM/OTMEnvironment.h

@@ -139,7 +139,7 @@ extern NSString * const OTMEnvironmentDateStringShort;
 @property (nonatomic, strong) NSDictionary* config;
 @property (nonatomic, strong) NSURL *instanceLogoUrl;
 @property BOOL speciesFieldWritable;
-@property BOOL photoFieldWritable;
+@property BOOL canAddTreePhoto;
 @property BOOL canAddTree;
 
 
@@ -164,6 +164,5 @@ extern NSString * const OTMEnvironmentDateStringShort;
 - (NSString *)absolutePhotoUrlFromPhotoUrl:(NSString *)url;
 
 - (BOOL) speciesFieldIsWritable;
-- (BOOL) photoFieldIsWritable;
 
 @end

OpenTreeMap/src/OTM/OTMEnvironment.m

@@ -210,7 +210,7 @@ - (void)updateEnvironmentWithDictionary:(NSDictionary *)dict {
     self.config = [dict objectForKey:@"config"];
     self.mapViewTitle = [dict objectForKey:@"name"];
     self.canAddTree = [[[[dict objectForKey:@"meta_perms"] objectForKey:@"can_add_tree"] stringValue] isEqualToString:@"0"] ? NO : YES;
-    self.photoFieldWritable = [[[[self.fieldData objectForKey:@"treephoto.image"] objectForKey:@"can_write"] stringValue] isEqualToString:@"0"] ? NO : YES;
+    self.canAddTreePhoto = [[[[dict objectForKey:@"meta_perms"] objectForKey:@"can_edit_tree_photo"] stringValue] isEqualToString:@"0"] ? NO : YES;
     [self setSearchRegionRadiusInMeters:[[dict objectForKey:@"extent_radius"] doubleValue]];
 
     NSDictionary *missingAndStandardFilters = [dict objectForKey:@"search"];
@@ -670,10 +670,6 @@ - (BOOL) speciesFieldIsWritable {
     return self.speciesFieldWritable;
 }
 
-- (BOOL) photoFieldIsWritable {
-    return self.photoFieldWritable;
-}
-
 //
 // Functions from DB5
 // https://github.com/quartermaster/DB5/blob/7e41cef54e7ae9d3e97c2f8f23fc5cf14df72114/Source/VSTheme.m