From 6f915eca923f6f8f8674f84a5e277008f082ac5a Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Sat, 29 Oct 2016 11:15:13 +0200 Subject: [PATCH] Documnt place --- Makefile | 6 ++++-- layers/place/README.md | 25 +++++++++++++++++++++++++ layers/place/mapping.png | Bin 0 -> 27310 bytes layers/place/mapping.yaml | 21 ++++++++++----------- layers/place/place.yaml | 23 ++++++++++++++++------- 5 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 layers/place/README.md create mode 100644 layers/place/mapping.png diff --git a/Makefile b/Makefile index aa4765c5..dd0634b7 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql .PHONY: docs -docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/highway/README.md layers/highway_name/README.md layers/poi/README.md - +docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/highway/README.md layers/highway_name/README.md layers/poi/README.md layers/place/README.md build/openmaptiles.tm2source/data.yml: mkdir -p build/openmaptiles.tm2source && generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml @@ -34,5 +33,8 @@ layers/water/README.md: layers/building/README.md: generate-doc layers/building/building.yaml > layers/building/README.md +layers/place/README.md: + generate-doc layers/place/place.yaml --diagram layers/place/mapping > layers/place/README.md + clean: rm -f build/openmaptiles.tm2source/data.yml && rm -f build/mapping.yaml && rm -f build/tileset.sql && rm -f layers/**/README.md&& rm -f layers/**/*.png diff --git a/layers/place/README.md b/layers/place/README.md new file mode 100644 index 00000000..0e997ab8 --- /dev/null +++ b/layers/place/README.md @@ -0,0 +1,25 @@ +# place + +The place layer consists out of [countries](http://wiki.openstreetmap.org/wiki/Tag:place%3Dcountry), +[states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate) and [cities](http://wiki.openstreetmap.org/wiki/Key:place). +Apart from the roads this is also one of the more important layers to create a beautiful map. +We suggest you use different font styles and sizes to create a text hierarchy. + +## Fields + +- **name_en**: The english `name:en` value if available. +- **name**: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI. +- **rank**: Countries, states and the most important cities all have a `rank` field ranging from `1` to `6` which +marks the importance of the feature. Less important places do not have a `rank`. +Use this to build a text hierarchy. The rank value originates from Natural Earth data and is either the +original `scalerank` for cities or the original `labelrank` for countries and states. +- **class**: Distinguish between `country`, `state` and other city classes like +`city`, `town`, `village`, `hamlet`, `suburb`, `neighbourhood` or `isolated_dwelling`. +Use this to separately style the different places according to their importance (usually country and state different +than cities). + +## Mapping + +![](mapping.png) + + diff --git a/layers/place/mapping.png b/layers/place/mapping.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7581c62c631f64808a616cb951f61c378e13bc GIT binary patch literal 27310 zcmYhj1yB{=|33_PflEk-bW4Mzq;!Xrq?DADAdPgVgwiD-AtBwJQW65vB^}b;&$;;d z{(sNRondC@?%h4R=e*yqI)tex%RELUMumfedn_j_sRjp!;0y-`PYXo?N8|>3Qo$d1 zM>QF7xRN2#EjTz)I5|l%4LA7Rbd;v}vGaSaZ1gM~Mq<;qSW0-G%EjgTlKPY61AlUQ z_nkyzWyO7a`-w{KZHyWo6P<*7u>7AQwZ)&;tuJ=2=QqyN9EbVO(>#Xj&(Xh}en`I- z8umV`{L;KQT)$CVd1hc8|DH*l3Lb~@f1h3}gjqA^{b~3AJ46XjBbpm!2l>Avz3>Pc z+YU=q4p3TAg#SKe!q_ozDE~gD^nQyz_xgFt=}bPir&=x;zRhenew=3gy(si)l<~}3 z7>yb7`cE*(|2sqU49jijdu@*6#?bVb@fo)ngxqZjzWz@zNyp4rHNxNk>A2K<^-88b^a!Lc`oUwQq67knkF^``C|F zucnu|w29i#^Dv0ip_j^GRF1xHuW_H;>Sof=C%!;Ezu)4E*Ha#=@t7Lh*%<=-iSK&! z?9C^iC^5}ad2Lsh0x$^}%oP$?%6DSjn#>1NYVPM<7j@=aysrC?)&|yoYZ+EM>NmQ? z@7Bx?mF!HFe~n{Qmk!1tWBOgBm54zmFjalLKKNPW?m}XFvXp&T_&kl;_~K)F_IH}fY?OF|0;g9LA^OGDw_BC=`_7jlw{d>Lriq*xzF%RJ+85_yr?mC; z%8!rpWyYQ2LNBg1X|zgS^XJPaUEiKB>NkHlo!hNlBo~NIKOPbs-uArO%GYeMndZ!= z@O*c1@F(lTXZn{l70(wvxinnHl%DHMpKOgum?@?5Iv4&8iV}3*UL7ZXBJg7<9H05G zz_`?x=QdMI-ZzIbMFE`EKlrPE29?zRtr$pS`kH037bBX7vpHRvudYzZtXEUqJjAzx z9&(@DdVeQqo_N~x@m2(~c+A0kEIEY5x8(b1uK9dH&q%0h+^lJ45aW|*A68r3_HuW` zAkO;!H~CLS4b@)PXPmY(+TI*LJ2PdKQHo5}*xU1s_UzhyruL@ipZ zUGydq_<@n99^h}O4P|k;TBG;atIyXcQ0wl0SN8|Wk7vJ|(6GuxvC$j6E%U=lggYuf z^rvOEv%DUyML6_s#&QUEt!MMDhLy4=eF#C2W$a8f!f1@)SW$B9wsEFB<}6x7DOP8f zP-nXsRD7nXiF?c6h4H&@KI*?mlux-kLAQRYR?zuD5V|ehpKOuA=)6518$$k}S6NI| zc(-bdy67+o!uhGq=kAz7k8MdXKjH0cx9)HFM@UmCD#fqTxh+3^*E>C}WA#Ev;`CV# zqnB@{af)L&m1)C>5jDqZo8jUkXe);w!i-g`cQ9j45%Fnplfpo>f6+!PSnQ_|BFW@@ zxCbw_KVw~5ed@j6a$TaB#;01Q9QMf_lG${BHfx6bcwRy zsEI)*E}hI07-l&|lh@S=V|}W0J#KshgNn8!!lf)+MoA2zfg6=#!8Mr3h^T521gw9B z&Nv3Qq$WqE3AbWp$StKV)B={!8teSoRTL%YXzUZ}!0gT+Wv{cQ4W=*Qb}W@_RVJ(Z0t2t42*f zGKHtneq;8DNW4kDnpPZro3$(@GKx_OPL>!JwP_ETYh2}!fWnK*Rb2OtbXU`kKokV_ zaWuBNwvHI1`BY3LPS?HH{0D81qzK(f;sY=QdW(_4daSH=yEqE&Mz47Li`sG?%;gI) zG2f+#VKkw;Ora$-48xLxyxTt^6hE&C%slp+U1fD5*T_PvKWM#vAJpb?emZG*uH;w* z$;7%j8em6|5?#1fWg$~gk|iCnSoanLe;<3YC+}cVC&mFE_*>uZpO>(?8Z(gr6%mc zF_p*?d^4{8a+=Vk(Pek_YNwRY6We&6 zxFd8);fX(cs-9i*tCGe&0n4eftnP%J`NmqM9dWUM6@&>W6)lRSaNR0s6})Tjhtl}h zlipA2yY{ix&bU2lRva>$(2x$i+ZY5JR%%6wrLL5p|nuA|+IxIZ(^!zhD9GWXjH_`V$LK)BRULN`s zWR&~!MWGR}#EiWZ5#A#4zW5Vj?iV6Oc0as*Nj@RnqT&~`K$BJ!r0co z8(X9civY!c7@2`pMclZr$2ru;eXo84)%!-w{)MiP{LRG^L6_oNpVq@4BxjFsMFei~ zc<_9>n!5{M{AZn)y)LmXpBT7PXD*%E#vd)o}u^ zH1t8ofBn1gRl2v1E+5+MLG5>4?R4FDY0B|}rx-3)m-fV5BU{uS`Q zQ#!e_O)=nw1n*hOe^W5K6o=OeUjMC3XX01RZ|D?w9T)TT>g&K34r2b;A7$Z%bf!pU z6Y1a?sbsbu`|TKGssM7&1F`%Gt$fWJ6|%=Hd*jT{og(j5Z{e3T+$%Y&`2=1q6yFo8 z%!yOzJO6%l*7B;G{p2!x0^9?8y1-lhR|lj~U%bwALO8w}Mhl-MH7~YHm>3Go5ndN+ z1n+$$3)E8!;wWZW@VnD?E`)#|OS{{2DvacR_3pcEb&`OmxfrTRR(~o9zeCQf^Q6A5 zO}MrGE5yt2Yap(G;SO=E5S$`XTo46Sj0pJooAu_%*e z2*;6jX-lRFR4;XtYFEgU;qg>U2UX`2u)9tfhv*RP#mfrGpK@cWZ`*S$d^ITOUO_EoKO1*bzhuTj3?x4oI8GAA>THP#&U zmpYc!3f6WnH@GsU*e1w}zzRTT4}1ewqltJ=(vJ>e@km7VnYcOn%mnRJgI9Di8h!Eu zjy*?+U2f>8%K{&eBi#-e{zwM7#f1sHHL_(}XzY~_*fN2>Q5DDeD6^HX?j@wq^;7bL zXdqTQH{*; zwAWaeBnTqpcfH@bxSwZ+)~&?V3SH($LJW`9Y8WMp#<51AvI;_V$?`>raCXCLJ&pgR zRlLzX!&AHwka4MHGDoka?t~`0IA<);%)uGq_x+(wT7}`ouxOu>^a#dL6b3} zg;3F0e;y(Xw1#zVtI8L}@=trdju+_svQ(>lGNHL|s6Er9M(nI2hu5Kls4Qb&!Nf?Q zqM=Twv8^WcX%|4cH~~LXJOSR_9r(i zr!qqrv|@1Kn0ai!|FjkVyx>?~1O4{7-KgoZY92KK-5zG{kC*pXcU`l~_sV2~Ki?o1 z&A0hIT6y(yn>0=*5^b!>8%4&rod0u!nB5LWPf%?<>u0WGMLxj-9Pxv{I3xOhmk!uISFwp)pbQ_qMlXES@Qg zYA439rk?mjZO;R-l}4kCDwC2;4=xjK=Xvjbb!I(= zzaicuDOwaw<4f-g6Ht!DrL>VzQB0ZrOq&fkl-;7NQaFx}B%k28eLzCYNCjBEJ_u9H zE%r}mh+b$~rcC{hcaAco?*pr|P-EQ-mVMBuTt`}%c=r04ORJ6#wu5Sm1hDx(7Fd`; z2fmgc{jGtT`QN`hu{>C6cM);h6qgcXARL^)`fKo(B1<+Hod`!j*+m9lB41=C4T;&+ z>aY@vg-pN+ik7AE1kKYsbGXn=*N0~|N`0-W*W{%WdU=!KKqmay-al?r5eVm)xpT%G|Z4O0OOQY*FdoD-$)KAO6z1ts?=760=G7NQM zg6e`T4dKoA+rTxHDEx(bdfi!j2H$E-|9cTPF9Ioh_7jPfW;)M$*Kl$2xooI^HjM={ zOBk^uR~!+Yu3lJKsEaHqdMgZf;Q;2z)BY;EbT2~*xTLl(w8fm9m5NIE#g{+IMWwrSN`$ehPj%a!%&wKnZl z((VQ4n2CPD&8%nQ6^u~v7#VND|5*x*C`8;NsA+XCgW;Sy~YShHGT*oO&<+n zC5ZA~8rzO-o+Lac=qEW+d&d$fAom{@h;f4YwH8r|vCnQCB6^Q{P28?q zPABx%ld>2uR!0@sS!3>bk5X*-^3)O^zYO!D^<$y;J$+Hu1Yp`rEKX6v7kWPs(b1?R zFhp+b^+^0#!)7D|jxmP|BxUhf}?8RUzf?`cWNQDQ_*%`o)S$sy8I*6 zAwYVVb59^eL5YLHONxnKU`gtnmsVR(q9P^6jU27o_aEGkxE?ggV%{nqlgO=O@NfY-8KATDm9MAEQkp=G^hqnYM8kks zkrG5ChR(q7PIl-q9R{lYd+IKWpGMQzu&LdP3pA6XRWZjTT3^osm8HyHs?DbzQ5r>> zO5E_ZfH}*|R9VtM`TtY8dX>S~D~{{SCuw7_;N1#Z&StF7#77Lf+^nW6a$kGwR_FZ$ zk_khWi+0$9utRwa1e}2zi!Sm{q8*T!dicZT%wDBrPASdrx^%L2^CkL%Ta%?ON8#}p7I6okR^pn^%QNhHQrn{>hg#3`;$0Ysy8)+u>>ezxM zb&Srab8(3ObS@&;6Zj#F;}Qx%r9T*8Z%yLC2q&HBZ5N*`e8o)k%*dC~0lZbVChUoS z!d)*T7?H#FdxvNBic38dK5=rNpC(Ja13HYkmo*?cLU$J{qva+t1!}qSY?xn6z`6{T zSOV1Bv^R^-(_wc!fmJUXBTQajgN23G?Ow|G{RSt-kF&=axw4sn#USn(NUyxAN62LXx5mJOaDm9{ zeq>7Y{9T&T_XI}uA9(eS!@`q!nyw4(8)`cwc8U)ITTDIdVeM5K4Bpzu10RmzPb6V${aeKLeG z-{AatC|!^X%O3Tj0_9-47bT8=Q>CGJ-$i9rpoN1!* ztf1*c(w`nJG&mP2N$gjRDI051uMsu*GX9(Y-Jryj zxZSupXJBbJx_lS9Iq0l0$FOYtaI#4S`eiP^*eZ&D6}lss-vnPV%dZ*!cUl{dbN5P5 zkz-mL(8X5oZ(HvzsN~M3OfX^SJjZo^p<<_`as8q%gUs`YxW@o3hrRSuBnocAj~ zvVwVSrYQf%1p6~boc~U#X3}=HL;4D0C(j!9TPly&1`?kuFw_77TP8Xfx*uZw-=z^z zz{`n2QIHi)V9}v|goIu;LJOWq>uaEY^GZPx18~ye@D_mLX8@DEE`f9aD|(-qOX|d7 zylfx?e&A_b4TbkbJF#|?TY0+7JPPhp+3s+B)<$Wdu&#j_7!P!Fd9V<~pBEXnw(x(Y ze1r@r1$f+dLLHEFo69DeZ` z=-o4Gy@?+EjQMyIc*8IsK-2&iH~^E;B0k8io|g_0j3Lg3BDW`>6;pW!m-CI^i_q~S zl;z!mHGKp`Iy%=s_f|4Y&J24q)kS~7PaXjcJGsN{pdFb$hmxS+QBx@Fkvjx}5<%)7 zLn{3SQg+eealQw%_YkO%o}u@p*(DIwS93lq%NN5>Fp0uV@F^xze>*6ARn##g0%Yh4 z+u543iY0i!C9bG*U)MXpbZRsqQ{!rhh1aML4uPmASiH-}f2K*P;Gz|B@(Z;}GlF`2 zE8zDPf_r2K9|Z?MSX{uHZVK{o2a>{1egv}@QwRI4_iUg|;+U=+sD0PvISvluga(no zhc{FHo&h?~y95pG?f+)$A!uh2!yy)xX>H)yT9GFsliK?#VN#P5=NSME|8+!k!dmA* z(w^(yoKA-KmF0Akd*y5UcElg&y)@Br@8%nlb1{hc%!e~<4|m?xuMvp-6o8VdW?r<5 zA?|Ddr95#Y2@9=EA(1VQG#IsB;-Mm8eTG{Z@0RSuomN}|dViH~4VYTBH-P0k!1Qe- zs2xxLdbydyVtEb5G!>A17XzDvjhkoRHST63IlY^$v1JI>e;S?Y1$q~ypCYA7owe@M zlTTihezef0qkiTZ476kvw$>X5KeKNRYyEOnZG}>FaBIcD)R5DUVw`yE4>tmR5t-SA z2kQxxejVT$FsET#o1*whMG(lfdf&1r;pb^#BYg!;U1!w81s4Jn?FVGxWfDNIlF7_e zhb=Z=2o4PYa3~kYw?n`*w4SH~oly>Gsiq4}?hakpGN$&?)79FLXI>F}ekyxq(xonv ze;c(Y%hMhft7xG0_61w7F2X^cq=9Nqe4$!y_#BwjHKHQc$X!t+@NPYChzZ&Mn+VHb zHP8)(^KgZ>t@eGkEp)!UIvs8G@u^==v1SQ*i{u=u|DSp1heOx)rGqX!^*J+}AA8G% zIIQwz3mr!a9re=GgtojY(j;2kf4xshs{Y@cN`{sEbs@Af zTK_gJLoYM+@4$Jgsd_iB`{Mq_QQ`Dejm>muiV%w>LT_KVrQLr6T*oq!{ruCN;BVhO zw5Hnb1j~R8*6S9iSV=~`yw0XA)V@kT z7L$hBP=VR;nf{BXTFmYvYf4bgt-`N>c5AW0tnrN!wB#1Egd`y4ix!Bi#i_4?C5;dH z-pcsx zflVTtzLnXOOp6wD8T|$LxzRFXiGk^exiavis?o`Xw1KNd3l?w-qc5h=fv9=Au^sF_ zGPzOSa@wN8w1+R=SAF_!e}a_n3Db1_(sa$`n_vDFwLt*I-oeTb?Ul+-VG$@3jkjmB z5@u8U`%TB7w5-kLfAO|jBMulU5d_6v{FH#*z-Cx~QZcxHTy0~#kWfHVYGnIuLX3*e zSe{ZklLyQ!f)&jc+@+L;(eZEYb~FdTIZLJK0$MU%l8b~DgSHbxvJ%`_sX?Ans=0bW zY_gEDz!vQ#07|A^q1c-EJ5(N^OMfd3Z-SYI?`nc*A`{C^dS*_FMS|lov%|l#b22YI z_(JO#uxhs|2%ON%I}C>I!%~B0-Gki4W)D~X zN1%nDtNkDrWLMda!LR`uv1Z_whT?aC__Q>OwW*3Uzkd=wpX1`j-zkll6BipdT#M}% zdT>sgU?#5}h1b?&Qo~JclAu#H>xp7)mN=NL)1_x4Uux0h2)mH}T7UfR=;iT72#;!! zCaa!Fh_jnPlSw!5@k{}d@tZq+p%hZ zrDKaq8v2`z+3S`N9HT}~T}SKQuNZOtXIIPm!Y)EtE`NwZDJR$ww={4Cp5R4egH}8m}4r&m%Of5!{A$j^HW30Wvd%{tX>FJz_oO@9?SbUUZCEy zfTnUp16hPMnVrZYVq)~KaV@qr;}0pWuP7?m!9-0XUg%OA#I2GiEza{ zyR)^4VYu`#G-0f6qk_sXtzeX>?^3Qp2fU(U{%T566o;b{!`21yUrRSK6keu(WS=S~ zQF?!vh<=jrg5ey@%Z4B+F?X<>B!!I;DdeCL%Vxk@^&g>Yy*Y{q61QAvs#gRI3y3k) zp%Ec9_C7y~j=So>qwdv0Fk8AyEe+VH8&iNAb9{u1!7YXH{)coFDbW?e%l-7}4{}&j zRhFL_)n3%3wbJ)<1nB~3QfKf}WgBaUt&SHH^u+ukyJ#>hSR?3ysuUuR6RIc=De3s_$3b$3aXPyy=MDPEX6d0BAU98)pPPN#5 z(|!}LWxyD!Py<8~O909666=FWjJGBt^1*NuD%3Qggk1$5 zM}73HJw@!-0Q8vsh$Mn}=*a@kh3xAI4=su^2y~rXEb|ubpfX(GBbHA&LaDETBi;+z zNFsaZ1|JQSvKk=BufYMx$^%gsGB|R@ypPgFe8Dh@n$R=$*Fsk{%(kmh_3%_b+xVe88VmQgo)s zr_JL-xRTjEFP5%Y9g>|%IS6GG=T97bksc4D-j|7dgOswe?&AJ z8Rt4a7w;gU#2pv7O37t2y zLQq@WV$*IX^z3rQwG{KF?Jof+Vh5!D|F{enBSKr5h4%T9BUo7_%x|~8$5zk zD+9ug9jKW(F#Oq#uhq*l`PxL8poMkSLn@sA1b$z5)l+yiMq(8dAMSj#@oP|{e;yNO zO!ac02UQs~f2aU}coDt!fiDt*cfQtbqU;@Wpegw@6u8VNX;d+L%ns=qN8gXaZKw|b z`%6W@lW z-_n4=B?kD&FGoarO`?U(Z}~w7WPL&1pS2_=mh;eWUSKbsSicb7h4fqjgLU@JIUpr{ zq1ZIyV>T!TLstCanab$`4q)D*HR*wOqO6A-a+@LS5&W?XbYkP4K2jqA!hT{%LN(yb z%Di?9q*iZ06+Z$4PT>I+&>^oX>&3Ram@GcuK7@>8d*VCu{oQ%17ydigI-_I<%sP=U zn*UHt8MyN)+?Lc(y(3@&t7R#W>MKtKW&;!>kSye0L0QU9YMLpUD{pkzIU{UJa|tMd zDM+8xUSFJXJihsIf76q9ry9JatyueEXX(dB5>`pniJSKA4MU&?xW84(w2OEsI=#*a zRpV<{xXSjPNy`ma+eK?YS@|@;)~IN7I|UXQZd1x{hxj(e{50yaDPuCS1x!BW+&Pz7 zTTYKN8~5YE=Ys(*qd9WMgAzK|+eM{+g~O&?wb@~dDH#zPzjk)7wN(Kdxl|$q!+7%O z0kj@{1bxHPV_Ee_qt$OF{+;4Vh`K(2iP>rIe-No!l`~MFP~Je}Jc~y1g}+~CZ!C}L|HK%%<29M+RyrHKO6iOvMLVqpHE=k zRSv-1?N93;qEq||zGJ2Q*Kcu2p0wm(KOr#8lRcLTV&iyssezUyZJ{H#^48e&&w(YlVvZpv5{aKeASVi=1+J7W@8@$9 z4Yr*g>yxW3#o*FqhNr9NiWE1LI6DR)W4aLc3@yl54LZW2LF)VJ`2<|dFj$rTgWri* zWGLNfR8BL`nm2vjr@CgOM0X_(IIa12=}h*@WYlR)Z}$M+bOEkZg?bOP5o7<=y&C50 zeCyld$G2k3?^-U+t&ul=Ehs&oUj;$7{j$4%ug4)>ln7l#1j^_x38(oOV$q%LN^2k! z`3x1Miw4dj2qX#k4dSW41gx>Xg%4aC_84ygH&kIhNX&n=`E@OX!uwf1iZ+~avqTec zUd7LY95EAcj0AY~y≶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 TQFnkBP!XL~(>qhDVj1#(rDw_i literal 0 HcmV?d00001 diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index 2c0303b5..6f6264ab 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -53,7 +53,7 @@ tables: place: - state city_point: - type: geometry + type: point fields: - name: osm_id type: id @@ -71,13 +71,12 @@ tables: filters: exclude_tags: - [ "name", "__nil__" ] - type_mappings: - points: - place: - - city - - town - - village - - hamlet - - suburb - - neighbourhood - - isolated_dwelling + mapping: + place: + - city + - town + - village + - hamlet + - suburb + - neighbourhood + - isolated_dwelling diff --git a/layers/place/place.yaml b/layers/place/place.yaml index 204f25f5..f09c8719 100644 --- a/layers/place/place.yaml +++ b/layers/place/place.yaml @@ -3,16 +3,25 @@ layer: description: | The place layer consists out of [countries](http://wiki.openstreetmap.org/wiki/Tag:place%3Dcountry), [states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate) and [cities](http://wiki.openstreetmap.org/wiki/Key:place). - For countries, states and places at low zoom levels (`z0` to `z7`) the - [Populated Places](http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-populated-places/) dataset from NaturalEarth is merged - with OSM data to only show the most relevant places for the given zoom level. All features derived from NaturalEarth have a `scalerank` field. - States and countries additionally contain `postal` and `abbreviation` fields for styles that want to fit a lot of data with small labels on the map. - The `place` layer only contains more important states (or similar entities) from the US, Russia, China and Brazil. - + Apart from the roads this is also one of the more important layers to create a beautiful map. + We suggest you use different font styles and sizes to create a text hierarchy. + fields: + name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI. + name_en: The english `name:en` value if available. + class: | + Distinguish between `country`, `state` and other city classes like + `city`, `town`, `village`, `hamlet`, `suburb`, `neighbourhood` or `isolated_dwelling`. + Use this to separately style the different places according to their importance (usually country and state different + than cities). + rank: | + Countries, states and the most important cities all have a `rank` field ranging from `1` to `6` which + marks the importance of the feature. Less important places do not have a `rank`. + Use this to build a text hierarchy. The rank value originates from Natural Earth data and is either the + original `scalerank` for cities or the original `labelrank` for countries and states. buffer_size: 128 datasource: geometry_field: geometry - query: (SELECT geometry, name, name_en, class, abbrev scalerank FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t + query: (SELECT geometry, name, name_en, class, rank FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t schema: - ./types.sql - ./city.sql