From 74e9321a3f93ba6ef566714a051568355abbfb20 Mon Sep 17 00:00:00 2001 From: Jin Igarashi Date: Sat, 23 Dec 2023 21:14:22 +0000 Subject: [PATCH 1/2] feat: bring new translations (Vietnam, Ukranian, Chinese simplified and Chinese traditional) from mapbox-gl-export --- .changeset/pretty-planes-grow.md | 5 +++ packages/maplibre-gl-export/README.md | 4 +++ .../src/lib/export-control.ts | 24 +++++++++++-- .../maplibre-gl-export/src/lib/local/index.ts | 18 +++++++++- .../maplibre-gl-export/src/lib/local/uk.ts | 9 +++++ .../maplibre-gl-export/src/lib/local/vi.ts | 9 +++++ .../src/lib/local/zhHans.ts | 9 +++++ .../src/lib/local/zhHant.ts | 9 +++++ .../index.html | 29 ++++++++++++++++ .../src/index.js | 34 +++++++++++++++---- 10 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 .changeset/pretty-planes-grow.md create mode 100644 packages/maplibre-gl-export/src/lib/local/uk.ts create mode 100644 packages/maplibre-gl-export/src/lib/local/vi.ts create mode 100644 packages/maplibre-gl-export/src/lib/local/zhHans.ts create mode 100644 packages/maplibre-gl-export/src/lib/local/zhHant.ts diff --git a/.changeset/pretty-planes-grow.md b/.changeset/pretty-planes-grow.md new file mode 100644 index 00000000..7740fe5b --- /dev/null +++ b/.changeset/pretty-planes-grow.md @@ -0,0 +1,5 @@ +--- +"@watergis/maplibre-gl-export": minor +--- + +feat: bring new translations (Vietnam, Ukranian, Chinese simplified and Chinese traditional) from mapbox-gl-export diff --git a/packages/maplibre-gl-export/README.md b/packages/maplibre-gl-export/README.md index 9e84b052..81da0788 100644 --- a/packages/maplibre-gl-export/README.md +++ b/packages/maplibre-gl-export/README.md @@ -91,6 +91,10 @@ You can specify default option as follows. - `fi` finnish - `sv` swedish - `es` spanish + - `vi` Vietnam + - `uk` Ukranian + - `zhHans` Chinese Simplified + - `zhHant` Chinese Traditional - AllowedSizes - list of allowed page sizes for export - available values `'A2'`, `'A3'`, `'A4'`, `'A5'`, `'A6'`, `'B2'`, `'B3'`, `'B4'`, `'B5'`, `'B6'` diff --git a/packages/maplibre-gl-export/src/lib/export-control.ts b/packages/maplibre-gl-export/src/lib/export-control.ts index b8f0f041..b2675597 100644 --- a/packages/maplibre-gl-export/src/lib/export-control.ts +++ b/packages/maplibre-gl-export/src/lib/export-control.ts @@ -1,7 +1,19 @@ import { ControlPosition, IControl, Map as MaplibreMap } from 'maplibre-gl'; import CrosshairManager from './crosshair-manager'; import PrintableAreaManager from './printable-area-manager'; -import { english, french, finnish, german, swedish, spanish, Translation } from './local'; +import { + english, + french, + finnish, + german, + swedish, + spanish, + vietnam, + ukranian, + zhHans, + zhHant, + Translation +} from './local'; import MapGenerator, { Size, Format, PageOrientation, DPI, Unit } from './map-generator'; type Options = { @@ -11,7 +23,7 @@ type Options = { DPI?: number; Crosshair?: boolean; PrintableArea?: boolean; - Local?: 'de' | 'en' | 'fr' | 'fi' | 'sv' | 'es'; + Local?: 'de' | 'en' | 'fr' | 'fi' | 'sv' | 'es' | 'vi' | 'uk' | 'zhHans' | 'zhHant'; AllowedSizes?: ('A2' | 'A3' | 'A4' | 'A5' | 'A6' | 'B2' | 'B3' | 'B4' | 'B5' | 'B6')[]; Filename?: string; }; @@ -82,6 +94,14 @@ export default class MaplibreExportControl implements IControl { return swedish; case 'es': return spanish; + case 'vi': + return vietnam; + case 'uk': + return ukranian; + case 'zhHans': + return zhHans; + case 'zhHant': + return zhHant; default: return english; } diff --git a/packages/maplibre-gl-export/src/lib/local/index.ts b/packages/maplibre-gl-export/src/lib/local/index.ts index 8402609d..3080238b 100644 --- a/packages/maplibre-gl-export/src/lib/local/index.ts +++ b/packages/maplibre-gl-export/src/lib/local/index.ts @@ -4,6 +4,10 @@ import finnish from './fi'; import german from './de'; import swedish from './sv'; import spanish from './es'; +import vietnam from './vi'; +import ukranian from './uk'; +import zhHans from './zhHans'; +import zhHant from './zhHant'; type Translation = { PageSize: string; @@ -13,4 +17,16 @@ type Translation = { Generate: string; }; -export { english, french, finnish, german, swedish, spanish, Translation }; +export { + english, + french, + finnish, + german, + swedish, + spanish, + vietnam, + ukranian, + zhHans, + zhHant, + Translation +}; diff --git a/packages/maplibre-gl-export/src/lib/local/uk.ts b/packages/maplibre-gl-export/src/lib/local/uk.ts new file mode 100644 index 00000000..dbc384a9 --- /dev/null +++ b/packages/maplibre-gl-export/src/lib/local/uk.ts @@ -0,0 +1,9 @@ +const translation = { + PageSize: 'Розмір сторінки', + PageOrientation: 'Орієнтація сторінки', + Format: 'Формат', + DPI: 'DPI', + Generate: 'Згенерувати' +}; + +export default translation; diff --git a/packages/maplibre-gl-export/src/lib/local/vi.ts b/packages/maplibre-gl-export/src/lib/local/vi.ts new file mode 100644 index 00000000..c91cd125 --- /dev/null +++ b/packages/maplibre-gl-export/src/lib/local/vi.ts @@ -0,0 +1,9 @@ +const translation = { + PageSize: 'Kích thước trang', + PageOrientation: 'Loại trang', + Format: 'Định dạng', + DPI: 'Mật độ điểm ảnh (DPI)', + Generate: 'Tạo' +}; + +export default translation; diff --git a/packages/maplibre-gl-export/src/lib/local/zhHans.ts b/packages/maplibre-gl-export/src/lib/local/zhHans.ts new file mode 100644 index 00000000..64151ff5 --- /dev/null +++ b/packages/maplibre-gl-export/src/lib/local/zhHans.ts @@ -0,0 +1,9 @@ +const translation = { + PageSize: '页面大小', + PageOrientation: '页面方向', + Format: '格式', + DPI: '像素', + Generate: '导出' +}; + +export default translation; diff --git a/packages/maplibre-gl-export/src/lib/local/zhHant.ts b/packages/maplibre-gl-export/src/lib/local/zhHant.ts new file mode 100644 index 00000000..d157b820 --- /dev/null +++ b/packages/maplibre-gl-export/src/lib/local/zhHant.ts @@ -0,0 +1,9 @@ +const translation = { + PageSize: '頁面大小', + PageOrientation: '頁面方向', + Format: '格式', + DPI: '像素', + Generate: '導出' +}; + +export default translation; diff --git a/sites/maplibre-gl-export.water-gis.com/index.html b/sites/maplibre-gl-export.water-gis.com/index.html index 866eb81f..2ccf06d7 100644 --- a/sites/maplibre-gl-export.water-gis.com/index.html +++ b/sites/maplibre-gl-export.water-gis.com/index.html @@ -12,6 +12,7 @@ rel="stylesheet" href="node_modules/@watergis/maplibre-gl-export/dist/maplibre-gl-export.css" /> + @@ -35,6 +43,27 @@ >Fork me on GitHub
+
+
+ +
+
+ +
+
+
+
diff --git a/sites/maplibre-gl-export.water-gis.com/src/index.js b/sites/maplibre-gl-export.water-gis.com/src/index.js index 041c64cc..377d7932 100644 --- a/sites/maplibre-gl-export.water-gis.com/src/index.js +++ b/sites/maplibre-gl-export.water-gis.com/src/index.js @@ -16,15 +16,37 @@ const map = new Map({ hash: true }); map.addControl(new NavigationControl({}), 'top-right'); -map.addControl( - new MaplibreExportControl({ + +const languageOption = document.getElementById('language'); +languageOption.value = 'en'; + +let exportControl = new MaplibreExportControl({ + PageSize: Size.A3, + PageOrientation: PageOrientation.Portrait, + Format: Format.PNG, + DPI: DPI[96], + Crosshair: true, + PrintableArea: true, + Local: languageOption.value +}); + +map.addControl(exportControl, 'top-right'); + +languageOption.addEventListener('change', () => { + if (exportControl) { + map.removeControl(exportControl); + } + + const language = document.getElementById('language'); + exportControl = new MaplibreExportControl({ PageSize: Size.A3, PageOrientation: PageOrientation.Portrait, Format: Format.PNG, DPI: DPI[96], Crosshair: true, PrintableArea: true, - Local: 'en' - }), - 'top-right' -); + Local: language.value + }); + + map.addControl(exportControl, 'top-right'); +}); From 478056d268f2f9a2fd3d0edffa6d3f7727593ed7 Mon Sep 17 00:00:00 2001 From: Jin Igarashi Date: Sat, 23 Dec 2023 21:19:31 +0000 Subject: [PATCH 2/2] feat: add Japanese language (ja) --- .changeset/poor-fishes-turn.md | 5 +++++ packages/maplibre-gl-export/README.md | 1 + packages/maplibre-gl-export/src/lib/export-control.ts | 5 ++++- packages/maplibre-gl-export/src/lib/local/index.ts | 2 ++ packages/maplibre-gl-export/src/lib/local/ja.ts | 9 +++++++++ sites/maplibre-gl-export.water-gis.com/index.html | 1 + 6 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .changeset/poor-fishes-turn.md create mode 100644 packages/maplibre-gl-export/src/lib/local/ja.ts diff --git a/.changeset/poor-fishes-turn.md b/.changeset/poor-fishes-turn.md new file mode 100644 index 00000000..19257892 --- /dev/null +++ b/.changeset/poor-fishes-turn.md @@ -0,0 +1,5 @@ +--- +"@watergis/maplibre-gl-export": minor +--- + +feat: add Japanese language (ja) diff --git a/packages/maplibre-gl-export/README.md b/packages/maplibre-gl-export/README.md index 81da0788..1bdd0ea6 100644 --- a/packages/maplibre-gl-export/README.md +++ b/packages/maplibre-gl-export/README.md @@ -95,6 +95,7 @@ You can specify default option as follows. - `uk` Ukranian - `zhHans` Chinese Simplified - `zhHant` Chinese Traditional + - `ja` Japanese - AllowedSizes - list of allowed page sizes for export - available values `'A2'`, `'A3'`, `'A4'`, `'A5'`, `'A6'`, `'B2'`, `'B3'`, `'B4'`, `'B5'`, `'B6'` diff --git a/packages/maplibre-gl-export/src/lib/export-control.ts b/packages/maplibre-gl-export/src/lib/export-control.ts index b2675597..c2c1eaf9 100644 --- a/packages/maplibre-gl-export/src/lib/export-control.ts +++ b/packages/maplibre-gl-export/src/lib/export-control.ts @@ -12,6 +12,7 @@ import { ukranian, zhHans, zhHant, + ja, Translation } from './local'; import MapGenerator, { Size, Format, PageOrientation, DPI, Unit } from './map-generator'; @@ -23,7 +24,7 @@ type Options = { DPI?: number; Crosshair?: boolean; PrintableArea?: boolean; - Local?: 'de' | 'en' | 'fr' | 'fi' | 'sv' | 'es' | 'vi' | 'uk' | 'zhHans' | 'zhHant'; + Local?: 'de' | 'en' | 'fr' | 'fi' | 'sv' | 'es' | 'vi' | 'uk' | 'zhHans' | 'zhHant' | 'ja'; AllowedSizes?: ('A2' | 'A3' | 'A4' | 'A5' | 'A6' | 'B2' | 'B3' | 'B4' | 'B5' | 'B6')[]; Filename?: string; }; @@ -102,6 +103,8 @@ export default class MaplibreExportControl implements IControl { return zhHans; case 'zhHant': return zhHant; + case 'ja': + return ja; default: return english; } diff --git a/packages/maplibre-gl-export/src/lib/local/index.ts b/packages/maplibre-gl-export/src/lib/local/index.ts index 3080238b..70f22fb7 100644 --- a/packages/maplibre-gl-export/src/lib/local/index.ts +++ b/packages/maplibre-gl-export/src/lib/local/index.ts @@ -8,6 +8,7 @@ import vietnam from './vi'; import ukranian from './uk'; import zhHans from './zhHans'; import zhHant from './zhHant'; +import ja from './ja'; type Translation = { PageSize: string; @@ -28,5 +29,6 @@ export { ukranian, zhHans, zhHant, + ja, Translation }; diff --git a/packages/maplibre-gl-export/src/lib/local/ja.ts b/packages/maplibre-gl-export/src/lib/local/ja.ts new file mode 100644 index 00000000..201675d8 --- /dev/null +++ b/packages/maplibre-gl-export/src/lib/local/ja.ts @@ -0,0 +1,9 @@ +const translation = { + PageSize: 'ページサイズ', + PageOrientation: 'ページ方向', + Format: 'フォーマット', + DPI: 'DPI（解像度）', + Generate: '出力' +}; + +export default translation; diff --git a/sites/maplibre-gl-export.water-gis.com/index.html b/sites/maplibre-gl-export.water-gis.com/index.html index 2ccf06d7..f591cba3 100644 --- a/sites/maplibre-gl-export.water-gis.com/index.html +++ b/sites/maplibre-gl-export.water-gis.com/index.html @@ -59,6 +59,7 @@ +