Merge branch 'main' into aggregation

2026-01-30 08:47:57 -05:00 · 2021-08-13 10:35:53 -04:00
parent 5066f008d9 eddc839606
commit 7601178ea3
30 changed files with 51 additions and 64 deletions
--- a/api/src/database/system-data/fields/fields.yaml
+++ b/api/src/database/system-data/fields/fields.yaml
@@ -52,6 +52,12 @@ fields:
    special: boolean
    width: half

+  - collection: directus_fields
+    field: required
+    hidden: true
+    special: boolean
+    width: half
+
  - collection: directus_fields
    field: sort
    width: half
--- a/app/src/lang/translations/ar-SA.yaml
+++ b/app/src/lang/translations/ar-SA.yaml
@@ -872,8 +872,6 @@ interfaces:
    display_template: عرض القالب
  input-rich-text-md:
    description: أدخل و معاينة markdown
-  map:
-    zoom: تكبير/تصغير
  list-o2m:
    description: حدد عدة عناصر ذات صلة
  system-folder:
--- a/app/src/lang/translations/bg-BG.yaml
+++ b/app/src/lang/translations/bg-BG.yaml
@@ -924,13 +924,13 @@ require_value_to_be_set: Изисква стойност при задаване
 translation: Превод
 value: Стойност
 view_project: Преглед на проект
+weeks: { }
 report_error: Докладване на грешка
 start: Начало
 interfaces:
  group-accordion:
    name: Акордеон
    description: Показване на полетата или групите по секции, като акордеон
-    start: Начало
    all_closed: Всички са затворени
    first_opened: Първият е отворен
    all_opened: Всички са отворени
@@ -1051,8 +1051,6 @@ interfaces:
    box: Блоков / Вложен
    imageToken: Токън за изображенията
    imageToken_label: Какъв (статичен) токън да се добави, към адресите на изображенията
-  map:
-    zoom: Мащабиране
  presentation-notice:
    notice: Пояснение
    description: Показване на кратко пояснение
--- a/app/src/lang/translations/de-DE.yaml
+++ b/app/src/lang/translations/de-DE.yaml
@@ -989,8 +989,6 @@ interfaces:
    box: Block / Inline
    imageToken: Bild-Token
    imageToken_label: Welcher (statischer) Token, der an Bildquellen angehängt werden soll
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Anmerkung
    description: Kurze Anmerkung anzeigen
--- a/app/src/lang/translations/en-US.yaml
+++ b/app/src/lang/translations/en-US.yaml
@@ -22,10 +22,12 @@

 edit_field: Edit Field
 conditions: Conditions
+maps: Maps
 item_revision: Item Revision
 duplicate_field: Duplicate Field
 half_width: Half Width
 full_width: Full Width
+limit: Limit
 group: Group
 and: And
 or: Or
@@ -187,6 +189,7 @@ time: Time
 timestamp: Timestamp
 uuid: UUID
 hash: Hash
+geometry: Geometry
 not_available_for_type: Not Available for this Type
 create_translations: Create Translations
 auto_refresh: Auto Refresh
@@ -386,6 +389,7 @@ no_users_copy: There are no users in this role yet.
 webhooks_count: 'No Webhooks | One Webhook | {count} Webhooks'
 no_webhooks_copy: There are no webhooks yet.
 all_items: All Items
+any: Any
 csv: CSV
 no_collections: No Collections
 create_collection: Create Collection
@@ -504,6 +508,7 @@ color: Color
 circle: Circle
 empty_item: Empty Item
 log_in_with: 'Log In with {provider}'
+advanced_settings: Advanced Settings
 advanced_filter: Advanced Filter
 delete_advanced_filter: Delete Filter
 change_advanced_filter_operator: Change Operator
@@ -530,6 +535,10 @@ operators:
  nempty: Isn't empty
  all: Contains these keys
  has: Contains some of these keys
+  intersects: Intersects
+  nintersects: Doesn't intersect
+  intersects_bbox: Intersects bounding box
+  nintersects_bbox: Doesn't intersect bounding box
 loading: Loading...
 drop_to_upload: Drop to Upload
 item: Item
@@ -944,6 +953,7 @@ interfaces:
  group-accordion:
    name: Accordion
    description: Display fields or groups as accordion sections
+    start: Start
    all_closed: All Closed
    first_opened: First Opened
    all_opened: All Opened
@@ -1064,6 +1074,22 @@ interfaces:
    box: Block / Inline
    imageToken: Image Token
    imageToken_label: What (static) token to append to image sources
