Hi Gerd
Attached is patch for ShapeSplitter
Ticker
On Sat, 2017-07-15 at 19:40 +0100, Ticker Berkin wrote:
> The ShapeSplitter code looks like my mistake - I suspect it should be
> testing the lowPoint and highPoint, but need to think about this more
> carefully before committing myself.
>
> HousenumberGenerator not mine but - yes, looks like those 2 lines
> should be removed
>
> ShapeMergeFilter isn't mine, but looks OK. For efficiency it first
> tests if the names are the same object, then null/string ordering,
> finally a string comparison.
>
> Ticker
>
> On Sat, 2017-07-15 at 10:49 -0700, UliBaer wrote:
> > Hi there,
> >
> > examining the code of mkgmap i found some strange lines.
> >
> > In /mkgmap/src/uk/me/parabola/util/ShapeSplitter.java Line 330:
> > This is redundant?
> >
> > In
> > /mkgmap/src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberG
> > en
> > erator.java
> > Line 1537+1538:
> > This was already tested 6 lines above, so this cannot occur - Dead
> > code?
> >
> > In /mkgmap/src/uk/me/parabola/mkgmap/filters/ShapeMergeFilter.java
> > Line 554:
> > This is a String comparison, shouldn't *n1.equals(n2)* be used
> > instead?
> >
> > Just some thoughts of mine browsing the code - your opinions?
> >
> >
> >
> > --
> > View this message in context:
> > http://gis.19327.n8.nabble.com/Strange-code-in-mkgmap-tp5899307.htm
> > l
> > Sent from the Mkgmap Development mailing list archive at
> > Nabble.com.
> > _______________________________________________
> > mkgmap-dev mailing list
> > [email protected]
> > http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
> _______________________________________________
> mkgmap-dev mailing list
> [email protected]
> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Index: src/uk/me/parabola/util/ShapeSplitter.java
===================================================================
--- src/uk/me/parabola/util/ShapeSplitter.java (revision 3974)
+++ src/uk/me/parabola/util/ShapeSplitter.java (working copy)
@@ -279,31 +279,7 @@
/* Dec16/Jan17. Ticker Berkin. New implementation for splitting shapes.
-Eventually maybe can be used instead of some of the above and in following code:
-
-done mkgmap/build/MapArea.java
- mkgmap/filters/PolygonSplitterBase.java
- mkgmap/filters/ShapeMergeFilter.java
- mkgmap/general/AreaClipper.java
- mkgmap/general/PolygonClipper.java
- mkgmap/reader/osm/MultiPolygonRelation.java
-Maybe not this lot:
- mkgmap/reader/osm/boundary/BoundaryConverter.java
- mkgmap/reader/osm/boundary/BoundaryCoverageUtil.java
- mkgmap/reader/osm/boundary/BoundaryDiff.java
- mkgmap/reader/osm/boundary/BoundaryElement.java
- mkgmap/reader/osm/boundary/BoundaryFile2Gpx.java
- mkgmap/reader/osm/boundary/BoundaryQuadTree.java
- mkgmap/reader/osm/boundary/BoundaryRelation.java
- mkgmap/reader/osm/boundary/BoundarySaver.java
- mkgmap/reader/osm/boundary/BoundaryUtil.java
-? not sure about these
- mkgmap/reader/osm/SeaGenerator.java
- mkgmap/sea/optional/PrecompSeaGenerator.java
- mkgmap/sea/optional/PrecompSeaMerger.java
- util/ElementQuadTreeNode.java
- util/Java2DConverter.java
- util/QuadTreeNode.java
+Eventually maybe can be used instead of some of the above and elsewhere
*/
/**
@@ -327,7 +303,7 @@
MergeCloseHelper thisLine = lineInfo.get(inx);
if (thisLine.highPoint > endEnclosed) // only do enclosed items
break; // simple - fully enclosed
- if (thisLine.highPoint == endEnclosed && thisLine.highPoint == endEnclosed) // consider carefully
+ if (thisLine.lowPoint == endEnclosed && thisLine.highPoint == endEnclosed) // consider carefully
if (calledFromHole == (thisLine.areaOrHole == -1))
break; // stop if same type
inx = doLines(inx+1, thisLine.highPoint, calledFromHole ? thisLine : null, lineInfo, origList);
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
