Re: [mkgmap-dev] error handling in splitter

2014-05-16 Thread Gerd Petermann
Hi Steve,

thanks again.
I've changed the branch to use  fastutil-6.5.15-mkg.1b.jar now.
After the merge to trunk I'll update ivy.xml mkgmap as well, so that
both use the same libs.

BTW: On my PC I don't see the big improvements in the pbf libs, so 
maybe I've hit an edge case on my netbook.

Gerd
On 16/05/14 07:00, Gerd Petermann wrote:
> I'd like to have a few more classes in it, so I've attached a small program
> that uses all classes which seem to be useful in splitter or mkgmap.
 
I had to alter the program so that it actually used the classes (attached).
 
I've now created minimal fastutil jars for mkgmap+splitter and for 
UseFastutil
 
They can downloaded by changing the version to 6.5.15-mkg.1 and
6.5.15-mkg.1b respectively.
 
mkgmap+splitter:

 
UseFastutil:

 
 
..Steve

___
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] error handling in splitter

2014-05-16 Thread Steve Ratcliffe

On 16/05/14 07:00, Gerd Petermann wrote:

I'd like to have a few more classes in it, so I've attached a small program
that uses all classes which seem to be useful in splitter or mkgmap.


I had to alter the program so that it actually used the classes (attached).

I've now created minimal fastutil jars for mkgmap+splitter and for 
UseFastutil


They can downloaded by changing the version to 6.5.15-mkg.1 and
6.5.15-mkg.1b respectively.

mkgmap+splitter:


UseFastutil:



..Steve

package util;

import it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import it.unimi.dsi.fastutil.shorts.ShortArrayList;


/**
 * @author GerdP
 */
public class UseFastutil{
	public static void main(String[] args) {
		UseFastutil uf = new UseFastutil();
		uf.doit();
	}
	public void doit() {
		String f = shortArrayList.toString() + intArrayList.toString() + longArrayList.toString()
			+ int2intOpenHashMap.toString() + int2ObjectOpenHashMap.toString()
			+ long2ObjectOpenHashMap.toString()
			+ int2intLinkedOpenHashMap.toString()
			+ int2ObjectLinkedOpenHashMap.toString()
			+ long2ObjectLinkedOpenHashMap.toString()
			+ int2ObjectAVLTreeMap.toString()
			+ long2ObjectAVLTreeMap.toString();
		System.out.println(f);
	}
	ShortArrayList shortArrayList;
	IntArrayList intArrayList;
	LongArrayList longArrayList;
	
	Int2IntOpenHashMap int2intOpenHashMap;
	Int2ObjectOpenHashMap int2ObjectOpenHashMap;

	Long2ObjectOpenHashMap long2ObjectOpenHashMap;
	
	Int2IntLinkedOpenHashMap int2intLinkedOpenHashMap;
	Int2ObjectLinkedOpenHashMap int2ObjectLinkedOpenHashMap;

	Long2ObjectLinkedOpenHashMap long2ObjectLinkedOpenHashMap;
	
	Int2ObjectAVLTreeMap int2ObjectAVLTreeMap;
	Long2ObjectAVLTreeMap long2ObjectAVLTreeMap;
	
} 
___
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev

Re: [mkgmap-dev] error handling in splitter

2014-05-16 Thread GerdP
Hi Steve,

the new pbf libs are much better. I've just tried to split an older 
Germany.osm.pbf on my netbook and I see an improvement
681s -> 476s

So, o5m is no longer that much better.

Gerd


GerdP wrote
> Hi Steve,
> 
> thanks, build works fine.
> I've committed it in the branch.
> I did not yet test if the pbf updates have an effect,
> will do that tomorrow.
> 
> Gerd
> Steve Ratcliffe wrote
>> Hi Gerd
>> 
>>> I don't know much about ivy. Is it a lot of work to change splitter to
>>> use it?
>> 
>> Here is a patch for ivy.
>> 
>> Everything upgraded to the latest except for fastutils.
>> 
>> ..Steve
>> 
>> 
>> ___
>> mkgmap-dev mailing list

>> mkgmap-dev@.org

>> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
>> 
>> ivy.patch (11K)
>> ;





--
View this message in context: 
http://gis.19327.n5.nabble.com/error-handling-in-splitter-tp5806188p5806506.html
Sent from the Mkgmap Development mailing list archive at Nabble.com.
___
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev


Re: [mkgmap-dev] splitter and overlapping tiles in split-file

2014-05-16 Thread GerdP
Hi Henning,

sounds good. I've added the warning in the branch.

Gerd


