Re: [mkgmap-dev] Index and equally named cities
Martin, I don't want to merge changes from one branch to another branch. The advantage of the branch is that one can concentrate on the development of a few specific things only (better assignment of city/region/country information in the locator branch). Merging unfinished developments from another branch might introduce new problems. Of course once the changes from the city-region branch are merged back to the trunk I will apply the changes to the locator branch soon. At the moment you can do that yourself: * Create a patch between the city-region branch and r1973 * Apply this patch to the locator branch WanMil @WanMil: could you please merge the locator-branch with the last city-region-branch from Steve?! I have no idea, how can I make this. THX Martin Am 07.07.2011 um 10:35 schrieb maning sambale: Testing this version, Uploading via mac mapinstall is a bit longer but not too long I only get two San Fernandos that are in a separate tile. The other San Fernandos within one tile is not included in the search results. args.list: code-page=1252 tdbfile latin1 country-abbr=PHL country-name=PHILIPPINES remove-short-arcs=5 route add-pois-to-areas family-id=639 family-name=OSM_PHIL overview-mapname=4001 series-name=OSM_PHIL description=OSM Philippines style-file=/home/maning/osm/routable_garmin/git/osmphgps/styles/default generate-sea=polygons,extend-sea-sectors,close-gaps=1000 index adjust-turn-headings check-roundabouts drive-on-right check-roundabout-flares report-dead-ends ignore-maxspeeds link-pois-to-ways location-autofill=0 styles: https://github.com/maning/osmphgps/tree/master/styles/default On Thu, Jul 7, 2011 at 4:01 PM, maning sambale emmanuel.samb...@gmail.com wrote: Got it! On Thu, Jul 7, 2011 at 3:58 PM, maning sambale emmanuel.samb...@gmail.com wrote: Where to download your branch? This is also a long standing issue for our PH maps. See issue report here: https://github.com/maning/osmphgps/issues/9 Basically, we have 6 San Fernando cities and city/address search only works for this case when using mkgmap r1867. On Thu, Jul 7, 2011 at 3:55 PM, Steve Ratcliffest...@parabola.me.uk wrote: Hi I am away this week so didn't have time to mention it, but I created a branch (city-region-index) to fix the city/region bug since it turned out to be quite a complex change. It is now working as far as I can tell. Upload to a device works without mapsource crashes and giving both city and region in the search box works. ..Steve ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Re: [mkgmap-dev] Index and equally named cities
WanMil, you are right. My fault, I didn't want you to merge this two branches for public. I have no idea how I can download the city-region- location-branch and the r1973. I also didn't know how to patch this both files and apply this patch to the locator branch. I think you know how to do this. So if you find some time, it would be nice if you can provide me this special branch. I think you can upload it to: http://files.mkgmap.org.uk/download Thank you in advance. Martin Am 2011-07-08 13:16, schrieb WanMil: Martin, I don't want to merge changes from one branch to another branch. The advantage of the branch is that one can concentrate on the development of a few specific things only (better assignment of city/region/country information in the locator branch). Merging unfinished developments from another branch might introduce new problems. Of course once the changes from the city-region branch are merged back to the trunk I will apply the changes to the locator branch soon. At the moment you can do that yourself: * Create a patch between the city-region branch and r1973 * Apply this patch to the locator branch WanMil @WanMil: could you please merge the locator-branch with the last city-region-branch from Steve?! I have no idea, how can I make this. THX Martin Am 07.07.2011 um 10:35 schrieb maning sambale: Testing this version, Uploading via mac mapinstall is a bit longer but not too long I only get two San Fernandos that are in a separate tile. The other San Fernandos within one tile is not included in the search results. args.list: code-page=1252 tdbfile latin1 country-abbr=PHL country-name=PHILIPPINES remove-short-arcs=5 route add-pois-to-areas family-id=639 family-name=OSM_PHIL overview-mapname=4001 series-name=OSM_PHIL description=OSM Philippines style-file=/home/maning/osm/routable_garmin/git/osmphgps/styles/default generate-sea=polygons,extend-sea-sectors,close-gaps=1000 index adjust-turn-headings check-roundabouts drive-on-right check-roundabout-flares report-dead-ends ignore-maxspeeds link-pois-to-ways location-autofill=0 styles: https://github.com/maning/osmphgps/tree/master/styles/default On Thu, Jul 7, 2011 at 4:01 PM, maning sambale emmanuel.samb...@gmail.com wrote: Got it! On Thu, Jul 7, 2011 at 3:58 PM, maning sambale emmanuel.samb...@gmail.com wrote: Where to download your branch? This is also a long standing issue for our PH maps. See issue report here: https://github.com/maning/osmphgps/issues/9 Basically, we have 6 San Fernando cities and city/address search only works for this case when using mkgmap r1867. On Thu, Jul 7, 2011 at 3:55 PM, Steve Ratcliffest...@parabola.me.uk wrote: Hi I am away this week so didn't have time to mention it, but I created a branch (city-region-index) to fix the city/region bug since it turned out to be quite a complex change. It is now working as far as I can tell. Upload to a device works without mapsource crashes and giving both city and region in the search box works. ..Steve ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Re: [mkgmap-dev] Index and equally named cities
On Fri, Jul 08, 2011 at 01:42:13PM +0200, Martin wrote: I also didn't know how to patch this both files and apply this patch to the locator branch. Here is how it should work: svn co http://svn.parabola.me.uk/mkgmap/branches/locator mkgmap-locator cd mkgmap-locator svn log|less # see which trunk revision it is based on # The log reports for me that the svn:log of the current head (r1977) is # Synchronize to trunk r1973. So, you will need to merge changes from # that on: svn merge http://svn.parabola.me.uk/mkgmap/trunk -r1973:HEAD . # This went without conflicts. ant dist # This gives compilation failures: cannot find class BlockInputStream So, it does not seem to be that simple. Best regards, Marko ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Re: [mkgmap-dev] Index and equally named cities
Hello Marko, thanks for your help: I would like to merge locator with the city-region-branch. Using your steps, I see, that Steve made the branch from 1979, or?! r1980 | steve | 2011-07-01 15:30:57 +0200 (Fre, 01. Jul 2011) | 2 Zeilen Create branch for city/region problem fix So, now, that I know how I can download different versions (tried 1973 and 1979), I tried to make a patch with diff -r -u mkgmap-city newtrunk patch1 When I try to patch the locator with this patch I get a lot of errors: Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file all-wcprops.rej ... So any idea what's wrong?! Cheers, Martin Am 2011-07-08 14:02, schrieb Marko Mäkelä: On Fri, Jul 08, 2011 at 01:42:13PM +0200, Martin wrote: I also didn't know how to patch this both files and apply this patch to the locator branch. Here is how it should work: svn co http://svn.parabola.me.uk/mkgmap/branches/locator mkgmap-locator cd mkgmap-locator svn log|less # see which trunk revision it is based on # The log reports for me that the svn:log of the current head (r1977) is # Synchronize to trunk r1973. So, you will need to merge changes from # that on: svn merge http://svn.parabola.me.uk/mkgmap/trunk -r1973:HEAD . # This went without conflicts. ant dist # This gives compilation failures: cannot find class BlockInputStream So, it does not seem to be that simple. Best regards, Marko ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
[mkgmap-dev] unused polygons hexes
A lot of POIs are being converted to polygons these days because of hires imagery. For my map I'm mostly interested to just show it as a point. The add-poi-to-areas switch is very helpful. However, I'm running out of possible hex to assign the polygon. Any advise on the unused hex we can recycle? I prefer an invisible hex when using the map even without a typ file. Of course I can make it invisible using a TYP editor but a hex that didn't have to edited is of course better. Is there such hex types? :) Thanks! -- cheers, maning -- Freedom is still the most radical idea of all -N.Branden wiki: http://esambale.wikispaces.com/ blog: http://epsg4253.wordpress.com/ -- ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Re: [mkgmap-dev] unused polygons hexes
Hi, if you just want to have a poi-Node and no special backgroundpolygon, just define one Polygon-Type with an transparent png. This polygon you can use for each area which should be handled by add-pois-to-areas. Henning ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Re: [mkgmap-dev] Index and equally named cities
On Fri, Jul 08, 2011 at 02:49:17PM +0200, Martin wrote: Hello Marko, thanks for your help: I would like to merge locator with the city-region-branch. Using your steps, I see, that Steve made the branch from 1979, or?! r1980 | steve | 2011-07-01 15:30:57 +0200 (Fre, 01. Jul 2011) | 2 Zeilen Create branch for city/region problem fix Subversion revision numbers are repository-wide. The common practice is that the repository contains subdirectories, such as trunk and branches/locator. So, now, that I know how I can download different versions (tried 1973 and 1979), I tried to make a patch with diff -r -u mkgmap-city newtrunk patch1 svn merge should do that in a more intelligent way, resolving conflicts and taking into account renamed files. I took a look at the output of svn diff, and I do not see any reference to BlockInputStream there. So, I guess that ant dist should fail even in the unmodified locator branch. Sure enough, I can repeat the build error after svn revert -R . Now I remember that I had a little tweak in my mkgmap/external.properties, replacing jars=/opt/jars with a different path. When I tweak that, the locator branch builds for me. The jars directory must contain the following: /opt/jars/osmprotobuf/osmprotobuf.jar /opt/jars/protobuf-2.3.0/protobuf.jar On my system, these point to the following files: osmosis-0.37/lib/default/osmbin-1.0-6d760534.jar osmosis-0.37/lib/default/protobuf-java-2.3.0.jar So any idea what's wrong?! Just follow the steps that I posted earlier, but make sure that the jar files are available. Best regards, Marko ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
