fix: PBF json (#945)

* fix: pbf encoding
koopjs · Mar 6, 2024 · cebed95 · cebed95
1 parent cb8f7b9
commit cebed95
Show file tree

Hide file tree

Showing 20 changed files with 303 additions and 165 deletions.
diff --git a/.changeset/wise-cooks-nail.md b/.changeset/wise-cooks-nail.md
@@ -0,0 +1,5 @@
+---
+"@koopjs/featureserver": patch
+---
+
+- changes to JSON specification sent to PBF encoder
diff --git a/demo/provider-data/points-id-string.geojson b/demo/provider-data/points-id-string.geojson
@@ -0,0 +1,62 @@
+{
+  "type": "FeatureCollection",
+  "metadata": {
+    "idField": "id",
+    "fields": [
+        { "name": "timestamp", "type": "Date" },
+        { "name": "id", "type": "String" },
+        { "name": "label", "type": "String" },
+        { "name": "category", "type": "String" }
+      ]
+    },
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "id": "aaa",
+        "timestamp": "2023-04-10T16:15:30.000Z",
+        "label": "White Leg",
+        "category": "pinto"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -80,
+          25
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "id": "bbb",
+        "timestamp": "2020-04-12T16:15:30.000Z",
+        "label": "Fireman",
+        "category": "pinto"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -120,
+          45
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "id": "ccc",
+        "timestamp": "2015-04-11T16:15:30.000Z",
+        "label": "Workhorse",
+        "category": "draft"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -100,
+          40
+        ]
+      }
+    }
+  ]
+}
diff --git a/packages/featureserver/coverage-unit.svg b/packages/featureserver/coverage-unit.svg
diff --git a/packages/featureserver/coverage.svg b/packages/featureserver/coverage.svg
diff --git a/packages/featureserver/src/helpers/feature-layer-metadata.js b/packages/featureserver/src/helpers/feature-layer-metadata.js
@@ -1,10 +1,6 @@
 const _ = require('lodash');
 const TableLayerMetadata = require('./table-layer-metadata');
-const {
-  PointRenderer,
-  LineRenderer,
-  PolygonRenderer
-} = require('./renderers');
+const { PointRenderer, LineRenderer, PolygonRenderer } = require('./renderers');
 const { calculateBounds } = require('@terraformer/spatial');
 const logManager = require('../log-manager');
 const getSpatialReference = require('./get-spatial-reference');