osm-8 wrote
> Hi Gerd,
> 
> I plan to document in a few sentence, what you should do, if you are 
> having overlapping polys. This could be integrated in mkgmap-guide. But 
> I don't know til then I can finish it, because next weekend I'm starting 
> a short biketrip (just a week) and I wont have time before.
> 
> Best situation would be: Insert warning now and if next time something 
> changes in splitter, which needs some tweaking in this section, remove it.
> 
> Henning
> 
> 
> Am 16.05.2014 08:25, schrieb Gerd Petermann:
>> Hi all,
>>
>> > Other things could be done:
>> >
>> > As you mainly had written the overlapping-code for me, I think it can
>> > be removed. The new method is so much better, that I would highly
>> > recommend not to use the older one.
>>
>> The code for this is not big (maybe 200 lines), but in the past
>> it often caused trouble when new features were implemented,
>> and it is difficult to test, so I'd appreciate to remove the support
>> for overlapping tiles in a given split-file.
>>
>> Is it okay to remove the support and print something like
>> "Error: Support for overlapping tiles in split-files was removed in 
>> version r36x."
>> or should splitter print a warning to stderr like
>> "Warning : Support for overlapping tiles will be removed in future 
>> releases"
>> for a while ?
>>
>> Gerd
>>
>>
>>
>> ___
>> mkgmap-dev mailing list
>> 

> mkgmap-dev@.org

>> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
> 
> 
> ___
> mkgmap-dev mailing list

> mkgmap-dev@.org

> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev





--
View this message in context: 
http://gis.19327.n5.nabble.com/splitter-and-overlapping-tiles-in-split-file-tp5806454p5806505.html
Sent from the Mkgmap Development mailing list archive at Nabble.com.
___
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev


Re: [mkgmap-dev] certain highway names are not compiled in the map

2014-05-16 Thread Henning Scholland

Hi Gerd,

there are a lot mp in osm-data, which has eg. landuse=forest in relation 
and on the way. To avoid problems with unclosed landuse=forest-ways 
(getting auto-closed and so on) it is useful to remove the tags from the 
way.


@WanMil: Actually I thing access and name could be useful.

Henning

Am 16.05.2014 08:04, schrieb Gerd Petermann:

Hi WanMil,

I don't understand the reason for the removal of tags in the ways
used in mp-relations. Can you explain why this is done?

Gerd

> Date: Thu, 15 May 2014 19:56:19 +0200
> From: wmgc...@web.de
> To: mkgmap-dev@lists.mkgmap.org.uk
> Subject: Re: [mkgmap-dev] certain highway names are not compiled in 
the map

>
> Hi Henning,
>
> do you have an proposals which exceptions could be used?
>
> WanMil
>
> > Hi Gerd,
> >
> > I think it's done because every tag is removed, if it is equal. Maybe
> > there should be some exceptions.
> >
> > Henning
> >
> > Am 2014-05-15 07:26, schrieb Gerd Petermann:
> >
> >> Hello Joern,
> >>
> >> I think you already gave the explanation.
> >> The multipolygon relation routine removes the name tag from
> >> outer ways because it is equal to the name tag of the relation.
> >>
> >> @WanMil : I don't know why this is done, it seems to be wrong in this
> >> case.
> >>
> >> Gerd
> >>
> >> 


> >> Date: Wed, 14 May 2014 20:15:23 +0200
> >> From: joern...@gmail.com
> >> To: mkgmap-dev@lists.mkgmap.org.uk
> >> Subject: [mkgmap-dev] certain highway names are not compiled in 
the map

> >>
> >> Using the default style in mkgmap-r3265 the map doesn't know the 
names

> >> of the residential highway Altcotta
> >> (http://www.openstreetmap.org/way/31130257).
> >> But it knows the name of the pedestrian multipolygon named Altcotta
> >> (http://www.openstreetmap.org/relation/977290).
> >> Does anyone has a clue about this?
> >>
> >> ___ 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


___
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] splitter and overlapping tiles in split-file

2014-05-16 Thread Henning Scholland

Hi Gerd,

I plan to document in a few sentence, what you should do, if you are 
having overlapping polys. This could be integrated in mkgmap-guide. But 
I don't know til then I can finish it, because next weekend I'm starting 
a short biketrip (just a week) and I wont have time before.


Best situation would be: Insert warning now and if next time something 
changes in splitter, which needs some tweaking in this section, remove it.


Henning


Am 16.05.2014 08:25, schrieb Gerd Petermann:

Hi all,

> Other things could be done:
>
> As you mainly had written the overlapping-code for me, I think it can
> be removed. The new method is so much better, that I would highly
> recommend not to use the older one.

The code for this is not big (maybe 200 lines), but in the past
it often caused trouble when new features were implemented,
and it is difficult to test, so I'd appreciate to remove the support
for overlapping tiles in a given split-file.

Is it okay to remove the support and print something like
"Error: Support for overlapping tiles in split-files was removed in 
version r36x."

or should splitter print a warning to stderr like
"Warning : Support for overlapping tiles will be removed in future 
releases"

for a while ?

Gerd



___
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] error handling in splitter

