<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style></head>
<body class='hmmessage'><div dir='ltr'>Hi all,<br><br>please test / review the changes in the branch.<br><br>Users: You should find no differences in map output between trunk r3215 and branch r3214,<br>but maybe the log is different.<br><br>Programmers: please have a closer look at the source.<br><br>The intended changes :<br>1) Create new class AccessTagsAndBits which contains code <br>to map tags which are relevant for routing to bit masks.<br><br>I prefer to have to bit 1 for "access allowed" to avoid<br>double negations like in "if (!noAccess[i]) ..."<br>I hope that is okay for you as well.<br><br>All routines which read data are now using the same<br>bit constants regarding CAR,FOOT,BICYCLE,TRUCK, etc.<br>to fill a bit mask field.<br>The write routines convert the internal representatio to<br>that used in the img format.<br><br>@WanMil: <br>Special case: Code in StyledConverter near roadLog.isInfoEnabled()<br>formats the content of the TabAAcesss field in RoadDef which<br>contains the img format. I think this is okay because the intention<br>of the log is to show exactly the content of this field.<br><br>2) Create class ConvertedWay which combines an<br>OSM Way instance with a reference to a GType instance.<br>Instead of copying and modifying fields (roadClass, roadSpeed) <br>in GType instances this is now done in ConvertedWay. <br>Many tags which are relevant for routing are evaluated once<br>when the ConvertedWay instance is created.<br>The results are kept in bit masks, this allows a quick<br>compare.<br>Also, RoadMerger uses this class instead of creating new <br>Road instances.<br><br>@WanMil: The new code produces a different log on debug<br>level because some comparisons are done in different order.<br>I've changed the code to compare the bit mask fields instead of the<br>tags, but the code still lists (most of) the compared tags <br>to be able to produce debug info. <br>Let me know if that is okay for you. Another solution could be to<br>implement the debugging in ConvertedWay e.g. something<br>like <br>public String compareAccess(ConvertedWay other)<br>could return a String like <br>"mkgmap:truck is different 'no' <> 'null' "<br><br>3)<br>With r3214 I've renamed a few methods. Please check if <br>you find better names:<br>http://www.mkgmap.org.uk/websvn/revision.php?repname=mkgmap&rev=3214<br><br><br> </div></body>
</html>