kerykeion 4.12.3__py3-none-any.whl → 4.14.2__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -27,7 +27,12 @@ from kerykeion.charts.charts_utils import (
     draw_degree_ring,
     draw_transit_ring,
     draw_first_circle,
-    draw_second_circle
+    draw_second_circle,
+    draw_third_circle,
+    draw_aspect_grid,
+    draw_houses_cusps_and_text_number,
+    draw_aspect_transit_grid,
+    draw_moon_phase
 )
 from pathlib import Path
 from scour.scour import scourString
@@ -98,7 +103,6 @@ class KerykeionChartSVG:
     location: str
     geolat: float
     geolon: float
-    zoom: int
     zodiac: tuple
     template: str
 
@@ -303,93 +307,6 @@ class KerykeionChartSVG:
 
         return output
 
-    def _makeHouses(self, r):
-        path = ""
-
-        xr = 12
-        for i in range(xr):
-            # check transit
-            if self.chart_type == "Transit" or self.chart_type == "Synastry":
-                dropin = 160
-                roff = 72
-                t_roff = 36
-            else:
-                dropin = self.c3
-                roff = self.c1
-
-            # offset is negative desc houses_degree_ut[6]
-            offset = (int(self.user.houses_degree_ut[int(xr / 2)]) / -1) + int(self.user.houses_degree_ut[i])
-            x1 = sliceToX(0, (r - dropin), offset) + dropin
-            y1 = sliceToY(0, (r - dropin), offset) + dropin
-            x2 = sliceToX(0, r - roff, offset) + roff
-            y2 = sliceToY(0, r - roff, offset) + roff
-
-            if i < (xr - 1):
-                text_offset = offset + int(degreeDiff(self.user.houses_degree_ut[(i + 1)], self.user.houses_degree_ut[i]) / 2)
-            else:
-                text_offset = offset + int(degreeDiff(self.user.houses_degree_ut[0], self.user.houses_degree_ut[(xr - 1)]) / 2)
-
-            # mc, asc, dsc, ic
-            if i == 0:
-                linecolor = self.planets_settings[12]["color"]
-            elif i == 9:
-                linecolor = self.planets_settings[13]["color"]
-            elif i == 6:
-                linecolor = self.planets_settings[14]["color"]
-            elif i == 3:
-                linecolor = self.planets_settings[15]["color"]
-            else:
-                linecolor = self.chart_colors_settings["houses_radix_line"]
-
-            # Transit houses lines.
-            if self.chart_type == "Transit" or self.chart_type == "Synastry":
-                # Degrees for point zero.
-
-                zeropoint = 360 - self.user.houses_degree_ut[6]
-                t_offset = zeropoint + self.t_user.houses_degree_ut[i]
-                if t_offset > 360:
-                    t_offset = t_offset - 360
-                t_x1 = sliceToX(0, (r - t_roff), t_offset) + t_roff
-                t_y1 = sliceToY(0, (r - t_roff), t_offset) + t_roff
-                t_x2 = sliceToX(0, r, t_offset)
-                t_y2 = sliceToY(0, r, t_offset)
-                if i < 11:
-                    t_text_offset = t_offset + int(degreeDiff(self.t_user.houses_degree_ut[(i + 1)], self.t_user.houses_degree_ut[i]) / 2)
-                else:
-                    t_text_offset = t_offset + int(degreeDiff(self.t_user.houses_degree_ut[0], self.t_user.houses_degree_ut[11]) / 2)
-                # linecolor
-                if i == 0 or i == 9 or i == 6 or i == 3:
-                    t_linecolor = linecolor
-                else:
-                    t_linecolor = self.chart_colors_settings["houses_transit_line"]
-                xtext = sliceToX(0, (r - 8), t_text_offset) + 8
-                ytext = sliceToY(0, (r - 8), t_text_offset) + 8
-
-                if self.chart_type == "Transit":
-                    path = path + '<text style="fill: #00f; fill-opacity: 0; font-size: 14px"><tspan x="' + str(xtext - 3) + '" y="' + str(ytext + 3) + '">' + str(i + 1) + "</tspan></text>"
-                    path = f"{path}<line x1='{str(t_x1)}' y1='{str(t_y1)}' x2='{str(t_x2)}' y2='{str(t_y2)}' style='stroke: {t_linecolor}; stroke-width: 2px; stroke-opacity:0;'/>"
-
-                else:
-                    path = path + '<text style="fill: #00f; fill-opacity: .4; font-size: 14px"><tspan x="' + str(xtext - 3) + '" y="' + str(ytext + 3) + '">' + str(i + 1) + "</tspan></text>"
-                    path = f"{path}<line x1='{str(t_x1)}' y1='{str(t_y1)}' x2='{str(t_x2)}' y2='{str(t_y2)}' style='stroke: {t_linecolor}; stroke-width: 2px; stroke-opacity:.3;'/>"
-
-
-            # if transit
-            if self.chart_type == "Transit" or self.chart_type == "Synastry":
-                dropin = 84
-            elif self.chart_type == "ExternalNatal":
-                dropin = 100
-            # Natal
-            else:
-                dropin = 48
-
-            xtext = sliceToX(0, (r - dropin), text_offset) + dropin  # was 132
-            ytext = sliceToY(0, (r - dropin), text_offset) + dropin  # was 132
-            path = f'{path}<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {linecolor}; stroke-width: 2px; stroke-dasharray:3,2; stroke-opacity:.4;"/>'
-            path = path + '<text style="fill: #f00; fill-opacity: .6; font-size: 14px"><tspan x="' + str(xtext - 3) + '" y="' + str(ytext + 3) + '">' + str(i + 1) + "</tspan></text>"
-
-        return path
-
     def _calculate_elements_points_from_planets(self):
         """
         Calculate chart element points from a planet.
@@ -608,8 +525,12 @@ class KerykeionChartSVG:
                 
             else:
                 scale = 1
-            # output planet
-            output += f'<g transform="translate(-{12 * scale},-{12 * scale})"><g transform="scale({scale})"><use x="{planet_x * (1/scale)}" y="{planet_y * (1/scale)}" xlink:href="#{self.available_planets_setting[i]["name"]}" /></g></g>'
+
+            planet_details = self.user[self.available_planets_setting[i]["name"].lower()]
+
+            output += f'<g kr:node="ChartPoint" kr:house="{planet_details['house']}" kr:sign="{planet_details['sign']}" kr:slug="{planet_details['name']}" transform="translate(-{12 * scale},-{12 * scale}) scale({scale})">'
+            output += f'<use x="{planet_x * (1/scale)}" y="{planet_y * (1/scale)}" xlink:href="#{self.available_planets_setting[i]["name"]}" />'
+            output += f'</g>'
 
         # make transit degut and display planets
         if self.chart_type == "Transit" or self.chart_type == "Synastry":
@@ -751,269 +672,37 @@ class KerykeionChartSVG:
 
         return output
 
-    def _makePatterns(self):
-        """
-        * Stellium: At least four planets linked together in a series of continuous conjunctions.
-        * Grand trine: Three trine aspects together.
-        * Grand cross: Two pairs of opposing planets squared to each other.
-        * T-Square: Two planets in opposition squared to a third.
-        * Yod: Two qunicunxes together joined by a sextile.
-        """
-        conj = {}  # 0
-        opp = {}  # 10
-        sq = {}  # 5
-        tr = {}  # 6
-        qc = {}  # 9
-        sext = {}  # 3
-        for i in range(len(self.available_planets_setting)):
-            a = self.points_deg_ut[i]
-            qc[i] = {}
-            sext[i] = {}
-            opp[i] = {}
-            sq[i] = {}
-            tr[i] = {}
-            conj[i] = {}
-            # skip some points
-            n = self.available_planets_setting[i]["name"]
-            if n == "earth" or n == "True_Node" or n == "osc. apogee" or n == "intp. apogee" or n == "intp. perigee":
-                continue
-            if n == "Dsc" or n == "Ic":
-                continue
-            for j in range(len(self.available_planets_setting)):
-                # skip some points
-                n = self.available_planets_setting[j]["name"]
-                if n == "earth" or n == "True_Node" or n == "osc. apogee" or n == "intp. apogee" or n == "intp. perigee":
-                    continue
-                if n == "Dsc" or n == "Ic":
-                    continue
-                b = self.points_deg_ut[j]
-                delta = float(degreeDiff(a, b))
-                # check for opposition
-                xa = float(self.aspects_settings[10]["degree"]) - float(self.aspects_settings[10]["orb"])
-                xb = float(self.aspects_settings[10]["degree"]) + float(self.aspects_settings[10]["orb"])
-                if xa <= delta <= xb:
-                    opp[i][j] = True
-                # check for conjunction
-                xa = float(self.aspects_settings[0]["degree"]) - float(self.aspects_settings[0]["orb"])
-                xb = float(self.aspects_settings[0]["degree"]) + float(self.aspects_settings[0]["orb"])
-                if xa <= delta <= xb:
-                    conj[i][j] = True
-                # check for squares
-                xa = float(self.aspects_settings[5]["degree"]) - float(self.aspects_settings[5]["orb"])
-                xb = float(self.aspects_settings[5]["degree"]) + float(self.aspects_settings[5]["orb"])
-                if xa <= delta <= xb:
-                    sq[i][j] = True
-                # check for qunicunxes
-                xa = float(self.aspects_settings[9]["degree"]) - float(self.aspects_settings[9]["orb"])
-                xb = float(self.aspects_settings[9]["degree"]) + float(self.aspects_settings[9]["orb"])
-                if xa <= delta <= xb:
-                    qc[i][j] = True
-                # check for sextiles
-                xa = float(self.aspects_settings[3]["degree"]) - float(self.aspects_settings[3]["orb"])
-                xb = float(self.aspects_settings[3]["degree"]) + float(self.aspects_settings[3]["orb"])
-                if xa <= delta <= xb:
-                    sext[i][j] = True
-
-        yot = {}
-        # check for double qunicunxes
-        for k, v in qc.items():
-            if len(qc[k]) >= 2:
-                # check for sextile
-                for l, w in qc[k].items():
-                    for m, x in qc[k].items():
-                        if m in sext[l]:
-                            if l > m:
-                                yot["%s,%s,%s" % (k, m, l)] = [k, m, l]
-                            else:
-                                yot["%s,%s,%s" % (k, l, m)] = [k, l, m]
-        tsquare = {}
-        # check for opposition
-        for k, v in opp.items():
-            if len(opp[k]) >= 1:
-                # check for square
-                for l, w in opp[k].items():
-                    for a, b in sq.items():
-                        if k in sq[a] and l in sq[a]:
-                            logging.debug(f"Got tsquare {a} {k} {l}")
-                            if k > l:
-                                tsquare[f"{a},{l},{k}"] = f"{self.available_planets_setting[a]['label']} => {self.available_planets_setting[l]['label']}, {self.available_planets_setting[k]['label']}"
-
-                            else:
-                                tsquare[f"{a},{k},{l}"] = f"{self.available_planets_setting[a]['label']} => {self.available_planets_setting[k]['label']}, {self.available_planets_setting[l]['label']}"
-
-        stellium = {}
-        # check for 4 continuous conjunctions
-        for k, v in conj.items():
-            if len(conj[k]) >= 1:
-                # first conjunction
-                for l, m in conj[k].items():
-                    if len(conj[l]) >= 1:
-                        for n, o in conj[l].items():
-                            # skip 1st conj
-                            if n == k:
-                                continue
-                            if len(conj[n]) >= 1:
-                                # third conjunction
-                                for p, q in conj[n].items():
-                                    # skip first and second conj
-                                    if p == k or p == n:
-                                        continue
-                                    if len(conj[p]) >= 1:
-                                        # fourth conjunction
-                                        for r, s in conj[p].items():
-                                            # skip conj 1,2,3
-                                            if r == k or r == n or r == p:
-                                                continue
-
-                                            l = [k, n, p, r]
-                                            l.sort()
-                                            stellium["%s %s %s %s" % (l[0], l[1], l[2], l[3])] = "%s %s %s %s" % (
-                                                self.available_planets_setting[l[0]]["label"],
-                                                self.available_planets_setting[l[1]]["label"],
-                                                self.available_planets_setting[l[2]]["label"],
-                                                self.available_planets_setting[l[3]]["label"],
-                                            )
-        # print yots
-        out = '<g transform="translate(-30,380)">'
-        if len(yot) >= 1:
-            y = 0
-            for k, v in yot.items():
-                out += f'<text y="{y}" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 12px;">{"Yot"}</text>'
-
-                # first planet symbol
-                out += f'<g transform="translate(20,{y})">'
-                out += f'<use transform="scale(0.4)" x="0" y="-20" xlink:href="#{self.available_planets_setting[yot[k][0]]["name"]}" /></g>'
-
-                # second planet symbol
-                out += f'<g transform="translate(30,{y})">'
-                out += f'<use transform="scale(0.4)" x="0" y="-20" xlink:href="#{self.available_planets_setting[yot[k][1]]["name"]}" /></g>'
-
-                # third planet symbol
-                out += f'<g transform="translate(40,{y})">'
-                out += f'<use transform="scale(0.4)" x="0" y="-20" xlink:href="#{self.available_planets_setting[yot[k][2]]["name"]}" /></g>'
-
-                y = y + 14
-        # finalize
-        out += "</g>"
-        # return out
-        return ""
-
     # Aspect and aspect grid functions for natal type charts.
-    def _makeAspects(self, r, ar):
+    def _draw_all_aspects_lines(self, r, ar):
         out = ""
-        for element in self.aspects_list:
+        for aspect in self.aspects_list:
             out += draw_aspect_line(
                 r=r,
                 ar=ar,
-                degA=element["p1_abs_pos"],
-                degB=element["p2_abs_pos"],
-                color=self.aspects_settings[element["aid"]]["color"],
+                aspect=aspect,
+                color=self.aspects_settings[aspect["aid"]]["color"],
                 seventh_house_degree_ut=self.user.seventh_house.abs_pos
             )
 
         return out
 
-    def _makeAspectGrid(self, r):
-        out = ""
-        style = "stroke:%s; stroke-width: 1px; stroke-opacity:.6; fill:none" % (self.chart_colors_settings["paper_0"])
-        xindent = 380
-        yindent = 468
-        box = 14
-        revr = list(range(len(self.available_planets_setting)))
-        revr.reverse()
-        counter = 0
-        for a in revr:
-            counter += 1
-            out += f'<rect x="{xindent}" y="{yindent}" width="{box}" height="{box}" style="{style}"/>'
-            out += f'<use transform="scale(0.4)" x="{(xindent+2)*2.5}" y="{(yindent+1)*2.5}" xlink:href="#{self.available_planets_setting[a]["name"]}" />'
-
-            xindent = xindent + box
-            yindent = yindent - box
-            revr2 = list(range(a))
-            revr2.reverse()
-            xorb = xindent
-            yorb = yindent + box
-            for b in revr2:
-                out += f'<rect x="{xorb}" y="{yorb}" width="{box}" height="{box}" style="{style}"/>'
-
-                xorb = xorb + box
-                for element in self.aspects_list:
-                    if (element["p1"] == a and element["p2"] == b) or (element["p1"] == b and element["p2"] == a):
-                        out += f'<use  x="{xorb-box+1}" y="{yorb+1}" xlink:href="#orb{element["aspect_degrees"]}" />'
-
-        return out
-
     # Aspect and aspect grid functions for transit type charts
-    def _makeAspectsTransit(self, r, ar):
+    def _draw_all_transit_aspects_lines(self, r, ar):
         out = ""
 
         self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file).relevant_aspects
 
-        for element in self.aspects_list:
+        for aspect in self.aspects_list:
             out += draw_aspect_line(
                 r=r,
                 ar=ar,
-                degA=element["p1_abs_pos"],
-                degB=element["p2_abs_pos"],
-                color=self.aspects_settings[element["aid"]]["color"],
+                aspect=aspect,
+                color=self.aspects_settings[aspect["aid"]]["color"],
                 seventh_house_degree_ut=self.user.seventh_house.abs_pos
             )
 
         return out
 
-    def _makeAspectTransitGrid(self, r):
-        out = '<g transform="translate(500,310)">'
-        out += f'<text y="-15" x="0" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 14px;">{self.language_settings["aspects"]}:</text>'
-
-        line = 0
-        nl = 0
-
-        for i in range(len(self.aspects_list)):
-            if i == 12:
-                nl = 100
-                
-                line = 0
-
-            elif i == 24:
-                nl = 200
-
-                line = 0
-
-            elif i == 36:
-                nl = 300
-                
-                line = 0
-                    
-            elif i == 48:
-                nl = 400
-
-                # When there are more than 60 aspects, the text is moved up
-                if len(self.aspects_list) > 60:
-                    line = -1 * (len(self.aspects_list) - 60) * 14
-                else:
-                    line = 0
-
-            out += f'<g transform="translate({nl},{line})">'
-            
-            # first planet symbol
-            out += f'<use transform="scale(0.4)" x="0" y="3" xlink:href="#{self.planets_settings[self.aspects_list[i]["p1"]]["name"]}" />'
-            
-            # aspect symbol
-            out += f'<use  x="15" y="0" xlink:href="#orb{self.aspects_settings[self.aspects_list[i]["aid"]]["degree"]}" />'
-            
-            # second planet symbol
-            out += '<g transform="translate(30,0)">'
-            out += '<use transform="scale(0.4)" x="0" y="3" xlink:href="#%s" />' % (self.planets_settings[self.aspects_list[i]["p2"]]["name"]) 
-            
-            out += "</g>"
-            # difference in degrees
-            out += f'<text y="8" x="45" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{convert_decimal_to_degree_string(self.aspects_list[i]["orbit"])}</text>'
-            # line
-            out += "</g>"
-            line = line + 14
-        out += "</g>"
-        return out
-
     def _makePlanetGrid(self):
         li = 10
         offset = 0
@@ -1102,7 +791,7 @@ class KerykeionChartSVG:
         out += end_of_line
         return out
 
-    def _draw_house_grid(self):
+    def _makeHouseGrid(self):
         """
         Generate SVG code for a grid of astrological houses.
 
