igs-slm 0.1.5b3__py3-none-any.whl → 0.2.0b1__py3-none-any.whl

slm/management/commands/generate_sinex.py

@@ -22,7 +22,7 @@ from typing_extensions import Annotated
 
 from slm.defines import ISOCountry
 from slm.models import Network, Site, SiteAntenna, SiteReceiver
-from slm.utils import dddmmss_ss_parts, transliterate, xyz2llh
+from slm.utils import dddmmss_ss_parts, lon_180_to_360, transliterate, xyz2llh
 
 DEFAULT_ANTEX = "https://files.igs.org/pub/station/general/igs20.atx.gz"
 
@@ -275,15 +275,13 @@ class Command(TyperCommand):
                 continue
 
             # is sinex longitude 0-360 or -180 to 180?
-            lon_deg, lon_min, lon_sec = dddmmss_ss_parts(
-                llh[1] if llh[1] > 0 else llh[1] + 360
-            )
+            lon_deg, lon_min, lon_sec = dddmmss_ss_parts(lon_180_to_360(llh[1]))
 
             yield (
                 f" {site.four_id.lower()}  A "
                 f"{site.iers_domes_number:>9} P "
-                f"{location:<21}  {lon_deg:3d} {lon_min:2d} "
-                f"{lon_sec:>4.1f} {lat_deg:3d} {lat_min:2d} "
+                f"{location:<21}  {lon_deg:3.0f} {lon_min:2d} "
+                f"{lon_sec:>4.1f} {lat_deg:3.0f} {lat_min:2d} "
                 f"{lat_sec:>4.1f} {llh[2]:>7.1f}"
             )
         yield "-SITE/ID"
@@ -334,7 +332,11 @@ class Command(TyperCommand):
                     f"{antenna.antenna_type.model:<15.15} "
                     f"{antenna.radome_type.model:4.4} "
                     f"{antenna.serial_number:<5.5} "
-                    f"{antenna.alignment if antenna.alignment else 0.0:>4.0f}"
+                    + (
+                        f"{antenna.alignment:>4.0f}"
+                        if antenna.alignment is not None
+                        else " " * 4
+                    )
                 )
                 # todo: add antenna offset defaulting to zero if its unknown?
                 #  seems wrong

