kerykeion 4.24.7__py3-none-any.whl → 4.25.1__py3-none-any.whl

kerykeion/__init__.py

@@ -16,3 +16,4 @@ from .report import Report
 from .settings import KerykeionSettingsModel, get_settings
 from .enums import Planets, Aspects, Signs
 from .ephemeris_data import EphemerisDataFactory
+from .composite_subject_factory import CompositeSubjectFactory

kerykeion/aspects/natal_aspects.py

@@ -5,6 +5,7 @@
 
 from pathlib import Path
 from kerykeion import AstrologicalSubject
+from kerykeion.kr_types import CompositeSubjectModel
 import logging
 from typing import Union, List
 from kerykeion.settings.kerykeion_settings import get_settings
@@ -32,7 +33,7 @@ class NatalAspects:
     Generates an object with all the aspects of a birthcart.
     """
 
-    user: Union[AstrologicalSubject, AstrologicalSubjectModel]
+    user: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel]
     new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
     active_points: List[Union[AxialCusps, Planet]] = field(default_factory=lambda: DEFAULT_ACTIVE_POINTS)
     active_aspects: List[ActiveAspect] = field(default_factory=lambda: DEFAULT_ACTIVE_ASPECTS)

kerykeion/astrological_subject.py

@@ -31,9 +31,8 @@ from kerykeion.utilities import (
     get_number_from_name,
     get_kerykeion_point_from_degree,
     get_planet_house,
-    get_moon_emoji_from_phase_int,
-    get_moon_phase_name_from_phase_int,
-    check_and_adjust_polar_latitude
+    check_and_adjust_polar_latitude,
+    calculate_moon_phase
 )
 from pathlib import Path
 from typing import Union, get_args
@@ -389,9 +388,15 @@ class AstrologicalSubject:
         self.julian_day = float(swe.julday(utc_object.year, utc_object.month, utc_object.day, utc_float_hour_with_minutes))
         # <--- UTC, julian day and local time setup
 
+        # Planets and Houses setup
         self._initialize_houses()
         self._initialize_planets()
-        self._initialize_moon_phase()
+
+        # Lunar Phase
+        self.lunar_phase = calculate_moon_phase(
+            self.moon.abs_pos,
+            self.sun.abs_pos
+        )
 
         # Deprecated properties
         self.utc_time
@@ -667,49 +672,6 @@ class AstrologicalSubject:
         self.medium_coeli.retrograde = False
         self.imum_coeli.retrograde = False
 
-    def _initialize_moon_phase(self) -> None:
-        """
-        Calculate and initialize the lunar phase based on the positions of the moon and sun.
-
-        This function calculates the degrees between the moon and the sun, determines the moon phase
-        and sun phase, and initializes the lunar phase model with the calculated values.
-        """
-        # Initialize moon_phase and sun_phase to None in case of an error
-        moon_phase, sun_phase = None, None
-
-        # Calculate the anti-clockwise degrees between the sun and moon
-        moon, sun = self.moon.abs_pos, self.sun.abs_pos
-        degrees_between = (moon - sun) % 360
-
-        # Calculate the moon phase (1-28) based on the degrees between the sun and moon
-        step = 360.0 / 28.0
-        moon_phase = int(degrees_between // step) + 1
-
-        # Define the sun phase steps
-        sunstep = [
-            0, 30, 40, 50, 60, 70, 80, 90, 120, 130, 140, 150, 160, 170, 180,
-            210, 220, 230, 240, 250, 260, 270, 300, 310, 320, 330, 340, 350
-        ]
-
-        # Calculate the sun phase (1-28) based on the degrees between the sun and moon
-        for x in range(len(sunstep)):
-            low = sunstep[x]
-            high = sunstep[x + 1] if x < len(sunstep) - 1 else 360
-            if low <= degrees_between < high:
-                sun_phase = x + 1
-                break
-
-        # Create a dictionary with the lunar phase information
-        lunar_phase_dictionary = {
-            "degrees_between_s_m": degrees_between,
-            "moon_phase": moon_phase,
-            "sun_phase": sun_phase,
-            "moon_emoji": get_moon_emoji_from_phase_int(moon_phase),
-            "moon_phase_name": get_moon_phase_name_from_phase_int(moon_phase)
-        }
-
-        # Initialize the lunar phase model with the calculated values
-        self.lunar_phase = LunarPhaseModel(**lunar_phase_dictionary)
 
     def json(self, dump=False, destination_folder: Union[str, None] = None, indent: Union[int, None] = None) -> str:
         """

