svgmap 1.3.4 → 1.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "svgmap",
   "description": "svgMap is a JavaScript library that lets you easily create an interactable world map comparing customizable data for each country.",
-  "version": "1.3.4",
+  "version": "1.5.0",
   "private": false,
   "license": "MIT",
   "main": "dist/svgMap.min.js",
@@ -16,14 +16,14 @@
   },
   "devDependencies": {
     "gulp": "^4.0.2",
-    "gulp-clean-css": "^4.2.0",
+    "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
     "gulp-header": "^2.0.9",
     "gulp-rename": "^2.0.0",
-    "gulp-sass": "^4.0.2",
+    "gulp-sass": "^4.1.0",
     "gulp-sourcemaps": "^2.6.5",
     "gulp-uglify": "^3.0.2",
-    "jest": "^24.9.0",
+    "jest": "^26.0.1",
     "svg-pan-zoom": "^3.6.1"
   },
   "dependencies": {},

package/src/js/svgMap/map.js

@@ -22,8 +22,17 @@ svgMap.prototype.createMap = function () {
     }.bind(this));
   }.bind(this));
 
+  // Fix countries
+  var mapPaths = Object.assign({}, this.mapPaths);
+
+  if (!this.options.countries.EH) {
+    mapPaths.MA.d = mapPaths['MA-EH'].d;
+    delete mapPaths.EH;
+  }
+  delete mapPaths['MA-EH'];
+
   // Add map elements
-  Object.keys(this.mapPaths).forEach(function (countryID) {
+  Object.keys(mapPaths).forEach(function (countryID) {
     var countryData = this.mapPaths[countryID];
     if (!countryData.d) {
       return;
@@ -52,6 +61,14 @@ svgMap.prototype.createMap = function () {
     });*/
 
     // Tooltip events
+    // Add tooltip when touch is used
+    countryElement.addEventListener('touchstart', function (e) {
+      var countryID = countryElement.getAttribute('data-id');
+      this.setTooltipContent(this.getTooltipContent(countryID));
+      this.showTooltip(e);
+      this.moveTooltip(e);
+    }.bind(this));
+
     countryElement.addEventListener('mouseenter', function (e) {
       var countryID = countryElement.getAttribute('data-id');
       this.setTooltipContent(this.getTooltipContent(countryID));
@@ -62,8 +79,11 @@ svgMap.prototype.createMap = function () {
       this.moveTooltip(e);
     }.bind(this));
 
-    countryElement.addEventListener('mouseleave', function () {
-      this.hideTooltip();
+    // Hide tooltip when event is mouseleav or touchend
+    ['mouseleave', 'touchend'].forEach(function (event) {
+      countryElement.addEventListener(event, function () {
+        this.hideTooltip();
+      }.bind(this));
     }.bind(this));
 
   }.bind(this));
@@ -125,7 +145,7 @@ svgMap.prototype.getTooltipContent = function (countryID) {
   // Title
   this.createElement('div', 'svgMap-tooltip-title', tooltipContentWrapper)
     .innerHTML = this.getCountryName(countryID);
-  
+
   // Content
   var tooltipContent = this.createElement('div', 'svgMap-tooltip-content', tooltipContentWrapper);
   if (!this.options.data.values[countryID]) {
@@ -166,4 +186,4 @@ svgMap.prototype.zoomMap = function (direction) {
     return false;
   }
   this.mapPanZoom[direction == 'in' ? 'zoomIn' : 'zoomOut']();
-};
+};