Schema CL and Data Manifest CL for OECD Waste Water Treatment for dif…

…ferent countries.

Please be noted that it is a modification of an old submitted CL: https://critique.corp.google.com/cl/650935805

In the above CL stat_vars.mcf file were missing the StatVars, so this CL is to update the stat_vars.mcf file

PiperOrigin-RevId: 656323842

core/dcschema.mcf

@@ -4207,3 +4207,20 @@ Node: dcid:StatisticalRegion
 name: "StatisticalRegion"
 typeOf: schema:Class
 subClassOf: schema:AdministrativeArea
+
+#oecd
+Node: dcid:wasteTreatmentType
+typeOf: dcs:Property
+name: "wasteTreatmentType"
+domainIncludes: dcid:Person
+rangeIncludes: dcid:WasteTreatmentTypeEnum
+
+Node: dcid:WasteTreatmentTypeEnum
+typeOf: schema:Class
+subClassOf: dcs:Enumeration
+name: "WasteTreatmentTypeEnum"
+isProvisional: dcs:True
+
+Node: dcid:WasteWaterTreatment
+typeOf: dcid:WasteTreatmentTypeEnum
+name: "Waste Water Treatment"

core/usgs_water.mcf

@@ -187,6 +187,12 @@ name: "WasteWaterTreated"
 description:"Treated wastewater can be reused as reclaimed water. The main purpose of wastewater treatment is for the treated wastewater to be able to be disposed or reused"
 descriptionUrl:"https://en.wikipedia.org/wiki/Wastewater_treatment"
 
+Node: dcid:WasteWaterNotTreated
+typeOf: dcid:WaterTreatmentStatusEnum
+name: "WasteWaterTreated"
+description:"Treated wastewater can be reused as reclaimed water. The main purpose of wastewater treatment is for the treated wastewater to be able to be disposed or reused"
+descriptionUrl:"https://en.wikipedia.org/wiki/Wastewater_treatment"
+
 Node: dcid:WasteWaterIndependentlyTreated
 typeOf: dcid:WaterTreatmentSystemEnum
 name: "WasteWaterIndependentlyTreated"
@@ -199,6 +205,12 @@ name: "WasteWaterCollectingSystem"
 description:"Collection Systems are the system of underground pipes and maintenance structures used to convey wastewater to a Water Resource Recovery Facility (WRRF)"
 descriptionUrl:"https://www.wbdg.org/resources/wastewater-treatment-and-water-resource-recovery-facilities-wrrfs/collection-systems"
 
+Node: dcid:PublicSewerage
+typeOf: dcid:WaterTreatmentSystemEnum
+name: "WasteWaterCollectingSystem"
+description:"Collection Systems are the system of underground pipes and maintenance structures used to convey wastewater to a Water Resource Recovery Facility (WRRF)"
+descriptionUrl:"https://www.wbdg.org/resources/wastewater-treatment-and-water-resource-recovery-facilities-wrrfs/collection-systems"
+
 Node: dcid:SecondaryTreatment
 typeOf: dcid:WaterTreatmentLevelEnum
 name: "SecondaryTreatment"

stat_vars/oecd_waste_water_treatment_stavar.mcf

@@ -1,85 +1,112 @@
-Node: dcid:Amount_WasteWater_PrimaryTreatment_WasteWaterTreatmentPlant_PerWaterTreatmentLevel
+Node: dcid:Count_Person_PrimaryTreatment_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant_AsAFractionOf_Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 typeOf: dcid:StatisticalVariable
-name: "Public total treatment (connected to a wastewater treatment plant), Primary treatment"
-populationType: dcid:WasteWater
-measuredProperty: dcid:amount
+name: "Percentage of population connected to the primary treatment of waste water treatment plant"
+populationType: dcid:Person
+measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentLevel
+measurementDenominator: dcid:Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 waterTreatmentLevel: dcid:PrimaryTreatment
+waterTreatmentStatus: dcid:WaterTreated
+waterTreatmentSystem: dcid:PublicSewerage
 waterTreatmentType: dcid:WasteWaterTreatmentPlant
 
-Node: dcid:Amount_WasteWater_SecondaryTreatment_WasteWaterTreatmentPlant_PerWaterTreatmentLevel
+Node: dcid:Count_Person_PublicSewerage
+typeOf: dcid:StatisticalVariable
+populationType: dcid:Person
+measuredProperty: dcid:count
+statType: dcid:measuredValue
+waterTreatmentSystem: dcid:PublicSewerage
+
+Node: dcid:Count_Person_PublicSewerage_AsAFractionOf_Count_Person
 typeOf: dcid:StatisticalVariable
-name: "Public total treatment (connected to a wastewater treatment plant), Secondary treatment"
-populationType: dcid:WasteWater
-measuredProperty: dcid:amount
+name: "Percentage of population connected to the total public sewerage"
+populationType: dcid:Person
+measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentLevel
+measurementDenominator: dcid:Count_Person
+waterTreatmentSystem: dcid:PublicSewerage
+
+Node: dcid:Count_Person_SecondaryTreatment_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant_AsAFractionOf_Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
+typeOf: dcid:StatisticalVariable
+name: "Percentage of population connected to the total secondary treatment of waste water treatment plant"
+populationType: dcid:Person
+measuredProperty: dcid:count
+statType: dcid:measuredValue
+measurementDenominator: dcid:Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 waterTreatmentLevel: dcid:SecondaryTreatment
+waterTreatmentStatus: dcid:WaterTreated
+waterTreatmentSystem: dcid:PublicSewerage
 waterTreatmentType: dcid:WasteWaterTreatmentPlant
 
