Merge lp:~toby-murray/osm-shields/toby-shields into lp:osm-shields

Proposed by Toby Murray
Status: Needs review
Proposed branch: lp:~toby-murray/osm-shields/toby-shields
Merge into: lp:osm-shields
Diff against target: 661 lines (+510/-65)
3 files modified
counties/US:KS (+37/-0)
counties/US:NY (+471/-64)
sequences/US:OK (+2/-1)
To merge this branch: bzr merge lp:~toby-murray/osm-shields/toby-shields
Reviewer Review Type Date Requested Status
Phil! Gold Pending
Review via email: mp+181703@code.launchpad.net

Description of the change

Adding the NY counties file from Richard.

To post a comment you must log in.
256. By Toby Murray

Adding OK 351

257. By Toby Murray

Minor NY county tweaks

258. By Toby Murray

Adding a file for Kansas counties

259. By Toby Murray

Moving OK 351 to the 2.5 SVG

260. By Toby Murray

Adding OK 364

Unmerged revisions

260. By Toby Murray

Adding OK 364

259. By Toby Murray

Moving OK 351 to the 2.5 SVG

258. By Toby Murray

Adding a file for Kansas counties

257. By Toby Murray

Minor NY county tweaks

256. By Toby Murray

Adding OK 351

255. By Toby Murray <email address hidden>