@@ -1157,21 +846,18 @@ class KerykeionChartSVG:
         # Calculate the elements points
         self._calculate_elements_points_from_planets()
 
-        # Viewbox and sizing
-        svgHeight = "100%"
-        svgWidth = "100%"
         rotate = "0"
-        
-        # To increase the size of the chart, change the viewbox
-        if self.chart_type == "Natal" or self.chart_type == "ExternalNatal":
-            viewbox = self.chart_settings["basic_chart_viewBox"]
-        else:
-            viewbox = self.chart_settings["wide_chart_viewBox"]
 
         # template dictionary
         td: ChartTemplateDictionary = dict() # type: ignore
         r = 240
 
+        # To increase the size of the chart, change the viewbox
+        if self.chart_type == "Natal" or self.chart_type == "ExternalNatal":
+            td['viewbox'] = self.chart_settings["basic_chart_viewBox"]
+        else:
+            td['viewbox'] = self.chart_settings["wide_chart_viewBox"]
+
         if self.chart_type == "ExternalNatal":
             self.c1 = 56
             self.c2 = 92
@@ -1189,35 +875,31 @@ class KerykeionChartSVG:
             # circles
             td["first_circle"] = draw_first_circle(r, self.chart_colors_settings["zodiac_transit_ring_2"], self.chart_type)
             td["second_circle"] = draw_second_circle(r, self.chart_colors_settings['zodiac_transit_ring_1'], self.chart_colors_settings['paper_1'], self.chart_type)
