Index: BL/Derde/Agenda/Agenda.cls.xml
===================================================================
diff -u -r2521 -r2641
--- BL/Derde/Agenda/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2521)
+++ BL/Derde/Agenda/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2641)
@@ -151,18 +151,29 @@
 <Method name="SetProximity">
 <FormalSpec>Agenda,ProximityAfstand</FormalSpec>
 <Implementation><![CDATA[
-	If '$L(Agenda.Type) Do ; Proximity
-	. Set Firma=Agenda.Gebruiker.FirmaGet()
-	. ;If ($$CALCDATE^vhDTyp(Agenda.Datum,"A","+0",Firma)'=Agenda.Datum) Do ; Datum is geen arbeidsdatum daarom "Prive"
-	. If ($$CALCDATE^vhDTyp(Agenda.Datum,"A","+0")'=Agenda.Datum)&&(((+$H=60935)&&(Firma'="BV"))||(+$H'=60935)) Do ; Datum is geen arbeidsdatum daarom "Prive"
-	. . Set Agenda.Type="P"
-	. Else  Do
-	. . Set Lookup=..BLGeoMobile.GetProximity(Agenda.Latitude,Agenda.Longitude,.ProximityAfstand)
-	. . Quit:Lookup=""
-	. . Set:Lookup.Type'="B" Agenda.Type=Lookup.Type
-	. . Set Agenda.Klant=Lookup.Klant
-	. . Set Agenda.Leverancier=Lookup.Leverancier
-	. . Set Agenda.Prospect=Lookup.Omschrijving
+	if '$length(Agenda.Type) {  // indien Agenda type niet gekend
+		if '$$ISARBDAG^vhRtn2(Agenda.Datum) { 	// indien geen arbeidsdag
+			set Agenda.Type="P"
+		} else {
+			set Lookup=..BLGeoMobile.GetProximity(Agenda.Latitude,Agenda.Longitude,.ProximityAfstand)
+			if $IsObject(Lookup) {
+				if Lookup.Type'="B" { // indien gevonden lokatie geen beurs
+					set Agenda.Type = Lookup.Type 
+				}
+				if $IsObject(Lookup.Klant) {
+					set Klant = ##class(DOM.DomeinContext).Instance().GeefKlantAPI().GeefKlant(Lookup.KlantGetObjectId())
+					set KlantNiveau = Klant.GeefKlantNiveau()
+					if KlantNiveau = ##class(DOM.CRM.enu.KlantNiveau).Architect() {
+						Set Agenda.Architect = Lookup.Klant
+					} else {
+					Set Agenda.Klant = Lookup.Klant	
+					}
+				}
+				set Agenda.Leverancier=Lookup.Leverancier		
+			    set Agenda.Prospect=Lookup.Omschrijving		
+			}
+		}
+	}
 ]]></Implementation>
 </Method>