scrap also LKW-h / a

matsim-vsp · Jan 15, 2025 · 2cbeacd · 2cbeacd
1 parent 686bed0
commit 2cbeacd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...n/java/org/tub/vsp/bvwp/data/container/base/street/StreetPhysicalEffectDataContainer.java b/...n/java/org/tub/vsp/bvwp/data/container/base/street/StreetPhysicalEffectDataContainer.java
@@ -9,7 +9,7 @@ public class StreetPhysicalEffectDataContainer {
     private PhysicalEffect pvVehicleHours; //Personenverkehr (Pkw) (Fzg-h)
     private PhysicalEffect pvVehicleKilometers; //Personenverkehr (Pkw) Fzg-km
     private PhysicalEffect pvPersonHours; //Personenverkehr Personen-h
-    private PhysicalEffect gvVehicleHours; //Güterverkehr (Lkw) Fzg-h
+    private Double gvVehicleHours; //Güterverkehr (Lkw) Fzg-h ; Nicht differenziert nach Entfernung <50; >= 50km
     private Double gvVehicleKilometers; //Güterverkehr (Lkw) Fzg-km
 
     public StreetEmissionsDataContainer getEmissionsDataContainer() {
@@ -84,10 +84,10 @@ public int hashCode() {
         result = 31 * result + (pvVehicleKilometers != null ? pvVehicleKilometers.hashCode() : 0);
         return result;
     }
-    public void setGvVehicleHours(PhysicalEffect gvVehicleHours){
+    public void setGvVehicleHours(Double gvVehicleHours){
         this.gvVehicleHours = gvVehicleHours;
     }
-    public PhysicalEffect getGvVehicleHours(){
+    public Double getGvVehicleHours(){
         return gvVehicleHours;
     }
 

diff --git a/src/main/java/org/tub/vsp/bvwp/data/mapper/physicalEffect/StreetPhysicalEffectMapper.java b/src/main/java/org/tub/vsp/bvwp/data/mapper/physicalEffect/StreetPhysicalEffectMapper.java
@@ -34,7 +34,11 @@ public static StreetPhysicalEffectDataContainer mapDocument(Document document) {
                   .ifPresent(i -> physicalEffectDataContainer.setPvVehicleKilometers(extractEffect(table.get(), i ) ) );
 
         JSoupUtils.getFirstRowIndexWithText( table.get(), "Veränderung der Betriebsleistung Güterverkehr (GV)" )
-                        .ifPresent( ii -> physicalEffectDataContainer.setGvVehicleKilometers( JSoupUtils.parseDoubleOrElseNull(JSoupUtils.getTextFromRowAndCol(table.get(), ii, 1) ) ) );
+                .ifPresent( ii -> physicalEffectDataContainer.setGvVehicleKilometers( JSoupUtils.parseDoubleOrElseNull(JSoupUtils.getTextFromRowAndCol(table.get(), ii, 1) ) ) );
+
+        JSoupUtils.getFirstRowIndexWithText( table.get(), "Veränderung der Fahrzeugeinsatzzeiten im GV" )
+                .ifPresent( ii -> physicalEffectDataContainer.setGvVehicleHours( JSoupUtils.parseDoubleOrElseNull(JSoupUtils.getTextFromRowAndCol(table.get(), ii, 1) ) ) );
+
 
         return physicalEffectDataContainer;
     }