Skip to content

Commit 2dcefb6

Browse files
CodingPupper3033CodingPupper3033
committed
Should have fixed any Altitude/Ground Level naming discrepancies.
1 parent b5f4d28 commit 2dcefb6

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

‎src/main/java/com/codingpupper3033/codebtekml/gui/screens/GuiDrawKML.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.codingpupper3033.codebtekml.helpers.block.BlockNameConverter;
77
import com.codingpupper3033.codebtekml.helpers.kmlfile.KMLParser;
88
import com.codingpupper3033.codebtekml.helpers.map.Placemark;
9-
import com.codingpupper3033.codebtekml.helpers.map.altitude.AltitudeProcessor;
9+
import com.codingpupper3033.codebtekml.helpers.map.altitude.GoundLevelProcessor;
1010
import com.codingpupper3033.codebtekml.helpers.map.placemark.PlacemarkFactory;
1111
import net.minecraft.client.gui.GuiButton;
1212
import net.minecraft.client.gui.GuiScreen;
@@ -138,7 +138,7 @@ public void initGui() {
138138

139139
// API Check Box
140140
apiCheckBox = new GuiCheckBox(API_CHECK_BOX_ID, guiMiddleX+API_CHECK_BOX_POS[0], guiStartY+API_CHECK_BOX_POS[1], API_CHECK_BOX_TEXT, true);
141-
AltitudeProcessor.defaultProcessor.enabled = true;
141+
GoundLevelProcessor.defaultProcessor.enabled = true;
142142
addButton(apiCheckBox);
143143

144144
// Build Button
@@ -255,7 +255,7 @@ protected void actionPerformed(GuiButton button) throws IOException {
255255
}
256256
break;
257257
case API_CHECK_BOX_ID: // Api setting
258-
AltitudeProcessor.defaultProcessor.enabled = apiCheckBox.isChecked(); // Can my boi process altitudes (using the internet)
258+
GoundLevelProcessor.defaultProcessor.enabled = apiCheckBox.isChecked(); // Can my boi process altitudes (using the internet)
259259
break;
260260
case BUILD_BUTTON_ID: // Do ya thing!
261261
build();

‎src/main/java/com/codingpupper3033/codebtekml/helpers/map/Coordinate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.codingpupper3033.codebtekml.helpers.map;
22

33
import com.codingpupper3033.codebtekml.helpers.map.altitude.AltitudeMode;
4-
import com.codingpupper3033.codebtekml.helpers.map.altitude.AltitudeProcessor;
4+
import com.codingpupper3033.codebtekml.helpers.map.altitude.GoundLevelProcessor;
55
import com.codingpupper3033.codebtekml.helpers.map.altitude.NoAltitudeException;
66

77
import java.io.IOException;
@@ -78,7 +78,7 @@ public double getAltitude() throws NoAltitudeException, IOException {
7878
case RELATIVE_TO_GROUND:
7979
case DEFAULT:
8080
if (groundLevel == null) {
81-
groundLevel = AltitudeProcessor.defaultProcessor.getGroundLevel(this);
81+
groundLevel = GoundLevelProcessor.defaultProcessor.getGroundLevel(this);
8282
}
8383
return groundLevel + getElevation();
8484
default:

src/main/java/com/codingpupper3033/codebtekml/helpers/map/altitude/AltitudeProcessor.java renamed to src/main/java/com/codingpupper3033/codebtekml/helpers/map/altitude/GoundLevelProcessor.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* @see AltitudeMode
1414
* @author Joshua Miller
1515
*/
16-
public class AltitudeProcessor {
16+
public class GoundLevelProcessor {
1717
/**
1818
* Default Altitude Processor
1919
* Currently it uses Open Elevation, as there appears to be no way to get ground level in java.
2020
* The downside is that it requires internet access to make API requests.
2121
*/
22-
public static AltitudeProcessor defaultProcessor = new OpenElevationAltitudeProcessor();
22+
public static GoundLevelProcessor defaultProcessor = new OpenElevationGoundLevelProcessor();
2323

2424
/**
2525
* Can we use this?
@@ -29,7 +29,7 @@ public class AltitudeProcessor {
2929
/**
3030
* List of coordinates to process
3131
*/
32-
private Queue<Coordinate> coordinateProcessorQueue = new LinkedList<>();
32+
private Queue<Coordinate> coordinateGroundLevelProcessorQueue = new LinkedList<>();
3333

3434
/**
3535
* Default altitude method. Should not be used.
@@ -56,24 +56,23 @@ public double[] getGroundLevels(Coordinate[] coordinates) throws IOException, No
5656
}
5757

5858
public void addCoordinateToProcessQueue(Coordinate coordinate) {
59-
coordinateProcessorQueue.add(coordinate);
59+
coordinateGroundLevelProcessorQueue.add(coordinate);
6060
}
6161

6262
public void addCoordinatesToProcessQueue(Coordinate[] coordinates) {
63-
coordinateProcessorQueue.addAll(Arrays.asList(coordinates));
63+
coordinateGroundLevelProcessorQueue.addAll(Arrays.asList(coordinates));
6464
}
6565

66-
public Queue<Coordinate> getCoordinateProcessorQueue() {
67-
return coordinateProcessorQueue;
66+
public Queue<Coordinate> getCoordinateGroundLevelProcessorQueue() {
67+
return coordinateGroundLevelProcessorQueue;
6868
}
6969

7070
/**
7171
* Empties the process coordinate queue
7272
*
73-
* @return
73+
* @return Whether it succeeded
7474
*/
75-
public boolean processCoordinateQueue() {
76-
75+
public boolean processCoordinateGroundLevelQueue() {
7776
return false;
7877
}
7978
}

src/main/java/com/codingpupper3033/codebtekml/helpers/map/altitude/OpenElevationAltitudeProcessor.java renamed to src/main/java/com/codingpupper3033/codebtekml/helpers/map/altitude/OpenElevationGoundLevelProcessor.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Uses the Open Elevation API to process altitudes.
1818
* @author Joshua Miller
1919
*/
20-
public class OpenElevationAltitudeProcessor extends AltitudeProcessor {
20+
public class OpenElevationGoundLevelProcessor extends GoundLevelProcessor {
2121
public static final String URL = "https://api.open-elevation.com/api/v1/lookup?locations=%s"; // Path and format of the api url
2222
public static final String LOCATIONS_CONCAT = "|"; // How to combine multiple locations
2323

@@ -93,14 +93,14 @@ public double[] getGroundLevels(Coordinate[] coordinates) throws IOException {
9393
* @return
9494
*/
9595
@Override
96-
public boolean processCoordinateQueue() {
97-
super.processCoordinateQueue();
96+
public boolean processCoordinateGroundLevelQueue() {
97+
super.processCoordinateGroundLevelQueue();
9898

99-
while (!getCoordinateProcessorQueue().isEmpty()) { // Keep working until all out
100-
Coordinate[] setOfLocationsToProcess = new Coordinate[Math.min(MAX_COORDINATES_PER_REQUEST,getCoordinateProcessorQueue().size())]; // Make it only as big as needed
99+
while (!getCoordinateGroundLevelProcessorQueue().isEmpty()) { // Keep working until all out
100+
Coordinate[] setOfLocationsToProcess = new Coordinate[Math.min(MAX_COORDINATES_PER_REQUEST, getCoordinateGroundLevelProcessorQueue().size())]; // Make it only as big as needed
101101
int i = 0;
102-
while (!getCoordinateProcessorQueue().isEmpty() && i < setOfLocationsToProcess.length) { // Only do the max size at a time
103-
setOfLocationsToProcess[i] = getCoordinateProcessorQueue().poll();
102+
while (!getCoordinateGroundLevelProcessorQueue().isEmpty() && i < setOfLocationsToProcess.length) { // Only do the max size at a time
103+
setOfLocationsToProcess[i] = getCoordinateGroundLevelProcessorQueue().poll();
104104
i++;
105105
}
106106

‎src/main/java/com/codingpupper3033/codebtekml/helpers/map/placemark/PlacemarkFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.codingpupper3033.codebtekml.helpers.kmlfile.KMLParser;
44
import com.codingpupper3033.codebtekml.helpers.map.Placemark;
5-
import com.codingpupper3033.codebtekml.helpers.map.altitude.AltitudeProcessor;
5+
import com.codingpupper3033.codebtekml.helpers.map.altitude.GoundLevelProcessor;
66
import org.w3c.dom.Document;
77
import org.w3c.dom.Element;
88
import org.w3c.dom.Node;
@@ -124,8 +124,8 @@ public static void drawPlacemarks(File f, String blockName) throws ParserConfigu
124124

125125
public static void proccessPlacemarks(Placemark[] placemarks) {
126126
for (Placemark placemark: placemarks) {
127-
AltitudeProcessor.defaultProcessor.addCoordinatesToProcessQueue(placemark.getCoordinates());
127+
GoundLevelProcessor.defaultProcessor.addCoordinatesToProcessQueue(placemark.getCoordinates());
128128
}
129-
AltitudeProcessor.defaultProcessor.processCoordinateQueue();
129+
GoundLevelProcessor.defaultProcessor.processCoordinateGroundLevelQueue();
130130
}
131131
}

0 commit comments

Comments
 (0)