feat: query of polygon features on map

Author: matheus-relief

src/i18n/en.json

@@ -293,6 +293,7 @@
 "feature": {
 "errors": {
 "invalidFields": "Please provide either geoField or latitudeField and longitudeField to the request parameters.",
+"missingPolygonGeoField": "Please provide a geoField when querying polygons.",
 "unexpected": "System failed to query data."
 }
 }

src/i18n/test.json

@@ -293,6 +293,7 @@
 "feature": {
 "errors": {
 "invalidFields": "******",
+"missingPolygonGeoField": "******",
 "unexpected": "******"
 }
 }

src/models/layer.model.ts

@@ -77,6 +77,13 @@ export interface LayerDefinition {
  drawingInfo?: DrawingInfo;
 }
 
+/** Allowed geometry types */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export enum GeometryType {
+ POINT = 'Point',
+ POLYGON = 'Polygon',
+}
+
 /**
  * Layer Datasource interface
  */
@@ -88,6 +95,7 @@ export interface LayerDatasource {
  geoField?: string;
  latitudeField?: string;
  longitudeField?: string;
+ type: GeometryType;
 }
 
 /** Layer documents interface declaration */
@@ -149,6 +157,10 @@ const layerSchema = new Schema(
  geoField: String,
  latitudeField: String,
  longitudeField: String,
+ type: {
+ type: String,
+ enum: Object.values(GeometryType),
+ },
  },
  },
  {

src/routes/gis/index.ts

@@ -1,5 +1,5 @@
 import express from 'express';
-import { Resource } from '@models';
+import { GeometryType, Resource } from '@models';
 import { buildQuery } from '@utils/query/queryBuilder';
 import config from 'config';
 import i18next from 'i18next';
@@ -20,6 +20,7 @@ interface IFeatureQuery {
  maxLat?: number;
  minLng?: number;
  maxLng?: number;
+ type: GeometryType;
 }
 
 /**
@@ -63,6 +64,7 @@ const getFilterPolygon = (query: IFeatureQuery) => {
  * Get feature from item and add it to collection
  *
  * @param features collection of features
+ * @param layerType layer type
  * @param item item to get feature from
  * @param mapping fields mapping, to build geoJson from
  * @param mapping.geoField geo field to extract geojson
@@ -72,6 +74,7 @@ const getFilterPolygon = (query: IFeatureQuery) => {
  */
 const getFeatureFromItem = (
  features: any[],
+ layerType: GeometryType,
  item: any,
  mapping: {
  geoField?: string;
@@ -91,7 +94,9 @@ const getFeatureFromItem = (
  ...geo,
  properties: { ...item },
  };
- features.push(feature);
+ // Only push if feature is of the same type as layer
+ if (geo.type === 'Feature' && geo.geometry?.type === layerType)
+ features.push(feature);
  } else {
  }
  }
@@ -125,7 +130,7 @@ const getFeatureFromItem = (
  *
  * @param req current http request
  * @param res http response
- * @returns GeoJSON feature collectionmutations
+ * @returns GeoJSON feature collection mutations
  */
 router.get('/feature', async (req, res) => {
  const featureCollection = {
@@ -135,6 +140,7 @@ router.get('/feature', async (req, res) => {
  const latitudeField = get(req, 'query.latitudeField');
  const longitudeField = get(req, 'query.longitudeField');
  const geoField = get(req, 'query.geoField');
+ const layerType = get(req, 'query.type', GeometryType.POINT);
  // const tolerance = get(req, 'query.tolerance', 1);
  // const highQuality = get(req, 'query.highquality', true);
  // turf.simplify(geoJsonData, {
@@ -146,6 +152,14 @@ router.get('/feature', async (req, res) => {
  .status(400)
  .send(i18next.t('routes.gis.feature.errors.invalidFields'));
  }
+
+ // Polygons are only supported for geoField
+ if (layerType === GeometryType.POLYGON && !geoField) {
+ return res
+ .status(400)
+ .send(i18next.t('routes.gis.feature.errors.missingPolygonGeoField'));
+ }
+
  const mapping = {
  geoField,
  longitudeField,
@@ -231,14 +245,20 @@ router.get('/feature', async (req, res) => {
  }
  for (const field in data.data) {
  if (Object.prototype.hasOwnProperty.call(data.data, field)) {
- if (data.data[field].items && data.data[field].items.length > 0) {
+ if (data.data[field].items?.length > 0) {
  data.data[field].items.map(async function (result) {
- getFeatureFromItem(featureCollection.features, result, mapping);
+ getFeatureFromItem(
+ featureCollection.features,
+ layerType,
+ result,
+ mapping
+ );
  });
  } else {
  data.data[field].edges.map(async function (result) {
  getFeatureFromItem(
  featureCollection.features,
+ layerType,
  result.node,
  mapping
  );

src/schema/inputs/layer.input.ts

@@ -118,6 +118,7 @@ const LayerDataSourceInputType = new GraphQLInputObjectType({
  geoField: { type: GraphQLString },
  latitudeField: { type: GraphQLString },
  longitudeField: { type: GraphQLString },
+ type: { type: GraphQLString },
  }),
 });
 

src/schema/types/layer.type.ts

@@ -12,6 +12,7 @@ import {
 import { Connection } from './pagination.type';
 import { LayerTypeEnum } from '@const/enumTypes';
 import GraphQLJSON from 'graphql-type-json';
+import { GeometryType } from '@models';
 
 /**
  * GraphQL datasourceType type.
@@ -26,6 +27,10 @@ const LayerDatasource = new GraphQLObjectType({
  geoField: { type: GraphQLString },
  latitudeField: { type: GraphQLString },
  longitudeField: { type: GraphQLString },
+ type: {
+ type: GraphQLNonNull(GraphQLString),
+ resolve: (parent) => parent.type ?? GeometryType.POINT,
+ },
  }),
 });