[josm-plugins] 01/06: Imported Upstream version 0.0.svn33050+ds
Bas Couwenberg
sebastic at debian.org
Mon Nov 7 07:21:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm-plugins.
commit 5c0776e6fdff7dec01d000921c3890d39fa47a0e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Nov 7 07:46:59 2016 +0100
Imported Upstream version 0.0.svn33050+ds
---
build-common.xml | 5 +++--
.../josm/plugins/lakewalker/LakewalkerAction.java | 16 ++++++----------
.../josm/plugins/measurement/MeasurementDialog.java | 4 ++--
svn-info.xml | 8 ++++----
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/build-common.xml b/build-common.xml
index 991a0f1..68c2223 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -14,8 +14,8 @@
<property name="josm" location="../../core/dist/josm-custom.jar"/>
<property name="josm.test.build.dir" location="../../core/test/build"/>
- <property name="error_prone_ant.jar" location="../00_core_tools/error_prone_ant-2.0.12.jar"/>
- <property name="checkstyle.jar" location="../00_core_tools/checkstyle/checkstyle-7.1-all.jar"/>
+ <property name="error_prone_ant.jar" location="../00_core_tools/error_prone_ant-2.0.13.jar"/>
+ <property name="checkstyle.jar" location="../00_core_tools/checkstyle/checkstyle-7.2-all.jar"/>
<property name="findbugs-ant.jar" location="../00_core_tools/findbugs/findbugs-ant.jar"/>
<property name="annotations.jar" location="../00_core_tools/findbugs/annotations.jar"/>
<property name="plugin.build.dir" location="build"/>
@@ -512,6 +512,7 @@
org/kaintoch/**/*.java,
org/marvinproject/**/*.java,
org/netbeans/**/*.java,
+ org/openstreetmap/josm/plugins/dataimport/io/tcx/**/*.java,
org/openstreetmap/josm/plugins/ohe/parser/**/*.java,
org/openstreetmap/josm/plugins/roadsigns/javacc/**/*.java,
org/osgeo/**/*.java,
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
index dd8564e..22db221 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
@@ -137,9 +137,8 @@ class LakewalkerAction extends JosmAction implements MouseListener {
@Override protected void realRun() throws SAXException {
progressMonitor.subTask(tr("checking cache..."));
cleanupCache();
- processnodelist(pos, topLeft, botRight, waylen, maxnode, threshold,
- epsilon, resolution, tilesize, startdir, wmslayer,
- progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ processnodelist(new Lakewalker(waylen, maxnode, threshold, epsilon, resolution, tilesize, startdir, wmslayer),
+ pos, topLeft, botRight, epsilon, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
}
@Override protected void finish() {
@@ -149,25 +148,22 @@ class LakewalkerAction extends JosmAction implements MouseListener {
LakewalkerAction.this.cancel();
}
};
- Thread executeThread = new Thread(lakewalkerTask);
- executeThread.start();
+ new Thread(lakewalkerTask).start();
} catch (Exception ex) {
- System.out.println("Exception caught: " + ex.getMessage());
+ Main.error(ex);
}
}
- private void processnodelist(LatLon pos, LatLon topLeft, LatLon botRight, int waylen, int maxnode, int threshold,
- double epsilon, int resolution, int tilesize, String startdir, String wmslayer, ProgressMonitor progressMonitor) {
+ private void processnodelist(Lakewalker lw, LatLon pos, LatLon topLeft, LatLon botRight, double epsilon, ProgressMonitor progressMonitor) {
progressMonitor.beginTask(null, 3);
try {
ArrayList<double[]> nodelist = new ArrayList<>();
- Lakewalker lw = new Lakewalker(waylen, maxnode, threshold, epsilon, resolution, tilesize, startdir, wmslayer);
try {
nodelist = lw.trace(pos.lat(), pos.lon(), topLeft.lon(), botRight.lon(), topLeft.lat(), botRight.lat(),
progressMonitor.createSubTaskMonitor(1, false));
} catch (LakewalkerException e) {
- System.out.println(e.getMessage());
+ Main.error(e);
}
System.out.println(nodelist.size()+" nodes generated");
diff --git a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
index 9d42b55..7c4d15f 100644
--- a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
+++ b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
@@ -176,9 +176,9 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL
double radius = 0.0;
Node lastNode = null;
// Don't mix up way and nodes computation (fix #6872). Priority given to ways
- ways = new SubclassFilteredCollection<>(newSelection, OsmPrimitive.wayPredicate);
+ ways = new SubclassFilteredCollection<>(newSelection, Way.class::isInstance);
if (ways.isEmpty()) {
- nodes = new SubclassFilteredCollection<>(newSelection, OsmPrimitive.nodePredicate);
+ nodes = new SubclassFilteredCollection<>(newSelection, Node.class::isInstance);
for (Node n : nodes) {
if (n.getCoor() != null) {
if (lastNode == null) {
diff --git a/svn-info.xml b/svn-info.xml
index 0e6edfc..1abaa5f 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
+ revision="33050"
kind="dir"
- path="plugins"
- revision="32928">
+ path="plugins">
<url>https://svn.openstreetmap.org/applications/editors/josm/plugins</url>
<relative-url>^/applications/editors/josm/plugins</relative-url>
<repository>
@@ -11,9 +11,9 @@
<uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
</repository>
<commit
- revision="32927">
+ revision="33049">
<author>donvip</author>
-<date>2016-09-04T16:05:38.537038Z</date>
+<date>2016-11-03T20:49:11.513844Z</date>
</commit>
</entry>
</info>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git
More information about the Pkg-grass-devel
mailing list