@@ -13,22 +9,20 @@ const normalizeExtent = require('./normalize-extent');
 const defaults = require('../metadata-defaults');
 
 class FeatureLayerMetadata extends TableLayerMetadata {
-  static create (geojson, options) {
-    const {
-      geojson: normalizedGeojson,
-      options: normalizedOptions
-    } = FeatureLayerMetadata.normalizeInput(geojson, options);
+  static create(geojson, options) {
+    const { geojson: normalizedGeojson, options: normalizedOptions } =
+      FeatureLayerMetadata.normalizeInput(geojson, options);
     const layerMetadata = new FeatureLayerMetadata();
     return layerMetadata.mixinOverrides(normalizedGeojson, normalizedOptions);
   }
 
-  constructor () {
+  constructor() {
     super();
     Object.assign(this, defaults.featureLayerDefaults());
     return this;
   }
 
-  mixinOverrides (geojson = {}, options = {}) {
+  mixinOverrides(geojson = {}, options = {}) {
     super.mixinOverrides(geojson, options);
 
     const { renderer, extent, inputCrs, sourceSR, capabilities = {} } = options;
@@ -46,14 +40,14 @@ class FeatureLayerMetadata extends TableLayerMetadata {
     return this;
   }
 
-  _setExtent (geojson, options) {
+  _setExtent(geojson, options) {
     const extent = getLayerExtent(geojson, options);
     if (extent) {
       this.extent = extent;
     }
   }
 
-  _setRenderer (renderer) {
+  _setRenderer(renderer) {
     if (renderer) {
       this.drawingInfo.renderer = renderer;
       return;
@@ -68,24 +62,21 @@ class FeatureLayerMetadata extends TableLayerMetadata {
     }
   }
 
-  _setDirectOverrides (options) {
+  _setDirectOverrides(options) {
     super._setDirectOverrides(options);
-    const {
-      minScale,
-      maxScale
-    } = options;
+    const { minScale, maxScale } = options;
 
     _.merge(this, {
       minScale,
-      maxScale
+      maxScale,
     });
   }
 }
 
-function getLayerExtent (geojson, options) {
+function getLayerExtent(geojson, options) {
   const spatialReference = getSpatialReference(geojson, options) || {
     wkid: 4326,
-    latestWkid: 4326
+    latestWkid: 4326,
   };
 
   const { extent } = options;
@@ -97,7 +88,7 @@ function getLayerExtent (geojson, options) {
   return calculateExtentFromFeatures(geojson, spatialReference);
 }
 
-function calculateExtentFromFeatures (geojson, spatialReference) {
+function calculateExtentFromFeatures(geojson, spatialReference) {
   if (!geojson.features || geojson.features.length === 0) {
     return;
   }
@@ -110,10 +101,12 @@ function calculateExtentFromFeatures (geojson, spatialReference) {
       xmax,
       ymin,
       ymax,
-      spatialReference
+      spatialReference,
     };
   } catch (error) {
-    logManager.logger.debug(`Could not calculate extent from data: ${error.message}`);
+    logManager.logger.debug(
+      `Could not calculate extent from data: ${error.message}`,
+    );
   }
 }
 

diff --git a/packages/featureserver/src/helpers/feature-layer-metadata.spec.js b/packages/featureserver/src/helpers/feature-layer-metadata.spec.js
@@ -51,6 +51,7 @@ describe('FeatureLayerMetadata', () => {
 
     featureLayerMetadata.should.deepEqual({
       currentVersion: CURRENT_VERSION,
+      supportedPbfFeatureEncodings: 'esriDefault',
       id: 0,
       name: 'Not Set',
       type: 'Feature Layer',
@@ -180,6 +181,7 @@ describe('FeatureLayerMetadata', () => {
 
       featureLayerMetadata.should.deepEqual({
         currentVersion: CURRENT_VERSION,
+        supportedPbfFeatureEncodings: 'esriDefault',
         id: 0,
         name: 'Not Set',
         type: 'Feature Layer',
@@ -299,7 +301,7 @@ describe('FeatureLayerMetadata', () => {
           renderer: {
             type: 'simple',
             symbol: {
-              color: [45, 172, 128, 161],
+              color: [247, 150, 70, 161],
               outline: {
                 color: [190, 190, 190, 105],
                 width: 0.5,
@@ -348,6 +350,7 @@ describe('FeatureLayerMetadata', () => {
       );
       featureLayerMetadata.should.deepEqual({
         currentVersion: CURRENT_VERSION,
+        supportedPbfFeatureEncodings: 'esriDefault',
         id: 0,
         name: 'Not Set',
         type: 'Feature Layer',
@@ -467,7 +470,7 @@ describe('FeatureLayerMetadata', () => {
           renderer: {
             type: 'simple',
             symbol: {
-              color: [45, 172, 128, 161],
+              color: [247, 150, 70, 161],
               outline: {
                 color: [190, 190, 190, 105],
                 width: 0.5,
@@ -508,6 +511,7 @@ describe('FeatureLayerMetadata', () => {
 
       featureLayerMetadata.should.deepEqual({
         currentVersion: CURRENT_VERSION,
+        supportedPbfFeatureEncodings: 'esriDefault',
         id: 0,
         name: 'Not Set',
         type: 'Feature Layer',
@@ -627,7 +631,7 @@ describe('FeatureLayerMetadata', () => {
           renderer: {
             type: 'simple',
             symbol: {
-              color: [45, 172, 128, 161],
+              color: [247, 150, 70, 161],
               outline: {
                 color: [190, 190, 190, 105],
                 width: 0.5,
@@ -664,6 +668,7 @@ describe('FeatureLayerMetadata', () => {
 
       featureLayerMetadata.should.deepEqual({
         currentVersion: CURRENT_VERSION,
+        supportedPbfFeatureEncodings: 'esriDefault',
         id: 0,
         name: 'Not Set',
         type: 'Feature Layer',
@@ -783,7 +788,7 @@ describe('FeatureLayerMetadata', () => {
           renderer: {
             type: 'simple',
             symbol: {
-              color: [45, 172, 128, 161],
+              color: [247, 150, 70, 161],
               outline: {
                 color: [190, 190, 190, 105],
                 width: 0.5,
@@ -826,6 +831,7 @@ describe('FeatureLayerMetadata', () => {
 
       featureLayerMetadata.should.deepEqual({
         currentVersion: CURRENT_VERSION,
+        supportedPbfFeatureEncodings: 'esriDefault',
         id: 0,
         name: 'Not Set',
         type: 'Feature Layer',
@@ -967,6 +973,7 @@ describe('FeatureLayerMetadata', () => {
 
       featureLayerMetadata.should.deepEqual({
         currentVersion: CURRENT_VERSION,
+        supportedPbfFeatureEncodings: 'esriDefault',
         id: 0,
         name: 'Not Set',
         type: 'Feature Layer',
@@ -1086,7 +1093,7 @@ describe('FeatureLayerMetadata', () => {
           renderer: {
             type: 'simple',
             symbol: {
-              color: [45, 172, 128, 161],
+              color: [247, 150, 70, 161],
               outline: {
                 color: [190, 190, 190, 105],
                 width: 0.5,
@@ -1134,6 +1141,7 @@ describe('FeatureLayerMetadata', () => {
 
     featureLayerMetadata.should.deepEqual({
       currentVersion: CURRENT_VERSION,
+      supportedPbfFeatureEncodings: 'esriDefault',
       id: 99,
       name: 'Not Set',
       type: 'Feature Layer',
@@ -1253,7 +1261,7 @@ describe('FeatureLayerMetadata', () => {
         renderer: {
           type: 'simple',
           symbol: {
-            color: [45, 172, 128, 161],
+            color: [247, 150, 70, 161],
             outline: {
               color: [190, 190, 190, 105],
               width: 0.5,

diff --git a/packages/featureserver/src/helpers/renderers.js b/packages/featureserver/src/helpers/renderers.js
@@ -4,9 +4,9 @@ class PointRenderer {
       type: 'simple',
       symbol: {
         color: [
-          45,
-          172,
-          128,
+          247,
+          150,
+          70,
           161
         ],
         outline: {

diff --git a/packages/featureserver/src/helpers/renderers.spec.js b/packages/featureserver/src/helpers/renderers.spec.js
@@ -14,9 +14,9 @@ describe('Renderers', () => {
       type: 'simple',
       symbol: {
         color: [
-          45,
-          172,
-          128,
+          247,
+          150,
+          70,
           161
         ],
         outline: {