fix halcyon_viewer redraw post-refactoring

diff --git a/halcyon_viewer.as b/halcyon_viewer.as
index 7a8070f162e20323fce7efa4ba1f909c527fbf01..11f8fa8743d995429ea7bf5d90e63dd27c37bf63 100755 (executable)
--- a/halcyon_viewer.as
+++ b/halcyon_viewer.as
@@ -68,8 +68,7 @@ package {
                }
 
                private function onRefreshCSS(str:String):void {
-                       theMap.ruleset.loadFromCSS(str);
-                       theMap.redraw();
+                       theMap.setStyle(str);
                }               
                private function onJumpTo(lat:Number,lon:Number):void {
                        theMap.init(lat,lon);

diff --git a/net/systemeD/halcyon/styleparser/RuleSet.as b/net/systemeD/halcyon/styleparser/RuleSet.as
index bdc15868855e8077ef934db0da2925f1ba242699..98b7d2b751233162948805dad7c59909582400a2 100644 (file)
--- a/net/systemeD/halcyon/styleparser/RuleSet.as
+++ b/net/systemeD/halcyon/styleparser/RuleSet.as
@@ -45,7 +45,7 @@ package net.systemeD.halcyon.styleparser {
                // Loading stylesheet
 
                public function loadFromCSS(str:String):void {
-                       if (str.match(/[\s\n\r\t]/)!=null) { parseCSS(str); redrawCallback(); return; }
+                       if (str.match(/[\s\n\r\t]/)!=null) { parseCSS(str); loaded=true; redrawCallback(); return; }
 
                        var request:URLRequest=new URLRequest(str);
                        var loader:URLLoader=new URLLoader();
@@ -62,10 +62,7 @@ package net.systemeD.halcyon.styleparser {
                private function parseCSS(str:String):void {
                        var css:MapCSS=new MapCSS(minscale,maxscale);
                        choosers=css.parse(str);
-//                     Inspector.getInstance().show();
-//                     Inspector.getInstance().shelf('Choosers', choosers);
                        loadImages();
-//                     map.redraw();
                }
 
                private function doRedrawCallback(e:Event):void {