[josm-plugins] 253/369: Imported Upstream version 0.0.svn26427+ds1
Bas Couwenberg
sebastic at xs4all.nl
Sat Oct 18 12:03:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 81d9cd74ef2db51a539cecccd9d727fe00afaf38
Author: Giovanni Mascellani <gio at debian.org>
Date: Sat Aug 27 20:01:41 2011 +0200
Imported Upstream version 0.0.svn26427+ds1
---
DirectUpload/build.xml | 294 +++++++++--------
DirectUpload/data/ar.lang | Bin 0 -> 125 bytes
DirectUpload/data/bg.lang | Bin 0 -> 941 bytes
DirectUpload/data/cs.lang | Bin 0 -> 1018 bytes
DirectUpload/data/da.lang | Bin 0 -> 869 bytes
DirectUpload/data/de.lang | Bin 0 -> 1124 bytes
DirectUpload/data/el.lang | Bin 0 -> 593 bytes
DirectUpload/data/en.lang | Bin 0 -> 993 bytes
DirectUpload/data/en_AU.lang | Bin 0 -> 60 bytes
DirectUpload/data/en_GB.lang | Bin 0 -> 60 bytes
DirectUpload/data/es.lang | Bin 0 -> 1092 bytes
DirectUpload/data/et.lang | Bin 0 -> 131 bytes
DirectUpload/data/eu.lang | Bin 0 -> 79 bytes
DirectUpload/data/fi.lang | Bin 0 -> 372 bytes
DirectUpload/data/fr.lang | Bin 0 -> 1235 bytes
DirectUpload/data/gl.lang | Bin 0 -> 266 bytes
DirectUpload/data/he.lang | Bin 0 -> 229 bytes
DirectUpload/data/id.lang | Bin 0 -> 328 bytes
DirectUpload/data/is.lang | Bin 0 -> 291 bytes
DirectUpload/data/it.lang | Bin 0 -> 1183 bytes
DirectUpload/data/ja.lang | Bin 0 -> 1431 bytes
DirectUpload/data/nb.lang | Bin 0 -> 550 bytes
DirectUpload/data/nl.lang | Bin 0 -> 476 bytes
DirectUpload/data/pl.lang | Bin 0 -> 469 bytes
DirectUpload/data/pt_BR.lang | Bin 0 -> 1063 bytes
DirectUpload/data/ru.lang | Bin 0 -> 2014 bytes
DirectUpload/data/sk.lang | Bin 0 -> 1127 bytes
DirectUpload/data/sv.lang | Bin 0 -> 517 bytes
DirectUpload/data/tr.lang | Bin 0 -> 211 bytes
DirectUpload/data/uk.lang | Bin 0 -> 1894 bytes
DirectUpload/data/zh_CN.lang | Bin 0 -> 883 bytes
DirectUpload/data/zh_TW.lang | Bin 0 -> 890 bytes
cadastre-fr/build.xml | 167 +++++-----
cadastre-fr/data/ar.lang | Bin 0 -> 749 bytes
cadastre-fr/data/bg.lang | Bin 0 -> 4857 bytes
cadastre-fr/data/cs.lang | Bin 0 -> 3992 bytes
cadastre-fr/data/da.lang | Bin 0 -> 2346 bytes
cadastre-fr/data/de.lang | Bin 0 -> 7231 bytes
cadastre-fr/data/el.lang | Bin 0 -> 1953 bytes
cadastre-fr/data/en.lang | Bin 0 -> 6095 bytes
cadastre-fr/data/en_AU.lang | Bin 0 -> 1643 bytes
cadastre-fr/data/en_GB.lang | Bin 0 -> 1643 bytes
cadastre-fr/data/es.lang | Bin 0 -> 7033 bytes
cadastre-fr/data/et.lang | Bin 0 -> 443 bytes
cadastre-fr/data/eu.lang | Bin 0 -> 417 bytes
cadastre-fr/data/fi.lang | Bin 0 -> 803 bytes
cadastre-fr/data/fr.lang | Bin 0 -> 7446 bytes
cadastre-fr/data/gl.lang | Bin 0 -> 2108 bytes
cadastre-fr/data/he.lang | Bin 0 -> 546 bytes
cadastre-fr/data/id.lang | Bin 0 -> 567 bytes
cadastre-fr/data/is.lang | Bin 0 -> 384 bytes
cadastre-fr/data/it.lang | Bin 0 -> 7529 bytes
cadastre-fr/data/ja.lang | Bin 0 -> 7086 bytes
cadastre-fr/data/nb.lang | Bin 0 -> 3081 bytes
cadastre-fr/data/nl.lang | Bin 0 -> 2550 bytes
cadastre-fr/data/pl.lang | Bin 0 -> 691 bytes
cadastre-fr/data/pt_BR.lang | Bin 0 -> 2986 bytes
cadastre-fr/data/ru.lang | Bin 0 -> 11208 bytes
cadastre-fr/data/sk.lang | Bin 0 -> 6150 bytes
cadastre-fr/data/sv.lang | Bin 0 -> 1770 bytes
cadastre-fr/data/tr.lang | Bin 0 -> 391 bytes
cadastre-fr/data/uk.lang | Bin 0 -> 11560 bytes
cadastre-fr/data/zh_CN.lang | Bin 0 -> 5240 bytes
cadastre-fr/data/zh_TW.lang | Bin 0 -> 5203 bytes
cadastre-fr/src/cadastre_fr/CacheControl.java | 4 +-
cadastre-fr/src/cadastre_fr/CadastreInterface.java | 4 +-
cadastre-fr/src/cadastre_fr/CadastrePlugin.java | 8 +-
.../src/cadastre_fr/CadastrePreferenceSetting.java | 20 +-
.../src/cadastre_fr/DownloadSVGBuilding.java | 2 +-
cadastre-fr/src/cadastre_fr/DownloadSVGTask.java | 2 +-
cadastre-fr/src/cadastre_fr/EastNorthBound.java | 2 +-
.../src/cadastre_fr/MenuActionCancelGrab.java | 3 +-
cadastre-fr/src/cadastre_fr/MenuActionGrab.java | 3 +-
.../src/cadastre_fr/MenuActionGrabPlanImage.java | 5 +-
.../src/cadastre_fr/MenuActionLoadFromCache.java | 27 +-
.../src/cadastre_fr/MenuActionNewLocation.java | 12 +-
.../src/cadastre_fr/MenuActionSaveRasterAs.java | 3 +-
cadastre-fr/src/cadastre_fr/WMSLayer.java | 16 +-
colorscheme/build.xml | 302 +++++++++---------
colorscheme/data/ar.lang | Bin 0 -> 38 bytes
colorscheme/data/bg.lang | Bin 0 -> 490 bytes
colorscheme/data/cs.lang | Bin 0 -> 255 bytes
colorscheme/data/da.lang | Bin 0 -> 248 bytes
colorscheme/data/de.lang | Bin 0 -> 338 bytes
colorscheme/data/el.lang | Bin 0 -> 525 bytes
colorscheme/data/en.lang | Bin 0 -> 248 bytes
colorscheme/data/en_AU.lang | Bin 0 -> 96 bytes
colorscheme/data/en_GB.lang | Bin 0 -> 96 bytes
colorscheme/data/es.lang | Bin 0 -> 323 bytes
colorscheme/data/et.lang | Bin 0 -> 33 bytes
colorscheme/data/eu.lang | Bin 0 -> 130 bytes
colorscheme/data/fi.lang | Bin 0 -> 243 bytes
colorscheme/data/fr.lang | Bin 0 -> 292 bytes
colorscheme/data/gl.lang | Bin 0 -> 155 bytes
colorscheme/data/he.lang | Bin 0 -> 290 bytes
colorscheme/data/id.lang | Bin 0 -> 36 bytes
colorscheme/data/is.lang | Bin 0 -> 42 bytes
colorscheme/data/it.lang | Bin 0 -> 269 bytes
colorscheme/data/ja.lang | Bin 0 -> 310 bytes
colorscheme/data/nb.lang | Bin 0 -> 209 bytes
colorscheme/data/nl.lang | Bin 0 -> 306 bytes
colorscheme/data/pl.lang | Bin 0 -> 135 bytes
colorscheme/data/pt_BR.lang | Bin 0 -> 58 bytes
colorscheme/data/ru.lang | Bin 0 -> 467 bytes
colorscheme/data/sk.lang | Bin 0 -> 271 bytes
colorscheme/data/sv.lang | Bin 0 -> 241 bytes
colorscheme/data/tr.lang | Bin 0 -> 224 bytes
colorscheme/data/uk.lang | Bin 0 -> 540 bytes
colorscheme/data/zh_CN.lang | Bin 0 -> 241 bytes
colorscheme/data/zh_TW.lang | Bin 0 -> 241 bytes
editgpx/build.xml | 299 +++++++++---------
editgpx/data/ar.lang | Bin 0 -> 40 bytes
editgpx/data/bg.lang | Bin 0 -> 443 bytes
editgpx/data/cs.lang | Bin 0 -> 244 bytes
editgpx/data/da.lang | Bin 0 -> 162 bytes
editgpx/data/de.lang | Bin 0 -> 258 bytes
editgpx/data/el.lang | Bin 0 -> 96 bytes
editgpx/data/en.lang | Bin 0 -> 218 bytes
editgpx/data/en_AU.lang | Bin 0 -> 20 bytes
editgpx/data/en_GB.lang | Bin 0 -> 20 bytes
editgpx/data/es.lang | Bin 0 -> 261 bytes
editgpx/data/et.lang | Bin 0 -> 41 bytes
editgpx/data/fi.lang | Bin 0 -> 133 bytes
editgpx/data/fr.lang | Bin 0 -> 270 bytes
editgpx/data/gl.lang | Bin 0 -> 231 bytes
editgpx/data/he.lang | Bin 0 -> 150 bytes
editgpx/data/id.lang | Bin 0 -> 20 bytes
editgpx/data/is.lang | Bin 0 -> 37 bytes
editgpx/data/it.lang | Bin 0 -> 288 bytes
editgpx/data/ja.lang | Bin 0 -> 344 bytes
editgpx/data/nb.lang | Bin 0 -> 223 bytes
editgpx/data/nl.lang | Bin 0 -> 141 bytes
editgpx/data/pl.lang | Bin 0 -> 68 bytes
editgpx/data/pt_BR.lang | Bin 0 -> 221 bytes
editgpx/data/ru.lang | Bin 0 -> 436 bytes
editgpx/data/sk.lang | Bin 0 -> 271 bytes
editgpx/data/sv.lang | Bin 0 -> 269 bytes
editgpx/data/tr.lang | Bin 0 -> 147 bytes
editgpx/data/uk.lang | Bin 0 -> 424 bytes
editgpx/data/zh_CN.lang | Bin 0 -> 218 bytes
editgpx/data/zh_TW.lang | Bin 0 -> 218 bytes
.../josm/plugins/editgpx/GPXLayerImportAction.java | 15 +-
lakewalker/build.xml | 313 +++++++++---------
lakewalker/data/ar.lang | Bin 0 -> 599 bytes
lakewalker/data/bg.lang | Bin 0 -> 3966 bytes
lakewalker/data/cs.lang | Bin 0 -> 2245 bytes
lakewalker/data/da.lang | Bin 0 -> 1228 bytes
lakewalker/data/de.lang | Bin 0 -> 2395 bytes
lakewalker/data/el.lang | Bin 0 -> 2582 bytes
lakewalker/data/en.lang | Bin 0 -> 2066 bytes
lakewalker/data/en_AU.lang | Bin 0 -> 351 bytes
lakewalker/data/en_GB.lang | Bin 0 -> 351 bytes
lakewalker/data/es.lang | Bin 0 -> 2408 bytes
lakewalker/data/et.lang | Bin 0 -> 250 bytes
lakewalker/data/eu.lang | Bin 0 -> 142 bytes
lakewalker/data/fi.lang | Bin 0 -> 1862 bytes
lakewalker/data/fr.lang | Bin 0 -> 2530 bytes
lakewalker/data/gl.lang | Bin 0 -> 1101 bytes
lakewalker/data/he.lang | Bin 0 -> 1920 bytes
lakewalker/data/id.lang | Bin 0 -> 202 bytes
lakewalker/data/is.lang | Bin 0 -> 195 bytes
lakewalker/data/it.lang | Bin 0 -> 2536 bytes
lakewalker/data/ja.lang | Bin 0 -> 2645 bytes
lakewalker/data/nb.lang | Bin 0 -> 2139 bytes
lakewalker/data/nl.lang | Bin 0 -> 2139 bytes
lakewalker/data/pl.lang | Bin 0 -> 460 bytes
lakewalker/data/pt_BR.lang | Bin 0 -> 356 bytes
lakewalker/data/ru.lang | Bin 0 -> 4057 bytes
lakewalker/data/sk.lang | Bin 0 -> 2290 bytes
lakewalker/data/sv.lang | Bin 0 -> 2309 bytes
lakewalker/data/tr.lang | Bin 0 -> 2150 bytes
lakewalker/data/uk.lang | Bin 0 -> 4340 bytes
lakewalker/data/zh_CN.lang | Bin 0 -> 2055 bytes
lakewalker/data/zh_TW.lang | Bin 0 -> 2082 bytes
.../josm/plugins/lakewalker/Lakewalker.java | 2 +-
livegps/build.xml | 315 +++++++++---------
livegps/data/ar.lang | Bin 0 -> 138 bytes
livegps/data/bg.lang | Bin 0 -> 863 bytes
livegps/data/cs.lang | Bin 0 -> 496 bytes
livegps/data/da.lang | Bin 0 -> 433 bytes
livegps/data/de.lang | Bin 0 -> 532 bytes
livegps/data/el.lang | Bin 0 -> 840 bytes
livegps/data/en.lang | Bin 0 -> 436 bytes
livegps/data/en_AU.lang | Bin 0 -> 177 bytes
livegps/data/en_GB.lang | Bin 0 -> 177 bytes
livegps/data/es.lang | Bin 0 -> 481 bytes
livegps/data/et.lang | Bin 0 -> 123 bytes
livegps/data/eu.lang | Bin 0 -> 105 bytes
livegps/data/fi.lang | Bin 0 -> 355 bytes
livegps/data/fr.lang | Bin 0 -> 507 bytes
livegps/data/gl.lang | Bin 0 -> 405 bytes
livegps/data/he.lang | Bin 0 -> 447 bytes
livegps/data/id.lang | Bin 0 -> 87 bytes
livegps/data/is.lang | Bin 0 -> 110 bytes
livegps/data/it.lang | Bin 0 -> 506 bytes
livegps/data/ja.lang | Bin 0 -> 558 bytes
livegps/data/nb.lang | Bin 0 -> 426 bytes
livegps/data/nl.lang | Bin 0 -> 460 bytes
livegps/data/pl.lang | Bin 0 -> 233 bytes
livegps/data/pt_BR.lang | Bin 0 -> 230 bytes
livegps/data/ru.lang | Bin 0 -> 855 bytes
livegps/data/sk.lang | Bin 0 -> 483 bytes
livegps/data/sv.lang | Bin 0 -> 447 bytes
livegps/data/tr.lang | Bin 0 -> 475 bytes
livegps/data/uk.lang | Bin 0 -> 849 bytes
livegps/data/zh_CN.lang | Bin 0 -> 436 bytes
livegps/data/zh_TW.lang | Bin 0 -> 432 bytes
livegps/src/livegps/LiveGpsData.java | 4 +-
livegps/src/livegps/LiveGpsPlugin.java | 3 +-
measurement/build.xml | 310 +++++++++---------
measurement/data/ar.lang | Bin 0 -> 112 bytes
measurement/data/bg.lang | Bin 0 -> 836 bytes
measurement/data/cs.lang | Bin 0 -> 399 bytes
measurement/data/da.lang | Bin 0 -> 390 bytes
measurement/data/de.lang | Bin 0 -> 420 bytes
measurement/data/el.lang | Bin 0 -> 414 bytes
measurement/data/en.lang | Bin 0 -> 391 bytes
measurement/data/en_AU.lang | Bin 0 -> 36 bytes
measurement/data/en_GB.lang | Bin 0 -> 36 bytes
measurement/data/es.lang | Bin 0 -> 471 bytes
measurement/data/et.lang | Bin 0 -> 55 bytes
measurement/data/eu.lang | Bin 0 -> 48 bytes
measurement/data/fi.lang | Bin 0 -> 377 bytes
measurement/data/fr.lang | Bin 0 -> 443 bytes
measurement/data/gl.lang | Bin 0 -> 355 bytes
measurement/data/he.lang | Bin 0 -> 421 bytes
measurement/data/is.lang | Bin 0 -> 248 bytes
measurement/data/it.lang | Bin 0 -> 531 bytes
measurement/data/ja.lang | Bin 0 -> 495 bytes
measurement/data/nb.lang | Bin 0 -> 325 bytes
measurement/data/nl.lang | Bin 0 -> 407 bytes
measurement/data/pl.lang | Bin 0 -> 336 bytes
measurement/data/pt_BR.lang | Bin 0 -> 139 bytes
measurement/data/ru.lang | Bin 0 -> 765 bytes
measurement/data/sk.lang | Bin 0 -> 428 bytes
measurement/data/sv.lang | Bin 0 -> 434 bytes
measurement/data/tr.lang | Bin 0 -> 396 bytes
measurement/data/uk.lang | Bin 0 -> 794 bytes
measurement/data/zh_CN.lang | Bin 0 -> 391 bytes
measurement/data/zh_TW.lang | Bin 0 -> 388 bytes
openvisible/build.xml | 319 +++++++++----------
openvisible/data/ar.lang | Bin 0 -> 81 bytes
openvisible/data/bg.lang | Bin 0 -> 390 bytes
openvisible/data/cs.lang | Bin 0 -> 230 bytes
openvisible/data/da.lang | Bin 0 -> 205 bytes
openvisible/data/de.lang | Bin 0 -> 240 bytes
openvisible/data/el.lang | Bin 0 -> 252 bytes
openvisible/data/en.lang | Bin 0 -> 200 bytes
openvisible/data/en_AU.lang | Bin 0 -> 16 bytes
openvisible/data/en_GB.lang | Bin 0 -> 16 bytes
openvisible/data/es.lang | Bin 0 -> 269 bytes
openvisible/data/et.lang | Bin 0 -> 65 bytes
openvisible/data/eu.lang | Bin 0 -> 26 bytes
openvisible/data/fi.lang | Bin 0 -> 168 bytes
openvisible/data/fr.lang | Bin 0 -> 253 bytes
openvisible/data/gl.lang | Bin 0 -> 150 bytes
openvisible/data/he.lang | Bin 0 -> 254 bytes
openvisible/data/id.lang | Bin 0 -> 16 bytes
openvisible/data/is.lang | Bin 0 -> 98 bytes
openvisible/data/it.lang | Bin 0 -> 252 bytes
openvisible/data/ja.lang | Bin 0 -> 290 bytes
openvisible/data/nb.lang | Bin 0 -> 217 bytes
openvisible/data/nl.lang | Bin 0 -> 192 bytes
openvisible/data/pl.lang | Bin 0 -> 63 bytes
openvisible/data/pt_BR.lang | Bin 0 -> 204 bytes
openvisible/data/ru.lang | Bin 0 -> 405 bytes
openvisible/data/sk.lang | Bin 0 -> 239 bytes
openvisible/data/sv.lang | Bin 0 -> 197 bytes
openvisible/data/tr.lang | Bin 0 -> 179 bytes
openvisible/data/uk.lang | Bin 0 -> 373 bytes
openvisible/data/zh_CN.lang | Bin 0 -> 197 bytes
openvisible/data/zh_TW.lang | Bin 0 -> 203 bytes
routing/build.xml | 351 ++++++++++-----------
routing/data/ar.lang | Bin 0 -> 145 bytes
routing/data/bg.lang | Bin 0 -> 938 bytes
routing/data/cs.lang | Bin 0 -> 510 bytes
routing/data/da.lang | Bin 0 -> 531 bytes
routing/data/de.lang | Bin 0 -> 624 bytes
routing/data/el.lang | Bin 0 -> 672 bytes
routing/data/en.lang | Bin 0 -> 485 bytes
routing/data/en_AU.lang | Bin 0 -> 83 bytes
routing/data/en_GB.lang | Bin 0 -> 83 bytes
routing/data/es.lang | Bin 0 -> 588 bytes
routing/data/et.lang | Bin 0 -> 151 bytes
routing/data/eu.lang | Bin 0 -> 126 bytes
routing/data/fi.lang | Bin 0 -> 183 bytes
routing/data/fr.lang | Bin 0 -> 690 bytes
routing/data/gl.lang | Bin 0 -> 363 bytes
routing/data/he.lang | Bin 0 -> 192 bytes
routing/data/id.lang | Bin 0 -> 110 bytes
routing/data/is.lang | Bin 0 -> 171 bytes
routing/data/it.lang | Bin 0 -> 621 bytes
routing/data/ja.lang | Bin 0 -> 653 bytes
routing/data/nb.lang | Bin 0 -> 506 bytes
routing/data/nl.lang | Bin 0 -> 197 bytes
routing/data/pl.lang | Bin 0 -> 204 bytes
routing/data/pt_BR.lang | Bin 0 -> 550 bytes
routing/data/ru.lang | Bin 0 -> 1142 bytes
routing/data/sk.lang | Bin 0 -> 586 bytes
routing/data/sv.lang | Bin 0 -> 404 bytes
routing/data/tr.lang | Bin 0 -> 179 bytes
routing/data/uk.lang | Bin 0 -> 1150 bytes
routing/data/zh_CN.lang | Bin 0 -> 502 bytes
routing/data/zh_TW.lang | Bin 0 -> 499 bytes
.../com/innovant/josm/jrt/core/RoutingGraph.java | 128 +++++---
.../innovant/josm/plugin/routing/RoutingLayer.java | 55 +++-
.../josm/plugin/routing/RoutingPlugin.java | 37 ++-
.../josm/plugin/routing/gui/RoutingMenu.java | 17 +
surveyor/build.xml | 344 ++++++++++----------
surveyor/data/ar.lang | Bin 0 -> 57 bytes
surveyor/data/bg.lang | Bin 0 -> 665 bytes
surveyor/data/cs.lang | Bin 0 -> 341 bytes
surveyor/data/da.lang | Bin 0 -> 324 bytes
surveyor/data/de.lang | Bin 0 -> 499 bytes
surveyor/data/el.lang | Bin 0 -> 171 bytes
surveyor/data/en.lang | Bin 0 -> 419 bytes
surveyor/data/en_AU.lang | Bin 0 -> 96 bytes
surveyor/data/en_GB.lang | Bin 0 -> 96 bytes
surveyor/data/es.lang | Bin 0 -> 443 bytes
surveyor/data/et.lang | Bin 0 -> 54 bytes
surveyor/data/eu.lang | Bin 0 -> 54 bytes
surveyor/data/fi.lang | Bin 0 -> 131 bytes
surveyor/data/fr.lang | Bin 0 -> 610 bytes
surveyor/data/gl.lang | Bin 0 -> 190 bytes
surveyor/data/he.lang | Bin 0 -> 134 bytes
surveyor/data/id.lang | Bin 0 -> 53 bytes
surveyor/data/is.lang | Bin 0 -> 50 bytes
surveyor/data/it.lang | Bin 0 -> 533 bytes
surveyor/data/ja.lang | Bin 0 -> 509 bytes
surveyor/data/nb.lang | Bin 0 -> 402 bytes
surveyor/data/nl.lang | Bin 0 -> 332 bytes
surveyor/data/pl.lang | Bin 0 -> 57 bytes
surveyor/data/pt_BR.lang | Bin 0 -> 462 bytes
surveyor/data/ru.lang | Bin 0 -> 714 bytes
surveyor/data/sk.lang | Bin 0 -> 442 bytes
surveyor/data/sv.lang | Bin 0 -> 342 bytes
surveyor/data/tr.lang | Bin 0 -> 338 bytes
surveyor/data/uk.lang | Bin 0 -> 828 bytes
surveyor/data/zh_CN.lang | Bin 0 -> 444 bytes
surveyor/data/zh_TW.lang | Bin 0 -> 444 bytes
.../josm/plugin/surveyor/SurveyorComponent.java | 2 +-
svn-info.xml | 8 +-
342 files changed, 1744 insertions(+), 1652 deletions(-)
diff --git a/DirectUpload/build.xml b/DirectUpload/build.xml
index f1c96cd..dba0014 100644
--- a/DirectUpload/build.xml
+++ b/DirectUpload/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the DirectUpload plugin
**
@@ -25,122 +25,120 @@
**
-->
<project name="DirectUpload" default="dist" basedir=".">
-
- <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])" />
- <property name="plugin.main.version" value="3835" />
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Subhodip Biswas"/>
- <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin"/>
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="This plugin directly upload GPS Traces from current active layer in JOSM to openstreetmap.org."/>
- <attribute name="Plugin-Icon" value="images/UploadAction.png"/>
- <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/User:Subhodip/GSoC_Doc#DirectUpload_Plugin_in_JOSM_:"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
+ <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Subhodip Biswas"/>
+ <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="This plugin directly upload GPS Traces from current active layer in JOSM to openstreetmap.org."/>
+ <attribute name="Plugin-Icon" value="images/UploadAction.png"/>
+ <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/User:Subhodip/GSoC_Doc#DirectUpload_Plugin_in_JOSM_:"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
Plugin-Mainversion: ${plugin.main.version}
@@ -150,36 +148,34 @@ Plugin-Version : ${version.entry.commit.revision}
Now commiting ${plugin.jar} ...
</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/DirectUpload/data/ar.lang b/DirectUpload/data/ar.lang
new file mode 100644
index 0000000..8e70eab
Binary files /dev/null and b/DirectUpload/data/ar.lang differ
diff --git a/DirectUpload/data/bg.lang b/DirectUpload/data/bg.lang
new file mode 100644
index 0000000..a67ec37
Binary files /dev/null and b/DirectUpload/data/bg.lang differ
diff --git a/DirectUpload/data/cs.lang b/DirectUpload/data/cs.lang
new file mode 100644
index 0000000..85b808d
Binary files /dev/null and b/DirectUpload/data/cs.lang differ
diff --git a/DirectUpload/data/da.lang b/DirectUpload/data/da.lang
new file mode 100644
index 0000000..0ae2d88
Binary files /dev/null and b/DirectUpload/data/da.lang differ
diff --git a/DirectUpload/data/de.lang b/DirectUpload/data/de.lang
new file mode 100644
index 0000000..0a560b3
Binary files /dev/null and b/DirectUpload/data/de.lang differ
diff --git a/DirectUpload/data/el.lang b/DirectUpload/data/el.lang
new file mode 100644
index 0000000..7d1da9f
Binary files /dev/null and b/DirectUpload/data/el.lang differ
diff --git a/DirectUpload/data/en.lang b/DirectUpload/data/en.lang
new file mode 100644
index 0000000..2daf6b5
Binary files /dev/null and b/DirectUpload/data/en.lang differ
diff --git a/DirectUpload/data/en_AU.lang b/DirectUpload/data/en_AU.lang
new file mode 100644
index 0000000..5d403f3
Binary files /dev/null and b/DirectUpload/data/en_AU.lang differ
diff --git a/DirectUpload/data/en_GB.lang b/DirectUpload/data/en_GB.lang
new file mode 100644
index 0000000..5d403f3
Binary files /dev/null and b/DirectUpload/data/en_GB.lang differ
diff --git a/DirectUpload/data/es.lang b/DirectUpload/data/es.lang
new file mode 100644
index 0000000..050a9fa
Binary files /dev/null and b/DirectUpload/data/es.lang differ
diff --git a/DirectUpload/data/et.lang b/DirectUpload/data/et.lang
new file mode 100644
index 0000000..264ed36
Binary files /dev/null and b/DirectUpload/data/et.lang differ
diff --git a/DirectUpload/data/eu.lang b/DirectUpload/data/eu.lang
new file mode 100644
index 0000000..7cb2dbb
Binary files /dev/null and b/DirectUpload/data/eu.lang differ
diff --git a/DirectUpload/data/fi.lang b/DirectUpload/data/fi.lang
new file mode 100644
index 0000000..7514c85
Binary files /dev/null and b/DirectUpload/data/fi.lang differ
diff --git a/DirectUpload/data/fr.lang b/DirectUpload/data/fr.lang
new file mode 100644
index 0000000..21ae1d7
Binary files /dev/null and b/DirectUpload/data/fr.lang differ
diff --git a/DirectUpload/data/gl.lang b/DirectUpload/data/gl.lang
new file mode 100644
index 0000000..e3dea0c
Binary files /dev/null and b/DirectUpload/data/gl.lang differ
diff --git a/DirectUpload/data/he.lang b/DirectUpload/data/he.lang
new file mode 100644
index 0000000..331c048
Binary files /dev/null and b/DirectUpload/data/he.lang differ
diff --git a/DirectUpload/data/id.lang b/DirectUpload/data/id.lang
new file mode 100644
index 0000000..235700b
Binary files /dev/null and b/DirectUpload/data/id.lang differ
diff --git a/DirectUpload/data/is.lang b/DirectUpload/data/is.lang
new file mode 100644
index 0000000..2172a02
Binary files /dev/null and b/DirectUpload/data/is.lang differ
diff --git a/DirectUpload/data/it.lang b/DirectUpload/data/it.lang
new file mode 100644
index 0000000..6c4e9e9
Binary files /dev/null and b/DirectUpload/data/it.lang differ
diff --git a/DirectUpload/data/ja.lang b/DirectUpload/data/ja.lang
new file mode 100644
index 0000000..62d8cd0
Binary files /dev/null and b/DirectUpload/data/ja.lang differ
diff --git a/DirectUpload/data/nb.lang b/DirectUpload/data/nb.lang
new file mode 100644
index 0000000..766811c
Binary files /dev/null and b/DirectUpload/data/nb.lang differ
diff --git a/DirectUpload/data/nl.lang b/DirectUpload/data/nl.lang
new file mode 100644
index 0000000..915bd62
Binary files /dev/null and b/DirectUpload/data/nl.lang differ
diff --git a/DirectUpload/data/pl.lang b/DirectUpload/data/pl.lang
new file mode 100644
index 0000000..911e440
Binary files /dev/null and b/DirectUpload/data/pl.lang differ
diff --git a/DirectUpload/data/pt_BR.lang b/DirectUpload/data/pt_BR.lang
new file mode 100644
index 0000000..86139cc
Binary files /dev/null and b/DirectUpload/data/pt_BR.lang differ
diff --git a/DirectUpload/data/ru.lang b/DirectUpload/data/ru.lang
new file mode 100644
index 0000000..bfcbf48
Binary files /dev/null and b/DirectUpload/data/ru.lang differ
diff --git a/DirectUpload/data/sk.lang b/DirectUpload/data/sk.lang
new file mode 100644
index 0000000..c35836a
Binary files /dev/null and b/DirectUpload/data/sk.lang differ
diff --git a/DirectUpload/data/sv.lang b/DirectUpload/data/sv.lang
new file mode 100644
index 0000000..394e18b
Binary files /dev/null and b/DirectUpload/data/sv.lang differ
diff --git a/DirectUpload/data/tr.lang b/DirectUpload/data/tr.lang
new file mode 100644
index 0000000..6c2b50c
Binary files /dev/null and b/DirectUpload/data/tr.lang differ
diff --git a/DirectUpload/data/uk.lang b/DirectUpload/data/uk.lang
new file mode 100644
index 0000000..ede822e
Binary files /dev/null and b/DirectUpload/data/uk.lang differ
diff --git a/DirectUpload/data/zh_CN.lang b/DirectUpload/data/zh_CN.lang
new file mode 100644
index 0000000..80a4316
Binary files /dev/null and b/DirectUpload/data/zh_CN.lang differ
diff --git a/DirectUpload/data/zh_TW.lang b/DirectUpload/data/zh_TW.lang
new file mode 100644
index 0000000..5bc58e4
Binary files /dev/null and b/DirectUpload/data/zh_TW.lang differ
diff --git a/cadastre-fr/build.xml b/cadastre-fr/build.xml
index 4d6175f..b193c5a 100644
--- a/cadastre-fr/build.xml
+++ b/cadastre-fr/build.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is a template build file for the cadastre-fr plugin.
**
@@ -24,17 +25,13 @@
**
-->
<project name="cadastre-fr" default="dist" basedir=".">
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
<property name="ant.build.javac.target" value="1.5"/>
-
-
-
- <property name="commit.message" value="Changed constructor for Plugin" />
- <property name="plugin.main.version" value="3835" />
-
+ <property name="commit.message" value="Changed constructor for Plugin"/>
+ <property name="plugin.main.version" value="4126"/>
<target name="init">
<mkdir dir="${plugin.build.dir}"/>
</target>
@@ -49,6 +46,9 @@
<copy todir="${plugin.build.dir}/images">
<fileset dir="images"/>
</copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
<jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
<manifest>
<attribute name="Author" value="Pieren"/>
@@ -86,81 +86,76 @@
</condition>
<copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
</target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/cadastre-fr/data/ar.lang b/cadastre-fr/data/ar.lang
new file mode 100644
index 0000000..fcc98e4
Binary files /dev/null and b/cadastre-fr/data/ar.lang differ
diff --git a/cadastre-fr/data/bg.lang b/cadastre-fr/data/bg.lang
new file mode 100644
index 0000000..198da98
Binary files /dev/null and b/cadastre-fr/data/bg.lang differ
diff --git a/cadastre-fr/data/cs.lang b/cadastre-fr/data/cs.lang
new file mode 100644
index 0000000..b2826d6
Binary files /dev/null and b/cadastre-fr/data/cs.lang differ
diff --git a/cadastre-fr/data/da.lang b/cadastre-fr/data/da.lang
new file mode 100644
index 0000000..d4e327f
Binary files /dev/null and b/cadastre-fr/data/da.lang differ
diff --git a/cadastre-fr/data/de.lang b/cadastre-fr/data/de.lang
new file mode 100644
index 0000000..02f64f1
Binary files /dev/null and b/cadastre-fr/data/de.lang differ
diff --git a/cadastre-fr/data/el.lang b/cadastre-fr/data/el.lang
new file mode 100644
index 0000000..1afd975
Binary files /dev/null and b/cadastre-fr/data/el.lang differ
diff --git a/cadastre-fr/data/en.lang b/cadastre-fr/data/en.lang
new file mode 100644
index 0000000..5012264
Binary files /dev/null and b/cadastre-fr/data/en.lang differ
diff --git a/cadastre-fr/data/en_AU.lang b/cadastre-fr/data/en_AU.lang
new file mode 100644
index 0000000..6ca9738
Binary files /dev/null and b/cadastre-fr/data/en_AU.lang differ
diff --git a/cadastre-fr/data/en_GB.lang b/cadastre-fr/data/en_GB.lang
new file mode 100644
index 0000000..6ca9738
Binary files /dev/null and b/cadastre-fr/data/en_GB.lang differ
diff --git a/cadastre-fr/data/es.lang b/cadastre-fr/data/es.lang
new file mode 100644
index 0000000..583b212
Binary files /dev/null and b/cadastre-fr/data/es.lang differ
diff --git a/cadastre-fr/data/et.lang b/cadastre-fr/data/et.lang
new file mode 100644
index 0000000..bbb857b
Binary files /dev/null and b/cadastre-fr/data/et.lang differ
diff --git a/cadastre-fr/data/eu.lang b/cadastre-fr/data/eu.lang
new file mode 100644
index 0000000..fd9060d
Binary files /dev/null and b/cadastre-fr/data/eu.lang differ
diff --git a/cadastre-fr/data/fi.lang b/cadastre-fr/data/fi.lang
new file mode 100644
index 0000000..92020d8
Binary files /dev/null and b/cadastre-fr/data/fi.lang differ
diff --git a/cadastre-fr/data/fr.lang b/cadastre-fr/data/fr.lang
new file mode 100644
index 0000000..7cf6d10
Binary files /dev/null and b/cadastre-fr/data/fr.lang differ
diff --git a/cadastre-fr/data/gl.lang b/cadastre-fr/data/gl.lang
new file mode 100644
index 0000000..945af69
Binary files /dev/null and b/cadastre-fr/data/gl.lang differ
diff --git a/cadastre-fr/data/he.lang b/cadastre-fr/data/he.lang
new file mode 100644
index 0000000..275c7d2
Binary files /dev/null and b/cadastre-fr/data/he.lang differ
diff --git a/cadastre-fr/data/id.lang b/cadastre-fr/data/id.lang
new file mode 100644
index 0000000..f3d8625
Binary files /dev/null and b/cadastre-fr/data/id.lang differ
diff --git a/cadastre-fr/data/is.lang b/cadastre-fr/data/is.lang
new file mode 100644
index 0000000..b56243e
Binary files /dev/null and b/cadastre-fr/data/is.lang differ
diff --git a/cadastre-fr/data/it.lang b/cadastre-fr/data/it.lang
new file mode 100644
index 0000000..0790daf
Binary files /dev/null and b/cadastre-fr/data/it.lang differ
diff --git a/cadastre-fr/data/ja.lang b/cadastre-fr/data/ja.lang
new file mode 100644
index 0000000..82016b8
Binary files /dev/null and b/cadastre-fr/data/ja.lang differ
diff --git a/cadastre-fr/data/nb.lang b/cadastre-fr/data/nb.lang
new file mode 100644
index 0000000..484c3ac
Binary files /dev/null and b/cadastre-fr/data/nb.lang differ
diff --git a/cadastre-fr/data/nl.lang b/cadastre-fr/data/nl.lang
new file mode 100644
index 0000000..3886268
Binary files /dev/null and b/cadastre-fr/data/nl.lang differ
diff --git a/cadastre-fr/data/pl.lang b/cadastre-fr/data/pl.lang
new file mode 100644
index 0000000..9466343
Binary files /dev/null and b/cadastre-fr/data/pl.lang differ
diff --git a/cadastre-fr/data/pt_BR.lang b/cadastre-fr/data/pt_BR.lang
new file mode 100644
index 0000000..3b9ab8c
Binary files /dev/null and b/cadastre-fr/data/pt_BR.lang differ
diff --git a/cadastre-fr/data/ru.lang b/cadastre-fr/data/ru.lang
new file mode 100644
index 0000000..0eb447e
Binary files /dev/null and b/cadastre-fr/data/ru.lang differ
diff --git a/cadastre-fr/data/sk.lang b/cadastre-fr/data/sk.lang
new file mode 100644
index 0000000..3c8e862
Binary files /dev/null and b/cadastre-fr/data/sk.lang differ
diff --git a/cadastre-fr/data/sv.lang b/cadastre-fr/data/sv.lang
new file mode 100644
index 0000000..0b69d9e
Binary files /dev/null and b/cadastre-fr/data/sv.lang differ
diff --git a/cadastre-fr/data/tr.lang b/cadastre-fr/data/tr.lang
new file mode 100644
index 0000000..5c17f2f
Binary files /dev/null and b/cadastre-fr/data/tr.lang differ
diff --git a/cadastre-fr/data/uk.lang b/cadastre-fr/data/uk.lang
new file mode 100644
index 0000000..eba8b94
Binary files /dev/null and b/cadastre-fr/data/uk.lang differ
diff --git a/cadastre-fr/data/zh_CN.lang b/cadastre-fr/data/zh_CN.lang
new file mode 100644
index 0000000..d7860d6
Binary files /dev/null and b/cadastre-fr/data/zh_CN.lang differ
diff --git a/cadastre-fr/data/zh_TW.lang b/cadastre-fr/data/zh_TW.lang
new file mode 100644
index 0000000..342df4d
Binary files /dev/null and b/cadastre-fr/data/zh_TW.lang differ
diff --git a/cadastre-fr/src/cadastre_fr/CacheControl.java b/cadastre-fr/src/cadastre_fr/CacheControl.java
index ca14762..829f87f 100644
--- a/cadastre-fr/src/cadastre_fr/CacheControl.java
+++ b/cadastre-fr/src/cadastre_fr/CacheControl.java
@@ -209,9 +209,9 @@ public class CacheControl implements Runnable {
private String WMSFileExtension() {
String ext = String.valueOf((wmsLayer.getLambertZone() + 1));
- if (Main.proj instanceof LambertCC9Zones)
+ if (Main.getProjection() instanceof LambertCC9Zones)
ext = cLambertCC9Z + ext;
- else if (Main.proj instanceof UTM_France_DOM)
+ else if (Main.getProjection() instanceof UTM_France_DOM)
ext = cUTM20N + ext;
return ext;
}
diff --git a/cadastre-fr/src/cadastre_fr/CadastreInterface.java b/cadastre-fr/src/cadastre_fr/CadastreInterface.java
index 0af2e74..d4036c6 100644
--- a/cadastre-fr/src/cadastre_fr/CadastreInterface.java
+++ b/cadastre-fr/src/cadastre_fr/CadastreInterface.java
@@ -57,8 +57,8 @@ public class CadastreInterface {
final String cInterfaceVector = "afficherCarteCommune.do";
final String cInterfaceRasterTA = "afficherCarteTa.do";
final String cInterfaceRasterFeuille = "afficherCarteFeuille.do";
- final String cImageLinkStart = "title=\"image\"><a href=\"#\" onClick=\"popup('afficherCarteFeuille.do?f=";
- final String cTAImageLinkStart = "title=\"image\"><a href=\"#\" onClick=\"popup('afficherCarteTa.do?f=";
+ final String cImageLinkStart = "<a href=\"#\" class=\"raster\" onClick=\"popup('afficherCarteFeuille.do?f=";
+ final String cTAImageLinkStart = "<a href=\"#\" class=\"raster\" onClick=\"popup('afficherCarteTa.do?f=";
final String cImageNameStart = ">Feuille ";
final String cTAImageNameStart = "Tableau d'assemblage <strong>";
diff --git a/cadastre-fr/src/cadastre_fr/CadastrePlugin.java b/cadastre-fr/src/cadastre_fr/CadastrePlugin.java
index 05e7cad..51af34c 100644
--- a/cadastre-fr/src/cadastre_fr/CadastrePlugin.java
+++ b/cadastre-fr/src/cadastre_fr/CadastrePlugin.java
@@ -121,6 +121,8 @@ import org.openstreetmap.josm.data.projection.*;
* - the divided BBox mode starts from the central square and loads the next in a spiral
* - move the grabber from CadastrPlugin singleton to each wmsLayer instance to allow grabbing
* of multiple municipalities in parallel.
+ * 2.2 01-Jul-2011 - replace deprecated Main.proj by newest Main.getProjection()
+ * - fix list of raster images (Feuilles) parsing failing after a Cadastre server change/maintenance
*/
public class CadastrePlugin extends Plugin {
static String VERSION = "2.1";
@@ -349,9 +351,9 @@ public class CadastrePlugin extends Plugin {
}
public static boolean isCadastreProjection() {
- return Main.proj.toString().equals(new Lambert().toString())
- || Main.proj.toString().equals(new UTM_France_DOM().toString())
- || Main.proj.toString().equals(new LambertCC9Zones().toString());
+ return Main.getProjection().toString().equals(new Lambert().toString())
+ || Main.getProjection().toString().equals(new UTM_France_DOM().toString())
+ || Main.getProjection().toString().equals(new LambertCC9Zones().toString());
}
public static void safeSleep(long milliseconds) {
diff --git a/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java b/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
index 189274b..a758ec6 100644
--- a/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
+++ b/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
@@ -44,7 +44,7 @@ public class CadastrePreferenceSetting implements PreferenceSetting {
private JCheckBox autoFirstLayer = new JCheckBox(tr("Select first WMS layer in list."));
- private JCheckBox dontUseRelation = new JCheckBox(tr("Don't use relation for addresses (but \"addr:street\" on elements)."));
+ private JCheckBox dontUseRelation = new JCheckBox(tr("Don''t use relation for addresses (but \"addr:street\" on elements)."));
private JRadioButton grabMultiplier1 = new JRadioButton("", true);
@@ -54,19 +54,19 @@ public class CadastrePreferenceSetting implements PreferenceSetting {
private JRadioButton grabMultiplier4 = new JRadioButton("", true);
- private JRadioButton crosspiece1 = new JRadioButton("off");
+ private JRadioButton crosspiece1 = new JRadioButton(tr("off"));
- private JRadioButton crosspiece2 = new JRadioButton("25m");
+ private JRadioButton crosspiece2 = new JRadioButton(tr("25 m"));
- private JRadioButton crosspiece3 = new JRadioButton("50m");
+ private JRadioButton crosspiece3 = new JRadioButton(tr("50 m"));
- private JRadioButton crosspiece4 = new JRadioButton("100m");
+ private JRadioButton crosspiece4 = new JRadioButton(tr("100 m"));
- private JRadioButton grabRes1 = new JRadioButton("high");
+ private JRadioButton grabRes1 = new JRadioButton(tr("high"));
- private JRadioButton grabRes2 = new JRadioButton("medium");
+ private JRadioButton grabRes2 = new JRadioButton(tr("medium"));
- private JRadioButton grabRes3 = new JRadioButton("low");
+ private JRadioButton grabRes3 = new JRadioButton(tr("low"));
private JCheckBox layerLS3 = new JCheckBox(tr("water"));
private JCheckBox layerLS2 = new JCheckBox(tr("building"));
@@ -291,7 +291,7 @@ public class CadastrePreferenceSetting implements PreferenceSetting {
cadastrewms.add(disableImageCropping, GBC.std().insets(0, 0, 10, 0));
// option to add the "Tableau d'assemblage" in list of sheets to grab
enableTableauAssemblage.setSelected(Main.pref.getBoolean("cadastrewms.useTA", false));
- enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."));
+ enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."));
cadastrewms.add(enableTableauAssemblage, GBC.eop().insets(0, 0, 0, 0));
// the crosspiece display
JLabel jLabelCrosspieces = new JLabel(tr("Display crosspieces:"));
@@ -322,7 +322,7 @@ public class CadastrePreferenceSetting implements PreferenceSetting {
}
});
enableCache.setSelected(Main.pref.getBoolean("cadastrewms.enableCaching", true));
- enableCache.setToolTipText(tr("Replace the original white background by the backgound color defined in JOSM preferences."));
+ enableCache.setToolTipText(tr("Allows an automatic caching"));
cadastrewms.add(enableCache, GBC.eop().insets(0, 0, 0, 0));
// option to fix the cache size(in MB)
diff --git a/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java b/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java
index 121d804..915885c 100644
--- a/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java
+++ b/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java
@@ -113,7 +113,7 @@ public class DownloadSVGBuilding extends PleaseWaitRunnable {
for (ArrayList<EastNorth> path : eastNorths) {
Way wayToAdd = new Way();
for (EastNorth eastNorth : path) {
- Node nodeToAdd = new Node(Main.proj.eastNorth2latlon(eastNorth));
+ Node nodeToAdd = new Node(Main.getProjection().eastNorth2latlon(eastNorth));
// check if new node is not already created by another new path
Node nearestNewNode = checkNearestNode(nodeToAdd, svgDataSet.getNodes());
if (nearestNewNode == nodeToAdd)
diff --git a/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java b/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java
index b30e816..65698d5 100644
--- a/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java
+++ b/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java
@@ -115,7 +115,7 @@ public class DownloadSVGTask extends PleaseWaitRunnable {
int bestPath = fitViewBox.indexOf(min);
List<Node> nodeList = new ArrayList<Node>();
for (EastNorth eastNorth : eastNorths.get(bestPath)) {
- nodeList.add(new Node(Main.proj.eastNorth2latlon(eastNorth)));
+ nodeList.add(new Node(Main.getProjection().eastNorth2latlon(eastNorth)));
}
Way wayToAdd = new Way();
Collection<Command> cmds = new LinkedList<Command>();
diff --git a/cadastre-fr/src/cadastre_fr/EastNorthBound.java b/cadastre-fr/src/cadastre_fr/EastNorthBound.java
index 178496f..4cc2e58 100644
--- a/cadastre-fr/src/cadastre_fr/EastNorthBound.java
+++ b/cadastre-fr/src/cadastre_fr/EastNorthBound.java
@@ -32,7 +32,7 @@ public class EastNorthBound implements Serializable {
}
public Bounds toBounds() {
- return new Bounds(Main.proj.eastNorth2latlon(min), Main.proj.eastNorth2latlon(max));
+ return new Bounds(Main.getProjection().eastNorth2latlon(min), Main.getProjection().eastNorth2latlon(max));
}
@Override public String toString() {
diff --git a/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java b/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java
index 4373a0a..4f8efd9 100644
--- a/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java
+++ b/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java
@@ -1,6 +1,7 @@
package cadastre_fr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.event.ActionEvent;
@@ -9,7 +10,7 @@ import org.openstreetmap.josm.actions.JosmAction;
@SuppressWarnings("serial")
public class MenuActionCancelGrab extends JosmAction {
- public static String name = "Cancel current grab";
+ public static String name = marktr("Cancel current grab");
private WMSLayer wmsLayer;
diff --git a/cadastre-fr/src/cadastre_fr/MenuActionGrab.java b/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
index 24028d4..c1053a7 100644
--- a/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
+++ b/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
@@ -2,6 +2,7 @@
package cadastre_fr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -19,7 +20,7 @@ public class MenuActionGrab extends JosmAction {
*/
private static final long serialVersionUID = 1L;
- public static String name = "Cadastre grab";
+ public static String name = marktr("Cadastre grab");
public MenuActionGrab() {
super(tr(name), "cadastre_small", tr("Download Image from French Cadastre WMS"),
diff --git a/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java b/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
index 0aa025a..7192285 100644
--- a/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
+++ b/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
@@ -2,6 +2,7 @@
package cadastre_fr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
@@ -30,7 +31,7 @@ public class MenuActionGrabPlanImage extends JosmAction implements Runnable, Mou
*/
private static final long serialVersionUID = 1L;
- public static String name = "Georeference an image";
+ public static String name = marktr("Georeference an image");
private DownloadWMSPlanImage downloadWMSPlanImage;
private WMSLayer wmsLayer;
@@ -140,7 +141,7 @@ public class MenuActionGrabPlanImage extends JosmAction implements Runnable, Mou
if (e.getButton() != MouseEvent.BUTTON1)
return;
if (ignoreMouseClick) return; // In case we are currently just allowing zooming to read lambert coordinates
- EastNorth ea = Main.proj.latlon2eastNorth(Main.map.mapView.getLatLon(e.getX(), e.getY()));
+ EastNorth ea = Main.getProjection().latlon2eastNorth(Main.map.mapView.getLatLon(e.getX(), e.getY()));
System.out.println("clic:"+countMouseClicked+" ,"+ea+", mode:"+mode);
if (clickOnTheMap) {
clickOnTheMap = false;
diff --git a/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java b/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java
index a7de7ba..c9705fd 100644
--- a/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java
+++ b/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java
@@ -2,6 +2,7 @@
package cadastre_fr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.event.ActionEvent;
import java.io.File;
@@ -18,7 +19,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
public class MenuActionLoadFromCache extends JosmAction {
private static final long serialVersionUID = 1L;
- public static String name = "Load layer from cache";
+ public static String name = marktr("Load layer from cache");
public MenuActionLoadFromCache() {
super(tr(name), "cadastre_small", tr("Load location from cache (only if cache is enabled)"), null, false);
@@ -37,10 +38,10 @@ public class MenuActionLoadFromCache extends JosmAction {
String filename = file.getName();
String ext = (filename.lastIndexOf(".")==-1)?"":filename.substring(filename.lastIndexOf(".")+1,filename.length());
if ((ext.length() == 3 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z) &&
- !(Main.proj instanceof LambertCC9Zones))
+ !(Main.getProjection() instanceof LambertCC9Zones))
|| (ext.length() == 4 && ext.substring(0, CacheControl.cUTM20N.length()).equals(CacheControl.cUTM20N) &&
- !(Main.proj instanceof UTM_France_DOM))
- || (ext.length() == 1) && !(Main.proj instanceof Lambert)) {
+ !(Main.getProjection() instanceof UTM_France_DOM))
+ || (ext.length() == 1) && !(Main.getProjection() instanceof Lambert)) {
JOptionPane.showMessageDialog(Main.parent, tr("{0} not allowed with the current projection", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
continue;
} else {
@@ -88,11 +89,11 @@ public class MenuActionLoadFromCache extends JosmAction {
fc.setMultiSelectionEnabled(true);
int layoutZone = new MenuActionLoadFromCache().getCurrentProjZone();
if (layoutZone != -1) {
- if (Main.proj instanceof Lambert)
+ if (Main.getProjection() instanceof Lambert)
fc.addChoosableFileFilter(CacheFileLambert4ZoneFilter.filters[layoutZone]);
- else if (Main.proj instanceof LambertCC9Zones)
+ else if (Main.getProjection() instanceof LambertCC9Zones)
fc.addChoosableFileFilter(CacheFileLambert9ZoneFilter.filters[layoutZone]);
- else if (Main.proj instanceof UTM_France_DOM)
+ else if (Main.getProjection() instanceof UTM_France_DOM)
fc.addChoosableFileFilter(CacheFileUTM20NFilter.filters[layoutZone]);
}
fc.setAcceptAllFileFilterUsed(false);
@@ -106,12 +107,12 @@ public class MenuActionLoadFromCache extends JosmAction {
private int getCurrentProjZone() {
int zone = -1;
- if (Main.proj instanceof LambertCC9Zones)
- zone = ((LambertCC9Zones)Main.proj).getLayoutZone();
- else if (Main.proj instanceof Lambert)
- zone = ((Lambert)Main.proj).getLayoutZone();
- else if (Main.proj instanceof UTM_France_DOM)
- zone = ((UTM_France_DOM)Main.proj).getCurrentGeodesic();
+ if (Main.getProjection() instanceof LambertCC9Zones)
+ zone = ((LambertCC9Zones)Main.getProjection()).getLayoutZone();
+ else if (Main.getProjection() instanceof Lambert)
+ zone = ((Lambert)Main.getProjection()).getLayoutZone();
+ else if (Main.getProjection() instanceof UTM_France_DOM)
+ zone = ((UTM_France_DOM)Main.getProjection()).getCurrentGeodesic();
return zone;
}
}
diff --git a/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java b/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java
index 5072639..2492594 100644
--- a/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java
+++ b/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java
@@ -115,12 +115,12 @@ public class MenuActionNewLocation extends JosmAction {
}
// add the layer if it doesn't exist
int zone = -1;
- if (Main.proj instanceof LambertCC9Zones)
- zone = ((LambertCC9Zones)Main.proj).getLayoutZone();
- else if (Main.proj instanceof Lambert)
- zone = ((Lambert)Main.proj).getLayoutZone();
- else if (Main.proj instanceof UTM_France_DOM)
- zone = ((UTM_France_DOM)Main.proj).getCurrentGeodesic();
+ if (Main.getProjection() instanceof LambertCC9Zones)
+ zone = ((LambertCC9Zones)Main.getProjection()).getLayoutZone();
+ else if (Main.getProjection() instanceof Lambert)
+ zone = ((Lambert)Main.getProjection()).getLayoutZone();
+ else if (Main.getProjection() instanceof UTM_France_DOM)
+ zone = ((UTM_France_DOM)Main.getProjection()).getCurrentGeodesic();
wmsLayer = new WMSLayer(location, codeCommune, zone);
wmsLayer.setDepartement(codeDepartement);
CadastrePlugin.addWMSLayer(wmsLayer);
diff --git a/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java b/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java
index cafae80..2a996ea 100644
--- a/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java
+++ b/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java
@@ -2,6 +2,7 @@
package cadastre_fr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
@@ -17,7 +18,7 @@ import org.openstreetmap.josm.actions.JosmAction;
public class MenuActionSaveRasterAs extends JosmAction {
- public static String name = "Save image as PNG";
+ public static String name = marktr("Save image as PNG");
private static final long serialVersionUID = 1L;
diff --git a/cadastre-fr/src/cadastre_fr/WMSLayer.java b/cadastre-fr/src/cadastre_fr/WMSLayer.java
index 998e279..df0b7f1 100644
--- a/cadastre-fr/src/cadastre_fr/WMSLayer.java
+++ b/cadastre-fr/src/cadastre_fr/WMSLayer.java
@@ -137,7 +137,7 @@ public class WMSLayer extends Layer implements ImageObserver {
divideBbox(b, 1);
} else {
if (isRaster) {
- b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
+ b = new Bounds(Main.getProjection().eastNorth2latlon(rasterMin), Main.getProjection().eastNorth2latlon(rasterMax));
divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
} else
@@ -157,8 +157,8 @@ public class WMSLayer extends Layer implements ImageObserver {
* allowing grabbing of next contiguous zone
*/
private void divideBbox(Bounds b, int factor) {
- EastNorth lambertMin = Main.proj.latlon2eastNorth(b.getMin());
- EastNorth lambertMax = Main.proj.latlon2eastNorth(b.getMax());
+ EastNorth lambertMin = Main.getProjection().latlon2eastNorth(b.getMin());
+ EastNorth lambertMax = Main.getProjection().latlon2eastNorth(b.getMax());
double minEast = lambertMin.east();
double minNorth = lambertMin.north();
double dEast = (lambertMax.east() - minEast) / factor;
@@ -321,8 +321,8 @@ public class WMSLayer extends Layer implements ImageObserver {
public boolean isOverlapping(Bounds bounds) {
GeorefImage georefImage =
new GeorefImage(null,
- Main.proj.latlon2eastNorth(bounds.getMin()),
- Main.proj.latlon2eastNorth(bounds.getMax()));
+ Main.getProjection().latlon2eastNorth(bounds.getMin()),
+ Main.getProjection().latlon2eastNorth(bounds.getMax()));
for (GeorefImage img : images) {
if (img.overlap(georefImage))
return true;
@@ -398,9 +398,9 @@ public class WMSLayer extends Layer implements ImageObserver {
* @param bounds the current main map view boundaries
*/
public void setRasterBounds(Bounds bounds) {
- EastNorth rasterCenter = Main.proj.latlon2eastNorth(bounds.getCenter());
- EastNorth eaMin = Main.proj.latlon2eastNorth(bounds.getMin());
- EastNorth eaMax = Main.proj.latlon2eastNorth(bounds.getMax());
+ EastNorth rasterCenter = Main.getProjection().latlon2eastNorth(bounds.getCenter());
+ EastNorth eaMin = Main.getProjection().latlon2eastNorth(bounds.getMin());
+ EastNorth eaMax = Main.getProjection().latlon2eastNorth(bounds.getMax());
double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX();
double rasterSizeY = communeBBox.max.getY() - communeBBox.min.getY();
double ratio = rasterSizeY/rasterSizeX;
diff --git a/colorscheme/build.xml b/colorscheme/build.xml
index c804c2d..850013e 100644
--- a/colorscheme/build.xml
+++ b/colorscheme/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the colorscheme plugin
**
@@ -25,163 +25,157 @@
**
-->
<project name="colorscheme" default="dist" basedir=".">
-
-
- <property name="commit.message" value="Uses new constructor for Plugin" />
- <property name="plugin.main.version" value="3835" />
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}">
- <fileset dir="src">
- <include name="*.xml"/>
- </fileset>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Christof Dallermassl"/>
- <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin" />
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-)" />
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
+ <property name="commit.message" value="Uses new constructor for Plugin"/>
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}">
+ <fileset dir="src">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Christof Dallermassl"/>
+ <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in preferences and ''Map Settings'' (strange but true :-)"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
***** Properties of published ${plugin.jar} *****
-Commit message : '${commit.message}'
+Commit message : '${commit.message}'
Plugin-Mainversion: ${plugin.main.version}
JOSM build version: ${coreversion.info.entry.revision}
Plugin-Version : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****
-
+***** / Properties of published ${plugin.jar} *****
+
Now commiting ${plugin.jar} ...
</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/colorscheme/data/ar.lang b/colorscheme/data/ar.lang
new file mode 100644
index 0000000..f4141b8
Binary files /dev/null and b/colorscheme/data/ar.lang differ
diff --git a/colorscheme/data/bg.lang b/colorscheme/data/bg.lang
new file mode 100644
index 0000000..8a213cb
Binary files /dev/null and b/colorscheme/data/bg.lang differ
diff --git a/colorscheme/data/cs.lang b/colorscheme/data/cs.lang
new file mode 100644
index 0000000..9ada444
Binary files /dev/null and b/colorscheme/data/cs.lang differ
diff --git a/colorscheme/data/da.lang b/colorscheme/data/da.lang
new file mode 100644
index 0000000..4187f5e
Binary files /dev/null and b/colorscheme/data/da.lang differ
diff --git a/colorscheme/data/de.lang b/colorscheme/data/de.lang
new file mode 100644
index 0000000..1eedf4f
Binary files /dev/null and b/colorscheme/data/de.lang differ
diff --git a/colorscheme/data/el.lang b/colorscheme/data/el.lang
new file mode 100644
index 0000000..e67f117
Binary files /dev/null and b/colorscheme/data/el.lang differ
diff --git a/colorscheme/data/en.lang b/colorscheme/data/en.lang
new file mode 100644
index 0000000..21df9b6
Binary files /dev/null and b/colorscheme/data/en.lang differ
diff --git a/colorscheme/data/en_AU.lang b/colorscheme/data/en_AU.lang
new file mode 100644
index 0000000..9243d71
Binary files /dev/null and b/colorscheme/data/en_AU.lang differ
diff --git a/colorscheme/data/en_GB.lang b/colorscheme/data/en_GB.lang
new file mode 100644
index 0000000..9243d71
Binary files /dev/null and b/colorscheme/data/en_GB.lang differ
diff --git a/colorscheme/data/es.lang b/colorscheme/data/es.lang
new file mode 100644
index 0000000..a40fbb6
Binary files /dev/null and b/colorscheme/data/es.lang differ
diff --git a/colorscheme/data/et.lang b/colorscheme/data/et.lang
new file mode 100644
index 0000000..58d6a31
Binary files /dev/null and b/colorscheme/data/et.lang differ
diff --git a/colorscheme/data/eu.lang b/colorscheme/data/eu.lang
new file mode 100644
index 0000000..d611fab
Binary files /dev/null and b/colorscheme/data/eu.lang differ
diff --git a/colorscheme/data/fi.lang b/colorscheme/data/fi.lang
new file mode 100644
index 0000000..fbee5d7
Binary files /dev/null and b/colorscheme/data/fi.lang differ
diff --git a/colorscheme/data/fr.lang b/colorscheme/data/fr.lang
new file mode 100644
index 0000000..366a287
Binary files /dev/null and b/colorscheme/data/fr.lang differ
diff --git a/colorscheme/data/gl.lang b/colorscheme/data/gl.lang
new file mode 100644
index 0000000..3f18647
Binary files /dev/null and b/colorscheme/data/gl.lang differ
diff --git a/colorscheme/data/he.lang b/colorscheme/data/he.lang
new file mode 100644
index 0000000..0782a83
Binary files /dev/null and b/colorscheme/data/he.lang differ
diff --git a/colorscheme/data/id.lang b/colorscheme/data/id.lang
new file mode 100644
index 0000000..c8138da
Binary files /dev/null and b/colorscheme/data/id.lang differ
diff --git a/colorscheme/data/is.lang b/colorscheme/data/is.lang
new file mode 100644
index 0000000..1fb0fc1
Binary files /dev/null and b/colorscheme/data/is.lang differ
diff --git a/colorscheme/data/it.lang b/colorscheme/data/it.lang
new file mode 100644
index 0000000..e869edf
Binary files /dev/null and b/colorscheme/data/it.lang differ
diff --git a/colorscheme/data/ja.lang b/colorscheme/data/ja.lang
new file mode 100644
index 0000000..913b679
Binary files /dev/null and b/colorscheme/data/ja.lang differ
diff --git a/colorscheme/data/nb.lang b/colorscheme/data/nb.lang
new file mode 100644
index 0000000..581f257
Binary files /dev/null and b/colorscheme/data/nb.lang differ
diff --git a/colorscheme/data/nl.lang b/colorscheme/data/nl.lang
new file mode 100644
index 0000000..eae186f
Binary files /dev/null and b/colorscheme/data/nl.lang differ
diff --git a/colorscheme/data/pl.lang b/colorscheme/data/pl.lang
new file mode 100644
index 0000000..43b6df6
Binary files /dev/null and b/colorscheme/data/pl.lang differ
diff --git a/colorscheme/data/pt_BR.lang b/colorscheme/data/pt_BR.lang
new file mode 100644
index 0000000..d50550c
Binary files /dev/null and b/colorscheme/data/pt_BR.lang differ
diff --git a/colorscheme/data/ru.lang b/colorscheme/data/ru.lang
new file mode 100644
index 0000000..05e7460
Binary files /dev/null and b/colorscheme/data/ru.lang differ
diff --git a/colorscheme/data/sk.lang b/colorscheme/data/sk.lang
new file mode 100644
index 0000000..f58adfd
Binary files /dev/null and b/colorscheme/data/sk.lang differ
diff --git a/colorscheme/data/sv.lang b/colorscheme/data/sv.lang
new file mode 100644
index 0000000..d9c1c2e
Binary files /dev/null and b/colorscheme/data/sv.lang differ
diff --git a/colorscheme/data/tr.lang b/colorscheme/data/tr.lang
new file mode 100644
index 0000000..9d21923
Binary files /dev/null and b/colorscheme/data/tr.lang differ
diff --git a/colorscheme/data/uk.lang b/colorscheme/data/uk.lang
new file mode 100644
index 0000000..5da8a53
Binary files /dev/null and b/colorscheme/data/uk.lang differ
diff --git a/colorscheme/data/zh_CN.lang b/colorscheme/data/zh_CN.lang
new file mode 100644
index 0000000..5e9c551
Binary files /dev/null and b/colorscheme/data/zh_CN.lang differ
diff --git a/colorscheme/data/zh_TW.lang b/colorscheme/data/zh_TW.lang
new file mode 100644
index 0000000..cee60b4
Binary files /dev/null and b/colorscheme/data/zh_TW.lang differ
diff --git a/editgpx/build.xml b/editgpx/build.xml
index b81c587..243eee1 100644
--- a/editgpx/build.xml
+++ b/editgpx/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the editgpx plugin
**
@@ -25,126 +25,121 @@
**
-->
<project name="editgpx" default="dist" basedir=".">
-
-
- <property name="commit.message" value="Changed constructor signature of plugin main class" />
- <property name="plugin.main.version" value="3835" />
-
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Martin Garbe" />
- <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.editgpx.EditGpxPlugin" />
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast." />
- <attribute name="Plugin-Icon" value="images/mapmode/editgpx_mode.png"/>
- <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx" />
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}" />
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <!-- <arg value="../../core"/>-->
- <arg value="../JOSM"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
+ <property name="commit.message" value="Changed constructor signature of plugin main class"/>
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Martin Garbe"/>
+ <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.editgpx.EditGpxPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast."/>
+ <attribute name="Plugin-Icon" value="images/mapmode/editgpx_mode.png"/>
+ <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <!-- <arg value="../../core"/>-->
+ <arg value="../JOSM"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
***** Properties of published ${plugin.jar} *****
Commit message : '${commit.message}'
Plugin-Mainversion: ${plugin.main.version}
@@ -154,36 +149,34 @@ Plugin-Version : ${version.entry.commit.revision}
Now commiting ${plugin.jar} ...
</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/editgpx/data/ar.lang b/editgpx/data/ar.lang
new file mode 100644
index 0000000..7d22d90
Binary files /dev/null and b/editgpx/data/ar.lang differ
diff --git a/editgpx/data/bg.lang b/editgpx/data/bg.lang
new file mode 100644
index 0000000..5018828
Binary files /dev/null and b/editgpx/data/bg.lang differ
diff --git a/editgpx/data/cs.lang b/editgpx/data/cs.lang
new file mode 100644
index 0000000..dd58f54
Binary files /dev/null and b/editgpx/data/cs.lang differ
diff --git a/editgpx/data/da.lang b/editgpx/data/da.lang
new file mode 100644
index 0000000..416cfbb
Binary files /dev/null and b/editgpx/data/da.lang differ
diff --git a/editgpx/data/de.lang b/editgpx/data/de.lang
new file mode 100644
index 0000000..7f0b937
Binary files /dev/null and b/editgpx/data/de.lang differ
diff --git a/editgpx/data/el.lang b/editgpx/data/el.lang
new file mode 100644
index 0000000..1059afa
Binary files /dev/null and b/editgpx/data/el.lang differ
diff --git a/editgpx/data/en.lang b/editgpx/data/en.lang
new file mode 100644
index 0000000..1ba49f5
Binary files /dev/null and b/editgpx/data/en.lang differ
diff --git a/editgpx/data/en_AU.lang b/editgpx/data/en_AU.lang
new file mode 100644
index 0000000..db7e4e6
Binary files /dev/null and b/editgpx/data/en_AU.lang differ
diff --git a/editgpx/data/en_GB.lang b/editgpx/data/en_GB.lang
new file mode 100644
index 0000000..db7e4e6
Binary files /dev/null and b/editgpx/data/en_GB.lang differ
diff --git a/editgpx/data/es.lang b/editgpx/data/es.lang
new file mode 100644
index 0000000..935451a
Binary files /dev/null and b/editgpx/data/es.lang differ
diff --git a/editgpx/data/et.lang b/editgpx/data/et.lang
new file mode 100644
index 0000000..7c13e8f
Binary files /dev/null and b/editgpx/data/et.lang differ
diff --git a/editgpx/data/fi.lang b/editgpx/data/fi.lang
new file mode 100644
index 0000000..762f45b
Binary files /dev/null and b/editgpx/data/fi.lang differ
diff --git a/editgpx/data/fr.lang b/editgpx/data/fr.lang
new file mode 100644
index 0000000..37d8c19
Binary files /dev/null and b/editgpx/data/fr.lang differ
diff --git a/editgpx/data/gl.lang b/editgpx/data/gl.lang
new file mode 100644
index 0000000..e8207a1
Binary files /dev/null and b/editgpx/data/gl.lang differ
diff --git a/editgpx/data/he.lang b/editgpx/data/he.lang
new file mode 100644
index 0000000..44bea7b
Binary files /dev/null and b/editgpx/data/he.lang differ
diff --git a/editgpx/data/id.lang b/editgpx/data/id.lang
new file mode 100644
index 0000000..db7e4e6
Binary files /dev/null and b/editgpx/data/id.lang differ
diff --git a/editgpx/data/is.lang b/editgpx/data/is.lang
new file mode 100644
index 0000000..06d5395
Binary files /dev/null and b/editgpx/data/is.lang differ
diff --git a/editgpx/data/it.lang b/editgpx/data/it.lang
new file mode 100644
index 0000000..dcfde01
Binary files /dev/null and b/editgpx/data/it.lang differ
diff --git a/editgpx/data/ja.lang b/editgpx/data/ja.lang
new file mode 100644
index 0000000..27b9d46
Binary files /dev/null and b/editgpx/data/ja.lang differ
diff --git a/editgpx/data/nb.lang b/editgpx/data/nb.lang
new file mode 100644
index 0000000..bdcf685
Binary files /dev/null and b/editgpx/data/nb.lang differ
diff --git a/editgpx/data/nl.lang b/editgpx/data/nl.lang
new file mode 100644
index 0000000..4bcdf8f
Binary files /dev/null and b/editgpx/data/nl.lang differ
diff --git a/editgpx/data/pl.lang b/editgpx/data/pl.lang
new file mode 100644
index 0000000..fbaa9c3
Binary files /dev/null and b/editgpx/data/pl.lang differ
diff --git a/editgpx/data/pt_BR.lang b/editgpx/data/pt_BR.lang
new file mode 100644
index 0000000..670fdca
Binary files /dev/null and b/editgpx/data/pt_BR.lang differ
diff --git a/editgpx/data/ru.lang b/editgpx/data/ru.lang
new file mode 100644
index 0000000..37f7efc
Binary files /dev/null and b/editgpx/data/ru.lang differ
diff --git a/editgpx/data/sk.lang b/editgpx/data/sk.lang
new file mode 100644
index 0000000..e78e317
Binary files /dev/null and b/editgpx/data/sk.lang differ
diff --git a/editgpx/data/sv.lang b/editgpx/data/sv.lang
new file mode 100644
index 0000000..2fff4bf
Binary files /dev/null and b/editgpx/data/sv.lang differ
diff --git a/editgpx/data/tr.lang b/editgpx/data/tr.lang
new file mode 100644
index 0000000..ac55f06
Binary files /dev/null and b/editgpx/data/tr.lang differ
diff --git a/editgpx/data/uk.lang b/editgpx/data/uk.lang
new file mode 100644
index 0000000..50629e2
Binary files /dev/null and b/editgpx/data/uk.lang differ
diff --git a/editgpx/data/zh_CN.lang b/editgpx/data/zh_CN.lang
new file mode 100644
index 0000000..18441b2
Binary files /dev/null and b/editgpx/data/zh_CN.lang differ
diff --git a/editgpx/data/zh_TW.lang b/editgpx/data/zh_TW.lang
new file mode 100644
index 0000000..475c70a
Binary files /dev/null and b/editgpx/data/zh_TW.lang differ
diff --git a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
index 337d0e4..4f57c0a 100644
--- a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
+++ b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
@@ -57,20 +57,16 @@ class GPXLayerImportAction extends AbstractAction {
final JList layerList = new JList(dModel);
Collection<Layer> data = Main.map.mapView.getAllLayers();
- Layer lastLayer = null;
int layerCnt = 0;
for (Layer l : data){
if(l instanceof GpxLayer){
dModel.addElement(l);
- lastLayer = l;
layerCnt++;
}
}
- if(layerCnt == 1){
- layerList.setSelectedValue(lastLayer, true);
- }
if(layerCnt > 0){
+ layerList.setSelectionInterval(0, layerCnt-1);
layerList.setCellRenderer(new DefaultListCellRenderer(){
@Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Layer layer = (Layer)value;
@@ -102,10 +98,11 @@ class GPXLayerImportAction extends AbstractAction {
return;
}
- GpxLayer gpx = (GpxLayer)layerList.getSelectedValue();
-
- synchronized(importing) {
- this.data.load(gpx.data, dropFirst.isSelected());
+ for (Object o : layerList.getSelectedValues()) {
+ GpxLayer gpx = (GpxLayer )o;
+ synchronized(importing) {
+ this.data.load(gpx.data, dropFirst.isSelected());
+ }
}
Main.map.mapView.repaint();
diff --git a/lakewalker/build.xml b/lakewalker/build.xml
index 032d74b..40c4941 100644
--- a/lakewalker/build.xml
+++ b/lakewalker/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the lakewalker plugin
**
@@ -25,162 +25,157 @@
**
-->
<project name="lakewalker" default="dist" basedir=".">
-
- <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
- <property name="plugin.main.version" value="3835" />
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Brent Easton, Jason Reid"/>
- <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerApp"/>
- <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin" />
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Helps vectorizing WMS images." />
- <attribute name="Plugin-Icon" value="images/lakewalker-sml.png"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Brent Easton, Jason Reid"/>
+ <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerApp"/>
+ <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Helps vectorizing WMS images."/>
+ <attribute name="Plugin-Icon" value="images/lakewalker-sml.png"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/lakewalker/data/ar.lang b/lakewalker/data/ar.lang
new file mode 100644
index 0000000..740cb9e
Binary files /dev/null and b/lakewalker/data/ar.lang differ
diff --git a/lakewalker/data/bg.lang b/lakewalker/data/bg.lang
new file mode 100644
index 0000000..2617840
Binary files /dev/null and b/lakewalker/data/bg.lang differ
diff --git a/lakewalker/data/cs.lang b/lakewalker/data/cs.lang
new file mode 100644
index 0000000..6e76f8e
Binary files /dev/null and b/lakewalker/data/cs.lang differ
diff --git a/lakewalker/data/da.lang b/lakewalker/data/da.lang
new file mode 100644
index 0000000..dc2bf7b
Binary files /dev/null and b/lakewalker/data/da.lang differ
diff --git a/lakewalker/data/de.lang b/lakewalker/data/de.lang
new file mode 100644
index 0000000..8a700c4
Binary files /dev/null and b/lakewalker/data/de.lang differ
diff --git a/lakewalker/data/el.lang b/lakewalker/data/el.lang
new file mode 100644
index 0000000..e19bf72
Binary files /dev/null and b/lakewalker/data/el.lang differ
diff --git a/lakewalker/data/en.lang b/lakewalker/data/en.lang
new file mode 100644
index 0000000..fd577f8
Binary files /dev/null and b/lakewalker/data/en.lang differ
diff --git a/lakewalker/data/en_AU.lang b/lakewalker/data/en_AU.lang
new file mode 100644
index 0000000..ee8bfda
Binary files /dev/null and b/lakewalker/data/en_AU.lang differ
diff --git a/lakewalker/data/en_GB.lang b/lakewalker/data/en_GB.lang
new file mode 100644
index 0000000..ee8bfda
Binary files /dev/null and b/lakewalker/data/en_GB.lang differ
diff --git a/lakewalker/data/es.lang b/lakewalker/data/es.lang
new file mode 100644
index 0000000..40a2065
Binary files /dev/null and b/lakewalker/data/es.lang differ
diff --git a/lakewalker/data/et.lang b/lakewalker/data/et.lang
new file mode 100644
index 0000000..31164e2
Binary files /dev/null and b/lakewalker/data/et.lang differ
diff --git a/lakewalker/data/eu.lang b/lakewalker/data/eu.lang
new file mode 100644
index 0000000..562feb2
Binary files /dev/null and b/lakewalker/data/eu.lang differ
diff --git a/lakewalker/data/fi.lang b/lakewalker/data/fi.lang
new file mode 100644
index 0000000..7d01b77
Binary files /dev/null and b/lakewalker/data/fi.lang differ
diff --git a/lakewalker/data/fr.lang b/lakewalker/data/fr.lang
new file mode 100644
index 0000000..04d25ea
Binary files /dev/null and b/lakewalker/data/fr.lang differ
diff --git a/lakewalker/data/gl.lang b/lakewalker/data/gl.lang
new file mode 100644
index 0000000..c88a6e9
Binary files /dev/null and b/lakewalker/data/gl.lang differ
diff --git a/lakewalker/data/he.lang b/lakewalker/data/he.lang
new file mode 100644
index 0000000..cce281b
Binary files /dev/null and b/lakewalker/data/he.lang differ
diff --git a/lakewalker/data/id.lang b/lakewalker/data/id.lang
new file mode 100644
index 0000000..ec79101
Binary files /dev/null and b/lakewalker/data/id.lang differ
diff --git a/lakewalker/data/is.lang b/lakewalker/data/is.lang
new file mode 100644
index 0000000..b074ca1
Binary files /dev/null and b/lakewalker/data/is.lang differ
diff --git a/lakewalker/data/it.lang b/lakewalker/data/it.lang
new file mode 100644
index 0000000..99cc49f
Binary files /dev/null and b/lakewalker/data/it.lang differ
diff --git a/lakewalker/data/ja.lang b/lakewalker/data/ja.lang
new file mode 100644
index 0000000..b733925
Binary files /dev/null and b/lakewalker/data/ja.lang differ
diff --git a/lakewalker/data/nb.lang b/lakewalker/data/nb.lang
new file mode 100644
index 0000000..a8553a4
Binary files /dev/null and b/lakewalker/data/nb.lang differ
diff --git a/lakewalker/data/nl.lang b/lakewalker/data/nl.lang
new file mode 100644
index 0000000..d67e842
Binary files /dev/null and b/lakewalker/data/nl.lang differ
diff --git a/lakewalker/data/pl.lang b/lakewalker/data/pl.lang
new file mode 100644
index 0000000..8a9e6f7
Binary files /dev/null and b/lakewalker/data/pl.lang differ
diff --git a/lakewalker/data/pt_BR.lang b/lakewalker/data/pt_BR.lang
new file mode 100644
index 0000000..4e3e5e6
Binary files /dev/null and b/lakewalker/data/pt_BR.lang differ
diff --git a/lakewalker/data/ru.lang b/lakewalker/data/ru.lang
new file mode 100644
index 0000000..0a9137c
Binary files /dev/null and b/lakewalker/data/ru.lang differ
diff --git a/lakewalker/data/sk.lang b/lakewalker/data/sk.lang
new file mode 100644
index 0000000..519f7b4
Binary files /dev/null and b/lakewalker/data/sk.lang differ
diff --git a/lakewalker/data/sv.lang b/lakewalker/data/sv.lang
new file mode 100644
index 0000000..0f1f985
Binary files /dev/null and b/lakewalker/data/sv.lang differ
diff --git a/lakewalker/data/tr.lang b/lakewalker/data/tr.lang
new file mode 100644
index 0000000..30e1af0
Binary files /dev/null and b/lakewalker/data/tr.lang differ
diff --git a/lakewalker/data/uk.lang b/lakewalker/data/uk.lang
new file mode 100644
index 0000000..57354a1
Binary files /dev/null and b/lakewalker/data/uk.lang differ
diff --git a/lakewalker/data/zh_CN.lang b/lakewalker/data/zh_CN.lang
new file mode 100644
index 0000000..56649b1
Binary files /dev/null and b/lakewalker/data/zh_CN.lang differ
diff --git a/lakewalker/data/zh_TW.lang b/lakewalker/data/zh_TW.lang
new file mode 100644
index 0000000..f067f35
Binary files /dev/null and b/lakewalker/data/zh_TW.lang differ
diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java
index 6937a13..a4d6f8b 100644
--- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java
+++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java
@@ -66,7 +66,7 @@ public class Lakewalker {
} else if(direction.equals("Southeast") || direction.equals("southeast")){
i = 7;
} else {
- throw new ArrayIndexOutOfBoundsException(tr("Direction index '{0}' not found",direction));
+ throw new ArrayIndexOutOfBoundsException(tr("Direction index ''{0}'' not found",direction));
}
return i;
}
diff --git a/livegps/build.xml b/livegps/build.xml
index 2ab917d..36920ce 100644
--- a/livegps/build.xml
+++ b/livegps/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the livegps plugin
**
@@ -25,165 +25,158 @@
**
-->
<project name="livegps" default="dist" basedir=".">
+ <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Frederik Ramm"/>
+ <attribute name="Plugin-Class" value="livegps.LiveGpsPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Support live GPS input (moving dot) through a connection to gpsd server."/>
+ <attribute name="Plugin-Icon" value="images/dialogs/livegps.png"/>
+ <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/LiveGPS"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Stage" value="50"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
- <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
- <property name="plugin.main.version" value="3835" />
-
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Frederik Ramm"/>
- <attribute name="Plugin-Class" value="livegps.LiveGpsPlugin"/>
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Support live GPS input (moving dot) through a connection to gpsd server."/>
- <attribute name="Plugin-Icon" value="images/dialogs/livegps.png"/>
- <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/LiveGPS"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Stage" value="50"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/livegps/data/ar.lang b/livegps/data/ar.lang
new file mode 100644
index 0000000..238bfdc
Binary files /dev/null and b/livegps/data/ar.lang differ
diff --git a/livegps/data/bg.lang b/livegps/data/bg.lang
new file mode 100644
index 0000000..02b8ae4
Binary files /dev/null and b/livegps/data/bg.lang differ
diff --git a/livegps/data/cs.lang b/livegps/data/cs.lang
new file mode 100644
index 0000000..70447c2
Binary files /dev/null and b/livegps/data/cs.lang differ
diff --git a/livegps/data/da.lang b/livegps/data/da.lang
new file mode 100644
index 0000000..db8fb51
Binary files /dev/null and b/livegps/data/da.lang differ
diff --git a/livegps/data/de.lang b/livegps/data/de.lang
new file mode 100644
index 0000000..7a77333
Binary files /dev/null and b/livegps/data/de.lang differ
diff --git a/livegps/data/el.lang b/livegps/data/el.lang
new file mode 100644
index 0000000..25c2d9d
Binary files /dev/null and b/livegps/data/el.lang differ
diff --git a/livegps/data/en.lang b/livegps/data/en.lang
new file mode 100644
index 0000000..82c3d39
Binary files /dev/null and b/livegps/data/en.lang differ
diff --git a/livegps/data/en_AU.lang b/livegps/data/en_AU.lang
new file mode 100644
index 0000000..24d9737
Binary files /dev/null and b/livegps/data/en_AU.lang differ
diff --git a/livegps/data/en_GB.lang b/livegps/data/en_GB.lang
new file mode 100644
index 0000000..24d9737
Binary files /dev/null and b/livegps/data/en_GB.lang differ
diff --git a/livegps/data/es.lang b/livegps/data/es.lang
new file mode 100644
index 0000000..4b77f35
Binary files /dev/null and b/livegps/data/es.lang differ
diff --git a/livegps/data/et.lang b/livegps/data/et.lang
new file mode 100644
index 0000000..b6cba80
Binary files /dev/null and b/livegps/data/et.lang differ
diff --git a/livegps/data/eu.lang b/livegps/data/eu.lang
new file mode 100644
index 0000000..11bafee
Binary files /dev/null and b/livegps/data/eu.lang differ
diff --git a/livegps/data/fi.lang b/livegps/data/fi.lang
new file mode 100644
index 0000000..2ec8aca
Binary files /dev/null and b/livegps/data/fi.lang differ
diff --git a/livegps/data/fr.lang b/livegps/data/fr.lang
new file mode 100644
index 0000000..6ed3411
Binary files /dev/null and b/livegps/data/fr.lang differ
diff --git a/livegps/data/gl.lang b/livegps/data/gl.lang
new file mode 100644
index 0000000..4f2baa8
Binary files /dev/null and b/livegps/data/gl.lang differ
diff --git a/livegps/data/he.lang b/livegps/data/he.lang
new file mode 100644
index 0000000..deb6720
Binary files /dev/null and b/livegps/data/he.lang differ
diff --git a/livegps/data/id.lang b/livegps/data/id.lang
new file mode 100644
index 0000000..b47024e
Binary files /dev/null and b/livegps/data/id.lang differ
diff --git a/livegps/data/is.lang b/livegps/data/is.lang
new file mode 100644
index 0000000..d912b59
Binary files /dev/null and b/livegps/data/is.lang differ
diff --git a/livegps/data/it.lang b/livegps/data/it.lang
new file mode 100644
index 0000000..fcdfe85
Binary files /dev/null and b/livegps/data/it.lang differ
diff --git a/livegps/data/ja.lang b/livegps/data/ja.lang
new file mode 100644
index 0000000..b462506
Binary files /dev/null and b/livegps/data/ja.lang differ
diff --git a/livegps/data/nb.lang b/livegps/data/nb.lang
new file mode 100644
index 0000000..b85fe35
Binary files /dev/null and b/livegps/data/nb.lang differ
diff --git a/livegps/data/nl.lang b/livegps/data/nl.lang
new file mode 100644
index 0000000..c12fc72
Binary files /dev/null and b/livegps/data/nl.lang differ
diff --git a/livegps/data/pl.lang b/livegps/data/pl.lang
new file mode 100644
index 0000000..1c7da9d
Binary files /dev/null and b/livegps/data/pl.lang differ
diff --git a/livegps/data/pt_BR.lang b/livegps/data/pt_BR.lang
new file mode 100644
index 0000000..96376eb
Binary files /dev/null and b/livegps/data/pt_BR.lang differ
diff --git a/livegps/data/ru.lang b/livegps/data/ru.lang
new file mode 100644
index 0000000..bba9441
Binary files /dev/null and b/livegps/data/ru.lang differ
diff --git a/livegps/data/sk.lang b/livegps/data/sk.lang
new file mode 100644
index 0000000..cce2164
Binary files /dev/null and b/livegps/data/sk.lang differ
diff --git a/livegps/data/sv.lang b/livegps/data/sv.lang
new file mode 100644
index 0000000..d6df7da
Binary files /dev/null and b/livegps/data/sv.lang differ
diff --git a/livegps/data/tr.lang b/livegps/data/tr.lang
new file mode 100644
index 0000000..fc380af
Binary files /dev/null and b/livegps/data/tr.lang differ
diff --git a/livegps/data/uk.lang b/livegps/data/uk.lang
new file mode 100644
index 0000000..20ff706
Binary files /dev/null and b/livegps/data/uk.lang differ
diff --git a/livegps/data/zh_CN.lang b/livegps/data/zh_CN.lang
new file mode 100644
index 0000000..bf459c9
Binary files /dev/null and b/livegps/data/zh_CN.lang differ
diff --git a/livegps/data/zh_TW.lang b/livegps/data/zh_TW.lang
new file mode 100644
index 0000000..7ad1898
Binary files /dev/null and b/livegps/data/zh_TW.lang differ
diff --git a/livegps/src/livegps/LiveGpsData.java b/livegps/src/livegps/LiveGpsData.java
index 56df8f6..6d964a0 100644
--- a/livegps/src/livegps/LiveGpsData.java
+++ b/livegps/src/livegps/LiveGpsData.java
@@ -9,6 +9,7 @@ import java.awt.Point;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
/**
@@ -163,7 +164,8 @@ public class LiveGpsData {
public Way getWay() {
if(way == null && Main.map != null && Main.map.mapView != null) {
Point xy = Main.map.mapView.getPoint(getLatLon());
- way = Main.map.mapView.getNearestWay(xy);
+ way = Main.map.mapView.getNearestWay(xy,
+ OsmPrimitive.isUsablePredicate);
}
return way;
}
diff --git a/livegps/src/livegps/LiveGpsPlugin.java b/livegps/src/livegps/LiveGpsPlugin.java
index b64bc00..bb4de02 100644
--- a/livegps/src/livegps/LiveGpsPlugin.java
+++ b/livegps/src/livegps/LiveGpsPlugin.java
@@ -97,7 +97,8 @@ public class LiveGpsPlugin extends Plugin implements LayerChangeListener {
}
public void layerRemoved(Layer oldLayer) {
- assert (oldLayer == lgpslayer);
+ if (oldLayer != lgpslayer)
+ return;
enableTracking(false);
lgpscapture.setSelected(false);
diff --git a/measurement/build.xml b/measurement/build.xml
index 9dcd049..fb2735b 100644
--- a/measurement/build.xml
+++ b/measurement/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the measurement plugin
**
@@ -25,162 +25,156 @@
**
-->
<project name="measurement" default="dist" basedir=".">
+ <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Raphael Mack, Reza Mohammadi"/>
+ <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments, area surrounded by a (simple) closed way and create measurement paths (which also can be imported from a gps layer)."/>
+ <attribute name="Plugin-Icon" value="images/dialogs/measure.png"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
- <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
- <property name="plugin.main.version" value="3835" />
-
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Raphael Mack, Reza Mohammadi"/>
- <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin"/>
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments, area surrounded by a (simple) closed way and create measurement paths (which also can be imported from a gps layer)."/>
- <attribute name="Plugin-Icon" value="images/dialogs/measure.png"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/measurement/data/ar.lang b/measurement/data/ar.lang
new file mode 100644
index 0000000..4c181ea
Binary files /dev/null and b/measurement/data/ar.lang differ
diff --git a/measurement/data/bg.lang b/measurement/data/bg.lang
new file mode 100644
index 0000000..88e8382
Binary files /dev/null and b/measurement/data/bg.lang differ
diff --git a/measurement/data/cs.lang b/measurement/data/cs.lang
new file mode 100644
index 0000000..22fee07
Binary files /dev/null and b/measurement/data/cs.lang differ
diff --git a/measurement/data/da.lang b/measurement/data/da.lang
new file mode 100644
index 0000000..3562752
Binary files /dev/null and b/measurement/data/da.lang differ
diff --git a/measurement/data/de.lang b/measurement/data/de.lang
new file mode 100644
index 0000000..fc7ee74
Binary files /dev/null and b/measurement/data/de.lang differ
diff --git a/measurement/data/el.lang b/measurement/data/el.lang
new file mode 100644
index 0000000..8962fbb
Binary files /dev/null and b/measurement/data/el.lang differ
diff --git a/measurement/data/en.lang b/measurement/data/en.lang
new file mode 100644
index 0000000..a48a3cc
Binary files /dev/null and b/measurement/data/en.lang differ
diff --git a/measurement/data/en_AU.lang b/measurement/data/en_AU.lang
new file mode 100644
index 0000000..ca05c9d
Binary files /dev/null and b/measurement/data/en_AU.lang differ
diff --git a/measurement/data/en_GB.lang b/measurement/data/en_GB.lang
new file mode 100644
index 0000000..ca05c9d
Binary files /dev/null and b/measurement/data/en_GB.lang differ
diff --git a/measurement/data/es.lang b/measurement/data/es.lang
new file mode 100644
index 0000000..259f6a0
Binary files /dev/null and b/measurement/data/es.lang differ
diff --git a/measurement/data/et.lang b/measurement/data/et.lang
new file mode 100644
index 0000000..f4f459b
Binary files /dev/null and b/measurement/data/et.lang differ
diff --git a/measurement/data/eu.lang b/measurement/data/eu.lang
new file mode 100644
index 0000000..2103100
Binary files /dev/null and b/measurement/data/eu.lang differ
diff --git a/measurement/data/fi.lang b/measurement/data/fi.lang
new file mode 100644
index 0000000..af18b34
Binary files /dev/null and b/measurement/data/fi.lang differ
diff --git a/measurement/data/fr.lang b/measurement/data/fr.lang
new file mode 100644
index 0000000..c308c97
Binary files /dev/null and b/measurement/data/fr.lang differ
diff --git a/measurement/data/gl.lang b/measurement/data/gl.lang
new file mode 100644
index 0000000..a3f37c1
Binary files /dev/null and b/measurement/data/gl.lang differ
diff --git a/measurement/data/he.lang b/measurement/data/he.lang
new file mode 100644
index 0000000..382fe6c
Binary files /dev/null and b/measurement/data/he.lang differ
diff --git a/measurement/data/is.lang b/measurement/data/is.lang
new file mode 100644
index 0000000..4b5f61f
Binary files /dev/null and b/measurement/data/is.lang differ
diff --git a/measurement/data/it.lang b/measurement/data/it.lang
new file mode 100644
index 0000000..ee2b0a3
Binary files /dev/null and b/measurement/data/it.lang differ
diff --git a/measurement/data/ja.lang b/measurement/data/ja.lang
new file mode 100644
index 0000000..f8c6cda
Binary files /dev/null and b/measurement/data/ja.lang differ
diff --git a/measurement/data/nb.lang b/measurement/data/nb.lang
new file mode 100644
index 0000000..685d72a
Binary files /dev/null and b/measurement/data/nb.lang differ
diff --git a/measurement/data/nl.lang b/measurement/data/nl.lang
new file mode 100644
index 0000000..e7e19e0
Binary files /dev/null and b/measurement/data/nl.lang differ
diff --git a/measurement/data/pl.lang b/measurement/data/pl.lang
new file mode 100644
index 0000000..1fdfcb1
Binary files /dev/null and b/measurement/data/pl.lang differ
diff --git a/measurement/data/pt_BR.lang b/measurement/data/pt_BR.lang
new file mode 100644
index 0000000..4daa858
Binary files /dev/null and b/measurement/data/pt_BR.lang differ
diff --git a/measurement/data/ru.lang b/measurement/data/ru.lang
new file mode 100644
index 0000000..7ef4f85
Binary files /dev/null and b/measurement/data/ru.lang differ
diff --git a/measurement/data/sk.lang b/measurement/data/sk.lang
new file mode 100644
index 0000000..329760d
Binary files /dev/null and b/measurement/data/sk.lang differ
diff --git a/measurement/data/sv.lang b/measurement/data/sv.lang
new file mode 100644
index 0000000..bb9e5ab
Binary files /dev/null and b/measurement/data/sv.lang differ
diff --git a/measurement/data/tr.lang b/measurement/data/tr.lang
new file mode 100644
index 0000000..be080ef
Binary files /dev/null and b/measurement/data/tr.lang differ
diff --git a/measurement/data/uk.lang b/measurement/data/uk.lang
new file mode 100644
index 0000000..cebdb07
Binary files /dev/null and b/measurement/data/uk.lang differ
diff --git a/measurement/data/zh_CN.lang b/measurement/data/zh_CN.lang
new file mode 100644
index 0000000..5778ec9
Binary files /dev/null and b/measurement/data/zh_CN.lang differ
diff --git a/measurement/data/zh_TW.lang b/measurement/data/zh_TW.lang
new file mode 100644
index 0000000..0f3a27d
Binary files /dev/null and b/measurement/data/zh_TW.lang differ
diff --git a/openvisible/build.xml b/openvisible/build.xml
index dc0dff3..2ba1f4f 100644
--- a/openvisible/build.xml
+++ b/openvisible/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the openvisible plugin.
**
@@ -28,165 +28,160 @@
**
-->
<project name="openvisible" default="dist" basedir=".">
-
- <!-- enter the SVN commit message -->
- <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml" />
- <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
- <property name="plugin.main.version" value="3835" />
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Christof Dallermassl"/>
- <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.openvisible.OpenVisiblePlugin"/>
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5"/>
- <attribute name="Plugin-Description" value="Allows opening gpx/osm files that intersect the currently visible screen area"/>
- <attribute name="Plugin-Icon" value="images/openvisible.png"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Stage" value="50"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ <!-- enter the SVN commit message -->
+ <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/>
+ <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Christof Dallermassl"/>
+ <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.openvisible.OpenVisiblePlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5"/>
+ <attribute name="Plugin-Description" value="Allows opening gpx/osm files that intersect the currently visible screen area"/>
+ <attribute name="Plugin-Icon" value="images/openvisible.png"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Stage" value="50"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/openvisible/data/ar.lang b/openvisible/data/ar.lang
new file mode 100644
index 0000000..3cfa706
Binary files /dev/null and b/openvisible/data/ar.lang differ
diff --git a/openvisible/data/bg.lang b/openvisible/data/bg.lang
new file mode 100644
index 0000000..2e3a539
Binary files /dev/null and b/openvisible/data/bg.lang differ
diff --git a/openvisible/data/cs.lang b/openvisible/data/cs.lang
new file mode 100644
index 0000000..d86c3f5
Binary files /dev/null and b/openvisible/data/cs.lang differ
diff --git a/openvisible/data/da.lang b/openvisible/data/da.lang
new file mode 100644
index 0000000..210bda0
Binary files /dev/null and b/openvisible/data/da.lang differ
diff --git a/openvisible/data/de.lang b/openvisible/data/de.lang
new file mode 100644
index 0000000..e96ca32
Binary files /dev/null and b/openvisible/data/de.lang differ
diff --git a/openvisible/data/el.lang b/openvisible/data/el.lang
new file mode 100644
index 0000000..2922ad9
Binary files /dev/null and b/openvisible/data/el.lang differ
diff --git a/openvisible/data/en.lang b/openvisible/data/en.lang
new file mode 100644
index 0000000..f74a345
Binary files /dev/null and b/openvisible/data/en.lang differ
diff --git a/openvisible/data/en_AU.lang b/openvisible/data/en_AU.lang
new file mode 100644
index 0000000..2b2e682
Binary files /dev/null and b/openvisible/data/en_AU.lang differ
diff --git a/openvisible/data/en_GB.lang b/openvisible/data/en_GB.lang
new file mode 100644
index 0000000..2b2e682
Binary files /dev/null and b/openvisible/data/en_GB.lang differ
diff --git a/openvisible/data/es.lang b/openvisible/data/es.lang
new file mode 100644
index 0000000..67b81d3
Binary files /dev/null and b/openvisible/data/es.lang differ
diff --git a/openvisible/data/et.lang b/openvisible/data/et.lang
new file mode 100644
index 0000000..30a3a8b
Binary files /dev/null and b/openvisible/data/et.lang differ
diff --git a/openvisible/data/eu.lang b/openvisible/data/eu.lang
new file mode 100644
index 0000000..c50e1b9
Binary files /dev/null and b/openvisible/data/eu.lang differ
diff --git a/openvisible/data/fi.lang b/openvisible/data/fi.lang
new file mode 100644
index 0000000..3f9cfdf
Binary files /dev/null and b/openvisible/data/fi.lang differ
diff --git a/openvisible/data/fr.lang b/openvisible/data/fr.lang
new file mode 100644
index 0000000..f8b614f
Binary files /dev/null and b/openvisible/data/fr.lang differ
diff --git a/openvisible/data/gl.lang b/openvisible/data/gl.lang
new file mode 100644
index 0000000..6ea4b01
Binary files /dev/null and b/openvisible/data/gl.lang differ
diff --git a/openvisible/data/he.lang b/openvisible/data/he.lang
new file mode 100644
index 0000000..766d4c5
Binary files /dev/null and b/openvisible/data/he.lang differ
diff --git a/openvisible/data/id.lang b/openvisible/data/id.lang
new file mode 100644
index 0000000..2b2e682
Binary files /dev/null and b/openvisible/data/id.lang differ
diff --git a/openvisible/data/is.lang b/openvisible/data/is.lang
new file mode 100644
index 0000000..7143b79
Binary files /dev/null and b/openvisible/data/is.lang differ
diff --git a/openvisible/data/it.lang b/openvisible/data/it.lang
new file mode 100644
index 0000000..d0a8fa1
Binary files /dev/null and b/openvisible/data/it.lang differ
diff --git a/openvisible/data/ja.lang b/openvisible/data/ja.lang
new file mode 100644
index 0000000..2673f53
Binary files /dev/null and b/openvisible/data/ja.lang differ
diff --git a/openvisible/data/nb.lang b/openvisible/data/nb.lang
new file mode 100644
index 0000000..dfa4aaa
Binary files /dev/null and b/openvisible/data/nb.lang differ
diff --git a/openvisible/data/nl.lang b/openvisible/data/nl.lang
new file mode 100644
index 0000000..0018e38
Binary files /dev/null and b/openvisible/data/nl.lang differ
diff --git a/openvisible/data/pl.lang b/openvisible/data/pl.lang
new file mode 100644
index 0000000..789df42
Binary files /dev/null and b/openvisible/data/pl.lang differ
diff --git a/openvisible/data/pt_BR.lang b/openvisible/data/pt_BR.lang
new file mode 100644
index 0000000..ce97f5b
Binary files /dev/null and b/openvisible/data/pt_BR.lang differ
diff --git a/openvisible/data/ru.lang b/openvisible/data/ru.lang
new file mode 100644
index 0000000..f0916dd
Binary files /dev/null and b/openvisible/data/ru.lang differ
diff --git a/openvisible/data/sk.lang b/openvisible/data/sk.lang
new file mode 100644
index 0000000..8d99a51
Binary files /dev/null and b/openvisible/data/sk.lang differ
diff --git a/openvisible/data/sv.lang b/openvisible/data/sv.lang
new file mode 100644
index 0000000..d92eda4
Binary files /dev/null and b/openvisible/data/sv.lang differ
diff --git a/openvisible/data/tr.lang b/openvisible/data/tr.lang
new file mode 100644
index 0000000..4b193dc
Binary files /dev/null and b/openvisible/data/tr.lang differ
diff --git a/openvisible/data/uk.lang b/openvisible/data/uk.lang
new file mode 100644
index 0000000..2aa8203
Binary files /dev/null and b/openvisible/data/uk.lang differ
diff --git a/openvisible/data/zh_CN.lang b/openvisible/data/zh_CN.lang
new file mode 100644
index 0000000..d27a7df
Binary files /dev/null and b/openvisible/data/zh_CN.lang differ
diff --git a/openvisible/data/zh_TW.lang b/openvisible/data/zh_TW.lang
new file mode 100644
index 0000000..1342466
Binary files /dev/null and b/openvisible/data/zh_TW.lang differ
diff --git a/routing/build.xml b/routing/build.xml
index 82e63a7..15fc201 100644
--- a/routing/build.xml
+++ b/routing/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the routing plugin
**
@@ -25,181 +25,178 @@
**
-->
<project name="routing" default="dist" basedir=".">
+ <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
+ <property name="plugin.main.version" value="3835"/>
+ <!-- Define some properties -->
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="libdir" location="lib"/>
+ <property name="jgrapht" value="${libdir}/jgrapht-jdk1.5.jar"/>
+ <property name="log4j" value="${libdir}/log4j-1.2.15.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <!-- Some initializations for several other targets -->
+ <target name="init">
+ <mkdir dir="${plugin.dist.dir}"/>
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <!-- Compile sources -->
+ <target name="compile" depends="init" description="Compile sources">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ <classpath>
+ <pathelement location="${josm}"/>
+ <pathelement location="${jgrapht}"/>
+ <pathelement location="${log4j}"/>
+ </classpath>
+ </javac>
+ </target>
+ <!-- Generate distribution -->
+ <target name="dist" depends="compile,revision" description="Generate distribution">
+ <unjar dest="${plugin.build.dir}" src="${jgrapht}"/>
+ <unjar dest="${plugin.build.dir}" src="${log4j}"/>
+ <copy todir="${plugin.build.dir}/">
+ <fileset dir="resources">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Jose Vidal <vidalfree at gmail.com>, Juangui Jordán <juangui at gmail.com>, Hassan S <hassan.sabirin at gmail.com>"/>
+ <attribute name="Plugin-Class" value="com.innovant.josm.plugin.routing.RoutingPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Provides routing capabilities."/>
+ <attribute name="Plugin-Icon" value="images/preferences/routing.png"/>
+ <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Stage" value="50"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
- <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
- <property name="plugin.main.version" value="3835" />
-
- <!-- Define some properties -->
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="jgrapht" value="lib/jgrapht-jdk1.5.jar"/>
- <property name="log4j" value="lib/log4j-1.2.15.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <!-- Some initializations for several other targets -->
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <!-- Compile sources -->
- <target name="compile" depends="init" description="Compile sources">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <pathelement location="${josm}"/>
- <pathelement location="${jgrapht}"/>
- <pathelement location="${log4j}"/>
- </classpath>
- </javac>
- </target>
- <!-- Generate distribution -->
- <target name="dist" depends="compile,revision" description="Generate distribution">
- <unjar dest="${plugin.build.dir}" src="${jgrapht}"/>
- <unjar dest="${plugin.build.dir}" src="${log4j}"/>
- <copy todir="${plugin.build.dir}/">
- <fileset dir="resources">
- <include name="*.xml"/>
- </fileset>
- </copy>
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Jose Vidal <vidalfree at gmail.com>, Juangui Jordán <juangui at gmail.com>"/>
- <attribute name="Plugin-Class" value="com.innovant.josm.plugin.routing.RoutingPlugin"/>
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Provides routing capabilities."/>
- <attribute name="Plugin-Icon" value="images/preferences/routing.png"/>
- <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Stage" value="50"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/routing/data/ar.lang b/routing/data/ar.lang
new file mode 100644
index 0000000..179b271
Binary files /dev/null and b/routing/data/ar.lang differ
diff --git a/routing/data/bg.lang b/routing/data/bg.lang
new file mode 100644
index 0000000..9dab00c
Binary files /dev/null and b/routing/data/bg.lang differ
diff --git a/routing/data/cs.lang b/routing/data/cs.lang
new file mode 100644
index 0000000..2ea2b36
Binary files /dev/null and b/routing/data/cs.lang differ
diff --git a/routing/data/da.lang b/routing/data/da.lang
new file mode 100644
index 0000000..b67f877
Binary files /dev/null and b/routing/data/da.lang differ
diff --git a/routing/data/de.lang b/routing/data/de.lang
new file mode 100644
index 0000000..3f89bf0
Binary files /dev/null and b/routing/data/de.lang differ
diff --git a/routing/data/el.lang b/routing/data/el.lang
new file mode 100644
index 0000000..0136a97
Binary files /dev/null and b/routing/data/el.lang differ
diff --git a/routing/data/en.lang b/routing/data/en.lang
new file mode 100644
index 0000000..2c204de
Binary files /dev/null and b/routing/data/en.lang differ
diff --git a/routing/data/en_AU.lang b/routing/data/en_AU.lang
new file mode 100644
index 0000000..f0105ff
Binary files /dev/null and b/routing/data/en_AU.lang differ
diff --git a/routing/data/en_GB.lang b/routing/data/en_GB.lang
new file mode 100644
index 0000000..f0105ff
Binary files /dev/null and b/routing/data/en_GB.lang differ
diff --git a/routing/data/es.lang b/routing/data/es.lang
new file mode 100644
index 0000000..0199a50
Binary files /dev/null and b/routing/data/es.lang differ
diff --git a/routing/data/et.lang b/routing/data/et.lang
new file mode 100644
index 0000000..4acc24a
Binary files /dev/null and b/routing/data/et.lang differ
diff --git a/routing/data/eu.lang b/routing/data/eu.lang
new file mode 100644
index 0000000..cc05e2d
Binary files /dev/null and b/routing/data/eu.lang differ
diff --git a/routing/data/fi.lang b/routing/data/fi.lang
new file mode 100644
index 0000000..ebdb00e
Binary files /dev/null and b/routing/data/fi.lang differ
diff --git a/routing/data/fr.lang b/routing/data/fr.lang
new file mode 100644
index 0000000..61e3ef3
Binary files /dev/null and b/routing/data/fr.lang differ
diff --git a/routing/data/gl.lang b/routing/data/gl.lang
new file mode 100644
index 0000000..6ecb552
Binary files /dev/null and b/routing/data/gl.lang differ
diff --git a/routing/data/he.lang b/routing/data/he.lang
new file mode 100644
index 0000000..e4eb155
Binary files /dev/null and b/routing/data/he.lang differ
diff --git a/routing/data/id.lang b/routing/data/id.lang
new file mode 100644
index 0000000..cf0d5c7
Binary files /dev/null and b/routing/data/id.lang differ
diff --git a/routing/data/is.lang b/routing/data/is.lang
new file mode 100644
index 0000000..0d23520
Binary files /dev/null and b/routing/data/is.lang differ
diff --git a/routing/data/it.lang b/routing/data/it.lang
new file mode 100644
index 0000000..84ffd6b
Binary files /dev/null and b/routing/data/it.lang differ
diff --git a/routing/data/ja.lang b/routing/data/ja.lang
new file mode 100644
index 0000000..27872ba
Binary files /dev/null and b/routing/data/ja.lang differ
diff --git a/routing/data/nb.lang b/routing/data/nb.lang
new file mode 100644
index 0000000..503ab1f
Binary files /dev/null and b/routing/data/nb.lang differ
diff --git a/routing/data/nl.lang b/routing/data/nl.lang
new file mode 100644
index 0000000..f729bd9
Binary files /dev/null and b/routing/data/nl.lang differ
diff --git a/routing/data/pl.lang b/routing/data/pl.lang
new file mode 100644
index 0000000..1921ac2
Binary files /dev/null and b/routing/data/pl.lang differ
diff --git a/routing/data/pt_BR.lang b/routing/data/pt_BR.lang
new file mode 100644
index 0000000..8d953ab
Binary files /dev/null and b/routing/data/pt_BR.lang differ
diff --git a/routing/data/ru.lang b/routing/data/ru.lang
new file mode 100644
index 0000000..52e734e
Binary files /dev/null and b/routing/data/ru.lang differ
diff --git a/routing/data/sk.lang b/routing/data/sk.lang
new file mode 100644
index 0000000..22d2f82
Binary files /dev/null and b/routing/data/sk.lang differ
diff --git a/routing/data/sv.lang b/routing/data/sv.lang
new file mode 100644
index 0000000..10f8cc3
Binary files /dev/null and b/routing/data/sv.lang differ
diff --git a/routing/data/tr.lang b/routing/data/tr.lang
new file mode 100644
index 0000000..d4f2f48
Binary files /dev/null and b/routing/data/tr.lang differ
diff --git a/routing/data/uk.lang b/routing/data/uk.lang
new file mode 100644
index 0000000..60c0c60
Binary files /dev/null and b/routing/data/uk.lang differ
diff --git a/routing/data/zh_CN.lang b/routing/data/zh_CN.lang
new file mode 100644
index 0000000..c4b9d7f
Binary files /dev/null and b/routing/data/zh_CN.lang differ
diff --git a/routing/data/zh_TW.lang b/routing/data/zh_TW.lang
new file mode 100644
index 0000000..94b7207
Binary files /dev/null and b/routing/data/zh_TW.lang differ
diff --git a/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java b/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java
index ef5b316..d541008 100644
--- a/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java
+++ b/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java
@@ -48,6 +48,7 @@ import com.innovant.josm.jrt.osm.OsmEdge;
*
* @author Juangui
* @author Jose Vidal
+ * @author Hassan S
*/
public class RoutingGraph {
@@ -98,6 +99,29 @@ public class RoutingGraph {
private Graph<Node, OsmEdge> graph;
private RoutingGraphDelegator rgDelegator=null;
+
+ /**
+ * Graph getter
+ */
+ public Graph<Node, OsmEdge> getGraph(){
+ return graph;
+
+ }
+
+
+ private void addEdgeBidirectional( Way way, Node from, Node to){
+ addEdge(way,from,to);
+ addEdge(way,to,from);
+ }
+
+ private void addEdgeReverseOneway( Way way, Node from, Node to){
+ addEdge(way,to,from);
+ }
+
+ private void addEdgeNormalOneway( Way way, Node from, Node to){
+ addEdge(way,from,to);
+ }
+
/**
* Speeds
*/
@@ -130,23 +154,69 @@ public class RoutingGraph {
rgDelegator.setRouteType(this.routeType);
// iterate all ways and segments for all nodes:
for (Way way : data.getWays()) {
- if (way != null && !way.isDeleted() && this.isvalidWay(way)) {
- Node from = null;
- for (Node to : way.getNodes()) {
- // Ignore the node if deleted
- if (!to.isDeleted()) {
- graph.addVertex(to);
- if (from != null) {
- addEdge(way, from, to);
- if (!isOneWay(way)){
- addEdge(way, to, from);}
- }
- from = to;
- }
- }
- }
- }
-// graph.vertexSet().size();
+
+ // skip way if not suitable for routing.
+ if (way == null || way.isDeleted() || !this.isvalidWay(way)
+ || way.getNodes().size() < 1) continue;
+
+ // INIT
+ Node from = null;
+ Node to = null;
+ List<Node> nodes = way.getNodes();
+ int nodes_count = nodes.size();
+
+ /*
+ * Assume node is A B C D E. The procedure should be
+ *
+ * case 1 - bidirectional ways:
+ * 1) Add vertex A B C D E
+ * 2) Link A<->B, B<->C, C<->D, D<->E as Edges
+ *
+ * case 2 - oneway reverse:
+ * 1) Add vertex A B C D E
+ * 2) Link B->A,C->B,D->C,E->D as Edges. result: A<-B<-C<-D<-E
+ *
+ * case 3 - oneway normal:
+ * 1) Add vertex A B C D E
+ * 2) Link A->B, B->C, C->D, D->E as Edges. result: A->B->C->D->E
+ *
+ *
+ */
+
+ String oneway_val = way.get("oneway"); /* get (oneway=?) tag for this way. */
+
+ from = nodes.get(0); /* 1st node A */
+ graph.addVertex(from); /* add vertex A */
+
+ for (int i = 1; i < nodes_count; i++) { /* loop from B until E */
+
+ to = nodes.get(i); /* 2nd node B */
+
+ if (to != null && !to.isDeleted()) {
+ graph.addVertex(to); /* add vertex B */
+
+
+ //this is where we link the vertices
+ if (oneway_val == null || oneway_val == "false" || oneway_val == "no" || oneway_val == "0") {
+ //Case 1 (bi-way): oneway=false OR oneway=unset OR oneway=0 OR oneway=no
+ addEdgeBidirectional(way, from, to);
+
+ } else if (oneway_val == "-1") {
+ //Case 2 (oneway reverse): oneway=-1
+ addEdgeReverseOneway(way, from, to);
+
+ } else if (oneway_val == "1" || oneway_val == "yes" || oneway_val == "true") {
+ //Case 3 (oneway normal): oneway=yes OR 1 OR true
+ addEdgeNormalOneway(way, from, to);
+
+ }
+
+ from = to; /* we did A<->B, next loop we will do B<->C, so from=B,to=C for next loop. */
+ }
+
+ } // end of looping thru nodes
+ } // end of looping thru ways
+
logger.debug("End Create Graph");
logger.debug("Vertex: "+graph.vertexSet().size());
logger.debug("Edges: "+graph.edgeSet().size());
@@ -224,20 +294,6 @@ public class RoutingGraph {
}
/**
- * Check is One Way.
- *
- * @param way
- * the way.
- * @return <code>true</code> is a one way. <code>false</code> is not a one
- * way.
- */
- private boolean isOneWay(Way way) {
- // FIXME: oneway=-1 is ignored for the moment!
- return way.get("oneway") != null
- || "motorway".equals(way.get("highway"));
- }
-
- /**
* Check if a Way is correct.
*
* @param way
@@ -245,18 +301,14 @@ public class RoutingGraph {
* @return <code>true</code> is valid. <code>false</code> is not valid.
*/
public boolean isvalidWay(Way way) {
- if (!way.isTagged())
- return false;
+ //if (!way.isTagged()) <---not needed me thinks
+ // return false;
return way.get("highway") != null || way.get("junction") != null
|| way.get("service") != null;
}
- public boolean isvalidNode(Node node) {
- return true;
- }
-
/**
* Apply selected routing algorithm to the graph.
*
@@ -294,7 +346,7 @@ public class RoutingGraph {
logger.debug("Using Dijkstra algorithm");
DijkstraShortestPath<Node, OsmEdge> routingk = null;
for (int index = 1; index < nodes.size(); ++index) {
- routingk = new DijkstraShortestPath<Node, OsmEdge>(rgDelegator, nodes
+ routingk = new DijkstraShortestPath<Node, OsmEdge>(g, nodes
.get(index - 1), nodes.get(index));
if (routingk.getPathEdgeList() == null) {
logger.debug("no path found!");
diff --git a/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java b/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
index cc879bc..5680689 100644
--- a/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
+++ b/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
@@ -32,10 +32,12 @@ import java.awt.Color;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Point;
+import java.awt.RenderingHints;
import java.awt.Stroke;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import javax.swing.Action;
import javax.swing.Icon;
@@ -105,6 +107,10 @@ public class RoutingLayer extends Layer {
this.dataLayer = dataLayer;
this.routingModel = new RoutingModel(dataLayer.data);
logger.debug("Routing Layer created.");
+
+
+ this.routingModel.routingGraph.createGraph(); /* construct the graph right after we we create the layer */
+ Main.map.repaint(); /* update MapView */
}
/**
@@ -138,7 +144,7 @@ public class RoutingLayer extends Layer {
if (n.isDeleted() || n.isIncomplete()) continue;
Point P = Main.map.mapView.getPoint(n);
- double dist = p.distanceSq(P);
+ double dist = p.distance(P);
if (dist < snapDistance) {
if ((nearest == null) || (dist < minDist)) {
nearest = n;
@@ -230,10 +236,6 @@ public class RoutingLayer extends Layer {
boolean isActiveLayer = (mv.getActiveLayer().equals(this));
// Get routing nodes (start, middle, end)
List<Node> nodes = routingModel.getSelectedNodes();
- if(nodes == null || nodes.size() == 0) {
- logger.debug("no nodes selected");
- return;
- }
// Get path stroke color from preferences
// Color is different for active and inactive layers
@@ -258,11 +260,31 @@ public class RoutingLayer extends Layer {
// Get path stroke width from preferences
String widthString = Main.pref.get(PreferencesKeys.KEY_ROUTE_WIDTH.key);
if (widthString.length() == 0) {
- widthString = "8";
+ widthString = "2"; /* I think 2 is better */
// FIXME add after good width is found: Main.pref.put(KEY_ROUTE_WIDTH, widthString);
}
int width = Integer.parseInt(widthString);
-
+
+
+ // draw our graph
+ if (isActiveLayer) {
+ if(routingModel != null) {
+ if(routingModel.routingGraph != null && routingModel.routingGraph.getGraph() != null) {
+ Color color2 = ColorHelper.html2color("#00ff00"); /* just green for now */
+ Set<OsmEdge> graphEdges = routingModel.routingGraph.getGraph().edgeSet();
+ OsmEdge firstedge = (OsmEdge) graphEdges.toArray()[0];
+ Point from = mv.getPoint(firstedge.fromEastNorth());
+ g.drawRect(from.x-4, from.y+4, from.x+4, from.y-4);
+ for(OsmEdge edge : graphEdges) {
+ drawGraph(g, mv, edge, color2, width);
+ }
+ }
+ }
+ }
+
+
+ if(nodes == null || nodes.size() == 0) return;
+
// Paint routing path
List<OsmEdge> routeEdges = routingModel.getRouteEdges();
if(routeEdges != null) {
@@ -326,9 +348,10 @@ public class RoutingLayer extends Layer {
to = mv.getPoint(edge.toEastNorth());
Graphics2D g2d = (Graphics2D)g;
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); // Anti-alias!
Stroke oldStroke = g2d.getStroke();
g2d.setStroke(new BasicStroke(width)); // thickness
- g.drawLine(from.x, from.y, to.x, to.y);
+ g2d.drawLine(from.x, from.y, to.x, to.y);
if (showDirection) {
double t = Math.atan2(to.y-from.y, to.x-from.x) + Math.PI;
g.drawLine(to.x,to.y, (int)(to.x + 10*Math.cos(t-ARROW_PHI)), (int)(to.y + 10*Math.sin(t-ARROW_PHI)));
@@ -336,5 +359,21 @@ public class RoutingLayer extends Layer {
}
g2d.setStroke(oldStroke);
}
+ private void drawGraph(Graphics g, MapView mv, OsmEdge edge, Color col, int width) {
+ g.setColor(col);
+ Point from;
+ Point to;
+ from = mv.getPoint(edge.fromEastNorth());
+ to = mv.getPoint(edge.toEastNorth());
+
+ Graphics2D g2d = (Graphics2D)g;
+ Stroke oldStroke = g2d.getStroke();
+ g2d.setStroke(new BasicStroke(width)); // thickness
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); // Anti-alias!
+ g2d.drawLine(from.x, from.y, to.x, to.y);
+ g2d.drawRect(to.x- 4, to.y+4, 4, 4);
+ g2d.setStroke(oldStroke);
+ }
+
}
diff --git a/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java b/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
index 0187792..21db082 100644
--- a/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
+++ b/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
@@ -34,6 +34,14 @@ import java.util.ArrayList;
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent.DatasetEventType;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
import org.openstreetmap.josm.gui.IconToggleButton;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
@@ -59,7 +67,7 @@ import com.innovant.josm.plugin.routing.gui.RoutingPreferenceDialog;
*
* @version 0.3
*/
-public class RoutingPlugin extends Plugin implements LayerChangeListener {
+public class RoutingPlugin extends Plugin implements LayerChangeListener,DataSetListenerAdapter.Listener {
/**
* Logger
*/
@@ -122,12 +130,16 @@ public class RoutingPlugin extends Plugin implements LayerChangeListener {
* Reference for the plugin class (as if it were a singleton)
*/
private static RoutingPlugin plugin;
+
+ private DataSetListenerAdapter datasetAdapter;
/**
* Default Constructor
*/
public RoutingPlugin(PluginInformation info) {
super(info);
+
+ datasetAdapter = new DataSetListenerAdapter(this);
plugin = this; // Assign reference to the plugin class
DOMConfigurator.configure("log4j.xml");
logger.debug("Loading routing plugin...");
@@ -140,6 +152,7 @@ public class RoutingPlugin extends Plugin implements LayerChangeListener {
menu = new RoutingMenu();
// Register this class as LayerChangeListener
MapView.addLayerChangeListener(this);
+ DatasetEventManager.getInstance().addDatasetListener(datasetAdapter, FireMode.IN_EDT_CONSOLIDATED);
logger.debug("Finished loading plugin");
}
@@ -202,7 +215,21 @@ public class RoutingPlugin extends Plugin implements LayerChangeListener {
* @see org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener#activeLayerChange(org.openstreetmap.josm.gui.layer.Layer, org.openstreetmap.josm.gui.layer.Layer)
*/
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
- routingDialog.refresh();
+
+ if (newLayer instanceof RoutingLayer) { /* show Routing toolbar and dialog window */
+ addRouteNodeButton.setVisible(true);
+ removeRouteNodeButton.setVisible(true);
+ moveRouteNodeButton.setVisible(true);
+ menu.enableRestOfItems();
+ routingDialog.showDialog();
+ routingDialog.refresh();
+ }else{ /* hide Routing toolbar and dialog window */
+ addRouteNodeButton.setVisible(false);
+ removeRouteNodeButton.setVisible(false);
+ moveRouteNodeButton.setVisible(false);
+ menu.disableRestOfItems();
+ routingDialog.hideDialog();
+ }
}
/*
@@ -253,7 +280,11 @@ public class RoutingPlugin extends Plugin implements LayerChangeListener {
// Reload RoutingDialog table model
routingDialog.refresh();
}
-
+
+ public void processDatasetEvent(AbstractDatasetChangedEvent event){
+
+
+ }
/* (non-Javadoc)
* @see org.openstreetmap.josm.plugins.Plugin#getPreferenceSetting()
*/
diff --git a/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java b/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java
index 2b360b7..a52979d 100644
--- a/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java
+++ b/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java
@@ -66,6 +66,7 @@ public class RoutingMenu extends JMenu {
private JMenuItem startMI;
private JMenuItem reverseMI;
private JMenuItem clearMI;
+ private JMenuItem regraphMI;
private JMenu criteriaM;
private JMenu menu;
@@ -165,6 +166,22 @@ public class RoutingMenu extends JMenu {
}
});
menu.add(clearMI);
+
+ regraphMI = new JMenuItem(tr("Reconstruct Graph"));
+ regraphMI.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+
+ if (Main.map.mapView.getActiveLayer() instanceof RoutingLayer) {
+ RoutingLayer layer = (RoutingLayer)Main.map.mapView.getActiveLayer();
+ RoutingModel routingModel = layer.getRoutingModel();
+ routingModel.routingGraph.resetGraph();
+ routingModel.routingGraph.createGraph();
+ }
+
+ }
+ });
+ menu.add(regraphMI);
+
// Initially disabled
disableAllItems();
diff --git a/surveyor/build.xml b/surveyor/build.xml
index b2748d6..d09c8c2 100644
--- a/surveyor/build.xml
+++ b/surveyor/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
** This is the build file for the surveyor plugin.
**
@@ -28,178 +28,172 @@
**
-->
<project name="surveyor" default="dist" basedir=".">
-
- <!-- enter the SVN commit message -->
- <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
- <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
- <property name="plugin.main.version" value="3835" />
-
-
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
- <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <target name="init">
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <pathelement location="${josm}"/>
- <pathelement location="${livegpsplugin.jar}"/>
- </classpath>
- </javac>
- </target>
- <target name="dist" depends="compile,revision">
- <copy todir="${plugin.build.dir}/">
- <fileset dir="resources">
- <include name="*.xml"/>
- <include name="audio/*"/>
- </fileset>
- </copy>
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Author" value="Christof Dallermassl"/>
- <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/>
- <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions."/>
- <attribute name="Plugin-Icon" value="images/surveyormenu.png"/>
- <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Surveyor"/>
- <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
- <attribute name="Plugin-Requires" value="livegps"/>
- <attribute name="Plugin-Stage" value="60"/>
- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
- </manifest>
- </jar>
- </target>
- <target name="revision">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
- </target>
- <target name="clean">
- <delete dir="${plugin.build.dir}"/>
- <delete file="${plugin.jar}"/>
- </target>
- <target name="install" depends="dist">
- <property environment="env"/>
- <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
- <and>
- <os family="windows"/>
- </and>
- </condition>
- <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
- </target>
-
- <!--
- ************************** Publishing the plugin ***********************************
- -->
- <!--
- ** extracts the JOSM release for the JOSM version in ../core and saves it in the
- ** property ${coreversion.info.entry.revision}
- **
- -->
- <target name="core-info">
- <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="../../core"/>
- </exec>
- <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
- <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
- <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
- <delete file="core.info.xml" />
- </target>
-
- <!--
- ** commits the source tree for this plugin
- -->
- <target name="commit-current">
- <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="commit"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="."/>
- </exec>
- </target>
-
- <!--
- ** updates (svn up) the source tree for this plugin
- -->
- <target name="update-current">
- <echo>Updating plugin source ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="."/>
- </exec>
- <echo>Updating ${plugin.jar} ...</echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="up"/>
- <arg value="../dist/${plugin.jar}"/>
- </exec>
- </target>
-
- <!--
- ** commits the plugin.jar
- -->
- <target name="commit-dist">
- <echo>
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
- </echo>
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="-m '${commit.message}'"/>
- <arg value="commit"/>
- <arg value="${plugin.jar}"/>
- </exec>
- </target>
-
- <!-- ** make sure svn is present as a command line tool ** -->
- <target name="ensure-svn-present">
- <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
- <env key="LANG" value="C" />
- <arg value="--version" />
- </exec>
- <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
- <!-- return code not set at all? Most likely svn isn't installed -->
- <condition>
- <not>
- <isset property="svn.exit.code" />
- </not>
- </condition>
- </fail>
- <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
- <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
- <condition>
- <isfailure code="${svn.exit.code}" />
- </condition>
- </fail>
- </target>
-
- <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
- </target>
+ <!-- enter the SVN commit message -->
+ <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
+ <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
+ <property name="plugin.main.version" value="3835"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
+ <property name="ant.build.javac.target" value="1.5"/>
+ <target name="init">
+ <mkdir dir="${plugin.build.dir}"/>
+ </target>
+ <target name="compile" depends="init">
+ <echo message="creating ${plugin.jar}"/>
+ <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ <classpath>
+ <pathelement location="${josm}"/>
+ <pathelement location="${livegpsplugin.jar}"/>
+ </classpath>
+ </javac>
+ </target>
+ <target name="dist" depends="compile,revision">
+ <copy todir="${plugin.build.dir}/">
+ <fileset dir="resources">
+ <include name="*.xml"/>
+ <include name="audio/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${plugin.build.dir}/images">
+ <fileset dir="images"/>
+ </copy>
+ <copy todir="${plugin.build.dir}/data">
+ <fileset dir="data"/>
+ </copy>
+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+ <manifest>
+ <attribute name="Author" value="Christof Dallermassl"/>
+ <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/>
+ <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions."/>
+ <attribute name="Plugin-Icon" value="images/surveyormenu.png"/>
+ <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Surveyor"/>
+ <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+ <attribute name="Plugin-Requires" value="livegps"/>
+ <attribute name="Plugin-Stage" value="60"/>
+ <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+ </manifest>
+ </jar>
+ </target>
+ <target name="revision">
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
+ </target>
+ <target name="clean">
+ <delete dir="${plugin.build.dir}"/>
+ <delete file="${plugin.jar}"/>
+ </target>
+ <target name="install" depends="dist">
+ <property environment="env"/>
+ <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
+ <!--
+ ************************** Publishing the plugin ***********************************
+ -->
+ <!--
+ ** extracts the JOSM release for the JOSM version in ../core and saves it in the
+ ** property ${coreversion.info.entry.revision}
+ **
+ -->
+ <target name="core-info">
+ <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+ <arg value="--xml"/>
+ <arg value="../../core"/>
+ </exec>
+ <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+ <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+ <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+ <delete file="core.info.xml"/>
+ </target>
+ <!--
+ ** commits the source tree for this plugin
+ -->
+ <target name="commit-current">
+ <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="commit"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="."/>
+ </exec>
+ </target>
+ <!--
+ ** updates (svn up) the source tree for this plugin
+ -->
+ <target name="update-current">
+ <echo>Updating plugin source ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="."/>
+ </exec>
+ <echo>Updating ${plugin.jar} ...</echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="up"/>
+ <arg value="../dist/${plugin.jar}"/>
+ </exec>
+ </target>
+ <!--
+ ** commits the plugin.jar
+ -->
+ <target name="commit-dist">
+ <echo>
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+ </echo>
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="-m '${commit.message}'"/>
+ <arg value="commit"/>
+ <arg value="${plugin.jar}"/>
+ </exec>
+ </target>
+ <!-- ** make sure svn is present as a command line tool ** -->
+ <target name="ensure-svn-present">
+ <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+ <env key="LANG" value="C"/>
+ <arg value="--version"/>
+ </exec>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+ <!-- return code not set at all? Most likely svn isn't installed -->
+ <condition>
+ <not>
+ <isset property="svn.exit.code"/>
+ </not>
+ </condition>
+ </fail>
+ <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+ <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+ <condition>
+ <isfailure code="${svn.exit.code}"/>
+ </condition>
+ </fail>
+ </target>
+ <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+ </target>
</project>
diff --git a/surveyor/data/ar.lang b/surveyor/data/ar.lang
new file mode 100644
index 0000000..8ce9250
Binary files /dev/null and b/surveyor/data/ar.lang differ
diff --git a/surveyor/data/bg.lang b/surveyor/data/bg.lang
new file mode 100644
index 0000000..a3ffff0
Binary files /dev/null and b/surveyor/data/bg.lang differ
diff --git a/surveyor/data/cs.lang b/surveyor/data/cs.lang
new file mode 100644
index 0000000..a1ca509
Binary files /dev/null and b/surveyor/data/cs.lang differ
diff --git a/surveyor/data/da.lang b/surveyor/data/da.lang
new file mode 100644
index 0000000..6c723ab
Binary files /dev/null and b/surveyor/data/da.lang differ
diff --git a/surveyor/data/de.lang b/surveyor/data/de.lang
new file mode 100644
index 0000000..84fef02
Binary files /dev/null and b/surveyor/data/de.lang differ
diff --git a/surveyor/data/el.lang b/surveyor/data/el.lang
new file mode 100644
index 0000000..2265edc
Binary files /dev/null and b/surveyor/data/el.lang differ
diff --git a/surveyor/data/en.lang b/surveyor/data/en.lang
new file mode 100644
index 0000000..40b70a7
Binary files /dev/null and b/surveyor/data/en.lang differ
diff --git a/surveyor/data/en_AU.lang b/surveyor/data/en_AU.lang
new file mode 100644
index 0000000..9eab3d5
Binary files /dev/null and b/surveyor/data/en_AU.lang differ
diff --git a/surveyor/data/en_GB.lang b/surveyor/data/en_GB.lang
new file mode 100644
index 0000000..9eab3d5
Binary files /dev/null and b/surveyor/data/en_GB.lang differ
diff --git a/surveyor/data/es.lang b/surveyor/data/es.lang
new file mode 100644
index 0000000..3913d0d
Binary files /dev/null and b/surveyor/data/es.lang differ
diff --git a/surveyor/data/et.lang b/surveyor/data/et.lang
new file mode 100644
index 0000000..5a1a668
Binary files /dev/null and b/surveyor/data/et.lang differ
diff --git a/surveyor/data/eu.lang b/surveyor/data/eu.lang
new file mode 100644
index 0000000..6800890
Binary files /dev/null and b/surveyor/data/eu.lang differ
diff --git a/surveyor/data/fi.lang b/surveyor/data/fi.lang
new file mode 100644
index 0000000..548a103
Binary files /dev/null and b/surveyor/data/fi.lang differ
diff --git a/surveyor/data/fr.lang b/surveyor/data/fr.lang
new file mode 100644
index 0000000..09dd6e3
Binary files /dev/null and b/surveyor/data/fr.lang differ
diff --git a/surveyor/data/gl.lang b/surveyor/data/gl.lang
new file mode 100644
index 0000000..af3e9f1
Binary files /dev/null and b/surveyor/data/gl.lang differ
diff --git a/surveyor/data/he.lang b/surveyor/data/he.lang
new file mode 100644
index 0000000..4b92ed2
Binary files /dev/null and b/surveyor/data/he.lang differ
diff --git a/surveyor/data/id.lang b/surveyor/data/id.lang
new file mode 100644
index 0000000..0ac741d
Binary files /dev/null and b/surveyor/data/id.lang differ
diff --git a/surveyor/data/is.lang b/surveyor/data/is.lang
new file mode 100644
index 0000000..62bd74c
Binary files /dev/null and b/surveyor/data/is.lang differ
diff --git a/surveyor/data/it.lang b/surveyor/data/it.lang
new file mode 100644
index 0000000..8a440ed
Binary files /dev/null and b/surveyor/data/it.lang differ
diff --git a/surveyor/data/ja.lang b/surveyor/data/ja.lang
new file mode 100644
index 0000000..5d01f40
Binary files /dev/null and b/surveyor/data/ja.lang differ
diff --git a/surveyor/data/nb.lang b/surveyor/data/nb.lang
new file mode 100644
index 0000000..340ce3e
Binary files /dev/null and b/surveyor/data/nb.lang differ
diff --git a/surveyor/data/nl.lang b/surveyor/data/nl.lang
new file mode 100644
index 0000000..1e1d182
Binary files /dev/null and b/surveyor/data/nl.lang differ
diff --git a/surveyor/data/pl.lang b/surveyor/data/pl.lang
new file mode 100644
index 0000000..6e9ee3b
Binary files /dev/null and b/surveyor/data/pl.lang differ
diff --git a/surveyor/data/pt_BR.lang b/surveyor/data/pt_BR.lang
new file mode 100644
index 0000000..702a1bb
Binary files /dev/null and b/surveyor/data/pt_BR.lang differ
diff --git a/surveyor/data/ru.lang b/surveyor/data/ru.lang
new file mode 100644
index 0000000..7b6e5c6
Binary files /dev/null and b/surveyor/data/ru.lang differ
diff --git a/surveyor/data/sk.lang b/surveyor/data/sk.lang
new file mode 100644
index 0000000..2041d1d
Binary files /dev/null and b/surveyor/data/sk.lang differ
diff --git a/surveyor/data/sv.lang b/surveyor/data/sv.lang
new file mode 100644
index 0000000..6f345ec
Binary files /dev/null and b/surveyor/data/sv.lang differ
diff --git a/surveyor/data/tr.lang b/surveyor/data/tr.lang
new file mode 100644
index 0000000..99f8cf4
Binary files /dev/null and b/surveyor/data/tr.lang differ
diff --git a/surveyor/data/uk.lang b/surveyor/data/uk.lang
new file mode 100644
index 0000000..1add60f
Binary files /dev/null and b/surveyor/data/uk.lang differ
diff --git a/surveyor/data/zh_CN.lang b/surveyor/data/zh_CN.lang
new file mode 100644
index 0000000..baa10b5
Binary files /dev/null and b/surveyor/data/zh_CN.lang differ
diff --git a/surveyor/data/zh_TW.lang b/surveyor/data/zh_TW.lang
new file mode 100644
index 0000000..a2df217
Binary files /dev/null and b/surveyor/data/zh_TW.lang differ
diff --git a/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java b/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
index 6cda7f5..b363ab8 100644
--- a/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
+++ b/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
@@ -104,7 +104,7 @@ public class SurveyorComponent extends JComponent implements PropertyChangeListe
public void addButton(ButtonDescription description) {
if(description.getHotkey() != "" && hotKeys.contains(description.getHotkey())) {
- JOptionPane.showMessageDialog(Main.parent, tr("Duplicate hotkey for button '{0}' - button will be ignored!",description.getLabel()));
+ JOptionPane.showMessageDialog(Main.parent, tr("Duplicate hotkey for button ''{0}'' - button will be ignored!",description.getLabel()));
} else {
if(rows == 0 && columns == 0) {
setColumns("4");
diff --git a/svn-info.xml b/svn-info.xml
index 66d89fe..2efcf5f 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -3,16 +3,16 @@
<entry
kind="dir"
path="plugins"
- revision="25938">
+ revision="26580">
<url>http://svn.openstreetmap.org/applications/editors/josm/plugins</url>
<repository>
<root>http://svn.openstreetmap.org</root>
<uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
</repository>
<commit
- revision="25935">
-<author>jttt</author>
-<date>2011-05-02T18:54:39.822241Z</date>
+ revision="26579">
+<author>malcolmh</author>
+<date>2011-08-26T18:08:50.188255Z</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