Commit b230281a authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 0.0.svn8159+dfsg1

parent 82c8334d
......@@ -34,7 +34,7 @@ Copyright rests with the contributors.
-------------------------------- EXTERNAL CODE --------------------------------
The jpeg metadata extraction code is from Drew Noakes
(http://code.google.com/p/metadata-extractor/) and licensed
(https://github.com/drewnoakes/metadata-extractor) and licensed
with Apache license version 2.0.
The Bzip2 code is from Apache Commons Compress and licensed
......
......@@ -114,12 +114,12 @@ This is an overview of the files and directories in the JOSM code repository:
- performance/ performance tests (source code)
- unit/ unit tests (source code)
- tools/ libraries and tools that help in the development process
- animal-sniffer-ant-tasks-1.13.jar
- animal-sniffer-ant-tasks-1.14.jar
used to build and check code signatures to ensure plugins binary compatibility
- appbundler-1.0ea.jar used to build Mac OS X package for Oracle Java 7
- findbugs/ libs and config files for findbugs (automatically detects common bugs and potential
problems in source code); can be launched as an ant target in build.xml
- groovy-all-2.3.9.jar used for some unit tests and various scripts
- groovy-all-2.4.3.jar used for some unit tests and various scripts
- jacocoant.jar used to include coverage data into JUnit test reports
- javacc.jar used in the build process to generate some .java files from a javacc source file
(src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
......@@ -147,9 +147,6 @@ There are some third party libraries which are directly included in the source c
* jmapviewer: Java component to browse a TMS map
src/org/openstreetmap/gui (svn external)
-> http://svn.openstreetmap.org/applications/viewer/jmapviewer/
* Apache commons codec: Better Base64 support
src/org/apache/commons/codec (svn external)
-> http://svn.apache.org/repos/asf/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec
* Apache commons compress: Support for bzip2 compression when opening files
src/org/apache/commons/compress/compressors (svn external)
-> http://svn.apache.org/repos/asf/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors
......
<?xml version="1.0"?>
<info>
<entry
kind="dir"
path="trunk"
revision="8109">
revision="8159"
kind="dir">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="8109">
<author>Don-vip</author>
<date>2015-03-01T23:13:51.162375Z</date>
revision="8159">
<author>stoecker</author>
<date>2015-03-29T12:37:50.444628Z</date>
</commit>
</entry>
</info>
......@@ -278,7 +278,7 @@ Build-Date: ${build.tstamp}
<include name="**/*.jar"/>
</fileset>
<pathelement path="dist/josm-custom.jar"/>
<pathelement path="tools/groovy-all-2.4.0.jar"/>
<pathelement path="tools/groovy-all-2.4.3.jar"/>
</path>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
......@@ -325,7 +325,7 @@ Build-Date: ${build.tstamp}
</sequential>
</macrodef>
<target name="test-compile" depends="test-init,dist">
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.4.0.jar"/>
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.4.3.jar"/>
<call-groovyc testfamily="unit">
<cp-elements>
<path refid="test.classpath"/>
......@@ -448,7 +448,7 @@ Build-Date: ${build.tstamp}
<local name="plugins"/>
<property name="dir" value="plugin-check"/>
<typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
<classpath path="tools/animal-sniffer-ant-tasks-1.13.jar"/>
<classpath path="tools/animal-sniffer-ant-tasks-1.14.jar"/>
</typedef>
<mkdir dir="${dir}"/>
<!-- List of deprecated plugins -->
......
This diff is collapsed.
......@@ -45,6 +45,7 @@ way[junction ][!highway][junction!=yes],
*[have_riverbank ][!waterway],
*[border_type ][!boundary],
*[bridge:structure ][!bridge],
*[piste:difficulty ][!piste:type],
*[source:date ][!source],
*[source:name ][!name],
*[source:maxspeed:forward ][!maxspeed:forward],
......@@ -103,7 +104,8 @@ way[junction ][!highway][junction!=yes],
*[castle_type ][historic!=castle],
*[reservoir_type ][landuse!=reservoir][water!=reservoir],
*[bridge:movable ][bridge!=movable],
*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/]
*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
*[cutline ][man_made!=cutline],
*[bunker_type ][military!=bunker] {
throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
}
......@@ -168,6 +170,11 @@ way[junction ][!highway][junction!=yes],
throwOther: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
}
/* {0.tag} together with {1.tag}, see #10186 */
*[highway=footway][bicycle=designated] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
}
/*see #11127*/
way[waterway][bridge=yes] {
throwWarning: tr("{0} together with {1}", "{0.key}", "{1.tag}");
......@@ -232,8 +239,8 @@ way[highway][natural],
fixRemove: "natural";
}
/* see #9593 */
*[sport][!building][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/] {
/* see #9593, #11183 */
*[sport][!building][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"] {
throwWarning: tr("sport without physical feature");
assertMatch: "node sport=tennis";
assertNoMatch: "node sport=tennis leisure=pitch";
......
......@@ -390,4 +390,24 @@ way[sidewalk=yes] {
*[crossing=unknown],
*[foot=unknown] {
throwWarning: tr("Unspecific tag {0}", "{0.tag}");
}
/* unclear definition, see #11183 */
*[sport=skiing][!piste:type] {
throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
suggestAlternative: {1.key};
}
/* see #11223 */
*[waterway=wadi] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "{0.key}=* + intermittent=yes";
suggestAlternative: "natural=valley";
}
/* see #10346 */
way[oneway=1] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "oneway=yes";
fixAdd: "oneway=yes";
}
\ No newline at end of file
......@@ -5,6 +5,8 @@ node[sidewalk],
node[footway],
node[man_made=embankment],
node[man_made=groyne],
node[man_made=cutline],
node[cutline],
node[aerialway=cable_car],
node[aerialway=gondola],
node[aerialway=chair_lift],
......@@ -29,12 +31,12 @@ node[railway=disused],
node[railway=abandoned],
node[waterway=river],
node[waterway=canal],
node[waterway=wadi],
node[waterway=stream],
node[waterway=ditch],
node[waterway=drain],
node[natural=coastline],
node[natural=ridge],
node[natural=valley],
node[natural=tree_row] {
throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");
assertMatch: "node oneway=-1";
......@@ -63,6 +65,7 @@ node[man_made=bridge],
node[man_made=breakwater],
node[aeroway=apron],
node[power=plant],
node[building:part],
node[source:outline] {
throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
}
......
......@@ -17,11 +17,11 @@ $pwd = '';
my %lang = map {$_ => 1} (
"ast", "bg", "ca", "cs", "da", "de", "el", "en_AU", "en_GB",
"es", "et", "fi", "fr", "gl", "hu", "id",
"it", "ja", "km", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"it", "ja", "km", "lt", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"sv", "uk", "zh_CN", "zh_TW"
);
my $revision = '$Revision: 31033 $';
my $revision = '$Revision: 31071 $';
$revision =~ s/^.*?(\d+).*$/$1/;
my $agent = "JOSM_Launchpad/1.$revision";
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-04 03:32+0100\n"
"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af@li.org>\n"
......@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2015-03-04 04:31+0000\n"
"X-Generator: Launchpad (build 17361)\n"
"X-Launchpad-Export-Date: 2015-04-01 04:30+0000\n"
"X-Generator: Launchpad (build 17413)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
msgid "Download OSM Notes"
msgstr ""
msgid "Downloading Notes"
msgstr ""
msgid "Notes"
msgstr ""
msgid "Download Compressed OSM Change"
msgstr ""
......@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
msgid "List of notes"
msgstr ""
msgid "Add comment"
msgstr ""
......@@ -7428,9 +7437,6 @@ msgstr ""
msgid "Select to download GPS traces in the selected download area."
msgstr ""
msgid "Notes"
msgstr ""
msgid "Select to download notes in the selected download area."
msgstr ""
......@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
msgid "Select sport:"
msgstr ""
msgid "Sport"
msgstr ""
......@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
msgid "shooting"
msgid "running"
msgstr ""
msgctxt "sport"
msgid "skateboard"
msgid "shooting"
msgstr ""
msgctxt "sport"
msgid "skating"
msgid "skateboard"
msgstr ""
msgctxt "sport"
msgid "skiing"
msgid "skating"
msgstr ""
msgctxt "sport"
......@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
msgid "culvert"
msgstr ""
msgid "Water access rules:"
msgstr ""
msgid "Ship"
msgstr ""
msgid "designated"
msgstr ""
msgid "Boat"
msgstr ""
msgid "Motorboat"
msgstr ""
msgid "Canoe"
msgstr ""
msgid "Streets"
msgstr ""
......@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
msgid "designated"
msgstr ""
msgid "Vehicles per type"
msgstr ""
......@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
msgid "In case of traffic signals:"
msgstr ""
msgid "Traffic Calming"
msgstr ""
......@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
msgid "Wadi"
msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
msgid "River"
msgstr ""
msgid "Spring"
msgstr ""
......@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
msgid "Coastline"
msgstr ""
......@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
msgid "incorrect"
msgstr ""
msgid "Bus Platform"
msgstr ""
......@@ -18076,6 +18100,9 @@ msgstr ""
msgid "Microbrewery"
msgstr ""
msgid "Outdoor seating"
msgstr ""
msgid "Fast Food"
msgstr ""
......@@ -18670,13 +18697,13 @@ msgstr ""
msgid "Collection times"
msgstr ""
msgid "11:30"
msgid "Mo-Sa 09:00"
msgstr ""
msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
msgid "Mo-Fr 17:30; Sa 12:00"
msgstr ""
msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off"
msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgstr ""
msgid "Drive through"
......@@ -18935,6 +18962,15 @@ msgstr ""
msgid "Pitch"
msgstr ""
msgid "artificial_turf"
msgstr ""
msgid "decoturf"
msgstr ""
msgid "tartan"
msgstr ""
msgid "Racetrack"
msgstr ""
......@@ -19042,6 +19078,12 @@ msgstr ""
msgid "skitour"
msgstr ""
msgid "sled"
msgstr ""
msgid "sleigh"
msgstr ""
msgid "snow_park"
msgstr ""
......@@ -19294,6 +19336,10 @@ msgctxt "building"
msgid "construction"
msgstr ""
msgctxt "building"
msgid "Levels"
msgstr ""
msgid "Residential Building"
msgstr ""
......@@ -19329,6 +19375,16 @@ msgctxt "building"
msgid "farm"
msgstr ""
msgid "Building part"
msgstr ""
msgctxt "building"
msgid "Skipped Levels"
msgstr ""
msgid "Skipped height (meters)"
msgstr ""
msgid "Entrance"
msgstr ""
......@@ -21062,22 +21118,28 @@ msgstr ""
msgid "scoria"
msgstr ""
msgid "Cave Entrance"
msgid "Ridge"
msgstr ""
msgid "The entrance to a cave."
msgid "A mountain or hill ridge."
msgstr ""
msgid "Island"
msgid "Valley"
msgstr ""
msgid "Islet"
msgid "A low area between hills."
msgstr ""
msgid "Ridge"
msgid "Cave Entrance"
msgstr ""
msgid "A mountain or hill ridge."
msgid "The entrance to a cave."
msgstr ""
msgid "Island"
msgstr ""
msgid "Islet"
msgstr ""
msgid "Nature"
......@@ -21107,6 +21169,37 @@ msgstr ""
msgid "Forest"
msgstr ""
msgid "Cutline"
msgstr ""
msgctxt "cutline"
msgid "border"
msgstr ""
msgctxt "cutline"
msgid "firebreak"
msgstr ""
msgctxt "cutline"
msgid "hunting"
msgstr ""
msgctxt "cutline"
msgid "loggingmachine"
msgstr ""
msgctxt "cutline"
msgid "pipeline"
msgstr ""
msgctxt "cutline"
msgid "piste"
msgstr ""
msgctxt "cutline"
msgid "section"
msgstr ""
msgid "Grassland"
msgstr ""
......@@ -22040,6 +22133,9 @@ msgstr ""
msgid "Unspecific tag {0}"
msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
msgid "{0} on a node. Should be used on a way."
msgstr ""
......@@ -27401,7 +27497,7 @@ msgstr ""
msgid "No object selected"
msgstr ""
msgid "SeaMap Editor"
msgid "SeaChart Editor"
msgstr ""
msgid "Seamark Inspector"
......@@ -27473,6 +27569,9 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
msgid "SeaMap Editor"
msgstr ""
msgid "AutoSave LiveData"
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-04 03:32+0100\n"
"POT-Creation-Date: 2015-04-01 03:33+0200\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Amharic <am@li.org>\n"
......@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Launchpad-Export-Date: 2015-03-04 04:32+0000\n"
"X-Generator: Launchpad (build 17361)\n"
"X-Launchpad-Export-Date: 2015-04-01 04:31+0000\n"
"X-Generator: Launchpad (build 17413)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -1696,9 +1696,15 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
msgid "Download OSM Notes"
msgstr ""
msgid "Downloading Notes"
msgstr ""
msgid "Notes"
msgstr ""
msgid "Download Compressed OSM Change"
msgstr ""
......@@ -6109,6 +6115,9 @@ msgstr ""
msgid "Customize the style"
msgstr ""
msgid "List of notes"
msgstr ""
msgid "Add comment"
msgstr ""
......@@ -7428,9 +7437,6 @@ msgstr ""
msgid "Select to download GPS traces in the selected download area."
msgstr ""
msgid "Notes"
msgstr ""
msgid "Select to download notes in the selected download area."
msgstr ""
......@@ -15682,9 +15688,6 @@ msgstr ""
msgid "stadium"
msgstr ""
msgid "Select sport:"
msgstr ""
msgid "Sport"
msgstr ""
......@@ -15805,19 +15808,19 @@ msgid "rugby_union"
msgstr ""
msgctxt "sport"
msgid "shooting"
msgid "running"
msgstr ""
msgctxt "sport"
msgid "skateboard"
msgid "shooting"
msgstr ""
msgctxt "sport"
msgid "skating"
msgid "skateboard"
msgstr ""
msgctxt "sport"
msgid "skiing"
msgid "skating"
msgstr ""
msgctxt "sport"
......@@ -16145,6 +16148,30 @@ msgstr ""
msgid "Toll"
msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
msgid "culvert"
msgstr ""
msgid "Water access rules:"
msgstr ""
msgid "Ship"
msgstr ""
msgid "designated"
msgstr ""
msgid "Boat"
msgstr ""
msgid "Motorboat"
msgstr ""
msgid "Canoe"
msgstr ""
msgid "Streets"
msgstr ""
......@@ -16360,9 +16387,6 @@ msgstr ""
msgid "official"
msgstr ""
msgid "designated"
msgstr ""
msgid "Vehicles per type"
msgstr ""
......@@ -16752,6 +16776,9 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
msgid "In case of traffic signals:"
msgstr ""
msgid "Traffic Calming"
msgstr ""
......@@ -16998,15 +17025,12 @@ msgstr ""
msgid "Stream"
msgstr ""
msgid "Wadi"
msgid "River"
msgstr ""
msgid "Canal"
msgstr ""
msgid "River"
msgstr ""
msgid "Spring"
msgstr ""
......@@ -17072,9 +17096,6 @@ msgstr ""
msgid "Salt Water"
msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
msgid "Coastline"
msgstr ""
......@@ -17914,6 +17935,9 @@ msgstr ""
msgid "Tactile Paving"
msgstr ""
msgid "incorrect"