kerykeion/charts/charts_utils.py

@@ -28,6 +28,7 @@ def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial
     else:
         raise KerykeionException(f"Celestial point {input_planet_name} not found in language model.")
 
+
 def decHourJoin(inH: int, inM: int, inS: int) -> float:
     """Join hour, minutes, seconds, timezone integer to hour float.
 
@@ -47,24 +48,42 @@ def decHourJoin(inH: int, inM: int, inS: int) -> float:
 
 
 def degreeDiff(a: Union[int, float], b: Union[int, float]) -> float:
-    """Calculate the difference between two degrees.
+    """Calculate the smallest difference between two angles in degrees.
 
     Args:
-        - a (int | float): first degree
-        - b (int | float): second degree
+        a (int | float): first angle in degrees
+        b (int | float): second angle in degrees
 
     Returns:
-        float: difference between a and b
+        float: smallest difference between a and b (0 to 180 degrees)
     """
+    diff = math.fmod(abs(a - b), 360)  # Assicura che il valore sia in [0, 360)
+    return min(diff, 360 - diff)  # Prende l'angolo più piccolo tra i due possibili
+
+
+def degreeSum(a: Union[int, float], b: Union[int, float]) -> float:
+    """Calculate the sum of two angles in degrees, normalized to [0, 360).
+
+    Args:
+        a (int | float): first angle in degrees
+        b (int | float): second angle in degrees
+
+    Returns:
+        float: normalized sum of a and b in the range [0, 360)
+    """
+    return math.fmod(a + b, 360) if (a + b) % 360 != 0 else 0.0
 
-    out = float()
-    if a > b:
-        out = a - b
-    if a < b:
-        out = b - a
-    if out > 180.0:
-        out = 360.0 - out
-    return out
+
+def normalizeDegree(angle: Union[int, float]) -> float:
+    """Normalize an angle to the range [0, 360).
+
+    Args:
+        angle (int | float): The input angle in degrees.
+
+    Returns:
+        float: The normalized angle in the range [0, 360).
+    """
+    return angle % 360 if angle % 360 != 0 else 0.0
 
 
 def offsetToTz(datetime_offset: Union[datetime.timedelta, None]) -> float:
@@ -270,49 +289,6 @@ def draw_aspect_line(
         f"</g>"
     )
 
-
-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))
-
-    return (
-        f'<g transform="translate(-30,79)">'
-        f'<text y="0" style="fill: var(--kerykeion-chart-color-fire-percentage); font-size: 10px;">{fire_label}  {str(fire_percentage)}%</text>'
-        f'<text y="12" style="fill: var(--kerykeion-chart-color-earth-percentage); font-size: 10px;">{earth_label} {str(earth_percentage)}%</text>'
-        f'<text y="24" style="fill: var(--kerykeion-chart-color-air-percentage); font-size: 10px;">{air_label}   {str(air_percentage)}%</text>'
-        f'<text y="36" style="fill: var(--kerykeion-chart-color-water-percentage); font-size: 10px;">{water_label} {str(water_percentage)}%</text>'
-        f"</g>"
-    )
-
-
 def convert_decimal_to_degree_string(dec: float, format_type: Literal["1", "2", "3"] = "3") -> str:
     """
     Converts a decimal float to a degrees string in the specified format.
@@ -766,22 +742,19 @@ def draw_transit_aspect_list(
     return out
 
 
-def draw_moon_phase(
+def calculate_moon_phase_chart_params(
     degrees_between_sun_and_moon: float,
     latitude: float
-) -> str:
+) -> dict:
     """
-    Draws the moon phase based on the degrees between the sun and the moon.
+    Calculate the parameters for the moon phase chart.
 
     Parameters:
     - degrees_between_sun_and_moon (float): The degrees between the sun and the moon.
     - latitude (float): The latitude for rotation calculation.
-    - lunar_phase_outline_color (str): The color for the lunar phase outline.
-    - dark_color (str): The color for the dark part of the moon.
-    - light_color (str): The color for the light part of the moon.
 
     Returns:
