Changeset 31716 in osm for applications/editors/josm/plugins/seachart/src

Timestamp:

2015-10-27T09:09:48+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart] fix errors

Location:

applications/editors/josm/plugins/seachart/src

Files:

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

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

@@ -190 +190 @@
                         if (testObject(Obj.LKBSPT)) for (Feature f : objects) if (testFeature(f)) areas();
                         if (testObject(Obj.LAKARE)) for (Feature f : objects) if (testFeature(f)) areas();
-                        if (testObject(Obj.RIVBNK)) 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();
@@ -286 +285 @@
                         break;
                 case LAKARE:
-                case RIVBNK:
                         Renderer.lineVector(feature, new LineStyle(Symbols.Bwater, 10, Symbols.Bwater));
                         break;

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

@@ -37 +37 @@
         static {
                 OSMtags.put("natural=coastline", new KeyVal<>(Obj.COALNE, Att.UNKATT, null, null)); OSMtags.put("natural=water", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null));
-                OSMtags.put("waterway=river", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null));
+                OSMtags.put("waterway=river", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null)); OSMtags.put("waterway=riverbank", new KeyVal<>(Obj.COALNE, Att.UNKATT, null, null));
                 OSMtags.put("waterway=canal", new KeyVal<>(Obj.CANALS, Att.UNKATT, null, null)); OSMtags.put("waterway=dock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null));
                 OSMtags.put("waterway=lock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null)); OSMtags.put("landuse=basin", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null));