finished adding aformentioned properties

diff --git a/lib/vehicleproperty.cpp b/lib/vehicleproperty.cpp
index 12291d2..f53bea5 100644 (file)
--- a/lib/vehicleproperty.cpp
+++ b/lib/vehicleproperty.cpp
@@ -91,8 +91,18 @@ const VehicleProperty::Property VehicleProperty::FuelConsumption = "FuelConsumpt
 const VehicleProperty::Property VehicleProperty::FuelRange = "FuelRange";
 const VehicleProperty::Property VehicleProperty::FuelEconomy = "FuelEconomy";
 const VehicleProperty::Property VehicleProperty::FuelAverageEconomy = "FuelAverageEconomy";
+const VehicleProperty::Property VehicleProperty::FuelType = "FuelType";
+const VehicleProperty::Property VehicleProperty::FuelPositionSide = "FuelPositionSide";
 const VehicleProperty::Property VehicleProperty::EngineOilRemaining = "EngineOilRemaining";
 const VehicleProperty::Property VehicleProperty::ExteriorBrightness = "ExteriorBrightness";
+const VehicleProperty::Property VehicleProperty::Latitude = "Latitude";
+const VehicleProperty::Property VehicleProperty::Longitude = "Longitude";
+const VehicleProperty::Property VehicleProperty::Direction = "Direction";
+const VehicleProperty::Property VehicleProperty::Altitude = "Altitude";
+const VehicleProperty::Property VehicleProperty::VehicleWidth = "VehicleWidth";
+const VehicleProperty::Property VehicleProperty::VehicleHeight = "VehicleHeight";
+const VehicleProperty::Property VehicleProperty::VehicleLength = "VehicleLength";
+
 
 std::list<VehicleProperty::Property> VehicleProperty::mCapabilities;
 std::list<VehicleProperty::Property> VehicleProperty::mCustomProperties;
@@ -150,13 +160,23 @@ VehicleProperty::VehicleProperty()
        REGISTERPROPERTYWITHTYPE(InteriorLightPassenger, LightStatusType, false);
        REGISTERPROPERTYWITHTYPE(InteriorLightCenter, LightStatusType, false);
        REGISTERPROPERTY(EngineLoad,0);
-       REGISTERPROPERTY(Horn,false);
+       REGISTERPROPERTY(Horn, false);
        REGISTERPROPERTY(FuelLevel, 0);
        REGISTERPROPERTY(FuelRange, 0);
        REGISTERPROPERTY(FuelConsumption, 0);
        REGISTERPROPERTY(FuelEconomy, 0);
        REGISTERPROPERTY(FuelAverageEconomy, 0);
+       REGISTERPROPERTY(FuelType, Fuel::Gasoline);
+       REGISTERPROPERTY(FuelPositionSide, Fuel::Left);
        REGISTERPROPERTY(ExteriorBrightness, 0);
+       REGISTERPROPERTYWITHTYPE(VehicleWidth,VehicleSizeType,0);
+       REGISTERPROPERTYWITHTYPE(VehicleHeight,VehicleSizeType,0);
+       REGISTERPROPERTYWITHTYPE(VehicleLength,VehicleSizeType,0);
+       REGISTERPROPERTY(Latitude,0);
+       REGISTERPROPERTY(Longitude,0);
+       REGISTERPROPERTY(Altitude,0);
+       REGISTERPROPERTY(Direction,0);
+
 
 }
 

diff --git a/lib/vehicleproperty.h b/lib/vehicleproperty.h
index c12978d..e37fc45 100644 (file)
--- a/lib/vehicleproperty.h
+++ b/lib/vehicleproperty.h
@@ -123,6 +123,18 @@ enum RefuelPosition
 };
 }
 
+namespace Vehicle {
+enum Type
+{
+       Sedan = 0,
+       Coupe,
+       Cabriole,
+       Roadster,
+       SUV,
+       Truck
+};
+}
+
 class VehicleProperty
 {
 
@@ -340,6 +352,8 @@ public:
        static const Property VehicleLength;
        typedef BasicPropertyType<uint> VehicleSizeType;
 
+
+
        /** END PROPERTIES **/