Merge branch 'devel' and bump version to 1.3.0

tmuguet · Oct 20, 2017 · e86bc74 · e86bc74
2 parents e471818 + c690901
commit e86bc74
Show file tree

Hide file tree

Showing 15 changed files with 1,035 additions and 634 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -5,6 +5,9 @@ const sources_js = [
     "src/js/jquery.shepherd.js",
     "src/js/maths.js",
     "src/js/utils.js",
+    "src/js/L.Polyline.find.js",
+    "src/js/L.Polyline.Hausdorff.js",
+    "src/js/L.Polyline.interpolate.js",
     "src/js/queue.js",
     "src/js/progress.js",
     "src/js/cache.js",

diff --git a/index.html b/index.html
@@ -191,15 +191,16 @@
         </div>
         <div id="form-import">
             <form enctype="multipart/form-data">
-                <input class="import-gpx-file" type="file" name="files[]"/>
+                <input id="import-gpx-file" type="file" name="files[]"/><br>
+                <input type="checkbox" name="interpolate" id="import-gpx-interpolate"/> <label for="import-gpx-interpolate">Rendre le tracé éditable</label>
             </form><br>
-            <button class="import-gpx-button"><span class="ico gpx"></span></button><br>
-            <span class="import-gpx-status"></span>
+            <button id="import-gpx-button"><span class="ico gpx"></span></button><br>
+            <span id="import-gpx-status"></span>
         </div>
         <div id="form-export">
-            <input type="text" value="nom" class="export-filename"/><br>
-            <button class="export-gpx-button"><span class="ico gpx"></span></button>
-            <button class="export-kml-button"><span class="ico kml"></span></button>
+            <input type="text" value="nom" id="export-filename"/><br>
+            <button id="export-gpx-button"><span class="ico gpx"></span></button>
+            <button id="export-kml-button"><span class="ico kml"></span></button>
         </div>
     </div>
     <div id="map"></div>