@opengis/gis 0.2.2 → 0.2.4

package/module/test/layer/individual.yml

@@ -0,0 +1,54 @@
+# Title: Parcel Polygon
+
+name: ФОП
+source_path: economy_profile.individual
+query: 1=1
+
+style:
+  type: point
+  color: orange
+  width: 1
+  border: 1
+  opacity: 0.6
+  stroke: "#eee"  
+
+popup:
+  - name: registration_date
+    meta: title
+  - ua: Назва замовника
+    name: bp_customer_name
+    meta: title
+  - label: Реєстраційний номер БП
+    name: bp_code
+    format: badge
+  - label: Адреса
+    name: address
+
+card:
+  - label: Адреса
+    name: address    
+
+
+filters:
+  - name: registration_date
+    label: Дата реєстрації
+    type: date    
+  - name: fop_status
+    label: Статус
+    type: Autocomplete
+    data: fop_status
+
+  - name: address_id
+    label: Адреса
+    type: Autocomplete
+    data: reg_address_id
+  - name: kved_main
+    label: КВЕД (основний)
+    type: Autocomplete
+    data: kved_main
+  - name: before_local_budget
+    label: Податковий борг перед місцевим бюджетом
+    type: Range
+  - name: before_state_budget
+    label: Податковий борг перед державним бюджетом
+    type: Range

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/plugin.js

@@ -1,6 +1,8 @@
 import fp from 'fastify-plugin';
 
-import { config, addHook, getMeta, pgClients, execMigrations } from '@opengis/fastify-table/utils.js';
+import {
+  config, addHook, getMeta, pgClients, execMigrations,
+} from '@opengis/fastify-table/utils.js';
 
 config.prefix = config.prefix || '/api';
 
@@ -38,4 +40,4 @@ async function plugin(app, opts = config) {
     Object.assign(payload, { fields: columns?.map?.(({ name, title, dataTypeID }) => ({ name, title: title || name, type: columnType[pg?.pgType?.[dataTypeID] || 'text'] })).filter(el => el.type) });
   });
 }
-export default fp(plugin)
+export default fp(plugin);

package/server/routes/gis/services/get.services.col.js

