Index: AX/Uitgaand/VKP/Trip/event/TripGewijzigdEventData.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/event/TripGewijzigdEventData.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/event/TripGewijzigdEventData.cls.xml	(revision 42380)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.event.TripGewijzigdEventData">
+<Super>TECH.PubSub.EventData</Super>
+
+<Parameter name="XMLTYPE">
+<Type>%String</Type>
+<Default>AX.Uitgaand.VKP.Trip.event.TripGewijzigdEventData</Default>
+</Parameter>
+
+<Property name="TripID">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>TripID:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..TripID = TripID
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefTripID">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..TripID
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>TripGewijzigdEventDataState</State>
+<Data name="TripGewijzigdEventDataState">
+<Structure>listnode</Structure>
+<Subscript>"TripGewijzigdEventData"</Subscript>
+<Value name="1">
+<Value>AdresID</Value>
+</Value>
+<Value name="2">
+<Value>TripID</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/Trip/impl/BepaalActiviteit.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/impl/BepaalActiviteit.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/impl/BepaalActiviteit.cls.xml	(revision 42380)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.impl.BepaalActiviteit">
+<Super>%RegisteredObject</Super>
+
+<Parameter name="KortePeriodeStilstand">
+<Default>60</Default>
+</Parameter>
+
+<Parameter name="KortePeriodeRijden">
+<Default>60</Default>
+</Parameter>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Code begins in CRM met 96995000x waar de x staat voor
+.0 = rijden
+.1 = diverse (wordt niet automatisch gezet)
+.2 = privé, voor alle thuisadressen BE en NL (automatisch)
+.3 = firma, voor BE (automatisch)
+.4 = beurs (wordt niet automatisch gezet) 
+.5 = te bepalen (automatisch voor de standstill's die niet voldoen aan .2 en .3)
+*/
+]]></Content>
+</UDLText>
+
+<Method name="GeefActiviteit">
+<FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Datum=+$ZDT(Trip.ToDateUtc,3,7)
+	If ..IsVerlofDatum(Datum)
+	{
+		Set Type=##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).Prive()
+	}	
+	ElseIf Trip.Type="Driving"
+	{
+		Set Type=##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).Rijden()
+	}
+	ElseIf Trip.Type="Stationary"
+	{
+		Set Type=##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).Stationary()
+	}
+	Else ;Stilstand
+	{
+		Set Type=..BepaalActiviteitVanuitPois(Trip)
+		If Type="" Set Type=##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).Stilstand()
+	}
+	Quit Type
+]]></Implementation>
+</Method>
+
+<Method name="IsVerlofDatum">
+<FormalSpec>Datum:%Date</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit $$CALCDATE^vhLib.DataTypes(Datum,"A",+0)'=Datum
+]]></Implementation>
+</Method>
+
+<Method name="BepaalActiviteitVanuitPois">
+<FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set MinAfwijking=999999
+	Set CRMCode=""
+	For PoisCount=1:1:Trip.FromPois.Count()
+	{
+		#Dim Pois as WS.GeoDynamics.tns.PoiCodeEntity
+		Set Pois=Trip.FromPois.GetAt(PoisCount)
+		If Pois.Code'="" && Pois.Deviation<MinAfwijking	
+		{
+			Set MinAfwijking=Pois.Deviation
+			Set CRMCode=Pois.Code
+		}
+	}
+	Quit:CRMCode="" ""
+	Quit ##class(AX.Uitgaand.VKP.Trip.enu.Activiteit).TranslateFromCRM(CRMCode)
+]]></Implementation>
+</Method>
+
+<Method name="IsTeKortePeriode">
+<FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Q 0 
+	
+	Set Van=$zdth(Trip.FromDateUtc,3,7)
+	Set Tot=$zdth(Trip.ToDateUtc,3,7)
+	Quit $$DIFFTIME^vhLib.DataTypes(Van,Tot,"s")<$S(Trip.Type="Driving":..#KortePeriodeRijden,1:..#KortePeriodeStilstand)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/Trip/enu/Activiteit.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/enu/Activiteit.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/enu/Activiteit.cls.xml	(revision 42380)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.enu.Activiteit">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="VALUELIST">
+<Default>;Rijden;Stationary;Stilstand;Prive;Firma;Onbekend</Default>
+</Parameter>
+
+<Method name="Rijden">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Activiteit</ReturnType>
+<Implementation><![CDATA[	quit "Rijden"
+]]></Implementation>
+</Method>
+
+<Method name="Stilstand">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Activiteit</ReturnType>
+<Implementation><![CDATA[	quit "Stilstand"
+]]></Implementation>
+</Method>
+
+<Method name="Prive">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Activiteit</ReturnType>
+<Implementation><![CDATA[	quit "Prive"
+]]></Implementation>
+</Method>
+
+<Method name="Stationary">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Activiteit</ReturnType>
+<Implementation><![CDATA[	quit "Stationary"
+]]></Implementation>
+</Method>
+
+<Method name="Firma">
+<ClassMethod>1</ClassMethod>
+<ReturnType>Activiteit</ReturnType>
+<Implementation><![CDATA[	quit "Firma"
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Code begins in CRM met 96995000x waar de x staat voor
+.0 = rijden
+.1 = diverse (wordt niet automatisch gezet)
+.2 = privé, voor alle thuisadressen BE en NL (automatisch)
+.3 = firma, voor BE (automatisch)
+.4 = beurs (wordt niet automatisch gezet) 
+.5 = te bepalen (automatisch voor de standstill's die niet voldoen aan .2 en .3)
+*/
+]]></Content>
+</UDLText>
+
+<Method name="TranslateToCRM">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Activiteit:Activiteit</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:Activiteit=..Prive() "969950002"
+	Quit:Activiteit=..Rijden() "969950000"
+	Quit:Activiteit=..Stationary() "969950000"
+	Quit:Activiteit=..Firma() "969950003"
+	Quit:Activiteit=..Stilstand() "969950005"
+	Quit "969950005"
+]]></Implementation>
+</Method>
+
+<Method name="TranslateFromCRM">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Activiteit:Activiteit</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:Activiteit="969950002" ..Prive()
+	Quit:Activiteit="969950000" ..Rijden()
+	Quit:Activiteit="969950003" ..Firma() 
+	Quit:Activiteit="969950005" ..Stilstand() 
+	Quit "Onbekend"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/Trip/event/EventRaiser.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/event/EventRaiser.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/event/EventRaiser.cls.xml	(revision 42380)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.event.EventRaiser">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="EventRaiser">
+<Type>TECH.PubSub.EventRaiser</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>EventRaiser:TECH.PubSub.EventRaiser</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..EventRaiser = $$$Inject(EventRaiser,##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="RaiseTripGewijzigdEvent">
+<FormalSpec>TripId:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set EventData = ##class(AX.Uitgaand.VKP.Trip.event.TripGewijzigdEventData).%New(TripId)
+	Set Event = ##class(AX.Uitgaand.VKP.Trip.event.TripGewijzigdEvent).%New(EventData)
+	Do ..EventRaiser.RaiseEventSync(Event)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/Trip/event/TripGewijzigdEvent.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/event/TripGewijzigdEvent.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/event/TripGewijzigdEvent.cls.xml	(revision 42380)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.event.TripGewijzigdEvent">
+<Super>TECH.PubSub.Event</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml	(revision 42380)
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport">
+<Super>%RegisteredObject</Super>
+
+<Parameter name="CompanyName">
+<Default>Van Hoecke</Default>
+</Parameter>
+
+<Parameter name="LoginName">
+<Default>webservices</Default>
+</Parameter>
+
+<Parameter name="Password">
+<Default>Vah25@adm</Default>
+</Parameter>
+
+<Property name="ActiviteitService">
+<Type>AX.Uitgaand.VKP.Trip.impl.BepaalActiviteit</Type>
+</Property>
+
+<Parameter name="DefaultDagenInVerleden">
+<Default>1</Default>
+</Parameter>
+
+<Property name="Vehicle">
+<Type>WS.GeoDynamics.tns.VehicleCodeEntity</Type>
+</Property>
+
+<Property name="VanDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="TotDatum">
+<Type>%Date</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>User:Res.InternePersoon</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..VanDatum =..BepaalLaatsteDatum()
+	Set ..TotDatum=+$H
+	Set ..ActiviteitService=##class(AX.Uitgaand.VKP.Trip.impl.BepaalActiviteit).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsServiceBeschikbaar">
+<Description>
+d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).IsServiceBeschikbaar()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
+	
+	Set WebService.SSLConfiguration="GeoDynamicsAPI"
+	Set result=WebService.Ping(..GeefCallerID())
+	Quit result="PONG"
+]]></Implementation>
+</Method>
+
+<Method name="FetchAll">
+<Description>
+d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).%New().FetchAll()</Description>
+<Implementation><![CDATA[
+	&sql(DECLARE GeoUsers CURSOR FOR
+	Select ID into :IPNr from Res.InternePersoon where length(isnull(GeoDevice,''))>15)
+   	&sql(OPEN GeoUsers)
+ 	For  &sql(FETCH GeoUsers) Quit:SQLCODE  Do
+	. Do ..FetchOne(IPNr)
+	&sql(CLOSE GeoUsers)
+]]></Implementation>
+</Method>
+
+<Method name="FetchOne">
+<Description>
+d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).%New().FetchOne(1034)</Description>
+<FormalSpec>User:Res.InternePersoon</FormalSpec>
+<Implementation><![CDATA[
+	Set Wagens=..GeefWagenVanGebruiker(User)
+	Do ..OphalenTripsOverPeriode(Wagens)
+]]></Implementation>
+</Method>
+
+<Method name="GeefAlleWagens">
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
+	Set WebService.SSLConfiguration="GeoDynamicsAPI"
+	Set Wagens=WebService.VehicleGetAll(..GeefCallerID())
+	Quit Wagens
+]]></Implementation>
+</Method>
+
+<Method name="GeefWagenVanGebruiker">
+<FormalSpec>User:Res.InternePersoon</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set:'$isObject(User) User=##class(Res.InternePersoon).%OpenId(User)
+	Set Devices=##class(%ListOfDataTypes).%New()
+	Do Devices.Insert(User.GeoDevice)
+	Quit Devices
+]]></Implementation>
+</Method>
+
+<Method name="OphalenTripsOverPeriode">
+<FormalSpec>Wagens:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Datum as %Date
+	For Datum=..VanDatum:1:..TotDatum
+	{
+		Do ..OphalenTrips(Wagens, Datum)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="OphalenTrips">
+<FormalSpec>Devices:%ListOfDataTypes,Datum:%Date</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
+	Set WebService.SSLConfiguration="GeoDynamicsAPI"
+
+	#Dim TripsPerVehicles as %ListOfObjects
+	Set TripsPerVehicles=WebService.TripOverviewGetByVehicleIdLstDt(..GeefCallerID(),Devices,$$EXTDATE^vhLib.DataTypes(Datum,"J4"),$$EXTDATE^vhLib.DataTypes(Datum,"MN"),$$EXTDATE^vhLib.DataTypes(Datum,"DMN"))
+	
+	For VehicleCount=1:1:TripsPerVehicles.Count()
+	{
+		#Dim TripsPerVehicle as WS.GeoDynamics.tns.TripOverviewEntity
+		Set TripsPerVehicle=TripsPerVehicles.GetAt(VehicleCount)
+
+		Set ..Vehicle=TripsPerVehicle.Vehicle
+		Do ..OpslaanTrips(TripsPerVehicle.TripItemEntities)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="OpslaanTrips">
+<FormalSpec>Trips:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	For TripCount=1:1:Trips.Count()
+	{
+		Do ..OpslaanTrip(Trips.GetAt(TripCount))
+		;Do ..SkipVerwijderdeTrips(Trips.GetAt(TripCount))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="OpslaanTrip">
+<FormalSpec>GeoTrip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+
+	Set StartTijdstip=..VertaalTijdstip(GeoTrip.FromDateUtc)
+	Set WagenNaam=..Vehicle.Name
+	Set Activiteit=..ActiviteitService.GeefActiviteit(GeoTrip)
+	
+	
+	If ##class(TripData).WagenEnTijdExists(WagenNaam,StartTijdstip,.TripID)
+	{
+		Set cTrip=##class(TripData).%OpenId(TripID)
+	}
+	Else  ; nieuw
+	{
+		Set cTrip=##class(TripData).%New()
+		Set cTrip.Gemeente=GeoTrip.FromLocation.Address.Submunicipality
+		Set:cTrip.Gemeente="" cTrip.Gemeente=GeoTrip.FromLocation.Address.City
+		Set cTrip.PostCode=GeoTrip.FromLocation.Address.PostalCode
+		Set cTrip.Land=..GeefLandVolgensNaam(GeoTrip.FromLocation.Address.Country)
+		Set cTrip.Straat=GeoTrip.FromLocation.Address.Street
+		Set cTrip.HuisNr=GeoTrip.FromLocation.Address.HouseNumber
+		Set cTrip.StartTijdstip=StartTijdstip
+		Set cTrip.WagenID=..Vehicle.Id
+		Set cTrip.WagenNaam=WagenNaam
+		Set cTrip.CreatieTijdstip=$ZDT($H,3)
+	}
+	If cTrip.Activiteit'=Activiteit
+	{
+		Set cTrip.Activiteit=Activiteit
+	}
+	If cTrip.EindTijdstip'=..VertaalTijdstip(GeoTrip.ToDateUtc)
+	{
+		Set cTrip.EindTijdstip=..VertaalTijdstip(GeoTrip.ToDateUtc)
+	}
+	If cTrip.Afstand'=GeoTrip.MileageDriven
+	{
+	 	Set cTrip.Afstand=GeoTrip.MileageDriven
+	}
+	
+	If cTrip.%IsModified()
+	{	
+		Write !,cTrip.%Id()," ",	WagenNaam," - ",StartTijdstip," - ",Activiteit," - ",GeoTrip.FromLocation.Address.City
+
+		Set cTrip.WijzigTijdstip=$ZDT($H,3)
+		Do cTrip.Save()
+		Do ##class(AX.Uitgaand.VKP.Trip.event.EventRaiser).%New().RaiseTripGewijzigdEvent(cTrip.%Id())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefLandVolgensNaam">
+<Description>
+s land=##class(BL.Derde.Agenda.GeoDynamicsImport).%New(1017).GeefLandVolgensNaam("Netherlands") d DumpObject^%apiOBJ(land)</Description>
+<FormalSpec>LandNaam:%String</FormalSpec>
+<ReturnType>Res.Land</ReturnType>
+<Implementation><![CDATA[
+	Set ISOCode=""
+	
+	&sql(DECLARE VLAND CURSOR FOR
+	SELECT ISOCode
+	INTO :ISOCode
+	FROM Res.Land
+	WHERE OmsE=:LandNaam)
+	&sql(OPEN VLAND)
+	&sql(FETCH VLAND)
+	&sql(CLOSE VLAND)
+
+	If ISOCode'="" Do
+	. Set Land=##class(Res.Land).%OpenId(ISOCode)
+	Else  Do
+	. Set Land=""
+	Quit Land
+]]></Implementation>
+</Method>
+
+<Method name="VertaalTijdstip">
+<FormalSpec>GeoTijdstip:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit $ZDT($ZDTH(GeoTijdstip,3,7),3)
+]]></Implementation>
+</Method>
+
+<Method name="VertaalDatum">
+<FormalSpec>GeoTijdstip:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit +$ZDTH(GeoTijdstip,3,7)
+]]></Implementation>
+</Method>
+
+<Method name="BepaalLaatsteDatum">
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	Set LaatsteTijdStip=""
+	&sql(DECLARE BLD CURSOR FOR
+	SELECT MAX(StartTijdstip) 
+    INTO :LaatsteTijdStip
+	FROM  AX_Uitgaand_VKP_Trip_impl.TripData)
+   	&sql(OPEN BLD)
+ 	For  &sql(FETCH BLD) Quit:SQLCODE
+ 	&sql(CLOSE BLD)
+ 	
+ 	Set LaatsteDatum=$S(LaatsteTijdStip'="":+$ZDH(LaatsteTijdStip,3),1:0)
+
+ 	If LaatsteDatum>+$H
+ 	{
+	 	Set LaatsteDatum=+$H-1
+	}
+	If LaatsteDatum<(+$H-5)
+	{
+	 	Set LaatsteDatum=+$H-5
+	}
+	
+	Quit LaatsteDatum
+]]></Implementation>
+</Method>
+
+<Method name="GeefCallerID">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>WS.GeoDynamics.tns.CallerEntity</ReturnType>
+<Implementation><![CDATA[
+	Set CallerID=##class(WS.GeoDynamics.tns.CallerEntity).%New()
+	Set CallerID.CompanyName=..#CompanyName
+	Set CallerID.LoginName=..#LoginName
+	Set CallerID.Password=..#Password
+	Quit CallerID
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/VKP/Trip/impl/TripData.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/Trip/impl/TripData.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/Trip/impl/TripData.cls.xml	(revision 42380)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.Trip.impl.TripData">
+<ClassType>persistent</ClassType>
+<Super>TECH.Persistent</Super>
+
+<Property name="WagenNaam">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="WagenID">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Straat">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="HuisNr">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="PostCode">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Gemeente">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Land">
+<Type>Res.Land</Type>
+</Property>
+
+<Property name="Longitude">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="Latitude">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="StartTijdstip">
+<Type>%TimeStamp</Type>
+</Property>
+
+<Property name="EindTijdstip">
+<Type>%TimeStamp</Type>
+</Property>
+
+<Property name="CreatieTijdstip">
+<Type>%TimeStamp</Type>
+</Property>
+
+<Property name="WijzigTijdstip">
+<Type>%TimeStamp</Type>
+</Property>
+
+<Property name="Activiteit">
+<Type>AX.Uitgaand.VKP.Trip.enu.Activiteit</Type>
+</Property>
+
+<Property name="Afstand">
+<Type>%Decimal</Type>
+</Property>
+
+<Index name="WagenEnTijd">
+<Properties>WagenNaam,StartTijdstip</Properties>
+<Unique>1</Unique>
+</Index>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^AX.Uitgaand.VKP.T208A.TripDataD</DataLocation>
+<DefaultData>TripDataDefaultData</DefaultData>
+<IdLocation>^AX.Uitgaand.VKP.T208A.TripDataD</IdLocation>
+<IndexLocation>^AX.Uitgaand.VKP.T208A.TripDataI</IndexLocation>
+<StreamLocation>^AX.Uitgaand.VKP.T208A.TripDataS</StreamLocation>
+<Data name="TripDataDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>WagenNaam</Value>
+</Value>
+<Value name="3">
+<Value>WagenID</Value>
+</Value>
+<Value name="4">
+<Value>Straat</Value>
+</Value>
+<Value name="5">
+<Value>HuisNr</Value>
+</Value>
+<Value name="6">
+<Value>PostCode</Value>
+</Value>
+<Value name="7">
+<Value>Gemeente</Value>
+</Value>
+<Value name="8">
+<Value>Land</Value>
+</Value>
+<Value name="9">
+<Value>Longitude</Value>
+</Value>
+<Value name="10">
+<Value>Latitude</Value>
+</Value>
+<Value name="11">
+<Value>StartTijdstip</Value>
+</Value>
+<Value name="12">
+<Value>EindTijdstip</Value>
+</Value>
+<Value name="13">
+<Value>CreatieTijdstip</Value>
+</Value>
+<Value name="14">
+<Value>WijzigTijdstip</Value>
+</Value>
+<Value name="15">
+<Value>Activiteit</Value>
+</Value>
+<Value name="16">
+<Value>Afstand</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: Res/Land.cls.xml
===================================================================
diff -u -r29059 -r42380
--- Res/Land.cls.xml	(.../Land.cls.xml)	(revision 29059)
+++ Res/Land.cls.xml	(.../Land.cls.xml)	(revision 42380)
@@ -6,13 +6,6 @@
 <StorageStrategy>VHOpslag</StorageStrategy>
 <Super>%Persistent,%XML.Adaptor</Super>
 
-<UDLText name="T">
-<Content><![CDATA[
-//Projection Java As %Projection.Java(ROOTDIR = "C:\InterSystems\GeneratedJava");
-
-]]></Content>
-</UDLText>
-
 <Index name="PrimKey">
 <IdKey>1</IdKey>
 <PrimaryKey>1</PrimaryKey>
@@ -55,6 +48,12 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
+<Property name="Code3">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="30"/>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
 <Property name="WijzigTijdStip">
 <Type>Sys.cTimeStamp</Type>
 </Property>
@@ -82,6 +81,10 @@
 <Delimiter>"\"</Delimiter>
 <Piece>1</Piece>
 </Data>
+<Data name="Code3">
+<Delimiter>"\"</Delimiter>
+<Piece>35</Piece>
+</Data>
 <Data name="OmsD">
 <Delimiter>"\"</Delimiter>
 <Piece>22</Piece>