@opengis/gis 0.1.81 → 0.2.0

package/module/test/map/ts.json

@@ -1,152 +1,43 @@
 {
   "history": true,
-  "height": "calc(100vh - 65px)",
-  "source_path": "ts.temp_structure",
+  "height": "calc(100vh - 65px)",  
+  "center": [    
+    34.65450,
+    48.51174    
+  ],
+  "zoom": 11,
+  "layers": ["ed67980cd690"],
   "widgets": [
     {
       "type": "info",
       "position": "top-left",
       "config": {
         "title": "Тимчасові споруди",
-        "content": "<p style='font-size: 14px; color: #34495E;'>Інформація про тимчасові споруди встановлені на території м. Кам'янське</p>",
-        "goTo": [
-          {
-            "label": "Карта адресного реєстру",
-            "url": "/map/addr"
-          },
-          {
-            "label": "Карта БП/МУО",
-            "url": "/map/bp_myo"
-          },
-          {
-            "label": "Карта містобудівної документації",
-            "url": "/map/mbd"
-          },
-          {
-            "label": "Основна карта",
-            "url": "/map/main"
-          }
-        ]
+        "content": "<p style='font-size: 14px; color: #34495E;'>Інформація про тимчасові споруди встановлені на території м. Кам'янське</p>"        
       }
     },
     {
-      "type": "attribute",
+      "type": "dataset",
       "position": "top-left",
       "config": {
-        "layer": {
-          "id": "temp_structure",
-          "service": "vtile",
-          "service_key": "ts",
-          "map_key": "ts",
-          "visible": true,
-          "url": "/api/vtile/ts.temp_structure/ua/{z}/{x}/{y}.vmt",
-          "style": {
-            "type": "polygon",
-            "attrType": "icon-by-attribute",
-            "attribute": "temp_structure_status",
-            "default_icon": "pin6-l-fa-question+4767e6.png",
-            "icon_base_url": "https://data.softpro.ua/api-user/markerIcon/",
-            "icon_size": 1,
-            "iconZoom": 14,
-            "pointZoom": 14,
-            "icon_anchor": "bottom",
-            "rules": [
-              {
-                "value": "1",
-                "label": "Діючий",
-                "color": "#28a745",
-                "icon": "pin6-l-fa-check+28a745.png"
-              },
-              {
-                "value": "2",
-                "label": "Анульований",
-                "color": "#dc3545",
-                "icon": "pin6-l-fa-exclamation+dc3545.png"
-              },
-              {
-                "value": "3",
-                "label": "Призупинений",
-                "color": "#ffc107",
-                "icon": "pin6-l-ty-lock-closed-outline+ffc107.png"
-              },
-              {
-                "value": "4",
-                "label": "Завершився термін дії",
-                "color": "purple",
-                "icon": "pin6-l-fa-clock-o+800080.png"
-              }
-            ],
-            "popup": {
-              "mode": "html",
-              "title": "<strong>Тимчасова споруда</strong>",
-              "fields": [
-                {
-                  "label": "Назва",
-                  "value": "name"
-                },
-                {
-                  "label": "Кадастровий номер ЗД",
-                  "value": "cad_num"
-                },
-                {
-                  "label": "Площа тимчасової споруди, м. кв.",
-                  "value": "area"
-                }
-              ]
-            }
-          }
-        }
+        "layer":"ed67980cd690",
+        "attribute":"status"
       }
     },
-    {
-      "type": "card",
-      "position": "top-right",
-      "config": {
-        "title": "Інформація про об'єкт"
-      }
+     {
+      "type": "layers",
+      "visible":false      
+    },
+     {
+      "type": "legend",
+      "position":"bottom-right"      
     },
     {
       "type": "basemaps",
       "position": "bottom-left",
-      "title": "Базові карти",
-      "config": {
-        "default": "voyager",
-        "layers": [
-          {
-            "id": "voyager",
-            "title": "Базова карта (voyager)",
-            "url": "https://data.gki.com.ua/api-user/rtile/voyager/ua/{z}/{x}/{y}.png",
-            "service": "raster",
-            "map_key": "ts",
-            "service_key": "ts",
-            "attribution": "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a>, &copy; <a href='https://carto.com/attributions'>CARTO</a>",
-            "image": "https://data.gki.com.ua/api-user/rtile/voyager/ua/12/2422/1400.png",
-            "owner": "OSM",
-            "basemap": true
-          },
-          {
-            "id": "esri",
-            "title": "ESRI Online Imagery(2022-2023)",
-            "url": "https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png",
-            "service": "raster",
-            "image": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/7/47/69.png"
-          }
-        ]
-      },
-      "visible": true
-    }
-  ],
-  "interactions": {
-    "hover": {
-      "enabled": true
-    },
-    "navigation": {
-      "enabled": true
-    },
-    "click": {
-      "enabled": true
+      "title": "Базові карти"      
     }
-  },
+  ],  
   "tools": [
     "home",
     "geolocation",

package/module/test/table/data_address.street.table.json

@@ -0,0 +1,70 @@
+{
+    "key": "str_id",
+    "table": "data_address.street",
+    "controls": [
+        "search",
+        "list",
+        "add"
+    ],
+    "form": "data_address.street.form",
+    "access": "user",
+    "sqlColumns": "*",
+    "order": "cdate desc",
+    "columns": [
+        {
+            "ua": "Назва вулиці",
+            "meta": "title",
+            "name": "name",
+            "format": "text"
+        },
+        {
+            "ua": "Статус",
+            "name": "status",
+            "data": "address.status",
+            "format": "select"
+        },
+        {
+            "ua": "Тип об'єкта",
+            "name": "type",
+            "data": "str_type",
+            "format": "select"
+        },
+        {
+            "ua": "Територіальна належність",
+            "name": "parent",
+            "data": "address.atu.object_id_all",
+            "width": 300,
+            "format": "select"
+        },
+        {
+            "ua": "Довжина вулиці",
+            "name": "str_length",
+            "html": "{{num_format str_length dec='2'}}",
+            "format": "number"
+        },
+        {
+            "ua": "Версія",
+            "name": "version",
+            "format": "text"
+        }
+    ],
+    "meta": {
+        "search": "name",
+        "title": "name"
+    },
+    "ua": "Вулиці",
+    "filterList": [
+        {
+            "ua": "Тип об'єкта",
+            "name": "type",
+            "data": "str_type",
+            "type": "Autocomplete"
+        },
+        {
+            "ua": "Статус",
+            "name": "status",
+            "data": "address.status",
+            "type": "Autocomplete"
+        }
+    ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.81",
+  "version": "0.2.0",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -15,8 +15,9 @@
     "LICENSE"
   ],
   "scripts": {
+    "start1": "bun server",
     "patch": "npm version patch && git push && npm publish",
-    "dev": "node server",
+    "dev": "bun --hot server",
     "front": "vite dev",
     "build-lib": "vite build",
     "build:admin": "vite build admin",
@@ -34,26 +35,27 @@
     "carto": "0.16.3"
   },
   "peerDependencies": {
-    "@opengis/fastify-table": "^1.5.4"
+    "@opengis/fastify-table": "^2.0.13"
+  },
+  "resolutions": {
+    "rollup": "4.30.0"
   },
   "devDependencies": {
-    "yaml": "2.8.1",
-    "@opengis/form": "^0.0.28",
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-auth": "^1.1.22",
-    "@opengis/fastify-table": "^1.5.4",
+    "@opengis/fastify-table": "^2.0.13",
     "@opengis/filter": "^0.1.7",
+    "@opengis/form": "^0.0.28",
+    "@opengis/table": "^0.0.27",
     "@vitejs/plugin-vue": "^5.2.3",
     "axios": "^1.11.0",
     "eslint": "8.49.0",
     "eslint-config-airbnb": "19.0.4",
     "lucide-vue-next": "^0.514.0",
     "sass-embedded": "1.86.3",
+    "typescript": "^5.9.2",
     "vite": "^6.3.5",
     "vue": "^3.5.13",
     "vue-router": "4.5.1",
-    "vuedraggable": "^4.1.0",
-    "typescript": "^5.9.2",
-    "@opengis/table": "^0.0.27"
+    "vuedraggable": "^4.1.0"
   }
-}
+}

package/server/migrations/services.sql

@@ -49,6 +49,9 @@ CREATE TABLE if not exists gis.services
       REFERENCES gis.group_list (group_id)
 );
 
+alter table gis.services add column if not exists template text;
+comment on column gis.services.template is 'Назва шаблону';
+
 DROP INDEX if exists gis.gis_services_category_gin_idx;
 
 CREATE INDEX gis_services_category_gin_idx

package/server/migrations/widgets.sql

@@ -0,0 +1,21 @@
+create schema if not exists gis;
+
+CREATE TABLE if not exists gis.widgets
+(
+  widget_id text NOT NULL DEFAULT next_id(),
+  map_id text NOT NULL,
+  name text,
+  type text NOT NULL,
+  title text,
+  position text,
+  config jsonb,
+  created_by text NOT NULL,
+  updated_by text,
+  updated_at timestamp without time zone,
+  created_at timestamp without time zone NOT NULL DEFAULT now(),
+  CONSTRAINT widgets_pkey PRIMARY KEY (widget_id),
+  CONSTRAINT widgets_map_id_fkey FOREIGN KEY (map_id)
+      REFERENCES gis.maps (map_id)
+);
+
+COMMENT ON TABLE gis.widgets IS 'Map widgets';