Index: BL/Derde/Agenda/GeoDynamicsImport.cls.xml
===================================================================
diff -u -r37533 -r38084
--- BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 37533)
+++ BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 38084)
@@ -16,7 +16,7 @@
 </Parameter>
 
 <Parameter name="KortePeriodeStilstand">
-<Default>90</Default>
+<Default>60</Default>
 </Parameter>
 
 <Parameter name="KortePeriodeRijden">
@@ -39,10 +39,6 @@
 <Type>%Time</Type>
 </Property>
 
-<Property name="LaatsteGeoMobile">
-<Type>Derde.Agenda.GeoMobile</Type>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>User:Res.InternePersoon</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -60,7 +56,7 @@
 
 <Method name="OphalenLocaties">
 <Description>
-d ##class(BL.Derde.Agenda.GeoDynamicsImport).%New(1017).OphalenLocaties()</Description>
+d ##class(BL.Derde.Agenda.GeoDynamicsImport).%New(17).OphalenLocaties()</Description>
 <Implementation><![CDATA[
 	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
 	Set WebService.SSLConfiguration="GeoDynamicsAPI"
@@ -138,6 +134,7 @@
 		Continue:MultiTrips.Count()=0
 		Do ..OpslaanTrips(MultiTrips.GetAt(1).TripItemEntities)
 	}
+	Do ..UpdateAfstand()
 ]]></Implementation>
 </Method>
 
@@ -162,18 +159,20 @@
 
 	Set Rijden=..VertaalNaarRijden(Trip)
 	
-	Set GeoData=##class(Derde.Agenda.GeoMobile).Create("",..User,$P(Tijdstip,",",1),$P(Tijdstip,",",2), Rijden, -Trip.MileageDriven, "", Trip.FromLocation.Latitude, Trip.FromLocation.Longitude,"","trip")
+	Set GeoData=##class(Derde.Agenda.GeoMobile).Create("",..User,$P(Tijdstip,",",1),$P(Tijdstip,",",2), Rijden, Trip.MileageDriven, "", Trip.FromLocation.Latitude, Trip.FromLocation.Longitude,"","trip")
 	
 	Set GeoData.Gemeente=Trip.FromLocation.Address.City
 	Set GeoData.PostCode=Trip.FromLocation.Address.PostalCode
 	Set GeoData.Land=Trip.FromLocation.Address.Country
 	Set GeoData.Straat=Trip.FromLocation.Address.Street_" "_Trip.FromLocation.Address.HouseNumber
 
 	Set GeoMobile=##class(Derde.Agenda.GeoMobile).OpenExisting(GeoData)
-	If $isObject(GeoMobile)
+	If $isObject(GeoMobile) && (GeoMobile.Afstand'=Trip.MileageDriven)
 	{
-		Set GeoMobile.Afstand=-Trip.MileageDriven
+		Set Distance=Trip.MileageDriven-GeoMobile.Afstand
+		Set GeoMobile.Afstand=Trip.MileageDriven
 		Set sc=GeoMobile.%Save()
+		
 	}
 	ElseIf (GeoData.Datum>..LaatsteDatum)||((GeoData.Datum=..LaatsteDatum)&&((..LaatsteTijd="")||(GeoData.Tijd>..LaatsteTijd)))
 	{
@@ -182,6 +181,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UpdateAfstand">
+<Implementation><![CDATA[
+	Set LaatsteDatum=..LaatsteDatum
+	Set UserID=..User.%Id()
+
+	&sql(DECLARE UPDAFST CURSOR FOR
+	SELECT Datum, AgendaSubID,Sum(Afstand) 
+    INTO Datum,AgendaSubID, Afstand
+	FROM Derde_Agenda.GeoMobile
+	WHERE Gebruiker=:UserID and Datum>=:LaatsteDatum 
+	Group by Datum, AgendaSubID)
+	
+   	&sql(OPEN UPDAFST)
+ 	For  &sql(FETCH UPDAFST) Quit:SQLCODE  Do
+	. If AgendaSubID Do
+	. .	Set Agenda=##class(Derde.Agenda.Agenda).%OpenId(UserID_"||"_Datum_"||"_AgendaSubID)
+	. .	If $isObject(Agenda) Do
+	. . . Set Agenda.Afstand=Afstand
+	. . . Set sc=Agenda.%Save()
+			
+ 	&sql(CLOSE UPDAFST)
+]]></Implementation>
+</Method>
+
 <Method name="BepaalLaatsteDatumEnTijd">
 <Implementation><![CDATA[
 	; Laatste datum
@@ -313,34 +336,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestLatLon">
-<Description>
-d ##class(BL.Derde.Agenda.GeoDynamics.OphalenGegevens).%New(17).TestTrip()</Description>
-<Implementation><![CDATA[
-	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
-	
-		;Set WebService.Https=1
-	Set WebService.SSLConfiguration="GeoDynamicsAPI"
-	Set Adres=##class(WS.GeoDynamics.tns.AddressEntity).%New()
-	Set Adres.Street="Kerkstraat"
-	Set Adres.HouseNumber=116
-	Set Adres.City="Temse"
-	Set Adres.Country="Belgium"
-	
-	Set result=WebService.GeoCodingFindAddress(..GeefCallerID(), Adres)
-	d DumpObject^%apiOBJ(result)
-	w !
-	w "Aantal trips:",result.Count(),!
-	d DumpObject^%apiOBJ(result.GetAt(1))
-	w !
-	d DumpObject^%apiOBJ(result.GetAt(1).TripItemEntities)
-	w !
-	d DumpObject^%apiOBJ(result.GetAt(1).TripItemEntities.GetAt(1))
-	w !
-	w !,"Aantal items ",result.GetAt(1).TripItemEntities.Count(),!
-]]></Implementation>
-</Method>
-
 <Method name="GeefCallerID">
 <ClassMethod>1</ClassMethod>
 <Private>1</Private>