Index: /applications/editors/josm/plugins/seachart/.classpath
===================================================================
--- /applications/editors/josm/plugins/seachart/.classpath	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/.classpath	(revision 32368)
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="jbasemap/src"/>
 	<classpathentry kind="src" path="jicons/src"/>
 	<classpathentry kind="src" path="jplotter/src"/>
 	<classpathentry kind="src" path="jrender/src"/>
 	<classpathentry kind="src" path="js57toosm/src"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="josmtos57/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="lib" path="libs/batik-svggen-1.8.jar"/>
+	<classpathentry kind="lib" path="libs/batik-dom-1.8.jar"/>
+	<classpathentry kind="lib" path="libs/batik-util-1.8.jar"/>
+	<classpathentry kind="lib" path="libs/batik-awt-util-1.8.jar"/>
+	<classpathentry kind="lib" path="libs/batik-ext-1.8.jar"/>
+	<classpathentry kind="lib" path="libs/batik-xml-1.8.jar"/>
+	<classpathentry kind="lib" path="libs/commons-lang3-3.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/seachart/.project
===================================================================
--- /applications/editors/josm/plugins/seachart/.project	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/.project	(revision 32368)
@@ -11,4 +11,9 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
Index: /applications/editors/josm/plugins/seachart/jbasemap/build.xml
===================================================================
--- /applications/editors/josm/plugins/seachart/jbasemap/build.xml	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/jbasemap/build.xml	(revision 32368)
@@ -1,11 +1,12 @@
 <project name="jbasemap" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jbasemap.jar"/>
-  <property name="batik.dir" value="/usr/local/bin/batik-1.7/"/>
+  <property name="batik.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
   </path>
-            
+
   <target name="init">
     <mkdir dir="${build}"/>
@@ -13,5 +14,5 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
 
@@ -22,10 +23,10 @@
         <attribute name="Class-Path" value="$jarfile"/>
       </manifest>
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml-1.8.jar" />
     </jar>
   </target>
Index: plications/editors/josm/plugins/seachart/jbasemap/src/render
===================================================================
--- /applications/editors/josm/plugins/seachart/jbasemap/src/render	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/render
Index: plications/editors/josm/plugins/seachart/jbasemap/src/s57
===================================================================
--- /applications/editors/josm/plugins/seachart/jbasemap/src/s57	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/s57
Index: plications/editors/josm/plugins/seachart/jbasemap/src/symbols
===================================================================
--- /applications/editors/josm/plugins/seachart/jbasemap/src/symbols	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/symbols
Index: /applications/editors/josm/plugins/seachart/jicons/build.xml
===================================================================
--- /applications/editors/josm/plugins/seachart/jicons/build.xml	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/jicons/build.xml	(revision 32368)
@@ -1,11 +1,12 @@
 <project name="jicons" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jicons.jar"/>
-  <property name="batik.dir" value="/usr/local/bin/batik-1.7/"/>
+  <property name="batik.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
   </path>
-            
+
   <target name="init">
     <mkdir dir="${build}"/>
@@ -13,5 +14,5 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
 
@@ -22,10 +23,10 @@
         <attribute name="Class-Path" value="$jarfile"/>
       </manifest>
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml-1.8.jar" />
     </jar>
   </target>
Index: plications/editors/josm/plugins/seachart/jicons/src/render
===================================================================
--- /applications/editors/josm/plugins/seachart/jicons/src/render	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/render
Index: plications/editors/josm/plugins/seachart/jicons/src/s57
===================================================================
--- /applications/editors/josm/plugins/seachart/jicons/src/s57	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/s57
Index: plications/editors/josm/plugins/seachart/jicons/src/symbols
===================================================================
--- /applications/editors/josm/plugins/seachart/jicons/src/symbols	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/symbols
Index: /applications/editors/josm/plugins/seachart/josmtos57/build.xml
===================================================================
--- /applications/editors/josm/plugins/seachart/josmtos57/build.xml	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/josmtos57/build.xml	(revision 32368)
@@ -1,15 +1,16 @@
 <project name="josmtos57" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./josmtos57.jar"/>
