Skip to content

Activate dated planetary administration data - #561

Open
VicenteCartas wants to merge 3 commits into
MegaMek:mainfrom
VicenteCartas:vc/map-inmersive
Open

Activate dated planetary administration data#561
VicenteCartas wants to merge 3 commits into
MegaMek:mainfrom
VicenteCartas:vc/map-inmersive

Conversation

@VicenteCartas

@VicenteCartas VicenteCartas commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

What this changes

Activates 8,692 existing dated administration blocks across 2,838 planetary-system files so consumers can load regional and district membership for administrative boundaries and system dossiers.

The same mechanical pass comments out 31 capitalType: District Capital entries that conflict with the recorded hierarchy. No administration values or dates are rewritten: a whole-diff audit found 26,016 removed lines, 26,016 added lines, and zero pairs differing by anything other than their YAML comment marker.

Focused owner review: 31 District Capital corrections

All 31 records are dated 2596-12-31. Each link points to the exact commented record in the PR head commit:

Also makes the existing data/fonts Checkstyle suppression separator-neutral so the repository's checks work on Windows as well as Unix-like systems.

Source

This promotes administration relationships that were already recorded in the planetary-system YAML as dormant comments; it does not add newly inferred memberships. Existing source annotations in those records remain the provenance for the data.

The 31 disabled District Capital entries are corrections made alongside the hierarchy activation. They should receive focused project-owner review because this change does not introduce a new book/page citation for each correction.

How this was checked

  • ./gradlew check passed on Java 21 after the path-suppression correction. The project has no unit-test sources; both Checkstyle tasks passed.
  • MekHQ's composite validateSystems loaded the unchanged data set: 4,424 systems/files and 32,756 planets, with 0 errors and 105 existing warnings.
  • The complete diff was audited programmatically: 8,692 administration blocks activated, 31 District Capital records disabled, and no rewritten values or dates.
  • git diff --check upstream/main...HEAD passed.
  • The administration hierarchy was exercised in MekHQ's interstellar map and system dossier during development.

What is not proven yet

This is not a fresh source-book audit of every dated membership. Unknown or missing memberships remain missing; no capitalOf relationships or undocumented regions were inferred. The separate MekHQ consumer/model changes and their merge order are outside this PR. Current upstream consumer compatibility has not been independently established beyond the composite validation described above.


  • The source is cited above, or this is not a canon change
  • The changed entries were loaded in the program and look right
  • Every file in the diff has a deliberate change (no stray reformatting of untouched entries)
  • Dev team only: if AI tools were used, the AI Assisted Development label is applied, and I can explain and have verified the result

@VicenteCartas VicenteCartas added the AI Assisted Development This project/code contains AI use under the supervision of a human developer. With Human testing. label Sep 11, 2026

@IllianiBird IllianiBird left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, there's a bit of a formatting issue throughout this PR

Comment thread data/universe/planetary_systems/canon_systems/Abadan.yml

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

The change set is a very large, mechanically applied activation across thousands of YAML records and should receive final human review despite passing described validations.

Pull request overview

Activates previously recorded (but commented-out) dated administration blocks in canonical planetary-system YAML so downstream consumers can load administrative memberships (regions/districts) as part of system dossiers and related features.

Changes:

  • Uncomments dated administration: blocks in planetary-system YAML history entries (no value/date rewrites; comment-marker-only activation).
  • Comments out a small set of conflicting capitalType: District Capital entries (per PR description: 31) where they contradict recorded hierarchy.
  • Adjusts Checkstyle suppression matching to be path-separator-neutral for data/fonts (per PR description) to support Windows check runs.
