Issue #1196 Changes for Valid Period Dialog.
Changes from review. Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee Former-commit-id:b629d03f38[formerly031fabe87a] [formerlyb629d03f38[formerly031fabe87a] [formerlyb3cd481696[formerly 2d73c05dcff07658fc1bcd9ab878a9bca73b4aa3]]] Former-commit-id:b3cd481696Former-commit-id:ac45c8984f[formerly1ef155a4f0] Former-commit-id:3dd5de22ac
This commit is contained in:
Roger Ferrel
parent
91f9b557c6
commit
d7d19ebc5c
3 changed files with 238 additions and 236 deletions
|
|
@ -52,6 +52,7 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
|
|||
* 09/13/12 1165 lvenable Update for the initial process
|
||||
* of removing the dialog blocking capability.
|
||||
* 09/20/12 1196 rferrel Changes to setBlockOnOpen.
|
||||
* 09/27/12 1196 rferrel Added bringToTop
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -185,6 +186,18 @@ public class CaveJFACEDialog extends Dialog implements
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gives the dialog focus.
|
||||
*/
|
||||
public final void bringToTop() {
|
||||
Shell shell = getShell();
|
||||
if (shell != null && shell.isDisposed() == false) {
|
||||
shell.setVisible(true);
|
||||
shell.forceFocus();
|
||||
shell.forceActive();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Call the callback method as this dialog has been disposed.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -7,19 +7,17 @@ import java.util.TimerTask;
|
|||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.SelectionAdapter;
|
||||
import org.eclipse.swt.events.SelectionEvent;
|
||||
import org.eclipse.swt.graphics.Font;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Dialog;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Group;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.swt.widgets.Spinner;
|
||||
|
||||
import com.raytheon.uf.common.time.SimulatedTime;
|
||||
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -33,17 +31,17 @@ import com.raytheon.uf.common.time.SimulatedTime;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Nov 15, 2011 jsanchez Initial creation
|
||||
* Sep 26, 2012 1193 rferrel Convert to extend CaveSWTDialog
|
||||
* and made non-blocking.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author jsanchez
|
||||
* @version 1.0
|
||||
*/
|
||||
public class ValidPeriodDialog extends Dialog {
|
||||
public class ValidPeriodDialog extends CaveSWTDialog {
|
||||
private Shell shell;
|
||||
|
||||
private Font font;
|
||||
|
||||
private Button okBtn;
|
||||
|
||||
private Button cancelBtn;
|
||||
|
|
@ -76,54 +74,23 @@ public class ValidPeriodDialog extends Dialog {
|
|||
|
||||
private Spinner endSecondSpinner;
|
||||
|
||||
private int duration = -1;
|
||||
|
||||
private Timer timer;
|
||||
|
||||
private TimerTask updateTimeTask;
|
||||
|
||||
public ValidPeriodDialog(Shell parentShell, Calendar startTime,
|
||||
Calendar endTime) {
|
||||
super(parentShell);
|
||||
super(parentShell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL,
|
||||
CAVE.DO_NOT_BLOCK);
|
||||
this.startTime = startTime;
|
||||
this.endTime = endTime;
|
||||
setReturnValue(-1);
|
||||
}
|
||||
|
||||
public int open() {
|
||||
Shell parent = getParent();
|
||||
Display display = parent.getDisplay();
|
||||
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
|
||||
@Override
|
||||
protected void initializeComponents(Shell shell) {
|
||||
this.shell = shell;
|
||||
shell.setText("Valid Period");
|
||||
|
||||
// Create the main layout for the shell.
|
||||
GridLayout mainLayout = new GridLayout(1, true);
|
||||
mainLayout.marginHeight = 1;
|
||||
mainLayout.marginWidth = 1;
|
||||
shell.setLayout(mainLayout);
|
||||
|
||||
font = new Font(shell.getDisplay(), "Courier", 10, SWT.NORMAL);
|
||||
|
||||
// Initialize all of the controls and layouts
|
||||
initializeComponents();
|
||||
|
||||
shell.pack();
|
||||
|
||||
shell.open();
|
||||
while (!shell.isDisposed()) {
|
||||
if (!display.readAndDispatch()) {
|
||||
display.sleep();
|
||||
}
|
||||
}
|
||||
|
||||
font.dispose();
|
||||
|
||||
return duration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the dialog components.
|
||||
*/
|
||||
private void initializeComponents() {
|
||||
createStartTimeComp();
|
||||
createEndTimeComp();
|
||||
createButtonComp();
|
||||
|
|
@ -397,15 +364,27 @@ public class ValidPeriodDialog extends Dialog {
|
|||
*/
|
||||
@Override
|
||||
public void widgetSelected(SelectionEvent e) {
|
||||
duration = -1;
|
||||
shell.dispose();
|
||||
setReturnValue(-1);
|
||||
close();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#disposed()
|
||||
*/
|
||||
@Override
|
||||
protected void disposed() {
|
||||
timer.cancel();
|
||||
super.disposed();
|
||||
}
|
||||
|
||||
private void calculateDuration() {
|
||||
duration = (int) (endTime.getTimeInMillis() - startTime
|
||||
int duration = (int) (endTime.getTimeInMillis() - startTime
|
||||
.getTimeInMillis()) / (60 * 1000);
|
||||
setReturnValue(duration);
|
||||
}
|
||||
|
||||
private void validateEndTime() {
|
||||
|
|
@ -416,13 +395,6 @@ public class ValidPeriodDialog extends Dialog {
|
|||
}
|
||||
}
|
||||
|
||||
public boolean isDisposed() {
|
||||
if (shell != null) {
|
||||
return shell.isDisposed();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void startTimeTimer() {
|
||||
timer = new Timer();
|
||||
|
||||
|
|
@ -432,21 +404,23 @@ public class ValidPeriodDialog extends Dialog {
|
|||
|
||||
shell.getDisplay().syncExec(new Runnable() {
|
||||
public void run() {
|
||||
startTime.setTime(SimulatedTime.getSystemTime()
|
||||
.getTime());
|
||||
startYearSpinner.setSelection(startTime
|
||||
.get(Calendar.YEAR));
|
||||
startMonthSpinner.setSelection(startTime
|
||||
.get(Calendar.MONTH) + 1);
|
||||
startDaySpinner.setSelection(startTime
|
||||
.get(Calendar.DAY_OF_MONTH));
|
||||
startHourSpinner.setSelection(startTime
|
||||
.get(Calendar.HOUR_OF_DAY));
|
||||
startMinuteSpinner.setSelection(startTime
|
||||
.get(Calendar.MINUTE));
|
||||
startSecondSpinner.setSelection(startTime
|
||||
.get(Calendar.SECOND));
|
||||
validateEndTime();
|
||||
if (shell != null && !shell.isDisposed()) {
|
||||
startTime.setTime(SimulatedTime.getSystemTime()
|
||||
.getTime());
|
||||
startYearSpinner.setSelection(startTime
|
||||
.get(Calendar.YEAR));
|
||||
startMonthSpinner.setSelection(startTime
|
||||
.get(Calendar.MONTH) + 1);
|
||||
startDaySpinner.setSelection(startTime
|
||||
.get(Calendar.DAY_OF_MONTH));
|
||||
startHourSpinner.setSelection(startTime
|
||||
.get(Calendar.HOUR_OF_DAY));
|
||||
startMinuteSpinner.setSelection(startTime
|
||||
.get(Calendar.MINUTE));
|
||||
startSecondSpinner.setSelection(startTime
|
||||
.get(Calendar.SECOND));
|
||||
validateEndTime();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -454,4 +428,5 @@ public class ValidPeriodDialog extends Dialog {
|
|||
|
||||
timer.schedule(updateTimeTask, 60000, 60000);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ import com.raytheon.viz.texteditor.msgs.IWarngenObserver;
|
|||
import com.raytheon.viz.texteditor.util.VtecUtil;
|
||||
import com.raytheon.viz.ui.EditorUtil;
|
||||
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
|
||||
import com.raytheon.viz.ui.dialogs.ICloseCallback;
|
||||
import com.raytheon.viz.warngen.Activator;
|
||||
import com.raytheon.viz.warngen.WarngenConstants;
|
||||
import com.raytheon.viz.warngen.comm.WarningSender;
|
||||
|
|
@ -121,6 +122,7 @@ import com.vividsolutions.jts.geom.Polygon;
|
|||
* Jul 26, 2012 #15227 Qinglu Lin Added removeDuplicateVertices(), removeOverlaidSegments(),
|
||||
* adjustLatLon(), etc.
|
||||
* Sep 05, 2012 DR 15261 D. Friedman Prevent additional counties from being selected for EXPs
|
||||
* Sep 27, 2012 #1196 rferrel Refactored to use non-blocking dialogs
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -154,8 +156,9 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
private static final String CLOSE_BUTTON_LABEL = "Close";
|
||||
|
||||
private static final double MIN_LATLON_DIFF = 1.0E-5;
|
||||
|
||||
private static final double MIN_DIFF = 1.0E-8;
|
||||
|
||||
|
||||
private ArrayList<String> mainProducts;
|
||||
|
||||
private Map<String, String> otherProducts;
|
||||
|
|
@ -840,9 +843,9 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
.getCurrentWarnings();
|
||||
|
||||
ArrayList<String> dropDownItems = new ArrayList<String>();
|
||||
WarningAction[] acts = new WarningAction[] { WarningAction.CON, WarningAction.COR,
|
||||
WarningAction.CAN, WarningAction.EXP, WarningAction.NEW,
|
||||
WarningAction.EXT };
|
||||
WarningAction[] acts = new WarningAction[] { WarningAction.CON,
|
||||
WarningAction.COR, WarningAction.CAN, WarningAction.EXP,
|
||||
WarningAction.NEW, WarningAction.EXT };
|
||||
for (int i = 0; i < warnings.size(); i++) {
|
||||
for (WarningAction act : acts) {
|
||||
if (FollowUpUtil.checkApplicable(site,
|
||||
|
|
@ -1367,11 +1370,11 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
* - The button that has been clicked
|
||||
*/
|
||||
private void changeTemplate(String templateName) {
|
||||
|
||||
//DR 14515
|
||||
|
||||
// DR 14515
|
||||
if (templateName.equals(warngenLayer.getTemplateName()))
|
||||
return;
|
||||
|
||||
return;
|
||||
|
||||
String lastAreaSource = warngenLayer.getConfiguration()
|
||||
.getGeospatialConfig().getAreaSource();
|
||||
|
||||
|
|
@ -1648,17 +1651,26 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
private void changeSelected() {
|
||||
if (validPeriodDlg == null || validPeriodDlg.isDisposed()) {
|
||||
validPeriodDlg = new ValidPeriodDialog(shell, startTime, endTime);
|
||||
int duration = validPeriodDlg.open();
|
||||
if (duration != -1) {
|
||||
durationList.setEnabled(false);
|
||||
endTime.add(Calendar.MINUTE, duration);
|
||||
end.setText(df.format(this.endTime.getTime()));
|
||||
warngenLayer.getStormTrackState().newDuration = duration;
|
||||
warngenLayer.getStormTrackState().geomChanged = true;
|
||||
warngenLayer.issueRefresh();
|
||||
changeStartEndTimes();
|
||||
}
|
||||
validPeriodDlg = null;
|
||||
validPeriodDlg.setCloseCallback(new ICloseCallback() {
|
||||
|
||||
@Override
|
||||
public void dialogClosed(Object returnValue) {
|
||||
int duration = (Integer) returnValue;
|
||||
if (duration != -1) {
|
||||
durationList.setEnabled(false);
|
||||
endTime.add(Calendar.MINUTE, duration);
|
||||
end.setText(df.format(endTime.getTime()));
|
||||
warngenLayer.getStormTrackState().newDuration = duration;
|
||||
warngenLayer.getStormTrackState().geomChanged = true;
|
||||
warngenLayer.issueRefresh();
|
||||
changeStartEndTimes();
|
||||
}
|
||||
validPeriodDlg = null;
|
||||
}
|
||||
});
|
||||
validPeriodDlg.open();
|
||||
} else {
|
||||
validPeriodDlg.bringToTop();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1941,7 +1953,7 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
+ "." + data.getSig());
|
||||
}
|
||||
|
||||
updatePolygon(newWarn);
|
||||
updatePolygon(newWarn);
|
||||
|
||||
warngenLayer.setOldWarningPolygon(newWarn);
|
||||
setTimesFromFollowup(newWarn.getStartTime().getTime(), newWarn
|
||||
|
|
@ -2046,8 +2058,8 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
/**
|
||||
* Set the shell to visible and then move it on top of the CAVE dialog.
|
||||
*/
|
||||
public void showDialog(boolean show) {
|
||||
if (shell != null && shell.isDisposed() == false) {
|
||||
public void showDialog(boolean show) {
|
||||
if (shell != null && shell.isDisposed() == false) {
|
||||
if (show) {
|
||||
if (shell.isVisible() == false) {
|
||||
shell.setVisible(true);
|
||||
|
|
@ -2091,7 +2103,7 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update polygon in a warning product to remove intersected segment.
|
||||
*/
|
||||
|
|
@ -2100,72 +2112,75 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
Coordinate[] coords0 = geo.getCoordinates();
|
||||
|
||||
GeometryFactory gf = new GeometryFactory();
|
||||
|
||||
// Duplicate vertices (BOX.SV.W.0049, July 2012) makes removeOverlaidSegments
|
||||
|
||||
// Duplicate vertices (BOX.SV.W.0049, July 2012) makes
|
||||
// removeOverlaidSegments
|
||||
// not working. So, remove the duplicate vertex first.
|
||||
Coordinate[] coords = removeDuplicateVertices(coords0);
|
||||
if (coords.length != coords0.length) {
|
||||
java.util.List<Coordinate> points = new ArrayList<Coordinate>(Arrays.asList(coords));
|
||||
java.util.List<Coordinate> points = new ArrayList<Coordinate>(
|
||||
Arrays.asList(coords));
|
||||
Polygon rval = gf.createPolygon(gf.createLinearRing(points
|
||||
.toArray(new Coordinate[points.size()])), null);
|
||||
oldWarning.setGeometry(rval);
|
||||
.toArray(new Coordinate[points.size()])), null);
|
||||
oldWarning.setGeometry(rval);
|
||||
}
|
||||
|
||||
|
||||
int size = coords.length;
|
||||
boolean adjusted = false;
|
||||
if (size > 3) {
|
||||
Coordinate[] coords2 = new Coordinate[size+3];
|
||||
for (int i=0; i<size; i++) {
|
||||
coords2[i] = coords[i];
|
||||
}
|
||||
coords2[size] = coords[1];
|
||||
coords2[size+1] = coords[2];
|
||||
coords2[size+2] = coords[3];
|
||||
adjusted = removeOverlaidSegments(coords2);
|
||||
|
||||
coords = Arrays.copyOf(coords2,size);
|
||||
coords[0] = coords2[size-1];
|
||||
Coordinate[] coords2 = new Coordinate[size + 3];
|
||||
for (int i = 0; i < size; i++) {
|
||||
coords2[i] = coords[i];
|
||||
}
|
||||
coords2[size] = coords[1];
|
||||
coords2[size + 1] = coords[2];
|
||||
coords2[size + 2] = coords[3];
|
||||
adjusted = removeOverlaidSegments(coords2);
|
||||
|
||||
coords = Arrays.copyOf(coords2, size);
|
||||
coords[0] = coords2[size - 1];
|
||||
}
|
||||
|
||||
java.util.List<Coordinate> points = new ArrayList<Coordinate>(Arrays.asList(coords));
|
||||
|
||||
java.util.List<Coordinate> points = new ArrayList<Coordinate>(
|
||||
Arrays.asList(coords));
|
||||
Polygon rval = gf.createPolygon(gf.createLinearRing(points
|
||||
.toArray(new Coordinate[points.size()])), null);
|
||||
|
||||
.toArray(new Coordinate[points.size()])), null);
|
||||
|
||||
if (adjusted)
|
||||
oldWarning.setGeometry(rval);
|
||||
oldWarning.setGeometry(rval);
|
||||
|
||||
boolean invalidPolyFlag = false;
|
||||
if (rval.isValid() == false) {
|
||||
invalidPolyFlag = true;
|
||||
points.remove(points.size()-1);
|
||||
PolygonUtil.removeIntersectedSeg(points);
|
||||
points.add(new Coordinate(points.get(0)));
|
||||
rval = gf.createPolygon(gf.createLinearRing(points
|
||||
.toArray(new Coordinate[points.size()])), null);
|
||||
invalidPolyFlag = true;
|
||||
points.remove(points.size() - 1);
|
||||
PolygonUtil.removeIntersectedSeg(points);
|
||||
points.add(new Coordinate(points.get(0)));
|
||||
rval = gf.createPolygon(gf.createLinearRing(points
|
||||
.toArray(new Coordinate[points.size()])), null);
|
||||
}
|
||||
if (invalidPolyFlag) {
|
||||
oldWarning.setGeometry(rval);
|
||||
oldWarning.setGeometry(rval);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Remove duplicate vertices
|
||||
* Remove duplicate vertices
|
||||
*/
|
||||
private Coordinate[] removeDuplicateVertices(Coordinate[] coords) {
|
||||
int size = coords.length;
|
||||
java.util.List<Coordinate> coords2 = new ArrayList<Coordinate>();
|
||||
coords2.add(coords[0]);
|
||||
for (int i=1; i<size; i++)
|
||||
if (Math.abs(coords[i].x-coords[i-1].x) > MIN_LATLON_DIFF ||
|
||||
Math.abs(coords[i].y-coords[i-1].y) > MIN_LATLON_DIFF)
|
||||
coords2.add(coords[i]);
|
||||
int size = coords.length;
|
||||
java.util.List<Coordinate> coords2 = new ArrayList<Coordinate>();
|
||||
coords2.add(coords[0]);
|
||||
for (int i = 1; i < size; i++)
|
||||
if (Math.abs(coords[i].x - coords[i - 1].x) > MIN_LATLON_DIFF
|
||||
|| Math.abs(coords[i].y - coords[i - 1].y) > MIN_LATLON_DIFF)
|
||||
coords2.add(coords[i]);
|
||||
size = coords2.size();
|
||||
Coordinate[] coords3 = coords2.toArray(new Coordinate[size]);
|
||||
return coords3;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Remove overlaid segments
|
||||
*/
|
||||
|
|
@ -2173,124 +2188,123 @@ public class WarngenDialog extends CaveSWTDialog implements
|
|||
double diffx1, diffx2, diffy1, diffy2;
|
||||
double ratio1, ratio2;
|
||||
boolean adjusted = false;
|
||||
for (int i=2; i<coords.length-2; i++) {
|
||||
diffx1 = coords[i-1].x - coords[i].x;
|
||||
if (Math.abs(diffx1) > MIN_LATLON_DIFF) {
|
||||
ratio1 = (coords[i-1].y-coords[i].y)/diffx1;
|
||||
diffx2 = coords[i].x - coords[i+1].x;
|
||||
if (Math.abs(diffx2) > MIN_LATLON_DIFF) {
|
||||
ratio2 = (coords[i].y-coords[i+1].y)/diffx2;
|
||||
if (Math.abs(ratio1-ratio2) < MIN_DIFF) {
|
||||
if (diffx1 > 0.0 && diffx2 > 0.0 ||
|
||||
diffx1 < 0.0 && diffx2 < 0.0) {
|
||||
// three vertices on a straight line. Not overlaid.
|
||||
} else {
|
||||
// two segments overlaid
|
||||
adjustLatLon('y',coords,i);
|
||||
adjusted = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
diffy1 = coords[i-1].y - coords[i].y;
|
||||
ratio1 = (coords[i-1].x-coords[i].x)/diffy1;
|
||||
diffy2 = coords[i].y - coords[i+1].y;
|
||||
if (Math.abs(diffy2) > MIN_LATLON_DIFF) {
|
||||
ratio2 = (coords[i].x-coords[i+1].x)/diffy2;
|
||||
if (Math.abs(ratio1-ratio2) < MIN_DIFF) {
|
||||
if (diffy1 > 0.0 && diffy2 > 0.0 ||
|
||||
diffy1 < 0.0 && diffy2 < 0.0) {
|
||||
// three vertices on a straight line. Not overlaid.
|
||||
} else {
|
||||
// two segments overlaid
|
||||
adjustLatLon('x',coords,i);
|
||||
adjusted = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
for (int i = 2; i < coords.length - 2; i++) {
|
||||
diffx1 = coords[i - 1].x - coords[i].x;
|
||||
if (Math.abs(diffx1) > MIN_LATLON_DIFF) {
|
||||
ratio1 = (coords[i - 1].y - coords[i].y) / diffx1;
|
||||
diffx2 = coords[i].x - coords[i + 1].x;
|
||||
if (Math.abs(diffx2) > MIN_LATLON_DIFF) {
|
||||
ratio2 = (coords[i].y - coords[i + 1].y) / diffx2;
|
||||
if (Math.abs(ratio1 - ratio2) < MIN_DIFF) {
|
||||
if (diffx1 > 0.0 && diffx2 > 0.0 || diffx1 < 0.0
|
||||
&& diffx2 < 0.0) {
|
||||
// three vertices on a straight line. Not overlaid.
|
||||
} else {
|
||||
// two segments overlaid
|
||||
adjustLatLon('y', coords, i);
|
||||
adjusted = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
diffy1 = coords[i - 1].y - coords[i].y;
|
||||
ratio1 = (coords[i - 1].x - coords[i].x) / diffy1;
|
||||
diffy2 = coords[i].y - coords[i + 1].y;
|
||||
if (Math.abs(diffy2) > MIN_LATLON_DIFF) {
|
||||
ratio2 = (coords[i].x - coords[i + 1].x) / diffy2;
|
||||
if (Math.abs(ratio1 - ratio2) < MIN_DIFF) {
|
||||
if (diffy1 > 0.0 && diffy2 > 0.0 || diffy1 < 0.0
|
||||
&& diffy2 < 0.0) {
|
||||
// three vertices on a straight line. Not overlaid.
|
||||
} else {
|
||||
// two segments overlaid
|
||||
adjustLatLon('x', coords, i);
|
||||
adjusted = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
return adjusted;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Increase or decrease latitude or longitude slightly
|
||||
*/
|
||||
private void adjustLatLon(char direction, Coordinate[] coords, int i) {
|
||||
// Empirical value.
|
||||
// 1.0E3 not working for horizontal rectangle cases
|
||||
// Empirical value.
|
||||
// 1.0E3 not working for horizontal rectangle cases
|
||||
double adjustedValue = 5.0E-3;
|
||||
|
||||
|
||||
int n = coords.length;
|
||||
int factor;
|
||||
if (direction == 'x') {
|
||||
// adjust longitude
|
||||
double diffx = coords[i-2].x - coords[i-1].x;
|
||||
if (Math.abs(diffx) > MIN_LATLON_DIFF) {
|
||||
if (coords[i-1].y > coords[i].y) {
|
||||
factor = 1;
|
||||
} else
|
||||
factor = -1;
|
||||
if (diffx < 0.0) {
|
||||
coords[i+1].x -= factor*adjustedValue;
|
||||
} else {
|
||||
coords[i-1].x += factor*adjustedValue;
|
||||
}
|
||||
if (i == n-3)
|
||||
coords[0].x = coords[i-1].x;
|
||||
} else {
|
||||
diffx = coords[i+2].x - coords[i+1].x;
|
||||
if (Math.abs(diffx) > MIN_LATLON_DIFF) {
|
||||
if (coords[i+1].y > coords[i].y) {
|
||||
factor = -1;
|
||||
} else
|
||||
factor = 1;
|
||||
if (diffx < 0.0) {
|
||||
coords[i-1].x -= factor*adjustedValue;
|
||||
} else {
|
||||
coords[i+1].x += factor*adjustedValue;
|
||||
}
|
||||
if (i == n-3)
|
||||
coords[0].x = coords[i-1].x;
|
||||
}
|
||||
}
|
||||
// adjust longitude
|
||||
double diffx = coords[i - 2].x - coords[i - 1].x;
|
||||
if (Math.abs(diffx) > MIN_LATLON_DIFF) {
|
||||
if (coords[i - 1].y > coords[i].y) {
|
||||
factor = 1;
|
||||
} else
|
||||
factor = -1;
|
||||
if (diffx < 0.0) {
|
||||
coords[i + 1].x -= factor * adjustedValue;
|
||||
} else {
|
||||
coords[i - 1].x += factor * adjustedValue;
|
||||
}
|
||||
if (i == n - 3)
|
||||
coords[0].x = coords[i - 1].x;
|
||||
} else {
|
||||
diffx = coords[i + 2].x - coords[i + 1].x;
|
||||
if (Math.abs(diffx) > MIN_LATLON_DIFF) {
|
||||
if (coords[i + 1].y > coords[i].y) {
|
||||
factor = -1;
|
||||
} else
|
||||
factor = 1;
|
||||
if (diffx < 0.0) {
|
||||
coords[i - 1].x -= factor * adjustedValue;
|
||||
} else {
|
||||
coords[i + 1].x += factor * adjustedValue;
|
||||
}
|
||||
if (i == n - 3)
|
||||
coords[0].x = coords[i - 1].x;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// adjust latitude
|
||||
double diffy = coords[i-2].y - coords[i-1].y;
|
||||
if (Math.abs(diffy) > MIN_LATLON_DIFF) {
|
||||
if (coords[i-1].x > coords[i].x) {
|
||||
factor = -1;
|
||||
} else
|
||||
factor = 1;
|
||||
if (diffy > 0.0) {
|
||||
coords[i+1].y -= factor*adjustedValue;
|
||||
} else {
|
||||
coords[i-1].y += factor*adjustedValue;
|
||||
}
|
||||
if (i == n-3)
|
||||
coords[0].y = coords[i-1].y;
|
||||
}
|
||||
else {
|
||||
diffy = coords[i+2].y - coords[i+1].y;
|
||||
if (Math.abs(diffy) > MIN_LATLON_DIFF) {
|
||||
if (coords[i+1].x > coords[i].x) {
|
||||
factor = -1;
|
||||
} else
|
||||
factor = 1;
|
||||
if (diffy < 0.0) {
|
||||
coords[i-1].y -= factor*adjustedValue;
|
||||
} else {
|
||||
coords[i+1].y += factor*adjustedValue;
|
||||
}
|
||||
if (i == n-3)
|
||||
coords[0].y = coords[i-1].y;
|
||||
}
|
||||
}
|
||||
// adjust latitude
|
||||
double diffy = coords[i - 2].y - coords[i - 1].y;
|
||||
if (Math.abs(diffy) > MIN_LATLON_DIFF) {
|
||||
if (coords[i - 1].x > coords[i].x) {
|
||||
factor = -1;
|
||||
} else
|
||||
factor = 1;
|
||||
if (diffy > 0.0) {
|
||||
coords[i + 1].y -= factor * adjustedValue;
|
||||
} else {
|
||||
coords[i - 1].y += factor * adjustedValue;
|
||||
}
|
||||
if (i == n - 3)
|
||||
coords[0].y = coords[i - 1].y;
|
||||
} else {
|
||||
diffy = coords[i + 2].y - coords[i + 1].y;
|
||||
if (Math.abs(diffy) > MIN_LATLON_DIFF) {
|
||||
if (coords[i + 1].x > coords[i].x) {
|
||||
factor = -1;
|
||||
} else
|
||||
factor = 1;
|
||||
if (diffy < 0.0) {
|
||||
coords[i - 1].y -= factor * adjustedValue;
|
||||
} else {
|
||||
coords[i + 1].y += factor * adjustedValue;
|
||||
}
|
||||
if (i == n - 3)
|
||||
coords[0].y = coords[i - 1].y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue