Index: AXimpl/Crm/GeolocationOut/Converter/GeolocationUpsertConverter.cls.xml
===================================================================
diff -u -r42195 -r42505
--- AXimpl/Crm/GeolocationOut/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 42195)
+++ AXimpl/Crm/GeolocationOut/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 42505)
@@ -7,10 +7,25 @@
 <FormalSpec>Command:AXif.Crm.GeolocationOut.Request</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)) {
+		Do ##class(TECH.Exceptions).Throw(##class(AX.common.impl.NoConversionNeededException).%New(##this.%ClassName(),Command.SubjectId))
+	}
+	
+	Set Location=##class(AXBizTalk.Crm.Geolocation.Location).%New()
+	Do Location.FillTrip(Trip)
+	
+	Set MessageParts = ##class(AXBizTalk.Crm.Geolocation.MessageParts).%New()
+	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(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),Command.SubjectId))
+		Do ##class(TECH.Exceptions).Throw(##class(AX.common.impl.NoConversionNeededException).%New(##this.%ClassName(),Command.SubjectId))
 	}
 	
 	Set Location=##class(AXif.Crm.GeolocationOut.MessageParts.Location).%New()
@@ -20,15 +35,17 @@
 	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:'Agenda.AutoCreate 0
 	
 	Quit 1
 ]]></Implementation>
Index: vhDeploy/D20170531xCrmTripGewijzigdEventHandler.cls.xml
===================================================================
diff -u
--- vhDeploy/D20170531xCrmTripGewijzigdEventHandler.cls.xml	(revision 0)
+++ vhDeploy/D20170531xCrmTripGewijzigdEventHandler.cls.xml	(revision 42505)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.D20170531xCrmTripGewijzigdEventHandler">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Crm Trip update Eventhandler</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Do ##class(AXimpl.Crm.GeolocationOut.EventHandler.TripUpdate).Install()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXif/Crm/GeolocationOut/MessageParts/Location.cls.xml
===================================================================
diff -u -r42163 -r42505
--- AXif/Crm/GeolocationOut/MessageParts/Location.cls.xml	(.../Location.cls.xml)	(revision 42163)
+++ AXif/Crm/GeolocationOut/MessageParts/Location.cls.xml	(.../Location.cls.xml)	(revision 42505)
@@ -74,69 +74,66 @@
 <Type>%Decimal</Type>
 </Property>
 
-<Method name="Fill">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Method name="FillTrip">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
 <Implementation><![CDATA[
-	Set ..AdminId=Agenda.%Id()
-	Set ..GeoDynamicsId=Agenda.Gebruiker.GeoDevice
-	Set ..VoertuigNaam=Agenda.Gebruiker.Naam
-	Set ..VoertuigCode=..GeefVoertuigCode(Agenda)
-	Set ..Straat=Agenda.Straat
-	Set ..PostalCode=Agenda.PostCode
-	Set ..Plaats=Agenda.Gemeente
-	Set ..Land=..GeefLand(Agenda)
-	Set ..Longitude=Agenda.Longitude
-	Set ..Latitude=Agenda.Latitude
-	Set ..TijdsbestedingStartDatum=..FormatTijdstip(Agenda.Datum,Agenda.TijdVan)
-	Set ..TijdsbestedingEindDatum=..FormatTijdstip(Agenda.Datum,Agenda.TijdTot)
-	Set ..TripType=..GeefTripType(Agenda)
-	Set ..Afstand=Agenda.Afstand
+	Set ..AdminId=Trip.%Id()
+	Set ..GeoDynamicsId=Trip.WagenID
+	Set ..VoertuigNaam=..GeefGebruikerNaam(Trip)
+	Set ..VoertuigCode=Trip.WagenNaam
+	Set ..Straat=Trip.Straat_$S(Trip.HuisNr'="":" "_Trip.HuisNr,1:"")
+	Set ..PostalCode=Trip.PostCode
+	Set ..Plaats=Trip.Gemeente
+	Set ..Land=..GeefLand(Trip)
+	Set ..Longitude=Trip.Longitude
+	Set ..Latitude=Trip.Latitude
+	Set ..TijdsbestedingStartDatum=..FormatTijdstip(Trip.StartTijdstip)
+	Set ..TijdsbestedingEindDatum=..FormatTijdstip(Trip.EindTijdstip)
+	Set ..TripType=..GeefTripType(Trip)
+	Set ..Afstand=Trip.Afstand
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLand">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Method name="GeefGebruikerNaam">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit:..IsRijden(Agenda) ""
-	Quit:Agenda.Land="" "BEL"
-	Quit Agenda.Land.Code3
+	Set WagenID=Trip.WagenID
+	Set Naam=""
+	If $L(WagenID)
+	{
+	  Set IPNr=$G(^vhUSER("IGEO",WagenID))
+	  If $L(IPNr)
+	  {
+	    Set Naam=$P(^vhUSER("D",IPNr),"\",5)
+	  }
+	}
+	Quit Naam
 ]]></Implementation>
 </Method>
 
-<Method name="FormatTijdstip">
-<FormalSpec>Datum:%Date,Tijd:%Time</FormalSpec>
-<Implementation><![CDATA[	Quit $ZDT(Datum_","_Tijd,3)
+<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 name="GeefVoertuigCode">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Method name="GeefLand">
+<FormalSpec>Trip:AX.Uitgaand.VKP.Trip.impl.TripData</FormalSpec>
 <Implementation><![CDATA[
-	Set IPNr=Agenda.Gebruiker.%Id()
-	Quit $P($G(^vhUSER("Vehicle",IPNr)),"\")
+	Quit:Trip.Land="" "BEL"
+	Quit Trip.Land.Code3
 ]]></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())
+<Method name="FormatTijdstip">
+<FormalSpec>Tijdstip:%TimeStamp</FormalSpec>
+<Implementation><![CDATA[	Quit Tijdstip ;$ZDT(Tijdstip,3)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefTripType">
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
-<Implementation><![CDATA[
-	If ..IsRijden(Agenda)
-	{
-		Set TripType="969950000" ;Driving
-	}
-	Else
-	{ 
-		Set TripType="969950001" ;Standstill
-	}
-	Quit TripType
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: AXimpl/Crm/GeolocationOut/EventHandler/TripUpdate.cls.xml
===================================================================
diff -u
--- AXimpl/Crm/GeolocationOut/EventHandler/TripUpdate.cls.xml	(revision 0)
+++ AXimpl/Crm/GeolocationOut/EventHandler/TripUpdate.cls.xml	(revision 42505)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Crm.GeolocationOut.EventHandler.TripUpdate">
+<Super>TECH.PubSub.EventHandler</Super>
+
+<Method name="StartVerwerking">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TripWijzigEvent:AX.Uitgaand.VKP.Trip.event.TripGewijzigdEvent</FormalSpec>
+<Implementation><![CDATA[
+	Set Generator = ##class(AXimpl.Generator).%New()
+	Set Request = ##class(AXBizTalk.Crm.Geolocation.Request).%New("Crm/GeolocationUpsert",TripWijzigEvent.Data.GeefTripID())
+	Do Generator.Generate(Request)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>