File summaries
File Description
data/universe/planetary_systems/canon_systems/Zumbo.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Zinal.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Zetang.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Zertarum.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/ZelskiIi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Zefri.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Zanbasa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Zalt.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/YpeJhu.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ylemelke.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Yidtall.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Woogi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Wokha.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Wismar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Wingzar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Windhoek.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Wilkes.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Weistheimer.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Waypoint.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Washburn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Waitur.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/WainiPoint.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vortalcoy.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vonja.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Voehn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vixen.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Visby.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Viroflay.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vinstra.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Viluisk.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Varri.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vargtass.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vannes.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vangburg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Valladolid.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Vakarel.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Umka.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ulubis.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ugland.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ubangi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Trinidad.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tresspass.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Trasjkis.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Totness.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Toten.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Torgvei.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tordenskjold.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tongatapu.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tomalov.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tirabad.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tintavel.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Thraxa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Thorn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/ThirtyWeight.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Thazi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Taurus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Taumaturgo.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/TaransWorld.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Tanz.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Syrstart.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Synsstad.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Svalstad.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Styriania.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Stralsund.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/StGall.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/StettinHl.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Spitz.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Spirit.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sparta.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sorsk.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sornath.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Solor.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Snowdon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Slewis.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Skiland.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Simone.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sileste.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sigurd.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sidon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sialkot.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Shiri.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Shira.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Shipton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Shalaine.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Serenity.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sentarus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sebha.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Schrim.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Schmitt.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sarkel.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/SantaAna.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/SanNicolas.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/SanCarlos.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Salvende.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Salisberg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Sackville.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Rypful.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Rudolpho.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Rosetta.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Rondon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Romita.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Rockwellawan.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Riga.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Reykavis.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Renorsal.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Reinbak.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ramora.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Raldamax.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ragusa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Raetia.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Quines.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Quelimane.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Qalzi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Puttalam.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Pressville.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Portland.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Pilon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Payvand.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Pavia.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/PaulusPrime.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Pasemah.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Parvan.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Paran.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Paradise.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Palm.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Paf.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ourem.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Otisberg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Osset.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/OberonVi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Nyasa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Novgorod.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Northsun.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Norfolk.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Nito.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/NewOlympia.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/NewAlborg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Nerum.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Naco.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Monthey.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mondra.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mohacs.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Modesto.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mizt.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mithron.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mirfak.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mindrel.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Midkiff.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mickleover.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Michtal.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Merton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Melville.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Melilla.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Megiddo.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Meghy.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mearra.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mayenne.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Masterton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mas.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Maripa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mao.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/MansuRi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Manihiki.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mangor.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mandeville.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Malaga.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Malacca.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Maderas.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Mackenzie.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lynn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Luxen.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Luxani.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Luderitz.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lubeck.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Loyalty.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lothario.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lorkdal.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lokoja.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ling.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Linden.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lengkong.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Leh.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Laureles.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/LasTunas.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/LastChance.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Landfall.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lande.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Lahti.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Labouchere.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Koury.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Koningsberg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/KolnHl.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kola.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kogl.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Klenkar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kleinwelt.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kirkenlaard.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Keystone.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kern.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kent.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Keeling.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Katinka.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Karakiraz.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kampen.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/KalmarHl.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Kaldu.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Joshua.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Johnson.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Jardangal.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Japminboddu.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/JansensHold.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Izmir.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Itzehoe.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Isabela.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/IronLand.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ionus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/InnerSurge.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ingvolstand.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Illium.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ildlandet.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ideyld.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ictus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ichmandu.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Huntington.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Hrafn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Howrah.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Hirtshals.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Hiberius.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Herrmaz.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Herbania.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Helvetica.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Helland.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Heliat.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Helduza.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Heidelburg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Heathville.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Hazeldean.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Hawktor.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Harmony.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Harlez.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Hamburg.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Halla.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Halgrim.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Haggard.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gwynedd.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gustrell.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Guldra.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Grossbach.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Grobin.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Greifswald.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Grankum.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Granera.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/GothKhakar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Goslar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gorgon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gorfynt.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gomeisa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Glitnir.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Givrodat.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gitarama.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Girondas.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gingeria.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ghaziabad.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gettorf.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gateway.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gangtok.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gambilon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gaeri.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Gabenstad.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Fredotto.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Flynn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Flychenia.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Flaum.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Flatspin.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Finse.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Finmark.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Findal.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Feijo.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/FarReach.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Farcry.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Famdo.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/FalseDawn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Fallry.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/FallenStars.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Euschelus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Erewhon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Elissa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/ElbingHl.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ejeda.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Eion.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Eigerland.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/EagleRest.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Durabon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dunianshire.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dreadlord.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dralkig.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dortmund.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dorpat.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dormandaine.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dirkel.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dichell.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dicallus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Derby.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Delagoa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ddraig.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Danzig.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Dante.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Danli.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Custozza.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Culmia.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cryfder.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Crichton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cresson.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Crellacor.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cree.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cranston.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Coyle.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Coromodir.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Coriscana.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Coraines.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Coopertown.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Conwy.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Circinus.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cilvituk.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Choex.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Chita.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Chagos.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ceuta.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cerignola.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ceram.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Centavido.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ceiba.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ceara.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cayuga.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Carthage.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Camadeierre.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Calingasta.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Caldarium.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cajamarca.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Caillinius.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Cadela.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/ByesShip.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/ButteHold.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Burton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Bruges.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/BremenRwr.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/BremenHl.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Braunschweig.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Brasha.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Boulsi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Bougie.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/BotanyBay.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Booker.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Boara.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Blueys.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Blackstone.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Bergen.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Beowulf.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/BellOa.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Beauvais.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Battaraigi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Barahona.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Bannerhoft.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Baltar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/BalladIi.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Azur.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Awyron.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Avior.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/August.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ashburton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Artru.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Armstrong.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Arlanda.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Argos.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Apsalar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Antwerp.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Anklan.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Angra.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ammon.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Ambrose.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Amber.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Alterf.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Alta.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/AllDawn.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Alegro.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Aitutaki.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Aea.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Addasar.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Achton.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Achnoly.yml Activate dated administration entry
data/universe/planetary_systems/canon_systems/Aalzorg.yml Activate dated administration entry
Review details
  • Files reviewed: 300/2839 changed files
  • Comments generated: 0
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@HammerGS

