diff --git a/mapbuilder/pom.xml b/mapbuilder/pom.xml index f046fbe6a24fdea8fbf5b1a147aa45f04a04d301..c89e4ee59ac0836a19cb73e8a7230e1434f0142f 100644 --- a/mapbuilder/pom.xml +++ b/mapbuilder/pom.xml @@ -18,6 +18,13 @@ </properties> <dependencies> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -90,6 +97,15 @@ <version>3.22.2</version> </dependency> + <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10</version> + </dependency> + + + </dependencies> </dependencyManagement> diff --git a/mapbuilder/src/main/java/map/builder/osm/OSMFetcher.java b/mapbuilder/src/main/java/map/builder/osm/OSMFetcher.java index a867735a15176fdc919889f34986b5ea98e938f6..d7760b3b100cb128a1911638aeec4c95a1d18b63 100644 --- a/mapbuilder/src/main/java/map/builder/osm/OSMFetcher.java +++ b/mapbuilder/src/main/java/map/builder/osm/OSMFetcher.java @@ -1,6 +1,8 @@ package map.builder.osm; -import java.io.BufferedReader; +import static map.builder.osm.json.serialization.OSMJsonDtoDeserializer.Mode.NODES_AND_WAYS; +import static map.builder.osm.json.serialization.OSMJsonDtoDeserializer.Mode.TURN_RESTRICTIONS; + import java.io.DataOutputStream; import java.io.File; import java.io.FileWriter; @@ -16,15 +18,11 @@ import java.util.stream.Collectors; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.stream.JsonReader; + import map.builder.osm.json.model.OSMJsonDto; import map.builder.osm.json.serialization.OSMJsonDtoDeserializer; -import org.json.JSONObject; - import map.builder.utilities.BoundingBox; -import static map.builder.osm.json.serialization.OSMJsonDtoDeserializer.Mode.NODES_AND_WAYS; -import static map.builder.osm.json.serialization.OSMJsonDtoDeserializer.Mode.TURN_RESTRICTIONS; - public class OSMFetcher { private final static String OverpassURL = "https://overpass.kumi.systems/api/interpreter"; private final static String nodeQuery = "[out:json];way[highway](%s);(._;>;);out;"; @@ -35,7 +33,7 @@ public class OSMFetcher { public static List<OSMJsonDto> fetchTurnRestrictions(BoundingBox boundingBox) throws IOException { System.out.println("Start to fetch turn restrictions."); - List<OSMJsonDto> dtos = OSMFetcher.runQueryForBBox(OSMFetcher.relationQuery, boundingBox, TURN_RESTRICTIONS); + List<OSMJsonDto> dtos = OSMFetcher.runQueryForBBox(OSMFetcher.relationQuery, boundingBox, TURN_RESTRICTIONS); System.out.println("Turn restrictions fetched."); return dtos; @@ -49,7 +47,8 @@ public class OSMFetcher { return dtos; } - private static List<OSMJsonDto> runQueryForBBox(String query, BoundingBox bbox, OSMJsonDtoDeserializer.Mode mode) throws IOException { + private static List<OSMJsonDto> runQueryForBBox(String query, BoundingBox bbox, OSMJsonDtoDeserializer.Mode mode) + throws IOException { InputStream response = requestData(query, bbox); JsonReader jsonReader = new JsonReader(new InputStreamReader(response)); @@ -104,11 +103,10 @@ public class OSMFetcher { FileWriter file = new FileWriter(path); file.write( "[" + - data.stream() - .map(OSMJsonDto::toJson) - .collect(Collectors.joining(", ")) - + "]" - ); + data.stream() + .map(OSMJsonDto::toJson) + .collect(Collectors.joining(", ")) + + "]"); file.close(); } }