Fix up the solar system layout(s)

ingest/solarSystems.sql

@@ -1,4 +1,17 @@
-WITH SystemConnections AS (
+WITH CanonicalLayouts AS (
+  SELECT regionId, MIN(layoutId) AS layoutId
+  FROM MapLayouts
+  GROUP BY regionId
+),
+RegionLayouts AS (
+  SELECT
+    re.regionId,
+    re.regionName,
+    cl.layoutId
+  FROM Regions re
+  JOIN CanonicalLayouts cl ON re.regionId = cl.regionId
+),
+SystemConnections AS (
   SELECT
     ss_from.solarSystemId AS fromSystemId,
     ss_to.solarSystemName AS toSystemName
@@ -17,10 +30,10 @@ SELECT
   ss.solarSystemName AS solarSystemName,
   ml.x,
   ml.y,
-  re.regionName as regionName,
+  rl.regionName AS regionName,
+  ss.security AS security,
   COALESCE(cs.connectedSystems, '') AS connectedSystems
-FROM MapLayout ml
+FROM RegionLayouts rl
+JOIN MapLayout ml ON ml.layoutId = rl.layoutId
 JOIN SolarSystems ss ON ss.solarSystemId = ml.solarSystemId
-JOIN MapLayouts mls ON ml.layoutId = mls.layoutId
-JOIN Regions re ON re.regionId = mls.regionId
-LEFT JOIN ConnectedSystems cs ON ss.solarSystemId = cs.fromSystemId;
+LEFT JOIN ConnectedSystems cs ON ss.solarSystemId = cs.fromSystemId