@opengis/gis 0.2.1 → 0.2.3

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

@@ -1,15 +1,23 @@
-import { config, pgClients, yml2json } from '@opengis/fastify-table/utils.js';
+import {
+  config, pgClients, yml2json, getTemplates, getTemplate,
+} from '@opengis/fastify-table/utils.js';
 
 export default async function layerList({
-    pg = pgClients.client, query = {}, user = {},
+  pg = pgClients.client, query = {}, user = {},
 }, reply) {
-    const { sql } = query;
-
-    if (!pg.pk?.['gis.services']) {
-        return reply.status(404).send('services table not found');
-    }
-
-    const q = `
+  const { sql } = query;
+  const layers = getTemplates('layer');
+  const files = Promise.all(layers.map(async (el) => {
+    const layer = await getTemplate('layer', el[0]);
+    return layer;
+  }));
+
+  if (!pg.pk?.['gis.services']) {
+    return files;
+    // return reply.status(404).send('services table not found');
+  }
+
+  const q = `
     select service_id as id, name, category, style, bbox::box2d as extent, st_asgeojson(bbox)::json as geom, null as url, coalesce(service_type, 'vtile') as service, group_id,
         popup, card, filters, style, source_path
     from gis.services where is_active and ${!user.uid ? 'is_public' : '1=1'}
@@ -19,32 +27,34 @@ export default async function layerList({
     from gis.ogc_service where enabled and ${!user.uid ? 'ispublic' : '1=1'}
     `;
 
-    if (user.uid && sql) return q;
+  if (user.uid && sql) return q;
+
+  const rows = await pg.query(q).then(el => el.rows || []);
 
-    const rows = await pg.query(q).then(el => el.rows || []);
+  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
+    .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+  rows.filter(row => row.source_path).forEach(row => Object.assign(row, { count: totals[row.source_path] || 0 }));
 
-    const totals = pg.queryCache ? await pg.queryCache(`select json_object_agg(oid::regclass, reltuples) from pg_class`)
-        .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-    rows.filter(row => row.source_path).forEach(row => Object.assign(row, { count: totals[row.source_path] || 0 }));
+  const groupIds = rows.map(el => el.group_id).filter(Boolean);
+  const groupNames = groupIds.length ? await pg.query('select json_object_agg(group_id,group_name) from gis.group_list where group_id=any($1)', [groupIds]).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+  rows.filter(el => el.group_id).forEach(row => Object.assign(row, { group_name: groupNames[row.group_id] }));
 
-    const groupIds = rows.map(el => el.group_id).filter(Boolean);
-    const groupNames = groupIds.length ? await pg.query('select json_object_agg(group_id,group_name) from gis.group_list where group_id=any($1)', [groupIds]).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-    rows.filter(el => el.group_id).forEach(row => Object.assign(row, { group_name: groupNames[row.group_id] }));
+  if (!rows.length) {
+    return reply.status(200).send([]);
+  }
 
-    if (!rows.length) {
-        return reply.status(200).send([]);
-    }
+  // parse service style
+  rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : null }));
+  // assign service url
+  rows.filter(row => row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
+  // parse extent string to number[]
+  rows.filter(row => row.extent).forEach(row => Object.assign(row, {
+    extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
+      ?.replace?.(/ /g, ',')
+      ?.split?.(','),
+  }));
 
-    // parse service style
-    rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : null }));
-    // assign service url
-    rows.filter(row => row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
-    // parse extent string to number[]
-    rows.filter(row => row.extent).forEach(row => Object.assign(row, {
-        extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
-            ?.replace?.(/ /g, ",")
-            ?.split?.(",")
-    }));
+  // return files;
 
-    return reply.status(200).send(rows);
-}
+  return reply.status(200).send(rows.concat(files));
+}

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

@@ -1,125 +1,85 @@
-import { pgClients, getTemplate, handlebars, metaFormat } from "@opengis/fastify-table/utils.js";
+import {
+  pgClients, getTemplate, handlebars, metaFormat,
+} from '@opengis/fastify-table/utils.js';
 
 export default async function mapFormat(req, reply) {
-    const { pg = pgClients.client, query = {} } = req;
-    const { layer, id, map } = query;
-    const time = Date.now();
-
-    if (!layer || !id) return reply.status(404).send('not enough params: layer,id,map is required');
-
-    let service = null;
-
-    if (map) {
-        const {
-            rows: [mapLayer],
-        } = await pg.query(
-            `select s.*
-             from gis.maps_layers ml
-             join gis.services s on s.service_id = ml.service_id
-             join gis.maps m on m.map_id = ml.map_id
-             where m.map_key = $1 and s.service_key = $2`,
-            [map, layer]
-        );
-
-        if (mapLayer) {
-            service = mapLayer;
-        }
-    } else {
-        const {
-            rows: [s],
-        } = await pg.query(`SELECT * FROM gis.services WHERE service_id = $1`, [layer]);
-
-        if (s) {
-            service = s;
-        }
-    }
-
-    let source_path, tpl, cardInterface, card, template;
-    if (service) {
-        ({ source_path, interface: cardInterface, card, template } = service);
-    } else {
-        // git
-        tpl = await getTemplate('map', map);
-        const matchedLayer = tpl?.layers?.find(l => l.id === layer || l.service === layer);
-        if (!matchedLayer || !matchedLayer.source_path || !matchedLayer.card) {
-            return reply.status(404).send('template not found');
-        };
-        source_path = matchedLayer.source_path;
-        card = matchedLayer.card;
-        template = matchedLayer.template;
-
-    }
-
-    const columns = card;
-    if (!source_path) return reply.status(404).send('missing source_path');
-
-    const pk = pg.pk?.[source_path];
-    if (!pk) return reply.status(404).send('missing pk');
-
-    if (!columns) return reply.status(404).send('columns setting not found');
-
-    const columnNames = columns.map(col => col.name);
-    const excluded = ["created_by", "created_at", "updated_by", "geom", "id", "uid", "updated_at", "cdate", "editor_date", "editor_id"];
-    const filteredColumns = columnNames.filter(name => !excluded.includes(name));
-
-    const rows = await pg.query(
-        `SELECT ${pk} as "id", geom::json, ${filteredColumns.map(n => `"${n}"`).join(", ")} FROM ${source_path} WHERE ${pk} = $1`,
-        [id]
-    ).then(el => el.rows || []);
-
-    if (!rows.length) return reply.status(404).send('object not found');
-
-    const classifiers = columns
-        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
-        .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-    await metaFormat({ rows, table: source_path, cls: classifiers, sufix: false });
-    const fullRow = rows[0];
-
-    const result = [];
-    for await (const col of columns) {
-        if (excluded.includes(col.name)) continue;
-        if (col.hidden_card === true) continue;
-
-        const name = col.label || col.ua || col.name;
-        let value;
-        value = fullRow[`${col.name}_data`]?.text
+  const { pg = pgClients.client, query = {} } = req;
+  const { layer, id } = query;
+  const time = Date.now();
+
+  if (!layer || !id) return reply.status(404).send('not enough params: layer,id,map is required');
+
+  const service = await getTemplate('layer', layer) || (pg.tlist.includes('gis.services') ? await pg.query('SELECT * FROM gis.services WHERE service_id = $1', [layer]).then(res => res.rows[0]) : null);
+
+  const {
+    source_path: tname, cardInterface, card, template,
+  } = service;
+
+  const columns = card;
+  if (!tname) return reply.status(404).send('missing source_path');
+
+  const pk = pg.pk?.[tname];
+  if (!pk) return reply.status(404).send('missing pk');
+
+  if (!columns) return reply.status(404).send('columns setting not found');
+
+  const columnNames = columns.map(col => col.name);
+  const excluded = ['created_by', 'created_at', 'updated_by', 'geom', 'id', 'uid', 'updated_at', 'cdate', 'editor_date', 'editor_id'];
+  const filteredColumns = columnNames.filter(name => !excluded.includes(name));
+
+  const rows = await pg.query(
+    `SELECT ${pk} as "id", geom::json, ${filteredColumns.map(n => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
+    [id],
+  ).then(el => el.rows || []);
+
+  if (!rows.length) return reply.status(404).send('object not found');
+
+  const classifiers = columns
+    .filter(col => col.data && ['select', 'badge', 'tags'].includes(col.format))
+    .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+  await metaFormat({
+    rows, table: tname, cls: classifiers, sufix: false,
+  });
+  const fullRow = rows[0];
+
+  const result = [];
+  const filtered = columns.filter(col => !excluded.includes(col.name));
+  for (let i = 0; i < filtered.length; i += 1) {
+    const col = filtered[i];
+
+    const name = col.label || col.ua || col.name;
+    const value = (col.format === 'date' ? new Date(fullRow[col.name]).toLocaleDateString('uk-UA') : null) || fullRow[`${col.name}_data`]?.text
             || fullRow[`${col.name}_text`]
             || fullRow[col.name];
 
-        if (col.format === 'date' && fullRow[col.name]) {
-            // const dt = formatDate(fullRow[col.name], { hash: { format: 'dd.mm.yy' } });
-            const dt = await handlebars.compile(`{{formatDate "${fullRow[col.name]}"}}`)({ format: 'dd.mm.yy' });
-            value = dt;
-        }
-        if (!value) continue;
-        result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
+    result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
             <dt class="text-gray-900">${name}</dt>
             <dd class="text-gray-700 sm:col-span-2">${value || '-'}</dd>
         </div>`);
-    }
-
-    const htmlTemplate = pg?.pk?.['admin.template']
-        ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || id]).then(el => el.rows?.[0]?.body)
-        : null;
-
-    const html1 = await handlebars.compile(htmlTemplate || 'template not found')(fullRow);
-
-    const html = template
-        ? html1
-        : `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
-
-    const res = {
-        time: Date.now() - time,
-        id,
-        rows: fullRow,
-        columns,
-        template,
-        html
-    };
-    if (service) {
-        res.cardInterface = cardInterface;
-    }
-
-    return res;
+  }
+
+  const htmlTemplate = pg?.pk?.['admin.template']
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || id]).then(el => el.rows?.[0]?.body)
+    : null;
+
+  const html1 = await handlebars.compile(htmlTemplate || 'template not found')(fullRow);
+
+  const html = template
+    ? html1
+    : `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
+
+  const res = {
+    time: Date.now() - time,
+    id,
+    rows: fullRow,
+    columns,
+    template,
+    html,
+  };
+  if (service) {
+    res.cardInterface = cardInterface;
+  }
+
+  return res;
 }

package/server/routes/map/maps/get.map.js

@@ -31,7 +31,10 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
 
     const totals = pg.queryCache ? await pg.queryCache(`select json_object_agg(oid::regclass, reltuples) from pg_class`)
         .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-
+    const maps = pg.pk?.['gis.maps'] ? await pg.query(
+        `SELECT map_id as slug, name FROM gis.maps`).then(el => el.rows || []) : [];
+    
+    
     if (params.id) {
         const map = rows[0] || {};
         const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
@@ -43,13 +46,13 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
                 const layerData = await getTemplate('layer', layer);
                 const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
                 Object.assign(serviceData, { count: totals[serviceData.source_path || ''] || 0 });
-                serviceData.style = yaml.load(serviceData.style);
+                serviceData.style = typeof serviceData.style ==='object'?serviceData.style: yaml.load(serviceData.style);
                 return { ...serviceData, id: layer, visible: true };
             }));
-            return { ...rows[0], ...obj, layers };
+            return { maps,...rows[0], ...obj, layers };
         }
 
-        return reply.status(200).send({ ...rows[0], ...loadTemplate });
+        return reply.status(200).send({ maps, ...rows[0], ...loadTemplate });
     }
 
     if (params.id && !rows.length) {

package/server/routes/map/vtile1.js

@@ -1,107 +1,89 @@
 const headers = {
-    'Content-Type': 'application/x-protobuf',
-    'Cache-Control': 'no-cache',
+  'Content-Type': 'application/x-protobuf',
+  'Cache-Control': 'no-cache',
 };
 import Sphericalmercator from '@mapbox/sphericalmercator';
+
 const mercator = new Sphericalmercator({ size: 256 });
-import { getColumnCLS, getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import {
+  getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
+} from '@opengis/fastify-table/utils.js';
 import yaml from 'js-yaml';
 
 const propsCache = {};
 
-export default async function vtile({ params = {}, query, pg, user }, reply) {
-    const { y, z } = params;
-    const x = params.x.split('.')[0] - 0;
-
-    // layer
-    const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
-    const data = await getTemplate('layer', layer);
-    // service
-    const data1 = await pg.query(`select * from gis.services where is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
-    if (!data && !data1) return { status: 404, message: 'not found' }
-
-    // style
-    const mapData = map ? await getTemplate('map', map) : {};
-    const mapStyle = mapData?.widgets?.find?.(el => el.type === 'attribute')?.config?.layer?.style;
-
-    const geom = data?.geometry_column
-        || data1?.geometry_column
-        || 'geom';
-    const table = data?.source_path
-        || data?.table_name
-        || data1?.source_path;
-    const style = mapStyle
-        || data?.style
-        || (data1?.style ? yaml.load(data1?.style) : null);
-    const filterList = data?.filters
-        || data?.filter_list
-        || data1?.filters;
-    const layerQuery = data?.query || data1?.query;
-
-    // bbox
-    const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
-    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
-
-    const filterData = query.filter ? await getFilterSQL({
-        filter: query.filter, table, filterList,
-    }) : {};
-
-    // meta
-    const metaTable = await getMeta({ pg, table });
-    if (metaTable.error) { return metaTable; }
-    const { pk: pkey, columns } = metaTable;
-
-    // props
-    const columnsFiltered = columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
-    const props = columnsFiltered.map(el => {
-        return el.type?.[0] === '_' ? `${el.name}[1] as ${el.name}` : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
-    });
-
-    const obj = (data1.attributes || []).concat(data1.card || []).concat(data1.popup || []).filter(el => el.data).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-    const propsWithCls = propsCache[layer] ?? await Promise.all(props.map(async (key, idx) => {
-        const { name, type, sql } = getColumnCLS(table, key) || {};
-        if (name && type === 'cls') {
-            return `(select name from admin.cls where parent='${name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
-        }
-        if (type === 'select' && sql) {
-            const { fields = [] } = await pg.query(sql + ' limit 0');
-            return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
-        }
-
-        if (obj[key]) {
-            const clsdata = await pg.query('select name, type, data as sql from admin.cls where name=$1', [obj[key]]).then(el => el.rows?.[0] || {});
-            if (clsdata.name && clsdata.type === 'json') {
-                return `(select name from admin.cls where parent='${clsdata.name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
-            }
-            if (clsdata.type === 'sql' && clsdata.sql) {
-                const { fields = [] } = await pg.query(clsdata.sql + ' limit 0');
-                return `(select "${fields[1].name}" from (${clsdata.sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
-            }
-        }
-        return `"${key}"::text`;
-    }));
-    if (!propsCache[layer]) { propsCache[layer] = propsWithCls; }
-
-    const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
+export default async function vtile({
+  params = {}, query, pg, user,
+}, reply) {
+  const { y, z } = params;
+  const x = params.x.split('.')[0] - 0;
+
+  // layer
+  const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
+
+  // service
+  const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
+
+  const geom = data?.geometry_column || 'geom';
+  const table = data?.source_path;
+  const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
+  const filterList = data?.filters;
+  const layerQuery = data?.query;
+
+  // bbox
+  const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
+  const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
+
+  const filterData = query.filter ? await getFilterSQL({
+    filter: query.filter, table, filterList,
+  }) : {};
+
+  // meta
+  const metaTable = await getMeta({ pg, table });
+  if (metaTable.error) { return metaTable; }
+  const { pk: pkey, columns } = metaTable;
+
+  // props
+  const props = !query.all ? data.popup || [] : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
+  const cache = layer + (query.all ? '-all' : '');
+  const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
+    const key = col.name;
+    const select = data.popup?.find(el => el.name === key);
+    // console.log(select);
+    const clsData = select?.data || col.data;
+    const cls = clsData ? await getSelect(clsData).then(el => ({ name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql })) : null;
+    const { name, type, sql } = cls || getColumnCLS(table, col.data || key) || {};
+    // console.log({ name, type, sql });
+    if (name && type === 'cls') {
+      return `(select name from admin.cls where parent='${name}' and code::text=${key}::text limit 1) as "${key}_text","${key}"::text`;
+    }
+    if (type === 'select' && sql) {
+      const { fields = [] } = await pg.query(`${sql} limit 0`);
+      return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
+    }
+    return `"${key}"::text`;
+  }));
+  propsCache[cache] = propsCache[cache] || propsWithCls;
+
+  const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
         || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
 
-    const koef = {
-        10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
-    }[z] || 0.0005;
+  const koef = {
+    10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
+  }[z] || 0.0005;
 
-    const { type } = query;
-    const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
-    const sql = ((query.clusterZoom - z) > 2
-        ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+  const { type } = query;
+  const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
+  const sql = ((query.clusterZoom - z) > 2
+    ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
             FROM (
                 SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, point_count, ST_AsMVTGeom(st_transform(geom,3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
                 FROM (
                 SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
                 FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j            
-                )q`: null
-    ) || ((query.clusterZoom - z) > 0 ?
-        `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+                )q` : null
+  ) || ((query.clusterZoom - z) > 0
+    ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
             FROM (
                 SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count, ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
                 FROM (
@@ -112,7 +94,7 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
                 ORDER BY 1 DESC
                 )q`
 
-        : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+    : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
                 FROM (
                     SELECT
 
@@ -138,8 +120,8 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
                     limit 3000)q
                 ) q`);
 
-    if (query.sql === '1') { return sql; }
-    const tile = await pg.query(sql);
-    const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
-    return reply.headers(headers).send(buffer);
-}
+  if (query.sql === '1') { return sql; }
+  const tile = await pg.query(sql);
+  const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
+  return reply.headers(headers).send(buffer);
+}

package/module/test/map/address/addr.yml

@@ -1,6 +0,0 @@
-label: Адреси
-source_path: data_address.address
-style:
-  color: "#555"
-  weight: 1.5
-visible: false

package/module/test/map/address/index.yml

@@ -1,22 +0,0 @@
----
-id: address
-name: address
-title: Адресний реєстр
-description: Адресний реєстр
-center:
-- 30.5234
-- 50.4501
-zoom: 12
-basemap: osm
-sources: []
-widgets:
-- type: legend
-  position: bottom-right
-  config:
-    items:
-    - label: Житлова зона
-      color: "#4caf50"
-    - label: Комерційна зона
-      color: "#2196f3"
-    - label: Промислова зона
-      color: "#f44336"

package/module/test/map/address/street.yml

@@ -1,16 +0,0 @@
-label: Вулиці
-source_path: data_address.street.table
-style:
-  attribute: type
-  colors:
-    "1": "#4caf50"
-    "2": "#2196f3"
-    "3": "#f44336"
-    "4": "#4caf50"
-    "5": "#2196f3"
-    "6": "#f44336"
-    "8": "#4caf50"
-    "9": "#2196f3"
-    "11": "#f44336"
-    "16": "#4caf50"
-visible: true

package/module/test/map/address2/addr.json

@@ -1,9 +0,0 @@
-{
-  "label": "Адреси",
-  "source_path": "data_address.address",
-  "style": {
-    "color": "#555",
-    "weight": 1.5
-  },
-  "visible": false
-}

package/module/test/map/address2/index.json

@@ -1,35 +0,0 @@
-{
-  "id": "address3",
-  "name": "address",
-  "title": "Адресний реєстр",
-  "description": "Адресний реєстр",
-  "center": [
-    30.5234,
-    50.4501
-  ],
-  "zoom": 12,
-  "basemap": "osm",
-  "sources": [],
-  "widgets": [
-    {
-      "type": "legend",
-      "position": "bottom-right",
-      "config": {
-        "items": [
-          {
-            "label": "Житлова зона",
-            "color": "#4caf50"
-          },
-          {
-            "label": "Комерційна зона",
-            "color": "#2196f3"
-          },
-          {
-            "label": "Промислова зона",
-            "color": "#f44336"
-          }
-        ]
-      }
-    }
-  ]
-}

package/module/test/map/address2/street.json

@@ -1,19 +0,0 @@
-{
-  "label": "Вулиці",
-  "source_path": "data_address.street.table",
-  "style": {
-    "attribute": "type",
-    "colors": {
-      "1": "#4caf50",
-      "2": "#2196f3",
-      "3": "#f44336",
-      "4": "#4caf50",
-      "5": "#2196f3",
-      "6": "#f44336",
-      "8": "#4caf50",
-      "9": "#2196f3",
-      "11": "#f44336",
-      "16": "#4caf50"
-    }
-  }
-}