Fix failure rendering styles that use glyphs or sprites (#4)

* Log requests for invalid protocols * Update to mapbox-gl-native 5.0.2 * Bump version to 0.0.4 * Fix styles with glyphs and sprites not working * Update getMap.js Co-Authored-By: John J Czaplewski <[email protected]> Co-authored-by: John J Czaplewski <[email protected]>
trailbehind · Mar 27, 2020 · bdabc36 · bdabc36
1 parent 8da41d8
commit bdabc36
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 61 deletions.
diff --git a/getMap.js b/getMap.js
@@ -16,6 +16,7 @@ function getMap() {
     mode: "static",
     ratio: 1.0,
     request: function(req, callback) {
+      debug("request: " + JSON.stringify(req));
       var start = Date.now();
       var protocol = req.url.split(":")[0];
       if (protocol == "file") {
@@ -29,7 +30,7 @@ function getMap() {
           callback(null, response);
           debug("Request for " + req.url + " complete in " + (Date.now() - start) + "ms");
         });
-      } else {
+      } else if (protocol === "http" || protocol === "https") {
         request(
           {
             url: req.url,
@@ -79,6 +80,9 @@ function getMap() {
             }
           }
         );
+      } else {
+        debug(`request for invalid url: "${req.url}"`);
+        return callback(`request for invalid url: "${req.url}"`);
       }
     }
   });

diff --git a/mapUtils.js b/mapUtils.js
@@ -60,6 +60,8 @@ exports.calculateZoom = function(extent, width, height) {
 
 exports.addOverlayDataToStyle = function(style, overlay) {
   return {
+    glyphs: style["glyphs"] || "",
+    sprints: style["sprites"] || "",
     sources: {
       ...style["sources"],
       overlay: { type: "geojson", data: overlay }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "StaticMaps-gl",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Static map rendering with mapbox-gl",
   "keywords": [],
   "main": "./index.js",
@@ -10,7 +10,7 @@
   },
   "license": "BSD-2-Clause",
   "dependencies": {
-    "@mapbox/mapbox-gl-native": "^4.1.0",
+    "@mapbox/mapbox-gl-native": "^5.0.2",
     "@mapbox/sphericalmercator": "^1.1.0",
     "@turf/bbox": "^6.0.1",
     "debug": "^4.1.1",