Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed java.awt.*

Browse source
This commit is contained in:
ivanPyrohivskyi 2021-02-26 19:51:36 +02:00
parent 27aab34bf9
commit 11f1ba5bc2
1 changed files with 58 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
OsmAnd-java/src/main/java/net/osmand/router/RouteColorize.java
View file

@ -2,13 +2,11 @@ package net.osmand.router;
import net.osmand.GPXUtilities; import net.osmand.GPXUtilities;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.binary.BinaryMapAddressReaderAdapter;
import net.osmand.osm.edit.Node; import net.osmand.osm.edit.Node;
import net.osmand.osm.edit.OsmMapUtils; import net.osmand.osm.edit.OsmMapUtils;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import java.awt.Color;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -22,9 +20,7 @@ public class RouteColorize {
public double maxValue; public double maxValue;
public double[][] palette; public double[][] palette;
private List<Data> dataList; private List<RouteColorizationPoint> dataList;
public static final int DARK_GREY = rgbaToDecimal(92, 92, 92, 255); public static final int DARK_GREY = rgbaToDecimal(92, 92, 92, 255);
public static final int LIGHT_GREY = rgbaToDecimal(200, 200, 200, 255); public static final int LIGHT_GREY = rgbaToDecimal(200, 200, 200, 255);
@ -48,7 +44,8 @@ public class RouteColorize {
private ValueType valueType; private ValueType valueType;
public static int SLOPE_RANGE = 150; public static int SLOPE_RANGE = 150;//150 meters
private static final double MIN_DIFFERENCE_SLOPE = 0.05d;//5%
private static final Log LOG = PlatformUtil.getLog(RouteColorize.class); private static final Log LOG = PlatformUtil.getLog(RouteColorize.class);
@ -160,39 +157,39 @@ public class RouteColorize {
return slopes; return slopes;
} }
public List<Data> getResult(boolean simplify) { public List<RouteColorizationPoint> getResult(boolean simplify) {
List<Data> result = new ArrayList<>(); List<RouteColorizationPoint> result = new ArrayList<>();
if (simplify) { if (simplify) {
result = simplify(); result = simplify();
} else { } else {
for (int i = 0; i < latitudes.length; i++) { for (int i = 0; i < latitudes.length; i++) {
result.add(new Data(i, latitudes[i], longitudes[i], values[i])); result.add(new RouteColorizationPoint(i, latitudes[i], longitudes[i], values[i]));
} }
} }
for (Data data : result) { for (RouteColorizationPoint data : result) {
data.color = getColorByValue(data.val); data.color = getColorByValue(data.val);
} }
return result; return result;
} }
public Color getColorByValue(double value) { public int getColorByValue(double value) {
if (Double.isNaN(value)) { if (Double.isNaN(value)) {
value = (minValue + maxValue) / 2; value = (minValue + maxValue) / 2;
} }
for (int i = 0; i < palette.length - 1; i++) { for (int i = 0; i < palette.length - 1; i++) {
if (value == palette[i][VALUE_INDEX]) if (value == palette[i][VALUE_INDEX])
return new Color((int) palette[i][DECIMAL_COLOR_INDEX]); return (int) palette[i][DECIMAL_COLOR_INDEX];
if (value >= palette[i][VALUE_INDEX] && value <= palette[i + 1][VALUE_INDEX]) { if (value >= palette[i][VALUE_INDEX] && value <= palette[i + 1][VALUE_INDEX]) {
Color minPaletteColor = new Color((int) palette[i][DECIMAL_COLOR_INDEX]); int minPaletteColor = (int) palette[i][DECIMAL_COLOR_INDEX];
Color maxPaletteColor = new Color((int) palette[i + 1][DECIMAL_COLOR_INDEX]); int maxPaletteColor = (int) palette[i + 1][DECIMAL_COLOR_INDEX];
double minPaletteValue = palette[i][VALUE_INDEX]; double minPaletteValue = palette[i][VALUE_INDEX];
double maxPaletteValue = palette[i + 1][VALUE_INDEX]; double maxPaletteValue = palette[i + 1][VALUE_INDEX];
double percent = (value - minPaletteValue) / (maxPaletteValue - minPaletteValue); double percent = (value - minPaletteValue) / (maxPaletteValue - minPaletteValue);
double resultRed = minPaletteColor.getRed() + percent * (maxPaletteColor.getRed() - minPaletteColor.getRed()); double resultRed = getRed(minPaletteColor) + percent * (getRed(maxPaletteColor) - getRed(minPaletteColor));
double resultGreen = minPaletteColor.getGreen() + percent * (maxPaletteColor.getGreen() - minPaletteColor.getGreen()); double resultGreen = getGreen(minPaletteColor) + percent * (getGreen(maxPaletteColor) - getGreen(minPaletteColor));
double resultBlue = minPaletteColor.getBlue() + percent * (maxPaletteColor.getBlue() - minPaletteColor.getBlue()); double resultBlue = getBlue(minPaletteColor) + percent * (getBlue(maxPaletteColor) - getBlue(minPaletteColor));
double resultAlpha = minPaletteColor.getAlpha() + percent * (maxPaletteColor.getAlpha() - minPaletteColor.getAlpha()); double resultAlpha = getAlpha(minPaletteColor) + percent * (getAlpha(maxPaletteColor) - getAlpha(minPaletteColor));
return new Color((int) resultRed, (int) resultGreen, (int) resultBlue, (int) resultAlpha); return rgbaToDecimal((int) resultRed, (int) resultGreen, (int) resultBlue, (int) resultAlpha);
} }
} }
return getDefaultColor(); return getDefaultColor();
@ -204,50 +201,53 @@ public class RouteColorize {
sortPalette(); sortPalette();
} }
private Color getDefaultColor() { private int getDefaultColor() {
return new Color(0, 0, 0, 0); return rgbaToDecimal(0, 0, 0, 0);
} }
private List<Data> simplify() { private List<RouteColorizationPoint> simplify() {
if (dataList == null) { if (dataList == null) {
dataList = new ArrayList<>(); dataList = new ArrayList<>();
for (int i = 0; i < latitudes.length; i++) { for (int i = 0; i < latitudes.length; i++) {
//System.out.println(latitudes[i] + " " + longitudes[i] + " " + values[i]); //System.out.println(latitudes[i] + " " + longitudes[i] + " " + values[i]);
dataList.add(new Data(i, latitudes[i], longitudes[i], values[i])); dataList.add(new RouteColorizationPoint(i, latitudes[i], longitudes[i], values[i]));
} }
} }
List<Node> nodes = new ArrayList<>(); List<Node> nodes = new ArrayList<>();
List<Node> result = new ArrayList<>(); List<Node> result = new ArrayList<>();
for (Data data : dataList) { for (RouteColorizationPoint data : dataList) {
nodes.add(new net.osmand.osm.edit.Node(data.lat, data.lon, data.id)); nodes.add(new net.osmand.osm.edit.Node(data.lat, data.lon, data.id));
} }
OsmMapUtils.simplifyDouglasPeucker(nodes, zoom + 5, 1, result, true); OsmMapUtils.simplifyDouglasPeucker(nodes, zoom + 5, 1, result, true);
List<Data> simplified = new ArrayList<>(); List<RouteColorizationPoint> simplified = new ArrayList<>();
for (int i = 1; i < result.size() - 1; i++) { for (int i = 1; i < result.size() - 1; i++) {
int prevId = (int) result.get(i - 1).getId(); int prevId = (int) result.get(i - 1).getId();
int currentId = (int) result.get(i).getId(); int currentId = (int) result.get(i).getId();
List<Data> sublist = dataList.subList(prevId, currentId); List<RouteColorizationPoint> sublist = dataList.subList(prevId, currentId);
simplified.addAll(getExtremums(sublist)); simplified.addAll(getExtremums(sublist));
} }
return simplified; return simplified;
} }
private List<Data> getExtremums(List<Data> subDataList) { private List<RouteColorizationPoint> getExtremums(List<RouteColorizationPoint> subDataList) {
if (subDataList.size() <= 2) if (subDataList.size() <= 2) {
return subDataList; return subDataList;
}
List<Data> result = new ArrayList<>(); List<RouteColorizationPoint> result = new ArrayList<>();
double min; double min;
double max; double max;
min = max = subDataList.get(0).val; min = max = subDataList.get(0).val;
for (Data pt : subDataList) { for (RouteColorizationPoint pt : subDataList) {
if (min > pt.val) if (min > pt.val) {
min = pt.val; min = pt.val;
if (max < pt.val) }
if (max < pt.val) {
max = pt.val; max = pt.val;
} }
}
double diff = max - min; double diff = max - min;
@ -256,15 +256,15 @@ public class RouteColorize {
double prev = subDataList.get(i - 1).val; double prev = subDataList.get(i - 1).val;
double current = subDataList.get(i).val; double current = subDataList.get(i).val;
double next = subDataList.get(i + 1).val; double next = subDataList.get(i + 1).val;
Data currentData = subDataList.get(i); RouteColorizationPoint currentData = subDataList.get(i);
if ((current > prev && current > next) || (current < prev && current < next) if ((current > prev && current > next) || (current < prev && current < next)
|| (current < prev && current == next) || (current == prev && current < next) || (current < prev && current == next) || (current == prev && current < next)
|| (current > prev && current == next) || (current == prev && current > next)) { || (current > prev && current == next) || (current == prev && current > next)) {
Data prevInResult; RouteColorizationPoint prevInResult;
if (result.size() > 0) { if (result.size() > 0) {
prevInResult = result.get(0); prevInResult = result.get(0);
if (prevInResult.val / diff > 0.05d) {// check differences in 5% if (prevInResult.val / diff > MIN_DIFFERENCE_SLOPE) {
result.add(currentData); result.add(currentData);
} }
} else } else
@ -297,11 +297,11 @@ public class RouteColorize {
if (p.length == 2) { if (p.length == 2) {
sRGBPalette[i] = p; sRGBPalette[i] = p;
} else if (p.length == 4) { } else if (p.length == 4) {
Color color = new Color((int) p[RED_COLOR_INDEX], (int) p[GREEN_COLOR_INDEX], (int) p[BLUE_COLOR_INDEX]); int color = rgbaToDecimal((int) p[RED_COLOR_INDEX], (int) p[GREEN_COLOR_INDEX], (int) p[BLUE_COLOR_INDEX], 255);
sRGBPalette[i] = new double[]{p[VALUE_INDEX], color.getRGB()}; sRGBPalette[i] = new double[]{p[VALUE_INDEX], color};
} else if (p.length >= 5) { } else if (p.length >= 5) {
Color color = new Color((int) p[RED_COLOR_INDEX], (int) p[GREEN_COLOR_INDEX], (int) p[BLUE_COLOR_INDEX], (int) p[ALPHA_COLOR_INDEX]); int color = rgbaToDecimal((int) p[RED_COLOR_INDEX], (int) p[GREEN_COLOR_INDEX], (int) p[BLUE_COLOR_INDEX], (int) p[ALPHA_COLOR_INDEX]);
sRGBPalette[i] = new double[]{p[VALUE_INDEX], color.getRGB()}; sRGBPalette[i] = new double[]{p[VALUE_INDEX], color};
} }
if (p[VALUE_INDEX] > max) { if (p[VALUE_INDEX] > max) {
max = p[VALUE_INDEX]; max = p[VALUE_INDEX];
@ -414,14 +414,30 @@ public class RouteColorize {
return value; return value;
} }
public class Data { private int getRed(int value) {
return (value >> 16) & 0xFF;
}
private int getGreen(int value) {
return (value >> 8) & 0xFF;
}
private int getBlue(int value) {
return (value >> 0) & 0xFF;
}
private int getAlpha(int value) {
return (value >> 24) & 0xff;
}
public static class RouteColorizationPoint {
int id; int id;
public double lat; public double lat;
public double lon; public double lon;
public double val; public double val;
public Color color; public int color;
Data(int id, double lat, double lon, double val) { RouteColorizationPoint(int id, double lat, double lon, double val) {
this.id = id; this.id = id;
this.lat = lat; this.lat = lat;
this.lon = lon; this.lon = lon;