ol-mapbox-style - npm Package Compare versions

Comparing version 2.7.2 to 2.8.0

index.js

@@ -10,3 +10,3 @@ /*
 import applyStyleFunction from 'mapbox-to-ol-style';
-import WebFont from 'webfontloader';
+import googleFonts from 'webfont-matcher/lib/fonts/google';
 import proj from 'ol/proj';
@@ -28,8 +28,9 @@ import tilegrid from 'ol/tilegrid';
 
-function loadFont(fonts, onChange) {
+function loadFont(fonts) {
+  var i, ii;
   if (!Array.isArray(fonts)) {
     var stops = fonts.stops;
     if (stops) {
-      for (var i = 0, ii = stops.length; i < ii; ++i) {
-        loadFont(stops[i][1], onChange);
+      for (i = 0, ii = stops.length; i < ii; ++i) {
+        loadFont(stops[i][1]);
       }
@@ -39,34 +40,33 @@ }
   }
+  var googleFamilies = googleFonts.getNames();
   var families = fonts.map(function(font) {
-    return mb2css(font, 1).split(' 1px ')[1];
+    return mb2css(font, 1).split(' 1px ')[1].replace(/"/g, '');
   });
-  WebFont.load({
-    google: {
-      families: families
-    },
-    fontactive: function(family) {
-      var index = families.indexOf(family);
-      if (index > -1) {
-        var font = families[index];
-        if (!availableFonts) {
-          availableFonts = [];
+  for (i = 0, ii = families.length; i < ii; ++i) {
+    var family = families[i];
+    var font = fonts[i];
+    if (googleFamilies.indexOf(family) !== -1) {
+      if (!availableFonts) {
+        availableFonts = [];
+      }
+      if (availableFonts.indexOf(font) == -1) {
+        availableFonts.push(font);
+        var fontUrl = 'https://fonts.googleapis.com/css?family=' + family.replace(/ /g, '+');
+        if (!document.querySelector('link[href="' + fontUrl + '"]')) {
+          var markup = document.createElement('link');
+          markup.href = fontUrl;
+          markup.rel = 'stylesheet';
+          document.getElementsByTagName('head')[0].appendChild(markup);
         }
-        if (availableFonts.indexOf(font) == -1) {
-          availableFonts.push(families[index]);
-          onChange();
-        }
       }
-    },
-    inactive: function() {
-      onChange();
-    },
-    timeout: 1500
-  });
+      break;
+    }
+  }
 }
 
-var defaultFont = ['Open Sans Regular', 'Arial Unicode MS Regular'];
+var defaultFont = ['Open Sans Regular', 'Arial Regular'];
 
-function preprocess(layer, onChange) {
+function preprocess(layer) {
   if ('layout' in layer && 'text-field' in layer.layout) {
-    loadFont(layer.layout['text-font'] || defaultFont, onChange);
+    loadFont(layer.layout['text-font'] || defaultFont);
   }
@@ -165,3 +165,3 @@ }
           if (typeof source == 'string' && layers[i].source == source || source.indexOf(layers[i].id) >= 0) {
-            preprocess(layers[i], onChange);
+            preprocess(layers[i]);
           }
@@ -247,3 +247,3 @@ }
     } else if (glStyle.sprite.indexOf('http') != 0) {
-      glStyle.sprite = host + path + glStyle.sprite + accessToken;
+      glStyle.sprite = (host ? (host + path) : '') + glStyle.sprite + accessToken;
     }
@@ -250,0 +250,0 @@ }

package.json

 {
   "name": "ol-mapbox-style",
-  "version": "2.7.2",
+  "version": "2.8.0",
   "description": "Create OpenLayers maps from Mapbox Style objects",
@@ -52,6 +52,6 @@ "main": "index.js",
     "@mapbox/mapbox-gl-style-spec": "^9.0.0",
-    "mapbox-to-css-font": "^2.0.3",
-    "mapbox-to-ol-style": "3.2.0",
-    "ol": "4.5.0",
-    "webfontloader": "^1.6.28"
+    "mapbox-to-css-font": "^2.1.0",
+    "mapbox-to-ol-style": "^3.2.4",
+    "ol": "^4.5.0",
+    "webfont-matcher": "^1.1.0"
   },
@@ -58,0 +58,0 @@ "devDependencies": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

3081362

decreased by-0.12%

Lines of code

68755

decreased by-0.39%

Dependency changes

• + Addedwebfont-matcher@^1.1.0

• + Addedmapbox-to-ol-style@3.4.3(transitive)

• + Addedol@4.6.5(transitive)

• + Addedwebfont-matcher@1.1.0(transitive)

• - Removedwebfontloader@^1.6.28

• - Removedmapbox-to-ol-style@3.2.0(transitive)

• - Removedol@4.5.0(transitive)

• - Removedwebfontloader@1.6.28(transitive)

• Updatedmapbox-to-css-font@^2.1.0

• Updatedmapbox-to-ol-style@^3.2.4

• Updatedol@^4.5.0