+  map:
+    map: Map
+    description: Select a location on a map
+    zoom: Zoom
+    geometry_type: Geometry type
+    geometry_format: Geometry format
+    default_view: Default view
+    invalid_options: Invalid options
+    invalid_format: Invalid format ({format})
+    unexpected_geometry: Expected {expected}, got {got}.
+    fit_bounds: Fit view to data
+    native: Native
+    geojson: GeoJSON
+    lnglat: Longitude, Latitude
+    wkt: WKT
+    wkb: WKB
  presentation-notice:
    notice: Notice
    description: Display a short notice
@@ -1273,3 +1299,16 @@ layouts:
    calendar: Calendar
    start_date_field: Start Date Field
    end_date_field: End Date Field
+  map:
+    map: Map
+    basemap: Basemap
+    layers: Layers
+    edit_custom_layers: Edit Layers
+    cluster_options: Clustering options
+    cluster: Activate clustering
+    cluster_radius: Cluster radius
+    cluster_minpoints: Cluster minimum size
+    cluster_maxzoom: Maximum zoom for clustering
+    fit_data: Fit data to view bounds
+    field: Geometry
+    invalid_geometry: Invalid geometry
--- a/app/src/lang/translations/es-419.yaml
+++ b/app/src/lang/translations/es-419.yaml
@@ -902,7 +902,6 @@ report_error: Reportar Error
 start: Iniciar
 interfaces:
  group-accordion:
-    start: Iniciar
    all_closed: Todo Cerrado
    first_opened: Primero Abierto
    all_opened: Todo Abierto
@@ -1014,8 +1013,6 @@ interfaces:
    box: Bloque / Alineación
    imageToken: Token de Imagen
    imageToken_label: Qué token (estático) añadir a las fuentes de la imagen
-  map:
-    zoom: Lupa
  presentation-notice:
    notice: Aviso
  list-o2m:
--- a/app/src/lang/translations/es-CL.yaml
+++ b/app/src/lang/translations/es-CL.yaml
@@ -902,7 +902,6 @@ report_error: Reportar Error
 start: Iniciar
 interfaces:
  group-accordion:
-    start: Iniciar
    all_closed: Todo Cerrado
    first_opened: Primero Abierto
    all_opened: Todo Abierto
@@ -1014,8 +1013,6 @@ interfaces:
    box: Bloque / Alineación
    imageToken: Token de Imagen
    imageToken_label: Qué token (estático) añadir a las fuentes de la imagen
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Aviso
  list-o2m:
--- a/app/src/lang/translations/es-ES.yaml
+++ b/app/src/lang/translations/es-ES.yaml
@@ -901,7 +901,6 @@ report_error: Reportar Error
 start: Iniciar
 interfaces:
  group-accordion:
-    start: Iniciar
    all_closed: Todo Cerrado
    first_opened: Primero Abierto
    all_opened: Todo Abierto
@@ -1013,8 +1012,6 @@ interfaces:
    box: Bloque / Alineación
    imageToken: Token de Imagen
    imageToken_label: Qué token (estático) añadir a las fuentes de la imagen
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Aviso
  list-o2m:
--- a/app/src/lang/translations/et-EE.yaml
+++ b/app/src/lang/translations/et-EE.yaml
@@ -984,8 +984,6 @@ interfaces:
    box: Plokk / Tekstisisene
    imageToken: Pildi kood
    imageToken_label: Milline (staatiline) kood lisada piltide allikatele
-  map:
-    zoom: Suurenda
  presentation-notice:
    notice: Teade
    description: Näita lühikest teadet
--- a/app/src/lang/translations/fi-FI.yaml
+++ b/app/src/lang/translations/fi-FI.yaml
@@ -976,8 +976,6 @@ interfaces:
    box: Lohko / rivillä
    imageToken: Kuvatunnus
    imageToken_label: Mikä (staattinen) tunnus lisätään kuvien lähteisiin
-  map:
-    zoom: Lähennä
  presentation-notice:
    notice: Ilmoitus
    description: Näytä lyhyt ilmoitus
--- a/app/src/lang/translations/fr-FR.yaml
+++ b/app/src/lang/translations/fr-FR.yaml
@@ -1006,8 +1006,6 @@ interfaces:
    box: Bloc / Inline
    imageToken: Token d'image
    imageToken_label: Quel token (statique) ajouter aux sources d'images
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Remarque
    description: Afficher une courte remarque
--- a/app/src/lang/translations/hu-HU.yaml
+++ b/app/src/lang/translations/hu-HU.yaml
@@ -682,8 +682,6 @@ interfaces:
    interface: Kezelőfelület
  select-dropdown-m2o:
    display_template: Megjelenítési sablon
-  map:
-    zoom: Nagyítás
  system-folder:
    folder: Könyvtár
  slider:
--- a/app/src/lang/translations/id-ID.yaml
+++ b/app/src/lang/translations/id-ID.yaml
@@ -607,8 +607,6 @@ interfaces:
    interface: Antarmuka
  select-dropdown-m2o:
    display_template: Tampilan Template
