CONTRIBUTION

@@ -25,7 +25,7 @@ Dirk Stöcker
 Michael Zangl
 
 Many minor contributions and patches by others; see SVN history
-at http://josm.openstreetmap.de/svn/ for details. Use
+at https://josm.openstreetmap.de/svn/ for details. Use
 "josm-dev AT openstreetmap.org" to contact still active authors.
 
 The logo has been designed by Ilya Palikov.

README

@@ -37,7 +37,7 @@ Under Linux, open a shell, go to the file directory and type
 your JAVA_HOME variable to the java executable location (the root location,
 not the bin).
 
-MacOS X users just click on the .jar file icon.
+macOS users just click on the .jar file icon.
 
 =============================================================================
             II. Development
@@ -93,6 +93,8 @@ This is an overview of the files and directories in the JOSM code repository:
                             archive of terms of use for the CHENyx06.gsb file
       - epsg                EPSG data file, taken from the proj.4 project
                             (see https://github.com/OSGeo/proj.4/blob/master/nad/epsg)
+      - esri                ESRI data file, taken from the proj.4 project
+                            (see https://github.com/OSGeo/proj.4/blob/master/nad/esri)
       - josm-epsg           customizations to the epsg file, used together with the epsg file
                             to generate data/projection/custom-epsg
                             

REVISION

 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
+   kind="dir"
    path="trunk"
-   revision="13367"
-   kind="dir">
+   revision="13500">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="13367">
+   revision="13500">
 <author>Don-vip</author>
-<date>2018-01-28T22:08:56.144724Z</date>
+<date>2018-03-04T15:20:37.045626Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -33,7 +33,6 @@
         <property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
         <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
-        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <property name="java.lang.version" value="1.8" />
         <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
         <property name="jacoco.inclbootstrapclasses" value="false" />
@@ -48,6 +47,14 @@
         <condition property="isJava9">
             <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
         </condition>
+        <!-- For Java10-specific stuff -->
+        <condition property="isJava10">
+            <matches string="${ant.java.version}" pattern="1[0-9]" />
+        </condition>
+        <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
+        <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
+            <isset property="isJava10"/>
+        </condition>
         <path id="test.classpath">
             <fileset dir="${test.dir}/lib">
                 <include name="**/*.jar"/>
@@ -376,6 +383,7 @@ Build-Date: ${build.tstamp}
             <link href="http://docs.oracle.com/javase/8/docs/api"/>
             <doctitle><![CDATA[<h2>JOSM - Javadoc</h2>]]></doctitle>
             <bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
+            <arg value="-html5" if:set="isJava9" />
             <arg value="--add-exports" if:set="isJava9" />
             <arg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
             <arg value="--add-exports" if:set="isJava9" />

data/boundaries.osm

@@ -39565,7 +39565,7 @@
     <nd ref='-11956' />
     <nd ref='-11952' />
     <tag k='ISO3166-1:alpha2' v='TW' />
-    <tag k='ISO3166-2' v='CN-71' />
+    <tag k='ISO3166-2' v='CN-TW' />
     <tag k='name:en' v='Taiwan' />
     <tag k='note' v='Self admin.; Claimed by China' />
   </way>
@@ -43863,7 +43863,7 @@
     <nd ref='-22530' />
     <nd ref='-22518' />
     <tag k='ISO3166-1:alpha2' v='HK' />
-    <tag k='ISO3166-2' v='CN-91' />
+    <tag k='ISO3166-2' v='CN-HK' />
     <tag k='driving_side' v='left' />
     <tag k='name:en' v='Hong Kong' />
   </way>
@@ -43935,7 +43935,7 @@
     <nd ref='-22610' />
     <nd ref='-22582' />
     <tag k='ISO3166-1:alpha2' v='MO' />
-    <tag k='ISO3166-2' v='CN-92' />
+    <tag k='ISO3166-2' v='CN-MO' />
     <tag k='driving_side' v='left' />
     <tag k='name:en' v='Macau' />
   </way>
@@ -50476,7 +50476,7 @@
     <nd ref='-22184' />
     <nd ref='-22186' />
     <nd ref='-22190' />
-    <tag k='ISO3166-2' v='CN-54' />
+    <tag k='ISO3166-2' v='CN-XZ' />
     <tag k='name:en' v='Tibet' />
   </way>
   <way id='-85625'>
@@ -50692,7 +50692,7 @@
     <nd ref='-85122' />
     <nd ref='-85124' />
     <nd ref='-85126' />
-    <tag k='ISO3166-2' v='CN-65' />
+    <tag k='ISO3166-2' v='CN-XJ' />
     <tag k='name:en' v='Xinjiang' />
   </way>
   <way id='-86238'>
@@ -51030,7 +51030,7 @@
     <nd ref='-13020' />
     <nd ref='-13018' />
     <nd ref='-7972' />
-    <tag k='ISO3166-2' v='CN-15' />
+    <tag k='ISO3166-2' v='CN-NM' />
     <tag k='name:en' v='Inner Mongolia' />
   </way>
   <way id='-86868'>
@@ -51190,7 +51190,7 @@
     <nd ref='-85284' />
     <nd ref='-85286' />
     <nd ref='-85288' />
-    <tag k='ISO3166-2' v='CN-63' />
+    <tag k='ISO3166-2' v='CN-QH' />
     <tag k='name:en' v='Qinghai' />
   </way>
   <way id='-87708'>
@@ -51395,7 +51395,7 @@
     <nd ref='-2502' />
     <nd ref='-2550' />
     <nd ref='-2504' />
-    <tag k='ISO3166-2' v='CN-45' />
+    <tag k='ISO3166-2' v='CN-GX' />
     <tag k='name:en' v='Guangxi' />
   </way>
   <way id='-88317'>
@@ -51762,7 +51762,7 @@
     <nd ref='-87372' />
     <nd ref='-87374' />
     <nd ref='-87376' />
-    <tag k='ISO3166-2' v='CN-53' />
+    <tag k='ISO3166-2' v='CN-YN' />
     <tag k='name:en' v='Yunnan' />
   </way>
   <way id='-89333'>
@@ -51960,7 +51960,7 @@
     <nd ref='-86943' />
     <nd ref='-86947' />
     <nd ref='-86949' />
-    <tag k='ISO3166-2' v='CN-51' />
+    <tag k='ISO3166-2' v='CN-SC' />
     <tag k='name:en' v='Sichuan' />
   </way>
   <way id='-90005'>
@@ -52104,7 +52104,7 @@
     <nd ref='-89342' />
     <nd ref='-89340' />
     <nd ref='-89338' />
-    <tag k='ISO3166-2' v='CN-62' />
+    <tag k='ISO3166-2' v='CN-GS' />
     <tag k='name:en' v='Gansu' />
   </way>
   <way id='-90235'>
@@ -52137,7 +52137,7 @@
     <nd ref='-90111' />
     <nd ref='-90113' />
     <nd ref='-90115' />
-    <tag k='ISO3166-2' v='CN-64' />
+    <tag k='ISO3166-2' v='CN-NX' />
     <tag k='name:en' v='Ningxia' />
   </way>
   <way id='-90295'>
@@ -52270,7 +52270,7 @@
     <nd ref='-86293' />
     <nd ref='-86295' />
     <nd ref='-86297' />
-    <tag k='ISO3166-2' v='CN-23' />
+    <tag k='ISO3166-2' v='CN-HL' />
     <tag k='name:en' v='Heilongjiang' />
   </way>
   <way id='-90451'>
@@ -52402,7 +52402,7 @@
     <nd ref='-86343' />
     <nd ref='-86345' />
     <nd ref='-86347' />
-    <tag k='ISO3166-2' v='CN-22' />
+    <tag k='ISO3166-2' v='CN-JL' />
     <tag k='name:en' v='Jilin' />
   </way>
   <way id='-90625'>
@@ -52486,7 +52486,7 @@
     <nd ref='-27310' />
     <nd ref='-12220' />
     <nd ref='-10870' />
-    <tag k='ISO3166-2' v='CN-21' />
+    <tag k='ISO3166-2' v='CN-LN' />
     <tag k='name:en' v='Liaoning' />
   </way>
   <way id='-90752'>
@@ -55969,8 +55969,8 @@
     <nd ref='-2170' />
     <nd ref='-2166' />
     <nd ref='-2168' />
-    <tag k='ISO3166-2' v='IN-AP' />
-    <tag k='name:en' v='Andhra Pradesh' />
+    <tag k='ISO3166-2' v='IN-AR' />
+    <tag k='name:en' v='Arunachal Pradesh' />
   </way>
   <way id='-98272'>
     <nd ref='-27426' />
@@ -56385,7 +56385,7 @@
     <nd ref='-90191' />
     <nd ref='-90193' />
     <nd ref='-90195' />
-    <tag k='ISO3166-2' v='CN-61' />
+    <tag k='ISO3166-2' v='CN-SN' />
     <tag k='name:en' v='Shaanxi' />
   </way>
   <way id='-98912'>
@@ -56570,7 +56570,7 @@
     <nd ref='-87462' />
     <nd ref='-87464' />
     <nd ref='-87466' />
-    <tag k='ISO3166-2' v='CN-52' />
+    <tag k='ISO3166-2' v='CN-GZ' />
     <tag k='name:en' v='Guizhou' />
   </way>
   <way id='-99015'>
@@ -56727,7 +56727,7 @@
     <nd ref='-99021' />
     <nd ref='-99017' />
     <nd ref='-99011' />
-    <tag k='ISO3166-2' v='CN-50' />
+    <tag k='ISO3166-2' v='CN-CQ' />
     <tag k='name:en' v='Chongqing' />
   </way>
   <way id='-99432'>
@@ -56737,7 +56737,7 @@
     <nd ref='-99434' />
     <nd ref='-11958' />
     <nd ref='-11960' />
-    <tag k='ISO3166-2' v='CN-46' />
+    <tag k='ISO3166-2' v='CN-HI' />
     <tag k='name:en' v='Hainan' />
   </way>
   <way id='-99452'>
@@ -57006,7 +57006,7 @@
     <nd ref='-98983' />
     <nd ref='-98985' />
     <nd ref='-99758' />
-    <tag k='ISO3166-2' v='CN-43' />
+    <tag k='ISO3166-2' v='CN-HN' />
     <tag k='name:en' v='Hunan' />
   </way>
   <way id='-100002'>
@@ -57157,7 +57157,7 @@
     <nd ref='-98763' />
     <nd ref='-98765' />
     <nd ref='-98767' />
-    <tag k='ISO3166-2' v='CN-42' />
+    <tag k='ISO3166-2' v='CN-HB' />
     <tag k='name:en' v='Hubei' />
   </way>
   <way id='-100210'>
@@ -57262,7 +57262,7 @@
     <nd ref='-98775' />
     <nd ref='-98777' />
     <nd ref='-98779' />
-    <tag k='ISO3166-2' v='CN-41' />
+    <tag k='ISO3166-2' v='CN-HA' />
     <tag k='name:en' v='Henan' />
   </way>
   <way id='-100399'>
@@ -57320,7 +57320,7 @@
     <nd ref='-11932' />
     <nd ref='-10870' />
     <nd ref='-90624' />
-    <tag k='ISO3166-2' v='CN-37' />
+    <tag k='ISO3166-2' v='CN-SD' />
     <tag k='name:en' v='Shandong' />
   </way>
   <way id='-100491'>
@@ -57442,7 +57442,7 @@
     <nd ref='-99571' />
     <nd ref='-99569' />
     <nd ref='-99567' />
-    <tag k='ISO3166-2' v='CN-36' />
+    <tag k='ISO3166-2' v='CN-JX' />
     <tag k='name:en' v='Jiangxi' />
   </way>
   <way id='-100567'>
@@ -57565,7 +57565,7 @@
     <nd ref='-100573' />
     <nd ref='-100569' />
     <nd ref='-100564' />
-    <tag k='ISO3166-2' v='CN-34' />
+    <tag k='ISO3166-2' v='CN-AH' />
     <tag k='name:en' v='Anhui' />
   </way>
   <way id='-100680'>
@@ -57642,7 +57642,7 @@
     <nd ref='-99521' />
     <nd ref='-99519' />
     <nd ref='-99515' />
-    <tag k='ISO3166-2' v='CN-35' />
+    <tag k='ISO3166-2' v='CN-FJ' />
     <tag k='name:en' v='Fujian' />
   </way>
   <way id='-100973'>
@@ -57715,7 +57715,7 @@
     <nd ref='-100692' />
     <nd ref='-100689' />
     <nd ref='-11942' />
-    <tag k='ISO3166-2' v='CN-33' />
+    <tag k='ISO3166-2' v='CN-ZJ' />
     <tag k='name:en' v='Zhejiang' />
   </way>
   <way id='-101075'>
@@ -57813,7 +57813,7 @@
     <nd ref='-100990' />
     <nd ref='-100988' />
     <nd ref='-100986' />
-    <tag k='ISO3166-2' v='CN-32' />
+    <tag k='ISO3166-2' v='CN-JS' />
     <tag k='name:en' v='Jiangsu' />
   </way>
   <way id='-101242'>
@@ -57850,7 +57850,7 @@
     <nd ref='-101116' />
     <nd ref='-101118' />
     <nd ref='-11942' />
-    <tag k='ISO3166-2' v='CN-31' />
+    <tag k='ISO3166-2' v='CN-SH' />
     <tag k='name:en' v='Shanghai' />
   </way>
   <way id='-101286'>
@@ -57943,7 +57943,7 @@
     <nd ref='-100211' />
     <nd ref='-100209' />
     <nd ref='-98779' />
-    <tag k='ISO3166-2' v='CN-14' />
+    <tag k='ISO3166-2' v='CN-SX' />
     <tag k='name:en' v='Shanxi' />
   </way>
   <way id='-101411'>
@@ -58138,7 +58138,7 @@
     <nd ref='-101378' />
     <nd ref='-101380' />
     <nd ref='-101382' />
-    <tag k='ISO3166-2' v='CN-13' />
+    <tag k='ISO3166-2' v='CN-HE' />
     <tag k='name:en' v='Hebei' />
   </way>
   <way id='-101711'>
@@ -58192,7 +58192,7 @@
     <nd ref='-101437' />
     <nd ref='-101435' />
     <nd ref='-101433' />
-    <tag k='ISO3166-2' v='CN-12' />
+    <tag k='ISO3166-2' v='CN-TJ' />
     <tag k='name:en' v='Tianjin' />
   </way>
   <way id='-101781'>
@@ -58262,7 +58262,7 @@
     <nd ref='-101579' />
     <nd ref='-101581' />
     <nd ref='-101731' />
-    <tag k='ISO3166-2' v='CN-11' />
+    <tag k='ISO3166-2' v='CN-BJ' />
     <tag k='name:en' v='Beijing' />
   </way>
   <relation id='-29600'>
@@ -58715,7 +58715,7 @@
     <member type='way' ref='-99452' role='outer' />
     <member type='way' ref='-29370' role='inner' />
     <member type='way' ref='-29384' role='inner' />
-    <tag k='ISO3166-2' v='CN-44' />
+    <tag k='ISO3166-2' v='CN-GD' />
     <tag k='name:en' v='Guangdong' />
     <tag k='type' v='multipolygon' />
   </relation>

data/help-browser.css

 @CHARSET "ISO-8859-1";
 /*
- * This is the CSS file used in the internal help browser
+ * This is the CSS file used in the internal help browser.
+ * Refer to https://docs.oracle.com/javase/8/docs/api/javax/swing/text/html/CSS.html
+ * and https://www.w3.org/TR/CSS1/ to see what CSS properties are supported by Java.
+ * - Not rendered are width, height, float, clear, display, font-variant and others.
+ * - Inline elements can't have borders, margins and paddings.
  */
 body {margin-left: 0.2cm; font-family: Arial, sans-serif; font-size:14pt; font-weight:normal}
 p {margin-top: 5px; margin-bottom: 5px;}
@@ -16,8 +20,14 @@ strong {font-weight: bold}
 b {font-weight: bold}
 em {font-style: italic}
 i {font-style: italic}
-tt {font-family: Courier New}
-pre {font-family: Courier New}
+code, pre, samp, tt {
+	background-color: rgb(240, 240, 240);
+	font-family: Courier New;
+	color: rgb(102, 0, 0);
+}
+code, tt {
+	font-size: 110%;
+}
 .warning-header {
 	font-family: Arial, sans-serif; 
 	font-size:24pt; 
@@ -43,3 +53,135 @@ pre {font-family: Courier New}
 	border-style: solid; 
 	border-width: 1px;
 }
+
+/********
+ TRAC CSS
+ ********/
+
+div.code pre .hll { background-color: #ffffcc }
+div.code pre  { background: #ffffff; }
+div.code pre .c { color: #999988; font-style: italic } /* Comment */
+div.code pre .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+div.code pre .k { font-weight: bold } /* Keyword */
+div.code pre .o { font-weight: bold } /* Operator */
+div.code pre .ch { color: #999988; font-style: italic } /* Comment.Hashbang */
+div.code pre .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+div.code pre .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+div.code pre .cpf { color: #999988; font-style: italic } /* Comment.PreprocFile */
+div.code pre .c1 { color: #999988; font-style: italic } /* Comment.Single */
+div.code pre .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+div.code pre .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+div.code pre .ge { font-style: italic } /* Generic.Emph */
+div.code pre .gr { color: #aa0000 } /* Generic.Error */
+div.code pre .gh { color: #999999 } /* Generic.Heading */
+div.code pre .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+div.code pre .go { color: #888888 } /* Generic.Output */
+div.code pre .gp { color: #555555 } /* Generic.Prompt */
+div.code pre .gs { font-weight: bold } /* Generic.Strong */
+div.code pre .gu { color: #aaaaaa } /* Generic.Subheading */
+div.code pre .gt { color: #aa0000 } /* Generic.Traceback */
+div.code pre .kc { font-weight: bold } /* Keyword.Constant */
+div.code pre .kd { font-weight: bold } /* Keyword.Declaration */
+div.code pre .kn { font-weight: bold } /* Keyword.Namespace */
+div.code pre .kp { font-weight: bold } /* Keyword.Pseudo */
+div.code pre .kr { font-weight: bold } /* Keyword.Reserved */
+div.code pre .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+div.code pre .m { color: #009999 } /* Literal.Number */
+div.code pre .s { color: #bb8844 } /* Literal.String */
+div.code pre .na { color: #008080 } /* Name.Attribute */
+div.code pre .nb { color: #999999 } /* Name.Builtin */
+div.code pre .nc { color: #445588; font-weight: bold } /* Name.Class */
+div.code pre .no { color: #008080 } /* Name.Constant */
+div.code pre .ni { color: #800080 } /* Name.Entity */
+div.code pre .ne { color: #990000; font-weight: bold } /* Name.Exception */
+div.code pre .nf { color: #990000; font-weight: bold } /* Name.Function */
+div.code pre .nn { color: #555555 } /* Name.Namespace */
+div.code pre .nt { color: #000080 } /* Name.Tag */
+div.code pre .nv { color: #008080 } /* Name.Variable */
+div.code pre .ow { font-weight: bold } /* Operator.Word */
+div.code pre .w { color: #bbbbbb } /* Text.Whitespace */
+div.code pre .mb { color: #009999 } /* Literal.Number.Bin */
+div.code pre .mf { color: #009999 } /* Literal.Number.Float */
+div.code pre .mh { color: #009999 } /* Literal.Number.Hex */
+div.code pre .mi { color: #009999 } /* Literal.Number.Integer */
+div.code pre .mo { color: #009999 } /* Literal.Number.Oct */
+div.code pre .sb { color: #bb8844 } /* Literal.String.Backtick */
+div.code pre .sc { color: #bb8844 } /* Literal.String.Char */
+div.code pre .sd { color: #bb8844 } /* Literal.String.Doc */
+div.code pre .s2 { color: #bb8844 } /* Literal.String.Double */
+div.code pre .se { color: #bb8844 } /* Literal.String.Escape */
+div.code pre .sh { color: #bb8844 } /* Literal.String.Heredoc */
+div.code pre .si { color: #bb8844 } /* Literal.String.Interpol */
+div.code pre .sx { color: #bb8844 } /* Literal.String.Other */
+div.code pre .sr { color: #808000 } /* Literal.String.Regex */
+div.code pre .s1 { color: #bb8844 } /* Literal.String.Single */
+div.code pre .ss { color: #bb8844 } /* Literal.String.Symbol */
+div.code pre .bp { color: #999999 } /* Name.Builtin.Pseudo */
+div.code pre .vc { color: #008080 } /* Name.Variable.Class */
+div.code pre .vg { color: #008080 } /* Name.Variable.Global */
+div.code pre .vi { color: #008080 } /* Name.Variable.Instance */
+div.code pre .il { color: #009999 } /* Literal.Number.Integer.Long */
+
+table.code td .hll { background-color: #ffffcc }
+table.code td  { background: #ffffff; }
+table.code td .c { color: #999988; font-style: italic } /* Comment */
+table.code td .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+table.code td .k { font-weight: bold } /* Keyword */
+table.code td .o { font-weight: bold } /* Operator */
+table.code td .ch { color: #999988; font-style: italic } /* Comment.Hashbang */
+table.code td .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+table.code td .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+table.code td .cpf { color: #999988; font-style: italic } /* Comment.PreprocFile */
+table.code td .c1 { color: #999988; font-style: italic } /* Comment.Single */
+table.code td .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+table.code td .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+table.code td .ge { font-style: italic } /* Generic.Emph */
+table.code td .gr { color: #aa0000 } /* Generic.Error */
+table.code td .gh { color: #999999 } /* Generic.Heading */
+table.code td .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+table.code td .go { color: #888888 } /* Generic.Output */
+table.code td .gp { color: #555555 } /* Generic.Prompt */
+table.code td .gs { font-weight: bold } /* Generic.Strong */
+table.code td .gu { color: #aaaaaa } /* Generic.Subheading */
+table.code td .gt { color: #aa0000 } /* Generic.Traceback */
+table.code td .kc { font-weight: bold } /* Keyword.Constant */
+table.code td .kd { font-weight: bold } /* Keyword.Declaration */
+table.code td .kn { font-weight: bold } /* Keyword.Namespace */
+table.code td .kp { font-weight: bold } /* Keyword.Pseudo */
+table.code td .kr { font-weight: bold } /* Keyword.Reserved */
+table.code td .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+table.code td .m { color: #009999 } /* Literal.Number */
+table.code td .s { color: #bb8844 } /* Literal.String */
+table.code td .na { color: #008080 } /* Name.Attribute */
+table.code td .nb { color: #999999 } /* Name.Builtin */
+table.code td .nc { color: #445588; font-weight: bold } /* Name.Class */
+table.code td .no { color: #008080 } /* Name.Constant */
+table.code td .ni { color: #800080 } /* Name.Entity */
+table.code td .ne { color: #990000; font-weight: bold } /* Name.Exception */
+table.code td .nf { color: #990000; font-weight: bold } /* Name.Function */
+table.code td .nn { color: #555555 } /* Name.Namespace */
+table.code td .nt { color: #000080 } /* Name.Tag */
+table.code td .nv { color: #008080 } /* Name.Variable */
+table.code td .ow { font-weight: bold } /* Operator.Word */
+table.code td .w { color: #bbbbbb } /* Text.Whitespace */
+table.code td .mb { color: #009999 } /* Literal.Number.Bin */
+table.code td .mf { color: #009999 } /* Literal.Number.Float */
+table.code td .mh { color: #009999 } /* Literal.Number.Hex */
+table.code td .mi { color: #009999 } /* Literal.Number.Integer */
+table.code td .mo { color: #009999 } /* Literal.Number.Oct */
+table.code td .sb { color: #bb8844 } /* Literal.String.Backtick */
+table.code td .sc { color: #bb8844 } /* Literal.String.Char */
+table.code td .sd { color: #bb8844 } /* Literal.String.Doc */
+table.code td .s2 { color: #bb8844 } /* Literal.String.Double */
+table.code td .se { color: #bb8844 } /* Literal.String.Escape */
+table.code td .sh { color: #bb8844 } /* Literal.String.Heredoc */
+table.code td .si { color: #bb8844 } /* Literal.String.Interpol */
+table.code td .sx { color: #bb8844 } /* Literal.String.Other */
+table.code td .sr { color: #808000 } /* Literal.String.Regex */
+table.code td .s1 { color: #bb8844 } /* Literal.String.Single */
+table.code td .ss { color: #bb8844 } /* Literal.String.Symbol */
+table.code td .bp { color: #999999 } /* Name.Builtin.Pseudo */
+table.code td .vc { color: #008080 } /* Name.Variable.Class */
+table.code td .vg { color: #008080 } /* Name.Variable.Global */
+table.code td .vi { color: #008080 } /* Name.Variable.Instance */
+table.code td .il { color: #009999 } /* Literal.Number.Integer.Long */

data/validator/combinations.mapcss

@@ -20,7 +20,7 @@ way[zip_left                   ][!highway],
 way[zip_right                  ][!highway],
 way[detail                     ][!railway][route!=railway],
 way[eddy_current_brake         ][!railway][route!=railway],
-way[electrified                ][!railway][route!=railway],
+way[electrified                ][!railway][route!=railway][!highway], /* #16007 */
 way[etcs                       ][!railway][route!=railway],
 way[gauge                      ][!railway][route!=railway],
 way[grade_of_track             ][!railway][route!=railway],
@@ -202,14 +202,9 @@ way[incline                    ][!highway][!railway][aeroway!~/^(runway|taxiway)
   group: tr("missing tag");
 }
 
-/* {0.tag} together with {1.key}, see #10837, #14034 */
+/* {0.tag} together with {1.key}, see #10837, #14034, #9389, #11977, #13156 */
 *[amenity=vending_machine][shop],
-*[noname?][name] {
-  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
-  group: tr("suspicious tag combination");
-}
-
-/* {0.tag} together with {1.key}, see #9389, #11977, #13156 */
+*[noname?][name],
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
 way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath],
 way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
@@ -230,6 +225,12 @@ way[highway=footway][bicycle=designated] {
   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}");
+  group: tr("suspicious tag combination");
+}
+
 /* #11127, #13727 */
 way[waterway][bridge=yes][waterway!=weir] {
   throwWarning: tr("{0} together with {1}", "{0.key}", "{1.tag}");

data/validator/deprecated.mapcss

@@ -537,16 +537,16 @@ way[sidewalk=yes] {
   group: tr("deprecated tagging");
 }
 
-/* see #10346 */
-way[oneway=1] {
+/* see #10346, #15667 (waterway has its own rules in unnecessary.mapcss) */
+way[oneway=1][!waterway] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "oneway=yes";
   group: tr("deprecated tagging");
   fixAdd: "oneway=yes";
 }
 
-/* see #11329 */
-way[oneway=-1] {
+/* see #11329, #15667 */
+way[oneway=-1][!waterway] {
   throwWarning: tr("{0} is not recommended. Use the Reverse Ways function from the Tools menu.", "{0.tag}");
 }
 
@@ -1215,3 +1215,10 @@ way[water=tidal] {
   fixRemove: "water";
   group: tr("deprecated tagging");
 }
+
+*[amenity=toilet] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "amenity=toilets";
+  group: tr("misspelled value");
+  fixAdd: "amenity=toilets";
+}
\ No newline at end of file

data/validator/geometry.mapcss

@@ -305,6 +305,11 @@ area:closed[place=island][eval(areasize()) < 500000] {
   fixAdd: "place=islet";
 }
 
+/* #15648 */
+way[place=island]!:closed {
+  throwError: tr("Way with {1} not closed.", "{0.tag}");
+}
+
 /* #12561 - building larger than Aalsmeer Flower Auction (518000) and Tesla factory (510000) */
 area:closed[building][building!=no][eval(areasize()) > 520000] {
   throwError: tr("Too large building");

data/validator/highway.mapcss

@@ -52,7 +52,7 @@ way[highway=unclassified][!name][noname!=yes] {
   assertNoMatch: "way highway=unclassified name=Foo";
 }
 
-way.major_road[!ref][!destination:ref][noref!=yes] {
+way.major_road[!ref][!destination:ref][noref!=yes][junction!=roundabout] {
   throwOther: tr("highway without a reference");
   group: tr("missing tag");
   assertMatch: "way highway=primary";

data/validator/ignoretags.cfg

@@ -146,6 +146,7 @@ K:man_made=yes
 K:railway=construction
 K:railway=razed
 K:railway=stop
+K:station=subway
 K:office=yes
 K:pilgrimage=yes
 K:bdouble=yes
@@ -326,4 +327,3 @@ K:man_made=mast
 K:amenity=childcare
 K:landuse=logging
 K:power=catenary_mast
\ No newline at end of file
-K:man_made=kiln
\ No newline at end of file

data/validator/unnecessary.mapcss

@@ -24,7 +24,9 @@ area:closed[shop    ][area?] {
   fixRemove: "{2.key}";
 }
 
-/* #14256 */
+/* #14256, #15664 */
+area:closed[highway=rest_area][area?],
+area:closed[highway=services][area?],
 area:closed[aeroway=aerodrome][area?],
 area:closed[aeroway=helipad][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.tag}");
@@ -51,3 +53,14 @@ way >:sameTags node:tagged {
   group: tr("unnecessary tag");
   fixRemove: "payment:cash";
 }
+
+/* see #10346, #15667 */
+way[waterway][oneway?] {
+  throwWarning: tr("{0} is unnecessary for {1}", "{1.key}", "{0.key}");
+  group: tr("unnecessary tag");
+  fixRemove: "{1.key}";
+}
+way[waterway][oneway=-1] {
+  throwWarning: tr("{0} is unnecessary for {1}. The flow direction is defined by the way direction.", "{1.key}", "{0.key}");
+  group: tr("unnecessary tag");
+}
\ No newline at end of file

data_nodist/projection/josm-epsg

@@ -417,6 +417,8 @@
 <6811> +proj=omerc +lat_0=45.91666666666666 +lonc=-123 +alpha=295 +k=1 +x_0=7000000.00000248 +y_0=-2999999.999988 +no_uoff +gamma=295 +ellps=GRS80 +units=ft +no_defs +bounds=-125,45,-121,47 <>
 # NAD83(2011) / Oregon Columbia River West zone (m)
 <6810> +proj=omerc +lat_0=45.91666666666666 +lonc=-123 +alpha=295 +k=1 +x_0=7000000 +y_0=-3000000 +no_uoff +gamma=295 +ellps=GRS80 +units=m +no_defs +bounds=-125,45,-121,47 <>
+# NAD83(2011) / PCCS zone 1 (ft)
+<8065> +proj=omerc +lat_0=32.25 +lonc=-111.4 +alpha=45 +k=1.00011 +x_0=48768 +y_0=243840 +gamma=45 +ellps=GRS80 +units=ft +no_defs +bounds=-112,31,-110,33 <>
 ##
 ## Following entries use Sinusoidal projection
 ##

debian/changelog

+josm (0.0.svn13500+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 10 Mar 2018 07:38:45 +0100
+
+josm (0.0.svn13500+dfsg-1) unstable; urgency=medium
+
+  * New hotfix tested snapshot.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 04 Mar 2018 19:02:35 +0100
+
+josm (0.0.svn13478+dfsg-1) unstable; urgency=medium
+
+  * New tested snapshot.
+  * Update watch file to not use URL on Alioth (will be shutdown).
+  * Bump minimum required jmapviewer version to 2.6.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 01 Mar 2018 16:08:28 +0100
+
 josm (0.0.svn13367+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9~),
                gettext,
                groovy,
                javacc,
-               jmapviewer (>= 2.5),
+               jmapviewer (>= 2.6),
                libcommons-compress-java,
                libcommons-logging-java,
                libgettext-ant-tasks-java,
@@ -30,7 +30,7 @@ Package: josm
 Architecture: all
 Depends: default-jre (>= 2:1.8) | java8-runtime,
          fonts-noto,
-         jmapviewer (>= 2.5),
+         jmapviewer (>= 2.6),
          libcommons-compress-java,
          libcommons-logging-java,
          libgettext-commons-java (>= 0.9.6),