Add a facility to ignore sections of the file and ignore [IMG ID] ...
[ump2osm.git] / ump.diff
blob37eea19d7aabb8862b8ad577ca13418b8ac0634a
1 Index: UMP-Bialystok/src/BIALYSTOK.ulice.txt
2 ===================================================================
3 RCS file: /home/cvsroot/UMP-Bialystok/src/BIALYSTOK.ulice.txt,v
4 retrieving revision 1.99
5 diff -u -r1.99 BIALYSTOK.ulice.txt
6 --- UMP-Bialystok/src/BIALYSTOK.ulice.txt 19 Aug 2009 22:38:26 -0000 1.99
7 +++ UMP-Bialystok/src/BIALYSTOK.ulice.txt 23 Aug 2009 10:05:59 -0000
8 @@ -7018,7 +7018,7 @@
9 Label=~[0x2e]65 Baranowicka
10 EndLevel=4
11 Data0=(53.12207,23.20314),(53.12206,23.20331),(53.12213,23.20561),(53.12218,23.20641),(53.12224,23.20731),(53.12241,23.20961),(53.12248,23.21053),(53.12265,23.21285),(53.12284,23.21540),(53.12295,23.21688),(53.12302,23.21789),(53.12338,23.22194),(53.12360,23.22443),(53.12367,23.22538),(53.12393,23.22670),(53.12430,23.22780),(53.12451,23.22833),(53.12516,23.22986)
12 -Label2-=Baranowicka
13 +Label2=Baranowicka
14 [END]
16 [POLYLINE]
17 Index: UMP-GorzowWlkp/src/KOSTRZYN.ulice.txt
18 ===================================================================
19 RCS file: /home/cvsroot/UMP-GorzowWlkp/src/KOSTRZYN.ulice.txt,v
20 retrieving revision 1.14
21 diff -u -r1.14 KOSTRZYN.ulice.txt
22 --- UMP-GorzowWlkp/src/KOSTRZYN.ulice.txt 21 Aug 2009 08:30:22 -0000 1.14
23 +++ UMP-GorzowWlkp/src/KOSTRZYN.ulice.txt 23 Aug 2009 10:06:04 -0000
24 @@ -49,12 +49,12 @@
25 Data0=(52.61034,14.65565),(52.60155,14.65296),(52.60033,14.65262),(52.59896,14.65234),(52.59609,14.65178),(52.59550,14.65159),(52.59466,14.65121),(52.59406,14.65125),(52.59356,14.65123),(52.59188,14.65063)
26 [END]
28 +; Label=Pó³nocna temp
29 [POLYLINE]
30 Type=0x5
31 -Label=Pó³nocna temp
32 EndLevel=2
33 Data0=(52.61053,14.65596),(52.61005,14.67726),(52.60434,14.68147)
34 -Label1=Pó³nocna
35 +Label=Pó³nocna
36 [END]
38 [POLYLINE]
39 Index: UMP-Hiszpania/src/Hiszpania-miasta_poza_obszarem_mapy.pnt.txt
40 ===================================================================
41 RCS file: /home/cvsroot/UMP-Hiszpania/src/Hiszpania-miasta_poza_obszarem_mapy.pnt.txt,v
42 retrieving revision 1.2
43 diff -u -r1.2 Hiszpania-miasta_poza_obszarem_mapy.pnt.txt
44 --- UMP-Hiszpania/src/Hiszpania-miasta_poza_obszarem_mapy.pnt.txt 7 Apr 2009 08:46:21 -0000 1.2
45 +++ UMP-Hiszpania/src/Hiszpania-miasta_poza_obszarem_mapy.pnt.txt 23 Aug 2009 10:06:08 -0000
46 @@ -1,3 +1,11 @@
47 +;Afryka
48 +OziExplorer Point File Version 1.0
49 +WGS 84
50 +Reserved 1
51 +Reserved 2
52 +255,65535,3,8,0,0,CITY Hiszpania
53 + 35.91000, -5.30000, 6,Ceuta,,,
54 + 35.30000, -2.95000, 6,Melilla
55 ;Canary Islands
56 28.10000, -15.43000, 8,Las Palmas
57 28.47000, -16.25000, 8,Santa Cruz de Tenerife
58 Index: UMP-JeleniaGora/src/miasta.txt
59 ===================================================================
60 RCS file: /home/cvsroot/UMP-JeleniaGora/src/miasta.txt,v
61 retrieving revision 1.3
62 diff -u -r1.3 miasta.txt
63 --- UMP-JeleniaGora/src/miasta.txt 12 Feb 2007 02:20:03 -0000 1.3
64 +++ UMP-JeleniaGora/src/miasta.txt 23 Aug 2009 10:06:08 -0000
65 @@ -1,90 +0,0 @@
66 -[Countries]
67 -Country1=Polska~[0x1d]PL
68 -[END-Countries]
70 -[Regions]
71 -Region1=dolno¶l±skie
72 -CountryIdx1=1
73 -[END-Regions]
75 -[Cities]
76 -City1=Szklarska Porêba
77 -RegionIdx1=1
78 -City2=Jelenia Góra
79 -RegionIdx2=1
80 -City3=Zgorzelec
81 -RegionIdx3=1
82 -City4=Krzywa
83 -RegionIdx4=1
84 -City5=Boles³awiec
85 -RegionIdx5=1
86 -City6=kamienna góra
87 -RegionIdx6=1
88 -City7=kowary
89 -RegionIdx7=1
90 -City8=cieplice
91 -RegionIdx8=1
92 -City9=lwówek ¶l.
93 -RegionIdx9=1
94 -City10=gryfów ¶l.
95 -RegionIdx10=1
96 -City11=b³a¿ejów
97 -RegionIdx11=1
98 -City12=che³msko ¶l.
99 -RegionIdx12=1
100 -City13=GOLIñSK
101 -RegionIdx13=1
102 -City14=MIEROSZóW
103 -RegionIdx14=1
104 -City15=nowe siod³o
105 -RegionIdx15=1
106 -City16=okrzeszyn
107 -RegionIdx16=1
108 -City17=uniemy¶l
109 -RegionIdx17=1
110 -City18=Lubiatów
111 -RegionIdx18=1
112 -City19=Nowa sól
113 -RegionIdx19=1
114 -City20=olszyna
115 -RegionIdx20=1
116 -City21=wêgliniec
117 -RegionIdx21=1
118 -City22=lubañ
119 -RegionIdx22=1
120 -City23=góra
121 -RegionIdx23=1
122 -City24=serby
123 -RegionIdx24=1
124 -City25=radwanice
125 -RegionIdx25=1
126 -City26=lubsko
127 -RegionIdx26=1
128 -City27=G³ogów
129 -RegionIdx27=1
130 -City28=¶wiêtno
131 -RegionIdx28=1
132 -City29=mochy
133 -RegionIdx29=1
134 -City30=kaszczor
135 -RegionIdx30=1
136 -City31=wijewo
137 -RegionIdx31=1
138 -City32=Lipno
139 -RegionIdx32=1
140 -City33=Smigiel
141 -RegionIdx33=1
142 -City34=Wschowa
143 -RegionIdx34=1
144 -City35=Slawa
145 -RegionIdx35=1
146 -City36=szlichtyngowa
147 -RegionIdx36=1
148 -City37=konotop
149 -RegionIdx37=1
150 -City38=otyn
151 -RegionIdx38=1
152 -City39=kozuchow
153 -RegionIdx39=1
154 -[END-Cities]
156 Index: UMP-Kalisz/src/POI-Kalisz.pnt
157 ===================================================================
158 RCS file: /home/cvsroot/UMP-Kalisz/src/POI-Kalisz.pnt,v
159 retrieving revision 1.91
160 diff -u -r1.91 POI-Kalisz.pnt
161 --- UMP-Kalisz/src/POI-Kalisz.pnt 20 Aug 2009 09:06:15 -0000 1.91
162 +++ UMP-Kalisz/src/POI-Kalisz.pnt 23 Aug 2009 10:06:08 -0000
163 @@ -15,8 +15,6 @@
164 51.60072, 18.77262, 0,Pomnik Bohaterom Wrze¶nia 1939,,Sieradz,POMNIK
165 51.59860, 18.69875, 0,Elektrocieplownia,Zachodnia,Sieradz,TOWER
166 51.82535, 17.94680, 0,Kamieñ Œw. Jadwigi,,,ATRAKCJA
167 - 51.45717, 18.93333, 0,,,,0x1809
168 - 51.45275, 18.93333, 0,,,,0x1809
169 51.19832, 18.85636, 0,Mokry Las,,,REZERWAT
170 51.59197, 18.74720, 0,Most,,Sieradz,MOST
171 51.60008, 18.76931, 0,Most,,Sieradz,MOST
172 Index: UMP-Klodzko/src/KLODZKO.szlaki.topo.txt
173 ===================================================================
174 RCS file: /home/cvsroot/UMP-Klodzko/src/KLODZKO.szlaki.topo.txt,v
175 retrieving revision 1.12
176 diff -u -r1.12 KLODZKO.szlaki.topo.txt
177 --- UMP-Klodzko/src/KLODZKO.szlaki.topo.txt 17 Aug 2009 07:02:47 -0000 1.12
178 +++ UMP-Klodzko/src/KLODZKO.szlaki.topo.txt 23 Aug 2009 10:06:09 -0000
179 @@ -74,8 +74,7 @@
180 Data0=(50.17269,16.77322),(50.17278,16.77395),(50.17345,16.77600),(50.17363,16.77639),(50.17375,16.77655),(50.17388,16.77663),(50.17435,16.77652),(50.17509,16.77585),(50.17641,16.77572),(50.17729,16.77665),(50.17844,16.77898),(50.17911,16.78113),(50.17906,16.78394),(50.17898,16.78456),(50.17907,16.79064),(50.17886,16.79147),(50.17875,16.79172),(50.17882,16.79234),(50.17941,16.79268),(50.18118,16.79298),(50.18217,16.79300),(50.18259,16.79209),(50.18288,16.79154),(50.18305,16.79145),(50.18360,16.79272),(50.18403,16.79366),(50.18506,16.79470),(50.18627,16.79643),(50.18674,16.79736),(50.18686,16.79778),(50.18691,16.79789),(50.18772,16.79959),(50.18888,16.80137),(50.18951,16.80194),(50.18968,16.80200),(50.19030,16.80195),(50.19107,16.80209),(50.19169,16.80234),(50.19158,16.80280),(50.19152,16.80346),(50.19230,16.80641),(50.19311,16.80870),(50.19400,16.81012),(50.19607,16.81196),(50.19649,16.81251),(50.19679,16.81334),(50.19688,16.81381),(50.19676,16.81437),(50.19633,16.81501),(50.19522,16.81659),(50.19490,16.81742),(50.19486,16.81849),(50.19535,16.82007),(50.19569,16.82205),(50.19660,16.82338),(50.19713,16.82396),(50.19760,16.82482),(50.19835,16.82589),(50.19867,16.82620),(50.19933,16.82732),(50.19938,16.82761),(50.19987,16.82829),(50.20001,16.82868),(50.20002,16.82902),(50.20064,16.83005),(50.20084,16.83020),(50.20141,16.83203),(50.20161,16.83295),(50.20182,16.83307),(50.20256,16.83314),(50.20303,16.83332),(50.20468,16.83319),(50.20523,16.83299),(50.20638,16.83308),(50.20716,16.83265),(50.20790,16.83258)
181 [END]
183 -[POLYLINE]
184 -Type=0x010e0a
185 -Data0=(50.34678,16.40079),(50.34684,16.40152),(50.34715,16.40208),(50.34767,16.40260),(50.34778,16.40319),(50.34808,16.40384),(50.34810,16.40417),(50.34805,16.40473)
186 -[END]
188 +[POLYLINE]
189 +Type=0x010e0a
190 +Data0=(50.34678,16.40079),(50.34684,16.40152),(50.34715,16.40208),(50.34767,16.40260),(50.34778,16.40319),(50.34808,16.40384),(50.34810,16.40417),(50.34805,16.40473)
191 +[END]
192 Index: UMP-Lublin/src/LUBLIN.woda.txt
193 ===================================================================
194 RCS file: /home/cvsroot/UMP-Lublin/src/LUBLIN.woda.txt,v
195 retrieving revision 1.105
196 diff -u -r1.105 LUBLIN.woda.txt
197 --- UMP-Lublin/src/LUBLIN.woda.txt 22 Aug 2009 14:20:21 -0000 1.105
198 +++ UMP-Lublin/src/LUBLIN.woda.txt 23 Aug 2009 10:06:11 -0000
199 @@ -864,15 +864,27 @@
200 Type=0x1f
201 Label=Kanal zrzutowy
202 EndLevel=1
203 -Data0=(51.45135,21.95987),(51.45129,21.94881),(51.45140,21.94853),(51.45177,21.94830)
204 Data0=(51.45135,21.95987),(51.45140,21.96685),(51.45146,21.96741),(51.45125,21.97065),(51.45131,21.97081)
205 [END]
207 [POLYLINE]
208 Type=0x1f
209 +Label=Kanal zrzutowy
210 +EndLevel=1
211 +Data0=(51.45135,21.95987),(51.45129,21.94881),(51.45140,21.94853),(51.45177,21.94830)
212 +[END]
214 +[POLYLINE]
215 +Type=0x1f
216 Label=Kanal dosylowy
217 EndLevel=1
218 Data0=(51.45107,21.95992),(51.45113,21.96603),(51.45131,21.96648),(51.45132,21.96698),(51.45118,21.96739),(51.45099,21.97067),(51.45111,21.97102)
219 +[END]
221 +[POLYLINE]
222 +Type=0x1f
223 +Label=Kanal dosylowy
224 +EndLevel=1
225 Data0=(51.45083,21.94825),(51.45085,21.95083),(51.45106,21.95155),(51.45107,21.95992)
226 [END]
228 @@ -927,6 +939,12 @@
229 Label=Osadnik Wód Deszczowych
230 EndLevel=1
231 Data0=(51.40454,21.96971),(51.40325,21.96717),(51.40217,21.96724),(51.40213,21.96738),(51.40170,21.96746),(51.40155,21.96920),(51.40165,21.96922),(51.40173,21.96827),(51.40213,21.96778),(51.40345,21.96782),(51.40445,21.96982)
232 +[END]
234 +[POLYGON]
235 +Type=0x41
236 +Label=Osadnik Wód Deszczowych
237 +EndLevel=1
238 Data0=(51.40338,21.96809),(51.40371,21.96873),(51.40182,21.96915),(51.40187,21.96850),(51.40219,21.96809)
239 [END]
241 @@ -2071,10 +2089,14 @@
243 [POLYLINE]
244 Type=0x18
245 -Data0=(51.41168,21.94945),(51.41193,21.95067)
246 Data0=(51.41193,21.95067),(51.41156,21.95603),(51.41122,21.95729)
247 [END]
249 +[POLYLINE]
250 +Type=0x18
251 +Data0=(51.41168,21.94945),(51.41193,21.95067)
252 +[END]
254 [POLYGON]
255 Type=0x41
256 Label=£acha Wiœlana
257 @@ -2085,6 +2107,10 @@
258 [POLYLINE]
259 Type=0x18
260 Data0=(51.41249,21.94653),(51.41171,21.94819)
261 +[END]
263 +[POLYLINE]
264 +Type=0x18
265 Data0=(51.41171,21.94819),(51.41169,21.94842)
266 [END]
268 Index: UMP-NowySacz/src/POI-NowySacz1.pnt
269 ===================================================================
270 RCS file: /home/cvsroot/UMP-NowySacz/src/POI-NowySacz1.pnt,v
271 retrieving revision 1.133
272 diff -u -r1.133 POI-NowySacz1.pnt
273 --- UMP-NowySacz/src/POI-NowySacz1.pnt 22 Aug 2009 12:08:14 -0000 1.133
274 +++ UMP-NowySacz/src/POI-NowySacz1.pnt 23 Aug 2009 10:06:12 -0000
275 @@ -1223,7 +1223,7 @@
276 49.61331, 20.69868, 0,,,Nowy S¹cz,0x1616
277 49.60945, 20.70065, 0,,,Nowy S¹cz,0x1616
278 49.61735, 20.71489, 0,,,Nowy S¹cz,0x1616
279 - 49.60800, 20.69426, 0,,,Nowy S¹cz,0x1916
280 + 49.60800, 20.69426, 0,,,Nowy S¹cz,0x1616
281 49.60829, 20.69228, 0,,,Nowy S¹cz,0x1616
282 49.60811, 20.69523, 0,,,Nowy S¹cz,0x1616
283 49.62421, 20.71926, 0,,,Nowy S¹cz,0x1616
284 @@ -2086,9 +2086,9 @@
285 49.42168, 20.95914, 0,Kredyt Bank,Zdrojowa;35;+48184716487,Krynica-Zdrój,ATM
286 49.41110, 20.95534, 0,BPS ATM,Kraszewskiego;37;+48184715573,Krynica-Zdrój,ATM
287 49.41229, 20.95540, 0,U Edytki,Kraszewskiego;32;+48501521580,Krynica-Zdrój,RESTAURACJA
288 - 49.63303, 20.71183, 0,,,Nowy S¹cz,0x1716
289 - 49.62076, 20.71825, 0,,,Nowy S¹cz,0x1716
290 - 49.61978, 20.71739, 0,,,Nowy S¹cz,0x1716
291 + 49.63303, 20.71183, 0,,,Nowy S¹cz,0x1616
292 + 49.62076, 20.71825, 0,,,Nowy S¹cz,0x1616
293 + 49.61978, 20.71739, 0,,,Nowy S¹cz,0x1616
294 49.63542, 20.69216, 0,Media Markt,Tarnowska,Nowy S¹cz,RTV
295 49.58897, 20.59580, 0,Grodzisko,,,ATRAKCJA
296 49.58528, 20.60697, 0,Cmentarz Ewangelicki,,,CMENTARZ
297 Index: UMP-Portugalia/src/Portugalia-miasta_poza_obszarem_mapy.pnt.txt
298 ===================================================================
299 RCS file: /home/cvsroot/UMP-Portugalia/src/Portugalia-miasta_poza_obszarem_mapy.pnt.txt,v
300 retrieving revision 1.1
301 diff -u -r1.1 Portugalia-miasta_poza_obszarem_mapy.pnt.txt
302 --- UMP-Portugalia/src/Portugalia-miasta_poza_obszarem_mapy.pnt.txt 8 May 2008 23:04:16 -0000 1.1
303 +++ UMP-Portugalia/src/Portugalia-miasta_poza_obszarem_mapy.pnt.txt 23 Aug 2009 10:06:12 -0000
304 @@ -1,8 +1,13 @@
305 ;Madeira
306 +;Açores
307 +OziExplorer Point File Version 1.0
308 +WGS 84
309 +Reserved 1
310 +Reserved 2
311 +255,65535,3,8,0,0,CITY Portugalia
312 32.65000, -16.90000, 6,Funchal
313 32.63000, -16.96000, 5,Câmara de Lobos
314 32.63000, -16.84000, 4,Caniço
315 32.70000, -16.76000, 4,Machico
316 -;Açores
317 37.75000, -25.67000, 5,Ponta Delgada
318 38.66000, -27.22000, 4,Angra de Heroismo
319 Index: UMP-Poznan/src/POZNAN.ulice.txt
320 ===================================================================
321 RCS file: /home/cvsroot/UMP-Poznan/src/POZNAN.ulice.txt,v
322 retrieving revision 1.885
323 diff -u -r1.885 POZNAN.ulice.txt
324 --- UMP-Poznan/src/POZNAN.ulice.txt 21 Aug 2009 17:37:19 -0000 1.885
325 +++ UMP-Poznan/src/POZNAN.ulice.txt 23 Aug 2009 10:06:22 -0000
326 @@ -8183,7 +8183,6 @@
327 DirIndicator=1
328 Data0=(52.38499,16.97139),(52.38419,16.97231)
329 Label2=Boles³awa Krzywoustego
330 -Label2=Boles³awa Krzywoustego
331 [END]
333 [POLYLINE]
334 @@ -31751,8 +31750,8 @@
335 Label=Wergiliusza
336 EndLevel=1
337 Data0=(52.44443,16.88162),(52.44455,16.88242)
338 --Numbers1=0,O,45,47,N,-1,-1
339 --Numbers2=1,N,-1,-1,N,-1,-1
340 +Numbers1=0,O,45,47,N,-1,-1
341 +Numbers2=1,N,-1,-1,N,-1,-1
342 [END]
344 [POLYLINE]
345 Index: UMP-Przemysl/src/IWONICZ-ZDROJ.ulice.txt
346 ===================================================================
347 RCS file: /home/cvsroot/UMP-Przemysl/src/IWONICZ-ZDROJ.ulice.txt,v
348 retrieving revision 1.14
349 diff -u -r1.14 IWONICZ-ZDROJ.ulice.txt
350 --- UMP-Przemysl/src/IWONICZ-ZDROJ.ulice.txt 20 Aug 2009 15:47:58 -0000 1.14
351 +++ UMP-Przemysl/src/IWONICZ-ZDROJ.ulice.txt 23 Aug 2009 10:06:22 -0000
352 @@ -77,7 +77,7 @@
353 [POLYLINE]
354 Type=0x5
355 Data0=(49.58946,21.83075),(49.58847,21.82949),(49.58816,21.82773),(49.58735,21.82589),(49.58696,21.82537),(49.58512,21.82430),(49.58422,21.82417),(49.58372,21.82456),(49.58319,21.82520),(49.58259,21.82520),(49.58138,21.82443),(49.58101,21.82393),(49.58035,21.82318),(49.57979,21.82284),(49.57835,21.82131),(49.57789,21.82080),(49.57748,21.82061),(49.57677,21.82061),(49.57666,21.82061),(49.57535,21.82002),(49.57495,21.81955),(49.57454,21.81942),(49.57429,21.81939),(49.57415,21.81955),(49.57396,21.81980),(49.57381,21.81982),(49.57357,21.81962),(49.57344,21.81944),(49.57307,21.81929),(49.57172,21.81850),(49.57087,21.81774),(49.57050,21.81740),(49.56954,21.81542),(49.56927,21.81373),(49.56919,21.81331),(49.56902,21.81299),(49.56858,21.81250),(49.56832,21.81227),(49.56809,21.81175),(49.56762,21.81102),(49.56734,21.81041),(49.56701,21.81010),(49.56685,21.80983),(49.56662,21.80915),(49.56644,21.80806),(49.56622,21.80704),(49.56617,21.80622),(49.56610,21.80543),(49.56597,21.80483),(49.56595,21.80474),(49.56562,21.80448),(49.56541,21.80421),(49.56530,21.80378),(49.56514,21.80359),(49.56469,21.80350),(49.56406,21.80320),(49.56332,21.80308),(49.56249,21.80273),(49.56248,21.80237),(49.56307,21.80177),(49.56368,21.80113),(49.56421,21.80044)
356 -EndLebel=2
357 +EndLevel=2
358 [END]
360 [POLYLINE]
361 Index: UMP-Przemysl/src/Pruchnik-pliki.txt
362 ===================================================================
363 RCS file: /home/cvsroot/UMP-Przemysl/src/Pruchnik-pliki.txt,v
364 retrieving revision 1.3
365 diff -u -r1.3 Pruchnik-pliki.txt
366 --- UMP-Przemysl/src/Pruchnik-pliki.txt 13 Mar 2007 22:38:11 -0000 1.3
367 +++ UMP-Przemysl/src/Pruchnik-pliki.txt 23 Aug 2009 10:06:22 -0000
368 @@ -1,8 +0,0 @@
369 -PRUCHNIK.obszary.txt
370 -PRUCHNIK.szlaki.txt
371 -PRUCHNIK.ulice.txt
372 -PRUCHNIK.woda.txt
373 -PRUCHNIK.zielone.txt
374 -PRUCHNIK.warstwice.txt
375 -PRUCHNIK.drogi.txt
376 -POI-Pruchnik.txt
377 Index: UMP-Suwalki/src/GOLDAP.ulice.txt
378 ===================================================================
379 RCS file: /home/cvsroot/UMP-Suwalki/src/GOLDAP.ulice.txt,v
380 retrieving revision 1.13
381 diff -u -r1.13 GOLDAP.ulice.txt
382 --- UMP-Suwalki/src/GOLDAP.ulice.txt 5 Aug 2009 15:32:51 -0000 1.13
383 +++ UMP-Suwalki/src/GOLDAP.ulice.txt 23 Aug 2009 10:06:22 -0000
384 @@ -21,7 +21,7 @@
385 EndLevel=4
386 DirIndicator=1
387 Data0=(54.30839,22.30353),(54.30818,22.30349)
388 -Lebel2=Królewiecka
389 +Label2=Królewiecka
390 [END]
392 [POLYLINE]
393 @@ -818,6 +818,6 @@
394 EndLevel=4
395 DirIndicator=1
396 Data0=(54.30818,22.30349),(54.30839,22.30342)
397 -Lebel2=Królewiecka
398 +Label2=Królewiecka
399 [END]
401 Index: UMP-Szczecin/src/STARGARD_SZCZECINSKI.ulice.txt
402 ===================================================================
403 RCS file: /home/cvsroot/UMP-Szczecin/src/STARGARD_SZCZECINSKI.ulice.txt,v
404 retrieving revision 1.47
405 diff -u -r1.47 STARGARD_SZCZECINSKI.ulice.txt
406 --- UMP-Szczecin/src/STARGARD_SZCZECINSKI.ulice.txt 8 Jul 2009 13:31:42 -0000 1.47
407 +++ UMP-Szczecin/src/STARGARD_SZCZECINSKI.ulice.txt 23 Aug 2009 10:06:22 -0000
408 @@ -560,7 +560,6 @@
409 Label=plac S³oneczny
410 EndLevel=1
411 Data0=(53.33828,15.02069),(53.33815,15.01977)
412 -End Level=1
413 [END]
415 [POLYLINE]
416 Index: UMP-Torun/src/inne.ulice.txt
417 ===================================================================
418 RCS file: /home/cvsroot/UMP-Torun/src/inne.ulice.txt,v
419 retrieving revision 1.379
420 diff -u -r1.379 inne.ulice.txt
421 --- UMP-Torun/src/inne.ulice.txt 21 Jun 2009 13:28:11 -0000 1.379
422 +++ UMP-Torun/src/inne.ulice.txt 23 Aug 2009 10:06:23 -0000
423 @@ -725,8 +725,7 @@
424 Label=~[0x2f]534/543 Tysi¹clecia
425 EndLevel=3
426 Data0=(53.38238,18.94770),(53.38265,18.94464),(53.38263,18.94342),(53.38254,18.94160),(53.38260,18.94084),(53.38280,18.94004),(53.38309,18.93976),(53.38325,18.93963),(53.38467,18.93837)
427 -Label2=Tysi¹clecia
428 -Label2=1000-lecia
429 +Label2=Tysi¹clecia, 1000-lecia
430 Miasto=Radzyñ Che³miñski
431 [END]
433 Index: UMP-Ukraina/src/miasta_poza_obszarem_mapy.pnt.txt
434 ===================================================================
435 RCS file: /home/cvsroot/UMP-Ukraina/src/miasta_poza_obszarem_mapy.pnt.txt,v
436 retrieving revision 1.1
437 diff -u -r1.1 miasta_poza_obszarem_mapy.pnt.txt
438 --- UMP-Ukraina/src/miasta_poza_obszarem_mapy.pnt.txt 8 May 2008 20:41:24 -0000 1.1
439 +++ UMP-Ukraina/src/miasta_poza_obszarem_mapy.pnt.txt 23 Aug 2009 10:06:23 -0000
440 @@ -1,3 +1,8 @@
441 +OziExplorer Point File Version 1.0
442 +WGS 84
443 +Reserved 1
444 +Reserved 2
445 +255,65535,3,8,0,0,CITY Ukraina
446 49.98000, 36.22000, 10,Charkiv
447 48.45000, 34.98000, 10,Dnipropetrovsk
448 48.00000, 37.82000, 10,Doneck
449 Index: UMP-Wroclaw/src/SZCZAWNO.ulice.txt
450 ===================================================================
451 RCS file: /home/cvsroot/UMP-Wroclaw/src/SZCZAWNO.ulice.txt,v
452 retrieving revision 1.2
453 diff -u -r1.2 SZCZAWNO.ulice.txt
454 --- UMP-Wroclaw/src/SZCZAWNO.ulice.txt 4 Jul 2009 06:48:18 -0000 1.2
455 +++ UMP-Wroclaw/src/SZCZAWNO.ulice.txt 23 Aug 2009 10:06:23 -0000
456 @@ -509,9 +509,3 @@
457 EndLevel=1
458 Data0=(50.796421,16.252750),(50.797840,16.252410),(50.799430,16.252109),(50.800411,16.251720),(50.800540,16.251329)
459 [END]
461 -[POI]
462 -Type=0x0
463 -Label=DUmMY
464 -Data0=(52.000000,20.555550)
465 -[END]
466 Index: UMP-Wroclaw/src/WROCLAW.drogi.txt
467 ===================================================================
468 RCS file: /home/cvsroot/UMP-Wroclaw/src/WROCLAW.drogi.txt,v
469 retrieving revision 1.358
470 diff -u -r1.358 WROCLAW.drogi.txt
471 --- UMP-Wroclaw/src/WROCLAW.drogi.txt 20 Aug 2009 19:17:22 -0000 1.358
472 +++ UMP-Wroclaw/src/WROCLAW.drogi.txt 23 Aug 2009 10:06:26 -0000
473 @@ -4806,7 +4806,7 @@
475 [POLYLINE]
476 Type=0x3
477 -Label=~[0c2c]8
478 +Label=~[0x2c]8
479 EndLevel=2
480 DirIndicator=1
481 Data0=(51.041831,16.969509),(51.042610,16.969677),(51.042919,16.969734),(51.043502,16.969905),(51.044017,16.970125),(51.044712,16.970420),(51.045047,16.970563),(51.046463,16.970607),(51.047050,16.970624),(51.047328,16.970684),(51.047584,16.970848)
482 Index: narzedzia/pnt2poi.awk
483 ===================================================================
484 RCS file: /home/cvsroot/narzedzia/pnt2poi.awk,v
485 retrieving revision 1.70
486 diff -u -r1.70 pnt2poi.awk
487 --- narzedzia/pnt2poi.awk 10 Aug 2009 10:07:04 -0000 1.70
488 +++ narzedzia/pnt2poi.awk 23 Aug 2009 10:06:26 -0000
489 @@ -22,7 +22,7 @@
490 sym["WERYFIKOWAC"]="0x170a";
491 sym["NIE_WIEM"]="0x170d";
492 sym["WATPLIWY"]="0x170d";
493 - sym["ZAKAZ"]="0x1710";
494 + sym["ZAKAZ"]="0x17105";
495 sym["REMONT"]="0x1712";
497 sym["STAWA"]="0x1606";
498 @@ -52,10 +52,10 @@
499 sym["JEDZENIE"]="0x2a00";
500 sym["AMERICAN"]="0x2a01";
501 sym["ASIAN"]="0x2a02";
502 - sym["SUSHI"]="0x2a02";
503 - sym["BARBECUE"]="0x2a03";
504 - sym["GRILL"]="0x2a03";
505 - sym["KEBAB"]="0x2a03";
506 + sym["SUSHI"]="0x2a025";
507 + sym["BARBECUE"]="0x2a030";
508 + sym["GRILL"]="0x2a031";
509 + sym["KEBAB"]="0x2a032";
510 sym["CHINESE"]="0x2a04";
511 sym["DELI"]="0x2a05";
512 sym["INTERNATIONA"]="0x2a06";
513 @@ -79,12 +79,12 @@
514 sym["GERMAN"]="0x2a10";
515 sym["BRITISH"]="0x2a11";
516 sym["GRECKA"]="0x2a12";
517 - sym["LIBANSKA"]="0x2a12";
518 + sym["LIBANSKA"]="0x2a125";
520 sym["HOSTEL"]="0x2b00";
521 sym["SCHRONISKO"]="0x2b00"; ## ?? a moze 2b05?/2b04
522 sym["lodging"]="0x2b01";
523 - sym["MOTEL"]="0x2b01"; # Hotel/Motel
524 + sym["MOTEL"]="0x2b015"; # Hotel/Motel
525 sym["HOTEL"]="0x2b01"; # Hotel/Other
526 sym["B&B"]="0x2b02";
527 sym["camping"]="0x2b03";
528 @@ -99,15 +99,15 @@
529 sym["amusement_park"]="0x2c01"; # Amusement Park
530 sym["AMUSEMENT_PARK"]="0x2c01";
531 sym["PLAC_ZABAW"]="0x2c01";
532 - sym["GALERIA"]="0x2c02";
533 + sym["GALERIA"]="0x2c025";
534 sym["museum"]="0x2c02";
535 sym["muzea"]="0x2c02";
536 sym["MUZEUM"]="0x2c02";
537 sym["BIBLIOTEKA"]="0x2c03";
538 - sym["DWOREK"]="0x2c04";
539 - sym["PALAC"]="0x2c04";
540 - sym["CASTLE"]="0x2c04"; # ???
541 - sym["ZAMEK"]="0x2c04"; # ???
542 + sym["DWOREK"]="0x2c040";
543 + sym["PALAC"]="0x2c041";
544 + sym["CASTLE"]="0x2c042"; # ???
545 + sym["ZAMEK"]="0x2c043"; # ???
546 sym["school"]="0x2c05";
547 sym["SZKOLA"]="0x2c05";
548 sym["szkoly"]="0x2c05";
549 @@ -118,9 +118,9 @@
550 sym["PARK"]="0x2c06";
551 sym["zoo"]="0x2c07";
552 sym["ZOO"]="0x2c07";
553 - sym["stadium"]="0x2c08";
554 - sym["STADION"]="0x2c08"; # Sports(point)
555 - sym["BOISKO"]="0x2c08";
556 + sym["stadium"]="0x2c081";
557 + sym["STADION"]="0x2c081"; # Sports(point)
558 + sym["BOISKO"]="0x2c080";
559 sym["TARGI"]="0x2c09";
560 sym["FAIR"]="0x2c09";
561 sym["WINIARNIA"]="0x2c0a";
562 @@ -141,8 +141,8 @@
563 sym["KINO"]="0x2d03";
564 sym["MULTIKINO"]="0x2d03";
565 sym["kina"]="0x2d03"; # Cinema
566 - sym["CASINO"]="0x2d04";
567 - sym["KASYNO"]="0x2d04";
568 + sym["CASINO"]="0x2d045";
569 + sym["KASYNO"]="0x2d045";
570 sym["GOLF"]="0x2d05";
571 sym["NARTY"]="0x2d06"; # Ski center
572 sym["KREGLE"]="0x2d07";
573 @@ -150,11 +150,11 @@
574 sym["BASEN"]="0x2d09";
575 sym["baseny"]="0x2d09";
576 sym["NUREK"]="0x2d09";
577 - sym["fitness"]="0x2d0a";
578 - sym["FITNESS"]="0x2d0a"; # Sports(point)
579 - sym["KORT"]="0x2d0a"; # Sports(point)
580 - sym["KORTY"]="0x2d0a"; # Sports(point)
581 - sym["SKATEPARK"]="0x2d0a"; # Sports(point)
582 + sym["fitness"]="0x2d0a0";
583 + sym["FITNESS"]="0x2d0a0"; # Sports(point)
584 + sym["KORT"]="0x2d0a1"; # Sports(point)
585 + sym["KORTY"]="0x2d0a1"; # Sports(point)
586 + sym["SKATEPARK"]="0x2d0a2"; # Sports(point)
587 sym["SPORT"]="0x2d0a"; # Sports(point)
588 sym["landing"]="0x2d0b";
590 @@ -170,7 +170,7 @@
591 sym["MARKET"]="0x2e01";
592 sym["store"]="0x2e01"; # Dept. Store
593 sym["SPOZYWCZY"]="0x2e02";
594 - sym["BAZAR"]="0x2e02";
595 + sym["BAZAR"]="0x2e025";
596 sym["GROCERY"]="0x2e02";
597 sym["SUPER"]="0x2e03";
598 sym["SUPERMARKET"]="0x2e03";
599 @@ -189,7 +189,7 @@
600 sym["DOM_I_OGROD"]="0x2e08";
601 sym["MEBLE"]="0x2e09";
602 sym["WNETRZA"]="0x2e09";
603 - sym["ROWEROWY"]="0x2e0a";
604 + sym["ROWEROWY"]="0x2e0a5";
605 sym["SPORTOWY"]="0x2e0a";
606 sym["TURYSTYCZNY"]="0x2e0a";
607 sym["RTV"]="0x2e0b";
608 @@ -201,44 +201,46 @@
609 sym["PALIWO"]="0x2f01";
610 sym["stacje benzynowe"]="0x2f01";
611 sym["RENTACAR"]="0x2f02";
612 - sym["AUTO"]="0x2f03";
613 - sym["CAR"]="0x2f03";
614 + sym["AUTO"]="0x2f030";
615 + sym["CAR"]="0x2f030";
616 sym["CARREPAIR"]="0x2f03";
617 sym["CARSERVICE"]="0x2f03";
618 sym["airport"]="0x2f04";
619 sym["AIRPORT"]="0x2f04";
620 sym["LOTNISKO"]="0x2f04";
621 - sym["POCZTA"]="0x2f05";
622 - sym["INPOST"]="0x2f05";
623 - sym["KURIER"]="0x2f05";
624 - sym["ATM"]="0x2f06";
625 - sym["ATMBANK"]="0x2f06";
626 + sym["POCZTA"]="0x2f05";
627 + sym["INPOST"]="0x2f05";
628 + sym["KURIER"]="0x2f050";
629 + sym["DHL"]="0x2f051";
630 + sym["UPS"]="0x2f052";
631 + sym["ATM"]="0x2f062";
632 + sym["ATMBANK"]="0x2f061";
633 sym["BANK"]="0x2f06";
634 sym["banki"]="0x2f06";
635 sym["CARDEALER"]="0x2f07";
636 - sym["BUS"]="0x2f08";
637 - sym["TRAM"]="0x2f08";
638 - sym["METRO"]="0x2f08";
639 - sym["PKS"]="0x2f08";
640 - sym["PKP"]="0x2f08";
641 + sym["BUS"]="0x2f080";
642 + sym["TRAM"]="0x2f081";
643 + sym["METRO"]="0x2f082";
644 + sym["PKS"]="0x2f083";
645 + sym["PKP"]="0x2f084";
646 sym["PORT"]="0x2f09";
647 sym["PRZYSTAN"]="0x2f09";
648 sym["parking"]="0x2f0b"; # 4d00?
649 sym["PARKING"]="0x2f0b"; # 4d00?
650 - sym["info"]="0x2f0c";
651 - sym["INFO"]="0x2f0c";
652 - sym["INFORMACJA"]="0x2f0c";
653 + sym["info"]="0x2f0c5";
654 + sym["INFO"]="0x2f0c5";
655 + sym["INFORMACJA"]="0x2f0c5";
656 sym["RESTROOM"]="0x2f0c"; # ???
657 sym["CARWASH"]="0x2f0e";
658 sym["MYJNIA"]="0x2f0e";
659 sym["GARMIN"]="0x2f0f";
660 sym["USLUGI"]="0x2f10"; # personal services
661 sym["FRYZJER"]="0x2f10"; # personal services
662 - sym["TATOO"]="0x2f10"; # personal services
663 - sym["OPTYK"]="0x2f10"; # personal services
664 - sym["FABRYKA"]="0x2f11";
665 - sym["BUSINESS"]="0x2f11";
666 - sym["FIRMA"]="0x2f11";
667 + sym["TATOO"]="0x2f105"; # personal services
668 + sym["OPTYK"]="0x2f106"; # personal services
669 + sym["FABRYKA"]="0x2f115";
670 + sym["BUSINESS"]="0x2f116";
671 + sym["FIRMA"]="0x2f116";
672 sym["HOTSPOT"]="0x2f12";
673 sym["WIFI"]="0x2f12";
674 sym["REPAIR"]="0x2f13";
675 @@ -252,13 +254,13 @@
677 sym["EMERGENCY"]="0x3000";
678 sym["POLICJA"]="0x3001";
679 - sym["DENTYSTA"]="0x3002";
680 + sym["DENTYSTA"]="0x30027";
681 sym["POGOTOWIE"]="0x3002";
682 - sym["PRZYCHODNIA"]="0x3002";
683 + sym["PRZYCHODNIA"]="0x30025";
684 sym["SZPITAL"]="0x3002";
685 sym["szpitale"]="0x3002";
686 - sym["UZDROWISKO"]="0x3002";
687 - sym["WETERYNARZ"]="0x3002";
688 + sym["UZDROWISKO"]="0x30025";
689 + sym["WETERYNARZ"]="0x30026";
690 sym["RATUSZ"]="0x3003";
691 sym["SAD"]="0x3004";
692 sym["KONCERT"]="0x3005";
693 @@ -274,6 +276,7 @@
694 sym["WRAK"]="0x4200";
695 sym["MARINA"]="0x4300";
696 sym["PRZYSTAN"]="0x4700"; # boat ramp? harbour
697 + sym["BOAT_RAMP"]="0x4701";
698 sym["picnic"]="0x4a00";
699 sym["PICNIC"]="0x4a00";
700 sym["REST"]="0x4a00";
701 @@ -283,18 +286,18 @@
702 sym["skiing"]="0x5300";
703 sym["SKI"]="0x5300";
704 sym["KAPIELISKO"]="0x5400";
705 - sym["FA"]="0x5600"; # Atrapa fotoradaru
706 - sym["FP"]="0x5600"; # Fotoradar przenosny
707 - sym["FS"]="0x5600"; # Fotoradar staly
708 - sym["KD"]="0x5600"; # Kontrola drogowa
709 - sym["RA"]="0x5600"; # Radiowoz z kamera
710 + sym["FA"]="0x56001"; # Atrapa fotoradaru
711 + sym["FP"]="0x56002"; # Fotoradar przenosny
712 + sym["FS"]="0x56003"; # Fotoradar staly
713 + sym["KD"]="0x56004"; # Kontrola drogowa
714 + sym["RA"]="0x56005"; # Radiowoz z kamera
715 sym["CZARNYPUNKT"]="0x5700";
716 sym["DANGER"]="0x5700";
717 - sym["FOTORADAR"]="0x5700";
718 - sym["RADAR"]="0x5700";
719 - sym["NM"]="0x5700"; # Niebezpieczne miejsce
720 - sym["OP"]="0x5700"; # Ograniczenie predkosci
721 - sym["PK"]="0x5700"; # Przejazd kolejowy
722 + sym["FOTORADAR"]="0x57000";
723 + sym["RADAR"]="0x57001";
724 + sym["NM"]="0x57002"; # Niebezpieczne miejsce
725 + sym["OP"]="0x57003"; # Ograniczenie predkosci
726 + sym["PK"]="0x57004"; # Przejazd kolejowy
727 sym["AIRPORTBIG"]="0x5901";
728 sym["AIRPORTMED"]="0x5902";
729 sym["AIRPORTSMALL"]="0x5903";
730 @@ -324,15 +327,15 @@
731 sym["PLATFORMA"]="0x640d";
732 sym["RV_park"]="0x640e";
733 sym["REZERWAT"]="0x640e"; # park
734 - sym["short_tower"]="0x6411";
735 - sym["tall_tower"]="0x6411";
736 + sym["short_tower"]="0x64110";
737 + sym["tall_tower"]="0x64111";
738 sym["TOWER"]="0x6411";
739 sym["WIEZA"]="0x6411";
740 sym["TRAIL"]="0x6412"; # ???
741 sym["SZLAK"]="0x6412";
742 sym["TUNEL"]="0x6413";
743 - sym["JASKINIA"]="0x6413";
744 - sym["CAVE"]="0x6413"; # Tunel?
745 + sym["JASKINIA"]="0x64135";
746 + sym["CAVE"]="0x64135"; # Tunel?
747 sym["OLIGOCEN"]="0x6414";
748 sym["BUNKIER"]="0x6415"; # ???
749 sym["FORT"]="0x6415"; # ???
750 @@ -344,14 +347,15 @@
751 sym["boat_ramp"]="0x650b"; # Harbor
752 sym["WYSPA"]="0x650c";
753 sym["JEZIORO"]="0x650d";
754 - sym["TOITOI"]="0x650f";
755 - sym["WC"]="0x650f"; # ???
756 + sym["TOITOI"]="0x650f5";
757 + sym["WC"]="0x650f5"; # ???
758 sym["ZRODLO"]="0x6511";
759 sym["SPRING"]="0x6511";
760 sym["stream"]="0x6512";
761 sym["pond"]="0x6513";
762 sym["KURHAN"]="0x6600"; # ???
763 sym["AREA"]="0x6602";
764 + sym["AREA"]="0x6602";
765 sym["OBSZAR"]="0x6602";
766 sym["PLAZA"]="0x6604"; # beach
767 sym["JAZ"]="0x6605"; # canal?
768 @@ -362,7 +366,9 @@
769 sym["TREE"]="0x660a";
770 sym["elevation"]="0x6610";
771 sym["plain"]="0x6610";
772 - sym["short_tower"]="0x6611";
773 + sym["short_tower"]="0x64110";
774 + sym["tall_tower"]="0x64111";
775 + sym["TALL_TOWER"]="0x64111";
776 sym["SKALA"]="0x6614";
777 sym["GORA"]="0x6616";
778 sym["HILL"]="0x6616";