2014-05-16 Thread GerdP
Hi Steve,

thanks, build works fine.
I've committed it in the branch.
I did not yet test if the pbf updates have an effect,
will do that tomorrow.

Gerd


Steve Ratcliffe wrote
> Hi Gerd
> 
>> I don't know much about ivy. Is it a lot of work to change splitter to
>> use it?
> 
> Here is a patch for ivy.
> 
> Everything upgraded to the latest except for fastutils.
> 
> ..Steve
> 
> 
> ___
> mkgmap-dev mailing list

> mkgmap-dev@.org

> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
> 
> ivy.patch (11K)
> ;





--
View this message in context: 
http://gis.19327.n5.nabble.com/error-handling-in-splitter-tp5806188p5806500.html
Sent from the Mkgmap Development mailing list archive at Nabble.com.
___
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev


Re: [mkgmap-dev] error handling in splitter

2014-05-16 Thread Steve Ratcliffe

Hi Gerd


I don't know much about ivy. Is it a lot of work to change splitter to
use it?


Here is a patch for ivy.

Everything upgraded to the latest except for fastutils.

..Steve

Index: build.xml
===
--- build.xml	(revision 367)
+++ build.xml	(working copy)
@@ -17,7 +17,7 @@
 Author: Steve Ratcliffe
 Create date: 3 Jan 2008
 -->
-
+
 
   
   
@@ -26,6 +26,8 @@
 	
 	
 
+	
+
   
-  
-  
-  
-  
-  
+	
 
 	
 	
@@ -57,23 +57,71 @@
 		
 	
 
+	
+	
+	
+	
+	
+	
   
-
   
   
 
-
-
-
-
+		
   
 
   
 
 
-
+		
   
 
+	
+	
+		
+		
+	
+
+	
+		
+		
+		
+		
+		http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar";
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+	
+
+	
+		
+			
+			
+		
+		
+		
+		
+		
+	
+
+	
+	
+		
+	
+	
+		
+	
+	
+
+	
+	
+		
+		
+		
+	
+
   
   
 
@@ -156,7 +204,7 @@
 		
 	
 
-  
+  
 
   
   
@@ -163,7 +211,7 @@
 
   
 
-  
+  
 
   
   
@@ -180,7 +228,7 @@
 
   
 
-
+
 
   
 
@@ -194,17 +242,6 @@
 
 
 
-
-
-  
-
-  
-  
-  
-  
-  
-
-
 
   
 
@@ -217,7 +254,7 @@
   
 
 
-  
+  
 
 
 
@@ -230,6 +267,27 @@
 
   
 
+
+		
+			
+
+	
+
+			
+		
+
+		
+		
+			
+
+
+
+			
+			
+			
+			
+			
+		
   
 
   
@@ -240,20 +298,20 @@
   
   
 
+		
   
 
-  
-  
-
-  
-
-
-
-  
-
+	
+		
   
 
+	
+		
+	
+
+	
+	
+
   
-
 
 
Index: ivysettings.xml
===
--- ivysettings.xml	(revision 0)
+++ ivysettings.xml	(working copy)
@@ -0,0 +1,25 @@
+
+	http://ivy.mkgmap.org.uk/repo"; />
+	
+
+	
+	
+	
+	
+	
+
+	
+		
+
+			
+
+			
+
+
+			
+
+		
+
+	
+
+
Index: ivy.xml
===
--- ivy.xml	(revision 0)
+++ ivy.xml	(working copy)
@@ -0,0 +1,35 @@
+
+	
+
+	
+		
+		
+		
+		
+		
+
+	
+
+	
+		
+
+		
+
+		
+
+		
+
+		
+
+	
+
___
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev

Re: [mkgmap-dev] error handling in splitter

2014-05-16 Thread Steve Ratcliffe

Hi Gerd


I think we should update fastutil to 6.5.15 and use the latest pbf libs
for both programs.


OK, and I would like to upgrade junit to 4.11.


Reg. fastutil:
I'd like to have a few more classes in it, so I've attached a small program
that uses all classes which seem to be useful in splitter or mkgmap.


OK


I don't know much about ivy. Is it a lot of work to change splitter to
use it?


It wouldn't take long since it will be mostly
the same as for mkgmap and display.

..Steve
___
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev