refactor: Use Translations, PrintableAreaManager and CrosshairManager…

… from maplibre-gl-export (#61)
watergis · Mar 10, 2024 · f7b81d9 · f7b81d9
1 parent df9cc38
commit f7b81d9
Show file tree

Hide file tree

Showing 24 changed files with 70 additions and 451 deletions.
diff --git a/.changeset/strange-nails-perform.md b/.changeset/strange-nails-perform.md
@@ -0,0 +1,6 @@
+---
+"@watergis/maplibre-gl-export": patch
+"@watergis/mapbox-gl-export": patch
+---
+
+refactor: Use Translations, PrintableAreaManager and CrosshairManager from maplibre-gl-export at mapbox-gl-export
diff --git a/packages/mapbox-gl-export/package.json b/packages/mapbox-gl-export/package.json
@@ -53,6 +53,7 @@
 		"@types/node": "^20.11.25",
 		"@typescript-eslint/eslint-plugin": "^7.1.1",
 		"@typescript-eslint/parser": "^7.1.1",
+		"@watergis/maplibre-gl-export": "workspace:^",
 		"autoprefixer": "^10.4.18",
 		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.1.0",

diff --git a/packages/mapbox-gl-export/src/lib/crosshair-manager.ts b/packages/mapbox-gl-export/src/lib/crosshair-manager.ts
diff --git a/packages/mapbox-gl-export/src/lib/export-control.ts b/packages/mapbox-gl-export/src/lib/export-control.ts
@@ -1,20 +1,11 @@
 import { IControl, Map as MapboxMap } from 'mapbox-gl';
-import CrosshairManager from './crosshair-manager';
-import PrintableAreaManager from './printable-area-manager';
 import {
-	english,
-	french,
-	finnish,
-	german,
-	swedish,
-	spanish,
-	vietnam,
-	ukranian,
-	zhHans,
-	zhHant,
-	ja,
-	Translation
-} from './local';
+	CrosshairManager,
+	PrintableAreaManager,
+	type Translation,
+	type languages,
+	getTranslation
+} from '@watergis/maplibre-gl-export';
 import MapGenerator, { Size, Format, PageOrientation, DPI, Unit } from './map-generator';
 
 type Options = {
@@ -25,7 +16,7 @@ type Options = {
 	Crosshair?: boolean;
 	PrintableArea: boolean;
 	accessToken?: string;
-	Local?: 'de' | 'en' | 'fr' | 'fi' | 'sv' | 'es' | 'vi' | 'uk' | 'zhHans' | 'zhHant' | 'ja';
+	Local?: languages;
 	AllowedSizes?: ('LETTER' | 'A2' | 'A3' | 'A4' | 'A5' | 'A6' | 'B2' | 'B3' | 'B4' | 'B5' | 'B6')[];
 	Filename?: string;
 };
@@ -85,32 +76,8 @@ export default class MapboxExportControl implements IControl {
 	}
 
 	public getTranslation(): Translation {
-		switch (this.options.Local) {
-			case 'de':
-				return german;
-			case 'en':
-				return english;
-			case 'fr':
-				return french;
-			case 'fi':
-				return finnish;
-			case 'sv':
-				return swedish;
-			case 'es':
-				return spanish;
-			case 'vi':
-				return vietnam;
-			case 'uk':
-				return ukranian;
-			case 'zhHans':
-				return zhHans;
-			case 'zhHant':
-				return zhHant;
-			case 'ja':
-				return ja;
-			default:
-				return english;
-		}
+		const lang: languages = this.options.Local ?? 'en';
+		return getTranslation(lang);
 	}
 
 	public onAdd(map: MapboxMap): HTMLElement {

diff --git a/packages/mapbox-gl-export/src/lib/local/de.ts b/packages/mapbox-gl-export/src/lib/local/de.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/en.ts b/packages/mapbox-gl-export/src/lib/local/en.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/es.ts b/packages/mapbox-gl-export/src/lib/local/es.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/fi.ts b/packages/mapbox-gl-export/src/lib/local/fi.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/fr.ts b/packages/mapbox-gl-export/src/lib/local/fr.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/index.ts b/packages/mapbox-gl-export/src/lib/local/index.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/ja.ts b/packages/mapbox-gl-export/src/lib/local/ja.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/sv.ts b/packages/mapbox-gl-export/src/lib/local/sv.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/uk.ts b/packages/mapbox-gl-export/src/lib/local/uk.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/vi.ts b/packages/mapbox-gl-export/src/lib/local/vi.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/zhHans.ts b/packages/mapbox-gl-export/src/lib/local/zhHans.ts
diff --git a/packages/mapbox-gl-export/src/lib/local/zhHant.ts b/packages/mapbox-gl-export/src/lib/local/zhHant.ts