Vehicle prototype zone def optional/mandatory

Author: ehughsbaird

src/veh_type.cpp

@@ -1355,6 +1355,15 @@ void vehicle_item_spawn::deserialize( const JsonObject &jo )
     optional( jo, false, "item_groups", item_groups, string_id_reader<Item_spawn_data> {} );
 }
 
+void vehicle_prototype::zone_def::deserialize( const JsonObject &jo )
+{
+    mandatory( jo, false, "type", zone_type );
+    mandatory( jo, false, "x", pt.x() );
+    mandatory( jo, false, "y", pt.y() );
+    optional( jo, false, "name", name );
+    optional( jo, false, "filter", filter );
+}
+
 void vehicle_prototype::load( const JsonObject &jo, std::string_view )
 {
     vgroups[vgroup_id( id.str() )].add_vehicle( id, 100 );
@@ -1376,21 +1385,7 @@ void vehicle_prototype::load( const JsonObject &jo, std::string_view )
     }
 
     optional( jo, was_loaded, "items", item_spawns );
-
-    for( JsonObject jzi : jo.get_array( "zones" ) ) {
-        zone_type_id zone_type( jzi.get_member( "type" ).get_string() );
-        std::string name;
-        std::string filter;
-        point_rel_ms pt( jzi.get_member( "x" ).get_int(), jzi.get_member( "y" ).get_int() );
-
-        if( jzi.has_string( "name" ) ) {
-            name = jzi.get_string( "name" );
-        }
-        if( jzi.has_string( "filter" ) ) {
-            filter = jzi.get_string( "filter" );
-        }
-        zone_defs.emplace_back( zone_def{ zone_type, name, filter, pt } );
-    }
+    optional( jo, was_loaded, "zones", zone_defs, json_read_reader<zone_def> {} );
 }
 
 void vehicle_prototype::save_vehicle_as_prototype( const vehicle &veh,

src/veh_type.h

@@ -541,6 +541,11 @@ struct vehicle_prototype {
             std::string name;
             std::string filter;
             point_rel_ms pt;
+
+            void deserialize( const JsonObject &jo );
+            bool operator==( const zone_def &other ) const {
+                return zone_type == other.zone_type && name == other.name && filter == other.name && pt == other.pt;
+            }
         };
 
         vproto_id id;

tests/vehicle_export_test.cpp

@@ -1,4 +1,3 @@
-#include <set>
 #include <sstream>
 #include <string>
 #include <utility>
@@ -20,11 +19,6 @@
 
 static const vproto_id vehicle_prototype_veh_export_test( "veh_export_test" );
 
-static bool operator==( const vehicle_prototype::zone_def &l, const vehicle_prototype::zone_def &r )
-{
-    return l.filter == r.filter && l.name == r.name && l.pt == r.pt && l.zone_type == r.zone_type;
-}
-
 static bool operator==( const vehicle_item_spawn &l, const vehicle_item_spawn &r )
 {
     return l.pos == r.pos && l.chance == r.chance &&