-    - str: The SVG element as a string.
+    - dict: The moon phase chart parameters.
     """
     deg = degrees_between_sun_and_moon
 
@@ -825,20 +798,11 @@ def draw_moon_phase(
     # Calculate rotation based on latitude
     lunar_phase_rotate = -90.0 - latitude
 
-    # Return the SVG element as a string
-    return (
-        f'<g transform="rotate({lunar_phase_rotate} 20 10)">'
-        f'    <defs>'
-        f'        <clipPath id="moonPhaseCutOffCircle">'
-        f'        <circle cx="20" cy="10" r="10" />'
-        f'        </clipPath>'
-        f'    </defs>'
-        f'    <circle cx="20" cy="10" r="10" style="fill: var(--kerykeion-chart-color-lunar-phase-0)" />'
-        f'    <circle cx="{circle_center_x}" cy="10" r="{circle_radius}" style="fill: var(--kerykeion-chart-color-lunar-phase-1)" clip-path="url(#moonPhaseCutOffCircle)" />'
-        f'    <circle cx="20" cy="10" r="10" style="fill: none; stroke: var(--kerykeion-chart-color-lunar-phase-0); stroke-width: 0.5px; stroke-opacity: 0.5" />'
-        f'</g>'
-    )
-
+    return {
+        "circle_center_x": circle_center_x,
+        "circle_radius": circle_radius,
+        "lunar_phase_rotate": lunar_phase_rotate,
+    }
 
 def draw_house_grid(
         main_subject_houses_list: list[KerykeionPointModel],

kerykeion/charts/kerykeion_chart_svg.py

@@ -14,7 +14,7 @@ from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel, Sign, ActiveAspect
 from kerykeion.kr_types import ChartTemplateDictionary
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, CompositeSubjectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsModel
 from kerykeion.kr_types.kr_literals import KerykeionChartTheme, KerykeionChartLanguage, AxialCusps, Planet
 from kerykeion.charts.charts_utils import (
@@ -22,7 +22,6 @@ from kerykeion.charts.charts_utils import (
     convert_latitude_coordinate_to_string,
     convert_longitude_coordinate_to_string,
     draw_aspect_line,
-    draw_elements_percentages,
     draw_transit_ring_degree_steps,
     draw_degree_ring,
     draw_transit_ring,
@@ -33,7 +32,7 @@ from kerykeion.charts.charts_utils import (
     draw_houses_cusps_and_text_number,
     draw_transit_aspect_list,
     draw_transit_aspect_grid,
-    draw_moon_phase,
+    calculate_moon_phase_chart_params,
     draw_house_grid,
     draw_planet_grid,
 )
@@ -113,7 +112,7 @@ class KerykeionChartSVG:
     chart_colors_settings: dict
     planets_settings: dict
     aspects_settings: dict
-    user: Union[AstrologicalSubject, AstrologicalSubjectModel]
+    user: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel]
     available_planets_setting: List[KerykeionSettingsCelestialPointModel]
     height: float
     location: str
@@ -123,7 +122,7 @@ class KerykeionChartSVG:
 
     def __init__(
         self,
-        first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel],
         chart_type: ChartType = "Natal",
         second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None] = None,
         new_output_directory: Union[str, None] = None,
@@ -178,7 +177,7 @@ class KerykeionChartSVG:
             )
             self.aspects_list = natal_aspects_instance.relevant_aspects
 
-        if self.chart_type == "Transit" or self.chart_type == "Synastry":
+        elif self.chart_type == "Transit" or self.chart_type == "Synastry":
             if not second_obj:
                 raise KerykeionException("Second object is required for Transit or Synastry charts.")
 
@@ -198,6 +197,12 @@ class KerykeionChartSVG:
             for body in available_celestial_points_names:
                 self.t_available_kerykeion_celestial_points.append(self.t_user.get(body))
 
+        elif self.chart_type == "Composite":
+            if not isinstance(first_obj, CompositeSubjectModel):
+                raise KerykeionException("First object must be a CompositeSubjectModel instance.")
+
+            self.aspects_list = NatalAspects(self.user, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
+
         # Double chart aspect grid type
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
 
@@ -210,12 +215,20 @@ class KerykeionChartSVG:
         else:
             self.width = self._DEFAULT_NATAL_WIDTH
 
-        # default location
-        self.location = self.user.city
-        self.geolat = self.user.lat
-        self.geolon =  self.user.lng
-
-        if self.chart_type == "Transit":
+        if self.chart_type in ["Natal", "ExternalNatal", "Synastry"]:
+            self.location = self.user.city
+            self.geolat = self.user.lat
+            self.geolon =  self.user.lng
+
+        elif self.chart_type == "Composite":
+            self.location = ""
+            self.geolat = (self.user.first_subject.lat + self.user.second_subject.lat) / 2
+            self.geolon = (self.user.first_subject.lng + self.user.second_subject.lng) / 2
+
+        elif self.chart_type in ["Transit"]:
+            self.location = self.t_user.city
+            self.geolat = self.t_user.lat
+            self.geolon = self.t_user.lng
             self.t_name = self.language_settings["transit_name"]
 
         # Default radius for the chart
@@ -393,7 +406,7 @@ class KerykeionChartSVG:
             ChartTemplateDictionary: A dictionary with template data for the chart.
         """
         # Initialize template dictionary