slm/migrations/0001_alter_archivedsitelog_size_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.2.23 on 2025-09-03 23:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("slm", "simplify_daily_index_files"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="archivedsitelog",
+            name="size",
+            field=models.PositiveIntegerField(
+                blank=True, db_index=True, default=None, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="geodesymlinvalid",
+            name="size",
+            field=models.PositiveIntegerField(
+                blank=True, db_index=True, default=None, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="sitefileupload",
+            name="size",
+            field=models.PositiveIntegerField(
+                blank=True, db_index=True, default=None, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="sitemoreinformation",
+            name="more_info",
+            field=models.URLField(
+                blank=True,
+                db_index=True,
+                default="",
+                max_length=8000,
+                verbose_name="URL for More Information",
+            ),
+        ),
+    ]

slm/migrations/0032_archiveindex_valid_range_and_more.py

@@ -1,5 +1,7 @@
 # Generated by Django 4.2.20 on 2025-05-08 19:52
 
+from datetime import timedelta
+
 import django.contrib.postgres.constraints
 import django.contrib.postgres.fields.ranges
 from django.contrib.postgres.fields.ranges import DateTimeTZRange
@@ -10,8 +12,13 @@ def populate_valid_range(apps, schema_editor):
     ArchiveIndex = apps.get_model("slm", "ArchiveIndex")
 
     for row in ArchiveIndex.objects.all():
+        begin = row.begin
+        end = row.end
+        if begin == end:
+            # add a little salt
+            end = end + timedelta(seconds=1)
         ArchiveIndex.objects.filter(pk=row.pk).update(
-            valid_range=DateTimeTZRange(row.begin, row.end)
+            valid_range=DateTimeTZRange(begin, end)
         )
 
 

slm/migrations/simplify_daily_index_files.py

@@ -0,0 +1,86 @@
+"""
+If multiple index files exist for a given station on a given day we remove the timestamp
+from the name of the latest daily file and add the timestamp to the earliest daily file.
+"""
+
+from datetime import datetime, time, timedelta, timezone
+from pathlib import Path
+
+from django.db import migrations
+from django.db.models import Count, Value
+from django.db.models.functions import Length, Replace
+
+
+def simplify_index(apps, schema_editor):
+    ArchivedSiteLog = apps.get_model("slm", "ArchivedSiteLog")
+    ArchiveIndex = apps.get_model("slm", "ArchiveIndex")
+
+    multi_day_indexes = ArchiveIndex.objects.filter(
+        files__in=ArchivedSiteLog.objects.annotate(
+            ucount=Length("file") - Length(Replace("file", Value("_"), Value("")))
+        ).filter(ucount__gte=2)
+    ).distinct()
+
+    multi_day_tuples = list(
+        multi_day_indexes.extra(select={"range_date": "DATE(lower(valid_range))"})
+        .values("site__name", "range_date")
+        .annotate(count=Count("id"))
+        .filter(count__gt=1)
+        .values_list("site__name", "range_date", flat=False)
+    )
+
+    for station, day in multi_day_tuples:
+        lower = datetime.combine(day, time.min, tzinfo=timezone.utc)
+        upper = lower + timedelta(days=1)
+        indexes = ArchiveIndex.objects.filter(
+            site__name=station,
+            valid_range__startswith__gte=lower,
+            valid_range__startswith__lte=upper,
+        ).order_by("valid_range")
+        assert indexes.count() >= 2
+        first = indexes.first()
+        last = indexes.last()
+
+        for file in first.files.all():
+            current_path = Path(file.file.path)
+            new_path = Path(file.file.path)
+            if current_path.stem.count("_") < 2:
+                new_path = current_path.with_name(
+                    f"{current_path.stem}_{first.valid_range.lower.strftime('%H%M%S')}{current_path.suffix}"
+                )
+                file.file.name = file.file.name.replace(
+                    current_path.name, new_path.name
+                )
+                file.name = Path(file.file.name).name
+                current_path.rename(new_path)
+                file.save(update_fields=["file", "name"])
+                print(f"Updated {current_path.name} -> {new_path.name}")
+
+        for file in last.files.all():
+            current_path = Path(file.file.path)
+            new_path = Path(file.file.path)
+            if current_path.stem.count("_") >= 2:
+                new_path = current_path.with_name(
+                    "_".join(current_path.stem.split("_")[:-1]) + current_path.suffix
+                )
+                file.file.name = file.file.name.replace(
+                    current_path.name, new_path.name
+                )
+                file.name = Path(file.file.name).name
+                current_path.rename(new_path)
+                file.save(update_fields=["file", "name"])
+                print(f"Updated {current_path.name} -> {new_path.name}")
+
+
+def noop(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("slm", "0005_slmversion"),
+    ]
+
+    operations = [
+        migrations.RunPython(simplify_index, reverse_code=noop, atomic=True),
+    ]

slm/models/index.py

@@ -2,6 +2,7 @@ import os
 import typing as t
 from datetime import datetime
 
+from django.conf import settings
 from django.contrib.postgres.constraints import ExclusionConstraint
 from django.contrib.postgres.fields import DateTimeRangeField
 from django.contrib.postgres.fields.ranges import DateTimeTZRange, RangeOperators
@@ -9,15 +10,19 @@ from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
 from django.db import models, transaction
 from django.db.models import (
+    Case,
     CharField,
     DateTimeField,
     Deferrable,
     F,
     Func,
+    IntegerField,
     OuterRef,
     Q,
     Subquery,
     Value,
+    When,
+    Window,
 )
 from django.db.models.functions import (
     Cast,
@@ -28,7 +33,9 @@ from django.db.models.functions import (
     Lower,
     LPad,
     Now,
+    RowNumber,
     Substr,
+    TruncDate,
 )
 from django.urls import reverse
 from django.utils.functional import cached_property
@@ -274,7 +281,7 @@ class ArchiveIndexQuerySet(models.QuerySet):
         name_len: t.Optional[int] = None,
         field_name: str = "filename",
         lower_case: bool = False,
-        log_format: bool = None,
+        log_format: SiteLogFormat = None,
     ):
         """
         Add the log names (w/o) extension as a property called filename to
@@ -308,7 +315,7 @@ class ArchiveIndexQuerySet(models.QuerySet):
             LPad(Cast(ExtractDay(begin), models.CharField()), 2, fill_text=Value("0")),
         ]
         if log_format:
-            parts.append(Value(f".{log_format.ext}"))
+            parts.append(Value(f".{log_format.suffix}"))
 
         return self.annotate(**{field_name: Concat(*parts, output_field=CharField())})
 
@@ -455,7 +462,7 @@ class ArchivedSiteLogQuerySet(models.QuerySet):
         name_len: t.Optional[int] = None,
         field_name: str = "filename",
         lower_case: bool = False,
-        log_format: t.Optional[SiteLogFormat] = None,
+        include_ext: bool = True,
     ):
         """
         Add the log names (w/o) extension as a property called filename to
@@ -465,7 +472,7 @@ class ArchivedSiteLogQuerySet(models.QuerySet):
             the first name_len characters of the site name.
         :param field_name: Change the name of the annotated field.
         :param lower_case: Filenames will be lowercase if true.
-        :param log_format: If given, add the extension for the given format
+        :param include_ext: If true (default), include the extension for the log file type.
         :return: A queryset with the filename annotation added.
         """
         name_str = F("site__name")
@@ -496,10 +503,70 @@ class ArchivedSiteLogQuerySet(models.QuerySet):
                 fill_text=Value("0"),
             ),
         ]
-        if log_format:
-            parts.append(Value(f".{log_format.ext}"))
+        if include_ext:
+            parts.append(
+                Case(
+                    *[
+                        When(log_format=key, then=Value(f".{ext}"))
+                        for key, ext in getattr(
+                            settings,
+                            "SLM_FORMAT_EXTENSIONS",
+                            {fmt: fmt.ext for fmt in SiteLogFormat},
+                        ).items()
+                    ],
+                    default=Value(""),
+                    output_field=CharField(),
+                ),
+            )
         return self.annotate(**{field_name: Concat(*parts)})
 
+    def best_format(self):
+        """
+        This query fetches a linear history of site logs, but only picks the most appropriate
+        format from the index for each point in time. By default the most appropriate format
+        is the rank ordering defined in :class:`slm.defines.SiteLogFormat` unless otherwise
+        specified in the :setting:`SLM_FORMAT_PRIORITY` mapping.
+        """
+        if priorities := getattr(settings, "SLM_FORMAT_PRIORITY"):
+            return self.annotate(
+                log_format_order=Case(
+                    *[When(log_format=k, then=v) for k, v in priorities.items()],
+                    default=999,
+                    output_field=IntegerField(),
+                ),
+                best_fmt=Window(
+                    expression=RowNumber(),
+                    partition_by=[
+                        F("index__site"),
+                        TruncDate("timestamp"),
+                    ],
+                    order_by=[
+                        F("timestamp").desc(),
+                        F("log_format_order").asc(),  # use mapped priority
+                    ],
+                ),
+            ).filter(best_fmt=1)
+        else:
+            return self.annotate(
+                best_fmt=Window(
+                    expression=RowNumber(),
+                    partition_by=[
+                        F("index__site"),
+                        TruncDate("timestamp"),
+                    ],
+                    order_by=[
+                        F("timestamp").desc(),
+                        F("log_format").desc(),
+                    ],  # higher format wins
+                ),
+            ).filter(best_fmt=1)
+
+    def most_recent(self):
+        return self.filter(index__valid_range__upper_inf=True)
+
+    def non_current(self):
+        return self.filter(index__valid_range__upper_inf=False)
+
 
 class ArchivedSiteLog(SiteFile):
     SUB_DIRECTORY = "archive"

slm/models/sitelog.py

@@ -45,6 +45,7 @@ from slm.defines import (
     AntennaReferencePoint,
     Aspiration,
     CollocationStatus,
+    CoordinateMode,
     FractureSpacing,
     FrequencyStandardType,
     ISOCountry,
@@ -2255,6 +2256,10 @@ class SiteLocation(SiteSection):
 
     objects = SiteLocationManager.from_queryset(SiteLocationQueryset)()
 
+    coordinate_mode = getattr(
+        settings, "SLM_COORDINATE_MODE", CoordinateMode.INDEPENDENT
+    )
+
     @classmethod
     def structure(cls):
         return [
@@ -4219,6 +4224,7 @@ class SiteMoreInformation(SiteSection):
         blank=True,
         verbose_name=_("URL for More Information"),
         db_index=True,
+        max_length=8000,
     )
 
     sitemap = models.CharField(

slm/models/system.py

@@ -40,6 +40,11 @@ def site_upload_path(instance: "SiteFile", filename: str) -> str:
     file will be saved to:
         MEDIA_ROOT/uploads/<site name>/filename
 
+    If there is a name collision with a file on disk, the _HHMMSS from the file's
+    timestamp will be added onto the name. If the collision is with an ArchivedSiteLog
+    the file already on disk will have its name changed to include the timestamp. This
+    keeps the most recently indexed file for each day having just the date timestamp.
+
     :param filename: The name of the file
     :return: The path where the site file should reside.
     """
@@ -56,7 +61,29 @@ def site_upload_path(instance: "SiteFile", filename: str) -> str:
     )
     if (Path(settings.MEDIA_ROOT) / dest).exists():
         stem, suffix = dest.stem, dest.suffix
-        dest = dest.with_name(f"{stem}_{timestamp.strftime('%H%M%S')}{suffix}")
+        if isinstance(instance, ArchivedSiteLog):
+            # TODO - there is potential here for the database to be out of sync with the filesytem if the outer
+            # transaction fails
+            try:
+                for archive in ArchivedSiteLog.objects.filter(
+                    file__endswith=str(dest.as_posix())
+                ):
+                    current_path = Path(archive.file.path)
+                    new_path = Path(archive.file.path)
+                    if current_path.stem.count("_") < 2:
+                        new_path = current_path.with_name(
+                            f"{current_path.stem}_{archive.index.valid_range.lower.strftime('%H%M%S')}{current_path.suffix}"
+                        )
+                        archive.file.name = archive.file.name.replace(
+                            current_path.name, new_path.name
+                        )
+                        archive.name = Path(archive.file.name).name
+                        current_path.rename(new_path)
+                        archive.save(update_fields=["file", "name"])
+            except ArchivedSiteLog.DoesNotExist:
+                (Path(settings.MEDIA_ROOT) / dest).unlink()
+        else:
+            dest = dest.with_name(f"{stem}_{timestamp.strftime('%H%M%S')}{suffix}")
     return dest.as_posix()
 
 
@@ -212,7 +239,9 @@ class SiteFile(models.Model):
         unique=True,
     )
 
