https://github.com/FS19_AutoDrive.git

.github/ISSUE_TEMPLATE/default-bug-report.md

@@ -0,0 +1,21 @@
+---
+name: Default bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+AutoDrive Version: 1.0.
+Release or custom zip: Release
+Map (if applicable): All
+Vehicle / type (applicable):
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**If applicable - Steps to reproduce the behavior**
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.

.github/ISSUE_TEMPLATE/deutsch---german---bug-report---titel-bitte-auf-englisch--bersetzen-.md

@@ -0,0 +1,21 @@
+---
+name: Deutsch / German - Bug report - Titel bitte auf Englisch übersetzen!
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+AutoDrive Version: 1.0.
+Release or selbsterstelltes zip: Release
+Karte (falls relevant): Alle
+Fahrzeug(art) (falls relevant):
+
+**Beschreibe den Bug**
+Eine klare Beschreibung des Bugs.
+
+**Falls anwendbar - Schritte mit denen ich den Bug nachstellen kann**
+
+**Screenshots**
+Falls relevant, bitte Screenshots beifügen

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -5,3 +5,34 @@ combine.png
 draw fsdensity query.txt
 draw fsdensity query_neu.txt
 empty.png
+Check Coll And fruit in front of tractor.txt
+AutoDrive Course Editor/.idea/AutoDrive Course Editor.iml
+AutoDrive Course Editor/.idea/misc.xml
+AutoDrive Course Editor/.idea/modules.xml
+AutoDrive Course Editor/.idea/vcs.xml
+AutoDrive Course Editor/.idea/workspace.xml
+AutoDrive Course Editor/out
+AutoDrive Course Editor/.idea
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/ADUtils.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/AutoDriveEditor$1.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/AutoDriveEditor.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/EditorListener.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Agrovation_Knezmost.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Estancia_Lapacho.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Felsbrunn.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/FS19_Dondiego_Map.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/FS19_Rolling_Hills_BETA_V_01.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Goeddenstedt.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Marwell_Manor_Farm.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/MarwellManor.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Multimap_2019.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/NF_Marsch_V1_4.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/mapImages/Ravenport.png
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/MapMarker.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/MapNode.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/MapPanel.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/MouseListener.class
+AutoDrive Course Editor/out/production/AutoDrive Course Editor/RoadMap.class
+modConfig.json
+.vscode
+tmp

AutoDrive Course Editor/Open Editor with Console to see errors.cmd

@@ -0,0 +1,2 @@
+java.exe -jar -Xms1024m -Xmx1024m .\AD.Jar
+pause

AutoDrive Course Editor/src/AutoDriveEditor.java

@@ -21,7 +21,9 @@
 import org.xml.sax.SAXException;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.TreeMap;
