Index: AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml
===================================================================
diff -u -r46486 -r47238
--- AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 46486)
+++ AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 47238)
@@ -157,7 +157,7 @@
 
 	Set StartTijdstip=..VertaalTijdstip(GeoTrip.FromDateUtc)
 	Set WagenNaam=..Vehicle.Name
-	Set Activiteit=..ActiviteitService.GeefActiviteit(GeoTrip)
+	Set Activiteit=..ActiviteitService.GeefActiviteit(GeoTrip,..Vehicle)
 	
 	
 	If ##class(TripData).WagenEnTijdExists(WagenNaam,StartTijdstip,.TripID)
@@ -193,7 +193,7 @@
 	
 	If cTrip.%IsModified()
 	{	
-		Write !,cTrip.%Id()," ",	WagenNaam," - ",StartTijdstip," - ",Activiteit," - ",GeoTrip.FromLocation.Address.City
+		;Write !,cTrip.%Id()," ",	WagenNaam," - ",StartTijdstip," - ",Activiteit," - ",GeoTrip.FromLocation.Address.City
 
 		Set cTrip.WijzigTijdstip=$ZDT($H,3)
 		Do cTrip.Save()
Index: AX/Uitgaand/VKP/Trip/impl/BepaalActiviteit.cls.xml
===================================================================
diff -u -r42380 -r47238
--- AX/Uitgaand/VKP/Trip/impl/BepaalActiviteit.cls.xml	(.../BepaalActiviteit.cls.xml)	(revision 42380)
+++ AX/Uitgaand/VKP/Trip/impl/BepaalActiviteit.cls.xml	(.../BepaalActiviteit.cls.xml)	(revision 47238)
@@ -26,11 +26,10 @@
 </UDLText>
 
 <Method name="GeefActiviteit">
-<FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
+<FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity,Vehicle:WS.GeoDynamics.tns.VehicleCodeEntity</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Datum=+$ZDT(Trip.ToDateUtc,3,7)
-	If ..IsVerlofDatum(Datum)
+	If ..IsVerlofDatum(Trip,Vehicle)
 	{
 		Set Type=##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).Prive()
 	}	
@@ -52,12 +51,41 @@
 </Method>
 
 <Method name="IsVerlofDatum">
-<FormalSpec>Datum:%Date</FormalSpec>
+<FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity,Vehicle:WS.GeoDynamics.tns.VehicleCodeEntity</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Quit $$CALCDATE^vhLib.DataTypes(Datum,"A",+0)'=Datum
+<Implementation><![CDATA[
+	Set Datum=+$ZDT(Trip.ToDateUtc,3,7)
+		
+	If ..GeefFirmaVanWagen(Vehicle)="BV"
+	{
+		Set IsVerlof=$$EXTDATE^vhLib.DataTypes(Datum,"DWN")>5
+	}
+	Else
+	{
+		Set IsVerlof= $$CALCDATE^vhLib.DataTypes(Datum,"A",+0)'=Datum
+	}
+	Quit IsVerlof
 ]]></Implementation>
 </Method>
 
+<Method name="GeefFirmaVanWagen">
+<FormalSpec>Vehicle:WS.GeoDynamics.tns.VehicleCodeEntity</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set WagenID=Vehicle.Id
+	Set Firma=""
+	If $L(WagenID)
+	{
+	  Set IPNr=$G(^vhUSER("IGEO",WagenID))
+	  If $L(IPNr)
+	  {
+	    Set Firma=$ZCVT($P(^vhUSER("D",IPNr),"\",16),"U")
+	  }
+	}
+	Quit Firma
+]]></Implementation>
+</Method>
+
 <Method name="BepaalActiviteitVanuitPois">
 <FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
 <Private>1</Private>
Index: AXif/Crm/GeolocationOut/MessageParts/Location.cls.xml
===================================================================
diff -u -r42680 -r47238
--- AXif/Crm/GeolocationOut/MessageParts/Location.cls.xml	(.../Location.cls.xml)	(revision 42680)
+++ AXif/Crm/GeolocationOut/MessageParts/Location.cls.xml	(.../Location.cls.xml)	(revision 47238)
@@ -74,11 +74,9 @@
 <Type>%Decimal</Type>
 </Property>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method FillTrip(Trip As AX.Uitgaand.VKP.Trip.impl.TripData)
-{
+<Method name="FillTrip">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
+<Implementation><![CDATA[
 	Set ..AdminId=Trip.%Id()
 	Set ..GeoDynamicsId=Trip.WagenID
 	Set ..VoertuigNaam=..GeefGebruikerNaam(Trip)
@@ -93,10 +91,13 @@
 	Set ..TijdsbestedingEindDatum=..FormatTijdstip(Trip.EindTijdstip)
 	Set ..TripType=..GeefTripType(Trip)
 	Set ..Afstand=Trip.Afstand
-}
+]]></Implementation>
+</Method>
 
-Method GeefGebruikerNaam(Trip As AX.Uitgaand.VKP.Trip.impl.TripData) As %String
-{
+<Method name="GeefGebruikerNaam">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
 	Set WagenID=Trip.WagenID
 	Set Naam=""
 	If $L(WagenID)
@@ -108,31 +109,36 @@
 	  }
 	}
 	Quit Naam
-}
+]]></Implementation>
+</Method>
 
-Method GeefTripType(Trip As AX.Uitgaand.VKP.Trip.impl.TripData) As %String
-{
+<Method name="GeefTripType">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
 	Set TripType=##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).TranslateToCRM(Trip.Activiteit)
 	Quit TripType
-}
+]]></Implementation>
+</Method>
 