@@ -1,32 +1,33 @@
-import { metaFormat, pgClients } from "@opengis/fastify-table/utils.js";
+import { metaFormat, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
 
 export default async function getServicesCol({ params = {}, pg = pgClients.client }, reply) {
-    const row = await pg.query(`
+  const row = await getTemplate('layer', params.id) || await pg.query(`
            SELECT 
                service_id, source_path, attributes
            FROM gis.services where ${params.id ? 'service_id=$1' : '1=1'}
        `, [params.id].filter(Boolean)).then(el => el.rows[0] || {});
 
-    if (!row.source_path) {
-        return reply.status(404).send({ code: 404, message: 'source not found' });
-    }
+  if (!row.source_path) {
+    return reply.status(404).send({ code: 404, message: 'source not found' });
+  }
 
-    const fields = await pg.query(` SELECT *  FROM ${row.source_path} limit 0`).then(el => el.fields);
-    const field = fields.find(el => el.name == params.col);
+  const fields = await pg.query(` SELECT *  FROM ${row.source_path} limit 0`).then(el => el.fields);
+  const field = fields.find(el => el.name === params.col);
 
-    if (!field) {
-        return reply.status(404).send({ message: { error: 'column not found', fields }, code: 404 });
-    }
+  if (!field) {
+    return reply.status(404).send({ message: { error: 'column not found', fields }, code: 404 });
+  }
 
-    const rows = await pg.query(`SELECT ${params.col}::text as id, ${params.col}, count(*) FROM ${row.source_path} 
-        where ${params.col} is not null group by ${params.col} order by count(*) desc limit 10`
-    ).then(el => el.rows || []);
+  const rows = await pg.query(`SELECT ${params.col}::text as id, ${params.col}, count(*) FROM ${row.source_path} 
+        where ${params.col} is not null group by ${params.col} order by count(*) desc limit 10`).then(el => el.rows || []);
 
-    const cls = row.attributes?.filter?.((col) => col.name && col.data && ["select", "badge", "tags"].includes(col.format)).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {}) || {};
+  const cls = row.attributes?.filter?.((col) => col.name && col.data && ['select', 'badge', 'tags'].includes(col.format)).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {}) || {};
 
-    await metaFormat({ rows, table: row.source_path, cls });
+  await metaFormat({ rows, table: row.source_path, cls });
 
-    const rows1 = rows.map(row => ({ ...row[`${params.col}_data`], ...row, [`${params.col}_data`]: undefined, [params.col]: undefined }));
+  const rows1 = rows.map(row => ({
+    ...row[`${params.col}_data`], ...row, [`${params.col}_data`]: undefined, [params.col]: undefined,
+  }));
 
-    return reply.status(200).send({ rows: rows1, field, fields });
-}
+  return reply.status(200).send({ rows: rows1, field, fields });
+}

package/server/routes/gis/services/get.services.js

@@ -1,17 +1,22 @@
-import { dataUpdate, getMeta, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
+import {
+  dataUpdate, getMeta, pgClients, yml2json, getTemplate,
+} from '@opengis/fastify-table/utils.js';
 
 const columnType = {
-    text: 'text',
-    date: 'date',
-    bool: 'yes/no',
-    numeric: 'number',
-    integer: 'number',
-    'timestamp without time zone': 'date',
-    'timestamp with time zone': 'date',
+  text: 'text',
+  date: 'date',
+  bool: 'yes/no',
+  numeric: 'number',
+  integer: 'number',
+  'timestamp without time zone': 'date',
+  'timestamp with time zone': 'date',
 };
 
 export default async function getServices({ params = {}, pg = pgClients.client }, reply) {
-    const rows = await pg.query(`
+  const t = await getTemplate('layer', params.id);
+  if (t) return t;
+  if (!pg.tlist.includes('gis.services')) return { status: 404, message: 'not found' };
+  const rows = await pg.query(`
         SELECT 
             service_id, service_key, name, description, keywords, category, holder, group_id, b.group_name, service_type, 
             source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
@@ -22,58 +27,58 @@ export default async function getServices({ params = {}, pg = pgClients.client }
         where ${params.id ? 'service_id=$1' : '1=1'}
     `, [params.id].filter(Boolean)).then(el => el.rows || []);
 
-    if (params.id && !rows.length) {
-        return reply.status(404).send('service not found');
-    }
+  if (params.id && !rows.length) {
+    return reply.status(404).send('service not found');
+  }
 
+  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 totals = pg.queryCache ? await pg.queryCache(`select json_object_agg(oid::regclass, reltuples) from pg_class`)
-        .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+  if (params.id) {
+    const html = await pg.query('select body from admin.templates where template_id=$1', [params.id]).then(el => el.rows?.[0]?.body);
+    Object.assign(rows[0], { html });
+  }
 
-    if (params.id) {
-        const html = await pg.query('select body from admin.templates where template_id=$1', [params.id]).then(el => el.rows?.[0]?.body);
-        Object.assign(rows[0], { html });
-    }
+  rows.filter(row => row.source_path).forEach(row => {
+    Object.assign(row, { count: totals[row.source_path] || 0 });
+  });
 
-    rows.filter(row => row.source_path).forEach(row => {
-        Object.assign(row, { count: totals[row.source_path] || 0 });
-    });
-
-    const { columns = [] } = await getMeta({ pg, table: rows[0].source_path }) || {};
-
-    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
-
-    const noCenterIds = rows.filter(row => !row.center && row.bbox).map(row => row.service_id);
-
-    const centers = noCenterIds.length ? await pg.query(`SELECT json_object_agg(service_id, st_pointonsurface(bbox)::json) FROM gis.services where service_id=any($1)`, [noCenterIds].filter(Boolean)).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-
-    await Promise.all(rows.filter(row => centers[row.service_id]).map(async (row) => {
-        // console.log('update service center', row.service_id, JSON.stringify(centers[row.service_id]));
-        await dataUpdate({ pg, id: row.service_id, table: 'gis.services', data: { center: centers[row.service_id] } });
-        Object.assign(row, { center: centers[row.service_id] });
-    }));
-
-    rows.forEach(row => Object.assign(row, {
-        center: row.center?.coordinates,
-        style: row.style ? yml2json(row.style) : undefined
-    }));
-    rows.filter(row => row.extent).forEach(row => Object.assign(row, {
-        extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
-            ?.replace?.(/ /g, ",")
-            ?.split?.(",")
-    }));
+  const { columns = [] } = await getMeta({ pg, table: rows[0].source_path }) || {};
 
+  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
 
-    rows.filter(row => row.filters).forEach(row => Object.assign(row, {
-        filters: row.filters.map(filter => ({ ...filter, api: '/api/suggest/' + row.source_path + ':' + filter.name + (filter.data && filter.name !== filter.data ? `?sel=${filter.data}` : '') }))
-    }));
+  const noCenterIds = rows.filter(row => !row.center && row.bbox).map(row => row.service_id);
 
-    if (params.id) {
-        return reply.status(200).send({ ...rows[0], fields });
-    }
+  const centers = noCenterIds.length ? await pg.query('SELECT json_object_agg(service_id, st_pointonsurface(bbox)::json) FROM gis.services where service_id=any($1)', [noCenterIds].filter(Boolean)).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
 
-    return reply.status(200).send({
-        rows,
-        fields,
+  await Promise.all(rows.filter(row => centers[row.service_id]).map(async (row) => {
+    // console.log('update service center', row.service_id, JSON.stringify(centers[row.service_id]));
+    await dataUpdate({
+      pg, id: row.service_id, table: 'gis.services', data: { center: centers[row.service_id] },
     });
-}
+    Object.assign(row, { center: centers[row.service_id] });
+  }));
+
+  rows.forEach(row => Object.assign(row, {
+    center: row.center?.coordinates,
+    style: row.style ? yml2json(row.style) : undefined,
+  }));
+  rows.filter(row => row.extent).forEach(row => Object.assign(row, {
+    extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
+      ?.replace?.(/ /g, ',')
+      ?.split?.(','),
+  }));
+
+  rows.filter(row => row.filters).forEach(row => Object.assign(row, {
+    filters: row.filters.map(filter => ({ ...filter, api: `/api/suggest/${row.source_path}:${filter.name}${filter.data && filter.name !== filter.data ? `?sel=${filter.data}` : ''}` })),
+  }));
+
+  if (params.id) {
+    return reply.status(200).send({ ...rows[0], fields });
+  }
+
+  return reply.status(200).send({
+    rows,
+    fields,
+  });
+}

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/index.mjs

@@ -29,18 +29,18 @@ const schemaInfo = {
         type: 'string',
       },
       z: {
-        type: 'number'
+        type: 'number',
       },
       y: {
-        type: 'number'
+        type: 'number',
       },
       x: {
         type: 'string',
-        pattern: '^\\d+\\.(pbf|vmt)$'
+        pattern: '^\\d+\\.(pbf|vmt)$',
       },
       id: {
-        type: 'string'
-      }
+        type: 'string',
+      },
     },
   },
 };
@@ -70,12 +70,12 @@ export default async function route(app) {
   app.get('/layer-rtile/:id/:z/:y/:x', publicParams, rtile);
   app.get('/layer-vtile/:id/:z/:y/:x', publicParams, vtile);
 
-  if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x', })) {
-    console.log("\x1b[34m%s\x1b[0m", 'add vtile from gis');
+  if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add vtile from gis');
     app.get('/vtile/:layer/:lang/:z/:y/:x', publicParams, vtile1);
   }
-  if (!app.hasRoute({ method: 'GET', url: '/api/gis-layer-list', })) {
-    console.log("\x1b[34m%s\x1b[0m", 'add gis-layer-list from gis');
+  if (!app.hasRoute({ method: 'GET', url: '/api/gis-layer-list' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add gis-layer-list from gis');
     app.get('/gis-layer-list', publicParams, layerList);
   }