-    size = models.PositiveIntegerField(null=True, default=None, blank=True)
+    size = models.PositiveIntegerField(
+        null=True, default=None, blank=True, db_index=True
+    )
 
     thumbnail = models.ImageField(
         upload_to=site_thumbnail_path,
@@ -254,6 +283,10 @@ class SiteFile(models.Model):
         help_text=_("The Geodesy ML version. (Only if file_type is GeodesyML)"),
     )
 
+    @property
+    def on_disk(self) -> Path:
+        return Path(self.file.path)
+
     def update_directory(self):
         for file in [self.file, self.thumbnail]:
             if not file or not file.path:

slm/parsing/__init__.py

@@ -788,6 +788,16 @@ def to_str(value):
     return value
 
 
+def concat_str(value):
+    """
+    For multi-line inputs, concatenate the lines, stripping white space at each line
+    break. This is necessary for things like multi-line urls.
+    """
+    if value is None:
+        return ""
+    return "".join([ln.strip() for ln in value.splitlines()])
+
+
 class BaseBinder:
     parsed: BaseParser = None
 

slm/parsing/legacy/binding.py

@@ -21,6 +21,7 @@ from slm.parsing import (
     Finding,
     _Ignored,
     _Warning,
+    concat_str,
     remove_from_start,
     to_alignment,
     to_antenna,
@@ -116,7 +117,7 @@ def to_temp_stab(value):
             value.lower().replace(" ", "").replace("(", "").replace(")", "")
             == "degc+/-degc"
         ):