-        template_dict: ChartTemplateDictionary = dict()  # type: ignore
+        template_dict: dict = {}
 
         # Set the color style tag
         template_dict["color_style_tag"] = self.color_style_tag
@@ -402,11 +415,8 @@ class KerykeionChartSVG:
         template_dict["chart_height"] = self.height
         template_dict["chart_width"] = self.width
 
-        # Set chart name
-        template_dict["stringName"] = f"{self.user.name}:" if self.chart_type in ["Synastry", "Transit"] else f'{self.language_settings["info"]}:'
-
         # Set viewbox based on chart type
-        if self.chart_type in ["Natal", "ExternalNatal"]:
+        if self.chart_type in ["Natal", "ExternalNatal", "Composite"]:
             template_dict['viewbox'] = self._BASIC_CHART_VIEWBOX
         elif self.double_chart_aspect_grid_type == "table" and self.chart_type == "Transit":
             template_dict['viewbox'] = self._TRANSIT_CHART_WITH_TABLE_VIWBOX
@@ -442,58 +452,85 @@ class KerykeionChartSVG:
             template_dict["stringTitle"] = f"{self.user.name} {self.language_settings['and_word']} {self.t_user.name}"
         elif self.chart_type == "Transit":
             template_dict["stringTitle"] = f"{self.language_settings['transits']} {self.t_user.day}/{self.t_user.month}/{self.t_user.year}"
-        else:
+        elif self.chart_type in ["Natal", "ExternalNatal"]:
             template_dict["stringTitle"] = self.user.name
+        elif self.chart_type == "Composite":
+            template_dict["stringTitle"] = f"{self.user.first_subject.name} {self.language_settings['and_word']} {self.user.second_subject.name}"
 
+        # Zodiac Type Info
         if self.user.zodiac_type == 'Tropic':
-            zodiac_info = "Tropical Zodiac"
-
+            zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
         else:
             mode_const = "SIDM_" + self.user.sidereal_mode # type: ignore
             mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
-            zodiac_info = f"Ayanamsa: {mode_name}"
+            zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
 
-        template_dict["bottomLeft0"] = f"{self.user.houses_system_name.capitalize()} Houses"
-        template_dict["bottomLeft1"] = zodiac_info
+        template_dict["bottom_left_0"] = f"{self.language_settings.get('houses_system_' + self.user.houses_system_identifier, self.user.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
+        template_dict["bottom_left_1"] = zodiac_info
 
         if self.chart_type in ["Natal", "ExternalNatal", "Synastry"]:
-            template_dict["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")} {self.language_settings.get("day", "Day").lower()}: {self.user.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.user.lunar_phase.moon_phase_name}'
-            template_dict["bottomLeft4"] = f'{self.user.perspective_type}'
-        else:
-            template_dict["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
-            template_dict["bottomLeft4"] = f'{self.t_user.perspective_type}'
+            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")} {self.language_settings.get("day", "Day").lower()}: {self.user.lunar_phase.get("moon_phase", "")}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.user.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.user.lunar_phase.moon_phase_name)}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get(self.user.perspective_type.lower().replace(" ", "_"), self.user.perspective_type)}'
+        elif self.chart_type == "Transit":
+            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get(self.t_user.perspective_type.lower().replace(" ", "_"), self.t_user.perspective_type)}'
+        elif self.chart_type == "Composite":
+            template_dict["bottom_left_2"] = f'{self.user.first_subject.perspective_type}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("composite_chart", "Composite Chart")} - {self.language_settings.get("midpoints", "Midpoints")}'
+            template_dict["bottom_left_4"] = ""
 
         # Draw moon phase
