@opengis/gis 0.2.150 → 0.2.151

package/module/gis/select/pg.column_name.geometry.sql

@@ -1,13 +1,13 @@
-SELECT
-    column_name,
-    column_name||coalesce(' ('||
-    pg_catalog.col_description(
-        format('%I.%I', table_schema, table_name)::regclass::oid,
-        ordinal_position
-    )||')','' 
-    )AS column_comment
-FROM
-    information_schema.columns
-WHERE
-    table_schema||'.'||table_name = '{{parent}}'
+SELECT
+    column_name,
+    column_name||coalesce(' ('||
+    pg_catalog.col_description(
+        format('%I.%I', table_schema, table_name)::regclass::oid,
+        ordinal_position
+    )||')','' 
+    )AS column_comment
+FROM
+    information_schema.columns
+WHERE
+    table_schema||'.'||table_name = '{{parent}}'
     AND udt_name = 'geometry'

package/module/gis/select/pg.columns.parent.sql

@@ -1,6 +1,6 @@
-select attname,
-       coalesce(attname,'') || coalesce(' (' || col_description(attrelid, attnum) || ')','') as description,
-       coalesce(col_description(attrelid, attnum),'') as comment
-from pg_attribute where attnum > 0 and not attisdropped
-                    and attrelid = '{{parent}}'::regclass
-
+select attname,
+       coalesce(attname,'') || coalesce(' (' || col_description(attrelid, attnum) || ')','') as description,
+       coalesce(col_description(attrelid, attnum),'') as comment
+from pg_attribute where attnum > 0 and not attisdropped
+                    and attrelid = '{{parent}}'::regclass
+

package/module/gis/select/pg.table_name.sql

@@ -1,17 +1,17 @@
-select id,text||coalesce(' ('||description||')','') as text
-from
-    (
-        select q.table_schema||'.'||q.table_name as id,
-               q.table_schema||'.'||q.table_name as text
-        from
-            (
-                select
-                    distinct quote_ident(table_name) as table_name,
-                             table_schema
-                from
-                    information_schema.tables
-                where table_schema not in ('pg_catalog','admin','bi','gis','gis_sync','log','setting','site','information_schema','pg_description','public','crm')
-            )q
-    )q
-        left join pg_description b on b.objoid=q.id::regclass and b.objsubid = 0
-order by text
+select id,text||coalesce(' ('||description||')','') as text
+from
+    (
+        select q.table_schema||'.'||q.table_name as id,
+               q.table_schema||'.'||q.table_name as text
+        from
+            (
+                select
+                    distinct quote_ident(table_name) as table_name,
+                             table_schema
+                from
+                    information_schema.tables
+                where table_schema not in ('pg_catalog','admin','bi','gis','gis_sync','log','setting','site','information_schema','pg_description','public','crm')
+            )q
+    )q
+        left join pg_description b on b.objoid=q.id::regclass and b.objsubid = 0
+order by text

package/module/gis/select/service_id.sql

@@ -1 +1 @@
-select service_id, name from gis.services
+select service_id, name from gis.services

package/module/gis/table/gis.cartocss.table.json