-  map:
-    zoom: Perbesar
  system-folder:
    folder: Direktori
  boolean:
--- a/app/src/lang/translations/it-IT.yaml
+++ b/app/src/lang/translations/it-IT.yaml
@@ -924,13 +924,13 @@ require_value_to_be_set: Richiedi di impostare il valore
 translation: Traduzione
 value: Valore
 view_project: Visualizza Progetto
+weeks: { }
 report_error: Segnala l'errore
 start: Inizio
 interfaces:
  group-accordion:
    name: Accordion
    description: Mostra i campi o i gruppi come sezioni in un accordion
-    start: Inizio
    all_closed: Tutto chiuso
    first_opened: Apri la prima sezione
    all_opened: Tutto aperto
@@ -1051,8 +1051,6 @@ interfaces:
    box: Blocco / In linea
    imageToken: Token Immagine
    imageToken_label: Token (statico) da aggiungere alle sorgenti delle immagini
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Avviso
    description: Mostra un avviso breve
--- a/app/src/lang/translations/lt-LT.yaml
+++ b/app/src/lang/translations/lt-LT.yaml
@@ -848,8 +848,6 @@ interfaces:
    interface: Sąsaja
  select-dropdown-m2o:
    display_template: Rodymo šablonas
-  map:
-    zoom: Padidinti
  system-folder:
    folder: Aplankas
  tags:
--- a/app/src/lang/translations/nl-NL.yaml
+++ b/app/src/lang/translations/nl-NL.yaml
@@ -958,8 +958,6 @@ interfaces:
    customSyntax: Aangepaste blokken
    box: Blok / Inline
    imageToken: Afbeeldingstoken
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Melding
    description: Een korte melding weergeven
--- a/app/src/lang/translations/pl-PL.yaml
+++ b/app/src/lang/translations/pl-PL.yaml
@@ -1002,8 +1002,6 @@ interfaces:
    box: Blok / Inline
    imageToken: Token obrazu
    imageToken_label: Jaki (statyczny) token dodać do źródeł obrazów
-  map:
-    zoom: Powiększ
  presentation-notice:
    notice: Informacja
    description: Wyświetl krótką informacje
--- a/app/src/lang/translations/pt-BR.yaml
+++ b/app/src/lang/translations/pt-BR.yaml
@@ -1002,8 +1002,6 @@ interfaces:
    box: Bloco / Em linha
    imageToken: Token da imagem
    imageToken_label: Qual token (estático) a ser adicionado nas imagens
-  map:
-    zoom: Zoom
  presentation-notice:
    notice: Aviso
    description: Mostrar um breve aviso
--- a/app/src/lang/translations/pt-PT.yaml
+++ b/app/src/lang/translations/pt-PT.yaml
@@ -680,8 +680,6 @@ interfaces:
    interface: Interface
  select-dropdown-m2o:
    display_template: Templates de Exibição
-  map:
-    zoom: Zoom
  system-folder:
    folder: Pasta
  tags:
--- a/app/src/lang/translations/ru-RU.yaml
+++ b/app/src/lang/translations/ru-RU.yaml
@@ -883,7 +883,6 @@ interfaces:
  group-accordion:
    name: Аккордеон
    description: Отображать поля или группы как секции аккордеона
-    start: Начало
    all_closed: Все закрыты
    first_opened: Первая открыта
    all_opened: Все открыты
@@ -1000,8 +999,6 @@ interfaces:
    customSyntax_add: Добавить произвольный синтаксис
    box: Блок / Строчный элемент
    imageToken: Ключ изображения
-  map:
-    zoom: Масштаб
  presentation-notice:
    notice: Уведомление
    description: Показать короткое уведомление
--- a/app/src/lang/translations/sl-SI.yaml
+++ b/app/src/lang/translations/sl-SI.yaml
@@ -924,13 +924,13 @@ require_value_to_be_set: Zahtevaj vrednost
 translation: Prevod
 value: Vrednost
 view_project: Poglej projekt
+weeks: { }
 report_error: Sporoči napako
 start: Začetek
 interfaces:
  group-accordion:
    name: Harmonika
    description: Prikaži polja ali skupine kot segmente harmonike
-    start: Začetek
    all_closed: Vse zaprto
    first_opened: Prvo odprto
    all_opened: Vse odprto
@@ -1051,8 +1051,6 @@ interfaces:
    box: Blok / v vrstici
    imageToken: Žeton slike
    imageToken_label: Kateri statični žeton se naj doda k sliki
-  map:
-    zoom: Povečaj
  presentation-notice:
    notice: Obvestilo
    description: Pokaži kratko obvestilo