+            td['third_circle'] = draw_third_circle(r, self.chart_colors_settings['zodiac_transit_ring_0'], self.chart_colors_settings['paper_1'], self.chart_type)
 
-            td["c3"] = 'cx="' + str(r) + '" cy="' + str(r) + '" r="' + str(r - 160) + '"'
-            td["c3style"] = f"fill: {self.chart_colors_settings['paper_1']}; fill-opacity:.8; stroke: {self.chart_colors_settings['zodiac_transit_ring_0']}; stroke-width: 1px"
+            td["makeAspects"] = self._draw_all_transit_aspects_lines(r, (r - 160))
 
-            td["makeAspects"] = self._makeAspectsTransit(r, (r - 160))
-            td["makeAspectGrid"] = self._makeAspectTransitGrid(r)
-            td["makePatterns"] = ""
+            td["makeAspectGrid"] = draw_aspect_transit_grid(
+                self.language_settings["aspects"],
+                self.aspects_list,
+                self.planets_settings,
+                self.aspects_settings
+            )
+
+        # Natal, External Natal
         else:
             td["transitRing"] = ""
             td["degreeRing"] = draw_degree_ring(r, self.c1, self.user.seventh_house.abs_pos, self.chart_colors_settings["paper_0"])
 
             td['first_circle'] = draw_first_circle(r, self.chart_colors_settings["zodiac_radix_ring_2"], self.chart_type, self.c1)
