Changeset 35772 in osm for applications/editors/josm

Timestamp:

2021-06-26T12:07:47+02:00 (3 years ago)

Author:

malcolmh

Message:

pipe & cable rule change

Location:

applications/editors/josm/plugins/seachart/src

Files:

• render/Rules.java (modified) (1 diff)
• s57/S57val.java (modified) (2 diffs)

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

@@ -1302 +1302 @@
 
         private static void pipelines() {
-                if (((Renderer.zoom >= 14) && (feature.geom.length > 2) && (feature.geom.length < 20)) || ((Renderer.zoom >= 16) && (feature.geom.length <= 2))) {
+                if ((Renderer.zoom >= 14)  && (feature.geom.length < 20)) {
                         if (feature.type == Obj.PIPSOL) {
                                 switch ((CatPIP) getAttEnum(feature.type, Att.CATPIP)) {

applications/editors/josm/plugins/seachart/src/s57/S57val.java

@@ -373 +373 @@
     }
 
-    public enum CatMOR { MOR_UNKN, MOR_DLPN, MOR_DDPN, MOR_BLRD, MOR_WALL, MOR_PILE, MOR_CHAN, MOR_BUOY, MOR_SHRP, MOR_AUTO, MOR_POST, MOR_WIRE, MOR_CABL }
+    public enum CatMOR { MOR_UNKN, MOR_DLPN, MOR_DDPN, MOR_BLRD, MOR_WALL, MOR_PILE, MOR_CHAN, MOR_BUOY, MOR_SHRP, MOR_AUTO, MOR_POST, MOR_WIRE, MOR_CABL, MOR_TROT }
 
     private static final EnumMap<CatMOR, S57enum> Catmor = new EnumMap<>(CatMOR.class); static {
@@ -381 +381 @@
         Catmor.put(CatMOR.MOR_BUOY, new S57enum(7, "buoy")); Catmor.put(CatMOR.MOR_SHRP, new S57enum(8, "shore_ropes")); Catmor.put(CatMOR.MOR_AUTO, new S57enum(9, "automatic"));
         Catmor.put(CatMOR.MOR_POST, new S57enum(10, "post")); Catmor.put(CatMOR.MOR_WIRE, new S57enum(11, "wire")); Catmor.put(CatMOR.MOR_CABL, new S57enum(12, "cable"));
+        Catmor.put(CatMOR.MOR_TROT, new S57enum(12, "trot"));
     }