Index: BL/Derde/Agenda/CRMExport.cls.xml
===================================================================
diff -u
--- BL/Derde/Agenda/CRMExport.cls.xml	(revision 0)
+++ BL/Derde/Agenda/CRMExport.cls.xml	(revision 38383)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Derde.Agenda.CRMExport">
+<Super>%RegisteredObject</Super>
+
+<Method name="Test">
+<Description>
+D ##class(BL.Derde.Agenda.CRMExport).Test()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set bl=..%New()
+	Set Datum=+$H-1
+	Set Agenda=##class(Derde.Agenda.Agenda).%OpenId(1017_"||"_Datum_"||"_1093030)
+	Do bl.SendXML(Agenda)
+	Set Agenda=##class(Derde.Agenda.Agenda).%OpenId(1017_"||"_Datum_"||"_1093038)
+	Do bl.SendXML(Agenda)
+	Set Agenda=##class(Derde.Agenda.Agenda).%OpenId(1017_"||"_Datum_"||"_1093338)
+	Do bl.SendXML(Agenda)
+]]></Implementation>
+</Method>
+
+<Method name="SendXML">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Implementation><![CDATA[
+	Quit:'..IsGeldig(Agenda)
+	
+	Set pxBeweging=##class(AXBizTalk.Crm.Geolocation.Location).%New()
+	Do pxBeweging.Fill(Agenda)
+	Do ..Export(pxBeweging,Agenda)
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldig">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:'Agenda.AutoCreate 0
+	
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="FileName">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit "GPS"_Agenda.Gebruiker.ID_" "_Agenda.SubID_".xml"
+]]></Implementation>
+</Method>
+
+<Method name="Pad">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit "\\notes01\shared\P V"
+]]></Implementation>
+</Method>
+
+<Method name="Export">
+<FormalSpec>pxBeweging:AXBizTalk.Crm.Geolocation.Location,Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set sc=$$ObjToXMLFile^vhLib(pxBeweging,$$FULLPAD^vhDEV(..Pad(),..FileName(Agenda)))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXBizTalk/Crm/Geolocation/MessageParts.cls.xml
===================================================================
diff -u
--- AXBizTalk/Crm/Geolocation/MessageParts.cls.xml	(revision 0)
+++ AXBizTalk/Crm/Geolocation/MessageParts.cls.xml	(revision 38383)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXBizTalk.Crm.Geolocation.MessageParts">
+<ClassType>serial</ClassType>
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLIGNORENULL">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
+<Property name="Location">
+<Type>AXBizTalk.Crm.Geolocation.Location</Type>
+<Parameter name="REFELEMENTQUALIFIED" value="1"/>
+<Parameter name="XMLNAME" value="Location"/>
+<Parameter name="XMLREF" value="1"/>
+</Property>
+</Class>
+
+
+</Export>
Index: AXBizTalk/Crm/Geolocation/Location.cls.xml
===================================================================
diff -u
--- AXBizTalk/Crm/Geolocation/Location.cls.xml	(revision 0)
+++ AXBizTalk/Crm/Geolocation/Location.cls.xml	(revision 38383)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXBizTalk.Crm.Geolocation.Location">
+<ClassType/>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<Inheritance>right</Inheritance>
+
+<Parameter name="XMLNAME">
+<Default>GpsBeweging</Default>
+</Parameter>
+
+<Property name="AdminId">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="GeoDynamicsId">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="VoertuigNaam">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="VoertuigCode">
+<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="PostalCode">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Plaats">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Land">
+<Type>%Library.String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Longitude">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="Latitude">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="TijdsbestedingStartDatum">
+<Type>%String</Type>
+</Property>
+
+<Property name="TijdsbestedingEindDatum">
+<Type>%String</Type>
+</Property>
+
+<Property name="TripType">
+<Type>%String</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Property name="Afstand">
+<Type>%Decimal</Type>
+</Property>
+
+<Method name="Fill">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</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
+]]></Implementation>
+</Method>
+
+<Method name="GeefLand">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Implementation><![CDATA[
+	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 name="GeefVoertuigCode">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Implementation><![CDATA[
+	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 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>
+
+
+</Export>
Index: AXBizTalk/Crm/Geolocation/Request.cls.xml
===================================================================
diff -u
--- AXBizTalk/Crm/Geolocation/Request.cls.xml	(revision 0)
+++ AXBizTalk/Crm/Geolocation/Request.cls.xml	(revision 38383)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXBizTalk.Crm.Geolocation.Request">
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLIGNORENULL">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
+<Property name="Command">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="SubjectId">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="Message">
+<Type>AXBizTalk.Crm.Geolocation.Envelope</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Command:%String,SubjectId:%String,Message:AXBizTalk.Crm.Geolocation.Envelope=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Command = Command
+	set ..SubjectId = SubjectId
+	set ..Message = Message 
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXBizTalk/Crm/Geolocation/Header.cls.xml
===================================================================
diff -u
--- AXBizTalk/Crm/Geolocation/Header.cls.xml	(revision 0)
+++ AXBizTalk/Crm/Geolocation/Header.cls.xml	(revision 38383)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXBizTalk.Crm.Geolocation.Header">
+<ClassType>serial</ClassType>
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLIGNORENULL">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="XMLNAME">
+<Default>Header</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+
+<Property name="MessageId">
+<Type>%String</Type>
+<Parameter name="MAXLEN"/>
+<Parameter name="XMLNAME" value="MessageId"/>
+</Property>
+
+<Property name="Company">
+<Type>%String</Type>
+<Parameter name="MAXLEN"/>
+<Parameter name="XMLNAME" value="Company"/>
+</Property>
+
+<Property name="Action">
+<Type>%String</Type>
+<Parameter name="MAXLEN"/>
+<Parameter name="XMLNAME" value="Action"/>
+</Property>
+
+<Property name="RequestMessageId">
+<Type>%String</Type>
+<Parameter name="MAXLEN"/>
+<Parameter name="XMLNAME" value="RequestMessageId"/>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>HeaderState</State>
+<StreamLocation>^AXBizTalk.Crm.Geolo19AC.HeaderS</StreamLocation>
+<Data name="HeaderState">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>MessageId</Value>
+</Value>
+<Value name="2">
+<Value>Company</Value>
+</Value>
+<Value name="3">
+<Value>Action</Value>
+</Value>
+<Value name="4">
+<Value>RequestMessageId</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: AXBizTalk/Crm/Geolocation/Body.cls.xml
===================================================================
diff -u
--- AXBizTalk/Crm/Geolocation/Body.cls.xml	(revision 0)
+++ AXBizTalk/Crm/Geolocation/Body.cls.xml	(revision 38383)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXBizTalk.Crm.Geolocation.Body">
+<ClassType>serial</ClassType>
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLIGNORENULL">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Property name="MessageParts">
+<Type>AXBizTalk.Crm.Geolocation.MessageParts</Type>
+<Parameter name="REFELEMENTQUALIFIED" value="1"/>
+<Parameter name="XMLNAME" value="MessageParts"/>
+<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+</Property>
+</Class>
+
+
+</Export>
Index: BL/Derde/Agenda/GeoDynamicsImport.cls.xml
===================================================================
diff -u -r38084 -r38383
--- BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 38084)
+++ BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 38383)
@@ -56,7 +56,7 @@
 
 <Method name="OphalenLocaties">
 <Description>
-d ##class(BL.Derde.Agenda.GeoDynamicsImport).%New(17).OphalenLocaties()</Description>
+d ##class(BL.Derde.Agenda.GeoDynamicsImport).%New(1017).OphalenLocaties()</Description>
 <Implementation><![CDATA[
 	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
 	Set WebService.SSLConfiguration="GeoDynamicsAPI"
@@ -132,7 +132,12 @@
 	{
 		Set MultiTrips=WebService.TripOverviewGetByVehicleIdLstDt(..GeefCallerID(),Devices,$$EXTDATE^vhLib.DataTypes(Datum,"J4"),$$EXTDATE^vhLib.DataTypes(Datum,"MN"),$$EXTDATE^vhLib.DataTypes(Datum,"DMN"))
 		Continue:MultiTrips.Count()=0
-		Do ..OpslaanTrips(MultiTrips.GetAt(1).TripItemEntities)
+		Set SingleTrips=MultiTrips.GetAt(1)
+		
+		; Onthouden van de GeoDynamics ID om door te geven naar CRM
+		Set:(SingleTrips.Vehicle.Name'="")&&(^vhUSER("Vehicle",..User.ID)'=SingleTrips.Vehicle.Name) ^vhUSER("Vehicle",..User.ID)=SingleTrips.Vehicle.Name
+
+		Do ..OpslaanTrips(SingleTrips.TripItemEntities)
 	}
 	Do ..UpdateAfstand()
 ]]></Implementation>
@@ -173,6 +178,7 @@
 		Set GeoMobile.Afstand=Trip.MileageDriven
 		Set sc=GeoMobile.%Save()
 		
+		
 	}
 	ElseIf (GeoData.Datum>..LaatsteDatum)||((GeoData.Datum=..LaatsteDatum)&&((..LaatsteTijd="")||(GeoData.Tijd>..LaatsteTijd)))
 	{
@@ -197,10 +203,11 @@
  	For  &sql(FETCH UPDAFST) Quit:SQLCODE  Do
 	. If AgendaSubID Do
 	. .	Set Agenda=##class(Derde.Agenda.Agenda).%OpenId(UserID_"||"_Datum_"||"_AgendaSubID)
-	. .	If $isObject(Agenda) Do
+	. .	If $isObject(Agenda)&&(Agenda.Afstand'=Afstand) Do
 	. . . Set Agenda.Afstand=Afstand
 	. . . Set sc=Agenda.%Save()
-			
+	. . . Do ##class(BL.Derde.Agenda.CRMExport).%New().SendXML(Agenda)
+	
  	&sql(CLOSE UPDAFST)
 ]]></Implementation>
 </Method>
@@ -255,7 +262,7 @@
 	}
 	Else 
 	{
-		If ..IsTeKortePeriode(Trip)
+		If ..IsTeKortePeriode(Trip) 
 		{
 			Set Rijden=1
 		}
@@ -271,6 +278,8 @@
 <Method name="IsTeKortePeriode">
 <FormalSpec>Trip:WS.GeoDynamics.tns.TripEntity</FormalSpec>
 <Implementation><![CDATA[
+	Q 0 ; test PV dd 05/12/2016
+	
 	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)
Index: AXBizTalk/Crm/Geolocation/Envelope.cls.xml
===================================================================
diff -u
--- AXBizTalk/Crm/Geolocation/Envelope.cls.xml	(revision 0)
+++ AXBizTalk/Crm/Geolocation/Envelope.cls.xml	(revision 38383)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXBizTalk.Crm.Geolocation.Envelope">
+<ClassType>serial</ClassType>
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLIGNORENULL">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="XMLNAME">
+<Default>Envelope</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>0</Default>
+</Parameter>
+
+<Property name="Header">
+<Type>AXBizTalk.Crm.Geolocation.Header</Type>
+<Parameter name="XMLNAME" value="Header"/>
+</Property>
+
+<Property name="Body">
+<Type>AXBizTalk.Crm.Geolocation.Body</Type>
+<Parameter name="XMLNAME" value="Body"/>
+</Property>
+</Class>
+
+
+</Export>
Index: BL/Derde/Agenda/GeoMobile.cls.xml
===================================================================
diff -u -r37296 -r38383
--- BL/Derde/Agenda/GeoMobile.cls.xml	(.../GeoMobile.cls.xml)	(revision 37296)
+++ BL/Derde/Agenda/GeoMobile.cls.xml	(.../GeoMobile.cls.xml)	(revision 38383)
@@ -2,6 +2,9 @@
 <Export generator="Cache" version="24">
 <Class name="BL.Derde.Agenda.GeoMobile">
 <Description>
+; uit voeren na aanpassing devicenr in vhUSER
+D ##class(BL.Derde.Agenda.GeoMobile).CreateLookup()
+
 D ##class(BL.Derde.Agenda.GeoMobile).UpdateAll()
 D ##class(BL.Derde.Agenda.GeoMobile).Create(22).CopyPreviousAllDay($H-2)</Description>
 <ClassType/>
@@ -118,6 +121,7 @@
 	. Set WieIsWie(Key)=UserID_"\"_Naam_"\"_GeoDevice
 	&sql(CLOSE LookupGeoUsers)
 	Kill ^vhUSER("IGEO") Merge ^vhUSER("IGEO")=IGeo
+	Set ^vhUSER("IGEO")="D ##class(BL.Derde.Agenda.GeoMobile).CreateLookup()"
 	Kill ^Derde.Agenda.GeoMobileCfg("WIE") Merge ^Derde.Agenda.GeoMobileCfg("WIE")=WieIsWie
 
 	#dim GeoMobileLogPath As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("BL.Derde.Agenda.GeoMobile.LogPath")
@@ -658,7 +662,7 @@
 Set ag=##class(Derde.Agenda.Agenda).%OpenId("22||60657||37020")
 w ok=##class(BL.Derde.Agenda.GeoMobile).SaveAgenda(ag)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<FormalSpec>Agenda</FormalSpec>
 <Implementation><![CDATA[
 	; Controle of gemeente is ingevuld, indien niet dan zoeken in de recenste gekende positie
 	If Agenda.Type'="R",Agenda.Type'="Q",Agenda.Gemeente="" Do
@@ -675,6 +679,8 @@
 	Set OK=Agenda.%Save()
 	;w $$ParseStatus^vhLib(OK),!
 	Quit:OK'=$$$OK OK
+	Do ##class(BL.Derde.Agenda.CRMExport).%New().SendXML(Agenda)
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -687,7 +693,7 @@
 
 Als Vorig GeoMobile data reeds overgebracht was aan een Agenda was dan wordt deze heropend om eventueel hieraan bij te voegen
 op deze manier kan de conversie steeds aan pikken waar het de vorige keer gebleven was</Description>
-<FormalSpec>Current:Derde.Agenda.GeoMobile,Vorig:Derde.Agenda.GeoMobile,Agenda:Derde.Agenda.Agenda</FormalSpec>
+<FormalSpec>Current,Vorig,Agenda</FormalSpec>
 <Implementation><![CDATA[
 	; Niets bijvoegen als AgendaSubID reeds ingevuld
 	;Quit:$L(Current.AgendaSubID) ""
@@ -724,29 +730,28 @@
 </Method>
 
 <Method name="CreateAgenda">
-<FormalSpec>Current:Derde.Agenda.GeoMobile</FormalSpec>
+<FormalSpec>Current</FormalSpec>
 <Implementation><![CDATA[
 	Set Agenda=##class(Derde.Agenda.Agenda).Create(Current.Gebruiker,Current.Datum,Current.Tijd,Current.Tijd,$S(Current.ContactOn:"R",1:""))
 	Set Agenda.AutoCreate=1
-	Set Agenda.BeginKM=Current.Afstand/$S(..IsLightBridge:1000,1:1) ; soms is de GeoMobile.Afstand = 0, dan wordt deze later ingevuld
+	Set Agenda.BeginKM=Current.Afstand/$S(..IsLightBridge:1000,1:1)
 	;w $ZT(Current.Tijd)," ",Agenda.BeginKM,!
 	;d DumpObject^%apiOBJ(Agenda)
 	Quit Agenda
 ]]></Implementation>
 </Method>
 
 <Method name="AddTime2Agenda">
-<FormalSpec>Current:Derde.Agenda.GeoMobile,Agenda:Derde.Agenda.Agenda,Tijd,Afstand</FormalSpec>
+<FormalSpec>Current,Agenda,Tijd,Afstand</FormalSpec>
 <Implementation><![CDATA[
-	Set:Agenda.TijdTot<Tijd Agenda.TijdTot=Tijd
-	Set:'Agenda.BeginKM Agenda.BeginKM=Afstand/$S(..IsLightBridge:1000,1:1) ; soms is de GeoMobile.Afstand = 0 correctie PV - 10/10/2012
-	Set:Agenda.Type="R" Agenda.Afstand=Afstand/$S(..IsLightBridge:1000,1:1)-Agenda.BeginKM
+	 Set:Agenda.TijdTot<Tijd Agenda.TijdTot=Tijd
+	 Set:Agenda.Type="R" Agenda.Afstand=Afstand/$S(..IsLightBridge:1000,1:1)-Agenda.BeginKM
 	 Do ..AddGPSInfo2Agenda(Current,Agenda)
 ]]></Implementation>
 </Method>
 
 <Method name="AddGPSInfo2Agenda">
-<FormalSpec>Current:Derde.Agenda.GeoMobile,Agenda:Derde.Agenda.Agenda</FormalSpec>
+<FormalSpec>Current,Agenda</FormalSpec>
 <Implementation><![CDATA[
 	 Quit:Agenda.Type="R" ; Geen positie gegevens opslaan bij Rijden
 	 If 'Current.PrecisionError Do