Static map mit session id von directions map

src/tourplaner/business/DirectionMap.java

@@ -9,6 +9,7 @@ import java.io.IOException;
  */
 public class DirectionMap {
     private double dauer, strecke;
+    private String sessionId;
 
     /**
      * Holt die Map als image und alle Daten zur berechneten Route
@@ -19,13 +20,13 @@ public class DirectionMap {
      * @throws IOException Fehler beim Image der Map
      */
     public DirectionMap (String start, String ende, String tourname) throws IOException {
-        Image map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
-        Image mappdf = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
+        getDirections(start, ende);
+        Image map = getMap(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
+        Image mappdf = getMap(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
         String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
         String filepdf = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg";
         FileHelper.saveImage(map, "jpg", new File(file));
         FileHelper.saveImage(mappdf, "jpg", new File(filepdf));
-        getDirections(start, ende);
         if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
             FileHelper.openDefault(file);
         }
@@ -54,8 +55,9 @@ public class DirectionMap {
      * @return Image von der Map
      * @throws IOException Fehler beim Get der Map
      */
-    private Image getMap(String start, String ende, String size) throws IOException {
-        return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?start="+start+"&end="+ende+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
+    private Image getMap(String size) throws IOException {
+        System.out.println("URL: " + "https://www.mapquestapi.com/staticmap/v5/map?session="+this.sessionId+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
+        return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?session="+this.sessionId+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
     }
 
     /**
@@ -65,12 +67,10 @@ public class DirectionMap {
      * @throws IOException Fehler beim besorgen der infos über die Tour
      */
     private void getDirections(String start, String ende) throws IOException {
-        System.out.println("LOCS: " + start + ende);
         String json = HttpHelper.httpGetJsonString("https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
-        System.out.println("JSON: " + json);
-        System.out.println("URL https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
         this.strecke = JsonHelper.getDoubleFromJson(json, "distance");
         this.dauer = formatetTimeToMinutes(JsonHelper.getStingFromJson(json, "formattedTime"));
+        this.sessionId = JsonHelper.getStingFromJson(json, "sessionId");
     }
 
     /**

src/tourplaner/business/TourPlaner.java

@@ -10,6 +10,7 @@ import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Locale;
 
 /**
  * Haupt Logik des Tourplaners
@@ -167,7 +168,7 @@ public class TourPlaner{
     public static ArrayList<Tour> sucheTour(String tourname){
         ArrayList<Tour> touren = new ArrayList<>();
         getAllTours().forEach(t ->{
-            if(t.getName().contains(tourname)){
+            if(t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){
                 touren.add(t);
             }
         });