Skip to content

Commits on Source 5

Show whitespace changes
Inline Side-by-side
.classpath
View file @ 88450f62
......@@ -42,17 +42,12 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.11.jar">
<classpathentry kind="lib" path="test/lib/classgraph-4.6.32.jar" sourcepath="C:/Users/vippy/.m2/repository/io/github/classgraph/classgraph/4.6.32/classgraph-4.6.32-sources.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar">
<classpathentry kind="lib" path="tools/guava.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
......
REVISION
View file @ 88450f62
......@@ -2,7 +2,7 @@
<info>
<entry
path="trunk"
revision="14760"
revision="14824"
kind="dir">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
......@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="14760">
<author>simon04</author>
<date>2019-02-02T20:01:18.097412Z</date>
revision="14824">
<author>Don-vip</author>
<date>2019-03-02T23:16:03.331839Z</date>
</commit>
</entry>
</info>
build.xml
View file @ 88450f62
......@@ -42,6 +42,10 @@
<property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
<property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
<property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
<property name="dataflow.jar" location="${tools.dir}/dataflow.jar"/>
<property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
<property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
<property name="guava.jar" location="${tools.dir}/guava.jar"/>
<property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
<property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
<property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
......@@ -82,6 +86,8 @@
<include name="**/*.jar"/>
</fileset>
<pathelement path="${dist.jar}"/>
<pathelement path="${failureaccess.jar}"/>
<pathelement path="${guava.jar}"/>
<pathelement path="${pmd.dir}/commons-lang3-3.8.1.jar"/>
<pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
</path>
......@@ -92,6 +98,10 @@
</path>
<path id="processor.path">
<pathelement location="${error_prone_core.jar}"/>
<pathelement location="${dataflow.jar}"/>
<pathelement location="${javacutil.jar}"/>
<pathelement location="${failureaccess.jar}"/>
<pathelement location="${guava.jar}"/>
<pathelement location="${jformatstring.jar}"/>
</path>
</target>
......@@ -202,7 +212,7 @@ Build-Date: ${build.tstamp}
<!-- Mac OS X target -->
<target name="mac" depends="init-properties">
<!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${tools.dir}/appbundler-1.0ea.jar"/>
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${tools.dir}/appbundler.jar"/>
<!-- create MacOS X application bundle -->
<bundleapp outputdirectory="${bundle.outdir}" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
mainclassname="org.openstreetmap.josm.gui.MainApplication"
......@@ -374,7 +384,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
<compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF"/>
<compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF"/>
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
......
data/defaultpresets.xml
View file @ 88450f62
......@@ -3272,7 +3272,7 @@
<key key="religion" value="christian" />
<text key="name" text="Name" />
<combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist,spiritist" values_context="christian" values_searchable="true" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_context="christian" values_searchable="true" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3285,7 +3285,7 @@
<key key="religion" value="muslim" />
<text key="name" text="Name" />
<combo key="building" text="Building type" values="mosque" values_searchable="true" />
<combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
<combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3298,7 +3298,7 @@
<key key="religion" value="jewish" />
<text key="name" text="Name" />
<combo key="building" text="Building type" values="synagogue" values_searchable="true" />
<combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_context="jewish" values_searchable="true" />
<combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3310,7 +3310,7 @@
<key key="amenity" value="place_of_worship" />
<key key="religion" value="buddhist" />
<text key="name" text="Name" />
<combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
<combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -4283,7 +4283,7 @@
<combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,sled,sleigh,snow_park" match="keyvalue"/>
<optional>
<combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" values_sort="false" />
<combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
<combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic+skating,scooter,backcountry" values_context="piste:grooming" />
</optional>
</item> <!-- Skiing -->
<item name="Shooting" icon="presets/sport/range.svg" type="node,closedway,multipolygon" preset_name_label="true">
......@@ -5027,9 +5027,9 @@
<reference ref="power_generator" />
<combo key="generator:method" text="Method" values_context="generator method" values="barrage,stream" />
<combo key="generator:type" text="Generator Type" values_searchable="true">
<list_entry value="horizontal_axis" short_description="steam" />
<list_entry value="horizontal_axis" short_description="stream" />
<list_entry value="kaplan_turbine" short_description="barrage" />
<list_entry value="vertical_axis" short_description="steam" />
<list_entry value="vertical_axis" short_description="stream" />
</combo>
<reference ref="power_output" />
</item> <!-- Tidal Water Turbine -->
......@@ -6843,7 +6843,7 @@
<link wiki="Tag:landuse=farmland" />
<space />
<key key="landuse" value="farmland" />
<combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop,tea" values_context="crop" />
<combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop,cereal,tea" values_context="crop" />
<reference ref="optional_name" />
</item> <!-- Farmland -->
<item name="Meadow" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
......
data/validator/combinations.mapcss
View file @ 88450f62
......@@ -41,6 +41,7 @@ way[canal ][!waterway],
way[have_riverbank ][!waterway],
*[border_type ][!boundary],
*[piste:difficulty ][!piste:type],
*[place ][!name][place!=islet],
*[source:date ][!source],
*[source:name ][!name],
*[source:maxspeed:forward ][!maxspeed:forward][!maxspeed],
......@@ -150,6 +151,13 @@ way[power=cable ][!voltage],
*[power=substation ][!substation],
*[power=switch ][!switch],
*[power=transformer ][!transformer],
*[amenity=bank ][!operator],
*[amenity=cinema ][!operator],
*[amenity=fast_food ][!operator],
*[amenity=fuel ][!operator],
*[mountain_pass=yes ][!ele],
*[natural=peak ][!ele],
*[amenity=place_of_worship ][!denomination],
*[amenity=parking ][!parking],
*[amenity=parking_entrance ][!parking] {
throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
......@@ -244,6 +252,12 @@ way[highway=footway][bicycle=designated] {
group: tr("suspicious tag combination");
}
/* {0.tag} together with {1.tag} (error level) */
relation[type=multipolygon][area=no] {
throwError: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
}
/* {0.key} together with {1.key} (info level) */
*[addr:street][addr:place] {
throwOther: tr("{0} together with {1}", "{0.key}", "{1.key}");
......@@ -351,7 +365,7 @@ way[highway=footway][cycleway=lane] {
group: tr("suspicious tag combination");
}
node[amenity][amenity =~ /^(restaurant|cafe|fast_food)$/][!name][noname!=yes] {
*[amenity][amenity =~ /^(restaurant|cafe|fast_food|pub|place_of_worship|school|university|hospital|library|theatre|courthouse|bank|cinema|pharmacy|fuel)$/][!name][noname!=yes] {
throwOther: tr("{0} without {1}", "{0.tag}", "{2.key}");
group: tr("missing tag");
assertMatch: "node amenity=restaurant";
......
data/validator/deprecated.mapcss
View file @ 88450f62
......@@ -452,6 +452,7 @@ way[type=palm] {
*[amenity=yes],
*[leisure=yes],
*[shop="*"],
*[shop=yes][amenity!=fuel],
*[craft=yes],
*[service=yes],
*[place=yes] {
......@@ -980,6 +981,14 @@ node[type][pipeline=marker] {
fixChangeKey: "amenity => leisure";
}
/* #17379 */
*[amenity=sauna] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "leisure=sauna";
group: tr("deprecated tagging");
fixChangeKey: "amenity => leisure";
}
/* #12494 */
*[/^[^t][^i][^g].+_[0-9]$/][!/^note_[0-9]$/][!/^description_[0-9]$/] {
throwOther: tr("{0}", "{0.key}");
......@@ -1371,3 +1380,11 @@ node[fire_hydrant:water_source] {
fixChangeKey: "fire_hydrant:water_source => water_source";
group: tr("deprecated tagging");
}
/* #17383 */
*[natural=waterfall] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "waterway=waterfall";
fixChangeKey: "natural => waterway";
group: tr("deprecated tagging");
}
\ No newline at end of file
data/validator/ignoretags.cfg
View file @ 88450f62
......@@ -279,10 +279,7 @@ K:denomination=karaite
K:denomination=living_waters_church
K:denomination=maronite
K:denomination=mennonite
K:denomination=nondenominational
K:denomination=salvation_army
K:denomination=serbian_orthodox
K:denomination=united
K:denomination=united_reformed
K:denomination=uniting
;
......@@ -295,7 +292,6 @@ K:denomination=humanistic
K:denomination=liberal
K:denomination=modern_orthodox
K:denomination=neo_orthodox
K:denomination=nondenominational
K:denomination=progressive
K:denomination=reconstructionist
K:denomination=renewal
......@@ -307,7 +303,6 @@ K:denomination=ultra_orthodox
K:denomination=alaouite
K:denomination=druze
K:denomination=ismaili
K:denomination=nondenominational
;
; Pastafarian Denominations
;
......@@ -354,7 +349,7 @@ K:natural=land
K:natural=hill
K:natural=arete
K:natural=slope
K:piste:grooming=classic+skating
K:piste:grooming=classic;skating
K:power=sub_station
K:product=wine
K:railway=derail
......
data_nodist/trans/en_AU.lang
View file @ 88450f62
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
data_nodist/trans/en_CA.lang 0 → 100644
View file @ 88450f62
￿
\ No newline at end of file
data_nodist/trans/en_GB.lang
View file @ 88450f62
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.