-        template_dict['moon_phase'] = draw_moon_phase(
+        moon_phase_dict = calculate_moon_phase_chart_params(
             self.user.lunar_phase["degrees_between_s_m"],
             self.geolat
         )
 
+        template_dict["lunar_phase_rotate"] = moon_phase_dict["lunar_phase_rotate"]
+        template_dict["lunar_phase_circle_center_x"] = moon_phase_dict["circle_center_x"]
+        template_dict["lunar_phase_circle_radius"] = moon_phase_dict["circle_radius"]
+
+        if self.chart_type == "Composite":
+            template_dict["top_left_1"] = f"{datetime.fromisoformat(self.user.first_subject.iso_formatted_local_datetime).strftime('%Y-%m-%d %H:%M')}"
         # Set location string
-        if len(self.location) > 35:
+        elif len(self.location) > 35:
             split_location = self.location.split(",")
             if len(split_location) > 1:
-                template_dict["stringLocation"] = split_location[0] + ", " + split_location[-1]
-                if len(template_dict["stringLocation"]) > 35:
-                    template_dict["stringLocation"] = template_dict["stringLocation"][:35] + "..."
+                template_dict["top_left_1"] = split_location[0] + ", " + split_location[-1]
+                if len(template_dict["top_left_1"]) > 35:
+                    template_dict["top_left_1"] = template_dict["top_left_1"][:35] + "..."
             else:
-                template_dict["stringLocation"] = self.location[:35] + "..."
+                template_dict["top_left_1"] = self.location[:35] + "..."
         else:
-            template_dict["stringLocation"] = self.location
+            template_dict["top_left_1"] = self.location
+
+        # Set chart name
+        if self.chart_type in ["Synastry", "Transit"]:
+            template_dict["top_left_0"] = f"{self.user.name}:"
+        elif self.chart_type in ["Natal", "ExternalNatal"]:
+            template_dict["top_left_0"] = f'{self.language_settings["info"]}:'
+        elif self.chart_type == "Composite":
+            template_dict["top_left_0"] = f'{self.user.first_subject.name}'
 
         # Set additional information for Synastry chart type
         if self.chart_type == "Synastry":
-            template_dict["stringLat"] = f"{self.t_user.name}: "
-            template_dict["stringLon"] = self.t_user.city
-            template_dict["stringPosition"] = f"{self.t_user.year}-{self.t_user.month}-{self.t_user.day} {self.t_user.hour:02d}:{self.t_user.minute:02d}"
+            template_dict["top_left_3"] = f"{self.t_user.name}: "
+            template_dict["top_left_4"] = self.t_user.city
+            template_dict["top_left_5"] = f"{self.t_user.year}-{self.t_user.month}-{self.t_user.day} {self.t_user.hour:02d}:{self.t_user.minute:02d}"
+        elif self.chart_type == "Composite":
+            template_dict["top_left_3"] = self.user.second_subject.name
+            template_dict["top_left_4"] = f"{datetime.fromisoformat(self.user.second_subject.iso_formatted_local_datetime).strftime('%Y-%m-%d %H:%M')}"
+            latitude_string = convert_latitude_coordinate_to_string(self.user.second_subject.lat, self.language_settings['north_letter'], self.language_settings['south_letter'])
+            longitude_string = convert_longitude_coordinate_to_string(self.user.second_subject.lng, self.language_settings['east_letter'], self.language_settings['west_letter'])
+            template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
         else:
             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'])
-            template_dict["stringLat"] = f"{self.language_settings['latitude']}: {latitude_string}"
-            template_dict["stringLon"] = f"{self.language_settings['longitude']}: {longitude_string}"
-            template_dict["stringPosition"] = f"{self.language_settings['type']}: {self.chart_type}"
+            template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
+            template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
+            template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get(self.chart_type, self.chart_type)}"
+
 
         # Set paper colors
         template_dict["paper_color_0"] = self.chart_colors_settings["paper_0"]
@@ -589,16 +626,17 @@ class KerykeionChartSVG:
             )
 
         # Draw elements percentages
