@opengis/gis 0.1.18 → 0.1.20

package/dist/import-file.js

@@ -24704,11 +24704,29 @@ function xb(u) {
   return u.startsWith("http") ? u : `${window.location.origin}${u}`;
 }
 function bb(u) {
-  const { id: d, sourceLayer: y, url: x, bounds: A, title: P, style: v, service: s, service_type: z, source_type: R, data: I } = u, O = xb(x), M = z || s || R || "vector";
+  const {
+    id: d,
+    sourceLayer: y,
+    url: x,
+    bounds: A,
+    title: P,
+    style: v,
+    service: s,
+    service_type: z,
+    source_type: R,
+    data: I
+  } = u, O = xb(x), M = z || s || R || "vector";
   switch (M) {
     case "vtile":
     case "vector":
-      return wb(d, y, O, A, P, v);
+      return wb(
+        d,
+        y,
+        O,
+        A,
+        P,
+        v
+      );
     case "raster":
       return Sb(d, O, A, P, v);
     case "geojson":
@@ -24729,14 +24747,14 @@ function zy(u) {
   }
 }
 function wb(u, d, y, x, A, P) {
-  const v = d || (y.match(/\/vtile\/([^/]+)/) || [])[1], s = {
+  const v = d || (y.match(/\/vtile\/([^/]+)/) || [])[1] || u, s = {
     type: "vector",
     tiles: [y],
     ...x && { bounds: x }
   }, z = P || zy("polygon"), I = Dy(z).map((O, M) => ({
     ...O,
     id: `${u}-${M}`,
-    "source-layer": v || u,
+    "source-layer": v,
     source: u
   }));
   return {
@@ -24830,13 +24848,19 @@ function Cb(u, d, y = "/icons/") {
   return By(u, A);
 }
 async function oa(u, d) {
-  const y = bb(d), x = kb(d.style);
+  const y = bb(d);
+  console.log("layer", y);
+  const x = kb(d.style);
   x.length > 0 && await By(u, x), d.layout && d.layout["icon-image"] && await Cb(u, d.layout), u.getSource(y.id) || u.addSource(y.id, y.source);
   for (const A of y.layers)
     d.visible !== void 0 && (A.layout = {
       ...A.layout,
       visibility: d.visible ? "visible" : "none"
-    }), u.getLayer(A.id) ? u.setLayoutProperty(A.id, "visibility", d.visible ? "visible" : "none") : await u.addLayer(A);
+    }), u.getLayer(A.id) ? u.setLayoutProperty(
+      A.id,
+      "visibility",
+      d.visible ? "visible" : "none"
+    ) : await u.addLayer(A);
   return y;
 }
 function gl(u, d) {
@@ -25083,7 +25107,8 @@ const Pb = { class: "w-full flex flex-col bg-white border border-stone-200 shado
                 default: yr(() => [
                   v[1] || (v[1] = ei(" Перейти на карту "))
                 ]),
-                _: 1
+                _: 1,
+                __: [1]
               })
             ]),
             default: yr(() => [
@@ -25286,7 +25311,12 @@ const Pb = { class: "w-full flex flex-col bg-white border border-stone-200 shado
     const d = u, y = Ar(() => {
       var z;
       return ((z = d.config) == null ? void 0 : z.title) || "";
-    }), x = dr([]), A = Ar(() => d.config.layer.style.rules.some((z) => z.count !== void 0)), P = Ar(() => d.config.layer.style.rules.reduce((z, R) => z + (R.count || 0), 0)), v = (z) => !z || P.value === 0 ? 0 : Math.round(z / P.value * 100), s = () => {
+    }), x = dr([]), A = Ar(() => d.config.layer.style.rules.some(
+      (z) => z.count !== void 0
+    )), P = Ar(() => d.config.layer.style.rules.reduce(
+      (z, R) => z + (R.count || 0),
+      0
+    )), v = (z) => !z || P.value === 0 ? 0 : Math.round(z / P.value * 100), s = () => {
       const R = d.config.layer.style.rules.filter(
         (I, O) => x.value[O]
       ).map((I) => I.id || I.value).join(",");
@@ -25300,7 +25330,9 @@ const Pb = { class: "w-full flex flex-col bg-white border border-stone-200 shado
     };
     return _l(() => {
       var z;
-      (z = d.config) != null && z.layer && (oa(d.map, d.config.layer), x.value = new Array(d.config.layer.style.rules.length).fill(!1));
+      (z = d.config) != null && z.layer && (oa(d.map, d.config.layer), x.value = new Array(d.config.layer.style.rules.length).fill(
+        !1
+      ));
     }), (z, R) => (ze(), Ke("div", f1, [
       y.value ? (ze(), Ke("div", m1, [
         re("div", null, [
@@ -25314,7 +25346,10 @@ const Pb = { class: "w-full flex flex-col bg-white border border-stone-200 shado
               (ze(!0), Ke(lr, null, Qr(u.config.layer.style.rules, (I, O) => (ze(), Ke("div", {
                 key: O,
                 class: "flex flex-col justify-center overflow-hidden text-xs text-white text-center whitespace-nowrap",
-                style: aa({ width: `${v(I.count)}%`, backgroundColor: I.color }),
+                style: aa({
+                  width: `${v(I.count)}%`,
+                  backgroundColor: I.color
+                }),
                 role: "progressbar",
                 "aria-valuenow": v(I.count),
                 "aria-valuemin": "0",
@@ -26934,7 +26969,7 @@ function Yw(u, d, y, x, A, P) {
         "aria-label": "Reset layers",
         onClick: d[0] || (d[0] = (...U) => P.clearSelectedLayers && P.clearSelectedLayers(...U))
       }, d[7] || (d[7] = [
-        ia('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-refresh-cw text-gray-600" data-v-5b1a9326><path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8" data-v-5b1a9326></path><path d="M21 3v5h-5" data-v-5b1a9326></path><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16" data-v-5b1a9326></path><path d="M8 16H3v5" data-v-5b1a9326></path></svg>', 1)
+        ia('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-refresh-cw text-gray-600" data-v-939430ce><path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8" data-v-939430ce></path><path d="M21 3v5h-5" data-v-939430ce></path><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16" data-v-939430ce></path><path d="M8 16H3v5" data-v-939430ce></path></svg>', 1)
       ]))
     ]),
     re("div", Sw, [
@@ -27212,7 +27247,7 @@ function Yw(u, d, y, x, A, P) {
     ], 64))
   ]);
 }
-const $w = /* @__PURE__ */ br(gw, [["render", Yw], ["__scopeId", "data-v-5b1a9326"]]);
+const $w = /* @__PURE__ */ br(gw, [["render", Yw], ["__scopeId", "data-v-939430ce"]]);
 var Zu = { exports: {} }, Ku = { exports: {} }, ns = {}, mn = {}, Xm;
 function _n() {
   if (Xm) return mn;
@@ -30854,7 +30889,8 @@ const B2 = { class: "w-full flex flex-col bg-white border border-stone-200 shado
             default: yr(() => [
               I[1] || (I[1] = ei(" Відкрити бокову панель "))
             ]),
-            _: 1
+            _: 1,
+            __: [1]
           })
         ]),
         _: 1
@@ -31046,7 +31082,8 @@ function dS(u, d, y, x, A, P) {
       default: yr(() => [
         d[0] || (d[0] = re("div", null, "Повернутися до початкових налаштувань", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [0]
     })
   ]);
 }
@@ -31218,7 +31255,8 @@ function xS(u, d, y, x, A, P) {
     default: yr(() => [
       d[0] || (d[0] = re("div", null, "Надрукувати", -1))
     ]),
-    _: 1
+    _: 1,
+    __: [0]
   });
 }
 const bS = /* @__PURE__ */ br(vS, [["render", xS]]), wS = {
@@ -31273,7 +31311,8 @@ function SS(u, d, y, x, A, P) {
     default: yr(() => [
       d[1] || (d[1] = re("div", null, "Перемикач виду", -1))
     ]),
-    _: 1
+    _: 1,
+    __: [1]
   });
 }
 const AS = /* @__PURE__ */ br(wS, [["render", SS]]), kS = {}, TS = {
@@ -31493,7 +31532,8 @@ function HS(u, d, y, x, A, P) {
       default: yr(() => [
         d[7] || (d[7] = re("div", null, "Дізнатися геолокацію", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [7]
     })
   ]);
 }
@@ -32253,7 +32293,8 @@ function xA(u, d, y, x, A, P) {
             default: yr(() => [
               d[2] || (d[2] = ei(" Приховати панель "))
             ]),
-            _: 1
+            _: 1,
+            __: [2]
           })
         ]),
         re("div", gA, [
@@ -32298,7 +32339,8 @@ function xA(u, d, y, x, A, P) {
       default: yr(() => [
         d[6] || (d[6] = re("div", null, "Виміряти довжину", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [6]
     })
   ]);
 }
@@ -32599,7 +32641,8 @@ function zA(u, d, y, x, A, P) {
             default: yr(() => [
               d[1] || (d[1] = ei(" Приховати панель "))
             ]),
-            _: 1
+            _: 1,
+            __: [1]
           })
         ]),
         re("div", LA, [
@@ -32636,7 +32679,8 @@ function zA(u, d, y, x, A, P) {
       default: yr(() => [
         d[4] || (d[4] = re("div", null, "Виміряти площу", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [4]
     })
   ]);
 }
@@ -33373,9 +33417,8 @@ const BA = /* @__PURE__ */ br(EA, [["render", zA], ["__scopeId", "data-v-024154e
                 key: 0,
                 map: y.value,
                 activeTool: I.value,
-                setActiveTool: Un,
-                ref_for: !0
-              }, Ft === "home" ? { initialView: cn.value } : {}, { onCardValuesId: ai }), null, 16, ["map", "activeTool"])) : Yt("", !0)
+                setActiveTool: Un
+              }, { ref_for: !0 }, Ft === "home" ? { initialView: cn.value } : {}, { onCardValuesId: ai }), null, 16, ["map", "activeTool"])) : Yt("", !0)
             ], 64))), 128))
           ])) : Yt("", !0)
         ], 512), [
@@ -33522,7 +33565,7 @@ const Qy = /* @__PURE__ */ br(jA, [["render", KA]]), GA = {
 }, $A = ["href"], ek = {
   key: 1,
   class: "text-foreground font-medium truncate"
-}, tk = { class: "flex flex-col md:flex-row gap-4 justify-end" }, rk = { class: "container" }, ik = {
+}, tk = { class: "flex flex-col md:flex-row gap-4 justify-start" }, rk = { class: "container" }, ik = {
   key: 0,
   class: "space-y-4"
 }, nk = { class: "my-5 pr-2" }, sk = { class: "paginationWrapper relative flex justify-center" }, ok = {
@@ -34053,7 +34096,7 @@ const _T = /* @__PURE__ */ br(nT, [["render", yT]]), vT = {
 }, kT = ["href"], TT = {
   key: 1,
   class: "text-foreground font-medium truncate"
-}, CT = { class: "flex flex-col md:flex-row gap-4 justify-end" }, PT = { class: "container" }, ET = {
+}, CT = { class: "flex flex-col md:flex-row gap-4 justify-start" }, PT = { class: "container" }, ET = {
   key: 0,
   class: "space-y-4"
 }, IT = { class: "my-5 pr-2" }, MT = { class: "paginationWrapper relative flex justify-center" }, LT = {
@@ -34201,7 +34244,5 @@ const VT = /* @__PURE__ */ br(OT, [["render", FT]]), oC = {
   }
 };
 export {
-  lk as RegistryList,
-  DT as RegistryListCustom,
   oC as default
 };

package/module/gis/card/gis.registers.table/columns.hbs

@@ -47,6 +47,9 @@
         <th class="py-2 last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0">
         Приховати поле в карточці
         </th>
+        <th class="py-2 last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0">
+        Експорт даних колонки
+        </th>
       </tr>
     </thead>
     <tbody class="divide-y divide-gray-200">
@@ -70,6 +73,9 @@
         <td class="py-2 pr-5  last:sticky last:right-0 ">
           {{{badge hidden_card data='yes_no'}}}
         </td>
+        <td class="py-2 pr-5  last:sticky last:right-0 ">
+          {{{badge is_export data='yes_no'}}}
+        </td>
       </tr>
       {{/each}}
     </tbody>

package/module/gis/card/gis.services.table/attributes.hbs

@@ -49,6 +49,9 @@
           <th class="py-2 last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0">
             Приховати поле в карточці
           </th>
+          <th class="py-2 last:min-w-[60px] last:max-w-[60px] last:bg-white last:sticky last:right-0">
+            Експорт даних колонки
+          </th>
         </tr>
         </thead>
         <tbody class="divide-y divide-gray-200">
@@ -72,6 +75,9 @@
             <td class="py-2 pr-5  last:sticky last:right-0 ">
               {{{badge hidden_card data='yes_no'}}}
             </td>
+            <td class="py-2 pr-5  last:sticky last:right-0 ">
+              {{{badge is_export data='yes_no'}}}
+            </td>
           </tr>
         {{/each}}
         </tbody>

package/module/gis/form/gis.maps.form.json

@@ -58,10 +58,7 @@
     "image": {
       "ua": "Фото",
       "col": 12,
-      "type": "Dropzone",
-      "validators": [
-        "required"
-      ]
+      "type": "Dropzone"
     }
   }
 }

