Mark Burton wrote:
Felix,
okay - 1.st all my patches against trunk (current revision) that I have applied. 2. StyleedCoverter.java
Thanks for those - but I don't see you using duplicate()? Can you send me the copy of StyledConverter.java that you tried putting the duplicate() into?
The patch that you published (I only used the second one, as you said I should forget about the first one) only applies to way.java I attach it here for you. Maybe you assumed that I use some sort of additional patch on StyledConverter.java too, which you forgot on the list?
Thanks,
Mark _______________________________________________ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
/* * Copyright (C) 2006 Steve Ratcliffe * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * * Author: Steve Ratcliffe * Create date: 17-Dec-2006 */ package uk.me.parabola.mkgmap.reader.osm; import java.util.ArrayList; import java.util.List; import uk.me.parabola.imgfmt.Utils; import uk.me.parabola.imgfmt.app.Coord; /** * Represent a OSM way in the 0.5 api. A way consists of an ordered list of * nodes. * * @author Steve Ratcliffe */ public class Way extends Element { private final List<Coord> points; public Way(long id) { points = new ArrayList<Coord>(); setId(id); } public Way(long id, List<Coord> points) { this.points = points; setId(id); } // create a new Way that is a duplicate of this one - the new Way // has a shallow copy of the points list so that changes to the // original list don't affect the points in the duplicate public Way duplicate() { Way dup = new Way(getId(), new ArrayList<Coord>(points)); dup.setName(getName()); dup.copyTags(this); return dup; } /** * Get the points that make up the way. We attempt to re-order the segments * and return a list of points that traces the route of the way. * * @return A simple list of points that form a line. */ public List<Coord> getPoints() { return points; } public boolean isBoolTag(String s) { String val = getTag(s); if (val == null) return false; if (val.equalsIgnoreCase("true") || val.equalsIgnoreCase("yes") || val.equals("1")) return true; return false; } public void addPoint(Coord co) { points.add(co); } public void reverse() { int numPoints = points.size(); for(int i = 0; i < numPoints/2; ++i) { Coord t = points.get(i); points.set(i, points.get(numPoints - 1 - i)); points.set(numPoints - 1 - i, t); } } public boolean isClosed() { return !points.isEmpty() && points.get(0).equals(points.get(points.size()-1)); } /** * A simple representation of this way. * @return A string with the name and start point */ public String toString() { if (points.isEmpty()) return "Way: empty"; Coord coord = points.get(0); StringBuilder sb = new StringBuilder(); sb.append("WAY: ").append(getId()).append(" "); sb.append(getName()); sb.append('('); sb.append(Utils.toDegrees(coord.getLatitude())); sb.append('/'); sb.append(Utils.toDegrees(coord.getLongitude())); sb.append(')'); sb.append(' '); sb.append(toTagString()); return sb.toString(); } public Coord getCofG() { int lat = 0; int lon = 0; int numPoints = points.size(); if(numPoints < 1) return null; for(Coord p : points) { lat += p.getLatitude(); lon += p.getLongitude(); } return new Coord((lat + numPoints / 2) / numPoints, (lon + numPoints / 2) / numPoints); } }