From 6e3f31df713900dbf630119159fdddcdb929be6d Mon Sep 17 00:00:00 2001
From: Komzpa <me@komzpa.net>
Date: Sun, 29 Jan 2012 23:11:33 +0300
Subject: [PATCH] no military labels

---
 src/libkomapnik.py                | 2 +-
 src/styles/osmosnimki-maps.mapcss | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libkomapnik.py b/src/libkomapnik.py
index c757d7e..10264be 100644
--- a/src/libkomapnik.py
+++ b/src/libkomapnik.py
@@ -144,7 +144,7 @@ def xml_textsymbolizer(
     dy = 0
   
   return """
-  <TextSymbolizer name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dx="%s" dy="%s" max_char_angle_delta="15" allow_overlap="%s" wrap_width="%s" min_distance="%s" vertical_alignment="middle" horizontal_alignment="%s" opacity="%s" placement-type="simple" placements="%s" text-transform="%s" />
+  <TextSymbolizer name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dx="%s" dy="%s" max_char_angle_delta="17" allow_overlap="%s" wrap_width="%s" min_distance="%s" vertical_alignment="middle" horizontal_alignment="%s" opacity="%s" placement-type="simple" placements="%s" text-transform="%s" />
   """%(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="",
diff --git a/src/styles/osmosnimki-maps.mapcss b/src/styles/osmosnimki-maps.mapcss
index 9936de3..d4e14d6 100644
--- a/src/styles/osmosnimki-maps.mapcss
+++ b/src/styles/osmosnimki-maps.mapcss
@@ -172,14 +172,14 @@ area|z12-[natural=heath]
 
 area|z10-13[landuse=industrial],area|z10-13[landuse=military] {background-color: #D8D6D7; z-index:3}
 
-area|z14-[landuse=industrial],area|z14-[landuse=military] {background-color: #DDDDDD; z-index:3}
-way|z14-15[landuse=industrial],area|z14-15[landuse=military]
+area|z14-[landuse=industrial], area|z14-[landuse=military] {background-color: #DDDDDD; z-index:3}
+way|z14-15[landuse=industrial] /*,area|z14-15[landuse=military]*/
 {text:name; font-size:10;
 font-family: DejaVu Sans Book; text-color:#303030; text-halo-radius: 1;
 text-halo-color: #ffffff; text-allow-overlap: false; -x-mapnik-min-distance:0; text-placement:any;
  max-width:50}
 
-way|z16-[landuse=industrial],area|z16-[landuse=military]
+way|z16-[landuse=industrial] /*,area|z16-[landuse=military]*/
 {text:name; font-size:11;
 font-family: DejaVu Sans Book; text-color:#303030; text-halo-radius: 1;
 text-halo-color: #ffffff; text-allow-overlap: false; -x-mapnik-min-distance:0; text-placement:any;