Skip to content
This repository has been archived by the owner on Nov 27, 2021. It is now read-only.

Commit

Permalink
Issue #150 ongoing
Browse files Browse the repository at this point in the history
  • Loading branch information
wwwouaiebe committed Jan 16, 2021
1 parent c57ac1f commit cca6ea2
Show file tree
Hide file tree
Showing 9 changed files with 447 additions and 384 deletions.
6 changes: 3 additions & 3 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = function(grunt) {
'tmp/MapboxRouteProvider.min.js': ['src/routeProviders/MapboxRouteProvider.js'],
'tmp/MapzenValhallaRouteProvider.min.js': ['src/routeProviders/MapzenValhallaRouteProvider.js'],
'tmp/OpenRouteServiceRouteProvider.min.js': ['src/routeProviders/OpenRouteServiceRouteProvider.js'],
'tmp/OSRMRouteProvider.min.js': ['src/routeProviders/OSRMRouteProvider.js'],
'tmp/OsrmRouteProvider.min.js': ['src/routeProviders/OsrmRouteProvider.js'],
'tmp/PolylineRouteProvider.min.js': ['src/routeProviders/PolylineRouteProvider.js'],
'tmp/PublicTransportRouteProvider.min.js': ['src/routeProviders/PublicTransportRouteProvider.js']
}
Expand Down Expand Up @@ -95,15 +95,15 @@ module.exports = function(grunt) {
'dist/TravelNotesProviders/MapboxRouteProvider.min.js': ['tmp/MapboxRouteProvider.min.js'],
'dist/TravelNotesProviders/MapzenValhallaRouteProvider.min.js': ['tmp/MapzenValhallaRouteProvider.min.js'],
'dist/TravelNotesProviders/OpenRouteServiceRouteProvider.min.js': ['tmp/OpenRouteServiceRouteProvider.min.js'],
'dist/TravelNotesProviders/OSRMRouteProvider.min.js': ['tmp/OSRMRouteProvider.min.js'],
'dist/TravelNotesProviders/OsrmRouteProvider.min.js': ['tmp/OsrmRouteProvider.min.js'],
'dist/TravelNotesProviders/PolylineRouteProvider.min.js': ['tmp/PolylineRouteProvider.min.js'],
'dist/TravelNotesProviders/PublicTransportRouteProvider.min.js': ['tmp/PublicTransportRouteProvider.min.js'],
'gh-page/TravelNotes.min.js': ['tmp/TravelNotes.min.js'],
'gh-page/TravelNotesProviders/GraphHopperRouteProvider.min.js': ['tmp/GraphHopperRouteProvider.min.js'],
'gh-page/TravelNotesProviders/MapboxRouteProvider.min.js': ['tmp/MapboxRouteProvider.min.js'],
'gh-page/TravelNotesProviders/MapzenValhallaRouteProvider.min.js': ['tmp/MapzenValhallaRouteProvider.min.js'],
'gh-page/TravelNotesProviders/OpenRouteServiceRouteProvider.min.js': ['tmp/OpenRouteServiceRouteProvider.min.js'],
'gh-page/TravelNotesProviders/OSRMRouteProvider.min.js': ['tmp/OSRMRouteProvider.min.js'],
'gh-page/TravelNotesProviders/OsrmRouteProvider.min.js': ['tmp/OsrmRouteProvider.min.js'],
'gh-page/TravelNotesProviders/PolylineRouteProvider.min.js': ['tmp/PolylineRouteProvider.min.js'],
'gh-page/TravelNotesProviders/PublicTransportRouteProvider.min.js': ['tmp/PublicTransportRouteProvider.min.js']
}
Expand Down
2 changes: 1 addition & 1 deletion buildNumber.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "buildNumber" : "00180"}
{ "buildNumber" : "00190"}
2 changes: 1 addition & 1 deletion src/html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script src="TravelNotesProviders/MapzenValhallaRouteProvider.min.js"></script>
<script src="TravelNotesProviders/MapboxRouteProvider.min.js"></script>
<script src="TravelNotesProviders/GraphHopperRouteProvider.min.js"></script>
<script src="TravelNotesProviders/OSRMRouteProvider.min.js"></script>
<script src="TravelNotesProviders/OsrmRouteProvider.min.js"></script>
<script src="TravelNotesProviders/PublicTransportRouteProvider.min.js"></script>
<script src="TravelNotesProviders/PolylineRouteProvider.min.js"></script>
</body>
Expand Down
14 changes: 7 additions & 7 deletions src/html/indexDebug.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<body>
<script src="../node_modules/leaflet/dist/leaflet.js"></script><noscript>Oh oh. Javascript is not enabled. It's impossible to display this page without javascript.</noscript>
<script type="module" defer src="../src/main/main.js"></script>
<script type="module" defer src="../src/openRouteServiceRouteProvider/OpenRouteServiceRouteProvider.js"></script>
<script type="module" defer src="../src/mapzenValhallaRouteProvider/MapzenValhallaRouteProvider.js"></script>
<script type="module" defer src="../src/mapboxRouteProvider/MapboxRouteProvider.js"></script>
<script type="module" defer src="../src/graphHopperRouteProvider/GraphHopperRouteProvider.js"></script>
<script type="module" defer src="../src/osrmRouteProvider/OSRMRouteProvider.js"></script>
<script type="module" defer src="../src/publicTransportRouteProvider/PublicTransportRouteProvider.js"></script>
<script type="module" defer src="../src/polylineRouteProvider/PolylineRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/OpenRouteServiceRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/MapzenValhallaRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/MapboxRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/GraphHopperRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/OsrmRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/PublicTransportRouteProvider.js"></script>
<script type="module" defer src="../src/routeProviders/PolylineRouteProvider.js"></script>
</body>
</html>
63 changes: 62 additions & 1 deletion src/routeProviders/IconList.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,60 @@
/*
Copyright - 2017 2021 - wwwouaiebe - Contact: https://www.ouaie.be/
This program is free software;
you can redistribute it and/or modify it under the terms of the
GNU General Public License as published by the Free Software Foundation;
either version 3 of the License, or any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/*
Changes:
- v2.1.0:
- created
Doc reviewed ...
Tests ...
*/

