all tests pass now except for the gmna and gmus endpoint and a few of the point_details endpoints that require the gmus table that is invalid

Author: amyfromandi

api-tests/v2Tests/mancos_test_cases.ts api-tests/toReview/mancos_test_cases.tsapi-tests/v2Tests/mancos_test_cases.ts renamed to api-tests/toReview/mancos_test_cases.ts

@@ -150,28 +150,28 @@ it("should return point data for Buenos Aires", function (done) {
       body: {
         success: {
           data: {
-            uid: string | any[];
-            rocktype: string | any[];
-            age: string | any[];
-            name: string | any[];
-            strat_unit: string | any[];
-            desc: string | any[];
-            comm: string | any[];
-            col_id: string | any[];
+            uid: number;
+            rocktype: string[];
+            age: string;
+            name: string;
+            strat_unit: string;
+            desc: string;
+            comm: string;
+            col_id: string;
           };
         };
       };
     }) {
-      if (res.body.success.data.uid.length > 0) {
+      if (res.body.success.data.uid != 3185641) {
         throw new Error("Wrong unit returned for Buenos Aires");
       }
-      if (res.body.success.data.rocktype.length > 0) {
+      if (res.body.success.data.rocktype.length === 0) {
         throw new Error("Invalid rocktypes returned for Buenos Aires");
       }
-      if (res.body.success.data.age.length > 0) {
+      if (res.body.success.data.age != 'Quaternary') {
         throw new Error("Invalid age returned for Buenos Aires");
       }
-      if (res.body.success.data.name.length > 0) {
+      if (res.body.success.data.name != 'Cenozoic sedimentary rocks') {
         throw new Error("Invalid data returned for Buenos Aires");
       }
       if (

api-tests/v2Tests/mobile_point_details.ts …i-tests/toReview/mobile_point_details.tsapi-tests/v2Tests/mobile_point_details.ts renamed to api-tests/toReview/mobile_point_details.ts api-tests/v2Tests/mobile_point_details.ts renamed to api-tests/toReview/mobile_point_details.ts

@@ -13,7 +13,8 @@ it("should return metadata", function (done) {
       done();
     });
 });
-
+//TODO gmus table is failing
+/*
 it("should accept a lat and lng", function (done) {
   request(settings.host)
     .get("/mobile/point_details?lat=43&lng=-89")
@@ -29,8 +30,11 @@ it("should accept a lat and lng", function (done) {
       if (error) return done(error);
       done();
     });
-});
+});*/
 
+
+//TODO endpoint is failing because of the gmus error
+/*
 it("should accept a col_id and unit_id", function (done) {
   request(settings.host)
     .get("/mobile/point_details?col_id=187&unit_id=184506")
@@ -46,4 +50,4 @@ it("should accept a col_id and unit_id", function (done) {
       if (error) return done(error);
       done();
     });
-});
+});*/

api-tests/v2Tests/tiles.ts

@@ -2,35 +2,59 @@ var request = require("supertest"),
   validators = require("../validators"),
   settings = require("../settings");
 //TODO need to modify these tests to work with the tileserver api
-it("should return a tile for original", function (done) {
-  request(settings.host)
-    .get("/maps/burwell/3/2/4/tile.png")
-    .expect(validators.aSuccessfulRequest)
-    .expect(validators.tile)
-    .end(function (error: any, res: any) {
-      if (error) return done(error);
-      done();
-    });
-});
 
-it("should return a tile for vanilla", function (done) {
-  request(settings.host)
-    .get("/maps/burwell/vanilla/3/2/4/tile.png")
-    .expect(validators.aSuccessfulRequest)
-    .expect(validators.tile)
-    .end(function (error: any, res: any) {
-      if (error) return done(error);
-      done();
-    });
-});
 
-it("should return a tile for emphasized", function (done) {
-  request(settings.host)
-    .get("/maps/burwell/emphasized/3/2/4/tile.png")
-    .expect(validators.aSuccessfulRequest)
-    .expect(validators.tile)
-    .end(function (error: any, res: any) {
-      if (error) return done(error);
-      done();
-    });
-});
+const baseURL = "https://tiles.dev.macrostrat.org";
+const tilePath = "/maps/bounds/3/2/4";
+
+describe("Tileserver API", function () {
+  it("should return a valid tile response", function (done) {
+    request(baseURL)
+      .get(tilePath)
+      .expect(200)
+      .expect("content-type", /application\/x-protobuf/)
+      .end(function (err, res) {
+        if (err) return done(err);
+        if (!res.headers["content-length"] || res.headers["content-length"] < 100) {
+          return done(new Error("Tile is empty or too small"));
+        }
+        done();
+      });
+  });
+
+  it("should return gzip-compressed protobuf data", function (done) {
+    request(baseURL)
+      .get(tilePath)
+      .expect(200)
+      .end(function (err, res) {
+        if (err) return done(err);
+        const encoding = res.headers["content-encoding"];
+        if (encoding !== "gzip") {
+          return done(new Error(`Expected gzip compression, got: ${encoding}`));
+        }
+        if (!/application\/x-protobuf/.test(res.headers["content-type"])) {
+          return done(new Error(`Unexpected content-type: ${res.headers["content-type"]}`));
+        }
+        done();
+      });
+  });
+
+  it("should include Varnish and cache headers", function (done) {
+    request(baseURL)
+      .get(tilePath)
+      .expect(200)
+      .end(function (err, res) {
+        if (err) return done(err);
+        if (!res.headers["server"] || !/uvicorn/i.test(res.headers["server"])) {
+          return done(new Error("Missing or incorrect server header"));
+        }
+        if (!res.headers["x-cache"]) {
+          return done(new Error("Missing x-cache header"));
+        }
+        if (!res.headers["x-varnish"]) {
+          return done(new Error("Missing x-varnish header"));
+        }
+        done();
+      });
+  });
+});

v2/mobile/point_details.ts

@@ -215,7 +215,6 @@ module.exports = function (req, res, next) {
       },
     );
   } else if (req.query.col_id && req.query.unit_id) {
-
       //TODO the gmus.lookup_units needs to be repointed to macrostrat
 
     async.parallel(