-        template_dict["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,
-        )
+        total = self.fire + self.water + self.earth + self.air
+
+        fire_percentage = int(round(100 * self.fire / total))
+        earth_percentage = int(round(100 * self.earth / total))
+        air_percentage = int(round(100 * self.air / total))
+        water_percentage = int(round(100 * self.water / total))
+
+        template_dict["fire_string"] = f"{self.language_settings['fire']} {fire_percentage}%"
+        template_dict["earth_string"] = f"{self.language_settings['earth']} {earth_percentage}%"
+        template_dict["air_string"] = f"{self.language_settings['air']} {air_percentage}%"
+        template_dict["water_string"] = f"{self.language_settings['water']} {water_percentage}%"
 
         # Draw planet grid
         if self.chart_type in ["Transit", "Synastry"]:
@@ -606,6 +644,7 @@ class KerykeionChartSVG:
                 second_subject_table_name = self.language_settings["transit_name"]
             else:
                 second_subject_table_name = self.t_user.name
+
             template_dict["makePlanetGrid"] = draw_planet_grid(
                 planets_and_houses_grid_title=self.language_settings["planets_and_house"],
                 subject_name=self.user.name,
@@ -617,9 +656,14 @@ class KerykeionChartSVG:
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
             )
         else:
+            if self.chart_type == "Composite":
+                subject_name = f"{self.user.first_subject.name} {self.language_settings['and_word']} {self.user.second_subject.name}"
+            else:
+                subject_name = self.user.name
+
             template_dict["makePlanetGrid"] = draw_planet_grid(
                 planets_and_houses_grid_title=self.language_settings["planets_and_house"],
-                subject_name=self.user.name,
+                subject_name=subject_name,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
@@ -627,12 +671,18 @@ class KerykeionChartSVG:
             )
 
         # Set date time string
-        dt = datetime.fromisoformat(self.user.iso_formatted_local_datetime)
-        custom_format = dt.strftime('%Y-%m-%d %H:%M [%z]')
-        custom_format = custom_format[:-3] + ':' + custom_format[-3:]
-        template_dict["stringDateTime"] = f"{custom_format}"
+        if self.chart_type in ["Composite"]:
+            # First Subject Latitude and Longitude
+            latitude = convert_latitude_coordinate_to_string(self.user.first_subject.lat, self.language_settings["north_letter"], self.language_settings["south_letter"])
+            longitude = convert_longitude_coordinate_to_string(self.user.first_subject.lng, self.language_settings["east_letter"], self.language_settings["west_letter"])
+            template_dict["top_left_2"] = f"{latitude} {longitude}"
+        else:
+            dt = datetime.fromisoformat(self.user.iso_formatted_local_datetime)
+            custom_format = dt.strftime('%Y-%m-%d %H:%M [%z]')
+            custom_format = custom_format[:-3] + ':' + custom_format[-3:]
+            template_dict["top_left_2"] = f"{custom_format}"
 
-        return template_dict
+        return ChartTemplateDictionary(**template_dict)
 
     def makeTemplate(self, minify: bool = False) -> str:
         """Creates the template for the SVG file"""
@@ -734,6 +784,7 @@ class KerykeionChartSVG:
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
+    from kerykeion.composite_subject_factory import CompositeSubjectFactory
     setup_logging(level="debug")
 
     first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
@@ -952,3 +1003,12 @@ if __name__ == "__main__":
     kanye_west_subject = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
     kanye_west_chart = KerykeionChartSVG(kanye_west_subject)
     kanye_west_chart.makeSVG()
+
+    # Composite Chart
+    angelina = AstrologicalSubject("Angelina Jolie", 1975, 6, 4, 9, 9, "Los Angeles", "US", lng=-118.15, lat=34.03, tz_str="America/Los_Angeles")
+    brad = AstrologicalSubject("Brad Pitt", 1963, 12, 18, 6, 31, "Shawnee", "US", lng=-96.56, lat=35.20, tz_str="America/Chicago")
+
+    composite_subject_factory = CompositeSubjectFactory(angelina, brad)
+    composite_subject_model = composite_subject_factory.get_midpoint_composite_subject_model()
+    composite_chart = KerykeionChartSVG(composite_subject_model, "Composite")
+    composite_chart.makeSVG()

kerykeion/charts/templates/chart.xml

@@ -26,22 +26,31 @@ OpenAstro.org -->
             <rect class="background-rectangle" x="0" y="0" width="$chart_width"
                 height="$chart_height" style="fill: $paper_color_1" />
             <text x="20" y="22" style="fill: $paper_color_0; font-size: 24px">$stringTitle</text>