-            return _Ignored, _Ignored, _Ignored
+            return _Ignored("Looks like a placeholder."), None, None
 
         if "yes" in value.lower() or "indoors" in value.lower():
             return _Warning(value=True, msg="Interpreted as 'stabilized'"), None, None
@@ -638,7 +639,7 @@ class SiteLogBinder(BaseBinder):
             for log_name, bindings in [
                 ("Primary Data Center", ("primary", to_str)),
                 ("Secondary Data Center", ("secondary", to_str)),
-                ("URL for More Information", ("more_info", to_str)),
+                ("URL for More Information", ("more_info", concat_str)),
                 ("Site Map", ("sitemap", to_str)),
                 ("Site Diagram", ("site_diagram", to_str)),
                 ("Horizon Mask", ("horizon_mask", to_str)),

slm/receivers/cache.py

@@ -0,0 +1,25 @@
+from django.core.cache import cache
+from django.dispatch import receiver
+
+from slm import signals as slm_signals
+from slm.defines import SiteFileUploadStatus
+
+
+@receiver(slm_signals.site_published)
+@receiver(slm_signals.site_file_published)
+@receiver(slm_signals.site_file_unpublished)
+def clear_default_cache(**_):
+    """
+    When events happen that change the public data of the SLM we clear our default cache.
+    """
+    cache.clear()
+
+
+@receiver(slm_signals.site_file_deleted)
+def clear_cache_if_published_file_deleted(sender, **kwargs):
+    """
+    If a site file attachment is deleted, only clear the caches if that file was published.
+    """
+    if file := kwargs.pop("upload", None):
+        if file.status is SiteFileUploadStatus.PUBLISHED:
+            cache.clear()

slm/settings/root.py

@@ -19,6 +19,7 @@ from split_settings.tools import include, optional
 from slm.settings import env as settings_environment
 from slm.settings import (
     get_setting,
+    resource,
     set_default,
     slm_path_mk_dirs_must_exist,
     slm_path_must_exist,
@@ -60,9 +61,23 @@ SLM_IGS_VALIDATION = env(
 )
 
 SLM_ADMIN_MAP = env("SLM_ADMIN_MAP", bool, default=get_setting("SLM_ADMIN_MAP", True))
+SLM_FILE_VIEWS = env(
+    "SLM_FILE_VIEWS", bool, default=get_setting("SLM_FILE_VIEWS", True)
+)
 SLM_SITE_NAME = env("SLM_SITE_NAME", str, default=get_setting("SLM_SITE_NAME", ""))
 SLM_ORG_NAME = env("SLM_ORG_NAME", str, default=get_setting("SLM_ORG_NAME", "SLM"))
 
+SLM_FILE_VIEW_FORMATS = env(
+    "SLM_FILE_VIEW_FORMATS",
+    list,
+    default=get_setting("SLM_FILE_VIEW_FORMATS", ["ASCII_9CHAR"]),
+)
+SLM_FILE_VIEW_FORMATS = env(
+    "SLM_FILE_VIEW_FORMATS",
+    list,
+    default=get_setting("SLM_FILE_VIEW_FORMATS", ["ASCII_9CHAR"]),
+)
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/stable/howto/deployment/checklist/
 
@@ -111,6 +126,8 @@ INSTALLED_APPS = set_default(
 
 if SLM_ADMIN_MAP:
     INSTALLED_APPS.insert(0, "slm.map")
+if SLM_FILE_VIEWS:
+    INSTALLED_APPS.insert(0, "slm.file_views")
 
 
 SLM_DATABASE = env(
@@ -244,3 +261,8 @@ set_default(
 WSGI_APPLICATION = env(
     "WSGI_APPLICATION", default=get_setting("WSGI_APPLICATION", "slm.wsgi.application")
 )
+
+if SLM_ADMIN_MAP or "slm.map" in INSTALLED_APPS:
+    include(resource("slm.map", "settings.py"))
+if SLM_FILE_VIEWS or "slm.file_views" in INSTALLED_APPS:
+    include(resource("slm.file_views", "settings.py"))

slm/settings/routines.py

@@ -27,8 +27,10 @@ routine(
 )
 
 command("deploy", "check", "--deploy")
+command("deploy", "check_upgrade", "is-safe")
 command("deploy", "shellcompletion", "install", switches=["initial"])
 command("deploy", "migrate", priority=11)
+command("deploy", "check_upgrade", "set-db-version")
 command("deploy", "renderstatic", priority=20)
 command("deploy", "collectstatic", "--no-input", priority=21)
 if get_setting("COMPRESS_OFFLINE", False) and get_setting("COMPRESS_ENABLED", False):

slm/settings/slm.py

@@ -6,8 +6,10 @@ from django.utils.translation import gettext_lazy as _
 
 from slm.defines import (
     AlertLevel,
+    CoordinateMode,
     GeodesyMLVersion,
     SiteFileUploadStatus,
+    SiteLogFormat,
     SiteLogStatus,
 )
 from slm.settings import env as settings_environment
@@ -201,3 +203,59 @@ if SLM_IGS_STATION_NAMING:
 else:
     set_default("SLM_STATION_NAME_REGEX", None)
     set_default("SLM_STATION_NAME_HELP", _("The name of the station."))
+
+
+# these settings control site log format precedence and naming
+SLM_FORMAT_PRIORITY = {
+    SiteLogFormat(fmt): int(priority)
+    for fmt, priority in env(
+        "SLM_FORMAT_PRIORITY", dict, default=get_setting("SLM_FORMAT_PRIORITY", {})
+    )
+}
+
+priorities = SLM_FORMAT_PRIORITY or {fmt: fmt.value for fmt in SiteLogFormat}
+
+SLM_DEFAULT_FORMAT = SiteLogFormat(
+    env(
+        "SLM_DEFAULT_FORMAT",
+        str,
+        max(priorities, key=priorities.get),
+    )
+)
+
+SLM_FORMAT_EXTENSIONS = {
+    **{fmt: fmt.ext for fmt in SiteLogFormat},
+    **{
+        SiteLogFormat(fmt): ext
+        for fmt, ext in env(
+            "SLM_FORMAT_EXTENSIONS",
+            dict,
+            default=get_setting(
+                "SLM_FORMAT_EXTENSIONS", {fmt: fmt.ext for fmt in SiteLogFormat}
+            ),
+        ).items()
+    },
+}
+
+# when logs are published, the following formats will be rendered to the site log index
+SLM_ENABLED_FORMATS = [
+    SiteLogFormat(fmt)
+    for fmt in env(
+        "SLM_ENABLED_FORMATS",
+        list,
+        default=get_setting(
+            "SLM_ENABLED_FORMATS", [SiteLogFormat.ASCII_9CHAR, SiteLogFormat.GEODESY_ML]
+        ),
+    )
+]
+
+if SLM_DEFAULT_FORMAT not in SLM_ENABLED_FORMATS:
+    SLM_ENABLED_FORMATS.insert(0, SLM_DEFAULT_FORMAT)
+
+
+SLM_COORDINATE_MODE = CoordinateMode(
+    env(
+        "SLM_COORDINATE_MODE",
+        default=get_setting("SLM_COORDINATE_MODE", CoordinateMode.INDEPENDENT),
+    )
+)

slm/settings/urls.py

@@ -92,7 +92,7 @@ def bring_in_urls(urlpatterns):
             urlpatterns.insert(0, path("", include(url_module_str)))
 
         except ImportError:
-            if app in {"slm", "slm.map", "network_map", "igs_ext"}:
+            if app in {"slm", "slm.map", "slm.file_views", "network_map", "igs_ext"}:
                 raise
             pass
 

slm/settings/validation.py

@@ -18,6 +18,7 @@ from slm.validators import (
     EnumValidator,
     FieldRequired,
     NonEmptyValidator,
+    PositionsMatchValidator,
     TimeRangeBookendValidator,
     TimeRangeValidator,
     VerifiedEquipmentValidator,
@@ -48,7 +49,7 @@ set_default(
         # 'sitemultipathsources',
         # 'sitesignalobstructions',
         # 'sitelocalepisodiceffects',
-        "siteoperationalcontact",
+        # "siteoperationalcontact",
         # 'siteresponsibleagency',
         # 'sitemoreinformation'
     ],
@@ -68,8 +69,8 @@ set_default(
             "city": [FieldRequired()],
             "country": [FieldRequired(), EnumValidator()],
             "tectonic": [EnumValidator()],
-            "xyz": [FieldRequired()],
-            "llh": [FieldRequired()],
+            "xyz": [FieldRequired(), PositionsMatchValidator()],
+            "llh": [FieldRequired(), PositionsMatchValidator()],
         },
         "slm.SiteReceiver": {
             "receiver_type": [VerifiedEquipmentValidator(), ActiveEquipmentValidator()],
@@ -93,7 +94,7 @@ set_default(
                 TimeRangeBookendValidator(),
             ],
             "marker_une": [FieldRequired(allow_legacy_nulls=True)],
-            "alignment": [FieldRequired(allow_legacy_nulls=True)],
+            "alignment": [FieldRequired(allow_legacy_nulls=True, desired=True)],
         },
         "slm.SiteSurveyedLocalTies": {
             "name": [FieldRequired()],