-
             td["second_circle"] = draw_second_circle(r, self.chart_colors_settings["zodiac_radix_ring_1"], self.chart_colors_settings["paper_1"], self.chart_type, self.c2)
+            td['third_circle'] = draw_third_circle(r,  self.chart_colors_settings["zodiac_radix_ring_0"], self.chart_colors_settings["paper_1"], self.chart_type, self.c3)
             
-            td["c3"] = f'cx="{r}" cy="{r}" r="{r - self.c3}"'
-            td["c3style"] = f'fill: {self.chart_colors_settings["paper_1"]}; fill-opacity:.8; stroke: {self.chart_colors_settings["zodiac_radix_ring_0"]}; stroke-width: 1px'
-            
-            td["makeAspects"] = self._makeAspects(r, (r - self.c3))
-            td["makeAspectGrid"] = self._makeAspectGrid(r)
-            td["makePatterns"] = self._makePatterns()
-        
+            td["makeAspects"] = self._draw_all_aspects_lines(r, (r - self.c3))
+            td["makeAspectGrid"] = draw_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list)
+
         td["chart_height"] = self.height
         td["chart_width"] = self.width
-        td["circleX"] = str(0)
-        td["circleY"] = str(0)
-        td["svgWidth"] = str(svgWidth)
-        td["svgHeight"] = str(svgHeight)
-        td["viewbox"] = viewbox
 
         # Chart Title
         if self.chart_type == "Synastry":
