kerykeion 4.6.2__py3-none-any.whl → 4.7.0__py3-none-any.whl

kerykeion/charts/charts_utils.py

@@ -3,6 +3,7 @@ import datetime
 from kerykeion.kr_types import KerykeionException, ChartType
 from typing import Union
 
+
 def decHourJoin(inH: int, inM: int, inS: int) -> float:
     """Join hour, minutes, seconds, timezone integer to hour float.
 
@@ -20,6 +21,7 @@ def decHourJoin(inH: int, inM: int, inS: int) -> float:
     output = dh + dm + ds
     return output
 
+
 def degreeDiff(a: Union[int, float], b: Union[int, float]) -> float:
     """Calculate the difference between two degrees.
 
@@ -40,6 +42,7 @@ def degreeDiff(a: Union[int, float], b: Union[int, float]) -> float:
         out = 360.0 - out
     return out
 
+
 def offsetToTz(datetime_offset: Union[datetime.timedelta, None]) -> float:
     """Convert datetime offset to float in hours.
 
@@ -61,9 +64,9 @@ def offsetToTz(datetime_offset: Union[datetime.timedelta, None]) -> float:
     output = dh + sh
     return output
 
+
 def sliceToX(slice: Union[int, float], radius: Union[int, float], offset: Union[int, float]) -> float:
-    """
-    Calculates the x-coordinate of a point on a circle based on the slice, radius, and offset.
+    """Calculates the x-coordinate of a point on a circle based on the slice, radius, and offset.
 
     Args:
         - slice (int | float): Represents the
@@ -86,9 +89,9 @@ def sliceToX(slice: Union[int, float], radius: Union[int, float], offset: Union[
     radial = ((math.pi / 6) * slice) + plus
     return radius * (math.cos(radial) + 1)
 
+
 def sliceToY(slice: Union[int, float], r: Union[int, float], offset: Union[int, float]) -> float:
-    """
-    Calculates the y-coordinate of a point on a circle based on the slice, radius, and offset.
+    """Calculates the y-coordinate of a point on a circle based on the slice, radius, and offset.
 
     Args:
         - slice (int | float): Represents the slice of the circle to calculate
@@ -111,22 +114,21 @@ def sliceToY(slice: Union[int, float], r: Union[int, float], offset: Union[int,
 
 
 def draw_zodiac_slice(
-        c1: Union[int, float],
-        chart_type: ChartType,
-        sixth_house_degree_ut: Union[int, float],
-        num: int,
-        r: Union[int, float],
-        style: str,
-        type: str,
-    ):
-    """
-    Draws a zodiac slice based on the given parameters.
+    c1: Union[int, float],
+    chart_type: ChartType,
+    seventh_house_degree_ut: Union[int, float],
+    num: int,
+    r: Union[int, float],
+    style: str,
+    type: str,
+) -> str:
+    """Draws a zodiac slice based on the given parameters.
 
     Args:
         - c1 (Union[int, float]): The value of c1.
         - chart_type (Literal["Natal", "ExternalNatal", "Synastry", "Transit"]): The type of chart.
-        - sixth_house_degree_ut (Union[int, float]): The degree of the sixth house.
-        - num (int): The number of the sign. Note: In OpenAstro it did refer to self.zodiac, 
+        - seventh_house_degree_ut (Union[int, float]): The degree of the seventh house.
+        - num (int): The number of the sign. Note: In OpenAstro it did refer to self.zodiac,
             which is a list of the signs in order, starting with Aries. Eg:
             {"name": "aries", "element": "fire"}
         - r (Union[int, float]): The value of r.
@@ -139,7 +141,7 @@ def draw_zodiac_slice(
     """
 
     # pie slices
-    offset = 360 - sixth_house_degree_ut
+    offset = 360 - seventh_house_degree_ut
     # check transit
     if chart_type == "Transit" or chart_type == "Synastry":
         dropin = 0