Adding NY counties from Richard.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'counties/US:KS'
--- counties/US:KS 1970-01-01 00:00:00 +0000
+++ counties/US:KS 2014-09-11 18:35:54 +0000
@@ -0,0 +1,37 @@
1[US:county_2.svg]
2county=Douglas
31..20
41E, 1W
5
6[US:county_2.5.svg]
7county=Douglas
8range_filter=has_ones
9400..500
10
11[US:county_3.svg]
12county=Douglas
13range_filter=no_ones
14400..500
15
16[US:county_3.5.svg]
17county=Douglas
18range_filter=has_ones
191000..1100
20
21[US:county_4.svg]
22county=Douglas
23range_filter=no_ones
241000..1100
25350E, 450N
26
27[US:county_2.5.svg]
28county=Riley
29range_filter=has_ones
30350..420
31860..920
32
33[US:county_3.svg]
34county=Riley
35range_filter=no_ones
36350..420
37860..920
038
=== modified file 'counties/US:NY'
--- counties/US:NY 2013-08-06 02:57:12 +0000
+++ counties/US:NY 2014-09-11 18:35:54 +0000
@@ -1,31 +1,55 @@
1[US:county_2.svg]1[US:county_2.svg]
2county=Broome;Chautauqua;Chemung;Chenango;Madison;Orange;Rockland;Warren
31..99
4
5
6[US:county_2.svg]
7county=Albany2county=Albany
81..9931..60
94
10[US:county_2.5.svg]5[US:county_2.5.svg]
11county=Albany6county=Albany
12range_filter=has_ones7201, 261, 301, 311, 312, 351, 361, 401
13100..4998101..115
9151..165
10410..414
1411
15[US:county_3.svg]12[US:county_3.svg]
16county=Albany13county=Albany
17range_filter=no_ones14range_filter=no_ones
18100..49915202..209
1916252..262
2017302..309
21[US:county_2.svg]18352..362
22county=Allegany19402..409
231..9920
2421[US:county_2.svg]
22county=Allegany
231..50
24
25[US:county_2.svg]
26county=Allegany
272A, 2B, 5A, 5B, 5C, 6S, 7A, 7B, 7C, 7D, 7E
28
29[US:county_3.svg]
30county=Allegany
3110S, 13A, 13B, 13C, 15A, 15B, 17S, 19A, 20S, 22A, 26S, 27B, 31A
32
33[US:county_2.svg]
34county=Broome
351..97
36
37[US:county_2.5.svg]
38county=Broome
39100..197
40217, 221, 241, 251
41
42[US:county_3.svg]
43county=Broome
44205, 209, 225, 229, 233, 237, 245, 249, 20S, 24S, 33S, 44S, 70S, 93S
45
46[US:county_4.svg]
47county=Broome
48181S, 233S
2549
26[US:county_2.svg]50[US:county_2.svg]
27county=Cattaraugus51county=Cattaraugus
281..99521..96
2953
30[US:county_3.5.svg]54[US:county_3.5.svg]
31county=Cattaraugus55county=Cattaraugus
@@ -35,20 +59,49 @@
35county=Cattaraugus59county=Cattaraugus
3686-26086-2
3761
62[US:county_2.svg]
63county=Chautauqua
641..95
65
66[US:county_3.svg]
67county=Chautauqua
68380
69
70[US:county_2.svg]
71county=Chemung
721..80
73
74[US:county_3.svg]
75county=Chemung
7615A, 15B, 43A, 55A, 64A, 64B, 64C
77
78[US:county_2.svg]
79county=Chenango
803A, 7A
811..47
82
83[US:county_3.svg]
84county=Chenango
8510A, 12A, 12B, 12C, 13A, 15A, 23A, 23B, 23C, 23D, 28A, 32A, 32B, 32C
3886
39[US:county_2.svg]87[US:county_2.svg]
40county=Columbia88county=Columbia
411..998946, 88, 89
902..35
425A, 7A, 7D, 8A915A, 7A, 7D, 8A
4392
44[US:county_2.5.svg]93[US:county_2.5.svg]
45county=Columbia94county=Columbia
4621C9511A, 21B, 21C
4796
48[US:county_3.svg]97[US:county_3.svg]
49county=Columbia98county=Columbia
5025A, 26A, 28A, 28B9925A, 25B, 26A, 27A, 27B, 28A, 28B, 35A
51100
101[US:county_2.svg]
102county=Delaware
10353, 67
1041..47
52105
53[US:county_2.svg]106[US:county_2.svg]
54county=Dutchess107county=Dutchess
@@ -56,31 +109,82 @@
56109
57[US:county_2.5.svg]110[US:county_2.5.svg]
58county=Dutchess111county=Dutchess
59100..199112100, 101, 110, 111, 114
113103..105
60114
115[US:county_3.svg]
116county=Dutchess
11740A, 67A, 83A
61118
62[US:county_2.svg]119[US:county_2.svg]
63county=Erie120county=Erie
641..991211..75
12282..87
12390..96
65124
66[US:county_2.5.svg]125[US:county_2.5.svg]
67county=Erie126county=Erie
68range_filter=has_ones127range_filter=has_ones
69100..599128201, 221, 231, 241, 251, 261, 281
129301, 310, 313, 319, 321, 341, 371, 381
130401, 410, 421, 431, 441, 451, 461, 471, 481, 491
131501, 519, 521, 531, 541, 551, 571
132103..144
133152..157
134161..177
135181..199
136215..218
137315..317
138412..419
139510..512
70140
71[US:county_3.svg]141[US:county_3.svg]
72county=Erie142county=Erie
73range_filter=no_ones143range_filter=no_ones
74100..599144200..208
75145220..233
76146240..299
77[US:county_2.svg]147303..309
78county=Fulton148322..338
791..99149343..356
80150362..399
81[US:county_2.5.svg]151400..409
82county=Fulton152420..499
83100..199153500..508
154523..530
155534..548
156550..563
157572..580
158
159[US:county_2.svg]
160county=Essex
1616A, 7B, 88
1622..85
163
164
165[US:county_2.5.svg]
166county=Essex
16710A
168
169[US:county_3.svg]
170county=Essex
17126A, 29A, 86A, 86B, 86C, 86D, 86E
172
173[US:county_2.svg]
174county=Franklin
17560
1761..56
177
178[US:county_2.5.svg]
179county=Fulton
180125, 126, 128, 137, 138, 140, 142, 143, 145, 146,
181101..124
182130..132
183148..158
184
185[US:county_3.svg]
186county=Fulton
187116A
84188
85[US:county_3.5.svg]189[US:county_3.5.svg]
86county=Fulton190county=Fulton
@@ -88,21 +192,194 @@
88142A192142A
89193
90[US:county_2.svg]194[US:county_2.svg]
91county=Montgomery195county=Greene
921..991968A
931971..31
94[US:county_2.5.svg]19835..42
95county=Montgomery19947..57
96100..19920061..67
9720174..85
98202
99[US:county_2.svg]203[US:county_2.5.svg]
100county=Saratoga204county=Greene
1011..9920513A, 41A
102206
103[US:county_2.5.svg]207[US:county_3.svg]
104county=Saratoga208county=Greene
105100..19920920A, 20B, 23B, 23C, 26A, 32C, 47A, 49A, 65A, 67A
210
211[US:county_2.svg]
212county=Hamilton
2136A, 24, 25
2141..22
215
216[US:county_2.5.svg]
217county=Hamilton
21810A
219
220[US:county_2.svg]
221county=Jefferson
22236, 37
2231..9
22411..30
22540..49
22650..59
22762..97
228
229[US:county_2.5.svg]
230county=Jefferson
231100, 111, 125, 128, 129, 136, 138, 144, 145, 152, 155, 156, 165, 178, 179, 181, 196, 197, 281
232120..123
233159..163
234189..194
235
236[US:county_3.svg]
237county=Jefferson
238200, 202
239
240[US:county_2.svg]
241county=Lewis
24260, 62, 68
2431..56
24470..76
24578..80
246
247[US:county_2.5.svg]
248county=Lewis
249147, 175, 194
250
251[US:county_2.svg]
252county=Livingston
2531A
2541..85
255
256[US:county_2.5.svg]
257county=Livingston
25820A, 23A, 24A 27B, 30A, 36A, 58A
259
260[US:county_2.svg]
261county=Madison
2626A
2631..99
264
265[US:county_2.5.svg]
266county=Madison
267100..109
268
269[US:county_2.5.svg]
270county=Madison
27189A
272
273[US:county_2.svg]
274county=Montgomery
2751..99
276
277[US:county_2.5.svg]
278county=Montgomery
279100..199
280
281[US:county_2.svg]
282county=Oneida
2832A, 5A, 6A, 8A, 9A
2841..27
28529..94
286
287[US:county_2.5.svg]
288county=Oneida
28910A, 12A, 15A, 18A, 71A, 71B
290
291[US:county_3.svg]
292county=Oneida
29324A, 26A, 37A, 40A, 42A, 48A, 50A, 54A, 60A, 67A, 68A, 68B, 70A, 72A, 74A, 79A, 79B, 79C, 79D, 88A, 92A, 840
294
295[US:county_2.svg]
296county=Ontario
2971..49
298
299[US:county_2.svg]
300county=Orange
3011, 1A, 1B, 99
3024..56
30360..96
304
305[US:county_2.5.svg]
306county=Orange
30713A
308100..108
309
310[US:county_2.svg]
311county=Oswego
3121A, 2A, 6A, 6B, 84, 85, 89
3131..48
31451..65
315
316[US:county_2.5.svg]
317county=Oswego
31817A, 41A, 51A, 176
319
320[US:county_3.svg]
321county=Oswego
32222A, 23A, 23B, 30A, 35A, 45A, 45S 57A, 58A, 59A, 84A
323
324[US:county_2.svg]
325county=Otsego
3263A
3271..60
328
329[US:county_2.5.svg]
330county=Otsego
33111A, 11B, 11C, 11D, 12A, 18A, 18B, 18C, 61A, 61B, 61C
332
333[US:county_3.svg]
334county=Otsego
33525A, 29A, 32A, 32S, 34A, 38A, 48A
336
337[US:county_2.svg]
338county=Putnam
33910..17
34020..24
34130..73
342
343[US:county_2.svg]
344county=Rensselaer
3451..9
34615..23
34726..98
348
349[US:county_2.5.svg]
350county=Rensselaer
351100..105
352109..145
353
354[US:county_2.svg]
355county=Rockland
35657, 60
3571..8
35811..17
35920..30
36033..38
36141..53
36264..69
36371..76
36480..98
365
366[US:county_2.svg]
367county=Rockland
368100, 118, 135
369106..112
370
371[US:county_3.svg]
372county=Rockland
37323A, 33A, 69A, 80A, 98A, 118A
374
375[US:county_2.svg]
376county=Saratoga
3771..99
378
379[US:county_2.5.svg]
380county=Saratoga
381101, 104
382108..110
106383
107[US:county_3.svg]384[US:county_3.svg]
108county=Saratoga385county=Saratoga
@@ -112,20 +389,150 @@
112county=Saratoga389county=Saratoga
11313453901345
114391
115392[US:county_2.5.svg]
116[US:county_2.svg]393county=Schenectady
117county=Schenectady394100..199
1181..99395
119396[US:county_2.svg]
120[US:county_2.5.svg]397county=Scoharie
121county=Schenectady3981A, 1B, 2A, 5A, 5B, 7A, 8A
122100..1993991..46
12340048..57
12440159..72
125[US:county_2.svg]402
126county=Rensselaer403[US:county_2.5.svg]
1271..99404county=Scoharie
12840519A
129[US:county_2.5.svg]406
130county=Rensselaer407[US:county_3.svg]
131100..199408county=Scoharie
40923A, 34A
410
411[US:county_2.svg]
412county=Schuyler
4131..31
414
415[US:county_3.svg]
416county=Schuyler
41723A
418
419[US:county_2.svg]
420county=St Lawrence
4211..31
42233..62
423
424[US:county_2.5.svg]
425county=St Lawrence
42631A
427
428[US:county_3.svg]
429county=St Lawrence
43023A, 27A, 28A, 38A, 42A, 48A
431
432[US:county_2.svg]
433county=Steuben
4341..99
435
436[US:county_2.5.svg]
437county=Steuben
43810A, 415
439100..129
440
441[US:county_3.svg]
442county=Steuben
44339A, 40A, 70A, 333
444
445[US:county_2.svg]
446county=Suffolk
4471..7
44810..99
449
450[US:county_2.5.svg]
451county=Suffolk
45213A, 19A
453100..106
454111..117
455
456[US:county_3.svg]
457county=Suffolk
45839A, 39B, 50A, 94A
459
460[US:county_2.svg]
461county=Sullivan
46211..26
46331..33
46441..66
46571..75
46681..85
46791..96
468
469[US:county_2.5.svg]
470county=Sullivan
471183
47211A, 21A
473100..134
474141..179
475
476[US:county_3.svg]
477county=Sullivan
47845A
479
480[US:county_4.svg]
481county=Sullivan
482133A, 143A, 166A, 173A, 174A, 179A, 183A, 183B, 183C
483
484[US:county_2.svg]
485county=Warren
4861..99
487
488[US:county_2.svg]
489county=Tioga
4901..29
49133..43
49254, 60, 65
493
494[US:county_2.5.svg]
495county=Tioga
49615B
497
498[US:county_2.5.svg]
499county=Tompkins
500100..190
501
502[US:county_4.svg]
503county=Tompkins
504103A, 103B, 107A, 113A, 115M, 117A, 131A, 133A, 143A, 162A, 177A, 182H
505
506[US:county_2.svg]
507county=Ulster
5082A, 6A, 7A
5091..54
510
511[US:county_2.5.svg]
512county=Ulster
513124, 157, 161, 162, 14A, 18A
514
515[US:county_3.svg]
516county=Ulster
51722A, 26A, 29A, 49A, 53A
518
519[US:county_2.svg]
520county=Washington
5216A, 6B, 7A, 9A, 9B
5221..78
523
524[US:county_2.5.svg]
525county=Washington
52611A, 12A, 17A, 18A, 113, 153
527
528[US:county_3.svg]
529county=Washington
53023A, 59A, 64A, 70A, 74A
531
532[US:county_2.svg]
533county=Yates
5341..48
535
536[US:county_2.5.svg]
537county=Yates
53810F
132539
=== modified file 'sequences/US:OK'
--- sequences/US:OK 2012-04-11 14:38:04 +0000
+++ sequences/US:OK 2014-09-11 18:35:54 +0000
@@ -43,10 +43,11 @@
4343
44[US:OK_2.5.svg]44[US:OK_2.5.svg]
45100..19945100..199
46351
4647
47[US:OK_3.svg]48[US:OK_3.svg]
48209,266,27049209,266,270
4932550325,364
5051
51[US:OK_suf_2.5.svg]52[US:OK_suf_2.5.svg]
52117#A53117#A

Subscribers

People subscribed via source and target branches

to all changes: