Disable logo drawing hacks

[leo.git] / leo.c

diff --git a/leo.c b/leo.c
index 10092d657cfb6d4bbd95d943c589550897583113..dea6cde89a684e6c87e83871add89e09ec6d261a 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -18,8 +18,6 @@
 #include "sym.h"
 #include "map.h"
 
-#undef ROTATE
-
 uns debug_dump_source, debug_dump_after_proj, debug_dump_after_scaling;
 uns debug_dump_multipolygons, debug_dump_css, debug_dump_styling, debug_dump_symbols;
 
@@ -153,13 +151,16 @@ int main(int argc UNUSED, char **argv)
     }
 
   struct svg *svg = svg_open(map_svg_output);
-#ifndef ROTATE
-  svg_set_attr_dimen(svg, "width", page_width);
-  svg_set_attr_dimen(svg, "height", page_height);
-#else
-  svg_set_attr_dimen(svg, "width", page_height);
-  svg_set_attr_dimen(svg, "height", page_width);
-#endif
+  if (!map_rotate)
+    {
+      svg_set_attr_dimen(svg, "width", page_width);
+      svg_set_attr_dimen(svg, "height", page_height);
+    }
+  else
+    {
+      svg_set_attr_dimen(svg, "width", page_height);
+      svg_set_attr_dimen(svg, "height", page_width);
+    }
 
   struct style_results r;
   style_init(&r);
@@ -206,17 +207,19 @@ int main(int argc UNUSED, char **argv)
 
       svg_push_element(svg, "g");
       svg_set_attr_format(svg, "clip-path", "url(#boundary)");
-#ifdef ROTATE
-      svg_set_attr_format(svg, "transform", "translate(%.6g,0) rotate(90)", page_height * svg->scale);
-#endif
+      if (map_rotate)
+       svg_set_attr_format(svg, "transform", "translate(%.6g,0) rotate(90)", page_height * svg->scale);
     }
 
   // FIXME: Replace by generic logo drawing facility
+#if 0
   struct svg_icon *logo = svg_icon_load(svg, "../logo/kocka-s-okrajem.svg");
+#endif
 
   sym_draw_all(svg);
 
   // Draw logo
+#if 0
   double logo_width = 36.12;
   double logo_height = 36.12 / logo->width * logo->height;
   struct svg_icon_request sir = {
@@ -227,6 +230,7 @@ int main(int argc UNUSED, char **argv)
     .height = logo_height,
   };
   svg_icon_put(svg, &sir);
+#endif
 
   draw_scale(svg);