Merge pull request #100 from GIScience/ors_4.0_custom_model

Ors 4.0 custom model

Author: takb

core/src/main/java/com/graphhopper/routing/weighting/custom/CustomModelParser.java

@@ -343,14 +343,6 @@ private static Java.CompilationUnit injectStatements(List<Java.BlockStatement> p
             boolean speedInjected = false;
             boolean priorityInjected = false;
 
-            @Override
-            public Java.FieldDeclaration copyFieldDeclaration(Java.FieldDeclaration subject) throws CompileException {
-                // for https://github.com/janino-compiler/janino/issues/135
-                Java.FieldDeclaration fd = super.copyFieldDeclaration(subject);
-                fd.setEnclosingScope(subject.getEnclosingScope());
-                return fd;
-            }
-
             @Override
             public Java.MethodDeclarator copyMethodDeclarator(Java.MethodDeclarator subject) throws CompileException {
                 if (subject.name.equals("getSpeed") && !speedStatements.isEmpty() && !speedInjected) {

web-api/src/main/java/com/graphhopper/jackson/StatementDeserializer.java

@@ -12,7 +12,7 @@
 
 import static com.graphhopper.json.Statement.Keyword.*;
 
-class StatementDeserializer extends JsonDeserializer<Statement> {
+public class StatementDeserializer extends JsonDeserializer<Statement> {
     @Override
     public Statement deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
         JsonNode treeNode = p.readValueAsTree();