Merge branch 'devel' and bump version to 1.3.1

tmuguet · Dec 3, 2017 · e73af08 · e73af08
2 parents 3b16f14 + 6169f10
commit e73af08
Show file tree

Hide file tree

Showing 17 changed files with 4,233 additions and 618 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+git-tag-version = false
diff --git a/css/map2gpx.min.css b/css/map2gpx.min.css
diff --git a/css/map2gpx.src.css b/css/map2gpx.src.css
diff --git a/gulpfile.js b/gulpfile.js
@@ -9,6 +9,7 @@ const sources_js = [
     "src/js/L.Polyline.Hausdorff.js",
     "src/js/L.Polyline.interpolate.js",
     "src/js/queue.js",
+    "src/js/blockingqueue.js",
     "src/js/progress.js",
     "src/js/cache.js",
 

diff --git a/index.html b/index.html
@@ -219,6 +219,10 @@ <h2><i class="fa fa-exclamation-triangle fa-3x" aria-hidden="true"></i><br/>Trac
         <h2><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i><br/><span>Chargement en cours...</span></h2>
         <h3></h3>
     </div>
+    <div id="pending">
+        <h2><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i><br/><span>Calcul de l'itinéraire en cours...</span></h2>
+        <h3></h3>
+    </div>
     <div id="mobile-warning"><strong>Attention:</strong> ce site n'est pas destiné aux mobiles. <button>Ok, j'ai compris</button></div>
 
     <script src="js/map2gpx.min.js"></script>

diff --git a/js/map2gpx.babel.js b/js/map2gpx.babel.js
diff --git a/js/map2gpx.min.js b/js/map2gpx.min.js
diff --git a/js/map2gpx.src.js b/js/map2gpx.src.js