Copy link
Copy Markdown
Member

Reviewed this alongside MegaMek/mekhq#10018. The diff audit holds up: I re-ran it independently and every changed line is a comment marker moving, with no value or date rewritten. Three things worth recording.

1. Merge order is the other way round from what mekhq#10018 says

More than half of this data is inert until the MekHQ side lands.

Planet.PlanetPostLoader on main today does planet.events.put(date, event). Two events on the same planet with the same date means the later one replaces the earlier one outright. Many administration blocks here sit in their own event that shares a date with a faction event, so under put they are read and then discarded.

I counted it across this branch: 4,864 of the 8,692 activated administration blocks share a date with a later event on the same planet. Those 4,864 load as nothing until mekhq#10018 changes put to merge.

Measured on the real files with the loader, once with each version of that line:

Addicks @3025-01-01   put:   admin=[Lockdale Province]
                      merge: admin=[Draconis March, Robinson Operational Area, Region 1]

So this PR can merge first safely, it just will not do very much on its own. mekhq#10018 says it "should merge after that data PR", which reads as though the data is the blocker. It is the reverse for 56% of the records. Worth stating the dependency explicitly in both bodies so nobody is surprised by a half-populated map.

2. 124 worlds record a province but no theatre next to a neighbour that records both

Not a defect in this PR, but it will show up as one on the map, so flagging it here as well.

At 3067, using the data on this branch:

Skye           administration: [Skye Province]
Zebebelgenubi  administration: [Skye Province, Freedom Theater]

Those two are 6.1 ly apart. The map groups worlds into 30 ly cells and treats any difference in the path as a disagreement, so the cell holding Skye loses its administrative classification and drops out of the Skye Province outline. I count 124 such same-faction, same-region pairs within 30 ly at 3067, 17 at 3145, 14 at 2765, 7 at 3025.

Two ways to close it, and they are not exclusive. The code side is a prefix rule, which I have raised on mekhq#10018. The data side is filling in the missing second element where it is known. If the intent is that some worlds genuinely sit in a province with no theatre, the code fix is the right one on its own.

3. The 31 District Capital removals

These are the only entries in the diff that change something already visible. I checked whether any of them were previously being dropped on load by the same-date problem in item 1, which would have meant the "conflict" only became observable with the MekHQ change. None of them were: all 31 are live in the current build, all dated 2596-12-31, so they really are correcting something a player can see today.

That makes them the part that needs the source citation. The first checkbox in the template is still unticked. Project convention is that all of them get ticked before opening, with a reason on the line when one does not apply, so this one probably wants either a citation or an explicit "corrections listed above, reviewed by owner" note.

