Changeset 34885 in osm

Timestamp:

2019-02-08T09:15:00+01:00 (6 years ago)

Author:

malcolmh

Message:

update

Location:

applications/editors/josm/plugins/seachart

Files:

• jrender/build.xml (modified) (3 diffs)
• jrender/src/jrender/Jrender.java (modified) (1 diff)
• src/render/Rules.java (modified) (6 diffs)

applications/editors/josm/plugins/seachart/jrender/build.xml

@@ -4 +4 @@
   <property name="build" location="build"/>
   <property name="jarfile" location="./jrender.jar"/>
-  <property name="batik.dir" value="../libs/"/>
-  <path id="classpath">
-    <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
-  </path>
 
   <target name="init">
@@ -14 +10 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" encoding="UTF-8" />
   </target>
 
@@ -23 +19 @@
         <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" />
     </jar>
   </target>

applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java

@@ -107 +107 @@
             bos.writeTo(fos);
             fos.close();
-            if (send.size() > 20) {
+            if (send.size() > 100) {
                 PrintWriter writer = new PrintWriter(srcdir + z + "-" + xdir + "-" + ynam + ".send", "UTF-8");
                 for (String str : send) {

applications/editors/josm/plugins/seachart/src/render/Rules.java

@@ -296 +296 @@
                                 if (testObject(Obj.SPLARE)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.SEAARE)) for (Feature f : objects) if (testFeature(f)) areas();
+                                if (testObject(Obj.DMPGRD)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.OBSTRN)) for (Feature f : objects) if (testFeature(f)) obstructions();
                                 if (testObject(Obj.UWTROC)) for (Feature f : objects) if (testFeature(f)) obstructions();
@@ -435 +436 @@
                 case RESARE:
                 case MIPARE:
+                case DMPGRD:
                         if (Renderer.zoom >= 12) {
                                 Renderer.lineSymbols(Areas.Restricted, 1.0, null, null, 0, Symbols.Mline);
@@ -969 +971 @@
                                         fncSym = Landmarks.RadioTV;
                                 Renderer.symbol(catSym);
-                                Renderer.symbol(fncSym);
+                                if (catSym != Landmarks.Spire)
+                                        Renderer.symbol(fncSym);
                                 break;
                         case SILTNK:
@@ -1183 +1186 @@
                                 Renderer.symbol(Areas.Rock);
                         }
-                } else {
-                        Renderer.symbol(Areas.Rock);
                 }
         }
@@ -1465 +1466 @@
                 if (Renderer.zoom >= 14) {
                         if (feature.type == Obj.RECTRC)
-                                Renderer.lineVector(new LineStyle(Color.black, 10, null, null));
+                                Renderer.lineVector(new LineStyle(Color.black, 5, null, null));
                         else if (feature.type == Obj.NAVLNE)
-                                Renderer.lineVector(new LineStyle(Color.black, 10, new float[] { 25, 25 }, null));
+                                Renderer.lineVector(new LineStyle(Color.black, 5, new float[] { 25, 25 }, null));
                 }
                 if (Renderer.zoom >= 15) {
@@ -1478 +1479 @@
                                 str += df.format(ort) + "º";
                                 if (!str.isEmpty())
-                                        Renderer.lineText(str, new Font("Arial", Font.PLAIN, 80), Color.black, -20);
+                                        Renderer.lineText(str, new Font("Arial", Font.PLAIN, 40), Color.black, -20);
                         }
                 }