@@ -156,4 +158,240 @@ def draw_zodiac_slice(
         dropin = 18 + c1
     sign = f'<g transform="translate(-16,-16)"><use x="{str(dropin + sliceToX(num, r - dropin, offset))}" y="{str(dropin + sliceToY(num, r - dropin, offset))}" xlink:href="#{type}" /></g>'
 
-    return slice + "" + sign
+    return slice + "" + sign
+
+
+def convert_latitude_coordinate_to_string(coord: Union[int, float], north_label: str, south_label: str) -> str:
+    """Converts a floating point latitude to string with
+    degree, minutes and seconds and the appropriate sign
+    (north or south). Eg. 52.1234567 -> 52°7'25" N
+
+    Args:
+        - coord (float | int): latitude in floating or integer format
+        - north_label (str): String label for north
+        - south_label (str): String label for south
+    Returns:
+        - str: latitude in string format with degree, minutes,
+        seconds and sign (N/S)
+    """
+
+    sign = north_label
+    if coord < 0.0:
+        sign = south_label
+        coord = abs(coord)
+    deg = int(coord)
+    min = int((float(coord) - deg) * 60)
+    sec = int(round(float(((float(coord) - deg) * 60) - min) * 60.0))
+    return f"{deg}°{min}'{sec}\" {sign}"
+
+
+def convert_longitude_coordinate_to_string(coord: Union[int, float], east_label: str, west_label: str) -> str:
+    """Converts a floating point longitude to string with
+    degree, minutes and seconds and the appropriate sign
+    (east or west). Eg. 52.1234567 -> 52°7'25" E
+
+    Args:
+        - coord (float|int): longitude in floating point format
+        - east_label (str): String label for east
+        - west_label (str): String label for west
+    Returns:
+        str: longitude in string format with degree, minutes,
+            seconds and sign (E/W)
+    """
+
+    sign = east_label
+    if coord < 0.0:
+        sign = west_label
+        coord = abs(coord)
+    deg = int(coord)
+    min = int((float(coord) - deg) * 60)
+    sec = int(round(float(((float(coord) - deg) * 60) - min) * 60.0))
+    return f"{deg}°{min}'{sec}\" {sign}"
+
+
+def draw_aspect_line(
+    r: Union[int, float],
+    ar: Union[int, float],
+    degA: Union[int, float],
+    degB: Union[int, float],
+    color: str,
+    seventh_house_degree_ut: Union[int, float],
+) -> str:
+    """Draws svg aspects: ring, aspect ring, degreeA degreeB
+
+    Args:
+        - r (Union[int, float]): The value of r.
+        - ar (Union[int, float]): The value of ar.
+        - degA (Union[int, float]): The degree of A.
+        - degB (Union[int, float]): The degree of B.
+        - color (str): The color of the aspect.
+        - seventh_house_degree_ut (Union[int, float]): The degree of the seventh house.
+
+    Returns:
+        str: The SVG line element as a string.
+    """
+
+    first_offset = (int(seventh_house_degree_ut) / -1) + int(degA)
+    x1 = sliceToX(0, ar, first_offset) + (r - ar)
+    y1 = sliceToY(0, ar, first_offset) + (r - ar)
+
+    second_offset = (int(seventh_house_degree_ut) / -1) + int(degB)
+    x2 = sliceToX(0, ar, second_offset) + (r - ar)
+    y2 = sliceToY(0, ar, second_offset) + (r - ar)
+
+    out = f'<line class="aspect" x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {color}; stroke-width: 1; stroke-opacity: .9;"/>'
+
+    return out
+
+
+def draw_elements_percentages(
+    fire_label: str,
+    fire_points: float,
+    earth_label: str,
+    earth_points: float,
+    air_label: str,
+    air_points: float,
+    water_label: str,
+    water_points: float,
+) -> str:
+    """Draw the elements grid.
+
+    Args:
+        - fire_label (str): Label for fire
+        - fire_points (float): Points for fire
+        - earth_label (str): Label for earth
+        - earth_points (float): Points for earth
+        - air_label (str): Label for air
+        - air_points (float): Points for air
+        - water_label (str): Label for water
+        - water_points (float): Points for water
+
+    Returns:
+        str: The SVG elements grid as a string.
+    """
+    total = fire_points + earth_points + air_points + water_points
+
+    fire_percentage = int(round(100 * fire_points / total))
+    earth_percentage = int(round(100 * earth_points / total))
+    air_percentage = int(round(100 * air_points / total))
+    water_percentage = int(round(100 * water_points / total))
+
+    out = '<g transform="translate(-30,79)">'
+    out += f'<text y="0" style="fill:#ff6600; font-size: 10px;">{fire_label}  {str(fire_percentage)}%</text>'
+    out += f'<text y="12" style="fill:#6a2d04; font-size: 10px;">{earth_label} {str(earth_percentage)}%</text>'
+    out += f'<text y="24" style="fill:#6f76d1; font-size: 10px;">{air_label}   {str(air_percentage)}%</text>'
+    out += f'<text y="36" style="fill:#630e73; font-size: 10px;">{water_label} {str(water_percentage)}%</text>'
+    out += "</g>"
+
+    return out
+
+
+def convert_decimal_to_degree_string(dec: float, type="3") -> str:
+    """
+    Coverts decimal float to degrees in format a°b'c".
+
+    Args:
+        - dec (float): decimal float
+        - type (str): type of format:
+            - 1: a°
+            - 2: a°b'
+            - 3: a°b'c"
+
+    Returns:
+        str: degrees in format a°b'c"
+    """
+
+    dec = float(dec)
+    a = int(dec)
+    a_new = (dec - float(a)) * 60.0
+    b_rounded = int(round(a_new))
+    b = int(a_new)
+    c = int(round((a_new - float(b)) * 60.0))
+
+    if type == "3":
+        out = f"{a:02d}&#176;{b:02d}&#39;{c:02d}&#34;"
+    elif type == "2":
+        out = f"{a:02d}&#176;{b_rounded:02d}&#39;"
+    elif type == "1":
+        out = f"{a:02d}&#176;"
+    else:
+        raise KerykeionException(f"Wrong type: {type}, it must be 1, 2 or 3.")
+
+    return str(out)
+
+
+def draw_transit_ring_degree_steps(r: Union[int, float], seventh_house_degree_ut: Union[int, float]) -> str:
+    """Draws the transit ring degree steps.
+
+    Args:
+        - r (Union[int, float]): The value of r.
+        - seventh_house_degree_ut (Union[int, float]): The degree of the seventh house.
+
+    Returns:
+        str: The SVG path of the transit ring degree steps.
+    """
+
+    out = '<g id="transitRingDegreeSteps">'
+    for i in range(72):
+        offset = float(i * 5) - seventh_house_degree_ut
+        if offset < 0:
+            offset = offset + 360.0
+        elif offset > 360:
+            offset = offset - 360.0
+        x1 = sliceToX(0, r, offset)
+        y1 = sliceToY(0, r, offset)
+        x2 = sliceToX(0, r + 2, offset) - 2
+        y2 = sliceToY(0, r + 2, offset) - 2
+        out += f'<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: #F00; stroke-width: 1px; stroke-opacity:.9;"/>'
+    out += "</g>"
+    
+    return out
+
+
+def draw_degree_ring(r: Union[int, float], c1: Union[int, float], seventh_house_degree_ut: Union[int, float], stroke_color: str) -> str:
+    """Draws the degree ring.
+    
+    Args:
+        - r (Union[int, float]): The value of r.
+        - c1 (Union[int, float]): The value of c1.
+        - seventh_house_degree_ut (Union[int, float]): The degree of the seventh house.
+        - stroke_color (str): The color of the stroke.
+        
+    Returns:
+        str: The SVG path of the degree ring.
+    """
+    out = '<g id="degreeRing">'
+    for i in range(72):
+        offset = float(i * 5) - seventh_house_degree_ut
+        if offset < 0:
+            offset = offset + 360.0
+        elif offset > 360:
+            offset = offset - 360.0
+        x1 = sliceToX(0, r - c1, offset) + c1
+        y1 = sliceToY(0, r - c1, offset) + c1
+        x2 = sliceToX(0, r + 2 - c1, offset) - 2 + c1
+        y2 = sliceToY(0, r + 2 - c1, offset) - 2 + c1
+
+        out += f'<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {stroke_color}; stroke-width: 1px; stroke-opacity:.9;"/>'
+    out += "</g>"
+    
+    return out
+
+def draw_transit_ring(r: Union[int, float], paper_1_color: str, zodiac_transit_ring_3_color: str) -> str:
+    """
+    Draws the transit ring.
+    
+    Args:
+        - r (Union[int, float]): The value of r.
+        - paper_1_color (str): The color of paper 1.
+        - zodiac_transit_ring_3_color (str): The color of the zodiac transit ring
+        
+    Returns:
+        str: The SVG path of the transit ring.
+    """
+    radius_offset = 18
+
+    out = f'<circle cx="{r}" cy="{r}" r="{r - radius_offset}" style="fill: none; stroke: {paper_1_color}; stroke-width: 36px; stroke-opacity: .4;"/>'
+    out += f'<circle cx="{r}" cy="{r}" r="{r}" style="fill: none; stroke: {zodiac_transit_ring_3_color}; stroke-width: 1px; stroke-opacity: .6;"/>'
+
+    return out

kerykeion/charts/kerykeion_chart_svg.py

@@ -4,20 +4,32 @@
 """
 
 
-import pytz
 import logging
 
-from datetime import datetime
 from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.synastry_aspects import SynastryAspects
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType
 from kerykeion.kr_types import ChartTemplateDictionary
-from kerykeion.charts.charts_utils import decHourJoin, degreeDiff, offsetToTz, sliceToX, sliceToY, draw_zodiac_slice
+from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel
+from kerykeion.charts.charts_utils import (
+    degreeDiff, 
+    sliceToX, 
+    sliceToY, 
+    draw_zodiac_slice, 
+    convert_latitude_coordinate_to_string, 
+    convert_longitude_coordinate_to_string,
+    draw_aspect_line,
+    draw_elements_percentages,
+    convert_decimal_to_degree_string,
+    draw_transit_ring_degree_steps,
+    draw_degree_ring,
+    draw_transit_ring
+)
 from pathlib import Path
 from string import Template
-from typing import Union
+from typing import Union, List
 
 
 class KerykeionChartSVG:
@@ -34,6 +46,7 @@ class KerykeionChartSVG:
         - new_settings_file: Set the settings file (default: kr.config.json)
     """
 
+    # Set at init
     first_obj: AstrologicalSubject
     second_obj: Union[AstrologicalSubject, None]
     chart_type: ChartType
@@ -41,6 +54,46 @@ class KerykeionChartSVG:
     new_settings_file: Union[Path, None]
     output_directory: Path
 
+    # Internal properties
+    fire: float
+    earth: float
+    air: float
+    water: float
+    c1: float
+    c2: float
+    c3: float
+    homedir: Path
+    xml_svg: Path
+    natal_width: float
+    full_width: float
+    language_settings: dict
+    chart_colors_settings: dict
+    planets_settings: dict
+    aspects_settings: dict
+    planet_in_zodiac_extra_points: int
+    chart_settings: dict
+    user: AstrologicalSubject
+    available_planets_setting: List[KerykeionSettingsCelestialPointModel]
+    transit_ring_exclude_points_names: List[str]
+    points_deg_ut: list
+    points_deg: list
+    points_sign: list
+    points_retrograde: list
+    houses_sign_graph: list
+    t_points_deg_ut: list
+    t_points_deg: list
+    t_points_sign: list
+    t_points_retrograde: list
+    t_houses_sign_graph: list
+    screen_width: float
+    screen_height: float
+    location: str
+    geolat: float
+    geolon: float
+    zoom: int
+    zodiac: tuple
+    template: str
+
     def __init__(
         self,
         first_obj: AstrologicalSubject,
@@ -77,7 +130,23 @@ class KerykeionChartSVG:
                 continue
 
             self.available_planets_setting.append(body)
-            
+
+        # House cusp points are excluded from the transit ring.
+        self.transit_ring_exclude_points_names = [
+            "First_House",
+            "Second_House",
+            "Third_House",
+            "Fourth_House",
+            "Fifth_House",
+            "Sixth_House",
+            "Seventh_House",
+            "Eighth_House",
+            "Ninth_House",
+            "Tenth_House",
+            "Eleventh_House",
+            "Twelfth_House"
+        ]
+
         # Available bodies
         available_celestial_points = []
         for body in self.available_planets_setting:
@@ -152,57 +221,15 @@ class KerykeionChartSVG:
             self.screen_width = 1200
         self.screen_height = 772.2
 
-        # check for home
-        self.home_location = self.user.city
-        self.home_geolat = self.user.lat
-        self.home_geolon = self.user.lng
-        self.home_countrycode = self.user.nation
-        self.home_timezonestr = self.user.tz_str
-
-        logging.info(f"{self.user.name} birth location: {self.home_location}, {self.home_geolat}, {self.home_geolon}")
-
         # default location
-        self.location = self.home_location
-        self.geolat = float(self.home_geolat)
-        self.geolon = float(self.home_geolon)
-        self.countrycode = self.home_countrycode
-        self.timezonestr = self.home_timezonestr
-
-        # current datetime
-        now = datetime.now()
-
-        # aware datetime object
-        dt_input = datetime(now.year, now.month, now.day, now.hour, now.minute, now.second)
-        dt = pytz.timezone(self.timezonestr).localize(dt_input)
-
-        # naive utc datetime object
-        dt_utc = dt.replace(tzinfo=None) - dt.utcoffset()  # type: ignore
-
-        # Default
-        self.name = self.user.name
-        self.charttype = self.chart_type
-        self.year = self.user.utc.year
-        self.month = self.user.utc.month
-        self.day = self.user.utc.day
-        self.hour = self.user.utc.hour + self.user.utc.minute / 100
-        self.timezone = offsetToTz(dt.utcoffset())
-        self.altitude = 25
-        self.geonameid = None
-
-        # Transit
+        self.location = self.user.city
+        self.geolat = self.user.lat
+        self.geolon =  self.user.lng
+        
+        logging.info(f"{self.user.name} birth location: {self.location}, {self.geolat}, {self.geolon}")
 
         if self.chart_type == "Transit":
-            self.t_geolon = self.geolon
-            self.t_geolat = self.geolat
-            self.t_altitude = self.altitude
             self.t_name = self.language_settings["transit_name"]
-            self.t_year = dt_utc.year
-            self.t_month = dt_utc.month
-            self.t_day = dt_utc.day
-            self.t_hour = decHourJoin(dt_utc.hour, dt_utc.minute, dt_utc.second)
-            self.t_timezone = offsetToTz(dt.utcoffset())
-            self.t_altitude = 25
-            self.t_geonameid = None
 
         # configuration
         # ZOOM 1 = 100%
@@ -247,130 +274,6 @@ class KerykeionChartSVG:
         self.planet_in_zodiac_extra_points = settings["general_settings"]["planet_in_zodiac_extra_points"]
         self.chart_settings = settings["chart_settings"]
 
-    def _transitRing(self, r) -> str:
-        """
-        Draws the transit ring.
-        """
-        radius_offset = 18
-
-        out = f'<circle cx="{r}" cy="{r}" r="{r - radius_offset}" style="fill: none; stroke: {self.chart_colors_settings["paper_1"]}; stroke-width: 36px; stroke-opacity: .4;"/>'
-        out += f'<circle cx="{r}" cy="{r}" r="{r}" style="fill: none; stroke: {self.chart_colors_settings["zodiac_transit_ring_3"]}; stroke-width: 1px; stroke-opacity: .6;"/>'
-
-        return out
-
-    def _degreeRing(self, r) -> str:
-        """
-        Draws the degree ring.
-        """
-        out = ""
-        for i in range(72):
-            offset = float(i * 5) - self.user.houses_degree_ut[6]
-            if offset < 0:
-                offset = offset + 360.0
-            elif offset > 360:
-                offset = offset - 360.0
-            x1 = sliceToX(0, r - self.c1, offset) + self.c1
-            y1 = sliceToY(0, r - self.c1, offset) + self.c1
-            x2 = sliceToX(0, r + 2 - self.c1, offset) - 2 + self.c1
-            y2 = sliceToY(0, r + 2 - self.c1, offset) - 2 + self.c1
-
-            out += f'<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {self.chart_colors_settings["paper_0"]}; stroke-width: 1px; stroke-opacity:.9;"/>'
-
-        return out
-
-    def _degreeTransitRing(self, r):
-        out = ""
-        for i in range(72):
-            offset = float(i * 5) - self.user.houses_degree_ut[6]
-            if offset < 0:
-                offset = offset + 360.0
-            elif offset > 360:
-                offset = offset - 360.0
-            x1 = sliceToX(0, r, offset)
-            y1 = sliceToY(0, r, offset)
-            x2 = sliceToX(0, r + 2, offset) - 2
-            y2 = sliceToY(0, r + 2, offset) - 2
-            out += f'<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: #F00; stroke-width: 1px; stroke-opacity:.9;"/>'
-
-        return out
-
-    def _lat2str(self, coord):
-        """Converts a floating point latitude to string with
-        degree, minutes and seconds and the appropriate sign
-        (north or south). Eg. 52.1234567 -> 52°7'25" N
-
-        Args:
-            coord (float): latitude in floating point format
-        Returns:
-            str: latitude in string format with degree, minutes,
-             seconds and sign (N/S)
-        """
-
-        sign = self.language_settings["north"]
-        if coord < 0.0:
-            sign = self.language_settings["south"]
-            coord = abs(coord)
-        deg = int(coord)
-        min = int((float(coord) - deg) * 60)
-        sec = int(round(float(((float(coord) - deg) * 60) - min) * 60.0))
-        return f"{deg}°{min}'{sec}\" {sign}"
-
-    def _lon2str(self, coord):
-        """Converts a floating point longitude to string with
-        degree, minutes and seconds and the appropriate sign
-        (east or west). Eg. 52.1234567 -> 52°7'25" E
-
-        Args:
-            coord (float): longitude in floating point format
-        Returns:
-            str: longitude in string format with degree, minutes,
-                seconds and sign (E/W)
-        """
-
-        sign = self.language_settings["east"]
-        if coord < 0.0:
-            sign = self.language_settings["west"]
-            coord = abs(coord)
-        deg = int(coord)
-        min = int((float(coord) - deg) * 60)
-        sec = int(round(float(((float(coord) - deg) * 60) - min) * 60.0))
-        return f"{deg}°{min}'{sec}\" {sign}"
-
-    def _dec2deg(self, dec, type="3"):
-        """Coverts decimal float to degrees in format
-        a°b'c".
-        """
-
-        dec = float(dec)
-        a = int(dec)
-        a_new = (dec - float(a)) * 60.0
-        b_rounded = int(round(a_new))
-        b = int(a_new)
-        c = int(round((a_new - float(b)) * 60.0))
-        if type == "3":
-            out = f"{a:02d}&#176;{b:02d}&#39;{c:02d}&#34;"
-        elif type == "2":
-            out = f"{a:02d}&#176;{b_rounded:02d}&#39;"
-        elif type == "1":
-            out = f"{a:02d}&#176;"
-        else:
-            raise KerykeionException(f"Wrong type: {type}, it must be 1, 2 or 3.")
-        return str(out)
-
-    def _drawAspect(self, r, ar, degA, degB, color):
-        """
-        Draws svg aspects: ring, aspect ring, degreeA degreeB
-        """
-        offset = (int(self.user.houses_degree_ut[6]) / -1) + int(degA)
-        x1 = sliceToX(0, ar, offset) + (r - ar)
-        y1 = sliceToY(0, ar, offset) + (r - ar)
-        offset = (int(self.user.houses_degree_ut[6]) / -1) + int(degB)
-        x2 = sliceToX(0, ar, offset) + (r - ar)
-        y2 = sliceToY(0, ar, offset) + (r - ar)
-        out = f'            <line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {color}; stroke-width: 1; stroke-opacity: .9;"/>'
-
-        return out
-
     def _draw_zodiac_circle_slices(self, r):
         """
         Generate the SVG string representing the zodiac circle
@@ -388,7 +291,7 @@ class KerykeionChartSVG:
             output += draw_zodiac_slice(
                 c1=self.c1,
                 chart_type=self.chart_type,
-                sixth_house_degree_ut=self.user.houses_degree_ut[6],
+                seventh_house_degree_ut=self.user.houses_degree_ut[6],
                 num=i,
                 r=r,
                 style=f'fill:{self.chart_colors_settings[f"zodiac_bg_{i}"]}; fill-opacity: 0.5;',
@@ -484,44 +387,50 @@ class KerykeionChartSVG:
 
         return path
 
-    def _value_element_from_planet(self, i):
+    def _calculate_elements_points_from_planets(self):
         """
         Calculate chart element points from a planet.
         """
+        
+        for i in range(len(self.available_planets_setting)):
+            # element: get extra points if planet is in own zodiac sign.
+            related_zodiac_signs = self.available_planets_setting[i]["related_zodiac_signs"]
+            cz = self.points_sign[i]
+            extra_points = 0
+            if related_zodiac_signs != []:
+                for e in range(len(related_zodiac_signs)):
+                    if int(related_zodiac_signs[e]) == int(cz):
+                        extra_points = self.planet_in_zodiac_extra_points
 
-        # element: get extra points if planet is in own zodiac sign.
-        related_zodiac_signs = self.available_planets_setting[i]["related_zodiac_signs"]
-        cz = self.points_sign[i]
-        extra_points = 0
-        if related_zodiac_signs != []:
-            for e in range(len(related_zodiac_signs)):
-                if int(related_zodiac_signs[e]) == int(cz):
-                    extra_points = self.planet_in_zodiac_extra_points
-
-        ele = self.zodiac[self.points_sign[i]]["element"]
-        if ele == "fire":
-            self.fire = self.fire + self.available_planets_setting[i]["element_points"] + extra_points
+            ele = self.zodiac[self.points_sign[i]]["element"]
+            if ele == "fire":
+                self.fire = self.fire + self.available_planets_setting[i]["element_points"] + extra_points
 
-        elif ele == "earth":
-            self.earth = self.earth + self.available_planets_setting[i]["element_points"] + extra_points
+            elif ele == "earth":
+                self.earth = self.earth + self.available_planets_setting[i]["element_points"] + extra_points
 
-        elif ele == "air":
-            self.air = self.air + self.available_planets_setting[i]["element_points"] + extra_points
+            elif ele == "air":
+                self.air = self.air + self.available_planets_setting[i]["element_points"] + extra_points
 
-        elif ele == "water":
-            self.water = self.water + self.available_planets_setting[i]["element_points"] + extra_points
+            elif ele == "water":
+                self.water = self.water + self.available_planets_setting[i]["element_points"] + extra_points
 
     def _make_planets(self, r):
         planets_degut = {}
         diff = range(len(self.available_planets_setting))
 
         for i in range(len(self.available_planets_setting)):
-            if self.available_planets_setting[i]["is_active"] == 1:
-                # list of planets sorted by degree
-                logging.debug(f"planet: {i}, degree: {self.points_deg_ut[i]}")
-                planets_degut[self.points_deg_ut[i]] = i
+            # list of planets sorted by degree
+            logging.debug(f"planet: {i}, degree: {self.points_deg_ut[i]}")
+            planets_degut[self.points_deg_ut[i]] = i
 
-            self._value_element_from_planet(i)
+        """
+        FIXME: The planets_degut is a dictionary like:
+        {planet_degree: planet_index}
+        It should be replaced bu points_deg_ut
+        print(self.points_deg_ut)
+        print(planets_degut)
+        """
 
         output = ""
         keys = list(planets_degut.keys())
@@ -703,14 +612,15 @@ class KerykeionChartSVG:
         if self.chart_type == "Transit" or self.chart_type == "Synastry":
             group_offset = {}
             t_planets_degut = {}
-            if self.chart_type == "Transit":
-                list_range = len(self.available_planets_setting) - 4
-            else:
-                list_range = len(self.available_planets_setting)
+            list_range = len(self.available_planets_setting)
+
             for i in range(list_range):
+                if self.chart_type == "Transit" and self.available_planets_setting[i]['name'] in self.transit_ring_exclude_points_names:
+                    continue
+                
                 group_offset[i] = 0
-                if self.available_planets_setting[i]["is_active"] == 1:
-                    t_planets_degut[self.t_points_deg_ut[i]] = i
+                t_planets_degut[self.t_points_deg_ut[i]] = i
+        
             t_keys = list(t_planets_degut.keys())
             t_keys.sort()
 
@@ -752,7 +662,12 @@ class KerykeionChartSVG:
                     group_offset[groups[i][3]] = 2.0
 
             switch = 0
+            
+            # Transit planets loop
             for e in range(len(t_keys)):
+                if self.chart_type == "Transit" and self.available_planets_setting[e]["name"] in self.transit_ring_exclude_points_names:
+                    continue
+
                 i = t_planets_degut[t_keys[e]]
 
                 if 22 < i < 27:
@@ -764,20 +679,21 @@ class KerykeionChartSVG:
                     rplanet = 26
                     switch = 1
 
+                # Transit planet name
                 zeropoint = 360 - self.user.houses_degree_ut[6]
                 t_offset = zeropoint + self.t_points_deg_ut[i]
                 if t_offset > 360:
                     t_offset = t_offset - 360
                 planet_x = sliceToX(0, (r - rplanet), t_offset) + rplanet
                 planet_y = sliceToY(0, (r - rplanet), t_offset) + rplanet
-                output += f'<g transform="translate(-6,-6)"><g transform="scale(0.5)"><use x="{planet_x*2}" y="{planet_y*2}" xlink:href="#{self.available_planets_setting[i]["name"]}" /></g></g>'
+                output += f'<g class="transit-planet-name" transform="translate(-6,-6)"><g transform="scale(0.5)"><use x="{planet_x*2}" y="{planet_y*2}" xlink:href="#{self.available_planets_setting[i]["name"]}" /></g></g>'
 
-                # transit planet line
+                # Transit planet line
                 x1 = sliceToX(0, r + 3, t_offset) - 3
                 y1 = sliceToY(0, r + 3, t_offset) - 3
                 x2 = sliceToX(0, r - 3, t_offset) + 3
                 y2 = sliceToY(0, r - 3, t_offset) + 3
-                output += f'<line x1="{str(x1)}" y1="{str(y1)}" x2="{str(x2)}" y2="{str(y2)}" style="stroke: {self.available_planets_setting[i]["color"]}; stroke-width: 1px; stroke-opacity:.8;"/>'
+                output += f'<line class="transit-planet-line" x1="{str(x1)}" y1="{str(y1)}" x2="{str(x2)}" y2="{str(y2)}" style="stroke: {self.available_planets_setting[i]["color"]}; stroke-width: 1px; stroke-opacity:.8;"/>'
 
                 # transit planet degree text
                 rotate = self.user.houses_degree_ut[0] - self.t_points_deg_ut[i]
@@ -801,7 +717,7 @@ class KerykeionChartSVG:
                 degree = int(t_offset)
                 output += f'<g transform="translate({deg_x},{deg_y})">'
                 output += f'<text transform="rotate({rotate})" text-anchor="{textanchor}'
-                output += f'" style="fill: {self.available_planets_setting[i]["color"]}; font-size: 10px;">{self._dec2deg(self.t_points_deg[i], type="1")}'
+                output += f'" style="fill: {self.available_planets_setting[i]["color"]}; font-size: 10px;">{convert_decimal_to_degree_string(self.t_points_deg[i], type="1")}'
                 output += "</text></g>"
 
             # check transit
@@ -983,12 +899,13 @@ class KerykeionChartSVG:
     def _makeAspects(self, r, ar):
         out = ""
         for element in self.aspects_list:
-            out += self._drawAspect(
-                r,
-                ar,
-                element["p1_abs_pos"],
-                element["p2_abs_pos"],
-                self.aspects_settings[element["aid"]]["color"],
+            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"],
+                seventh_house_degree_ut=self.user.seventh_house.abs_pos
             )
 
         return out
@@ -1004,24 +921,22 @@ class KerykeionChartSVG:
         counter = 0
         for a in revr:
             counter += 1
-            if self.available_planets_setting[a]["is_active"] == 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:
-                    if self.available_planets_setting[b]["is_active"] == 1:
-                        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"]}" />'
+            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
 
@@ -1032,12 +947,13 @@ class KerykeionChartSVG:
         self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file).relevant_aspects
 
         for element in self.aspects_list:
-            out += self._drawAspect(
-                r,
-                ar,
-                element["p1_abs_pos"],
-                element["p2_abs_pos"],
-                self.aspects_settings[element["aid"]]["color"],
+            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"],
+                seventh_house_degree_ut=self.user.seventh_house.abs_pos
             )
 
         return out
@@ -1088,36 +1004,20 @@ class KerykeionChartSVG:
             
             out += "</g>"
             # difference in degrees
-            out += f'<text y="8" x="45" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self._dec2deg(self.aspects_list[i]["orbit"])}</text>'
+            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 _makeElements(self, r):
-        total = self.fire + self.earth + self.air + self.water
-        pf = int(round(100 * self.fire / total))
-        pe = int(round(100 * self.earth / total))
-        pa = int(round(100 * self.air / total))
-        pw = int(round(100 * self.water / total))
-
-        out = '<g transform="translate(-30,79)">'
-        out += f'<text y="0" style="fill:#ff6600; font-size: 10px;">{self.language_settings["fire"]}  {str(pf)}%</text>'
-        out += f'<text y="12" style="fill:#6a2d04; font-size: 10px;">{self.language_settings["earth"]} {str(pe)}%</text>'
-        out += f'<text y="24" style="fill:#6f76d1; font-size: 10px;">{self.language_settings["air"]}   {str(pa)}%</text>'
-        out += f'<text y="36" style="fill:#630e73; font-size: 10px;">{self.language_settings["water"]} {str(pw)}%</text>'
-        out += "</g>"
-
-        return out
-
     def _makePlanetGrid(self):
         li = 10
         offset = 0
 
         out = '<g transform="translate(500,-20)">'
         out += '<g transform="translate(140, -15)">'
-        out += f'<text text-anchor="end" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 14px;">{self.language_settings["planets_and_house"]} {self.name}:</text>'
+        out += f'<text text-anchor="end" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 14px;">{self.language_settings["planets_and_house"]} {self.user.name}:</text>'
         out += "</g>"
 
         end_of_line = None
@@ -1140,7 +1040,7 @@ class KerykeionChartSVG:
             out += f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{self.available_planets_setting[i]["name"]}" /></g>'
 
             # planet degree
-            out += f'<text text-anchor="start" x="19" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self._dec2deg(self.points_deg[i])}</text>'
+            out += f'<text text-anchor="start" x="19" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{convert_decimal_to_degree_string(self.points_deg[i])}</text>'
 
             # zodiac
             out += f'<g transform="translate(60,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.points_sign[i]]["name"]}" /></g>'
@@ -1172,27 +1072,26 @@ class KerykeionChartSVG:
                     t_li = 10
                     t_offset = -120
 
-                if self.available_planets_setting[i]["is_active"] == 1:
-                    # start of line
-                    out += f'<g transform="translate({t_offset},{t_li})">'
+                # start of line
+                out += f'<g transform="translate({t_offset},{t_li})">'
 
-                    # planet text
-                    out += f'<text text-anchor="end" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["celestial_points"][self.available_planets_setting[i]["label"]]}</text>'
-                    # planet symbol
-                    out += f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{self.available_planets_setting[i]["name"]}" /></g>'
-                    # planet degree
-                    out += f'<text text-anchor="start" x="19" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self._dec2deg(self.t_points_deg[i])}</text>'
-                    # zodiac
-                    out += f'<g transform="translate(60,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.t_points_sign[i]]["name"]}" /></g>'
+                # planet text
+                out += f'<text text-anchor="end" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["celestial_points"][self.available_planets_setting[i]["label"]]}</text>'
+                # planet symbol
+                out += f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{self.available_planets_setting[i]["name"]}" /></g>'
+                # planet degree
+                out += f'<text text-anchor="start" x="19" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{convert_decimal_to_degree_string(self.t_points_deg[i])}</text>'
+                # zodiac
+                out += f'<g transform="translate(60,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.t_points_sign[i]]["name"]}" /></g>'
 
-                    # planet retrograde
-                    if self.t_points_retrograde[i]:
-                        out += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
+                # planet retrograde
+                if self.t_points_retrograde[i]:
+                    out += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
 
-                    # end of line
-                    out += end_of_line
+                # end of line
+                out += end_of_line
 
-                    t_li = t_li + offset_between_lines
+                t_li = t_li + offset_between_lines
 
         if end_of_line is None:
             raise KerykeionException("End of line not found")
@@ -1201,6 +1100,12 @@ class KerykeionChartSVG:
         return out
 
     def _draw_house_grid(self):
+        """
+        Generate SVG code for a grid of astrological houses.
+
+        Returns:
+            str: The SVG code for the grid of houses.
+        """
         out = '<g transform="translate(600,-20)">'
 
         li = 10
@@ -1212,7 +1117,7 @@ class KerykeionChartSVG:
             out += f'<g transform="translate(0,{li})">'
             out += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {cusp}:</text>'
             out += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.houses_sign_graph[i]]["name"]}" /></g>'
-            out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {self._dec2deg(self.user.houses_list[i]["position"])}</text>'
+            out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {convert_decimal_to_degree_string(self.user.houses_list[i]["position"])}</text>'
             out += "</g>"
             li = li + 14
 
@@ -1229,7 +1134,7 @@ class KerykeionChartSVG:
                 out += '<g transform="translate(0,' + str(li) + ')">'
                 out += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {cusp}:</text>'
                 out += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.t_houses_sign_graph[i]]["name"]}" /></g>'
-                out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {self._dec2deg(self.t_user.houses_list[i]["position"])}</text>'
+                out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {convert_decimal_to_degree_string(self.t_user.houses_list[i]["position"])}</text>'
                 out += "</g>"
                 li = li + 14
             out += "</g>"
@@ -1244,6 +1149,9 @@ class KerykeionChartSVG:
         self.air = 0.0
         self.water = 0.0
 
+        # Calculate the elements points
+        self._calculate_elements_points_from_planets()
+
         # width and height from screen
         ratio = float(self.screen_width) / float(self.screen_height)
         if ratio < 1.3:  # 1280x1024
@@ -1278,8 +1186,8 @@ class KerykeionChartSVG:
 
         # transit
         if self.chart_type == "Transit" or self.chart_type == "Synastry":
-            td["transitRing"] = self._transitRing(r)
-            td["degreeRing"] = self._degreeTransitRing(r)
+            td["transitRing"] = draw_transit_ring(r, self.chart_colors_settings["paper_1"], self.chart_colors_settings["zodiac_transit_ring_3"])
+            td["degreeRing"] = draw_transit_ring_degree_steps(r, self.user.seventh_house.abs_pos)
 
             # circles
             td["c1"] = f'cx="{r}" cy="{r}" r="{r - 36}"'
@@ -1296,7 +1204,7 @@ class KerykeionChartSVG:
             td["chart_width"] = self.full_width
         else:
             td["transitRing"] = ""
-            td["degreeRing"] = self._degreeRing(r)
+            td["degreeRing"] = draw_degree_ring(r, self.c1, self.user.seventh_house.abs_pos, self.chart_colors_settings["paper_0"])
 
             # circles
             td["c1"] = f'cx="{r}" cy="{r}" r="{r - self.c1}"'
@@ -1317,17 +1225,17 @@ class KerykeionChartSVG:
         td["viewbox"] = viewbox
 
         if self.chart_type == "Synastry":
-            td["stringTitle"] = f"{self.name} {self.language_settings['and_word']} {self.t_user.name}"
+            td["stringTitle"] = f"{self.user.name} {self.language_settings['and_word']} {self.t_user.name}"
 
         elif self.chart_type == "Transit":
             td["stringTitle"] = f"{self.language_settings['transits']} {self.t_user.day}/{self.t_user.month}/{self.t_user.year}"
 
         else:
-            td["stringTitle"] = self.name
+            td["stringTitle"] = self.user.name
 
         # Tipo di carta
-        if self.chart_type == "Synastry" or self.name == "Transit":
-            td["stringName"] = f"{self.name}:"
+        if self.chart_type == "Synastry" or self.chart_type == "Transit":
+            td["stringName"] = f"{self.user.name}:"
         else:
             td["stringName"] = f'{self.language_settings["info"]}:'
 
@@ -1411,9 +1319,20 @@ class KerykeionChartSVG:
             td["stringPosition"] = f"{self.t_user.year}-{self.t_user.month}-{self.t_user.day} {self.t_user.hour:02d}:{self.t_user.minute:02d}"
 
         else:
-            td["stringLat"] = f"{self.language_settings['latitude']}: {self._lat2str(self.geolat)}"
-            td["stringLon"] = f"{self.language_settings['longitude']}: {self._lon2str(self.geolon)}"
-            td["stringPosition"] = f"{self.language_settings['type']}: {self.charttype}"
+            latitude_string = convert_latitude_coordinate_to_string(
+                self.geolat, 
+                self.language_settings['north'], 
+                self.language_settings['south']
+            )
+            longitude_string = convert_longitude_coordinate_to_string(
+                self.geolon, 
+                self.language_settings['east'], 
+                self.language_settings['west']
+            )
+
+            td["stringLat"] = f"{self.language_settings['latitude']}: {latitude_string}"
+            td["stringLon"] = f"{self.language_settings['longitude']}: {longitude_string}"
+            td["stringPosition"] = f"{self.language_settings['type']}: {self.chart_type}"
 
         # paper_color_X
         td["paper_color_0"] = self.chart_colors_settings["paper_0"]
@@ -1446,7 +1365,16 @@ class KerykeionChartSVG:
         # TODO: Add the rest of the functions
         td["makeHouses"] = self._makeHouses(r)
         td["makePlanets"] = self._make_planets(r)
-        td["makeElements"] = self._makeElements(r)
+        td["elements_percentages"] = draw_elements_percentages(
+            self.language_settings['fire'],
+            self.fire,
+            self.language_settings['earth'],
+            self.earth,
+            self.language_settings['air'],
+            self.air,
+            self.language_settings['water'],
+            self.water,
+        )
         td["makePlanetGrid"] = self._makePlanetGrid()
 
         return td
@@ -1472,7 +1400,7 @@ class KerykeionChartSVG:
         if not (self.template):
             self.template = self.makeTemplate()
 
-        self.chartname = self.output_directory / f"{self.name}{self.chart_type}Chart.svg"
+        self.chartname = self.output_directory / f"{self.user.name}{self.chart_type}Chart.svg"
 
         with open(self.chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(self.template)

kerykeion/charts/templates/chart.xml

@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
-<!---
-This file is part of Kerykeion and is based on OpenAstro.org -->
+<!--- This file is part of Kerykeion and is based on OpenAstro.org -->
 <svg
     xmlns="http://www.w3.org/2000/svg"
     xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -10,7 +8,7 @@ This file is part of Kerykeion and is based on OpenAstro.org -->
     viewBox="$viewbox"
     preserveAspectRatio="xMidYMid"
 >
-    <title>Kerykeion</title>
+    <title>$stringTitle | Kerykeion</title>
     <g transform="translate($cfgTranslate)">
         <g transform="rotate($cfgRotate)">
             <g transform="scale($cfgZoom)">
@@ -469,20 +467,49 @@ This file is part of Kerykeion and is based on OpenAstro.org -->
                 </symbol>
                 <g transform="translate(50,50)">
                     <g transform="translate($circleX,$circleY)">
-                        <!-- Zodiac -->$makeZodiac <!-- First Circle -->
+                        <!-- Zodiac -->
+                        $makeZodiac 
+
+                        <!-- First Circle -->
                         <circle $c1 style="$c1style" />
+
                         <!-- Second Circle -->
-                        <circle
-                            $c2 style="$c2style" />
+                        <circle $c2 style="$c2style" />
+
                         <!-- Third Circle -->
                         <circle $c3 style="$c3style" />
-                        <!-- TransitRing -->$transitRing <!-- Degree Ring -->$degreeRing <!-- Houses -->
-                    $makeHouses
-                        <!-- Planets -->$makePlanets <!-- Aspects -->$makeAspects </g>
-                    <!-- makePatterns -->$makePatterns <!-- AspectGrid -->
+
+                        <!-- TransitRing -->
+                        $transitRing 
+
+                        <!-- Degree Ring -->
+                        $degreeRing
+
+                        <!-- Houses -->
+                        $makeHouses
+
+                        <!-- Planets -->
+                        $makePlanets
+
+                        <!-- Aspects -->
+                        $makeAspects 
+                    </g>
+
+                    <!-- makePatterns -->
+                    $makePatterns
+
+                    <!-- AspectGrid -->
                     $makeAspectGrid
-                    <!-- Elements -->$makeElements <!-- Planet Grid -->$makePlanetGrid <!-- Houses Grid -->
+
+                    <!-- Elements -->
+                    $elements_percentages 
+
+                    <!-- Planet Grid -->
+                    $makePlanetGrid
+
+                    <!-- Houses Grid -->
                     $makeHousesGrid
+
                 </g>
             </g>
         </g>

kerykeion/kr_types/chart_types.py

@@ -36,8 +36,13 @@ class ChartTemplateDictionary(TypedDict):
     stringLat: str
     stringLon: str
     stringPosition: str
+
+    # Font color
     paper_color_0: str
+    # Background color of the chart
     paper_color_1: str
+    
+    # Planets colors, from 1 to 15 (0 is the Sun)
     planets_color_0: str
     planets_color_1: str
     planets_color_2: str
@@ -54,6 +59,8 @@ class ChartTemplateDictionary(TypedDict):
     planets_color_13: str
     planets_color_14: str
     planets_color_15: str
+    
+    # Zodiac colors, from 0 to 11 (0 is Aries)
     zodiac_color_0: str
     zodiac_color_1: str
     zodiac_color_2: str
@@ -66,6 +73,8 @@ class ChartTemplateDictionary(TypedDict):
     zodiac_color_9: str
     zodiac_color_10: str
     zodiac_color_11: str
+
+    # Aspects colors, from 0 to 9 (0 is conjunction)
     orb_color_0: str
     orb_color_30: str
     orb_color_45: str
@@ -77,12 +86,13 @@ class ChartTemplateDictionary(TypedDict):
     orb_color_144: str
     orb_color_150: str
     orb_color_180: str
+
     cfgZoom: str
     cfgRotate: str
     cfgTranslate: str
     makeZodiac: str
     makeHouses: str
     makePlanets: str
-    makeElements: str
+    elements_percentages: str
     makePlanetGrid: str
     makeHousesGrid: str

kerykeion/kr_types/settings_models.py

@@ -4,10 +4,8 @@
 """
 
 
-from json import load
 from pydantic import BaseModel, Field
-from pathlib import Path
-from typing import Dict, List, Union
+from typing import List
 
 
 class CustomBaseModel(BaseModel):

{kerykeion-4.6.2.dist-info → kerykeion-4.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.6.2
+Version: 4.7.0
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0

{kerykeion-4.6.2.dist-info → kerykeion-4.7.0.dist-info}/RECORD

@@ -6,17 +6,17 @@ kerykeion/aspects/natal_aspects.py,sha256=m3_v1dM6YXvENZ6iN_EJkikKxySZBeR5QKhGsa
 kerykeion/aspects/synastry_aspects.py,sha256=uwg7Lc7wKnpxW9ydOdBHqx9cvO_t0ydGfIGluBIDD7c,3993
 kerykeion/astrological_subject.py,sha256=9vLsYZYfAfkR5EJO_EkbkhXa4i788Yv1lCESaQrt5kU,22965
 kerykeion/charts/__init__.py,sha256=Juxkduy2TaagWblh_7CE8Acrg3dHL27-WEddJhau_eQ,127
-kerykeion/charts/charts_utils.py,sha256=jJLgoBcs9e6-ArNFsj_N7Wel0zCzMKEsGrlz_A7MECE,5167
-kerykeion/charts/kerykeion_chart_svg.py,sha256=6y0VHsfBEjefSrJErcKB3UH1xFOuWoEps4Y_1-IynVo,64764
-kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
+kerykeion/charts/charts_utils.py,sha256=E5qrvA7uaSxKL0PrcRtWhDP581itIm3kAebsxYVa4hE,13214
+kerykeion/charts/kerykeion_chart_svg.py,sha256=IjR5E2LsKjWjfLeMcjR3UIutixASPcZbs0Ljl3HDSZg,60991
+kerykeion/charts/templates/chart.xml,sha256=7gkzNRQmkOn9hCAOiPbQwd9e8x9shFtF3uEZo5tp8P0,70156
 kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
 kerykeion/fetch_geonames.py,sha256=fWuhgP_hZTPzDuodu7hvSznzGCWj3IC3vHAX32zPRw8,4444
 kerykeion/kr_types/__init__.py,sha256=-qhGQikurdoHnGtuT1bsaEeZ-IwmZtIHMjGOPC9_oqQ,295
-kerykeion/kr_types/chart_types.py,sha256=PvdOEqzZZBrJxFKQqAC0KcnfIY4T4I2i6CeLQhvVbe8,1945
+kerykeion/kr_types/chart_types.py,sha256=ZXBfMhidgwSGNEIO6kRELQedc8L7TF4z-pYgW28PA4s,2169
 kerykeion/kr_types/kerykeion_exception.py,sha256=G-7VFta78qBt10l54JZWvwH-3lUNKmDwuILXaVGVu9A,314
 kerykeion/kr_types/kr_literals.py,sha256=Kc7LfdeTqHi5uDGoQHWsB81GTBc5E-fGxTJqWKK1FFU,1267
 kerykeion/kr_types/kr_models.py,sha256=3gyT4z-J9EM6p5175HKJX9q9WVWQTDt5Y_m3m8lZu9s,4260
-kerykeion/kr_types/settings_models.py,sha256=fueHaDLW2GPQl4HWImUNsWxeM7xcF0JU-fFc3rQqPgE,12743
+kerykeion/kr_types/settings_models.py,sha256=V4iEj7egXZHrWiV1cGQIezbtVmOKbOB-BRzPwa8WVtc,12683
 kerykeion/relationship_score.py,sha256=R9JugfK5_gJgr5ND-EghkqpqZcutzzKlJ-2JnYUMVv4,6794
 kerykeion/report.py,sha256=kS5avIN119pJVapYjZOvabg77nEcA8sSrOuXbRifABk,2565
 kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
@@ -25,8 +25,8 @@ kerykeion/settings/kr.config.json,sha256=1Yhv9RGHom5U9e-JZZRWVfT2Ubllz2WrckdwadD
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
 kerykeion/utilities.py,sha256=ncoXHvzXhNjhdm-uU6hMirVo287laq2GAJElNE6cBZM,10822
-kerykeion-4.6.2.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.6.2.dist-info/METADATA,sha256=hnPIiPxPtZE9OlhC3Us33D38-4g7-RA71eFeZpEATCU,10311
-kerykeion-4.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kerykeion-4.6.2.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.6.2.dist-info/RECORD,,
+kerykeion-4.7.0.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.7.0.dist-info/METADATA,sha256=zb-U4K0Na0Gu84TVzUa2mcgksnvSCXFQjLBQ1gbKPRc,10311
+kerykeion-4.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.7.0.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.7.0.dist-info/RECORD,,