style parameters

diff --git a/experiments/geo/geo.php b/experiments/geo/geo.php
index 9374eb5..c6fc044 100755 (executable)
--- a/experiments/geo/geo.php
+++ b/experiments/geo/geo.php
@@ -26,7 +26,11 @@ class geo_params
 
        function get_styles ( $id , $type )
                {
-               return "fill:brown; stroke:black; stroke-width:1" ;
+               if ( isset ( $this->style_fill[$id] ) ) $fill = $this->style_fill[$id] ;
+               else $fill = "fill:#CCCCCC" ;
+               if ( isset ( $this->style_border[$id] ) ) $border = $this->style_border[$id] ;
+               else $border = "stroke:black; stroke-width:10" ;
+               return $fill . "; " . $border ;
                }
 
        function data_to_real ( &$x , &$y )
@@ -70,7 +74,7 @@ class geo_params
        function get_svg_labels ()
                {
                $ret = "" ;
-               $medium_font_size = floor ( ( $this->max_x - $this->min_x ) / (100/3) ) ;
+               $medium_font_size = floor ( ( $this->max_x - $this->min_x ) / 50 ) ;
                foreach ( $this->labels AS $l )
                        {
                        $text = $l['text'] ;
@@ -89,7 +93,6 @@ class geo_params
                        
                        $s .= "' x='{$x}' y='{$y}'>{$text}</text>\n" ;
                        $ret .= $s ;
-#              $ret = "<text style='font-size:1000pt;text-anchor:middle;fill-opacity:0.7' x='{$x}' y='{$y}'>{$text}</text>\n" ;
                        }
                return $ret ;
                }
@@ -285,7 +288,7 @@ $g->set_from_id ( "germany" ) ;
 
 $p = new geo_params ;
 $p->languages = array ( "de" , "en" ) ; # Fallback to "en" if there's no "de"
-$p->style_fill = array ( "de.sylt" => "blue" ) ;
+$p->style_fill = array ( "germany.hamburg" => "fill:red" ) ;
 
 $svg = $g->draw ( $p ) ;
 $svg .= $p->get_svg_labels () ;

