Merge remote-tracking branch 'upstream/master' into dev

CHANGELOG.md

@@ -1,6 +1,29 @@
 BRouter-Web Changelog
 =====================
 
+## 0.7.0 (2018-10-10)
+
+See also [milestone 0.7.0](https://github.com/nrenner/brouter-web/milestone/4?closed=1)
+
+### New Features
+
+* Redesign of the user interface to also support mobile devices - by [@bagage](https://github.com/bagage) and [@RoPP](https://github.com/RoPP) ([#34](https://github.com/nrenner/brouter-web/issues/34), [#66](https://github.com/nrenner/brouter-web/issues/66))
+* Permalink replaced with auto-updating URL address bar - by [@bagage](https://github.com/bagage) ([#62](https://github.com/nrenner/brouter-web/issues/62))
+* Allow user to add custom layers - by [@bagage](https://github.com/bagage) ([#77](https://github.com/nrenner/brouter-web/pull/77))
+* Profile and data table now in a collapsible, full-height sidebar ([#90](https://github.com/nrenner/brouter-web/issues/90), [#114](https://github.com/nrenner/brouter-web/issues/114))
+* No-go areas individually editable and deletable ([#100](https://github.com/nrenner/brouter-web/issues/100))
+
+### Improvements
+
+* New gulp debug task and watch CSS folder - by [@bagage](https://github.com/bagage) ([#58](https://github.com/nrenner/brouter-web/pull/58))
+* Locate button not shown when no https ([#60](https://github.com/nrenner/brouter-web/issues/60))
+* Support Leaflet 1.0 ([#65](https://github.com/nrenner/brouter-web/issues/65), [#69](https://github.com/nrenner/brouter-web/issues/69))
+* Add a gulp command for release - by [@RoPP](https://github.com/RoPP) ([#85](https://github.com/nrenner/brouter-web/pull/85))
+* Use https scheme whenever possible, to avoid mixed content issues - by [@bagage](https://github.com/bagage) ([#87](https://github.com/nrenner/brouter-web/pull/87))
+* Add car-eco/fast profiles + display energy/time - by [@abrensch](https://github.com/abrensch) ([#95](https://github.com/nrenner/brouter-web/pull/95))
+* Improve error message if no route found - by [@bagage](https://github.com/bagage) ([#99](https://github.com/nrenner/brouter-web/issues/99))
+* Support zoom 19 for German style - by [@giggls](https://github.com/giggls) ([#128](https://github.com/nrenner/brouter-web/pull/128))
+
 ## 0.6.3 (2017-03-16)
 
 * Fix data tab showing only two rows (regression from v0.6.2) ([#72](https://github.com/nrenner/brouter-web/issues/72))

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Norbert Renner and contributors
+Copyright (c) 2018 Norbert Renner and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,13 +1,11 @@
 brouter-web
 ===========
 
-Web client (by [@nrenner](https://github.com/nrenner)) for the BRouter routing engine (by [@abrensch](https://github.com/abrensch)). *Work in progress*.
+Web client (by [@nrenner](https://github.com/nrenner) and [contributors](https://github.com/nrenner/brouter-web/graphs/contributors)) for the BRouter routing engine (by [@abrensch](https://github.com/abrensch)). *Work in progress*.
 
-**New web client available mobile-ready to test on [brouter.damsy.net](http://brouter.damsy.net).
-Feedbacks are appreciated, do not hesitate to create issues about it!**
-
-BRouter online service (provided by [@abrensch](https://github.com/abrensch)):  
-http://brouter.de/brouter-web/
+Instances:  
+* [brouter.de/brouter-web](http://brouter.de/brouter-web/) *(provided by [@abrensch](https://github.com/abrensch))*
+* [brouter.damsy.net](http://brouter.damsy.net) *(provided by [@bagage](https://github.com/bagage))*
 
 This repository is only about the frontend. For the server/backend, BRouter routing engine, Android app, profiles, brouter.de site, see:  
 https://github.com/abrensch/brouter
@@ -25,12 +23,12 @@ As an alternative to the above online version, the standalone server of BRouter
 ### Install BRouter (server with routing engine)
 
 1. download and unzip latest [BRouter revision](http://brouter.de/brouter/revisions.html)  
-e.g. for Linux (replace ``~/opt/`` with your preferred install dir and ``1_4_10`` with latest version):  
+e.g. for Linux (replace ``~/opt/`` with your preferred install dir and ``1_4_11`` with latest version):  
 
         mkdir ~/opt/brouter
         cd ~/opt/brouter
-        wget http://brouter.de/brouter_bin/brouter_1_4_10.zip
-        unzip brouter_1_4_10.zip
+        wget http://brouter.de/brouter_bin/brouter_1_4_11.zip
+        unzip brouter_1_4_11.zip
         chmod +x ./standalone/server.sh
 
 2. download one or more [data file(s)](http://brouter.de/brouter/segments4/) (rd5) into ``segments4`` dir
@@ -41,9 +39,8 @@ e.g. for Linux (replace ``~/opt/`` with your preferred install dir and ``1_4_10`
    * using the latest stable release - adjust to current version number - from
      https://github.com/nrenner/brouter-web/releases:
 
-         wget https://github.com/nrenner/brouter-web/archive/0.6.4.zip
-         unzip 0.6.4.zip
-         mv brouter-web-0.6.4 brouter-web
+         wget https://github.com/nrenner/brouter-web/releases/download/0.7.0/brouter-web-0.7.0.zip
+         unzip brouter-web-0.7.0.zip -d brouter-web
 
    * OR the current development state (potentially instable and without runtime distributables):
 
@@ -97,7 +94,7 @@ Requires [Node and npm](https://nodejs.org/) (or [io.js](https://iojs.org)), [Bo
 
 ## License
 
-Copyright (c) 2016 Norbert Renner and [contributors](https://github.com/nrenner/brouter-web/graphs/contributors), licensed under the [MIT License (MIT)](LICENSE)
+Copyright (c) 2018 Norbert Renner and [contributors](https://github.com/nrenner/brouter-web/graphs/contributors), licensed under the [MIT License (MIT)](LICENSE)
 
 ## Credits and Licenses
 
@@ -137,5 +134,17 @@ Copyright (c) 2012 Makina Corpus, [MIT License](https://github.com/makinacorpus/
 Copyright (c) 2014 Dominik Moritz, [MIT License](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/LICENSE)
 * [Font Awesome](http://fontawesome.io/license/)  
 by Dave Gandy; [SIL OFL 1.1](https://scripts.sil.org/OFL) (Font), MIT License (Code), CC BY 3.0 (Documentation)
+* [url-search-params](https://github.com/WebReflection/url-search-params)  
+Copyright (C) 2015-2017 Andrea Giammarchi - @WebReflection; [MIT License](https://github.com/WebReflection/url-search-params/blob/master/LICENSE.txt)
+* [bootstrap-select](https://github.com/snapappointments/bootstrap-select)  
+Copyright (c) 2012-2018 SnapAppointments, LLC; [MIT License](https://github.com/snapappointments/bootstrap-select/blob/v1.13.0-dev/LICENSE)
+* [leaflet-sidebar-v2](https://github.com/nickpeihl/leaflet-sidebar-v2)  
+Copyright (c) 2013 Tobias Bieniek; [MIT License](https://github.com/nickpeihl/leaflet-sidebar-v2/blob/master/LICENSE)
+* [CodeMirror](https://github.com/codemirror/CodeMirror)  
+Copyright (C) 2017 by Marijn Haverbeke <[email protected]> and others; [MIT License](https://github.com/codemirror/CodeMirror/blob/master/LICENSE)
 * [Map BBCode](https://github.com/MapBBCode/mapbbcode)  
 Ilya Zverev; [Do What The F*ck You Want To Public License](https://github.com/MapBBCode/mapbbcode/blob/master/LICENSE)
+* [Leafet.StravaSegments](https://gitlab.com/bagage/leaflet.stravasegments)  
+Copyright (c) 2018 Gautier Pelloux-Prayer; [MIT License](https://gitlab.com/bagage/leaflet.stravasegments/blob/master/LICENSE)
+* [polyline](https://github.com/mapbox/polyline)  
+Copyright (c), Development Seed; [BSD 3-Clause License](https://github.com/mapbox/polyline/blob/master/LICENSE)

bower.json

@@ -32,7 +32,7 @@
     "leaflet.editable": "^1.1.0",
     "codemirror": "^5.35.0",
     "mapbbcode": "MapBBCode/mapbbcode#v1.2.0",
-    "@mapbox/polyline": "^0.2.0"
+    "polyline": "^0.2.0"
   },
   "overrides": {
     "leaflet": {

config.template.js

@@ -85,6 +85,9 @@
         //'Mapsforge Tile Server': 'http://localhost:6090/{z}/{x}/{y}.png'
     };
 
+    // Base layer to show on start, as position number in the layer switcher, starting from 0, default is first
+    BR.conf.defaultBaseLayerIndex = 0;
+
     // Initial route line transparency (0-1, overridden by stored slider setting)
     BR.conf.defaultOpacity = 0.67;
 
@@ -131,7 +134,4 @@
         }:
 
     }
-
-    // Strava API token in case you want to display Strava segments
-    BR.conf.stravaToken = null;
 })();

gulpfile.js

@@ -229,13 +229,13 @@ gulp.task('release:zip', ['release:tag', 'default'], function() {
 });
 
 gulp.task('release:publish', ['release:zip'], function() {
-  gulp.src('./brouter-web.'+nextVersion+'.zip')
+  gulp.src('./brouter-web-'+nextVersion+'.zip')
   .pipe(release({
     tag: nextVersion,
     token: ghToken,
     owner: 'bagage',
     repo: 'brouter-web',
-    manifeste: pkg,
+    manifest: pkg,
   }))
 });
 

js/Map.js

@@ -120,10 +120,10 @@ BR.Map = {
                 overlays[i] = L.tileLayer(BR.conf.overlays[i]);
             }
         }
-        // after applying custom base layer configurations, add first base layer to map
-        var firstLayer = baseLayers[Object.keys(baseLayers)[0]];
-        if (firstLayer) {
-            map.addLayer(firstLayer);
+        // after applying custom base layer configurations, add configured base layer to map
+        var defaultLayer = baseLayers[Object.keys(baseLayers)[BR.conf.defaultBaseLayerIndex || 0]];
+        if (defaultLayer) {
+            map.addLayer(defaultLayer);
         }
 
         layersControl = BR.layersTab(baseLayers, overlays).addTo(map);

js/index.js

@@ -240,10 +240,10 @@
         drawToolbar = L.easyBar([drawButton, nogos.getButton(), deleteButton]).addTo(map);
         nogos.preventRoutePointOnCreate(routing);
 
-        if (BR.conf.stravaToken) {
+        if (BR.keys.strava) {
             new L.Control.StravaSegments(
             {
-                stravaToken: BR.conf.stravaToken
+                stravaToken: BR.keys.strava
             })
             .addTo(map);
         }

js/router/BRouter.js

@@ -57,6 +57,11 @@ L.BRouter = L.Class.extend({
                 delete params.profile;
             if (params.alternativeidx == 0)
                 delete params.alternativeidx;
+
+            // don't add custom profile, as these are only stored temporarily
+            if (params.profile && params.profile.substring(0, 7) === 'custom_') {
+                delete params.profile;
+            }
         }
 
         return params;

keys.template.js

@@ -10,7 +10,10 @@
         digitalGlobe: '',
 
         // Thunderforest, https://thunderforest.com/pricing/
-        thunderforest: ''
+        thunderforest: '',
+
+        // Strava API token in case you want to display Strava segments
+        strava: ''
     };
 
 })();