Fix incorrect parameters for metadata types

4 files changed, 50 insertions, 38 deletions

diff --git a/SmartDeviceLink/SDLMetadataTags.m b/SmartDeviceLink/SDLMetadataTags.m
index 9a071ed0d..745e43a39 100644
--- a/SmartDeviceLink/SDLMetadataTags.m
+++ b/SmartDeviceLink/SDLMetadataTags.m
@@ -52,14 +52,14 @@
 
 - (void)setMainField1:(NSMutableArray<SDLMetadataType *> *)mainField1 {
     if (mainField1 != nil) {
-        [store setObject:mainField1 forKey:NAMES_mainField1Type];
+        [store setObject:mainField1 forKey:NAMES_mainField1];
     } else {
-        [store removeObjectForKey:NAMES_mainField1Type];
+        [store removeObjectForKey:NAMES_mainField1];
     }
 }
 
 - (NSMutableArray<SDLMetadataType *> *)mainField1 {
-    NSMutableArray *array = [store objectForKey:NAMES_mainField1Type];
+    NSMutableArray *array = [store objectForKey:NAMES_mainField1];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
     } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
@@ -75,14 +75,14 @@
 
 - (void)setMainField2:(NSMutableArray<SDLMetadataType *> *)mainField2 {
     if (mainField2 != nil) {
-        [store setObject:mainField2 forKey:NAMES_mainField2Type];
+        [store setObject:mainField2 forKey:NAMES_mainField2];
     } else {
-        [store removeObjectForKey:NAMES_mainField2Type];
+        [store removeObjectForKey:NAMES_mainField2];
     }
 }
 
 - (NSMutableArray<SDLMetadataType *> *)mainField2 {
-    NSMutableArray *array = [store objectForKey:NAMES_mainField2Type];
+    NSMutableArray *array = [store objectForKey:NAMES_mainField2];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
     } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
@@ -98,14 +98,14 @@
 
 - (void)setMainField3:(NSMutableArray<SDLMetadataType *> *)mainField3 {
     if (mainField3 != nil) {
-        [store setObject:mainField3 forKey:NAMES_mainField3Type];
+        [store setObject:mainField3 forKey:NAMES_mainField3];
     } else {
-        [store removeObjectForKey:NAMES_mainField3Type];
+        [store removeObjectForKey:NAMES_mainField3];
     }
 }
 
 - (NSMutableArray<SDLMetadataType *> *)mainField3 {
-    NSMutableArray *array = [store objectForKey:NAMES_mainField3Type];
+    NSMutableArray *array = [store objectForKey:NAMES_mainField3];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
     } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
@@ -121,14 +121,14 @@
 
 - (void)setMainField4:(NSMutableArray<SDLMetadataType *> *)mainField4 {
     if (mainField4 != nil) {
-        [store setObject:mainField4 forKey:NAMES_mainField4Type];
+        [store setObject:mainField4 forKey:NAMES_mainField4];
     } else {
-        [store removeObjectForKey:NAMES_mainField4Type];
+        [store removeObjectForKey:NAMES_mainField4];
     }
 }
 
 - (NSMutableArray<SDLMetadataType *> *)mainField4 {
-    NSMutableArray *array = [store objectForKey:NAMES_mainField4Type];
+    NSMutableArray *array = [store objectForKey:NAMES_mainField4];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
     } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
diff --git a/SmartDeviceLink/SDLMetadataType.h b/SmartDeviceLink/SDLMetadataType.h
index 96e65552a..2141756cc 100644
--- a/SmartDeviceLink/SDLMetadataType.h
+++ b/SmartDeviceLink/SDLMetadataType.h
@@ -116,4 +116,11 @@
  */
 + (SDLMetadataType *)HUMIDITY;
 
+/**
+ The data in this field is not of a common type or should not be processed.  Any time a field does not have a type parameter it is considered as the none type.
+
+ @return A SDLTextFieldType object with value of *none*
+ */
++ (SDLMetadataType *)NONE;
+
 @end
