diff --git a/core/dcschema.mcf b/core/dcschema.mcf index dd02c87cd..aa02d843f 100644 --- a/core/dcschema.mcf +++ b/core/dcschema.mcf @@ -1349,6 +1349,58 @@ typeOf: dcs:Property name: "amountOutstanding" domainIncludes: dcid:Debt +# TODO(ajaits): add descriptions to new properties +Node: dcid:lendingEntity +typeOf: dcs:Property +name: "lendingEntity" +domainIncludes: dcid:Debt +rangeIncludes: dcid:LendingEntityEnum,dcid:Country + +Node: dcid:amountPrincipalRepayment +typeOf: dcs:Property +name: "amountPrincipalRepayment" +domainIncludes: dcid:Debt + +Node: dcid:debtType +typeOf: dcs:Property +name: "debtType" +domainIncludes: dcid:Debt +rangeIncludes: dcid:DebtTypeEnum + +Node: dcid:debtGuaranteeStatus +typeOf: dcs:Property +name: "debtGuaranteeStatus" +domainIncludes: dcid:Debt +rangeIncludes: dcid:DebtGuaranteeStatusEnum + +Node: dcid:debtCreditorType +typeOf: dcs:Property +name: "debtCreditorType" +domainIncludes: dcid:Debt +rangeIncludes: dcid:DebtCreditorTypeEnum + +Node: dcid:debtInstrument +typeOf: dcs:Property +name: "debtInstrument" +domainIncludes: dcid:Debt +rangeIncludes: dcid:DebtInstrumentEnum,dcid:Class + +Node: dcid:debtFinancer +typeOf: dcs:Property +name: "debtFinancer" +domainIncludes: dcid:Debt +rangeIncludes: dcid:DebtFinancerEnum + +Node: dcid:amountInterestRepayment +typeOf: dcs:Property +name: "amountInterestRepayment" +domainIncludes: dcid:Debt + +Node: dcid:amountOutstanding +typeOf: dcs:Property +name: "amountOutstanding" +domainIncludes: dcid:Debt + # TODO(ajaits): add descriptions to new properties Node: dcid:totalIndivContrib name: totalIndivContrib @@ -1762,6 +1814,7 @@ Node: SquareKilometer typeOf: dcid:AreaUnitOfMeasure name: "SquareKilometer" shortDisplayName: "km²" +shortDisplayName: "km²" dcid: "SquareKilometer" description: "An area equal to a square with each side length equivalent to one kilometer." @@ -1839,6 +1892,12 @@ name: "currency" domainIncludes: dcid:Debt rangeIncludes: dcid:Currency, dcid:OneOrg_CurrencyEnum +Node: dcid:currency +typeOf: dcs:Property +name: "currency" +domainIncludes: dcid:Debt +rangeIncludes: dcid:Currency, dcid:OneOrg_CurrencyEnum + Node: dcid:USDollar typeOf: dcs:CurrencyUnitOfMeasure name: "USDollar" @@ -3329,3 +3388,10 @@ name: "footnote" description: "Footnote for a StatisticalVariable." domainIncludes: dcs:StatisticalVariable rangeIncludes: dcs:Text + +Node: dcid:vehicleFuelType +typeOf: dcs:Property +name: "vehicleFuelType" +domainIncludes: dcid:Vehicle +rangeIncludes: dcid:VehicleFuelTypeEnum +isProvisional: dcs:True diff --git a/core/dcschema_enum_classes.mcf b/core/dcschema_enum_classes.mcf index 34254a2ba..106afabff 100644 --- a/core/dcschema_enum_classes.mcf +++ b/core/dcschema_enum_classes.mcf @@ -509,3 +509,8 @@ Node: dcid:OneOrg_CurrencyEnum typeOf: schema:Class subClassOf: dcs:Enumeration name: "OneOrg_CurrencyEnum" + +Node: dcid:VehicleFuelTypeEnum +typeOf:Class +subClassOf:Enumeration +name: "VehicleFuelTypeEnum" diff --git a/core/dcschema_enum_instances.mcf b/core/dcschema_enum_instances.mcf index e7fb24a28..46944dfcb 100644 --- a/core/dcschema_enum_instances.mcf +++ b/core/dcschema_enum_instances.mcf @@ -2776,3 +2776,18 @@ name: "Above 185 percent of Federal Poverty Line" Node: dcid:Below185PercentOfFederalPovertyLine typeOf: dcs:HouseholdIncomeEnum name: "Below 185 percent of Federal Poverty Line" + +Node: dcid:HybridElectric +typeOf: dcid:VehicleFuelTypeEnum +name: "HybridElectric" +isProvisional: dcs:True + +Node: dcid:PlugInHybridElectric +typeOf: dcid:VehicleFuelTypeEnum +name: "PlugInHybridElectric" +isProvisional: dcs:True + +Node: dcid:Electric +typeOf: dcid:VehicleFuelTypeEnum +name: "Electric" +isProvisional: dcs:True diff --git a/stat_vars/us_electric_vehicle_sales_statvar.mcf b/stat_vars/us_electric_vehicle_sales_statvar.mcf new file mode 100644 index 000000000..ff30520d9 --- /dev/null +++ b/stat_vars/us_electric_vehicle_sales_statvar.mcf @@ -0,0 +1,21 @@ +Node: dcid:Sales_Vehicle_Electric +typeOf: dcid:StatisticalVariable +populationType: dcid:Vehicle +measuredProperty: dcid:sales +statType: dcid:measuredValue +vehicleFuelType: dcid:Electric + +Node: dcid:Sales_Vehicle_HybridElectric +typeOf: dcid:StatisticalVariable +populationType: dcid:Vehicle +measuredProperty: dcid:sales +statType: dcid:measuredValue +vehicleFuelType: dcid:HybridElectric + +Node: dcid:Sales_Vehicle_PlugInHybridElectric +typeOf: dcid:StatisticalVariable +populationType: dcid:Vehicle +measuredProperty: dcid:sales +statType: dcid:measuredValue +vehicleFuelType: dcid:PlugInHybridElectric +