-Node: dcid:Amount_WasteWater_TertiaryTreatment_WasteWaterTreatmentPlant_PerWaterTreatmentLevel
+Node: dcid:Count_Person_TertiaryTreatment_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant_AsAFractionOf_Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 typeOf: dcid:StatisticalVariable
-name: "Public total treatment (connected to a wastewater treatment plant), Tertiary treatment"
-populationType: dcid:WasteWater
-measuredProperty: dcid:amount
+name: "Percentage of population connected to the tertiary treatment of waste water treatment plant"
+populationType: dcid:Person
+measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentLevel
+measurementDenominator: dcid:Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 waterTreatmentLevel: dcid:TertiaryTreatment
+waterTreatmentStatus: dcid:WaterTreated
+waterTreatmentSystem: dcid:PublicSewerage
 waterTreatmentType: dcid:WasteWaterTreatmentPlant
 
-Node: dcid:Amount_WasteWater_UnspecifiedTreatment_WasteWaterTreatmentPlant_PerWaterTreatmentLevel
+Node: dcid:Count_Person_UnspecifiedTreatment_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant_AsAFractionOf_Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 typeOf: dcid:StatisticalVariable
-name: "Public total treatment (connected to a wastewater treatment plant) , Unspecified (other) treatment"
-populationType: dcid:WasteWater
-measuredProperty: dcid:amount
+name: "Percentage of population connected to the Unspecified (other) treatment of waste water treatment plant"
+populationType: dcid:Person
+measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentLevel
+measurementDenominator: dcid:Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 waterTreatmentLevel: dcid:UnspecifiedTreatment
+waterTreatmentStatus: dcid:WaterTreated
+waterTreatmentSystem: dcid:PublicSewerage
 waterTreatmentType: dcid:WasteWaterTreatmentPlant
 
-Node: dcid:Count_Person_PublicSewerageWithoutTreatment_PerWaterTreatmentType
+Node: dcid:Count_Person_WasteWaterIndependentlyTreated_AsAFractionOf_Count_Person
 typeOf: dcid:StatisticalVariable
-name: "Total public sewerage (% of resident population connected to a wastewater collecting system), Population connected to the public sewerage without treatment"
+name: "Percentage of population connected to the Independent treatment of waste water treatment plant"
 populationType: dcid:Person
 measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentType
-waterTreatmentType: dcid:PublicSewerageWithoutTreatment
+measurementDenominator: dcid:Count_Person
+waterTreatmentSystem: dcid:WasteWaterIndependentlyTreated
 
-Node: dcid:Count_Person_Resident_WasteWaterCollectingSystem_PerWaterTreatmentSystem
+Node: dcid:Count_Person_WasteWaterTreatmentPlant_AsAFractionOf_Count_Person
 typeOf: dcid:StatisticalVariable
-name: "Total public sewerage (% of resident population connected to a wastewater collecting system)"
+name: "Percentage of population connected to the total wastewater treatment"
 populationType: dcid:Person
 measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentSystem
-residentStatus: dcid:Resident
-waterTreatmentSystem: dcid:WasteWaterCollectingSystem
+measurementDenominator: dcid:Count_Person
+treatmentType: dcid:WasteWaterTreatmentPlant
 
-Node: dcid:Count_Person_WasteWaterIndependentlyTreated_PerWaterTreatmentSystem
+Node: dcid:Count_Person_WaterNotTreated_PublicSewerage_PublicSewerageWithoutTreatment_AsAFractionOf_Count_Person_PublicSewerage
 typeOf: dcid:StatisticalVariable
-name: "Population connected to independent treatment"
+name: "Percentage of population connected to the public sewerage without treatment"
 populationType: dcid:Person
 measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentSystem
-waterTreatmentSystem: dcid:WasteWaterIndependentlyTreated
+measurementDenominator: dcid:Count_Person_PublicSewerage
+waterTreatmentStatus: dcid:WaterNotTreated
+waterTreatmentSystem: dcid:PublicSewerage
+waterTreatmentType: dcid:PublicSewerageWithoutTreatment
 
-Node: dcid:Count_Person_WasteWaterTreated_PerWaterTreatmentStatus
+Node: dcid:Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant
 typeOf: dcid:StatisticalVariable
-name: "Total connected to wastewater treatment"
 populationType: dcid:Person
 measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentStatus
-waterTreatmentStatus: dcid:WasteWaterTreated
+waterTreatmentStatus: dcid:WaterTreated
+waterTreatmentSystem: dcid:PublicSewerage
+waterTreatmentType: dcid:WasteWaterTreatmentPlant
 
-Node: dcid:Count_Person_WasteWaterTreatmentPlant_PerWaterTreatmentType
+Node: dcid:Count_Person_WaterTreated_PublicSewerage_WasteWaterTreatmentPlant_AsAFractionOf_Count_Person_PublicSewerage
 typeOf: dcid:StatisticalVariable
-name: "Public total treatment (connected to a wastewater treatment plant)"
+name: "Percentage of population connected to the public total waste water treatment"
 populationType: dcid:Person
 measuredProperty: dcid:count
 statType: dcid:measuredValue
-measurementDenominator: dcid:waterTreatmentType
+measurementDenominator: dcid:Count_Person_PublicSewerage
+waterTreatmentStatus: dcid:WaterTreated
+waterTreatmentSystem: dcid:PublicSewerage
 waterTreatmentType: dcid:WasteWaterTreatmentPlant