Praha metro

src/libkomapnik.py

@@ -148,20 +148,20 @@ def xml_textsymbolizer(
   """%(text,face,int(float(size)),color,halo_color,halo_radius,placement,dx,dy,overlap,wrap_width,distance,align,opacity,pos, transform)
 
 def xml_shieldsymbolizer(path="", width="", height="",
-                        text="name",face="DejaVu Sans Book",size="10",color="#000000", halo_color="#ffffff", halo_radius="0", placement="line", offset="0", overlap="false", distance="26", wrap_width=256, align="center", opacity="1", transform="none"):
+                        text="name",face="DejaVu Sans Book",size="10",color="#000000", halo_color="#ffffff", halo_radius="0", placement="line", offset="0", overlap="false", distance="26", wrap_width=256, align="center", opacity="1", transform="none", unlock_image='true'):
   color = nicecolor(color)
   halo_color = nicecolor(halo_color)
   placement = {"center": "point"}.get(placement.lower(), placement)
   align = {"center": "middle"}.get(align.lower(), align)
   size = size.split(",")[0]
-  if width:
+  if width: 
     width =' width="%s" '%width
   if height:
     height =' height="%s" '%height
   return """
-    <ShieldSymbolizer file="%s%s" %s %s name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dy="%s" allow_overlap="%s" wrap_width="%s" min_distance="%s" horizontal_alignment="%s" opacity="%s" text-transform="%s" unlock-image="true" />
+    <ShieldSymbolizer file="%s%s" %s %s name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dy="%s" allow_overlap="%s" wrap_width="%s" min_distance="%s" horizontal_alignment="%s" opacity="%s" text-transform="%s" unlock-image="%s" />
   """%(icons_path, \
-    path, width, height,text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity, transform)
+    path, width, height,text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity, transform, unlock_image)
 
 def xml_filter(string):
   return """

src/styles/osmosnimki-maps.mapcss

@@ -1095,6 +1095,8 @@ way|z12-[railway=subway][colour=purple] {width:3; color: #8B509C;z-index:15; das
 way|z12-[railway=subway][colour=orange] {width:3; color: #FF7700;z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-mapnik-layer: top;}
 way|z12-[railway=subway][colour=green]  {width:3; color: #006600;z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-mapnik-layer: top;}
 way|z12-[railway=subway][colour=brown]  {width:3; color: #BB7700;z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-mapnik-layer: top;}
+way|z12-[railway=subway][colour=yellow] {width:3; color: #F7C600;z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-mapnik-layer: top;}
+
 
 /*way|z13-15[railway=subway][!colour][tunnel!=yes] {width:1.5; color:#700E19;z-index:15; 
 opacity:0.5; dashes:3,2; linecap: butt; z-index:15}*/
@@ -2049,6 +2051,14 @@ node|z12-15[railway=station][transport=subway][colour=green][operator=Wiener Lin
 node|z12-15[railway=station][transport=subway][colour=brown][operator=Wiener Linien]{icon-image:vienna-ubahn-brown.png;z-index:17;}
 node|z12-15[railway=station][transport=subway][!colour][operator=Wiener Linien]{icon-image:vienna-ubahn-blue.png;z-index:17;}
 
+
+/*     Prague       */
+node|z12-15[railway=station][transport=subway][colour=red][operator=cz:DPP]{icon-image:praha-metro-red.png;z-index:17;}
+node|z12-15[railway=station][transport=subway][colour=yellow][operator=cz:DPP]{icon-image:praha-metro-yellow.png;z-index:17;}
+node|z12-15[railway=station][transport=subway][colour=green][operator=cz:DPP]{icon-image:praha-metro-green.png;z-index:17;}
+
+
+
 /*  Others  */
 node|z12[railway=station][transport=subway][!colour] {icon-image:metro_others6_copy.png;z-index:17;}
 node|z13[railway=station][transport=subway][!colour] {icon-image:metro_others12_z.png;z-index:17;}