@@ -1250,60 +932,11 @@ class KerykeionChartSVG:
             td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
             td["bottomLeft4"] = f'{self.t_user.perspective_type}'
 
-        # lunar phase
-        deg = self.user.lunar_phase["degrees_between_s_m"]
-
-        lffg = None
-        lfbg = None
-        lfcx = None
-        lfr = None
-
-        if deg < 90.0:
-            maxr = deg
-            if deg > 80.0:
-                maxr = maxr * maxr
-            lfcx = 20.0 + (deg / 90.0) * (maxr + 10.0)
-            lfr = 10.0 + (deg / 90.0) * maxr
-            lffg = self.chart_colors_settings["lunar_phase_0"]
-            lfbg = self.chart_colors_settings["lunar_phase_1"]
-
-        elif deg < 180.0:
-            maxr = 180.0 - deg
-            if deg < 100.0:
-                maxr = maxr * maxr
-            lfcx = 20.0 + ((deg - 90.0) / 90.0 * (maxr + 10.0)) - (maxr + 10.0)
-            lfr = 10.0 + maxr - ((deg - 90.0) / 90.0 * maxr)
-            lffg = self.chart_colors_settings["lunar_phase_1"]
-            lfbg = self.chart_colors_settings["lunar_phase_0"]
-
-        elif deg < 270.0:
-            maxr = deg - 180.0
-            if deg > 260.0:
-                maxr = maxr * maxr
-            lfcx = 20.0 + ((deg - 180.0) / 90.0 * (maxr + 10.0))
-            lfr = 10.0 + ((deg - 180.0) / 90.0 * maxr)
-            lffg, lfbg = self.chart_colors_settings["lunar_phase_1"], self.chart_colors_settings["lunar_phase_0"]
-
-        elif deg < 361:
-            maxr = 360.0 - deg
-            if deg < 280.0:
-                maxr = maxr * maxr
-            lfcx = 20.0 + ((deg - 270.0) / 90.0 * (maxr + 10.0)) - (maxr + 10.0)
-            lfr = 10.0 + maxr - ((deg - 270.0) / 90.0 * maxr)
-            lffg, lfbg = self.chart_colors_settings["lunar_phase_0"], self.chart_colors_settings["lunar_phase_1"]
-
-        if lffg is None or lfbg is None or lfcx is None or lfr is None:
-            raise KerykeionException("Lunar phase error")
-
-        td["lunar_phase_fg"] = lffg
-        td["lunar_phase_bg"] = lfbg
-        td["lunar_phase_cx"] = lfcx
-        td["lunar_phase_r"] = lfr
-        td["lunar_phase_outline"] = self.chart_colors_settings["lunar_phase_2"]
-
-        # rotation based on latitude
-        td["lunar_phase_rotate"] = -90.0 - self.geolat
-
+        td['moon_phase'] = draw_moon_phase(
+            self.user.lunar_phase["degrees_between_s_m"],
+            self.geolat
+        )
+        
         # stringlocation
         if len(self.location) > 35:
             split = self.location.split(",")