Checked and clean

  • Whole-diff audit reproduced independently: 26,016 added lines, 26,016 removed, and zero pairs differing by anything other than the comment marker.
  • administration is the only key that becomes live anywhere in the diff. Nothing else is uncommented, so no capitalOf relationship or new region is introduced.
  • The data/fonts Checkstyle suppression change is separator-neutral and does what it says on Windows.

@VicenteCartas

Copy link
Copy Markdown
Contributor Author

Reviewed this alongside MegaMek/mekhq#10018. The diff audit holds up: I re-ran it independently and every changed line is a comment marker moving, with no value or date rewritten. Three things worth recording.

1. Merge order is the other way round from what mekhq#10018 says

More than half of this data is inert until the MekHQ side lands.

Planet.PlanetPostLoader on main today does planet.events.put(date, event). Two events on the same planet with the same date means the later one replaces the earlier one outright. Many administration blocks here sit in their own event that shares a date with a faction event, so under put they are read and then discarded.

I counted it across this branch: 4,864 of the 8,692 activated administration blocks share a date with a later event on the same planet. Those 4,864 load as nothing until mekhq#10018 changes put to merge.

Measured on the real files with the loader, once with each version of that line:

Addicks @3025-01-01   put:   admin=[Lockdale Province]
                      merge: admin=[Draconis March, Robinson Operational Area, Region 1]

So this PR can merge first safely, it just will not do very much on its own. mekhq#10018 says it "should merge after that data PR", which reads as though the data is the blocker. It is the reverse for 56% of the records. Worth stating the dependency explicitly in both bodies so nobody is surprised by a half-populated map.

2. 124 worlds record a province but no theatre next to a neighbour that records both

Not a defect in this PR, but it will show up as one on the map, so flagging it here as well.

At 3067, using the data on this branch:

Skye           administration: [Skye Province]
Zebebelgenubi  administration: [Skye Province, Freedom Theater]

Those two are 6.1 ly apart. The map groups worlds into 30 ly cells and treats any difference in the path as a disagreement, so the cell holding Skye loses its administrative classification and drops out of the Skye Province outline. I count 124 such same-faction, same-region pairs within 30 ly at 3067, 17 at 3145, 14 at 2765, 7 at 3025.

Two ways to close it, and they are not exclusive. The code side is a prefix rule, which I have raised on mekhq#10018. The data side is filling in the missing second element where it is known. If the intent is that some worlds genuinely sit in a province with no theatre, the code fix is the right one on its own.

3. The 31 District Capital removals

These are the only entries in the diff that change something already visible. I checked whether any of them were previously being dropped on load by the same-date problem in item 1, which would have meant the "conflict" only became observable with the MekHQ change. None of them were: all 31 are live in the current build, all dated 2596-12-31, so they really are correcting something a player can see today.

That makes them the part that needs the source citation. The first checkbox in the template is still unticked. Project convention is that all of them get ticked before opening, with a reason on the line when one does not apply, so this one probably wants either a citation or an explicit "corrections listed above, reviewed by owner" note.

Checked and clean

  • Whole-diff audit reproduced independently: 26,016 added lines, 26,016 removed, and zero pairs differing by anything other than the comment marker.
  • administration is the only key that becomes live anywhere in the diff. Nothing else is uncommented, so no capitalOf relationship or new region is introduced.
  • The data/fonts Checkstyle suppression change is separator-neutral and does what it says on Windows.
  1. I am going to pushback, without this PR first, some of the map options render nothing. If this PR goes first, doesn't affect anything to current MekHQ (as the review says, it does nothing by itself), but it makes it so when the mekhq PR goes in, users can see all the data as expected with the new map.
  2. Agreed, our data has gaps, and this will expose them more, it's something we will need to fill as we get user reports.
  3. This is the part I need help from you @HammerGS , I think those records were incorrect because they are set in 2596-12-31 and never change, but I am not sure.

@HammerGS

Copy link
Copy Markdown
Member

Re: Data. I have fresh SUCS data but need to change the approach I'm using to integrate it. I'll take things to Discord where we can chat later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI Assisted Development This project/code contains AI use under the supervision of a human developer. With Human testing.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants