Merge pull request #1 from graphhopper/master

Update My Repo

Author: Wombatpm

.gitignore

@@ -1,22 +1,17 @@
 target/
 *~
-*largeEWD.txt.gz
 TODO.txt
 *-gh/
 *.osm
-docs/
 nbactions-*.xml
 config.properties
 build.xml
 queries.sh
 maven/
 measurement*.properties
-live_graphhopper.sh
 gen/
 bin/
 *.map
-scripts/googlecode_upload.py
-deploy.sh
 android/libs/graphhopper-*-android.jar
 */nbactions.xml
 .idea/
@@ -25,4 +20,16 @@ debug.sh
 *.pbf
 *.dem
 *.log
-core/TODO*.txt
+core/TODO*.txt
+srtmprovider/
+core/docs/
+.*#
+cgiarprovider/
+/nbactions.xml
+tools/nb-configuration.xml
+android/build/
+android/app/build/
+android/.gradle
+.settings/
+.classpath
+.project

.travis.yml

@@ -1,12 +1,14 @@
 language: java
 jdk:
   - openjdk7
-  - openjdk6
   - oraclejdk7
-# fails with GZIPInputStream creation (readHeader)  - oraclejdk8
+  - oraclejdk8
 # do not install anything instead return true via unix command true
 install: true
 script: ./core/files/travis-build.sh
 notifications:
   email:
-    - [email protected]
+    - [email protected]
+
+# enable container-based stack
+sudo: false

CONTRIBUTING.md

@@ -1,24 +1,36 @@
 Submit a new issue only if you are sure it is a missing feature or a bug. Otherwise discuss the topic on the 
