An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Refine location editing and coordinate selection https://github.com/siyuan-note/siyuan/issues/20325
Daniel2dceb98821e6
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex 74cf46d617..75e1170e6a 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "اختر نظام الإحداثيات",+ "coordinateOrder": "ترتيب الإحداثيات",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, خرائط Tencent)",+ "coordinateSystemBD09": "BD-09 (خرائط Baidu)","mapAuthenticationBypass": "لا تتوفر الخرائط أثناء تفعيل تجاوز المصادقة. تظل السجلات متاحة","mapSettings": "الخريطة","mapServices": "خدمات الخرائط",@@ -47,7 +52,7 @@"mapFitMarkers": "ملاءمة العرض لجميع العلامات المحمّلة","mapTooManyMarkers": "تحتوي هذه الصفحة على أكثر من ${limit} موقعًا. استخدم عوامل التصفية أو قلّل حجم الصفحة لعرض الخريطة","defaultCoordinateSystem": "نظام الإحداثيات الافتراضي للإدخال الجديد",- "defaultCoordinateSystemTip": "ينطبق على الإدخال الجديد فقط؛ تحتفظ المواقع الحالية بأنظمة إحداثياتها",+ "defaultCoordinateSystemTip": "ينطبق على الإدخال الجديد فقط؛ تبقى المواقع الحالية دون تغيير ولا يتم تحويل الإحداثيات","locationPasteInEditor": "الصق أزواج الإحداثيات في محرر الموقع، حيث يُوضَّح ترتيب خط العرض ثم خط الطول ونظام الإحداثيات","location": "الموقع","locationName": "الاسم (اختياري)",@@ -59,7 +64,7 @@"coordinateOrderTip": "إحداثيات عشرية بترتيب خط العرض ثم خط الطول؛ لا يتم تبديل الترتيب تلقائيًا","invalidCoordinates": "أدخل خط عرض محدودًا من -90 إلى 90 وخط طول من -180 إلى 180، أو اترك كليهما فارغًا","invalidCoordinateSystem": "اختر نظام إحداثيات مدعومًا",- "coordinateSystemTip": "تغيير تسمية نظام الإحداثيات لا يحوّل الإحداثيات",+ "coordinateSystemTip": "اختر نظام الإحداثيات المستخدم فعليًا؛ تغيير التسمية لا يحوّل الإحداثيات","pageScrollUp": "الشاشة السابقة","pageScrollDown": "الشاشة التالية","showPageScrollButtons": "إظهار أزرار التمرير بملء الشاشة",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex 654fcfa40d..1306133ed4 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Koordinatensystem auswählen",+ "coordinateOrder": "Koordinatenreihenfolge",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Karten sind bei aktivierter Umgehung der Authentifizierung nicht verfügbar. Datensätze bleiben verfügbar","mapSettings": "Karte","mapServices": "Kartendienste",@@ -47,7 +52,7 @@"mapFitMarkers": "Alle geladenen Markierungen einpassen","mapTooManyMarkers": "Diese Seite enthält mehr als ${limit} Standorte. Filter verwenden oder die Seitengröße verkleinern, um die Karte anzuzeigen","defaultCoordinateSystem": "Standardkoordinatensystem für neue Eingaben",- "defaultCoordinateSystemTip": "Gilt nur für neue Eingaben; vorhandene Standorte behalten ihr Koordinatensystem",+ "defaultCoordinateSystemTip": "Gilt nur für neue Eingaben; vorhandene Standorte bleiben unverändert und Koordinaten werden nicht umgerechnet","locationPasteInEditor": "Koordinatenpaare im Standorteditor einfügen, wo die Reihenfolge Breitengrad, Längengrad und das Koordinatensystem ausdrücklich angegeben sind","location": "Standort","locationName": "Name (optional)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Dezimalgrad in der Reihenfolge Breitengrad, Längengrad; die Reihenfolge wird nie vertauscht","invalidCoordinates": "Endlichen Breitengrad von -90 bis 90 und Längengrad von -180 bis 180 eingeben oder beide leer lassen","invalidCoordinateSystem": "Ein unterstütztes Koordinatensystem auswählen",- "coordinateSystemTip": "Das Ändern der Koordinatensystembezeichnung rechnet die Koordinaten nicht um",+ "coordinateSystemTip": "Wählen Sie das tatsächliche Koordinatensystem der Koordinaten; eine Änderung der Bezeichnung rechnet die Koordinaten nicht um","pageScrollUp": "Vorheriger Bildschirm","pageScrollDown": "Nächster Bildschirm","showPageScrollButtons": "Schaltflächen zum seitenweisen Scrollen anzeigen",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex bf7145af0b..b11dac7195 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Select a coordinate system",+ "coordinateOrder": "Coordinate order",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Maps are unavailable while authentication bypass is enabled. Records remain available","mapSettings": "Map","mapServices": "Map services",@@ -47,7 +52,7 @@"mapFitMarkers": "Fit all loaded markers","mapTooManyMarkers": "This page has more than ${limit} locations. Use filters or a smaller page size to display the map","defaultCoordinateSystem": "Default coordinate system for new input",- "defaultCoordinateSystemTip": "Applies only to new input; existing locations keep their coordinate systems",+ "defaultCoordinateSystemTip": "Applies only to new input; existing locations stay unchanged and coordinates are not converted","locationPasteInEditor": "Paste coordinate pairs in the location editor, where latitude, longitude order and the coordinate system are explicit","location": "Location","locationName": "Name (optional)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Decimal coordinates in latitude, longitude order; coordinates are never swapped","invalidCoordinates": "Enter a finite latitude from -90 to 90 and longitude from -180 to 180, or leave both empty","invalidCoordinateSystem": "Choose a supported coordinate system",- "coordinateSystemTip": "Changing the coordinate system label does not convert coordinates",+ "coordinateSystemTip": "Select the coordinate system actually used by the coordinates; changing the label does not convert coordinates","pageScrollUp": "Previous screen","pageScrollDown": "Next screen","showPageScrollButtons": "Show page scroll buttons",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 6eb06bdd67..65292b5e6a 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Seleccione un sistema de coordenadas",+ "coordinateOrder": "Orden de las coordenadas",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Los mapas no están disponibles mientras esté activada la omisión de autenticación. Los registros siguen disponibles","mapSettings": "Mapa","mapServices": "Servicios de mapas",@@ -47,7 +52,7 @@"mapFitMarkers": "Ajustar a todos los marcadores cargados","mapTooManyMarkers": "Esta página tiene más de ${limit} ubicaciones. Use filtros o reduzca el tamaño de página para mostrar el mapa","defaultCoordinateSystem": "Sistema de coordenadas predeterminado para nuevas entradas",- "defaultCoordinateSystemTip": "Solo se aplica a nuevas entradas; las ubicaciones existentes conservan su sistema de coordenadas",+ "defaultCoordinateSystemTip": "Solo se aplica a nuevas entradas; las ubicaciones existentes no cambian y las coordenadas no se convierten","locationPasteInEditor": "Pega los pares de coordenadas en el editor de ubicación, donde se indican el orden latitud, longitud y el sistema de coordenadas","location": "Ubicación","locationName": "Nombre (opcional)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Coordenadas decimales en orden latitud, longitud; nunca se intercambia el orden","invalidCoordinates": "Introduce una latitud finita entre -90 y 90 y una longitud entre -180 y 180, o deja ambas vacías","invalidCoordinateSystem": "Elige un sistema de coordenadas compatible",- "coordinateSystemTip": "Cambiar la etiqueta del sistema de coordenadas no convierte las coordenadas",+ "coordinateSystemTip": "Seleccione el sistema que utilizan realmente las coordenadas; cambiar la etiqueta no convierte las coordenadas","pageScrollUp": "Pantalla anterior","pageScrollDown": "Pantalla siguiente","showPageScrollButtons": "Mostrar botones de desplazamiento por pantalla",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex 775b408eba..9ee6195761 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Sélectionnez un système de coordonnées",+ "coordinateOrder": "Ordre des coordonnées",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Les cartes sont indisponibles lorsque le contournement de l’authentification est activé. Les enregistrements restent disponibles","mapSettings": "Carte","mapServices": "Services cartographiques",@@ -47,7 +52,7 @@"mapFitMarkers": "Ajuster à tous les repères chargés","mapTooManyMarkers": "Cette page comporte plus de ${limit} localisations. Utilisez des filtres ou réduisez la taille des pages pour afficher la carte","defaultCoordinateSystem": "Système de coordonnées par défaut des nouvelles saisies",- "defaultCoordinateSystemTip": "S’applique uniquement aux nouvelles saisies ; les lieux existants conservent leur système de coordonnées",+ "defaultCoordinateSystemTip": "S’applique uniquement aux nouvelles saisies ; les lieux existants restent inchangés et les coordonnées ne sont pas converties","locationPasteInEditor": "Collez les paires de coordonnées dans l’éditeur de lieu, où l’ordre latitude, longitude et le système de coordonnées sont précisés","location": "Lieu","locationName": "Nom (facultatif)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Coordonnées décimales dans l’ordre latitude, longitude ; cet ordre n’est jamais inversé","invalidCoordinates": "Saisissez une latitude finie entre -90 et 90 et une longitude entre -180 et 180, ou laissez les deux vides","invalidCoordinateSystem": "Choisissez un système de coordonnées pris en charge",- "coordinateSystemTip": "Changer l’étiquette du système de coordonnées ne convertit pas les coordonnées",+ "coordinateSystemTip": "Sélectionnez le système réellement utilisé par les coordonnées ; changer l’étiquette ne convertit pas les coordonnées","pageScrollUp": "Écran précédent","pageScrollDown": "Écran suivant","showPageScrollButtons": "Afficher les boutons de défilement par écran",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 5f1792ee5f..5934cf19a0 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "בחרו מערכת קואורדינטות",+ "coordinateOrder": "סדר הקואורדינטות",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "מפות אינן זמינות כאשר עקיפת האימות מופעלת. הרשומות נשארות זמינות","mapSettings": "מפה","mapServices": "שירותי מפות",@@ -47,7 +52,7 @@"mapFitMarkers": "התאמת התצוגה לכל הסמנים שנטענו","mapTooManyMarkers": "בדף זה יש יותר מ-${limit} מיקומים. השתמש במסננים או הקטן את גודל הדף כדי להציג את המפה","defaultCoordinateSystem": "מערכת קואורדינטות כברירת מחדל לקלט חדש",- "defaultCoordinateSystemTip": "חל רק על קלט חדש; מיקומים קיימים שומרים על מערכת הקואורדינטות שלהם",+ "defaultCoordinateSystemTip": "חל רק על קלט חדש; מיקומים קיימים אינם משתנים והקואורדינטות אינן מומרות","locationPasteInEditor": "יש להדביק זוגות קואורדינטות בעורך המיקום, שבו סדר קו הרוחב וקו האורך ומערכת הקואורדינטות מצוינים במפורש","location": "מיקום","locationName": "שם (רשות)",@@ -59,7 +64,7 @@"coordinateOrderTip": "קואורדינטות עשרוניות בסדר קו רוחב, קו אורך; הסדר לעולם לא מוחלף אוטומטית","invalidCoordinates": "יש להזין קו רוחב סופי בין -90 ל-90 וקו אורך בין -180 ל-180, או להשאיר את שניהם ריקים","invalidCoordinateSystem": "יש לבחור מערכת קואורדינטות נתמכת",- "coordinateSystemTip": "שינוי תווית מערכת הקואורדינטות אינו ממיר את הקואורדינטות",+ "coordinateSystemTip": "בחרו את המערכת שבה הקואורדינטות משתמשות בפועל; שינוי התווית אינו ממיר את הקואורדינטות","pageScrollUp": "המסך הקודם","pageScrollDown": "המסך הבא","showPageScrollButtons": "הצגת כפתורי גלילה לפי מסך",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex 94ffd94848..379997a9f8 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "निर्देशांक प्रणाली चुनें",+ "coordinateOrder": "निर्देशांक क्रम",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "प्रमाणीकरण बायपास सक्षम होने पर मानचित्र उपलब्ध नहीं हैं। रिकॉर्ड उपलब्ध रहते हैं","mapSettings": "मानचित्र","mapServices": "मानचित्र सेवाएँ",@@ -47,7 +52,7 @@"mapFitMarkers": "सभी लोड किए गए मार्कर दृश्य में समाएँ","mapTooManyMarkers": "इस पृष्ठ पर ${limit} से अधिक स्थान हैं। मानचित्र दिखाने के लिए फ़िल्टर उपयोग करें या पृष्ठ का आकार कम करें","defaultCoordinateSystem": "नए इनपुट के लिए डिफ़ॉल्ट निर्देशांक प्रणाली",- "defaultCoordinateSystemTip": "केवल नए इनपुट पर लागू होता है; मौजूदा स्थान अपनी निर्देशांक प्रणाली बनाए रखते हैं",+ "defaultCoordinateSystemTip": "केवल नए इनपुट पर लागू होता है; मौजूदा स्थान अपरिवर्तित रहते हैं और निर्देशांक परिवर्तित नहीं होते","locationPasteInEditor": "निर्देशांक जोड़े स्थान संपादक में पेस्ट करें, जहाँ अक्षांश, देशांतर का क्रम और निर्देशांक प्रणाली स्पष्ट हैं","location": "स्थान","locationName": "नाम (वैकल्पिक)",@@ -59,7 +64,7 @@"coordinateOrderTip": "दशमलव निर्देशांक अक्षांश, देशांतर के क्रम में दें; क्रम कभी अपने आप नहीं बदलेगा","invalidCoordinates": "-90 से 90 तक सीमित अक्षांश और -180 से 180 तक सीमित देशांतर दर्ज करें, या दोनों खाली छोड़ें","invalidCoordinateSystem": "समर्थित निर्देशांक प्रणाली चुनें",- "coordinateSystemTip": "निर्देशांक प्रणाली का लेबल बदलने से निर्देशांक परिवर्तित नहीं होते",+ "coordinateSystemTip": "वह प्रणाली चुनें जिसका निर्देशांक वास्तव में उपयोग करते हैं; लेबल बदलने से निर्देशांक परिवर्तित नहीं होते","pageScrollUp": "पिछली स्क्रीन","pageScrollDown": "अगली स्क्रीन","showPageScrollButtons": "एक स्क्रीन स्क्रॉल करने के बटन दिखाएँ",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex eba636165f..20a0f9b62d 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Pilih sistem koordinat",+ "coordinateOrder": "Urutan koordinat",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Peta tidak tersedia saat fitur melewati autentikasi diaktifkan. Rekaman tetap tersedia","mapSettings": "Peta","mapServices": "Layanan peta",@@ -47,7 +52,7 @@"mapFitMarkers": "Sesuaikan tampilan dengan semua penanda yang dimuat","mapTooManyMarkers": "Halaman ini memiliki lebih dari ${limit} lokasi. Gunakan filter atau ukuran halaman yang lebih kecil untuk menampilkan peta","defaultCoordinateSystem": "Sistem koordinat bawaan untuk masukan baru",- "defaultCoordinateSystemTip": "Hanya berlaku untuk masukan baru; lokasi yang ada mempertahankan sistem koordinatnya",+ "defaultCoordinateSystemTip": "Hanya berlaku untuk masukan baru; lokasi yang ada tidak berubah dan koordinat tidak dikonversi","locationPasteInEditor": "Tempel pasangan koordinat di editor lokasi, tempat urutan lintang, bujur dan sistem koordinat ditentukan dengan jelas","location": "Lokasi","locationName": "Nama (opsional)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Koordinat desimal dalam urutan lintang, bujur; urutan tidak pernah ditukar otomatis","invalidCoordinates": "Masukkan lintang terhingga dari -90 hingga 90 dan bujur dari -180 hingga 180, atau kosongkan keduanya","invalidCoordinateSystem": "Pilih sistem koordinat yang didukung",- "coordinateSystemTip": "Mengubah label sistem koordinat tidak mengonversi koordinat",+ "coordinateSystemTip": "Pilih sistem yang sebenarnya digunakan oleh koordinat; mengubah label tidak mengonversi koordinat","pageScrollUp": "Layar sebelumnya","pageScrollDown": "Layar berikutnya","showPageScrollButtons": "Tampilkan tombol gulir per layar",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex 34a06d5b14..33393c7956 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Seleziona un sistema di coordinate",+ "coordinateOrder": "Ordine delle coordinate",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Le mappe non sono disponibili quando è attivo il bypass dell’autenticazione. I record restano disponibili","mapSettings": "Mappa","mapServices": "Servizi cartografici",@@ -47,7 +52,7 @@"mapFitMarkers": "Inquadra tutti gli indicatori caricati","mapTooManyMarkers": "Questa pagina contiene più di ${limit} posizioni. Usa i filtri o riduci la dimensione della pagina per visualizzare la mappa","defaultCoordinateSystem": "Sistema di coordinate predefinito per nuovi inserimenti",- "defaultCoordinateSystemTip": "Si applica solo ai nuovi inserimenti; le posizioni esistenti mantengono il proprio sistema di coordinate",+ "defaultCoordinateSystemTip": "Si applica solo ai nuovi inserimenti; le posizioni esistenti restano invariate e le coordinate non vengono convertite","locationPasteInEditor": "Incolla le coppie di coordinate nell’editor della posizione, dove sono indicati l’ordine latitudine, longitudine e il sistema di coordinate","location": "Posizione","locationName": "Nome (facoltativo)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Coordinate decimali nell’ordine latitudine, longitudine; l’ordine non viene mai invertito","invalidCoordinates": "Inserisci una latitudine finita da -90 a 90 e una longitudine da -180 a 180, oppure lascia entrambe vuote","invalidCoordinateSystem": "Scegli un sistema di coordinate supportato",- "coordinateSystemTip": "Cambiare l’etichetta del sistema di coordinate non converte le coordinate",+ "coordinateSystemTip": "Seleziona il sistema effettivamente usato dalle coordinate; modificare l’etichetta non converte le coordinate","pageScrollUp": "Schermata precedente","pageScrollDown": "Schermata successiva","showPageScrollButtons": "Mostra i pulsanti di scorrimento per schermata",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex c1def47411..3f7a7a6c73 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "座標系を選択してください",+ "coordinateOrder": "座標の順序",+ "coordinateSystemWGS84": "WGS84(OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02(AMap、Tencent Maps)",+ "coordinateSystemBD09": "BD-09(Baidu Maps)","mapAuthenticationBypass": "認証のバイパスが有効な間は地図を利用できません。レコードは引き続き利用できます","mapSettings": "地図","mapServices": "地図サービス",@@ -47,7 +52,7 @@"mapFitMarkers": "読み込み済みの全マーカーを表示範囲に収める","mapTooManyMarkers": "このページには ${limit} 件を超える位置があります。フィルターを使用するか、ページあたりの件数を減らして地図を表示してください","defaultCoordinateSystem": "新規入力の既定の座標系",- "defaultCoordinateSystemTip": "新規入力にのみ適用され、既存の位置の座標系は変わりません",+ "defaultCoordinateSystemTip": "新規入力にのみ適用されます。既存の位置は変わらず、座標も変換されません","locationPasteInEditor": "緯度、経度の順序と座標系を確認できる位置エディターで座標の組を貼り付けてください","location": "位置","locationName": "名前(任意)",@@ -59,7 +64,7 @@"coordinateOrderTip": "緯度、経度の順に十進度で入力します。順序は自動で入れ替わりません","invalidCoordinates": "緯度は -90 から 90、経度は -180 から 180 の有限値を入力するか、両方を空欄にしてください","invalidCoordinateSystem": "対応する座標系を選択してください",- "coordinateSystemTip": "座標系のラベルを変更しても座標は変換されません",+ "coordinateSystemTip": "座標が実際に使用している座標系を選択してください。ラベルを変更しても座標は変換されません","pageScrollUp": "前の画面","pageScrollDown": "次の画面","showPageScrollButtons": "画面単位のスクロールボタンを表示",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex 87254dd0f7..1bda0452e5 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "좌표계를 선택하세요",+ "coordinateOrder": "좌표 순서",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "인증 우회가 활성화된 동안에는 지도를 사용할 수 없습니다. 레코드는 계속 사용할 수 있습니다","mapSettings": "지도","mapServices": "지도 서비스",@@ -47,7 +52,7 @@"mapFitMarkers": "불러온 모든 마커에 맞추기","mapTooManyMarkers": "이 페이지의 위치가 ${limit}개를 초과합니다. 지도를 표시하려면 필터를 사용하거나 페이지 크기를 줄이세요","defaultCoordinateSystem": "새 입력의 기본 좌표계",- "defaultCoordinateSystemTip": "새 입력에만 적용되며 기존 위치는 각자의 좌표계를 유지합니다",+ "defaultCoordinateSystemTip": "새 입력에만 적용되며 기존 위치는 변경되지 않고 좌표도 변환되지 않습니다","locationPasteInEditor": "위도, 경도 순서와 좌표계가 명확하게 표시된 위치 편집기에 좌표 쌍을 붙여넣으세요","location": "위치","locationName": "이름(선택 사항)",@@ -59,7 +64,7 @@"coordinateOrderTip": "위도, 경도 순서로 십진수 좌표를 입력하며 순서는 자동으로 바뀌지 않습니다","invalidCoordinates": "위도는 -90~90, 경도는 -180~180 사이의 유한한 값을 입력하거나 둘 다 비워 두세요","invalidCoordinateSystem": "지원되는 좌표계를 선택하세요",- "coordinateSystemTip": "좌표계 표시를 변경해도 좌표는 변환되지 않습니다",+ "coordinateSystemTip": "좌표에 실제로 사용된 좌표계를 선택하세요. 표시를 변경해도 좌표는 변환되지 않습니다","pageScrollUp": "이전 화면","pageScrollDown": "다음 화면","showPageScrollButtons": "화면 단위 스크롤 버튼 표시",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex dc56dd3dcc..3d6920b6a2 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Selecteer een coördinatenstelsel",+ "coordinateOrder": "Coördinatenvolgorde",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Kaarten zijn niet beschikbaar wanneer het omzeilen van authenticatie is ingeschakeld. Records blijven beschikbaar","mapSettings": "Kaart","mapServices": "Kaartdiensten",@@ -47,7 +52,7 @@"mapFitMarkers": "Alle geladen markeringen in beeld brengen","mapTooManyMarkers": "Deze pagina heeft meer dan ${limit} locaties. Gebruik filters of verklein de paginagrootte om de kaart weer te geven","defaultCoordinateSystem": "Standaardcoördinatenstelsel voor nieuwe invoer",- "defaultCoordinateSystemTip": "Geldt alleen voor nieuwe invoer; bestaande locaties behouden hun coördinatenstelsel",+ "defaultCoordinateSystemTip": "Geldt alleen voor nieuwe invoer; bestaande locaties blijven ongewijzigd en coördinaten worden niet geconverteerd","locationPasteInEditor": "Plak coördinatenparen in de locatie-editor, waar de volgorde breedtegraad, lengtegraad en het coördinatenstelsel expliciet zijn aangegeven","location": "Locatie","locationName": "Naam (optioneel)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Decimale coördinaten in de volgorde breedtegraad, lengtegraad; de volgorde wordt nooit omgewisseld","invalidCoordinates": "Voer een eindige breedtegraad van -90 tot 90 en lengtegraad van -180 tot 180 in, of laat beide leeg","invalidCoordinateSystem": "Kies een ondersteund coördinatenstelsel",- "coordinateSystemTip": "Het wijzigen van het label van het coördinatenstelsel converteert de coördinaten niet",+ "coordinateSystemTip": "Selecteer het coördinatenstelsel dat de coördinaten daadwerkelijk gebruiken; het wijzigen van het label converteert de coördinaten niet","pageScrollUp": "Vorig scherm","pageScrollDown": "Volgend scherm","showPageScrollButtons": "Knoppen voor scrollen per scherm tonen",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex a128e9c0e0..f4ee166376 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Wybierz układ współrzędnych",+ "coordinateOrder": "Kolejność współrzędnych",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Mapy są niedostępne, gdy pomijanie uwierzytelniania jest włączone. Rekordy pozostają dostępne","mapSettings": "Mapa","mapServices": "Usługi map",@@ -47,7 +52,7 @@"mapFitMarkers": "Dopasuj do wszystkich wczytanych znaczników","mapTooManyMarkers": "Ta strona zawiera więcej niż ${limit} lokalizacji. Użyj filtrów lub zmniejsz rozmiar strony, aby wyświetlić mapę","defaultCoordinateSystem": "Domyślny układ współrzędnych dla nowych wpisów",- "defaultCoordinateSystemTip": "Dotyczy tylko nowych wpisów; istniejące lokalizacje zachowują swoje układy współrzędnych",+ "defaultCoordinateSystemTip": "Dotyczy tylko nowych wpisów; istniejące lokalizacje pozostają bez zmian, a współrzędne nie są przeliczane","locationPasteInEditor": "Wklej pary współrzędnych w edytorze lokalizacji, w którym określono kolejność szerokość, długość geograficzna oraz układ współrzędnych","location": "Lokalizacja","locationName": "Nazwa (opcjonalna)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Współrzędne dziesiętne w kolejności szerokość, długość geograficzna; kolejność nie jest automatycznie zamieniana","invalidCoordinates": "Podaj skończoną szerokość od -90 do 90 i długość od -180 do 180 lub pozostaw oba pola puste","invalidCoordinateSystem": "Wybierz obsługiwany układ współrzędnych",- "coordinateSystemTip": "Zmiana etykiety układu współrzędnych nie przelicza współrzędnych",+ "coordinateSystemTip": "Wybierz układ rzeczywiście używany przez współrzędne; zmiana etykiety nie przelicza współrzędnych","pageScrollUp": "Poprzedni ekran","pageScrollDown": "Następny ekran","showPageScrollButtons": "Pokaż przyciski przewijania o jeden ekran",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex 993d9b5552..507a1760e1 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Selecione um sistema de coordenadas",+ "coordinateOrder": "Ordem das coordenadas",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Os mapas ficam indisponíveis enquanto a opção de ignorar a autenticação está ativada. Os registros continuam disponíveis","mapSettings": "Mapa","mapServices": "Serviços de mapas",@@ -47,7 +52,7 @@"mapFitMarkers": "Ajustar a todos os marcadores carregados","mapTooManyMarkers": "Esta página tem mais de ${limit} localizações. Use filtros ou reduza o tamanho da página para exibir o mapa","defaultCoordinateSystem": "Sistema de coordenadas padrão para novas entradas",- "defaultCoordinateSystemTip": "Aplica-se apenas a novas entradas; as localizações existentes mantêm seus sistemas de coordenadas",+ "defaultCoordinateSystemTip": "Aplica-se apenas a novas entradas; as localizações existentes não mudam e as coordenadas não são convertidas","locationPasteInEditor": "Cole os pares de coordenadas no editor de localização, onde a ordem latitude, longitude e o sistema de coordenadas são explícitos","location": "Localização","locationName": "Nome (opcional)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Coordenadas decimais na ordem latitude, longitude; a ordem nunca é invertida","invalidCoordinates": "Insira uma latitude finita de -90 a 90 e uma longitude de -180 a 180, ou deixe ambas vazias","invalidCoordinateSystem": "Escolha um sistema de coordenadas compatível",- "coordinateSystemTip": "Alterar o rótulo do sistema de coordenadas não converte as coordenadas",+ "coordinateSystemTip": "Selecione o sistema realmente usado pelas coordenadas; alterar o rótulo não converte as coordenadas","pageScrollUp": "Tela anterior","pageScrollDown": "Próxima tela","showPageScrollButtons": "Mostrar botões de rolagem por tela",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex 18be2d4995..83bde4bf50 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Выберите систему координат",+ "coordinateOrder": "Порядок координат",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Карты недоступны, пока включён обход аутентификации. Записи остаются доступными","mapSettings": "Карта","mapServices": "Картографические сервисы",@@ -47,7 +52,7 @@"mapFitMarkers": "Показать все загруженные маркеры","mapTooManyMarkers": "На этой странице больше ${limit} местоположений. Используйте фильтры или уменьшите размер страницы, чтобы отобразить карту","defaultCoordinateSystem": "Система координат по умолчанию для новых данных",- "defaultCoordinateSystemTip": "Применяется только к новым данным; существующие местоположения сохраняют свои системы координат",+ "defaultCoordinateSystemTip": "Применяется только к новым данным; существующие местоположения не меняются, координаты не преобразуются","locationPasteInEditor": "Вставляйте пары координат в редакторе местоположения, где явно указаны порядок широта, долгота и система координат","location": "Местоположение","locationName": "Название (необязательно)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Десятичные координаты в порядке широта, долгота; порядок никогда не меняется автоматически","invalidCoordinates": "Введите конечную широту от -90 до 90 и долготу от -180 до 180 или оставьте оба поля пустыми","invalidCoordinateSystem": "Выберите поддерживаемую систему координат",- "coordinateSystemTip": "Изменение метки системы координат не преобразует координаты",+ "coordinateSystemTip": "Выберите систему, в которой фактически заданы координаты; изменение метки не преобразует координаты","pageScrollUp": "Предыдущий экран","pageScrollDown": "Следующий экран","showPageScrollButtons": "Показывать кнопки прокрутки на один экран",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex 47ad2ca7dc..a5077eaa3a 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Vyberte súradnicový systém",+ "coordinateOrder": "Poradie súradníc",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Mapy nie sú dostupné, keď je zapnuté obchádzanie overenia totožnosti. Záznamy zostávajú dostupné","mapSettings": "Mapa","mapServices": "Mapové služby",@@ -47,7 +52,7 @@"mapFitMarkers": "Zobraziť všetky načítané značky","mapTooManyMarkers": "Táto stránka obsahuje viac ako ${limit} polôh. Na zobrazenie mapy použite filtre alebo menšiu veľkosť stránky","defaultCoordinateSystem": "Predvolený súradnicový systém pre nové údaje",- "defaultCoordinateSystemTip": "Platí iba pre nové údaje; existujúce polohy si zachovajú svoj súradnicový systém",+ "defaultCoordinateSystemTip": "Platí iba pre nové údaje; existujúce polohy zostanú nezmenené a súradnice sa neprepočítajú","locationPasteInEditor": "Dvojice súradníc vkladajte v editore polohy, kde je uvedené poradie šírka, dĺžka a súradnicový systém","location": "Poloha","locationName": "Názov (voliteľný)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Desatinné súradnice v poradí šírka, dĺžka; poradie sa nikdy automaticky nevymieňa","invalidCoordinates": "Zadajte konečnú šírku od -90 do 90 a dĺžku od -180 do 180 alebo nechajte obe polia prázdne","invalidCoordinateSystem": "Vyberte podporovaný súradnicový systém",- "coordinateSystemTip": "Zmena označenia súradnicového systému neprepočíta súradnice",+ "coordinateSystemTip": "Vyberte súradnicový systém, ktorý súradnice skutočne používajú; zmena označenia neprepočíta súradnice","pageScrollUp": "Predchádzajúca obrazovka","pageScrollDown": "Nasledujúca obrazovka","showPageScrollButtons": "Zobraziť tlačidlá posúvania o jednu obrazovku",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 5086bbd137..fda946cecf 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Изаберите координатни систем",+ "coordinateOrder": "Редослед координата",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Мапе нису доступне док је укључено заобилажење аутентификације. Записи остају доступни","mapSettings": "Мапа","mapServices": "Услуге мапа",@@ -47,7 +52,7 @@"mapFitMarkers": "Прикажи све учитане ознаке","mapTooManyMarkers": "Ова страница има више од ${limit} локација. Користите филтере или смањите величину странице да бисте приказали мапу","defaultCoordinateSystem": "Подразумевани координатни систем за нове уносе",- "defaultCoordinateSystemTip": "Примењује се само на нове уносе; постојеће локације задржавају своје координатне системе",+ "defaultCoordinateSystemTip": "Примењује се само на нове уносе; постојеће локације остају непромењене, а координате се не претварају","locationPasteInEditor": "Налепите парове координата у уређивачу локације, где су јасно наведени редослед ширина, дужина и координатни систем","location": "Локација","locationName": "Назив (опционо)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Децималне координате редом ширина, дужина; редослед се никада аутоматски не мења","invalidCoordinates": "Унесите коначну ширину од -90 до 90 и дужину од -180 до 180 или оставите оба поља празна","invalidCoordinateSystem": "Изаберите подржани координатни систем",- "coordinateSystemTip": "Промена ознаке координатног система не претвара координате",+ "coordinateSystemTip": "Изаберите систем који координате заиста користе; промена ознаке не претвара координате","pageScrollUp": "Претходни екран","pageScrollDown": "Следећи екран","showPageScrollButtons": "Прикажи дугмад за померање за један екран",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 4b5c516f17..6143e6d8b2 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "โปรดเลือกระบบพิกัด",+ "coordinateOrder": "ลำดับพิกัด",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "แผนที่ไม่พร้อมใช้งานขณะเปิดใช้การข้ามการยืนยันตัวตน ระเบียนยังคงพร้อมใช้งาน","mapSettings": "แผนที่","mapServices": "บริการแผนที่",@@ -47,7 +52,7 @@"mapFitMarkers": "ปรับให้เห็นหมุดที่โหลดแล้วทั้งหมด","mapTooManyMarkers": "หน้านี้มีตำแหน่งมากกว่า ${limit} รายการ ใช้ตัวกรองหรือลดขนาดหน้าเพื่อแสดงแผนที่","defaultCoordinateSystem": "ระบบพิกัดเริ่มต้นสำหรับข้อมูลใหม่",- "defaultCoordinateSystemTip": "ใช้กับข้อมูลใหม่เท่านั้น ตำแหน่งเดิมจะคงระบบพิกัดของตนไว้",+ "defaultCoordinateSystemTip": "ใช้กับข้อมูลใหม่เท่านั้น ตำแหน่งเดิมจะไม่เปลี่ยนแปลงและจะไม่มีการแปลงพิกัด","locationPasteInEditor": "วางคู่พิกัดในตัวแก้ไขตำแหน่ง ซึ่งระบุลำดับละติจูด ลองจิจูด และระบบพิกัดไว้อย่างชัดเจน","location": "ตำแหน่ง","locationName": "ชื่อ (ไม่บังคับ)",@@ -59,7 +64,7 @@"coordinateOrderTip": "พิกัดทศนิยมเรียงตามละติจูด ลองจิจูด โดยจะไม่สลับลำดับอัตโนมัติ","invalidCoordinates": "ป้อนละติจูดที่เป็นจำนวนจำกัดตั้งแต่ -90 ถึง 90 และลองจิจูดตั้งแต่ -180 ถึง 180 หรือเว้นว่างทั้งคู่","invalidCoordinateSystem": "เลือกระบบพิกัดที่รองรับ",- "coordinateSystemTip": "การเปลี่ยนป้ายกำกับระบบพิกัดจะไม่แปลงพิกัด",+ "coordinateSystemTip": "เลือกระบบที่พิกัดใช้งานจริง การเปลี่ยนป้ายกำกับจะไม่แปลงพิกัด","pageScrollUp": "หน้าจอก่อนหน้า","pageScrollDown": "หน้าจอถัดไป","showPageScrollButtons": "แสดงปุ่มเลื่อนทีละหน้าจอ",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex a8de86e72d..74b6ac413c 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Bir koordinat sistemi seçin",+ "coordinateOrder": "Koordinat sırası",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Kimlik doğrulamayı atlama etkinken haritalar kullanılamaz. Kayıtlar kullanılabilir durumda kalır","mapSettings": "Harita","mapServices": "Harita hizmetleri",@@ -47,7 +52,7 @@"mapFitMarkers": "Yüklenen tüm işaretleri görünüm içine sığdır","mapTooManyMarkers": "Bu sayfada ${limit} konumdan fazla konum var. Haritayı göstermek için filtreleri kullanın veya sayfa boyutunu küçültün","defaultCoordinateSystem": "Yeni girişler için varsayılan koordinat sistemi",- "defaultCoordinateSystemTip": "Yalnızca yeni girişlere uygulanır; mevcut konumlar kendi koordinat sistemlerini korur",+ "defaultCoordinateSystemTip": "Yalnızca yeni girişlere uygulanır; mevcut konumlar değişmez ve koordinatlar dönüştürülmez","locationPasteInEditor": "Koordinat çiftlerini enlem, boylam sırasının ve koordinat sisteminin açıkça belirtildiği konum düzenleyicisine yapıştırın","location": "Konum","locationName": "Ad (isteğe bağlı)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Enlem, boylam sırasında ondalık koordinatlar; sıra hiçbir zaman otomatik değiştirilmez","invalidCoordinates": "-90 ile 90 arasında sonlu bir enlem ve -180 ile 180 arasında bir boylam girin veya ikisini de boş bırakın","invalidCoordinateSystem": "Desteklenen bir koordinat sistemi seçin",- "coordinateSystemTip": "Koordinat sistemi etiketini değiştirmek koordinatları dönüştürmez",+ "coordinateSystemTip": "Koordinatların gerçekte kullandığı sistemi seçin; etiketi değiştirmek koordinatları dönüştürmez","pageScrollUp": "Önceki ekran","pageScrollDown": "Sonraki ekran","showPageScrollButtons": "Ekranlık kaydırma düğmelerini göster",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 4e248fa7b5..f145f407e4 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "Виберіть систему координат",+ "coordinateOrder": "Порядок координат",+ "coordinateSystemWGS84": "WGS84 (OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02 (AMap, Tencent Maps)",+ "coordinateSystemBD09": "BD-09 (Baidu Maps)","mapAuthenticationBypass": "Мапи недоступні, доки ввімкнено обхід автентифікації. Записи залишаються доступними","mapSettings": "Мапа","mapServices": "Картографічні сервіси",@@ -47,7 +52,7 @@"mapFitMarkers": "Показати всі завантажені маркери","mapTooManyMarkers": "На цій сторінці понад ${limit} місцеположень. Використайте фільтри або зменште розмір сторінки, щоб показати мапу","defaultCoordinateSystem": "Типова система координат для нових даних",- "defaultCoordinateSystemTip": "Застосовується лише до нових даних; наявні розташування зберігають свої системи координат",+ "defaultCoordinateSystemTip": "Застосовується лише до нових даних; наявні розташування не змінюються, координати не перетворюються","locationPasteInEditor": "Вставляйте пари координат у редакторі розташування, де явно вказано порядок широта, довгота та систему координат","location": "Розташування","locationName": "Назва (необов’язково)",@@ -59,7 +64,7 @@"coordinateOrderTip": "Десяткові координати в порядку широта, довгота; порядок ніколи не змінюється автоматично","invalidCoordinates": "Введіть скінченну широту від -90 до 90 і довготу від -180 до 180 або залиште обидва поля порожніми","invalidCoordinateSystem": "Виберіть підтримувану систему координат",- "coordinateSystemTip": "Зміна позначки системи координат не перетворює координати",+ "coordinateSystemTip": "Виберіть систему, у якій фактично задано координати; зміна позначки не перетворює координати","pageScrollUp": "Попередній екран","pageScrollDown": "Наступний екран","showPageScrollButtons": "Показувати кнопки прокручування на один екран",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 5360e259b4..38f68b9935 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "请选择坐标系",+ "coordinateOrder": "坐标顺序",+ "coordinateSystemWGS84": "WGS84(OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02(高德、腾讯)",+ "coordinateSystemBD09": "BD-09(百度)","mapAuthenticationBypass": "启用鉴权绕过时无法使用地图,记录仍可访问","mapSettings": "地图","mapServices": "地图服务",@@ -47,7 +52,7 @@"mapFitMarkers": "显示全部已加载的标记","mapTooManyMarkers": "当前页面的位置超过 ${limit} 个,请使用筛选或减小每页记录数以显示地图","defaultCoordinateSystem": "新录入默认坐标系",- "defaultCoordinateSystemTip": "仅影响新录入,已有位置保留各自的坐标系",+ "defaultCoordinateSystemTip": "仅用于新录入;已有位置保持不变,不转换坐标","locationPasteInEditor": "请在位置编辑器中粘贴坐标对,明确纬度、经度顺序和坐标系","location": "位置","locationName": "名称(可选)",@@ -59,7 +64,7 @@"coordinateOrderTip": "按纬度、经度顺序输入十进制度坐标,不会自动交换顺序","invalidCoordinates": "请输入 -90 至 90 的有限纬度和 -180 至 180 的有限经度,或同时留空","invalidCoordinateSystem": "请选择支持的坐标系",- "coordinateSystemTip": "更改坐标系标签不会转换坐标",+ "coordinateSystemTip": "请选择坐标实际使用的坐标系;修改标记不会转换坐标","pageScrollUp": "上一屏","pageScrollDown": "下一屏","showPageScrollButtons": "显示翻屏按钮",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex b92c026e22..ea32f87f88 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,4 +1,9 @@{+ "selectCoordinateSystem": "請選擇座標系",+ "coordinateOrder": "座標順序",+ "coordinateSystemWGS84": "WGS84(OpenFreeMap)",+ "coordinateSystemGCJ02": "GCJ-02(高德、騰訊)",+ "coordinateSystemBD09": "BD-09(百度)","mapAuthenticationBypass": "啟用驗證繞過時無法使用地圖,記錄仍可存取","mapSettings": "地圖","mapServices": "地圖服務",@@ -47,7 +52,7 @@"mapFitMarkers": "顯示全部已載入的標記","mapTooManyMarkers": "目前頁面的位置超過 ${limit} 個,請使用篩選或減少每頁記錄數以顯示地圖","defaultCoordinateSystem": "新輸入預設座標系",- "defaultCoordinateSystemTip": "僅影響新輸入,既有位置保留各自的座標系",+ "defaultCoordinateSystemTip": "僅用於新輸入;既有位置保持不變,不轉換座標","locationPasteInEditor": "請在位置編輯器中貼上座標對,明確緯度、經度順序和座標系","location": "位置","locationName": "名稱(選填)",@@ -59,7 +64,7 @@"coordinateOrderTip": "依緯度、經度順序輸入十進位度數座標,不會自動交換順序","invalidCoordinates": "請輸入 -90 至 90 的有限緯度和 -180 至 180 的有限經度,或同時留空","invalidCoordinateSystem": "請選擇支援的座標系",- "coordinateSystemTip": "變更座標系標籤不會轉換座標",+ "coordinateSystemTip": "請選擇座標實際使用的座標系;修改標記不會轉換座標","pageScrollUp": "上一屏","pageScrollDown": "下一屏","showPageScrollButtons": "顯示翻屏按鈕",diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.syindex 87610a1530..e754b72f18 100644--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy@@ -7,7 +7,7 @@"id": "20240208172514-9dsv6na","title": "Database","type": "doc",- "updated": "20261009075700"+ "updated": "20261009101102"},"Children": [{@@ -74,7 +74,7 @@"HeadingLevel": 2,"Properties": {"id": "20261009034010-6kd9rk5",- "updated": "20261009040533"+ "updated": "20261009101102"},"Children": [{@@ -88,12 +88,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-0yhiv8g",- "updated": "20261009035322"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "Add a field of type Location, then click a cell to edit its name and coordinates. The name is optional. Enter both latitude and longitude in decimal degrees. Latitude ranges from -90 to 90 and longitude from -180 to 180; zero is a valid value. Leave both coordinates blank to save only a name. In the field settings, Default coordinate system for new input only presets new input; existing locations, including Unknown, stay unchanged, each value can choose its own coordinate system, and copied or imported locations retain their saved coordinate system."+ "Data": "Add a field of type Location, then click a cell to edit its name and coordinates. The name is optional. Enter both latitude and longitude in decimal degrees. Latitude ranges from -90 to 90 and longitude from -180 to 180; zero is a valid value. Leave both coordinates blank to save only a name. In the field settings, Default coordinate system for new input only presets new input; existing locations stay unchanged, each value can choose its own coordinate system, and copied or imported locations retain their saved coordinate system. Existing locations without a labeled coordinate system are preserved as saved; when editing, explicitly select the coordinate system actually used by their coordinates. Coordinates are not converted automatically."}]},@@ -102,12 +102,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-h9vridq",- "updated": "20261009034224"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "To import coordinates, enter a pair such as 39.9042, 116.4074 in Paste coordinates and click Confirm. The order is latitude, longitude; SiYuan never swaps the values. Choose Unknown, WGS84, GCJ-02, or BD-09 for the coordinate system; this label does not convert coordinates. Imported text is retained unchanged as source metadata. Manually changing the coordinates or coordinate system clears that source text."+ "Data": "To import coordinates, enter a pair such as 39.9042, 116.4074 in Paste coordinates and click Confirm. The default Coordinate order is latitude, longitude; if the source uses longitude, latitude, switch the order manually. SiYuan does not infer the order. A coordinate pair may be enclosed in ASCII parentheses. Choose WGS84 (OpenFreeMap), GCJ-02 (AMap, Tencent Maps), or BD-09 (Baidu Maps) for the coordinate system; changing this label does not convert coordinates. Imported text is retained unchanged as source metadata. Manually changing the coordinates or coordinate system clears that source text."}]},diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.syindex 9dc09c66e7..14f3c4f2ae 100644--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy@@ -7,7 +7,7 @@"id": "20240208113259-nykkvaq","title": "数据库","type": "doc",- "updated": "20261009075700"+ "updated": "20261009101102"},"Children": [{@@ -74,7 +74,7 @@"HeadingLevel": 2,"Properties": {"id": "20261009034010-m7nwg3o",- "updated": "20261009040533"+ "updated": "20261009101102"},"Children": [{@@ -88,12 +88,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-8ihp92l",- "updated": "20261009035322"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "添加类型为「位置」的字段后,点击单元格编辑名称和坐标。名称可留空。纬度和经度须成对填写,使用十进制度数。纬度范围为 -90 到 90,经度范围为 -180 到 180,零是有效值。将两个坐标都留空时,可仅保存名称。字段设置中的「新录入默认坐标系」仅用于新录入的位置;已有位置(包括「未知」)保持不变,每个值仍可单独选择坐标系,复制或导入的位置保留其已保存的坐标系。"+ "Data": "添加类型为「位置」的字段后,点击单元格编辑名称和坐标。名称可留空。纬度和经度须成对填写,使用十进制度数。纬度范围为 -90 到 90,经度范围为 -180 到 180,零是有效值。将两个坐标都留空时,可仅保存名称。字段设置中的「新录入默认坐标系」仅用于新录入的位置;已有位置保持不变,每个值仍可单独选择坐标系,复制或导入的位置保留其已保存的坐标系。已有未标注坐标系的位置按原值保留;编辑时需明确选择坐标实际使用的坐标系,不会自动转换坐标。"}]},@@ -102,12 +102,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-grvs8hv",- "updated": "20261009034224"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "导入坐标时,在「粘贴坐标」中输入 39.9042, 116.4074 这样的坐标对,再点击「确定」。顺序为纬度、经度,思源不会自动交换两者。坐标系可选择「未知」、WGS84、GCJ-02 或 BD-09;此标记不进行坐标转换。导入的原始文本会原样保留为来源信息,手动修改坐标或坐标系会清除该来源文本。"+ "Data": "导入坐标时,在「粘贴坐标」中输入 39.9042, 116.4074 这样的坐标对,再点击「确定」。「坐标顺序」默认为纬度、经度;若来源为经度、纬度,请手动切换,思源不会自动判断。坐标对可用英文括号包裹。坐标系可选择 WGS84(OpenFreeMap)、GCJ-02(高德、腾讯)或 BD-09(百度);修改此标记不会转换坐标。导入的原始文本会原样保留为来源信息,手动修改坐标或坐标系会清除该来源文本。"}]},diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.syindex 5c98d0d4b1..232a169d08 100644--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy@@ -7,7 +7,7 @@"id": "20240208171522-y7dxcno","title": "資料庫","type": "doc",- "updated": "20261009075700"+ "updated": "20261009101102"},"Children": [{@@ -74,7 +74,7 @@"HeadingLevel": 2,"Properties": {"id": "20261009034010-5oq6h7a",- "updated": "20261009040533"+ "updated": "20261009101102"},"Children": [{@@ -88,12 +88,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-m2e4n60",- "updated": "20261009035322"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "新增類型為「位置」的欄位後,點擊儲存格編輯名稱和座標。名稱可留空。緯度和經度須成對填寫,使用十進位度數。緯度範圍為 -90 到 90,經度範圍為 -180 到 180,零是有效值。將兩個座標都留空時,可僅保存名稱。欄位設定中的「新輸入預設座標系」僅用於新輸入的位置;既有位置(包括「未知」)保持不變,每個值仍可單獨選擇座標系,複製或匯入的位置保留其已保存的座標系。"+ "Data": "新增類型為「位置」的欄位後,點擊儲存格編輯名稱和座標。名稱可留空。緯度和經度須成對填寫,使用十進位度數。緯度範圍為 -90 到 90,經度範圍為 -180 到 180,零是有效值。將兩個座標都留空時,可僅保存名稱。欄位設定中的「新輸入預設座標系」僅用於新輸入的位置;既有位置保持不變,每個值仍可單獨選擇座標系,複製或匯入的位置保留其已保存的座標系。既有未標註座標系的位置按原值保留;編輯時需明確選擇座標實際使用的座標系,不會自動轉換座標。"}]},@@ -102,12 +102,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-ue87c6m",- "updated": "20261009034224"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "匯入座標時,在「貼上座標」中輸入 39.9042, 116.4074 這樣的座標對,再點擊「確定」。順序為緯度、經度,思源不會自動交換兩者。座標系可選擇「未知」、WGS84、GCJ-02 或 BD-09;此標記不進行座標轉換。匯入的原始文字會原樣保留為來源資訊,手動修改座標或座標系會清除該來源文字。"+ "Data": "匯入座標時,在「貼上座標」中輸入 39.9042, 116.4074 這樣的座標對,再點擊「確定」。「座標順序」預設為緯度、經度;若來源為經度、緯度,請手動切換,思源不會自動判斷。座標對可用英文括號包裹。座標系可選擇 WGS84(OpenFreeMap)、GCJ-02(高德、騰訊)或 BD-09(百度);修改此標記不會轉換座標。匯入的原始文字會原樣保留為來源資訊,手動修改座標或座標系會清除該來源文字。"}]},diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.syindex a13ec24534..2210efc5e6 100644--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy@@ -8,7 +8,7 @@"id": "20240530101000-3eaevtp","title": "データベース","type": "doc",- "updated": "20261009075700"+ "updated": "20261009101102"},"Children": [{@@ -75,7 +75,7 @@"HeadingLevel": 2,"Properties": {"id": "20261009034010-6j4iniw",- "updated": "20261009040533"+ "updated": "20261009101102"},"Children": [{@@ -89,12 +89,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-x0x9tob",- "updated": "20261009035322"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "「位置」タイプのフィールドを追加し、セルをクリックして名前と座標を編集します。名前は省略できます。緯度と経度は十進数の度数で、必ず両方を指定します。緯度は -90 から 90、経度は -180 から 180 の範囲で、ゼロも有効な値です。両方の座標を空欄にすると、名前だけを保存できます。フィールド設定の「新規入力の既定の座標系」は新しく入力する位置にのみ適用され、「不明」を含む既存の位置は変更されず、各値の座標系は個別に選択でき、コピーまたはインポートした位置では保存済みの座標系が維持されます。"+ "Data": "「位置」タイプのフィールドを追加し、セルをクリックして名前と座標を編集します。名前は省略できます。緯度と経度は十進数の度数で、必ず両方を指定します。緯度は -90 から 90、経度は -180 から 180 の範囲で、ゼロも有効な値です。両方の座標を空欄にすると、名前だけを保存できます。フィールド設定の「新規入力の既定の座標系」は新しく入力する位置にのみ適用され、既存の位置は変更されず、各値の座標系は個別に選択でき、コピーまたはインポートした位置では保存済みの座標系が維持されます。座標系が設定されていない既存の位置は保存された値のまま保持されます。編集時には座標が実際に使用している座標系を明示的に選択してください。座標は自動変換されません。"}]},@@ -103,12 +103,12 @@"Type": "NodeParagraph","Properties": {"id": "20261009034010-1609sdo",- "updated": "20261009034224"+ "updated": "20261009101102"},"Children": [{"Type": "NodeText",- "Data": "座標を取り込むには、「座標を貼り付け」に 39.9042, 116.4074 のような座標の組を入力し、「確認」をクリックします。順序は緯度、経度で、SiYuan は自動で入れ替えません。座標系には「不明」、WGS84、GCJ-02、BD-09 を選択できますが、このラベルを変更しても座標は変換されません。取り込んだ元のテキストは出典情報としてそのまま保持されます。座標または座標系を手動で変更すると、この出典テキストは消去されます。"+ "Data": "座標を取り込むには、「座標を貼り付け」に 39.9042, 116.4074 のような座標の組を入力し、「確認」をクリックします。「座標の順序」の既定値は緯度、経度です。元データが経度、緯度の順の場合は手動で切り替えてください。SiYuan は順序を自動判定しません。座標の組を半角括弧で囲むこともできます。座標系には WGS84(OpenFreeMap)、GCJ-02(AMap、Tencent Maps)、BD-09(Baidu Maps)を選択できますが、このラベルを変更しても座標は変換されません。取り込んだ元のテキストは出典情報としてそのまま保持されます。座標または座標系を手動で変更すると、この出典テキストは消去されます。"}]},diff --git a/app/src/config/map.test.ts b/app/src/config/map.test.tsindex a289a74236..61a8b623d6 100644--- a/app/src/config/map.test.ts+++ b/app/src/config/map.test.ts@@ -125,7 +125,7 @@ test("Map settings share desktop/mobile order, existing icon, searchable controlassert.equal((html.match(/type="password" autocomplete="off"/g) || []).length, 2);assert.doesNotMatch(html, /value=".*apiKey/i);const tabs = readFileSync("src/config/setting/tabs.ts", "utf8");- assert.match(tabs, /ocr: setting\.tab\([\s\S]*?map: setting\.tab\([\s\S]*?icon: "iconPin"[\s\S]*?registerMapTab\),\s*export:/);+ assert.match(tabs, /ocr: setting\.tab\([\s\S]*?map: setting\.tab\([\s\S]*?icon: "iconGlobe"[\s\S]*?registerMapTab\),\s*export:/);assert.match(readFileSync("src/mobile/menu/settingPanel.ts", "utf8"), /tabId === "map"[\s\S]*?unmountMapTab\(root\)/);assert.match(readFileSync("src/config/index.ts", "utf8"), /if \(mapRoot\) unmountMapTab\(mapRoot\)/);});diff --git a/app/src/config/setting/tabs.ts b/app/src/config/setting/tabs.tsindex 976c4e2d37..bb03e906cb 100644--- a/app/src/config/setting/tabs.ts+++ b/app/src/config/setting/tabs.ts@@ -95,7 +95,7 @@ const createSettingTabs = () => {}, registerOCRTab),map: setting.tab({id: "map",- icon: "iconPin",+ icon: "iconGlobe",title: () => window.siyuan.languages.mapSettings,afterMount: mountMapTab,}, registerMapTab),diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.tsindex 1b8f41cfd5..f65f504637 100644--- a/app/src/protyle/render/av/col.ts+++ b/app/src/protyle/render/av/col.ts@@ -776,7 +776,7 @@ export const getColIconByType = (type: TAVCol) => {case "phone":return "iconPhone";case "location":- return "iconPin";+ return "iconGlobe";case "template":return "iconMath";case "checkbox":@@ -2121,7 +2121,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st});menu.addItem({id: "location",- icon: "iconPin",+ icon: "iconGlobe",label: window.siyuan.languages.location,click() {const id = Lute.NewNodeID();diff --git a/app/src/protyle/render/av/locationColumn.test.ts b/app/src/protyle/render/av/locationColumn.test.tsindex c3b121b44a..5cff2a0f93 100644--- a/app/src/protyle/render/av/locationColumn.test.ts+++ b/app/src/protyle/render/av/locationColumn.test.ts@@ -8,18 +8,19 @@ const compiled = transpileModule(readFileSync("src/protyle/render/av/locationColcompilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2020},}).outputText;-test("location default CRS uses checked submenus on desktop and mobile", () => {- for (const mobile of [false, true]) {+test("location default CRS lists explicit systems and providers on desktop and mobile without guessing missing defaults", () => {+ for (const [mobile, defaultSystem] of [[false, "gcj02"], [true, "gcj02"], [false, "unknown"], [true, "unknown"]] as const) {const items: IMenu[] = [];const mobileItems: IMenu[] = [];const changes: string[] = [];const listeners = new Map<string, (event: any) => void>();+ const attributes = new Map<string, string>();let shown = 0;let closed = 0;let focused = false;const submenu = {querySelector: () => ({focus: () => focused = true})};const element = {- dataset: {}, setAttribute() {}, focus() {},+ dataset: {}, setAttribute: (name: string, value: string) => attributes.set(name, value), focus() {},classList: {add() {}, remove() {}},querySelector: () => submenu,addEventListener: (type: string, handler: (event: any) => void) => listeners.set(type, handler),@@ -29,13 +30,21 @@ test("location default CRS uses checked submenus on desktop and mobile", () => {const api = {} as typeof import("./locationColumn");runInNewContext(compiled, {exports: api,- window: {siyuan: {languages: {coordinateSystemUnknown: "Unknown", defaultCoordinateSystem: "Default", defaultCoordinateSystemTip: "New input only"},+ window: {siyuan: {languages: {+ coordinateSystemWGS84: "WGS84 (OpenFreeMap)", coordinateSystemGCJ02: "GCJ-02 (AMap, Tencent Maps)",+ coordinateSystemBD09: "BD-09 (Baidu Maps)", defaultCoordinateSystem: "Default", defaultCoordinateSystemTip: "New input only",+ },menus: {menu: {showSubMenu: () => shown++}}}},require: (name: string) => ({"../../../util/functions": {isMobile: () => mobile},"../../../menus/Menu": {MenuItem: class {element = element;- constructor(options: IMenu) { items.push(...options.submenu); }+ constructor(options: IMenu) {+ assert.equal(options.icon, "iconGlobe");+ assert.equal(options.action, "iconInfo");+ assert.equal(options.actionLabel, "New input only");+ items.push(...options.submenu);+ }}},"../../../plugin/Menu": {Menu: class {addItem(item: IMenu) { mobileItems.push(item); }@@ -43,7 +52,7 @@ test("location default CRS uses checked submenus on desktop and mobile", () => {}},})[name],});- const column = {id: "location", type: "location", location: {defaultCoordinateSystem: "gcj02"}} as IAVColumn;+ const column = {id: "location", type: "location", location: {defaultCoordinateSystem: defaultSystem}} as IAVColumn;api.bindLocationDefaultCoordinateSystem({column,menuElement: {@@ -53,28 +62,44 @@ test("location default CRS uses checked submenus on desktop and mobile", () => {} as unknown as HTMLElement,onChange: system => changes.push(system),});- assert.deepEqual(items.map(item => item.label), ["Unknown", "WGS84", "GCJ-02", "BD-09"]);- assert.deepEqual(items.map(item => item.checked), [false, false, true, false]);+ assert.deepEqual(items.map(item => item.label), ["WGS84 (OpenFreeMap)", "GCJ-02 (AMap, Tencent Maps)", "BD-09 (Baidu Maps)"]);+ assert.equal(attributes.has("title"), false);+ assert.deepEqual(items.map(item => item.checked), [false, defaultSystem === "gcj02", false]);+ assert.deepEqual(changes, []);const event = {preventDefault() {}, stopPropagation() {}};if (mobile) {assert.equal(listeners.has("mouseenter"), false);listeners.get("click")(event);- assert.equal(mobileItems.length, 4);+ assert.equal(mobileItems.length, 3);} else {listeners.get("mouseenter")(event);listeners.get("keydown")({...event, key: "ArrowRight"});assert.equal(focused, true);}assert.ok(shown > 0);- items[2].click({} as HTMLElement, {} as MouseEvent);- assert.equal(changes.length, 0);items[1].click({} as HTMLElement, {} as MouseEvent);- assert.deepEqual(changes, ["wgs84"]);+ assert.deepEqual(changes, defaultSystem === "gcj02" ? [] : ["gcj02"]);+ items[0].click({} as HTMLElement, {} as MouseEvent);+ assert.deepEqual(changes, defaultSystem === "gcj02" ? ["wgs84"] : ["gcj02", "wgs84"]);assert.equal(closed, 2);- assert.equal(column.location.defaultCoordinateSystem, "gcj02");+ assert.equal(column.location.defaultCoordinateSystem, defaultSystem);}});+test("location field menus reuse the existing globe icon without changing pin actions", () => {+ const source = readFileSync("src/protyle/render/av/col.ts", "utf8");+ const start = source.indexOf("export const getColIconByType =");+ const end = source.indexOf("const addAttrViewColAnimation =", start);+ const api = {} as {getColIconByType: (type: string) => string};+ runInNewContext(transpileModule(source.slice(start, end), {+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2020},+ }).outputText, {exports: api});+ assert.equal(api.getColIconByType("location"), "iconGlobe");+ assert.match(source, /id: "location",\s*icon: "iconGlobe"/);+ assert.match(source, /icon: isFreeze \? "iconUnpin" : "iconPin"/);+ assert.match(readFileSync("appearance/icons/litheness/icon.js", "utf8"), /<symbol id="iconGlobe"/);+});+test("location default CRS setting constructs symmetric do and undo operations", () => {const source = readFileSync("src/protyle/render/av/col.ts", "utf8");const start = source.indexOf("export const bindEditEvent =");diff --git a/app/src/protyle/render/av/locationColumn.ts b/app/src/protyle/render/av/locationColumn.tsindex 5507642e8f..28bbd6fa3a 100644--- a/app/src/protyle/render/av/locationColumn.ts+++ b/app/src/protyle/render/av/locationColumn.ts@@ -11,9 +11,11 @@ export const bindLocationDefaultCoordinateSystem = (options: {if (!target) {return;}+ const languages = window.siyuan.languages;const systems: Array<[IAVCellLocationValue["coordinateSystem"], string]> = [- ["unknown", window.siyuan.languages.coordinateSystemUnknown], ["wgs84", "WGS84"],- ["gcj02", "GCJ-02"], ["bd09", "BD-09"],+ ["wgs84", languages.coordinateSystemWGS84],+ ["gcj02", languages.coordinateSystemGCJ02],+ ["bd09", languages.coordinateSystemBD09],];const items: IMenu[] = systems.map(([system, label]) => ({label,@@ -26,10 +28,15 @@ export const bindLocationDefaultCoordinateSystem = (options: {options.menuElement.closest(".av__panel")?.remove();},}));- const item = new MenuItem({icon: "iconPin", label: window.siyuan.languages.defaultCoordinateSystem, submenu: items});+ const item = new MenuItem({+ icon: "iconGlobe",+ label: languages.defaultCoordinateSystem,+ action: "iconInfo",+ actionLabel: languages.defaultCoordinateSystemTip,+ submenu: items,+ });target.replaceWith(item.element);item.element.dataset.type = "locationDefaultCoordinateSystem";- item.element.setAttribute("title", window.siyuan.languages.defaultCoordinateSystemTip);const submenu = item.element.querySelector<HTMLElement>(".b3-menu__submenu");const show = () => {item.element.classList.add("b3-menu__item--show");diff --git a/app/src/protyle/render/av/locationEditor.test.ts b/app/src/protyle/render/av/locationEditor.test.tsindex 76f4fcfc70..eabe58b7c7 100644--- a/app/src/protyle/render/av/locationEditor.test.ts+++ b/app/src/protyle/render/av/locationEditor.test.ts@@ -35,12 +35,13 @@ class Control {const createEditor = (options: {value?: IAVCellLocationValue;+ unspecifiedSystem?: boolean;mobile?: boolean;isValid?: () => boolean;alreadyOpen?: boolean;save?: (value: IAVCellLocationValue) => Promise<void>;} = {}) => {- const fields = Object.fromEntries(["name", "latitude", "longitude", "coordinateSystem", "paste"]+ const fields = Object.fromEntries(["name", "latitude", "longitude", "coordinateSystem", "coordinateOrder", "paste"].map(name => [name, new Control()]));const buttons = Object.fromEntries(["save", "clear", "cancel", "parse"].map(name => [name, new Control()]));const container = new Control();@@ -114,7 +115,7 @@ const createEditor = (options: {},});const dialog = methods.openAVLocationEditor({- value: options.value,+ value: options.unspecifiedSystem ? options.value : {coordinateSystem: "wgs84", ...options.value},ownerElement: owner as HTMLElement,avBlockID: "database-block",isValid: options.isValid,@@ -136,6 +137,54 @@ const createEditor = (options: {};describe("database location editor", () => {+ it("requires an explicit real CRS without relabeling old unspecified coordinates", async () => {+ const value = {latitude: 25.04, longitude: 102.42, coordinateSystem: "unknown" as const};+ const editor = createEditor({value, unspecifiedSystem: true});+ assert.equal(editor.fields.coordinateSystem.value, "");+ assert.doesNotMatch(editor.markup, /<option value="unknown">/);+ editor.buttons.save.dispatch("click");+ await editor.settle();+ assert.equal(editor.saved.length, 0);+ assert.equal(editor.error.textContent, "selectCoordinateSystem");+ assert.equal(value.coordinateSystem, "unknown");+ editor.fields.coordinateSystem.value = "gcj02";+ editor.fields.coordinateSystem.dispatch("change");+ editor.buttons.save.dispatch("click");+ await editor.settle();+ assert.equal(editor.saved[0].coordinateSystem, "gcj02");+ assert.equal(editor.saved[0].latitude, value.latitude);+ assert.equal(editor.saved[0].longitude, value.longitude);+ });++ it("parses parenthesized longitude-first input only after explicit order selection", async () => {+ const editor = createEditor();+ editor.fields.paste.value = "(102.42,25.04)";+ editor.buttons.parse.dispatch("click");+ assert.equal(editor.error.textContent, "invalidCoordinates");+ assert.equal(editor.fields.paste.focused, true);+ assert.equal(editor.fields.latitude.value, "");+ editor.fields.coordinateOrder.value = "longitudeLatitude";+ editor.fields.coordinateOrder.dispatch("change");+ editor.buttons.parse.dispatch("click");+ assert.equal(editor.fields.latitude.value, "25.04");+ assert.equal(editor.fields.longitude.value, "102.42");+ editor.buttons.save.dispatch("click");+ await editor.settle();+ assert.equal(editor.saved[0].originalInput, "(102.42,25.04)");+ });++ it("changing import order requires confirmation without changing existing coordinates", async () => {+ const editor = createEditor({value: {latitude: 20, longitude: 30, originalInput: "20,30"}});+ editor.fields.coordinateOrder.value = "longitudeLatitude";+ editor.fields.coordinateOrder.dispatch("change");+ editor.buttons.save.dispatch("click");+ await editor.settle();+ assert.equal(editor.saved.length, 0);+ assert.equal(editor.fields.latitude.value, "20");+ editor.buttons.parse.dispatch("click");+ assert.equal(editor.fields.latitude.value, "30");+ });+it("does not create overlapping editors on repeated open events", () => {const editor = createEditor({alreadyOpen: true});assert.equal(editor.dialog, undefined);@@ -187,7 +236,7 @@ describe("database location editor", () => {editor.fields.name.value = "New";editor.buttons.save.dispatch("click");await editor.settle();- assert.deepEqual(editor.saved, [{...initial, name: "New", coordinateSystem: "unknown"}]);+ assert.deepEqual(editor.saved, [{...initial, name: "New", coordinateSystem: "wgs84"}]);assert.equal(initial.name, "Old");});@@ -241,7 +290,7 @@ describe("database location editor", () => {editor.buttons.save.dispatch("click");await editor.settle();assert.deepEqual(editor.saved, [{name: "Office", latitude: null, longitude: null,- coordinateSystem: "unknown", originalInput: ""}]);+ coordinateSystem: "wgs84", originalInput: ""}]);});it("opens very small stored decimal coordinates without invalid exponent notation", async () => {@@ -357,10 +406,10 @@ describe("database location editor", () => {it("requires an explicit valid coordinate system instead of silently guessing", async () => {const editor = createEditor({value: {coordinateSystem: "custom" as IAVCellLocationValue["coordinateSystem"]}});- assert.equal(editor.fields.coordinateSystem.value, "custom");+ assert.equal(editor.fields.coordinateSystem.value, "");editor.buttons.save.dispatch("click");await editor.settle();- assert.equal(editor.error.textContent, "invalidCoordinateSystem");+ assert.equal(editor.error.textContent, "selectCoordinateSystem");assert.equal(editor.saved.length, 0);});});diff --git a/app/src/protyle/render/av/locationEditor.ts b/app/src/protyle/render/av/locationEditor.tsindex 50cca43327..90ec530754 100644--- a/app/src/protyle/render/av/locationEditor.ts+++ b/app/src/protyle/render/av/locationEditor.ts@@ -46,22 +46,38 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {title: escapeHtml(languages.location),width: mobile ? "100vw" : "480px",content: `<div class="b3-dialog__content">- <label class="fn__block">${escapeHtml(languages.locationName)}<input class="b3-text-field fn__block" data-field="name" type="text" style="width:100%"></label>- <div class="fn__hr"></div>- <label class="fn__block">${escapeHtml(languages.latitude)}<input class="b3-text-field fn__block" data-field="latitude" type="text" inputmode="decimal" spellcheck="false" style="width:100%"></label>- <div class="fn__hr"></div>- <label class="fn__block">${escapeHtml(languages.longitude)}<input class="b3-text-field fn__block" data-field="longitude" type="text" inputmode="decimal" spellcheck="false" style="width:100%"></label>- <div class="fn__hr"></div>- <label class="fn__block">${escapeHtml(languages.coordinateSystem)}<select class="b3-select fn__block" data-field="coordinateSystem" style="width:100%">- <option value="unknown">${escapeHtml(languages.coordinateSystemUnknown)}</option>- <option value="wgs84">WGS84</option><option value="gcj02">GCJ-02</option><option value="bd09">BD-09</option>- </select></label>- <div class="b3-label__text">${escapeHtml(languages.coordinateSystemTip)}</div>- <div class="fn__hr"></div>- <label class="fn__block">${escapeHtml(languages.pasteCoordinates)} (${escapeHtml(languages.latitude)}, ${escapeHtml(languages.longitude)})<textarea class="b3-text-field fn__block" data-field="paste" rows="2" spellcheck="false" style="width:100%"></textarea></label>- <div class="b3-label__text">${escapeHtml(languages.coordinateOrderTip)}</div>+ <label class="b3-label b3-label--inner fn__block">${escapeHtml(languages.locationName)}+ <div class="fn__hr"></div><input class="b3-text-field fn__block" data-field="name" type="text">+ </label>+ <div class="fn__flex">+ <label class="b3-label b3-label--inner fn__flex-1">${escapeHtml(languages.latitude)}+ <div class="fn__hr"></div><input class="b3-text-field fn__block" data-field="latitude" type="text" inputmode="decimal" spellcheck="false">+ </label>+ <div class="fn__space"></div>+ <label class="b3-label b3-label--inner fn__flex-1">${escapeHtml(languages.longitude)}+ <div class="fn__hr"></div><input class="b3-text-field fn__block" data-field="longitude" type="text" inputmode="decimal" spellcheck="false">+ </label>+ </div>+ <label class="b3-label b3-label--inner fn__block">${escapeHtml(languages.coordinateSystem)}+ <div class="fn__hr"></div><select class="b3-select fn__block" data-field="coordinateSystem">+ <option value="" disabled>${escapeHtml(languages.selectCoordinateSystem)}</option>+ <option value="wgs84">${escapeHtml(languages.coordinateSystemWGS84)}</option>+ <option value="gcj02">${escapeHtml(languages.coordinateSystemGCJ02)}</option>+ <option value="bd09">${escapeHtml(languages.coordinateSystemBD09)}</option>+ </select>+ <div class="b3-label__text">${escapeHtml(languages.coordinateSystemTip)}</div>+ </label>+ <label class="b3-label b3-label--inner fn__block">${escapeHtml(languages.coordinateOrder)}+ <div class="fn__hr"></div><select class="b3-select fn__block" data-field="coordinateOrder">+ <option value="latitudeLongitude">${escapeHtml(languages.latitude)}, ${escapeHtml(languages.longitude)}</option>+ <option value="longitudeLatitude">${escapeHtml(languages.longitude)}, ${escapeHtml(languages.latitude)}</option>+ </select>+ </label>+ <label class="b3-label b3-label--inner fn__block">${escapeHtml(languages.pasteCoordinates)}+ <div class="fn__hr"></div><textarea class="b3-text-field fn__block" data-field="paste" rows="2" spellcheck="false"></textarea>+ </label><button type="button" class="b3-button b3-button--outline" data-action="parse">${escapeHtml(languages.confirm)}</button>- <div class="ft__error fn__none" data-role="error" role="alert" aria-live="polite"></div>+ <div class="ft__error fn__none" style="margin-top:8px" data-role="error" role="alert" aria-live="polite"></div></div><div class="b3-dialog__action"><button type="button" class="b3-button b3-button--text" data-action="clear">${escapeHtml(languages.clear)}</button>@@ -83,6 +99,8 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {const latitudeInput = root.querySelector<HTMLInputElement>('[data-field="latitude"]');const longitudeInput = root.querySelector<HTMLInputElement>('[data-field="longitude"]');const systemInput = root.querySelector<HTMLSelectElement>('[data-field="coordinateSystem"]');+ const orderInput = root.querySelector<HTMLSelectElement>('[data-field="coordinateOrder"]');+ orderInput.value = "latitudeLongitude";const pasteInput = root.querySelector<HTMLTextAreaElement>('[data-field="paste"]');const errorElement = root.querySelector<HTMLElement>('[data-role="error"]');const controls = root.querySelectorAll<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement | HTMLButtonElement>(@@ -92,15 +110,13 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {longitudeInput.value = initial.longitude == null ? "" : formatAVLocationCoordinate(initial.longitude);pasteInput.value = initial.originalInput || "";parsedInput = pasteInput.value;- const initialSystem = initial.coordinateSystem || "unknown";- // 无法识别的旧值保持可见,由用户明确选择后再保存。- if (!isAVLocationCoordinateSystem(initialSystem)) {- const option = document.createElement("option");- option.value = initialSystem;- option.textContent = initialSystem;- systemInput.appendChild(option);- }- systemInput.value = initialSystem;+ // 旧值未注明坐标系时保留空选项,必须明确选择,不能打开即重标。+ systemInput.value = initial.coordinateSystem && initial.coordinateSystem !== "unknown" &&+ isAVLocationCoordinateSystem(initial.coordinateSystem) ? initial.coordinateSystem : "";+ const hasSelectedSystem = () => systemInput.value !== "unknown" && isAVLocationCoordinateSystem(systemInput.value);+ const parsePaste = () => parseAVLocationCoordinates(pasteInput.value,+ systemInput.value as IAVCellLocationValue["coordinateSystem"],+ orderInput.value === "longitudeLatitude" ? "longitudeLatitude" : "latitudeLongitude");const setError = (message = "") => {errorElement.textContent = message;@@ -135,14 +151,14 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {}let value: IAVCellLocationValue = {coordinateSystem: "unknown"};if (!clear) {- if (!isAVLocationCoordinateSystem(systemInput.value)) {- setError(languages.invalidCoordinateSystem);+ if (!hasSelectedSystem()) {+ setError(languages.selectCoordinateSystem);systemInput.focus();return;}// 未确认的导入文本不能在保存时被静默丢弃,错误输入也保持原样可编辑。if (pasteInput.value.trim() && pasteInput.value !== parsedInput) {- const valid = parseAVLocationCoordinates(pasteInput.value, systemInput.value);+ const valid = parsePaste();setError(valid ? `${languages.pasteCoordinates}: ${languages.confirm}` : languages.invalidCoordinates);if (valid) {root.querySelector<HTMLButtonElement>('[data-action="parse"]').focus();@@ -151,12 +167,13 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {}return;}- value = {name: nameInput.value.trim(), coordinateSystem: systemInput.value};+ value = {name: nameInput.value.trim(), coordinateSystem: systemInput.value as IAVCellLocationValue["coordinateSystem"]};if (latitudeInput.value.trim() || longitudeInput.value.trim()) {value.latitude = parseAVLocationCoordinate(latitudeInput.value);value.longitude = parseAVLocationCoordinate(longitudeInput.value);if (value.latitude === undefined || value.longitude === undefined) {setError(languages.invalidCoordinates);+ (value.latitude === undefined ? latitudeInput : longitudeInput).focus();return;}}@@ -165,6 +182,7 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {}if (!validateAVLocation(value)) {setError(languages.invalidCoordinates);+ (Math.abs(value.latitude) > 90 ? latitudeInput : longitudeInput).focus();return;}}@@ -202,6 +220,11 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {};[latitudeInput, longitudeInput].forEach(input => input.addEventListener("input", clearProvenance));systemInput.addEventListener("change", clearProvenance);+ orderInput.addEventListener("change", () => {+ // 切换顺序不改已有坐标,只让当前粘贴文本重新等待确认。+ parsedInput = undefined;+ setError();+ });root.addEventListener("compositionstart", () => composing = true);root.addEventListener("compositionend", () => composing = false);root.addEventListener("keydown", (event: KeyboardEvent) => {@@ -230,13 +253,15 @@ export const openAVLocationEditor = (options: AVLocationEditorOptions) => {if (saving || closing || composing) {return;}- if (!isAVLocationCoordinateSystem(systemInput.value)) {- setError(languages.invalidCoordinateSystem);+ if (!hasSelectedSystem()) {+ setError(languages.selectCoordinateSystem);+ systemInput.focus();return;}- const parsed = parseAVLocationCoordinates(pasteInput.value, systemInput.value);+ const parsed = parsePaste();if (!parsed) {setError(languages.invalidCoordinates);+ pasteInput.focus();return;}latitudeInput.value = formatAVLocationCoordinate(parsed.latitude);diff --git a/app/src/protyle/render/av/locationValue.test.ts b/app/src/protyle/render/av/locationValue.test.tsindex 654bef1183..2e3b4e1208 100644--- a/app/src/protyle/render/av/locationValue.test.ts+++ b/app/src/protyle/render/av/locationValue.test.ts@@ -13,6 +13,18 @@ import {} from "./locationValue";describe("database location values", () => {+ it("supports paired parentheses and explicit longitude-first order without guessing", () => {+ const source = " (102.42,25.04) ";+ assert.equal(parseAVLocationCoordinates(source, "gcj02"), undefined);+ assert.deepEqual(parseAVLocationCoordinates(source, "gcj02", "longitudeLatitude"), {+ latitude: 25.04, longitude: 102.42, coordinateSystem: "gcj02", originalInput: source,+ });+ assert.equal(parseAVLocationCoordinates("(20,30)", "wgs84")?.latitude, 20);+ assert.equal(parseAVLocationCoordinates("(20,30)", "wgs84", "longitudeLatitude")?.latitude, 30);+ for (const text of ["(20,30", "20,30)", "((20,30))", "(20),30", "[20,30]"]) {+ assert.equal(parseAVLocationCoordinates(text), undefined, text);+ }+ });it("keeps ordinary text as names without inference and replaces stale coordinates", () => {for (const text of [" Office ", "https://maps.example.com/?lat=31&lon=121", "geo:31,121"]) {assert.deepEqual(createAVLocationFromText(text), {@@ -22,7 +34,7 @@ describe("database location values", () => {});it("requires the explicit import flow for coordinate-looking or canonical pasted text", () => {- for (const source of ["31.2,121.5", "31,", ",121", "31,121,0", "181,91", "1e-7,-1e-7", "NaN,Infinity", "0,0 [unknown]",+ for (const source of ["31.2,121.5", "(102.42,25.04)", " (20,30) ", "31,", ",121", "31,121,0", "181,91", "1e-7,-1e-7", "NaN,Infinity", "0,0 [unknown]","Office; 0, 0 [GCJ-02]", "Office; 0, 0 [BD-09]"]) {assert.equal(isAVLocationCoordinateInput(source), true, source);assert.throws(() => createAVLocationFromText(source));diff --git a/app/src/protyle/render/av/locationValue.ts b/app/src/protyle/render/av/locationValue.tsindex 8304b0d0c8..a09f2c7ee2 100644--- a/app/src/protyle/render/av/locationValue.ts+++ b/app/src/protyle/render/av/locationValue.ts@@ -70,7 +70,9 @@ export const createAVLocationReplacement = (location?: IAVCellLocationValue): IA});export const isAVLocationCoordinateInput = (text: string) => {- const parts = text.split(",").map(part => part.trim());+ const trimmed = text.trim();+ const unwrapped = trimmed.startsWith("(") && trimmed.endsWith(")") ? trimmed.slice(1, -1) : trimmed;+ const parts = unwrapped.split(",").map(part => part.trim());return (parts.length > 1 && parts.some(part => part !== "") &&parts.every(part => part === "" || coordinateInput.test(part))) || canonicalInput.test(text);};@@ -92,17 +94,20 @@ export const parseAVLocationCoordinate = (text: string) => {return Number.isFinite(number) ? number : undefined;};-// 仅用于明确标注“纬度, 经度”的导入入口,不尝试交换坐标或解析地图服务链接。+// 只按用户明确选择的顺序解析,不根据范围猜测顺序或解析地图服务链接。export const parseAVLocationCoordinates = (text: string,- coordinateSystem: IAVCellLocationValue["coordinateSystem"] = "unknown"):+ coordinateSystem: IAVCellLocationValue["coordinateSystem"] = "unknown",+ order: "latitudeLongitude" | "longitudeLatitude" = "latitudeLongitude"):IAVCellLocationValue | undefined => {coordinateSystem = coordinateSystem || "unknown";- const parts = text.split(",");+ const trimmed = text.trim();+ const unwrapped = trimmed.startsWith("(") && trimmed.endsWith(")") ? trimmed.slice(1, -1) : trimmed;+ const parts = unwrapped.split(",");if (parts.length !== 2 || !isAVLocationCoordinateSystem(coordinateSystem)) {return undefined;}- const latitude = parseAVLocationCoordinate(parts[0]);- const longitude = parseAVLocationCoordinate(parts[1]);+ const latitude = parseAVLocationCoordinate(parts[order === "longitudeLatitude" ? 1 : 0]);+ const longitude = parseAVLocationCoordinate(parts[order === "longitudeLatitude" ? 0 : 1]);const value = {latitude, longitude, coordinateSystem, originalInput: text};return hasAVLocationCoordinates(value) ? value : undefined;};