package/module/gis/form/gis.registers.form.json

@@ -200,6 +200,13 @@
           "ua": "Приховати поле в карточці об'єкта",
           "i": "Чи приховати поле при перегляді карточки об'єктів",
           "col": 6
+        },
+        {
+          "key": "is_export",
+          "type": "Switcher",
+          "ua": "Експорт даних колонки",
+          "i": "Чи експортувати колонку при експорті?",
+          "col": 6
         }
       ]
     },

package/module/gis/form/gis.registers_column.form.json

@@ -66,6 +66,13 @@
           "ua": "Приховати поле в карточці об'єкта",
           "i": "Чи приховати поле при перегляді карточки об'єктів",
           "col": 6
+        },
+        {
+          "key": "is_export",
+          "type": "Switcher",
+          "ua": "Експорт даних колонки",
+          "i": "Чи експортувати колонку при експорті?",
+          "col": 6
         }
       ],
       "validators": [

package/module/gis/form/gis.services.form.json

@@ -218,6 +218,13 @@
           "ua": "Приховати поле в карточці об'єкта",
           "i": "Чи приховати поле при перегляді карточки об'єктів",
           "col": 6
+        },
+        {
+          "key": "is_export",
+          "type": "Switcher",
+          "ua": "Експорт даних колонки",
+          "i": "Чи експортувати колонку при експорті?",
+          "col": 6
         }
       ]
     },