-[mailing list](http://graphhopper.com/#developers) first.
+[mailing list](http://graphhopper.com/#developers) first. For new translations or fixes to existing translations
+please refer to [this documentation](https://github.com/graphhopper/graphhopper/blob/master/docs/core/translations.md).
 
-We love pull requests. Here's a quick guide:
+Issues for newcomers are tagged with 
+['good first issue'](https://github.com/graphhopper/graphhopper/labels/good%20first%20issue) 
+and documentation issues are taged with 
+['documentation'](https://github.com/graphhopper/graphhopper/labels/documentation).
 
-1. [Fork the repo](https://help.github.com/articles/fork-a-repo), optionally create a feature branch
+## We love pull requests. Here's a quick guide:
 
-2. Run the tests. We only take pull requests with passing tests: `mvn test`
+1. [Fork the repo](https://help.github.com/articles/fork-a-repo) and create a branch for your new feature or bug fix.
 
-3. Add a test for your change. Only refactoring and documentation changes
-require no new tests. If you are adding functionality or fixing a bug, we need
-a test!
+2. Run the tests. We only take pull requests with passing tests: `mvn clean test verify`
 
-4. Make the test pass.
+3. Add at least one test for your change. Only refactoring and documentation changes
+require no new tests. Also make sure you submit a change specific to exactly one issue. If you have ideas for multiple 
+changes please create separate pull requests.
 
-5. Push to your fork and [submit a pull request](https://help.github.com/articles/using-pull-requests)
+4. Make the test(s) pass.
 
+5. Push to your fork and [submit a pull request](https://help.github.com/articles/using-pull-requests). A button should
+appear on your fork its github page afterwards.
 
-Syntax:
+## License Agreement
 
-* Tell this your IDE or just use NetBeans which picks the format from pom.xml. E.g. no tabs - use 4 spaces instead!!
+For contributions like pull requests, bug fixes and translations please read and electronically sign 
+the <a href="http://www.clahub.com/agreements/graphhopper/graphhopper">GraphHopper License Agreement</a>,
+which gives not away your rights but it will make sure for others that you agree to the Apache License, Version 2.
+
+## Syntax:
+
+* Tell this your IDE or just use NetBeans which picks the format from pom.xml. E.g. no tabs - use 4 spaces instead!
 * Follow the conventions you see used in the source already.
 
 And in case we didn't emphasize it enough: we love tests!

CONTRIBUTORS.md

@@ -1,13 +1,27 @@
 [Members](https://github.com/graphhopper?tab=members) and [Contributors](https://github.com/graphhopper/graphhopper/contributors)
 
+ * AnahitaS
  * agouge, discussion and API refactoring
+ * b3nn0, Android improvements
+ * cgarreau, increase of routing success rate via subnetwork cleanup
  * daisy1754, fixed usage of graphhopper.sh script
+ * dardin88, instructions improved
+ * dewos
+ * lmar, improved instructions information
  * fredao, translations
+ * jansoe, one of the core developers
  * jansonhanson, general host config
- * karussell, lead developer
- * khuebner, pushes turn instructions forward
+ * JohannesPelzer, improved GPX information and various other things
+ * karussell, one of the core developers
+ * khuebner, pushed turn instructions forward
  * lmar, improved instructions
  * NopMap, massive improvements regarding OSM, parsing and encoding, route relations
  * ocampana, initial implementation for instructions
- * ratrun, route relations and bike handling
- * rodo, more descriptions
+ * ratrun, route relations, GPX information, bike handling etc
+ * rodneyodonnell, improved dead end removal
+ * rodo, more descriptions
+
+# Translations
+
+A lot people helped to create translations - thanks!
+See [this spreadsheet](https://docs.google.com/spreadsheet/ccc?key=0AmukcXek0JP6dGM4R1VTV2d3TkRSUFVQakhVeVBQRHc#gid=0)

NOTICE.md

@@ -1,6 +1,6 @@
 GraphHopper licensed under the Apache license, Version 2.0
 
-Copyright 2012-2013 Peter Karich
+Copyright 2012-2015 Peter Karich
 
 The core product includes the following software
  * slf4j.org - SLF4J distributed under the MIT license. 
@@ -10,6 +10,7 @@ The core product includes the following software
  * protobuf - New BSD license
  * OSM-binary - LGPL license
  * Osmosis - public domain, see osmosis-copying.txt under core/files
+ * XMLGraphics-Commons for CGIAR elevation files - (Apache License)
 
 tools
  * apache-compress
@@ -18,5 +19,7 @@ web
  * org.json, MIT style license
  * com.google.inject, Apache License 2.0
  * images from mapbox https://www.mapbox.com/maki/, BSD License, see core/files
+
+android
  * android, Apache License 2.0
  * org.mapsforge, LGPL

README.md

@@ -1,21 +1,44 @@
-# GraphHopper [![Build Status](https://secure.travis-ci.org/graphhopper/graphhopper.png?branch=master)](http://travis-ci.org/graphhopper/graphhopper)
+# GraphHopper Route Planner
+
+[![Build Status](https://secure.travis-ci.org/graphhopper/graphhopper.png?branch=master)](http://travis-ci.org/graphhopper/graphhopper)
 
 GraphHopper is a fast and memory efficient Java road routing engine released under Apache License 2.0.
-It is tuned towards road networks with OpenStreetMap data but can be useful for public transport problems as well.
+Per default it uses OpenStreetMap data but can import other data sources.
+
+GraphHopper for the Web
+--------------
+
+See GraphHopper in action on [GraphHopper Maps](https://graphhopper.com/maps)
 
+[![GraphHopper Maps](https://karussell.files.wordpress.com/2014/12/graphhopper-maps-0-4-preview.png)](https://graphhopper.com/maps)
 
-Get Started & Contribute
+GraphHopper Maps uses the [Directions API for Business](https://graphhopper.com/#directions-api), which provides 
+routing and matrix routing through GraphHopper and also a fast address search via [Photon](https://github.com/komoot/photon).
+Additionally the map tiles from various Providers like [Lyrk](https://geodienste.lyrk.de/pakete)
+are used and all is available for free and through HTTPS for a secure route planning experience!
+
+
+GraphHopper for Mobile
 ---------------
 
-Read through our [wiki](https://github.com/graphhopper/graphhopper/wiki/), 
-[how to contribute](https://github.com/graphhopper/graphhopper/blob/master/CONTRIBUTING.md) and 
+There are subprojects to make GraphHopper working offline
+on [Android](https://github.com/graphhopper/graphhopper/tree/master/android)
+and [iOS](http://github.com/graphhopper/graphhopper-ios)
+
+
+Get Started
+---------------
+
+Read through our Documentation ([0.4](https://github.com/graphhopper/graphhopper/blob/0.4/docs/index.md), [unstable](https://github.com/graphhopper/graphhopper/blob/master/docs/index.md)), 
 ask questions on [Stackoverflow](http://stackoverflow.com/questions/tagged/graphhopper)
-or sign up to the [mailing list](http://graphhopper.com/#developers).
+and sign up to the [mailing list](http://graphhopper.com/#developers).
 
-**Please only email me directly if you need consultancy** or can't explain your problem in the public.
 
-There are subprojects to make GraphHopper working on [Android](https://github.com/graphhopper/graphhopper/wiki/Android) or 
-as a [web application](https://github.com/graphhopper/graphhopper/tree/master/web). Have a look into our [live application](http://graphhopper.com/maps)
+Contribute
+---------------
+
+Read through [how to contribute](https://github.com/graphhopper/graphhopper/blob/master/CONTRIBUTING.md)
+like finding and fixing bugs and improving our documentation or translations!
 
 
 Features
@@ -25,6 +48,6 @@ Features
  * Open Source
  * Memory efficient and fast
  * Highly customizable
- * Works on the desktop, as a web service and offline on Android
- * Well tested
- * [... more](http://graphhopper.com/#overview)
+ * Works on the desktop, as a web service and offline on Android or iOS
+ * Large test suite
+ * [... more](http://graphhopper.com/#overview)

android/.classpath

@@ -1,6 +1,6 @@
-This is a simple Eclipse project which uses graphhoppers routing and mapsforge to display the map.
-
-* Download the apk [here](http://graphhopper.com/#download)
-* More information about setup, maps creation etc is [in the wiki](https://github.com/graphhopper/graphhopper/wiki/Android)
+This maven module can be used for various IDEs like NetBeans or Eclipse to
+make GraphHopper offline routing working on Android. For offline
+maps the mapsforge project is used. For more information see the 
+[android docs](https://github.com/graphhopper/graphhopper/blob/master/docs/android/index.md).
 
 ![simple routing](http://karussell.files.wordpress.com/2012/09/graphhopper-android.png)

android/.project

@@ -0,0 +1,51 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "com.graphhopper.android"
+        minSdkVersion 8
+        targetSdkVersion 19
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    lintOptions {
+        /* CGIARProvider refers to java.awt
+         * Helper7 refers to java.lang.management
+         * HeightTile refers to javax.imageio and java.awt
+         * OSMElement refers to javax.xml.stream
+         */
+        disable 'InvalidPackage'
+    }
+}
+
+/** only necessary if you need to use latest SNAPSHOT
+configurations.all {
+    // check for updates every build
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+ **/
+
+dependencies {
+    compile(group: 'com.graphhopper', name: 'graphhopper', version: '0.4-SNAPSHOT') {
+       exclude group: 'com.google.protobuf', module: 'protobuf-java'
+       exclude group: 'org.openstreetmap.osmosis', module: 'osmosis-osm-binary'
+       exclude group: 'org.apache.xmlgraphics', module: 'xmlgraphics-commons'
+    }
+
+    compile group: 'org.mapsforge', name: 'mapsforge-core', version: '0.5.0'
+    compile group: 'org.mapsforge', name: 'mapsforge-map', version: '0.5.0'
+    compile group: 'org.mapsforge', name: 'mapsforge-map-android', version: '0.5.0'
+    compile group: 'org.mapsforge', name: 'mapsforge-map-reader', version: '0.5.0'
+
+    compile group: 'org.slf4j', name: 'slf4j-android', version: '1.7.10'
+    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.10'
+}