@@ -48,10 +50,12 @@ public class AutoDriveEditor extends JFrame {
     public JToggleButton createNode;
     public JToggleButton createDestination;
     public JToggleButton fourTimesMap;
+    public JToggleButton sixteenTimesMap;
 
     public MapNode selected = null;
 
     public boolean isFourTimesMap = false;
+    public boolean isSixteenTimesMap = false;
 
     public int editorState = EDITORSTATE_MOVING;
 
@@ -120,11 +124,16 @@ public AutoDriveEditor() {
         createDestination.setActionCommand("Create Destinations");
         buttonPanel.add(createDestination);
 
-        fourTimesMap = new JToggleButton("Four times Map");
+        fourTimesMap = new JToggleButton(" 4x");
         fourTimesMap.addActionListener(this.editorListener);
         fourTimesMap.setActionCommand("FourTimesMap");
         buttonPanel.add(fourTimesMap);
 
+        sixteenTimesMap = new JToggleButton(" 16x");
+        sixteenTimesMap.addActionListener(this.editorListener);
+        sixteenTimesMap.setActionCommand("SixteenTimesMap");
+        buttonPanel.add(sixteenTimesMap);
+
         saveButton = new JButton("Save");
         saveButton.addActionListener(this.editorListener);
         saveButton.setActionCommand("Save");
@@ -173,22 +182,29 @@ public RoadMap loadFile(String path) throws ParserConfigurationException, IOExce
         NodeList markerList = doc.getElementsByTagName("mapmarker");
         LinkedList<MapMarker> mapMarkers = new LinkedList<>();
 
-        TreeMap<Integer, String> mapMarkerTree = new TreeMap<>();
+        TreeMap<Integer, MapMarker> mapMarkerTree = new TreeMap<>();
         for (int temp = 0; temp < markerList.getLength(); temp++) {
             Node markerNode = markerList.item(temp);
             if (markerNode.getNodeType() == Node.ELEMENT_NODE) {
                 Element eElement = (Element) markerNode;
 
                 NodeList idNodeList = eElement.getElementsByTagName("id");
                 NodeList nameNodeList = eElement.getElementsByTagName("name");
+                NodeList groupNodeList = eElement.getElementsByTagName("group");
 
                 for (int markerIndex = 0; markerIndex<idNodeList.getLength(); markerIndex++ ) {
                     Node node = (Node) idNodeList.item(markerIndex).getChildNodes().item(0);
                     String markerNodeId = node.getNodeValue();
 
                     node = (Node) nameNodeList.item(markerIndex).getChildNodes().item(0);
                     String markerName = node.getNodeValue();
-                    mapMarkerTree.put((int)Double.parseDouble(markerNodeId), markerName);
+
+                    node = (Node) groupNodeList.item(markerIndex).getChildNodes().item(0);
+                    String markerGroup = node.getNodeValue();
+
+                    MapNode dummyNode = new MapNode((int)Double.parseDouble(markerNodeId), 0, 0, 0);
+                    MapMarker mapMarker = new MapMarker(dummyNode, markerName, markerGroup);
+                    mapMarkerTree.put((int)Double.parseDouble(markerNodeId), mapMarker);
                 }
             }
         }
@@ -249,19 +265,23 @@ public RoadMap loadFile(String path) throws ParserConfigurationException, IOExce
                     double y = Double.parseDouble(yValues[i]);
                     double z = Double.parseDouble(zValues[i]);
 
-                    if (isFourTimesMap) {
+                    if (isFourTimesMap && !isSixteenTimesMap) {
                         x = (x)/2.0;
                         z = (z)/2.0;
                     }
+                    if (isSixteenTimesMap && !isFourTimesMap) {
+                        x = (x)/4.0;
+                        z = (z)/4.0;
+                    }
 
                     MapNode mapNode = new MapNode(id, x, y, z);
                     nodes.add(mapNode);
                 }
 
 
-                for (Map.Entry<Integer, String> entry : mapMarkerTree.entrySet())
+                for (Map.Entry<Integer, MapMarker> entry : mapMarkerTree.entrySet())
                 {
-                    mapMarkers.add(new MapMarker(nodes.get(entry.getKey()-1), entry.getValue()));
+                    mapMarkers.add(new MapMarker(nodes.get(entry.getKey()-1), entry.getValue().name, entry.getValue().group));
                 }
 
                 for (int i=0; i<ids.length; i++) {
@@ -364,6 +384,9 @@ public RoadMap loadFile(String path) throws ParserConfigurationException, IOExce
 
         if (image != null) {
             mapPanel.image = image;
+        }
+
+        if (mapPanel.image != null) {
             mapPanel.setPreferredSize(new Dimension(1024, 768));
             mapPanel.setMinimumSize(new Dimension(1024, 768));
             pack();
@@ -379,9 +402,22 @@ public void saveMap(String oldPath, String newPath) {
         System.out.println("SaveMap called");
         try {
             String filepath = oldPath;
+            File file = null;
+            try {
+                filepath = URLDecoder.decode(filepath, "UTF-8");
+                file = new File(filepath);
+            } catch(UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
             DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-            Document doc = docBuilder.parse(filepath);
+            Document doc = null;
+            if (file != null) {
+                doc = docBuilder.parse(file);
+            }
+            else {
+                doc = docBuilder.parse(filepath);
+            }
 
             Node AutoDrive = doc.getFirstChild();
             Element root = doc.getDocumentElement();
@@ -390,6 +426,7 @@ public void saveMap(String oldPath, String newPath) {
 
             Node waypoints = doc.getElementsByTagName("waypoints").item(0);
 
+
             // loop the staff child node
             NodeList list = waypoints.getChildNodes();
 
@@ -411,8 +448,13 @@ public void saveMap(String oldPath, String newPath) {
                     String xPositions = "";
                     for (int j=0; j<mapPanel.roadMap.mapNodes.size(); j++) {
                         MapNode mapNode = mapPanel.roadMap.mapNodes.get(j);
-                        if (isFourTimesMap) {
-                            xPositions += mapNode.x * 2.0;
+                        if (isFourTimesMap || isSixteenTimesMap) {
+                            if (isFourTimesMap) {
+                                xPositions += mapNode.x * 2.0;
+                            }
+                            else {
+                                xPositions += mapNode.x * 4.0;
+                            }
                         }
                         else {
                             xPositions += mapNode.x;
@@ -562,10 +604,29 @@ public void saveMap(String oldPath, String newPath) {
                 markerName.appendChild(doc.createTextNode(mapMarker.name));
                 newMapMarker.appendChild(markerName);
 
+                Element markerGroup = doc.createElement("group");
+                markerGroup.appendChild(doc.createTextNode(mapMarker.group));
+                newMapMarker.appendChild(markerGroup);
+
                 markerNode.appendChild(newMapMarker);
                 mapMarkerCount += 1;
             }
 
+
+            Node mapNameNode = waypoints.getParentNode();
+            String newMapName = mapNameNode.getNodeValue();
+            if (newPath.contains("AutoDrive_") && newPath.contains("_config")) {
+                int newPathStartIndex = newPath.lastIndexOf("AutoDrive_");
+                newPathStartIndex += "AutoDrive_".length();
+                int newPathEndIndex = newPath.lastIndexOf("_config");
+                if (newPath.endsWith("_init_config")) {
+                    newPathEndIndex = newPath.lastIndexOf("_init_config");
+                }
+                newMapName = newPath.substring(newPathStartIndex, newPathEndIndex);
+                System.out.println("Found new map name in: " + newPath + " : " + newMapName);
+            }
+            doc.renameNode(mapNameNode, null, newMapName);
+
             // write the content into xml file
             filepath = newPath;
             TransformerFactory transformerFactory = TransformerFactory.newInstance();

AutoDrive Course Editor/src/EditorListener.java

@@ -8,6 +8,8 @@
 import java.awt.geom.Point2D;
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 
 public class EditorListener implements ActionListener {
 
@@ -29,9 +31,6 @@ public void actionPerformed(ActionEvent e) {
                 editor.savedFile = fc.getSelectedFile();
                 editor.saveMap(editor.loadedFile.getAbsolutePath(), editor.savedFile.getAbsolutePath());
             }
-            else {
-                this.editor.saveMap("C:\\Users\\Stephan\\Downloads\\AutoDrive_config.xml", "C:\\Users\\Stephan\\Downloads\\AutoDrive_config_new.xml");
-            }
         }
         if (e.getActionCommand() == "Move Nodes") {
             this.editor.editorState = AutoDriveEditor.EDITORSTATE_MOVING;
@@ -87,5 +86,8 @@ public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand() == "FourTimesMap") {
             editor.isFourTimesMap = editor.fourTimesMap.isSelected();
         }
+        if (e.getActionCommand() == "SixteenTimesMap") {
+            editor.isSixteenTimesMap = editor.sixteenTimesMap.isSelected();
+        }
     }
 }

AutoDrive Course Editor/src/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: AutoDriveEditor
+

AutoDrive Course Editor/src/MapMarker.java

@@ -5,10 +5,12 @@ public class MapMarker implements Comparable {
 
     public MapNode mapNode;
     public String name;
+    public String group;
 
-    public MapMarker (MapNode mapNode, String name) {
+    public MapMarker (MapNode mapNode, String name, String group) {
         this.name = name;
         this.mapNode = mapNode;
+        this.group = group;
     }
 
 

AutoDrive Course Editor/src/MapPanel.java

@@ -282,7 +282,7 @@ public void createConnectionBetween(MapNode start, MapNode target) {
 
     public void createDestinationAt(MapNode mapNode, String destinationName) {
         if (mapNode != null && destinationName != null && destinationName.length() > 0) {
-            MapMarker mapMarker = new MapMarker(mapNode, destinationName);
+            MapMarker mapMarker = new MapMarker(mapNode, destinationName, "All");
             this.roadMap.addMapMarker(mapMarker);
         }
     }