Merge branch 'devel' and bump version to 1.2.3

tmuguet · Oct 13, 2017 · a9bf7e6 · a9bf7e6
2 parents 5b043e6 + 204fd20
commit a9bf7e6
Show file tree

Hide file tree

Showing 17 changed files with 2,660 additions and 2,263 deletions.
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
@@ -6,16 +6,18 @@ const sources_js = [
     "src/js/maths.js",
     "src/js/utils.js",
     "src/js/queue.js",
-    "src/js/state.js",
+    "src/js/progress.js",
     "src/js/cache.js",
 
     "src/js/view.js",
     "src/js/stats.js",
     "src/js/chart.js",
 
-    "src/js/route.js",
     "src/js/track.js",
 
+    "src/js/map.js",
+
+
     "src/js/script.js"
 ];
 const sources_css = [

diff --git a/index.html b/index.html
@@ -213,10 +213,7 @@ <h2><i class="fa fa-area-chart fa-3x" aria-hidden="true"></i><br/>Rien à montre
         <h2><i class="fa fa-exclamation-triangle fa-3x" aria-hidden="true"></i><br/>Tracé invalide !</h2>
         Le tracé est invalide: l'itinéraire n'a pas pu être calculé avec le dernier marqueur. Déplacez le marqueur translucide pour ré-essayer un nouvel itinéraire.
     </div>
-    <div id="data-computing" class="data">
-        <h2><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i><br/>
-            <strong><span id="data-computing-progress"></span> <small>- <span id="data-computing-status">Calculs en cours...</span></small></strong>
-            <div id="data-computing-progressbar-container"><div id="data-computing-progressbar"></div></div></h2></div>
+    <div id="data-computing" class="data"></div>
     <div id="loading" style="display: block; position: absolute; top: 0px; left: 0px; right: 0px; bottom: 0px; background-color: #FFFFFF; z-index: 5000; text-align: center;">
         <h2><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i><br/><span>Chargement en cours...</span></h2>
         <h3></h3>