Skip to content

Commit

Permalink
Internal review, part 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@JorgenErlandsson
JorgenErlandsson committed Oct 19, 2024
1 parent d380167 commit d91e092
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 209 deletions.
2 changes: 1 addition & 1 deletion guides/profiles/66-advanceddespatchadvice/description/environmentaldata.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Contains the possible values for the Description element when the AttributeID is
|EuroStageIIIB |Euro Stage IIIB
|EuroStageIV |Euro Stage IV
|EuroStageV |Euro Stage V
|EV |EV
|EV |Electrical Vehicle
|FuelCell |Fuel Cell
|Hybrid |Hybrid
|PHEV |Plug-in Hybrid
Expand Down
189 changes: 0 additions & 189 deletions guides/profiles/66-advanceddespatchadvice/description/environmentaldataje.adoc
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...xamples/Advanced Despatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_04.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down
4 changes: 2 additions & 2 deletions ...xamples/Advanced Despatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_05.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down
2 changes: 1 addition & 1 deletion ...espatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_06_Concrete_material.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@

<!-- Specific climate data, GWP value calculated by the supplier -->
<cac:AdditionalItemProperty>
<cbc:Name>GWP GHG A1-3 EPD total value for line</cbc:Name>
<cbc:Name>GWP GHG A1-3 EPD value per kilogram</cbc:Name>
<cbc:NameCode listID="IPNC">GWP-GHG_A1-3_vA1</cbc:NameCode>
<cbc:Value>NA</cbc:Value>
<cbc:ValueQuantity unitCode="KGM">0.251</cbc:ValueQuantity>
Expand Down
4 changes: 2 additions & 2 deletions ...xamples/Advanced Despatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_07.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down
4 changes: 2 additions & 2 deletions ...xamples/Advanced Despatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_09.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down
4 changes: 2 additions & 2 deletions ...xamples/Advanced Despatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_10.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down
4 changes: 2 additions & 2 deletions ...xamples/Advanced Despatch Advice use cases/AdvancedDespatchAdvice__Example_UseCase_11.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down
6 changes: 3 additions & 3 deletions rules/snippets/advanceddespatch/snippet-30-4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
<cac:OriginalDespatchTransportationService>
<cbc:TransportServiceCode>FuelReport</cbc:TransportServiceCode>
<cac:TransportEquipment>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1">HVO</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO Diesel</cbc:Description>
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017</cbc:TransportEquipmentTypeCode>
<cbc:Description>HVO100</cbc:Description>
<cac:MeasurementDimension>
<cbc:AttributeID>FuelConsumption</cbc:AttributeID>
<cbc:Measure unitCode="LTR">115.6</cbc:Measure>
Expand Down Expand Up @@ -303,7 +303,7 @@

<!-- Specific climate data, GWP value calculated by the supplier -->
<cac:AdditionalItemProperty>
<cbc:Name>GWP GHG A1-3 EPD total value for line</cbc:Name>
<cbc:Name>GWP GHG A1-3 EPD value per kilogram</cbc:Name>
<cbc:NameCode listID="IPNC">GWP-GHG_A1-3_vA1</cbc:NameCode>
<cbc:Value>NA</cbc:Value>
<cbc:ValueQuantity unitCode="KGM">0.251</cbc:ValueQuantity>
Expand Down
6 changes: 3 additions & 3 deletions structure/source/ubl-advanced-despatch-advice.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@
<?Name Transport equipment?>
<?Description Used to specify fuel consumption. To be repeated for all fuel types used.?>
<?Cardinality 0..n?>
<cbc:TransportEquipmentTypeCode listID="FuelGroup" listAgencyID="Trafikverket" listVersionID="2023:1"> HVO
<cbc:TransportEquipmentTypeCode listID="ClimateDatabas" listAgencyID="Boverket" listVersionID="02.05.000">6000000017
<?Name Tranport equipment type code?>
<?Description Used to specify the type of fuel.?>
<?Cardinality 0..1?>
Expand All @@ -827,7 +827,7 @@
<?listVersionID-Description Identifies the version of the List. ?>
<?listVersionID-usage Optional?>
</cbc:TransportEquipmentTypeCode>
<cbc:Description> HVO Diesel
<cbc:Description> HVO100
<?Name Description?>
<?Description Fuel description.?>
<?Cardinality 0..1?>
Expand Down Expand Up @@ -1910,7 +1910,7 @@
</cac:HazardousItem>

<cac:AdditionalItemProperty>
<cbc:ID schemeDataURI="sdfdf" schemeID="ISO22057" schemeVersionID="2022"> 77e416eb-a363-4258-a04e-171d843a6460
<cbc:ID schemeDataURI="https://define.cobuilder.no/77e416eb-a363-4258-a04e-171d843a6460/2022/" schemeID="ISO22057" schemeVersionID="2022"> 77e416eb-a363-4258-a04e-171d843a6460
<?Description ID of the property if assigned by an Agency?>
<?Cardinality 0..1?>
<?schemeDataURI-Name Scheme Data URI?>
Expand Down

0 comments on commit d91e092

Please sign in to comment.