-  
+
   <target name="init">
     <mkdir dir="${build}"/>
   </target>
-  
+
   <target name="compile" depends="init" description="compile the source">
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}"/>
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}"/>
   </target>
-  
+
   <target name="dist" depends="compile" description="generate the distribution">
     <jar jarfile="${jarfile}" basedir="${build}" manifestencoding="UTF-8">
@@ -20,5 +21,5 @@
     </jar>
   </target>
-  
+
   <target name="clean" description="clean up">
     <delete dir="${build}"/>
Index: /applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java
===================================================================
--- /applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java	(revision 32368)
@@ -86,5 +86,5 @@
 			in = new BufferedReader(new FileReader(new File(args[0])));
 			try {
-				S57osm.OSMmap(in, map);
+				S57osm.OSMmap(in, map, true);
 			} catch (Exception e) {
 				System.err.println("Input data error");
Index: plications/editors/josm/plugins/seachart/josmtos57/src/s57
===================================================================
--- /applications/editors/josm/plugins/seachart/josmtos57/src/s57	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/s57
Index: /applications/editors/josm/plugins/seachart/jplotter/build.xml
===================================================================
--- /applications/editors/josm/plugins/seachart/jplotter/build.xml	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/jplotter/build.xml	(revision 32368)
@@ -1,4 +1,5 @@
 <project name="jplotter" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jplotter.jar"/>
@@ -9,5 +10,5 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}"/>
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}"/>
   </target>
 
Index: /applications/editors/josm/plugins/seachart/jrender/build.xml
===================================================================
--- /applications/editors/josm/plugins/seachart/jrender/build.xml	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/jrender/build.xml	(revision 32368)
@@ -1,11 +1,12 @@
 <project name="jrender" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jrender.jar"/>
-  <property name="batik.dir" value="/usr/local/bin/batik-1.7/"/>
+  <property name="batik.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
   </path>
-            
+
   <target name="init">
     <mkdir dir="${build}"/>
@@ -13,5 +14,5 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
 
Index: plications/editors/josm/plugins/seachart/jrender/src/render
===================================================================
--- /applications/editors/josm/plugins/seachart/jrender/src/render	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/render
Index: plications/editors/josm/plugins/seachart/jrender/src/s57
===================================================================
--- /applications/editors/josm/plugins/seachart/jrender/src/s57	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/s57
Index: plications/editors/josm/plugins/seachart/jrender/src/symbols
===================================================================
--- /applications/editors/josm/plugins/seachart/jrender/src/symbols	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/symbols
Index: /applications/editors/josm/plugins/seachart/js57toosm/build.xml
===================================================================
--- /applications/editors/josm/plugins/seachart/js57toosm/build.xml	(revision 32367)
+++ /applications/editors/josm/plugins/seachart/js57toosm/build.xml	(revision 32368)
@@ -1,17 +1,18 @@
 <project name="js57toosm" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./js57toosm.jar"/>
-  <property name="lang.dir" value="/usr/local/bin/commons-lang3-3.4/"/>
+  <property name="lang.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${lang.dir}" includes="**/commons-lang3-3.4.jar"/>
   </path>
-  
+
   <target name="init">
     <mkdir dir="${build}"/>
   </target>
-  
+
   <target name="compile" depends="init" description="compile the source">
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
   
@@ -25,5 +26,5 @@
     </jar>
   </target>
-  
+
   <target name="clean" description="clean up">
     <delete dir="${build}"/>
Index: plications/editors/josm/plugins/seachart/js57toosm/src/s57
===================================================================
--- /applications/editors/josm/plugins/seachart/js57toosm/src/s57	(revision 32367)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../src/s57