/**
@------------------------------------------------------------------------------------------------------------------------------
@file IconList.js
@copyright Copyright - 2017 2021 - wwwouaiebe - Contact: https://www.ouaie.be/
@license GNU General Public License
@private
@------------------------------------------------------------------------------------------------------------------------------
*/

/**
@------------------------------------------------------------------------------------------------------------------------------
@module IconList
@private
@------------------------------------------------------------------------------------------------------------------------------
*/

/**
@------------------------------------------------------------------------------------------------------------------------------
@readonly
@enum {Object}
@desc Enum for icons used by Mapbox and OSRM
@public
@------------------------------------------------------------------------------------------------------------------------------
*/

export const ICON_LIST = Object.freeze (
{
turn : {
Expand Down Expand Up @@ -132,4 +189,8 @@ export const ICON_LIST = Object.freeze (
default : 'kUndefined'
}
}
);
);

/*
--- End of IconList.js file ---------------------------------------------------------------------------------------------------
*/
4 changes: 2 additions & 2 deletions src/routeProviders/MapboxRouteProvider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Tests ...
*/

import { thePolylineEncoder } from '../util/PolylineEncoder.js';
import { osrmTextInstructions } from '../routeProviders/OsrmTextInstructions.js';
import { theOsrmTextInstructions } from '../routeProviders/OsrmTextInstructions.js';
import { ICON_LIST } from '../routeProviders/IconList.js';
import { ZERO, ONE, TWO, LAT_LNG, HTTP_STATUS_OK } from '../util/Constants.js';

Expand Down Expand Up @@ -100,7 +100,7 @@ function newMapboxRouteProvider ( ) {
:
ICON_LIST [ 'default' ] [ 'default' ];

maneuver.instruction = osrmTextInstructions.compile ( myUserLanguage, step );
maneuver.instruction = theOsrmTextInstructions.compile ( myUserLanguage, step );
maneuver.duration = step.duration;
let distance = ZERO;
for (
Expand Down
4 changes: 2 additions & 2 deletions src/routeProviders/OSRMRouteProvider.js → src/routeProviders/OsrmRouteProvider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

import { thePolylineEncoder } from '../util/PolylineEncoder.js';
import { osrmTextInstructions } from '../routeProviders/OsrmTextInstructions.js';
import { theOsrmTextInstructions } from '../routeProviders/OsrmTextInstructions.js';
import { ICON_LIST } from '../routeProviders/IconList.js';
import { ZERO, ONE, LAT_LNG, HTTP_STATUS_OK } from '../util/Constants.js';

Expand Down Expand Up @@ -72,7 +72,7 @@ function newOSRMRouteProvider ( ) {
:
ICON_LIST [ 'default' ] [ 'default' ];

maneuver.instruction = osrmTextInstructions.compile ( myUserLanguage, step );
maneuver.instruction = theOsrmTextInstructions.compile ( myUserLanguage, step );
maneuver.duration = step.duration;
let distance = ZERO;
for (
Expand Down

0 comments on commit cca6ea2

Please sign in to comment.