--- a/app/src/lang/translations/sr-CS.yaml
+++ b/app/src/lang/translations/sr-CS.yaml
@@ -984,8 +984,6 @@ interfaces:
    box: Blok / Linijski
    imageToken: Token Fotografije
    imageToken_label: Koji (statični) token prikačiti na izvore slika
-  map:
-    zoom: Uvеćanjе
  presentation-notice:
    notice: Napomеna
    description: Prikaži kratku napomenu
--- a/app/src/lang/translations/sv-SE.yaml
+++ b/app/src/lang/translations/sv-SE.yaml
@@ -883,8 +883,6 @@ interfaces:
    interface: Gränssnitt
  select-dropdown-m2o:
    display_template: Visningsmall
-  map:
-    zoom: Zooma
  system-folder:
    folder: Mapp
  slider:
--- a/app/src/lang/translations/th-TH.yaml
+++ b/app/src/lang/translations/th-TH.yaml
@@ -1005,8 +1005,6 @@ interfaces:
    box: กล่อง/บรรทัดเดียวกัน
    imageToken: Image Token
    imageToken_label: Image Token ที่จะถูกต่อเข้าไปที่แห่งที่มาของรูปภาพ
-  map:
-    zoom: ซูม
  presentation-notice:
    notice: แจ้งให้ทราบ
    description: แสดงการแจ้งให้ทราบแบบย่อ
--- a/app/src/lang/translations/tr-TR.yaml
+++ b/app/src/lang/translations/tr-TR.yaml
@@ -720,8 +720,6 @@ interfaces:
    interface: Arayüz
  select-dropdown-m2o:
    display_template: Görüntüleme Şablonu
-  map:
-    zoom: Yakınlaş
  system-folder:
    folder: Klasör
  slider:
--- a/app/src/lang/translations/vi-VN.yaml
+++ b/app/src/lang/translations/vi-VN.yaml
@@ -626,8 +626,6 @@ interfaces:
    interface: Giao diện
  select-dropdown-m2o:
    display_template: Mẫu hiển thị
-  map:
-    zoom: Thu phóng
  system-folder:
    folder: Thư mục
  slider:
--- a/app/src/lang/translations/zh-CN.yaml
+++ b/app/src/lang/translations/zh-CN.yaml
@@ -1010,8 +1010,6 @@ interfaces:
    box: Block / Inline
    imageToken: 图像Token
    imageToken_label: 添加到源图片的Token
-  map:
-    zoom: 缩放
  presentation-notice:
    notice: 提示
    description: 显示一个快捷提示
--- a/app/src/lang/translations/zh-TW.yaml
+++ b/app/src/lang/translations/zh-TW.yaml
@@ -636,8 +636,6 @@ interfaces:
    interface: 介面
  select-dropdown-m2o:
    display_template: 顯示模板
-  map:
-    zoom: 縮放
  system-folder:
    folder: 資料夾
  slider:
--- a/package-lock.json
+++ b/package-lock.json
@@ -25054,7 +25054,6 @@
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz",
 			"integrity": "sha1-PNbJY5m+ZbVu5VWWEW/pGRznAcA=",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.10"
 			}
@@ -58702,6 +58701,7 @@
 				"date-fns": "1.30.1",
 				"express": "4.17.1",
 				"fs-extra": "10.0.0",
+				"geojson": "0.5.0",
 				"joi": "17.4.2",
 				"knex-schema-inspector": "1.5.13",
 				"lodash": "4.17.21",
@@ -58709,7 +58709,6 @@
 				"vue-router": "4.0.11"
 			},
 			"devDependencies": {
-				"geojson": "0.5.0",
 				"npm-run-all": "4.1.5",
 				"rimraf": "3.0.2",
 				"typescript": "4.3.5"
@@ -81927,8 +81926,7 @@
 		"geojson": {
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz",
-			"integrity": "sha1-PNbJY5m+ZbVu5VWWEW/pGRznAcA=",
-			"dev": true
+			"integrity": "sha1-PNbJY5m+ZbVu5VWWEW/pGRznAcA="
 		},
 		"geojson-flatten": {
 			"version": "1.0.4",
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -48,6 +48,7 @@
 		"date-fns": "1.30.1",
 		"express": "4.17.1",
 		"fs-extra": "10.0.0",
+		"geojson": "0.5.0",
 		"joi": "17.4.2",
 		"knex-schema-inspector": "1.5.13",
 		"lodash": "4.17.21",
@@ -55,7 +56,6 @@
 		"vue-router": "4.0.11"
 	},
 	"devDependencies": {
-		"geojson": "0.5.0",
 		"npm-run-all": "4.1.5",
 		"rimraf": "3.0.2",
 		"typescript": "4.3.5"