Changeset 35707 in osm for applications/editors/josm

Timestamp:

2021-02-10T16:34:47+01:00 (3 years ago)

Author:

malcolmh

Message:

water/riverbanks overwrite coast line

File:

• applications/editors/josm/plugins/seachart/src/render/Rules.java (modified) (4 diffs)

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

@@ -287 +287 @@
                                 if (testObject(Obj.LOKBSN)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.LKBSPT)) for (Feature f : objects) if (testFeature(f)) areas();
+                                if (testObject(Obj.COALNE)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.LAKARE)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.RIVERS)) for (Feature f : objects) if (testFeature(f)) waterways();
                                 if (testObject(Obj.CANALS)) for (Feature f : objects) if (testFeature(f)) waterways();
                                 if (testObject(Obj.DEPARE)) for (Feature f : objects) if (testFeature(f)) areas();
-                                if (testObject(Obj.COALNE)) for (Feature f : objects) if (testFeature(f)) areas();
                                 if (testObject(Obj.ROADWY)) for (Feature f : objects) if (testFeature(f)) highways();
                                 if (testObject(Obj.RAILWY)) for (Feature f : objects) if (testFeature(f)) highways();
@@ -418 +418 @@
                         }
                         break;
+                case CANALS:
                 case LAKARE:
+                case RIVERS:
                         if ((Renderer.zoom >= 12) || (feature.geom.area > 10.0))
-                                Renderer.lineVector(new LineStyle(Symbols.Bwater));
+                                Renderer.lineVector(new LineStyle(Symbols.Bwater, 11, Symbols.Bwater));
                         break;
                 case DRGARE:
@@ -703 +705 @@
 
         private static void cables() {
-                if ((Renderer.zoom >= 16) && (feature.geom.length < 20)) {
+                if (((Renderer.zoom >= 14) && (feature.geom.length > 2) && (feature.geom.length < 20)) || ((Renderer.zoom >= 16) && (feature.geom.length <= 2))) {
                         if (feature.type == Obj.CBLSUB) {
                                 Renderer.lineSymbols(Areas.Cable, 0.0, null, null, 0, Symbols.Mline);
@@ -1300 +1302 @@
 
         private static void pipelines() {
-                if ((Renderer.zoom >= 16) && (feature.geom.length < 20)) {
+                if (((Renderer.zoom >= 14) && (feature.geom.length > 2) && (feature.geom.length < 20)) || ((Renderer.zoom >= 16) && (feature.geom.length <= 2))) {
                         if (feature.type == Obj.PIPSOL) {
                                 switch ((CatPIP) getAttEnum(feature.type, Att.CATPIP)) {