-Method GeefLand(Trip As AX.Uitgaand.VKP.Trip.impl.TripData)
-{
+<Method name="GeefLand">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
+<Implementation><![CDATA[
 	Quit:Trip.Land="" "BEL"
 	Quit Trip.Land.Code3
-}
+]]></Implementation>
+</Method>
 
-Method FormatTijdstip(Tijdstip As %TimeStamp)
-{
-	Quit Tijdstip ;$ZDT(Tijdstip,3)
-}
-*/
-]]></Content>
-</UDLText>
+<Method name="FormatTijdstip">
+<FormalSpec>Tijdstip:%TimeStamp</FormalSpec>
+<Implementation><![CDATA[	Quit Tijdstip ;$ZDT(Tijdstip,3)
+]]></Implementation>
+</Method>
 
-<Method name="Fill">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
-<Implementation><![CDATA[
+<UDLText name="T">
+<Content><![CDATA[
+/*Method Fill(Agenda As Derde.Agenda.Agenda)
+{
 	Set ..AdminId=Agenda.%Id()
 	Set ..GeoDynamicsId=Agenda.Gebruiker.GeoDevice
 	Set ..VoertuigNaam=Agenda.Gebruiker.Naam
@@ -147,43 +153,35 @@
 	Set ..TijdsbestedingEindDatum=..FormatTijdstip(Agenda.Datum,Agenda.TijdTot)
 	Set ..TripType=..GeefTripType(Agenda)
 	Set ..Afstand=Agenda.Afstand
-]]></Implementation>
-</Method>
+}
 
-<Method name="GeefLand">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
-<Implementation><![CDATA[
+Method GeefLand(Agenda As Derde.Agenda.Agenda)
+{
 
 	Quit:..IsRijden(Agenda) ""
 	Quit:Agenda.Land="" "BEL"
 	Quit Agenda.Land.Code3
-]]></Implementation>
-</Method>
+}
 
-<Method name="FormatTijdstip">
-<FormalSpec>Datum:%Date,Tijd:%Time</FormalSpec>
-<Implementation><![CDATA[	Quit $ZDT(Datum_","_Tijd,3)
-]]></Implementation>
-</Method>
+Method FormatTijdstip(Datum As %Date, Tijd As %Time)
+{
+	Quit $ZDT(Datum_","_Tijd,3)
+}
 
-<Method name="GeefVoertuigCode">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
-<Implementation><![CDATA[
+Method GeefVoertuigCode(Agenda As Derde.Agenda.Agenda)
+{
 
 	Set IPNr=Agenda.Gebruiker.%Id()
 	Quit $P($G(^vhUSER("Vehicle",IPNr)),"\")
-]]></Implementation>
-</Method>
+}
 
-<Method name="IsRijden">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
-<Implementation><![CDATA[	Quit (Agenda.Type=##class(Derde.Agenda.enu.AgendaType).RijdenWerk())||(Agenda.Type=##class(Derde.Agenda.enu.AgendaType).RijdenPrive())
-]]></Implementation>
-</Method>
+Method IsRijden(Agenda As Derde.Agenda.Agenda)
+{
+	Quit (Agenda.Type=##class(Derde.Agenda.enu.AgendaType).RijdenWerk())||(Agenda.Type=##class(Derde.Agenda.enu.AgendaType).RijdenPrive())
+}
 
-<Method name="GeefTripType">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
-<Implementation><![CDATA[
+Method GeefTripType(Agenda As Derde.Agenda.Agenda)
+{
 
 	If ..IsRijden(Agenda)
 	{
@@ -194,8 +192,10 @@
 		Set TripType="969950001" ;Standstill
 	}
 	Quit TripType
-]]></Implementation>
-</Method>
+}
+*/
+]]></Content>
+</UDLText>
 </Class>
 
 
Index: AXimpl/Crm/GeolocationOut/Converter/GeolocationUpsertConverter.cls.xml
===================================================================
diff -u -r43020 -r47238
--- AXimpl/Crm/GeolocationOut/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 43020)
+++ AXimpl/Crm/GeolocationOut/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 47238)
@@ -7,8 +7,7 @@
 <FormalSpec>Command:AXif.Crm.GeolocationOut.Request,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Crm.GeolocationOut.MessageParts</ReturnType>
 <Implementation><![CDATA[
- /*
-
+ 
 	Set Trip = ##class(AX.Uitgaand.VKP.Trip.impl.TripData).%OpenId(Command.SubjectId)
 	
 	If $$$Not(..IsGeldig(Trip)) {
@@ -22,32 +21,14 @@
 	Set MessageParts.Location = Location
 	
 	Quit MessageParts
-	*/
-
-	Set Agenda = ##class(Derde.Agenda.Agenda).%OpenId(Command.SubjectId)
-	
-	If $$$Not(..IsGeldig(Agenda)) {
-		Do ##class(TECH.Exceptions).Throw(##class(AX.common.impl.NoConversionNeededException).%New(##this.%ClassName(),Command.SubjectId))
-	}
-	
-	Set Location=##class(AXif.Crm.GeolocationOut.MessageParts.Location).%New()
-	Do Location.Fill(Agenda)
-	
-	Set MessageParts = ##class(AXif.Crm.GeolocationOut.MessageParts).%New()
-	Set MessageParts.Location = Location
-	
-	Quit MessageParts
 ]]></Implementation>
 </Method>
 
 <Method name="IsGeldig">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Quit:'Agenda.AutoCreate 0
-	
-	Quit 1
+<Implementation><![CDATA[	Quit 1
 ]]></Implementation>
 </Method>
 </Class>