-            <text x="20" y="50" style="fill: $paper_color_0; font-size: 11px">$stringName</text>
-            <text x="20" y="62" style="fill: $paper_color_0; font-size: 11px">$stringLocation</text>
-            <text x="20" y="74" style="fill: $paper_color_0; font-size: 11px">$stringDateTime</text>
-            <text x="20" y="86" style="fill: $paper_color_0; font-size: 11px">$stringLat</text>
-            <text x="20" y="98" style="fill: $paper_color_0; font-size: 11px">$stringLon</text>
-            <text x="20" y="110" style="fill: $paper_color_0; font-size: 11px">$stringPosition</text>
-            <text x="20" y="452" style="fill: $paper_color_0; font-size: 10px">$bottomLeft0</text>
-            <text x="20" y="466" style="fill: $paper_color_0; font-size: 10px">$bottomLeft1</text>
-            <text x="20" y="480" style="fill: $paper_color_0; font-size: 10px">$bottomLeft2</text>
-            <text x="20" y="494" style="fill: $paper_color_0; font-size: 10px">$bottomLeft3</text>
-            <text x="20" y="508" style="fill: $paper_color_0; font-size: 10px">$bottomLeft4</text>
+            <text x="20" y="50" style="fill: $paper_color_0; font-size: 10px">$top_left_0</text>
+            <text x="20" y="62" style="fill: $paper_color_0; font-size: 10px">$top_left_1</text>
+            <text x="20" y="74" style="fill: $paper_color_0; font-size: 10px">$top_left_2</text>
+            <text x="20" y="86" style="fill: $paper_color_0; font-size: 10px">$top_left_3</text>
+            <text x="20" y="98" style="fill: $paper_color_0; font-size: 10px">$top_left_4</text>
+            <text x="20" y="110" style="fill: $paper_color_0; font-size: 10px">$top_left_5</text>
+            <text x="20" y="452" style="fill: $paper_color_0; font-size: 10px">$bottom_left_0</text>
+            <text x="20" y="466" style="fill: $paper_color_0; font-size: 10px">$bottom_left_1</text>
+            <text x="20" y="480" style="fill: $paper_color_0; font-size: 10px">$bottom_left_2</text>
+            <text x="20" y="494" style="fill: $paper_color_0; font-size: 10px">$bottom_left_3</text>
+            <text x="20" y="508" style="fill: $paper_color_0; font-size: 10px">$bottom_left_4</text>
         </g>
 
         <!-- Lunar Phase -->
         <g kr:node="Lunar_Phase" transform="translate(20,518)">
-            $moon_phase
+            <g transform="rotate($lunar_phase_rotate 20 10)">
+                <defs>
+                    <clipPath id="moonPhaseCutOffCircle">
+                    <circle cx="20" cy="10" r="10" />
+                    </clipPath>
+                </defs>
+                <circle cx="20" cy="10" r="10" style="fill: var(--kerykeion-chart-color-lunar-phase-0)" />
+                <circle cx="$lunar_phase_circle_center_x" cy="10" r="$lunar_phase_circle_radius" style="fill: var(--kerykeion-chart-color-lunar-phase-1)" clip-path="url(#moonPhaseCutOffCircle)" />
+                <circle cx="20" cy="10" r="10" style="fill: none; stroke: var(--kerykeion-chart-color-lunar-phase-0); stroke-width: 0.5px; stroke-opacity: 0.5" />
+            </g>
         </g>
 
         <g kr:node="Main_Content" transform="translate(50,50)">
@@ -100,7 +109,12 @@ OpenAstro.org -->
 
             <!-- Elements -->
             <g kr:node="Elements_Percentages">
-                $elements_percentages
+                <g transform="translate(-30,79)">
+                <text y="0" style="fill: var(--kerykeion-chart-color-fire-percentage); font-size: 10px;">$fire_string</text>
+                <text y="12" style="fill: var(--kerykeion-chart-color-earth-percentage); font-size: 10px;">$earth_string</text>
+                <text y="24" style="fill: var(--kerykeion-chart-color-air-percentage); font-size: 10px;">$air_string</text>
+                <text y="36" style="fill: var(--kerykeion-chart-color-water-percentage); font-size: 10px;">$water_string</text>
+                </g>"
             </g>
 
             <!-- Houses_And_Planets_Grid -->