feat(map): add border gap setting

MichaelMakesGames · May 31, 2024 · cd0798a · cd0798a
1 parent e14e240
commit cd0798a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/src/renderer/src/intl/en-US.ts b/src/renderer/src/intl/en-US.ts
@@ -330,6 +330,8 @@ export default {
 			<li>When enabled, the overall border of the galaxy will be circular in shape, and there will be no "holes" between systems.</li>
 			<li>If the galaxy is a "Starburst", a special spiral shape will be used instead of a circle.</li>
 		</ul>`,
+		borderGap: 'Border Gap',
+		borderGap_tooltip: 'Adds blank space between country borders',
 		hyperlaneSensitiveBorders: 'Hyperlane Sensitive Borders',
 		hyperlaneSensitiveBorders_tooltip: `<ul>
 			<li>When enabled, borders will follow hyperlanes.</li>

diff --git a/src/renderer/src/lib/map/data/processBorders.ts b/src/renderer/src/lib/map/data/processBorders.ts
@@ -38,6 +38,7 @@ export const processBordersDeps = [
 	'sectorBorderStroke',
 	'mapMode',
 	'mapModePointOfView',
+	'borderGap',
 ] satisfies (keyof MapSettings)[];
 
 export default function processBorders(
@@ -345,11 +346,19 @@ export default function processBorders(
 		if (settings.borderStroke.smoothing && boundedOuterBorderGeoJSON != null) {
 			smoothedOuterBorderGeoJSON = smoothGeojson(boundedOuterBorderGeoJSON, 2);
 		}
+		smoothedOuterBorderGeoJSON =
+			smoothedOuterBorderGeoJSON == null
+				? null
+				: (turf.buffer(smoothedOuterBorderGeoJSON, -(settings.borderGap ?? 0) / 2 / SCALE, {
+						units: 'degrees',
+						steps: settings.borderStroke.smoothing ? 8 : 1,
+					}) as ReturnType<typeof turf.buffer> | null);
 		const smoothedInnerBorderGeoJSON =
 			smoothedOuterBorderGeoJSON == null
 				? null
 				: (turf.buffer(smoothedOuterBorderGeoJSON, -settings.borderStroke.width / SCALE, {
 						units: 'degrees',
+						steps: settings.borderStroke.smoothing ? 8 : 1,
 					}) as ReturnType<typeof turf.buffer> | null);
 		border.outerPath =
 			smoothedOuterBorderGeoJSON == null

diff --git a/src/renderer/src/lib/settings/mapSettings.ts b/src/renderer/src/lib/settings/mapSettings.ts
@@ -14,6 +14,7 @@ export type NumberMapSettings =
 	| 'systemNamesFontSize';
 
 export type NumberOptionalMapSettings =
+	| 'borderGap'
 	| 'countryEmblemsMaxSize'
 	| 'countryEmblemsMinSize'
 	| 'countryNamesMaxSize'
@@ -313,6 +314,7 @@ export const defaultMapSettings: MapSettings = {
 		colorAdjustments: [],
 	},
 	voronoiGridSize: 30,
+	borderGap: null,
 	hyperlaneSensitiveBorders: true,
 	claimVoidBorderThreshold: 0.6,
 	claimVoidMaxSize: 1000,

diff --git a/src/renderer/src/lib/settings/mapSettingsConfig.ts b/src/renderer/src/lib/settings/mapSettingsConfig.ts
@@ -483,6 +483,15 @@ export const mapSettingsConfig: MapSettingConfigGroup[] = [
 				type: 'toggle',
 				tooltip: 'setting.circularGalaxyBorders_tooltip',
 			},
+			{
+				id: 'borderGap',
+				requiresReprocessing: true,
+				type: 'number',
+				step: 0.5,
+				min: 0,
+				optional: true,
+				tooltip: 'setting.borderGap_tooltip',
+			},
 			{
 				id: 'hyperlaneSensitiveBorders',
 				requiresReprocessing: true,