@@ -1,75 +1,75 @@
-{
-    "key": "cartocss_id",
-    "table": "gis.cartocss",
-    "form": "gis.cartocss.form",
-    "meta": {
-        "title": "name",
-        "search": "name,description"
-    },
-    "card": true,
-    "order": "created_at desc",
-    "columns": [
-        {
-            "ua": "Назва",
-            "name": "name",
-            "format": "text",
-            "slot": "<div><p>{{data?.name}}</p></div><p class='text-xs text-gray-500'>{{data?.source_path}}</p>",
-            "link": "/gis.cartocss/{id}"
-        },
-        {
-            "ua": "Шлях",
-            "name": "source_path",
-            "width": 100,
-            "hidden": true,
-            "format": "text"
-        },
-        {
-            "ua": "Опис",
-            "hidden": true,
-            "name": "description",
-            "format": "text"
-        },
-        {
-            "ua": "Група",
-            "name": "group_id",
-            "data": "gis.group_list",
-            "format": "badge"
-        },
-        {
-            "ua": "Включений",
-            "name": "enabled",
-            "data": "yes_no",
-            "width": 100,
-            "format": "boolean",
-            "edit": true
-        },
-        {
-            "ua": "Публічний",
-            "name": "is_public",
-            "data": "yes_no",
-            "width": 100,
-            "format": "boolean",
-            "edit": true
-        }
-    ],
-    "filterList": [
-        {
-            "ua": "Група",
-            "name": "group_id",
-            "data": "gis.group_list",
-            "type": "Check"
-        },
-        {
-            "ua": "On/Off",
-            "name": "enabled",
-            "data": "yes_no",
-            "type": "Check"
-        },
-        {
-            "ua": "Чи публічний",
-            "name": "is_public",
-            "data": "yes_no",
-            "type": "Check"
-        }
-    ]
+{
+    "key": "cartocss_id",
+    "table": "gis.cartocss",
+    "form": "gis.cartocss.form",
+    "meta": {
+        "title": "name",
+        "search": "name,description"
+    },
+    "card": true,
+    "order": "created_at desc",
+    "columns": [
+        {
+            "ua": "Назва",
+            "name": "name",
+            "format": "text",
+            "slot": "<div><p>{{data?.name}}</p></div><p class='text-xs text-gray-500'>{{data?.source_path}}</p>",
+            "link": "/gis.cartocss/{id}"
+        },
+        {
+            "ua": "Шлях",
+            "name": "source_path",
+            "width": 100,
+            "hidden": true,
+            "format": "text"
+        },
+        {
+            "ua": "Опис",
+            "hidden": true,
+            "name": "description",
+            "format": "text"
+        },
+        {
+            "ua": "Група",
+            "name": "group_id",
+            "data": "gis.group_list",
+            "format": "badge"
+        },
+        {
+            "ua": "Включений",
+            "name": "enabled",
+            "data": "yes_no",
+            "width": 100,
+            "format": "boolean",
+            "edit": true
+        },
+        {
+            "ua": "Публічний",
+            "name": "is_public",
+            "data": "yes_no",
+            "width": 100,
+            "format": "boolean",
+            "edit": true
+        }
+    ],
+    "filterList": [
+        {
+            "ua": "Група",
+            "name": "group_id",
+            "data": "gis.group_list",
+            "type": "Check"
+        },
+        {
+            "ua": "On/Off",
+            "name": "enabled",
+            "data": "yes_no",
+            "type": "Check"
+        },
+        {
+            "ua": "Чи публічний",
+            "name": "is_public",
+            "data": "yes_no",
+            "type": "Check"
+        }
+    ]
 }

package/module/gis/table/gis.group_list.table.json

@@ -1,59 +1,59 @@
-{
-   "key": "group_id",
-   "model": "gis.group_list",
-   "table": "gis.group_list",
-   "orderby": "cdate desc",
-   "meta": {
-      "title": "group_name",
-      "search": "group_name"
-   },
-   "card": false,
-   "actions": [
-      "edit",
-      "del",
-      "add"
-   ],
-   "setting": [
-      "card",
-      "export",
-      "add"
-   ],
-   "sql": [
-      {
-         "sql": "select sum(count) as count from ( select count(*) from gis.cartocss where group_id=t.group_id union all select count(*) from gis.ogc_service where group_id=t.group_id union all select count(*) from gis.rasters where group_id=t.group_id union all select count(*) from gis.services where group_id=t.group_id )q",
-         "name": "count_sql"
-      }
-   ],
-   "form": "gis.group_list.form",
-   "columns": [
-      {
-         "ua": "Назва",
-         "name": "group_name",
-         "format": "text"
-      },
-      {
-         "ua": "Кількість георесурсів",
-         "name": "count",
-         "format": "text"
-      },
-      {
-         "ua": "Вкл/Викл",
-         "name": "enabled",
-         "format": "boolean",
-         "edit": true
-      }
-   ],
-   "filters": [
-      {
-         "name": "group_name",
-         "ua": "Назва",
-         "type": "Text"
-      },
-      {
-         "name": "enabled",
-         "ua": "Вкл/Викл",
-         "data": "yes_no",
-         "type": "Check"
-      }
-   ]
+{
+   "key": "group_id",
+   "model": "gis.group_list",
+   "table": "gis.group_list",
+   "orderby": "cdate desc",
+   "meta": {
+      "title": "group_name",
+      "search": "group_name"
+   },
+   "card": false,
+   "actions": [
+      "edit",
+      "del",
+      "add"
+   ],
+   "setting": [
+      "card",
+      "export",
+      "add"
+   ],
+   "sql": [
+      {
+         "sql": "select sum(count) as count from ( select count(*) from gis.cartocss where group_id=t.group_id union all select count(*) from gis.ogc_service where group_id=t.group_id union all select count(*) from gis.rasters where group_id=t.group_id union all select count(*) from gis.services where group_id=t.group_id )q",
+         "name": "count_sql"
+      }
+   ],
+   "form": "gis.group_list.form",
+   "columns": [
+      {
+         "ua": "Назва",
+         "name": "group_name",
+         "format": "text"
+      },
+      {
+         "ua": "Кількість георесурсів",
+         "name": "count",
+         "format": "text"
+      },
+      {
+         "ua": "Вкл/Викл",
+         "name": "enabled",
+         "format": "boolean",
+         "edit": true
+      }
+   ],
+   "filters": [
+      {
+         "name": "group_name",
+         "ua": "Назва",
+         "type": "Text"
+      },
+      {
+         "name": "enabled",
+         "ua": "Вкл/Викл",
+         "data": "yes_no",
+         "type": "Check"
+      }
+   ]
 }

package/module/gis/table/gis.maps.table.json

@@ -1,111 +1,111 @@
-{
-  "key": "map_id",
-  "table": "gis.maps",
-  "public": true,
-  "actions": [
-    "add",
-    "edit",
-    "del"
-  ],
-  "controls": [
-    "search",
-    "list",
-    "add"
-  ],
-  "order": "created_at desc",
-  "meta": {
-    "title": "name",
-    "search": "name,description,map_key,keywords_text"
-  },
-  "title": "Тематичні карти",
-  "form": "gis.maps.form",
-  "sql": [
-    {
-      "sql": "select array_agg(name) as services from gis.services where service_id in (select service_id from gis.maps_layers where map_id=t.map_id)",
-      "name": "services_sql"
-    },
-    {
-      "sql": "select array_to_string(keywords, ',','') as keywords_text",
-      "name": "keywords_text_sql"
-    }
-  ],
-  "sqlColumns": "*",
-  "columns": [
-    {
-      "ua": "Назва",
-      "meta": "title",
-      "name": "name",
-      "format": "slot",
-      "max-w": 500,
-      "link": "/gis.maps/{id}",
-      "slot": "<div><p>{{data?.name}}</p></div><p class='text-xs text-gray-500'>{{data?.description}}</p>"
-    },
-    {
-      "ua": "Ключові слова",
-      "name": "keywords",
-      "hidden": true,
-      "format": "text"
-    },
-    {
-      "ua": "Держатель",
-      "name": "holder",
-      "format": "text",
-      "hidden": true
-    },
-    {
-      "ua": "Набори даних",
-      "name": "services",
-      "hidden": true,
-      "format": "text"
-    },
-    {
-      "ua": "Зум",
-      "name": "zoom",
-      "format": "text",
-      "hidden": true
-    },
-    {
-      "ua": "Публічний",
-      "name": "is_public",
-      "data": "yes_no",
-      "edit": true,
-      "width": 100,
-      "format": "boolean"
-    },
-    {
-      "ua": "Активний",
-      "name": "is_active",
-      "data": "yes_no",
-      "edit": true,
-      "width": 100,
-      "format": "boolean"
-    },
-    {
-      "ua": "Карта",
-      "name": "map",
-      "format": "slot",
-      "width": 50,
-      "link": "/maps/{}id}",
-      "slot": "<div class='flex items-center gap-3'><svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' class='w-5 h-5 text-blue-600' fill='none' stroke='currentColor' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'><path d='M14.106 5.553a2 2 0 0 0 1.788 0l3.659-1.83A1 1 0 0 1 21 4.619v12.764a1 1 0 0 1-.553.894l-4.553 2.277a2 2 0 0 1-1.788 0l-4.212-2.106a2 2 0 0 0-1.788 0l-3.659 1.83A1 1 0 0 1 3 19.381V6.618a1 1 0 0 1 .553-.894l4.553-2.277a2 2 0 0 1 1.788 0z'></path><path d='M15 5.764v15'></path><path d='M9 3.236v15'></path></svg></div>"
-    }
-  ],
-  "filterList": [
-    {
-      "ua": "Ключові слова",
-      "name": "keywords_text",
-      "type": "Text"
-    },
-    {
-      "ua": "Публічний",
-      "name": "is_public",
-      "data": "yes_no",
-      "type": "Check"
-    },
-    {
-      "ua": "Активний",
-      "name": "is_active",
-      "data": "yes_no",
-      "type": "Check"
-    }
-  ]
+{
+  "key": "map_id",
+  "table": "gis.maps",
+  "public": true,
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "controls": [
+    "search",
+    "list",
+    "add"
+  ],
+  "order": "created_at desc",
+  "meta": {
+    "title": "name",
+    "search": "name,description,map_key,keywords_text"
+  },
+  "title": "Тематичні карти",
+  "form": "gis.maps.form",
+  "sql": [
+    {
+      "sql": "select array_agg(name) as services from gis.services where service_id in (select service_id from gis.maps_layers where map_id=t.map_id)",
+      "name": "services_sql"
+    },
+    {
+      "sql": "select array_to_string(keywords, ',','') as keywords_text",
+      "name": "keywords_text_sql"
+    }
+  ],
+  "sqlColumns": "*",
+  "columns": [
+    {
+      "ua": "Назва",
+      "meta": "title",
+      "name": "name",
+      "format": "slot",
+      "max-w": 500,
+      "link": "/gis.maps/{id}",
+      "slot": "<div><p>{{data?.name}}</p></div><p class='text-xs text-gray-500'>{{data?.description}}</p>"
+    },
+    {
+      "ua": "Ключові слова",
+      "name": "keywords",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Держатель",
+      "name": "holder",
+      "format": "text",
+      "hidden": true
+    },
+    {
+      "ua": "Набори даних",
+      "name": "services",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Зум",
+      "name": "zoom",
+      "format": "text",
+      "hidden": true
+    },
+    {
+      "ua": "Публічний",
+      "name": "is_public",
+      "data": "yes_no",
+      "edit": true,
+      "width": 100,
+      "format": "boolean"
+    },
+    {
+      "ua": "Активний",
+      "name": "is_active",
+      "data": "yes_no",
+      "edit": true,
+      "width": 100,
+      "format": "boolean"
+    },
+    {
+      "ua": "Карта",
+      "name": "map",
+      "format": "slot",
+      "width": 50,
+      "link": "/maps/{}id}",
+      "slot": "<div class='flex items-center gap-3'><svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' class='w-5 h-5 text-blue-600' fill='none' stroke='currentColor' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'><path d='M14.106 5.553a2 2 0 0 0 1.788 0l3.659-1.83A1 1 0 0 1 21 4.619v12.764a1 1 0 0 1-.553.894l-4.553 2.277a2 2 0 0 1-1.788 0l-4.212-2.106a2 2 0 0 0-1.788 0l-3.659 1.83A1 1 0 0 1 3 19.381V6.618a1 1 0 0 1 .553-.894l4.553-2.277a2 2 0 0 1 1.788 0z'></path><path d='M15 5.764v15'></path><path d='M9 3.236v15'></path></svg></div>"
+    }
+  ],
+  "filterList": [
+    {
+      "ua": "Ключові слова",
+      "name": "keywords_text",
+      "type": "Text"
+    },
+    {
+      "ua": "Публічний",
+      "name": "is_public",
+      "data": "yes_no",
+      "type": "Check"
+    },
+    {
+      "ua": "Активний",
+      "name": "is_active",
+      "data": "yes_no",
+      "type": "Check"
+    }
+  ]
 }