@@ -294,6 +301,10 @@
       "ua": "Стилізація у форматі yml",
       "type": "Ace",
       "syntax": "yml"
+    },
+    "card": {
+      "ua": "Шаблон картки",
+      "type": "Text"
     }
   }
 }

package/module/gis/form/gis.services_attributes.form.json

@@ -57,6 +57,13 @@
           "ua": "Приховати поле в карточці об'єкта",
           "i": "Чи приховати поле при перегляді карточки об'єктів",
           "col": 6
+        },
+        {
+          "key": "is_export",
+          "type": "Switcher",
+          "ua": "Експорт даних колонки",
+          "i": "Чи експортувати колонку при експорті?",
+          "col": 6
         }
       ],
       "validators": [

package/module/gis/table/site.gis.registers.table.json

@@ -18,7 +18,7 @@
         "title": "name",
         "search": "name,description"
     },
-    "title":"Реєстри",
+    "title": "Реєстри",
     "form": "gis.registers.form",
     "columns": [
         {
@@ -63,13 +63,9 @@
     "filterList": [
         {
             "label": "Назва",
-            "id": "name",
-            "type": "Text"
-        },
-        {
-            "label": "Держатель",
-            "id": "holder",
-            "type": "Text"
+            "id": "search",
+            "type": "Text",
+            "columns": "name,holder"
         }
     ]
-}
+}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "type": "module",
   "author": "Softpro",