diff --git a/SmartDeviceLink/SDLMetadataType.m b/SmartDeviceLink/SDLMetadataType.m
index 8b5e448d8..c232b0948 100644
--- a/SmartDeviceLink/SDLMetadataType.m
+++ b/SmartDeviceLink/SDLMetadataType.m
@@ -20,6 +20,7 @@ SDLMetadataType *SDLMetadataType_MAXIMUM_TEMPERATURE = nil;
 SDLMetadataType *SDLMetadataType_MINIMUM_TEMPERATURE = nil;
 SDLMetadataType *SDLMetadataType_WEATHER_TERM = nil;
 SDLMetadataType *SDLMetadataType_HUMIDITY = nil;
+SDLMetadataType *SDLMetadataType_NONE = nil;
 
 NSArray *SDLMetadataType_values = nil;
 
@@ -48,93 +49,101 @@ NSArray *SDLMetadataType_values = nil;
                                    SDLMetadataType.MAXIMUM_TEMPERATURE,
                                    SDLMetadataType.MINIMUM_TEMPERATURE,
                                    SDLMetadataType.WEATHER_TERM,
-                                   SDLMetadataType.HUMIDITY];
+                                   SDLMetadataType.HUMIDITY,
+                                   SDLMetadataType_NONE];
     }
     return SDLMetadataType_values;
 }
 
 + (SDLMetadataType *)MEDIA_TITLE {
     if (SDLMetadataType_MEDIA_TITLE== nil) {
-        SDLMetadataType_MEDIA_TITLE = [[SDLMetadataType alloc] initWithValue:@"MEDIA_TITLE"];
+        SDLMetadataType_MEDIA_TITLE = [[SDLMetadataType alloc] initWithValue:@"mediaTitle"];
     }
     return SDLMetadataType_MEDIA_TITLE;
 }
 
 + (SDLMetadataType *)MEDIA_ARTIST {
     if (SDLMetadataType_MEDIA_ARTIST== nil) {
-        SDLMetadataType_MEDIA_ARTIST = [[SDLMetadataType alloc] initWithValue:@"MEDIA_ARTIST"];
+        SDLMetadataType_MEDIA_ARTIST = [[SDLMetadataType alloc] initWithValue:@"mediaArtist"];
     }
     return SDLMetadataType_MEDIA_ARTIST;
 }
 
 + (SDLMetadataType *)MEDIA_ALBUM {
     if (SDLMetadataType_MEDIA_ALBUM== nil) {
-        SDLMetadataType_MEDIA_ALBUM = [[SDLMetadataType alloc] initWithValue:@"MEDIA_ALBUM"];
+        SDLMetadataType_MEDIA_ALBUM = [[SDLMetadataType alloc] initWithValue:@"mediaAlbum"];
     }
     return SDLMetadataType_MEDIA_ALBUM;
 }
 
 + (SDLMetadataType *)MEDIA_YEAR {
-    if (SDLMetadataType_MEDIA_YEAR== nil) {
-        SDLMetadataType_MEDIA_YEAR = [[SDLMetadataType alloc] initWithValue:@"MEDIA_YEAR"];
+    if (SDLMetadataType_MEDIA_YEAR == nil) {
+        SDLMetadataType_MEDIA_YEAR = [[SDLMetadataType alloc] initWithValue:@"mediaArtist"];
     }
     return SDLMetadataType_MEDIA_YEAR;
 }
 
 + (SDLMetadataType *)MEDIA_GENRE {
-    if (SDLMetadataType_MEDIA_GENRE== nil) {
-        SDLMetadataType_MEDIA_GENRE = [[SDLMetadataType alloc] initWithValue:@"MEDIA_GENRE"];
+    if (SDLMetadataType_MEDIA_GENRE == nil) {
+        SDLMetadataType_MEDIA_GENRE = [[SDLMetadataType alloc] initWithValue:@"mediaGenre"];
     }
     return SDLMetadataType_MEDIA_GENRE;
 }
 
 + (SDLMetadataType *)MEDIA_STATION {
-    if (SDLMetadataType_MEDIA_STATION== nil) {
-        SDLMetadataType_MEDIA_STATION = [[SDLMetadataType alloc] initWithValue:@"MEDIA_STATION"];
+    if (SDLMetadataType_MEDIA_STATION == nil) {
+        SDLMetadataType_MEDIA_STATION = [[SDLMetadataType alloc] initWithValue:@"mediaStation"];
     }
     return SDLMetadataType_MEDIA_STATION;
 }
 
 + (SDLMetadataType *)RATING {
-    if (SDLMetadataType_RATING== nil) {
-        SDLMetadataType_RATING = [[SDLMetadataType alloc] initWithValue:@"RATING"];
+    if (SDLMetadataType_RATING == nil) {
+        SDLMetadataType_RATING = [[SDLMetadataType alloc] initWithValue:@"rating"];
     }
     return SDLMetadataType_RATING;
 }
 
 + (SDLMetadataType *)CURRENT_TEMPERATURE {
-    if (SDLMetadataType_CURRENT_TEMPERATURE== nil) {
-        SDLMetadataType_CURRENT_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"CURRENT_TEMPERATURE"];
+    if (SDLMetadataType_CURRENT_TEMPERATURE == nil) {
+        SDLMetadataType_CURRENT_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"currentTemperature"];
     }
     return SDLMetadataType_CURRENT_TEMPERATURE;
 }
 
 + (SDLMetadataType *)MAXIMUM_TEMPERATURE {
-    if (SDLMetadataType_MAXIMUM_TEMPERATURE== nil) {
-        SDLMetadataType_MAXIMUM_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"MAXIMUM_TEMPERATURE"];
+    if (SDLMetadataType_MAXIMUM_TEMPERATURE == nil) {
+        SDLMetadataType_MAXIMUM_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"maximumTemperature"];
     }
     return SDLMetadataType_MAXIMUM_TEMPERATURE;
 }
 
 + (SDLMetadataType *)MINIMUM_TEMPERATURE {
-    if (SDLMetadataType_MINIMUM_TEMPERATURE== nil) {
-        SDLMetadataType_MINIMUM_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"MINIMUM_TEMPERATURE"];
+    if (SDLMetadataType_MINIMUM_TEMPERATURE == nil) {
+        SDLMetadataType_MINIMUM_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"minimumTemperature"];
     }
     return SDLMetadataType_MINIMUM_TEMPERATURE;
 }
 
 + (SDLMetadataType *)WEATHER_TERM {
-    if (SDLMetadataType_WEATHER_TERM== nil) {
-        SDLMetadataType_WEATHER_TERM = [[SDLMetadataType alloc] initWithValue:@"WEATHER_TERM"];
+    if (SDLMetadataType_WEATHER_TERM == nil) {
+        SDLMetadataType_WEATHER_TERM = [[SDLMetadataType alloc] initWithValue:@"weatherTerm"];
     }
     return SDLMetadataType_WEATHER_TERM;
 }
 
 + (SDLMetadataType *)HUMIDITY {
-    if (SDLMetadataType_HUMIDITY== nil) {
-        SDLMetadataType_HUMIDITY = [[SDLMetadataType alloc] initWithValue:@"HUMIDITY"];
+    if (SDLMetadataType_HUMIDITY == nil) {
+        SDLMetadataType_HUMIDITY = [[SDLMetadataType alloc] initWithValue:@"humidity"];
     }
     return SDLMetadataType_HUMIDITY;
 }
 
++ (SDLMetadataType *)NONE {
+    if (SDLMetadataType_NONE == nil) {
+        SDLMetadataType_NONE = [[SDLMetadataType alloc] initWithValue:@"none"];
+    }
+    return SDLMetadataType_NONE;
+}
+
 @end
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h
index e34f02b2d..5b468d034 100644
--- a/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink/SDLNames.h
@@ -193,10 +193,6 @@
 #define NAMES_mainField2 @"mainField2"
 #define NAMES_mainField3 @"mainField3"
 #define NAMES_mainField4 @"mainField4"
-#define NAMES_mainField1Type @"mainField1Type"
-#define NAMES_mainField2Type @"mainField2Type"
-#define NAMES_mainField3Type @"mainField3Type"
-#define NAMES_mainField4Type @"mainField4Type"
 #define NAMES_majorVersion @"majorVersion"
 #define NAMES_make @"make"
 #define NAMES_maneuverComplete @"maneuverComplete"