diff --git a/experiments/geo/geo_data.php b/experiments/geo/geo_data.php
index 75b0cfc..0d8fe47 100644 (file)
--- a/experiments/geo/geo_data.php
+++ b/experiments/geo/geo_data.php
@@ -25,6 +25,27 @@ $geo_data = array (
 "germany.mv/sh" => "!data:531203,103559 531943,103804 532632,104518 532905,105131 533502,105131 533736,104518 534424,104110 534840,104314 535255,104825",
 "germany.mv/north-east" => "!data:535346,104825 535619,105437 535710,110152 535619,110601 535255,111417 535802,111724 540906,112438 540906,113153 542101,115542 543256,120705 543529,122849 544400,123604 545048,124727 544218,125135 544400,130054 543944,130259 543205,125952 542658,130911 542152,130605 542607,125646 542101,124931 541503,124727 541048,125544 541412,130707 541230,131830 540632,132953 535853,133300 535204,131932 534606,133606 532125,134627",
 
+"germany.sh/north" => "!data:535346,104825 535619,104314 540217,104314 540126,104620 541230,105744 542101,105539 542516,110050 542425,110805 543256,110152 543438,105437 542931,105131 542749,105642 542607,105642 542516,105131 542425,104927 542010,103906 542243,103253 542607,101619 542101,101007 542607,101313 542840,101007 542749,095639 543347,100150 544218,100354 544957,100150 545048,095639 545413,094108 545919,094006 545413,093557 545413,093047 545322,092638 545555,092332 545737,085535",
+"germany.sh/west" => "!data:545555,085433 544542,085943 543256,091311 542658,090658 542425,085331 541503,085331 541554,090046 541736,090902 541139,090556 540541,090556 535944,091005 535853,090658 534931,091413",
+"germany.sh/ns1" => "!data:534424,092638 533918,093251 533411,093904 532956,094210 532723,094618",
+"germany.sh/ns2" => "!data:531619,102028 531437,102232 531345,102538 531345,102947 531254,103457",
+
+"germany.hamburg/sh" => "!data:532814,095027 532723,095333 533229,100048 533736,101109 533411,101007 532956,101415 532541,101109 531852,101926",
+"germany.hamburg/ns" => "!data:532541,094925 532034,095333 531710,095537 531801,095844 531528,100048 531801,100700 531528,101415 531619,101619",
+
+"germany.ns/sa" => "!data:525137,112438 524722,112234 524216,111928 523851,111315 524033,110356 524033,105539 523800,105233 523618,104416 523254,104212 522838,104723 522008,105437 521228,105642 520955,105233 520357,105948 520124,105539 515435,105948 515020,105846 514838,105846 514422,105539 514240,105539 514058,104110 513643,103559 513409,103906 513045,103804 512812,103804 512214,103702 511759,104212 511343,104110",
+"germany.ns/tr" => "!data:511201,104008 510746,104008 510655,103355 511110,102538 510513,102640 505915,101619 505409,100354",
+"germany.ns/hesse" => "!data:505642,100150 505642,095537 505227,095129 504811,095231 505044,094108 505551,094618 510057,094618 510422,094516 510928,094822 511019,094414 511343,093557",
+"germany.ns/west" => "!data:515708,072940 520306,073144 520955,072634 521137,071409 522241,071613 522059,073349 523851,073451 524631,074410 525735,074001 531021,074512 530839,073246 532307,073451 532358,073859 532632,073655 533320,074512 533411,075329 533320,080043 533502,082534 533138,082432 532216,083147 532216,082330 531801,082738 531528,083351 532125,083901 532307,083657 532723,083453 532905,084003 532449,084820 532125,085331 532632,085535 532814,085433 532814,084922 533229,084820 534840,085331 534749,090046 534424,090454 534515,091515",
+
+"germany.ns" => "
+!type[political]:state
+!name[de]:Niedersachsen
+!name[en]:Lower Saxony
+!region[political]:
+polygon(germany.sh/ns1,germany.hamburg/ns,germany.sh/ns2,germany.mv/ns,germany.ns/sa,germany.ns/tr,germany.ns/hesse,germany.nrw/ns,germany.ns/west)
+",
+
 "germany.sylt" => "
 !type[political]:isle
 !name[de]:Sylt
@@ -34,13 +55,10 @@ polygon(germany.sylt)
 !data:544724,083657 550010,083759 551114,084412 550841,084718 550517,084412 545828,084310 545828,084922 545504,084310 545555,084003 544906,084003
 ",
 
-"germany.sh/north" => "!data:535346,104825 535619,104314 540217,104314 540126,104620 541230,105744 542101,105539 542516,110050 542425,110805 543256,110152 543438,105437 542931,105131 542749,105642 542607,105642 542516,105131 542425,104927 542010,103906 542243,103253 542607,101619 542101,101007 542607,101313 542840,101007 542749,095639 543347,100150 544218,100354 544957,100150 545048,095639 545413,094108 545919,094006 545413,093557 545413,093047 545322,092638 545555,092332 545737,085535",
-"germany.sh/west" => "!data:545555,085433 544542,085943 543256,091311 542658,090658 542425,085331 541503,085331 541554,090046 541736,090902 541139,090556 540541,090556 535944,091005 535853,090658 534931,091413",
-
 "germany.sh.body" => "
 !type:abstract
 !region[political]:
-polygon(germany.mv/sh,germany.sh/north,germany.sh/west)
+polygon(germany.mv/sh,germany.sh/north,germany.sh/west,germany.sh/ns1,germany.hamburg/sh,germany.sh/ns2)
 ",
 
 "germany.sh" => "
@@ -51,6 +69,14 @@ polygon(germany.mv/sh,germany.sh/north,germany.sh/west)
 addregs(germany.sylt,germany.sh.body)
 ",
 
+"germany.hamburg" => "
+!type[political]:state
+!name[de]:Hamburg
+!name[en]:Hamburg
+!region[political]:
+polygon(germany.hamburg/sh,germany.hamburg/ns)
+",
+
 "germany.mv" => "
 !type[political]:state
 !name[de]:Mecklenburg-Vorpommern
@@ -88,7 +114,7 @@ polygon(germany.bavaria/bw,germany.bw/south,germany.bw/west,germany.bw/rp,german
 !name[de]:Deutschland
 !name[en]:Germany
 !region[political]:
-addregs(germany.bavaria,germany.bw,germany.nrw,germany.mv,germany.sh)
+addregs(germany.bavaria,germany.bw,germany.nrw,germany.mv,germany.sh,germany.ns,germany.hamburg)
 ",
 
 "danube" => "