Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Navigation (online&cached) added #4

Open
wants to merge 87 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
7873f65
mazda internal patch enhanced with HTML5 geo location
Dec 9, 2015
58965ba
test env added
quaso Dec 30, 2015
f635df5
sandbox for graphhopper created
quaso Dec 30, 2015
5c596e8
requesting from graphhopper is working
quaso Dec 30, 2015
82e60e3
parsing and setting route
quaso Dec 30, 2015
a827954
minor fix
quaso Dec 30, 2015
e82f3a5
minor fix2
quaso Dec 30, 2015
b6dee3e
showing turn and distance-to-turn as driving via the computed route (…
quaso Dec 31, 2015
75d2ce3
- fixed an issue with two consecutive CONTINUE_ON_STREET instructions
quaso Jan 1, 2016
9edc85b
displaying route with marker icons
quaso Jan 1, 2016
76c8e02
error handling improved
quaso Jan 1, 2016
23ce25f
rerouting
quaso Jan 1, 2016
997a18b
several continue instructions merged to next non-continue one
quaso Jan 3, 2016
23cfd24
- rerouting fixed
quaso Jan 2, 2016
ad541f1
showing line instead of points for the route
Jan 5, 2016
808933b
destination reached fixed
quaso Jan 6, 2016
e1ef075
maxOffRouteTime removed from settings
quaso Jan 6, 2016
031bf0d
- menu manager moved to extra file menu.js (currently just mainMenu i…
quaso Jan 6, 2016
9fb1f2a
Menu manager created, multiple menus are supported
Jan 7, 2016
972a5fa
dynamically creating list of destinations in navigation menu
Jan 7, 2016
9ddb33e
NavCtrl.css formatting fixed
Jan 7, 2016
62ab749
$.ajax() error handling improved
Jan 7, 2016
306c249
caching routes and reading routes from cache
Jan 7, 2016
ff39997
readme updated
Jan 8, 2016
6749213
GraphHopper attribution shown
Jan 8, 2016
a4b144f
testing improved
Jan 8, 2016
1b0e426
readme updated
Jan 8, 2016
0bbe60f
algorithm for parsing data from Graphhopper rewritten, because of wro…
quaso Jan 9, 2016
82e019e
Showing turn instruction text in the notificationDiv
quaso Jan 10, 2016
f4a5188
exporting&clearing localStorage to web app
quaso Jan 10, 2016
77b95c1
UI minor fixes
quaso Jan 10, 2016
fe802a7
Java project for editing cached routes added
quaso Jan 10, 2016
e8e5367
URI for routes manager is configurable
quaso Jan 10, 2016
18d029f
distribution package updated
quaso Jan 10, 2016
6f7e562
transforming routes from/to json and zip implemented
Jan 11, 2016
c38f5d2
uplading file from javascript web app to Java web app
Jan 11, 2016
4d69ab7
- controlNotification inserted into ctrlMap, was in ctrlDiv
Jan 11, 2016
5308b6b
displaying uploaded routes in a list
quaso Jan 11, 2016
f161493
UI fixes to notificationCtrl
brettalcox Jan 11, 2016
3a3b51c
Merge branch 'brettalcox-fixUI' into fixUI (CSS fixes of notification
Jan 12, 2016
9fb81a8
fixes in showNotification function
Jan 12, 2016
112d59d
- showing a route when user clicks on it
Jan 12, 2016
1c77a11
ui fixes
IgorKvasn Jan 12, 2016
20e01b0
route cache management added to separate js file
Jan 13, 2016
a53a06d
showing and clearing more routes implemented
Jan 13, 2016
a74f221
offline navigation with cached routes
Jan 14, 2016
050cb42
debug messages for offline routing shown
quaso Jan 14, 2016
88bf6cc
visibility css added
Jan 15, 2016
9d2ddbe
debug mode for offline routing
Jan 15, 2016
4561e2c
showing more notifications in offline routing mode
Jan 15, 2016
185fa87
rounding numbers in LatLng (fixing float arithmetic)
Jan 15, 2016
2bace2d
offline navigation tweaking & DestinationHolder created
quaso Jan 17, 2016
9b7fe92
minor bug fix
Jan 18, 2016
d99b56e
minor bug fixes
Jan 18, 2016
e61d00b
- no connection icon added
quaso Jan 23, 2016
835d18a
Merge branch 'master' into export
quaso Jan 23, 2016
f0042a6
- start/finish marker icons added and shown
quaso Jan 24, 2016
2fe847a
adding new route (not storing it yet)
quaso Jan 25, 2016
e77fc0f
uploaded to Google App Engine & running there :)
quaso Jan 30, 2016
607bf2a
sending exported routes via email
quaso Jan 30, 2016
f7f570b
File uploading fixed
quaso Jan 31, 2016
41dcd17
loading api key and other settings from settings.js (user must upload…
quaso Jan 31, 2016
71e9f68
loading destinations from settings.js file (and showing them in conte…
quaso Jan 31, 2016
da79493
adding new route
quaso Jan 31, 2016
e0ce283
saving routes to files (not finished yet)
quaso Jan 31, 2016
4901a13
Parsing KML file with alerts and creating alerts.js
quaso Feb 1, 2016
ce1fd3a
showing alerts on map (loaded from alerts.js)
quaso Feb 1, 2016
fd69299
typo error fixed
quaso Feb 2, 2016
584fda6
added example for alerts.js
Feb 3, 2016
6882677
adjusted for flyandi's test environment
Feb 3, 2016
6ff4415
downloading routes as zip
Feb 3, 2016
fca960c
minor fix for clearing routes in session after zip file was created
quaso Feb 4, 2016
53723b6
syncing route format with one used in Mazda app
Feb 5, 2016
5d3881d
do not using CDN for fontawesome and jquery
Feb 5, 2016
ef09092
CORS issue fixed (Spring boot version upgrade)
Feb 5, 2016
867e6ca
destination editor added
Feb 5, 2016
bbc201b
run as SpringBoot app or in GAE
Feb 5, 2016
f66ef98
creating destination improved
quaso Feb 6, 2016
a60890f
- cleaning new route and start/finish markers fixed
Feb 8, 2016
27928f1
Saving settings.js in UI
quaso Feb 20, 2016
e874038
Merge branch 'export'
quaso Feb 20, 2016
c2a58b1
entering GraphHopper API key improved
quaso Feb 21, 2016
c067467
- fixed exporting routes with asynchronous upload
Feb 22, 2016
88e27a1
File uploading in webUI improved
Feb 22, 2016
e586292
CORS issue fixed
quaso Feb 22, 2016
0d1cc3a
lazy loading alerts.js
Feb 23, 2016
bf50ce8
Message is displayed when there are no routes for export
Feb 23, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,14 @@ resources/poi/
resources/tiles/
tilepack/
dist/*.zip
emnaviApp.orig.js
emnaviApp.orig.js
src/tiles
src/.project
settings.js
.project
.settings
routesCacheFile.js
src/test*
.idea/
*.iml
alerts.js
5 changes: 5 additions & 0 deletions MazdaRoutesEditor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.classpath
.project
.settings
target
/.springBeans
Binary file added MazdaRoutesEditor/.mvn/wrapper/maven-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions MazdaRoutesEditor/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
233 changes: 233 additions & 0 deletions MazdaRoutesEditor/mvnw
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------
# Maven2 Start Up Batch script
#
# Required ENV vars:
# ------------------
# JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
# M2_HOME - location of maven2's installed home dir
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------

if [ -z "$MAVEN_SKIP_RC" ] ; then

if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi

if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"
fi

fi

# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
Darwin*) darwin=true
#
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
# for the new JDKs provided by Oracle.
#
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
#
# Apple JDKs
#
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
fi

if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
#
# Apple JDKs
#
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi

if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
#
# Oracle JDKs
#
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi

if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
#
# Apple JDKs
#
export JAVA_HOME=`/usr/libexec/java_home`
fi
;;
esac

if [ -z "$JAVA_HOME" ] ; then
if [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
fi
fi

if [ -z "$M2_HOME" ] ; then
## resolve links - $0 may be a link to maven's home
PRG="$0"

# need this for relative symlinks
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG="`dirname "$PRG"`/$link"
fi
done

saveddir=`pwd`

M2_HOME=`dirname "$PRG"`/..

# make it fully qualified
M2_HOME=`cd "$M2_HOME" && pwd`

cd "$saveddir"
# echo Using m2 at $M2_HOME
fi

# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$M2_HOME" ] &&
M2_HOME=`cygpath --unix "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi

# For Migwn, ensure paths are in UNIX format before anything is touched
if $mingw ; then
[ -n "$M2_HOME" ] &&
M2_HOME="`(cd "$M2_HOME"; pwd)`"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
# TODO classpath?
fi

if [ -z "$JAVA_HOME" ]; then
javaExecutable="`which javac`"
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=`which readlink`
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
if $darwin ; then
javaHome="`dirname \"$javaExecutable\"`"
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
else
javaExecutable="`readlink -f \"$javaExecutable\"`"
fi
javaHome="`dirname \"$javaExecutable\"`"
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
JAVA_HOME="$javaHome"
export JAVA_HOME
fi
fi
fi

if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="`which java`"
fi
fi

if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi

if [ -z "$JAVA_HOME" ] ; then
echo "Warning: JAVA_HOME environment variable is not set."
fi

CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher

# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$M2_HOME" ] &&
M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi

# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
local basedir=$(pwd)
local wdir=$(pwd)
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
wdir=$(cd "$wdir/.."; pwd)
done
echo "${basedir}"
}

# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
echo "$(tr -s '\n' ' ' < "$1")"
fi
}

export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"

# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS

WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} "$@"
Loading