-  "main": "import-file.js",
+  "main": "dist/import-file.js",
   "files": [
     "dist/*",
     "module/*",
@@ -16,9 +16,11 @@
   ],
   "scripts": {
     "dev": "node server",
+    "build-lib": "vite build ",
     "build": "vite build && vite build admin",
     "preview": "vite preview",
-    "prod": "set NODE_ENV=production&& node server",
+    "prod": "export NODE_ENV=production&& node server",
+    "prodw": "set NODE_ENV=production&& node server",
     "docs:install": "npm install --prefix ./docs",
     "docs:dev": "npm run --prefix ./docs docs:dev",
     "docs:build": "npm run --prefix ./docs docs:build",
@@ -42,10 +44,12 @@
     "monaco-editor": "^0.52.2",
     "vue": "^3.5.13",
     "vue-router": "4.5.1",
-    "vue3-smooth-dnd": "0.0.6"
+    "vue3-smooth-dnd": "0.0.6",
+    "yaml": "^2.8.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.3",
+    "dotenv": "^16.5.0",
     "eslint": "8.49.0",
     "eslint-config-airbnb": "19.0.4",
     "sass-embedded": "1.86.3",

package/server/routes/gis/registers/funcs/handleRegistryRequest.js

@@ -39,8 +39,6 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
 
         await attachClassifiers(row, classifiers);
 
-        return row;
-
         return {
             row,
             columns: columnsInfo,

package/server/routes/map/controllers/mapCatalog.js

@@ -18,13 +18,17 @@ export default async function mapCatalog({ pg = pgClients.client }, reply) {
     const { rows: services = [] } = pg.pk?.['gis.services']
         ? await pg.query(`select 
                 service_id as id, name, service_type, service_url as url, 
-                source_type, source_path, style, layers, 
+                source_type, source_path, geometry_column, style, layers, 
                 st_asgeojson(bbox)::json->'coordinates' as bbox, 
-                st_asgeojson(center)::json->'coordinates' as center
+                st_asgeojson(center)::json->'coordinates' as center,
+                popup, card, filters
             from gis.services where is_active and is_public`
         )
         : {};
 
+    const bboxq = services.filter(el => el.source_path && pg?.pk?.[el.source_path] && !el.bbox).map(el => `update gis.services set bbox = (select st_extent(${el.geometry_column || 'geom'})::geometry from ${el.source_path}) where service_id='${el.id}'`).join(';');
+    await pg.query(bboxq).catch(err => console.error(err.toString()));
+
     services.filter(row => row.style).map(row => {
         row.style = yml2json(row.style);
     });