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
1=== added file 'counties/US:KS'
2--- counties/US:KS 1970-01-01 00:00:00 +0000
3+++ counties/US:KS 2014-09-11 18:35:54 +0000
4@@ -0,0 +1,37 @@
5+[US:county_2.svg]
6+county=Douglas
7+1..20
8+1E, 1W
9+
10+[US:county_2.5.svg]
11+county=Douglas
12+range_filter=has_ones
13+400..500
14+
15+[US:county_3.svg]
16+county=Douglas
17+range_filter=no_ones
18+400..500
19+
20+[US:county_3.5.svg]
21+county=Douglas
22+range_filter=has_ones
23+1000..1100
24+
25+[US:county_4.svg]
26+county=Douglas
27+range_filter=no_ones
28+1000..1100
29+350E, 450N
30+
31+[US:county_2.5.svg]
32+county=Riley
33+range_filter=has_ones
34+350..420
35+860..920
36+
37+[US:county_3.svg]
38+county=Riley
39+range_filter=no_ones
40+350..420
41+860..920
42
43=== modified file 'counties/US:NY'
44--- counties/US:NY 2013-08-06 02:57:12 +0000
45+++ counties/US:NY 2014-09-11 18:35:54 +0000
46@@ -1,31 +1,55 @@
47 [US:county_2.svg]
48-county=Broome;Chautauqua;Chemung;Chenango;Madison;Orange;Rockland;Warren
49-1..99
50-
51-
52-[US:county_2.svg]
53 county=Albany
54-1..99
55+1..60
56
57 [US:county_2.5.svg]
58 county=Albany
59-range_filter=has_ones
60-100..499
61+201, 261, 301, 311, 312, 351, 361, 401
62+101..115
63+151..165
64+410..414
65
66 [US:county_3.svg]
67 county=Albany
68 range_filter=no_ones
69-100..499
70-
71-
72-[US:county_2.svg]
73-county=Allegany
74-1..99
75-
76+202..209
77+252..262
78+302..309
79+352..362
80+402..409
81+
82+[US:county_2.svg]
83+county=Allegany
84+1..50
85+
86+[US:county_2.svg]
87+county=Allegany
88+2A, 2B, 5A, 5B, 5C, 6S, 7A, 7B, 7C, 7D, 7E
89+
90+[US:county_3.svg]
91+county=Allegany
92+10S, 13A, 13B, 13C, 15A, 15B, 17S, 19A, 20S, 22A, 26S, 27B, 31A
93+
94+[US:county_2.svg]
95+county=Broome
96+1..97
97+
98+[US:county_2.5.svg]
99+county=Broome
100+100..197
101+217, 221, 241, 251
102+
103+[US:county_3.svg]
104+county=Broome
105+205, 209, 225, 229, 233, 237, 245, 249, 20S, 24S, 33S, 44S, 70S, 93S
106+
107+[US:county_4.svg]
108+county=Broome
109+181S, 233S
110
111 [US:county_2.svg]
112 county=Cattaraugus
113-1..99
114+1..96
115
116 [US:county_3.5.svg]
117 county=Cattaraugus
118@@ -35,20 +59,49 @@
119 county=Cattaraugus
120 86-2
121
122+[US:county_2.svg]
123+county=Chautauqua
124+1..95
125+
126+[US:county_3.svg]
127+county=Chautauqua
128+380
129+
130+[US:county_2.svg]
131+county=Chemung
132+1..80
133+
134+[US:county_3.svg]
135+county=Chemung
136+15A, 15B, 43A, 55A, 64A, 64B, 64C
137+
138+[US:county_2.svg]
139+county=Chenango
140+3A, 7A
141+1..47
142+
143+[US:county_3.svg]
144+county=Chenango
145+10A, 12A, 12B, 12C, 13A, 15A, 23A, 23B, 23C, 23D, 28A, 32A, 32B, 32C
146
147 [US:county_2.svg]
148 county=Columbia
149-1..99
150+46, 88, 89
151+2..35
152 5A, 7A, 7D, 8A
153
154 [US:county_2.5.svg]
155 county=Columbia
156-21C
157+11A, 21B, 21C
158
159 [US:county_3.svg]
160 county=Columbia
161-25A, 26A, 28A, 28B
162+25A, 25B, 26A, 27A, 27B, 28A, 28B, 35A
163
164+[US:county_2.svg]
165+county=Delaware
166+53, 67
167+1..47
168
169 [US:county_2.svg]
170 county=Dutchess
171@@ -56,31 +109,82 @@
172
173 [US:county_2.5.svg]
174 county=Dutchess
175-100..199
176+100, 101, 110, 111, 114
177+103..105
178
179+[US:county_3.svg]
180+county=Dutchess
181+40A, 67A, 83A
182
183 [US:county_2.svg]
184 county=Erie
185-1..99
186+1..75
187+82..87
188+90..96
189
190 [US:county_2.5.svg]
191 county=Erie
192 range_filter=has_ones
193-100..599
194+201, 221, 231, 241, 251, 261, 281
195+301, 310, 313, 319, 321, 341, 371, 381
196+401, 410, 421, 431, 441, 451, 461, 471, 481, 491
197+501, 519, 521, 531, 541, 551, 571
198+103..144
199+152..157
200+161..177
201+181..199
202+215..218
203+315..317
204+412..419
205+510..512
206
207 [US:county_3.svg]
208 county=Erie
209 range_filter=no_ones
210-100..599
211-
212-
213-[US:county_2.svg]
214-county=Fulton
215-1..99
216-
217-[US:county_2.5.svg]
218-county=Fulton
219-100..199
220+200..208
221+220..233
222+240..299
223+303..309
224+322..338
225+343..356
226+362..399
227+400..409
228+420..499
229+500..508
230+523..530
231+534..548
232+550..563
233+572..580
234+
235+[US:county_2.svg]
236+county=Essex
237+6A, 7B, 88
238+2..85
239+
240+
241+[US:county_2.5.svg]
242+county=Essex
243+10A
244+
245+[US:county_3.svg]
246+county=Essex
247+26A, 29A, 86A, 86B, 86C, 86D, 86E
248+
249+[US:county_2.svg]
250+county=Franklin
251+60
252+1..56
253+
254+[US:county_2.5.svg]
255+county=Fulton
256+125, 126, 128, 137, 138, 140, 142, 143, 145, 146,
257+101..124
258+130..132
259+148..158
260+
261+[US:county_3.svg]
262+county=Fulton
263+116A
264
265 [US:county_3.5.svg]
266 county=Fulton
267@@ -88,21 +192,194 @@
268 142A
269
270 [US:county_2.svg]
271-county=Montgomery
272-1..99
273-
274-[US:county_2.5.svg]
275-county=Montgomery
276-100..199
277-
278-
279-[US:county_2.svg]
280-county=Saratoga
281-1..99
282-
283-[US:county_2.5.svg]
284-county=Saratoga
285-100..199
286+county=Greene
287+8A
288+1..31
289+35..42
290+47..57
291+61..67
292+74..85
293+
294+[US:county_2.5.svg]
295+county=Greene
296+13A, 41A
297+
298+[US:county_3.svg]
299+county=Greene
300+20A, 20B, 23B, 23C, 26A, 32C, 47A, 49A, 65A, 67A
301+
302+[US:county_2.svg]
303+county=Hamilton
304+6A, 24, 25
305+1..22
306+
307+[US:county_2.5.svg]
308+county=Hamilton
309+10A
310+
311+[US:county_2.svg]
312+county=Jefferson
313+36, 37
314+1..9
315+11..30
316+40..49
317+50..59
318+62..97
319+
320+[US:county_2.5.svg]
321+county=Jefferson
322+100, 111, 125, 128, 129, 136, 138, 144, 145, 152, 155, 156, 165, 178, 179, 181, 196, 197, 281
323+120..123
324+159..163
325+189..194
326+
327+[US:county_3.svg]
328+county=Jefferson
329+200, 202
330+
331+[US:county_2.svg]
332+county=Lewis
333+60, 62, 68
334+1..56
335+70..76
336+78..80
337+
338+[US:county_2.5.svg]
339+county=Lewis
340+147, 175, 194
341+
342+[US:county_2.svg]
343+county=Livingston
344+1A
345+1..85
346+
347+[US:county_2.5.svg]
348+county=Livingston
349+20A, 23A, 24A 27B, 30A, 36A, 58A
350+
351+[US:county_2.svg]
352+county=Madison
353+6A
354+1..99
355+
356+[US:county_2.5.svg]
357+county=Madison
358+100..109
359+
360+[US:county_2.5.svg]
361+county=Madison
362+89A
363+
364+[US:county_2.svg]
365+county=Montgomery
366+1..99
367+
368+[US:county_2.5.svg]
369+county=Montgomery
370+100..199
371+
372+[US:county_2.svg]
373+county=Oneida
374+2A, 5A, 6A, 8A, 9A
375+1..27
376+29..94
377+
378+[US:county_2.5.svg]
379+county=Oneida
380+10A, 12A, 15A, 18A, 71A, 71B
381+
382+[US:county_3.svg]
383+county=Oneida
384+24A, 26A, 37A, 40A, 42A, 48A, 50A, 54A, 60A, 67A, 68A, 68B, 70A, 72A, 74A, 79A, 79B, 79C, 79D, 88A, 92A, 840
385+
386+[US:county_2.svg]
387+county=Ontario
388+1..49
389+
390+[US:county_2.svg]
391+county=Orange
392+1, 1A, 1B, 99
393+4..56
394+60..96
395+
396+[US:county_2.5.svg]
397+county=Orange
398+13A
399+100..108
400+
401+[US:county_2.svg]
402+county=Oswego
403+1A, 2A, 6A, 6B, 84, 85, 89
404+1..48
405+51..65
406+
407+[US:county_2.5.svg]
408+county=Oswego
409+17A, 41A, 51A, 176
410+
411+[US:county_3.svg]
412+county=Oswego
413+22A, 23A, 23B, 30A, 35A, 45A, 45S 57A, 58A, 59A, 84A
414+
415+[US:county_2.svg]
416+county=Otsego
417+3A
418+1..60
419+
420+[US:county_2.5.svg]
421+county=Otsego
422+11A, 11B, 11C, 11D, 12A, 18A, 18B, 18C, 61A, 61B, 61C
423+
424+[US:county_3.svg]
425+county=Otsego
426+25A, 29A, 32A, 32S, 34A, 38A, 48A
427+
428+[US:county_2.svg]
429+county=Putnam
430+10..17
431+20..24
432+30..73
433+
434+[US:county_2.svg]
435+county=Rensselaer
436+1..9
437+15..23
438+26..98
439+
440+[US:county_2.5.svg]
441+county=Rensselaer
442+100..105
443+109..145
444+
445+[US:county_2.svg]
446+county=Rockland
447+57, 60
448+1..8
449+11..17
450+20..30
451+33..38
452+41..53
453+64..69
454+71..76
455+80..98
456+
457+[US:county_2.svg]
458+county=Rockland
459+100, 118, 135
460+106..112
461+
462+[US:county_3.svg]
463+county=Rockland
464+23A, 33A, 69A, 80A, 98A, 118A
465+
466+[US:county_2.svg]
467+county=Saratoga
468+1..99
469+
470+[US:county_2.5.svg]
471+county=Saratoga
472+101, 104
473+108..110
474
475 [US:county_3.svg]
476 county=Saratoga
477@@ -112,20 +389,150 @@
478 county=Saratoga
479 1345
480
481-
482-[US:county_2.svg]
483-county=Schenectady
484-1..99
485-
486-[US:county_2.5.svg]
487-county=Schenectady
488-100..199
489-
490-
491-[US:county_2.svg]
492-county=Rensselaer
493-1..99
494-
495-[US:county_2.5.svg]
496-county=Rensselaer
497-100..199
498+[US:county_2.5.svg]
499+county=Schenectady
500+100..199
501+
502+[US:county_2.svg]
503+county=Scoharie
504+1A, 1B, 2A, 5A, 5B, 7A, 8A
505+1..46
506+48..57
507+59..72
508+
509+[US:county_2.5.svg]
510+county=Scoharie
511+19A
512+
513+[US:county_3.svg]
514+county=Scoharie
515+23A, 34A
516+
517+[US:county_2.svg]
518+county=Schuyler
519+1..31
520+
521+[US:county_3.svg]
522+county=Schuyler
523+23A
524+
525+[US:county_2.svg]
526+county=St Lawrence
527+1..31
528+33..62
529+
530+[US:county_2.5.svg]
531+county=St Lawrence
532+31A
533+
534+[US:county_3.svg]
535+county=St Lawrence
536+23A, 27A, 28A, 38A, 42A, 48A
537+
538+[US:county_2.svg]
539+county=Steuben
540+1..99
541+
542+[US:county_2.5.svg]
543+county=Steuben
544+10A, 415
545+100..129
546+
547+[US:county_3.svg]
548+county=Steuben
549+39A, 40A, 70A, 333
550+
551+[US:county_2.svg]
552+county=Suffolk
553+1..7
554+10..99
555+
556+[US:county_2.5.svg]
557+county=Suffolk
558+13A, 19A
559+100..106
560+111..117
561+
562+[US:county_3.svg]
563+county=Suffolk
564+39A, 39B, 50A, 94A
565+
566+[US:county_2.svg]
567+county=Sullivan
568+11..26
569+31..33
570+41..66
571+71..75
572+81..85
573+91..96
574+
575+[US:county_2.5.svg]
576+county=Sullivan
577+183
578+11A, 21A
579+100..134
580+141..179
581+
582+[US:county_3.svg]
583+county=Sullivan
584+45A
585+
586+[US:county_4.svg]
587+county=Sullivan
588+133A, 143A, 166A, 173A, 174A, 179A, 183A, 183B, 183C
589+
590+[US:county_2.svg]
591+county=Warren
592+1..99
593+
594+[US:county_2.svg]
595+county=Tioga
596+1..29
597+33..43
598+54, 60, 65
599+
600+[US:county_2.5.svg]
601+county=Tioga
602+15B
603+
604+[US:county_2.5.svg]
605+county=Tompkins
606+100..190
607+
608+[US:county_4.svg]
609+county=Tompkins
610+103A, 103B, 107A, 113A, 115M, 117A, 131A, 133A, 143A, 162A, 177A, 182H
611+
612+[US:county_2.svg]
613+county=Ulster
614+2A, 6A, 7A
615+1..54
616+
617+[US:county_2.5.svg]
618+county=Ulster
619+124, 157, 161, 162, 14A, 18A
620+
621+[US:county_3.svg]
622+county=Ulster
623+22A, 26A, 29A, 49A, 53A
624+
625+[US:county_2.svg]
626+county=Washington
627+6A, 6B, 7A, 9A, 9B
628+1..78
629+
630+[US:county_2.5.svg]
631+county=Washington
632+11A, 12A, 17A, 18A, 113, 153
633+
634+[US:county_3.svg]
635+county=Washington
636+23A, 59A, 64A, 70A, 74A
637+
638+[US:county_2.svg]
639+county=Yates
640+1..48
641+
642+[US:county_2.5.svg]
643+county=Yates
644+10F
645
646=== modified file 'sequences/US:OK'
647--- sequences/US:OK 2012-04-11 14:38:04 +0000
648+++ sequences/US:OK 2014-09-11 18:35:54 +0000
649@@ -43,10 +43,11 @@
650
651 [US:OK_2.5.svg]
652 100..199
653+351
654
655 [US:OK_3.svg]
656 209,266,270
657-325
658+325,364
659
660 [US:OK_suf_2.5.svg]
661 117#A

Subscribers

People subscribed via source and target branches

to all changes: