Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/SchuineHoekenToevoeger.cls.xml
===================================================================
diff -u -r60122 -r60197
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/SchuineHoekenToevoeger.cls.xml	(.../SchuineHoekenToevoeger.cls.xml)	(revision 60122)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/SchuineHoekenToevoeger.cls.xml	(.../SchuineHoekenToevoeger.cls.xml)	(revision 60197)
@@ -4,20 +4,16 @@
 <Super>%RegisteredObject</Super>
 
 <Method name="SchuineHoeken">
-<FormalSpec>ProfielBreedte,KaderBreedte,KaderHoogte</FormalSpec>
+<FormalSpec>ProfielBreedte:%Integer,KaderBreedte:%Integer,KaderHoogte:%Integer</FormalSpec>
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set SchuineHoekenOffset = ProfielBreedte
-	Set SchuineHoekGroup =##class(TECH.Svg.Basis.Group).%New()
+	Set SchuineHoekGroup = ##class(TECH.Svg.Basis.Group).%New()
 	Do SchuineHoekGroup.VoegToeID("schuine hoeken")
-	#dim LeftTopLine As TECH.Svg.Basis.Line
-	#dim RightTopLine As TECH.Svg.Basis.Line
-	#dim LeftBottomLine As TECH.Svg.Basis.Line
-	#dim RightBottomLine As TECH.Svg.Basis.Line
 	Set LeftTopLine = BasisElementFactory.MaakLijn(0,0,SchuineHoekenOffset\1,SchuineHoekenOffset\1)
 	Do LeftTopLine.SetStroke(##class(TECH.Svg.enu.Kleur).Zwart())
 	Do SchuineHoekGroup.VoegToeElement(LeftTopLine)
-	Set RightTopLine =BasisElementFactory.MaakLijn(KaderBreedte,0,KaderBreedte-(SchuineHoekenOffset\1),SchuineHoekenOffset\1)
+	Set RightTopLine = BasisElementFactory.MaakLijn(KaderBreedte,0,KaderBreedte-(SchuineHoekenOffset\1),SchuineHoekenOffset\1)
 	Do RightTopLine.SetStroke(##class(TECH.Svg.enu.Kleur).Zwart())
 	Do SchuineHoekGroup.VoegToeElement(RightTopLine)
 	Set LeftBottomLine = BasisElementFactory.MaakLijn(0,KaderHoogte\1,SchuineHoekenOffset\1,KaderHoogte-(SchuineHoekenOffset\1))
Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/LosProfielToevoeger.cls.xml
===================================================================
diff -u -r60122 -r60197
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/LosProfielToevoeger.cls.xml	(.../LosProfielToevoeger.cls.xml)	(revision 60122)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/LosProfielToevoeger.cls.xml	(.../LosProfielToevoeger.cls.xml)	(revision 60197)
@@ -7,6 +7,7 @@
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,LosOffset:%Integer,ProfPlaats:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	Set LeftTopInner  = BasisElementFactory.MaakCoordinaat(LosOffset,LosOffset)
 	Set RightTopInner = BasisElementFactory.MaakCoordinaat(Breedte - LosOffset,LosOffset)
 	Set LeftBottomInner = BasisElementFactory.MaakCoordinaat(LosOffset,Lengte-LosOffset)
@@ -17,34 +18,20 @@
 	Set LeftBottomOuter = BasisElementFactory.MaakCoordinaat(0, Lengte)
 	Set RightBottomOuter = BasisElementFactory.MaakCoordinaat(Breedte, Lengte)
 	
-	#dim CoordinatesList As %ListOfObjects = ##class(%ListOfObjects).%New()
-	
 	If (ProfPlaats="PL") {
-		Do CoordinatesList.Insert(LeftTopInner)
-		Do CoordinatesList.Insert(LeftTopOuter)
-		Do CoordinatesList.Insert(LeftBottomOuter)
-		Do CoordinatesList.Insert(LeftBottomInner)
+		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(LeftTopInner, LeftTopOuter, LeftBottomOuter, LeftBottomInner)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList)
 	}
 		If (ProfPlaats="PB") {
-		Do CoordinatesList.Insert(LeftTopInner)
-		Do CoordinatesList.Insert(LeftTopOuter)
-		Do CoordinatesList.Insert(RightTopOuter)
-		Do CoordinatesList.Insert(RightTopInner)
+		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(LeftTopInner, LeftTopOuter, RightTopOuter, RightTopInner)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList)
 	}
 		If (ProfPlaats="PR") {
-		Do CoordinatesList.Insert(RightTopInner)
-		Do CoordinatesList.Insert(RightTopOuter)
-		Do CoordinatesList.Insert(RightBottomOuter)
-		Do CoordinatesList.Insert(RightBottomInner)
+		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(RightTopInner, RightTopOuter, RightBottomOuter, RightBottomInner)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList)
 	}
 		If (ProfPlaats="PO") {
-		Do CoordinatesList.Insert(RightBottomInner)
-		Do CoordinatesList.Insert(RightBottomOuter)
-		Do CoordinatesList.Insert(LeftBottomOuter)
-		Do CoordinatesList.Insert(LeftBottomInner)
+		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(RightBottomInner, RightBottomOuter, LeftBottomOuter, LeftBottomInner)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList)
 	}
 		Do Path.SetFill("#F0F0F0")
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r60134 -r60197
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60134)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60197)
@@ -29,50 +29,42 @@
 ]]></Implementation>
 </Method>
 
-<Method name="SD30FREES">
-<FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer</FormalSpec>
+<Method name="SDxFREES">
+<FormalSpec>Diameter:%Integer,MiddleOffset:%Integer,Offset:%Integer,OffsetOpposite:%Integer,P1:%Integer,P2:%Integer,Rotation:%Integer,Breedte:%Integer,Lengte:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	Set Diameter = 30
-	Set MiddleOffset = 2.9
-	Set Offset = (Diameter/2) - MiddleOffset
-	Set OffsetOpposite = (Diameter/2) + MiddleOffset
-	Set P1 = 0.28
-	Set P2 = 29.72
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
 	If (Rotation = 0) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Breedte-Offset,Lengte-(Diameter\2)))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Offset,P2))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Offset,P1))
+		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,Offset,P2,Offset,P1)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
-		
 	}ElseIf (Rotation = 90) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Lengte-(Diameter\2), Breedte-Offset))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P1,Offset))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P2,Offset))
+		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P1,Offset,P2,Offset)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 180) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Breedte-Offset,Lengte-(Diameter\2)))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(OffsetOpposite,P1))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(OffsetOpposite,P2))
+		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,OffsetOpposite,P1,OffsetOpposite,P2)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 270) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Lengte-(Diameter\2), Breedte-Offset))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P2,OffsetOpposite))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P1,OffsetOpposite))
+		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P2,OffsetOpposite,P1,OffsetOpposite)
 		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
 	}
 	Do ..SvgBox.VoegToeElement(Path)
 ]]></Implementation>
 </Method>
 
+<Method name="SD30FREES">
+<FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Set Diameter = 30
+	Set MiddleOffset = 2.9
+	Set Offset = (Diameter/2) - MiddleOffset
+	Set OffsetOpposite = (Diameter/2) + MiddleOffset
+	Set P1 = 0.28
+	Set P2 = 29.72
+	
+	Do ..SDxFREES(Diameter,MiddleOffset,Offset,OffsetOpposite,P1,P2, Rotation, Breedte, Lengte)
+]]></Implementation>
+</Method>
+
 <Method name="SD35FREES">
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer</FormalSpec>
 <Implementation><![CDATA[
@@ -82,39 +74,8 @@
 	Set OffsetOpposite = (Diameter/2) + MiddleOffset
 	Set P1 = 1.69
 	Set P2 = 33.31
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	
-	If (Rotation = 0) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Breedte-Offset,Lengte-(Diameter\2)))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Offset,P2))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Offset,P1))
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
-		
-	}ElseIf (Rotation = 90) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Lengte-(Diameter\2), Breedte-Offset))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P1,Offset))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P2,Offset))
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
-	}ElseIf (Rotation = 180) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Breedte-Offset,Lengte-(Diameter\2)))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(OffsetOpposite,P1))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(OffsetOpposite,P2))
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
-	}ElseIf (Rotation = 270) {
-		Set CoordinatesList = ##class(%ListOfObjects).%New()
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Lengte-(Diameter\2), Breedte-Offset))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(Diameter,Diameter))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P2,OffsetOpposite))
-		Do CoordinatesList.Insert(BasisElementFactory.MaakCoordinaat(P1,OffsetOpposite))
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
-	}
-	Do ..SvgBox.VoegToeElement(Path)
+	Do ..SDxFREES(Diameter,MiddleOffset,Offset,OffsetOpposite,P1,P2, Rotation, Breedte, Lengte)
 ]]></Implementation>
 </Method>
 
@@ -144,9 +105,7 @@
 <Method name="XMLExport">
 <FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	
-	Quit ..SvgBox.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+<Implementation><![CDATA[	Quit ..SvgBox.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/Test.cls.xml
===================================================================
diff -u -r60129 -r60197
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 60129)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 60197)
@@ -10,6 +10,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test SDxFREES 90 ">
+<Implementation><![CDATA[
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD30",350,450,90)
+	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
+]]></Implementation>
+</Method>
+
+<Method name="Test SDxFREES 180 ">
+<Implementation><![CDATA[
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD30",350,450,180)
+	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
+]]></Implementation>
+</Method>
+
+<Method name="Test SDxFREES 270 ">
+<Implementation><![CDATA[
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD30",350,450,270)
+	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="Test SD35FREES">
 <Implementation><![CDATA[
 	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD35",350,450,0)