@@ -1355,7 +988,6 @@ class KerykeionChartSVG:
             td[f"orb_color_{self.aspects_settings[i]['degree']}"] = self.aspects_settings[i]['color']
 
         # config
-        td["cfgZoom"] = str(self.zoom)
         td["cfgRotate"] = rotate
 
         # ---
@@ -1363,9 +995,38 @@ class KerykeionChartSVG:
         #--- 
 
         td["makeZodiac"] = self._draw_zodiac_circle_slices(r)
-        td["makeHousesGrid"] = self._draw_house_grid()
-        # TODO: Add the rest of the functions
-        td["makeHouses"] = self._makeHouses(r)
+        td["makeHousesGrid"] = self._makeHouseGrid()
+        
+        # Houses Cusps and Number
+        if self.chart_type == "Transit" or self.chart_type == "Synastry":
+            td["makeHouses"] = draw_houses_cusps_and_text_number(
+                r=r,
+                first_subject_houses_list_ut=self.user.houses_degree_ut,
+                standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
+                first_house_color=self.planets_settings[12]["color"],
+                tenth_house_color=self.planets_settings[13]["color"],
+                seventh_house_color=self.planets_settings[14]["color"],
+                fourth_house_color=self.planets_settings[15]["color"],
+                c1=self.c1,
+                c3=self.c3,
+                chart_type=self.chart_type,
+                second_subject_houses_list_ut=self.t_user.houses_degree_ut,
+                transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
+            )
+        else:
+            td["makeHouses"] = draw_houses_cusps_and_text_number(
+                r=r,
+                first_subject_houses_list_ut=self.user.houses_degree_ut,
+                standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
+                first_house_color=self.planets_settings[12]["color"],
+                tenth_house_color=self.planets_settings[13]["color"],
+                seventh_house_color=self.planets_settings[14]["color"],
+                fourth_house_color=self.planets_settings[15]["color"],
+                c1=self.c1,
+                c3=self.c3,
+                chart_type=self.chart_type,
+            )
+
         td["makePlanets"] = self._make_planets(r)
         td["elements_percentages"] = draw_elements_percentages(
             self.language_settings['fire'],
@@ -1377,6 +1038,7 @@ class KerykeionChartSVG:
             self.language_settings['water'],
             self.water,
         )
+
         td["makePlanetGrid"] = self._makePlanetGrid()
 
         # Date time String