Merge branch 'master' into 0.3

Author: karussell

.github/CONTRIBUTING.md

@@ -0,0 +1,29 @@
+Submit a new issue only if you are sure it is a missing feature or a bug. Otherwise please discuss the topic in the [mailing list](https://lists.openstreetmap.org/listinfo/photon) first. 
+
+## We love pull requests. Here's a quick guide:
+
+1. [Fork the repo](https://help.github.com/articles/fork-a-repo) and create a branch for your new feature or bug fix.
+
+2. Run the tests. We only take pull requests with passing tests: `mvn clean test`
+
+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.
+
+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.
+
+## Code formatting
+
+We use IntelliJ defaults and a very similar configuration for NetBeans defined in the root pom.xml. For eclipse there is this [configuration](https://github.com/graphhopper/graphhopper/files/481920/GraphHopper.Formatter.zip). Also for other IDEs 
+it should be simple to match:
+
+ * Java indent is 4 spaces
+ * Line width is 100 characters
+ * The rest is left to Java coding standards but disable "auto-format on save" to prevent unnecessary format changes. 
+ * Currently we do not care about import section that much, avoid changing it
+ * Unix line endings (should be handled via git)
+
+And in case we didn't emphasize it enough: we love tests!

.travis.yml

@@ -3,7 +3,3 @@ language: java
 jdk:
   - oraclejdk8
   - oraclejdk9
-  
-matrix:
-  allow_failures:
-  - jdk: oraclejdk9

README.md

@@ -24,12 +24,13 @@ Feel free to test and participate!
 
 photon requires java, at least version 8.
 
-get photon
+Get photon, at least 0.3, from [the releases](https://github.com/komoot/photon/releases) and start it:
+
 ```bash
-wget http://photon.komoot.de/data/photon-0.2.7.jar
+java -jar photon-*.jar
 ```
 
-download search index (31G gb compressed, 56.3 gb uncompressed, worldwide coverage, languages: English, German, French and Italian). The search index is updated weekly and thankfully provided by [graphhopper](https://graphhopper.com/) with the support of [lonvia](https://github.com/lonvia).
+Download the search index (53G gb compressed, worldwide coverage, languages: English, German, French and Italian). The search index is updated weekly and thankfully provided by [GraphHopper](https://www.graphhopper.com/) with the support of [lonvia](https://github.com/lonvia).
 
 Make sure you have bzip2 or pbzip2 installed and execute one of these two commands in your shell. This will download, uncompress and extract the huge database in one step:
 
@@ -38,24 +39,28 @@ wget -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | bzi
 # you can significantly speed up extracting using pbzip2 (recommended):
 wget -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | pbzip2 -cd | tar x
  ```
- 
-start photon
-```bash
-java -jar photon-0.2.7.jar
-```
 
-Check the URL `http://localhost:2322/api?q=berlin` to see if photon is running without problems. You may want to use our [leaflet plugin](https://github.com/komoot/leaflet.photon) to see the results on a map.
+To use an older version of ElasticSearch please download the data from [here](http://download1.graphhopper.com/public/photon-ES-17-db-171019.tar.bz2) (Nov 2017) via wget as described above and use version [0.2.7 of photon](http://photon.komoot.de/data/photon-0.2.7.jar) (Oct 2016).
 
-discover more of photon's feature with its usage `java -jar photon-0.2.7.jar -h`.
+Check the URL `http://localhost:2322/api?q=berlin` to see if photon is running without problems. You may want to use our [leaflet plugin](https://github.com/komoot/leaflet.photon) to see the results on a map.
 
+discover more of photon's feature with its usage `java -jar photon-*.jar -h`.
 
 
 ### Customized Search Data
 If you need search data in other languages or restricted to a country you will need to create your search data by your own.
-Once you have your [nominatim](https://github.com/twain47/Nominatim) database ready, you can import the data to photon:
+Once you have your [nominatim](https://github.com/twain47/Nominatim) database ready, you can import the data to photon.
 
+If you haven't already set a password for your nominatim database user, do it now (change user name and password as you like, below):
+
+```bash
+su postgres
+psql
+ALTER USER nominatim WITH ENCRYPTED PASSWORD 'mysecretpassword';
+```
+Import the data to photon:
 ```bash
-java -jar photon-0.2.7.jar -nominatim-import -host localhost -port 5432 -database nominatim -user nominatim -password ... -languages es,fr
+java -jar photon-*.jar -nominatim-import -host localhost -port 5432 -database nominatim -user nominatim -password mysecretpassword -languages es,fr
 ```
 
 The import of worldwide data set will take some hours/days, ssd disk are recommended to accelerate nominatim queries.
@@ -65,7 +70,7 @@ The import of worldwide data set will take some hours/days, ssd disk are recomme
 In order to update from nominatim, you must start photon with the nominatim database credentials on the command line:
 
 ```bash
-java -jar photon-0.2.7.jar -host localhost -port 5432 -database nominatim -user nominatim -password ...
+java -jar photon-*.jar -host localhost -port 5432 -database nominatim -user nominatim -password ...
 ```
 
 A nominatim setup is also a requirement to have continuous updates. To keep in sync with the latest OSM changes run:
@@ -83,10 +88,6 @@ curl http://localhost:2322/nominatim-update
 
 
 ### Search API
-#### Start Photon
-```bash
-java -jar photon-0.2.7.jar
-```
 
 #### Search
 ```

pom.xml

@@ -83,7 +83,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.12.6</version>
+			<version>1.16.18</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -126,40 +126,10 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>1.10.19</version>
+			<version>2.13.0</version>
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.6.4</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.hamcrest</groupId>
-					<artifactId>hamcrest-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.6.4</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.hamcrest</groupId>
-					<artifactId>hamcrest-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -253,6 +223,9 @@
 			<resource>
 				<directory>es/</directory>
 			</resource>
+			<resource>
+				<directory>src/main/resources/</directory>
+			</resource>
 		</resources>
 	</build>
 	<properties>