From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 11 Oct 2010 13:51:41 +0000 (+0000)
Subject: Correct order of Icon, Label, Line styles in KML writer.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~917
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5dae580d9d7be2fea65cbb2d0f53b0f17cad47a8;p=gpsbabel.git

Correct order of Icon, Label, Line styles in KML writer.
---

diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index e7285c721..aabf9ffe4 100644
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -466,18 +466,6 @@ static void kml_write_bitmap_style_(const char *style, const char * bitmap,
 		highlighted ? "Highlighted" : "Normal", style);
 	kml_write_xml(1, "<Style id=\"%s_%c\">\n", style, hovertag(highlighted));
 
-	if (is_multitrack) {
-		kml_output_linestyle(opt_line_color,
-                                     highlighted ? line_width + 2 :
-                                                   line_width);
-        }
-
-	if (is_track && !highlighted) {
-		kml_write_xml(1, "<LabelStyle>\n");
-		kml_write_xml(0, "<scale>0</scale>\n");
-		kml_write_xml(-1, "</LabelStyle>\n");
-	}
-
 	kml_write_xml(1, "<IconStyle>\n");
 	if (highlighted) {
 		kml_write_xml(0, "<scale>1.2</scale>\n");
@@ -494,6 +482,19 @@ static void kml_write_bitmap_style_(const char *style, const char * bitmap,
 	kml_write_xml(0, "<href>%s</href>\n", bitmap);
 	kml_write_xml(-1, "</Icon>\n");
 	kml_write_xml(-1, "</IconStyle>\n");
+
+	if (is_track && !highlighted) {
+		kml_write_xml(1, "<LabelStyle>\n");
+		kml_write_xml(0, "<scale>0</scale>\n");
+		kml_write_xml(-1, "</LabelStyle>\n");
+	}
+
+	if (is_multitrack) {
+		kml_output_linestyle(opt_line_color,
+                                     highlighted ? line_width + 2 :
+                                                   line_width);
+        }
+
 	kml_write_xml(-1, "</Style>\n");
 }
 
diff --git a/gpsbabel/reference/earth-expertgps-track.kml b/gpsbabel/reference/earth-expertgps-track.kml
index 597948f08..8b9f8d10f 100644
--- a/gpsbabel/reference/earth-expertgps-track.kml
+++ b/gpsbabel/reference/earth-expertgps-track.kml
@@ -32,15 +32,15 @@
     </StyleMap>
 <!-- Normal track style -->
     <Style id="track_n">
-      <LabelStyle>
-        <scale>0</scale>
-      </LabelStyle>
       <IconStyle>
         <scale>.5</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
+      <LabelStyle>
+        <scale>0</scale>
+      </LabelStyle>
     </Style>
 <!-- Highlighted track style -->
     <Style id="track_h">
@@ -63,28 +63,28 @@
     </StyleMap>
 <!-- Normal multiTrack style -->
     <Style id="multiTrack_n">
-      <LineStyle>
-        <color>99ffac59</color>
-        <width>6</width>
-      </LineStyle>
       <IconStyle>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
-    </Style>
-<!-- Highlighted multiTrack style -->
-    <Style id="multiTrack_h">
       <LineStyle>
         <color>99ffac59</color>
-        <width>8</width>
+        <width>6</width>
       </LineStyle>
+    </Style>
+<!-- Highlighted multiTrack style -->
+    <Style id="multiTrack_h">
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
+      <LineStyle>
+        <color>99ffac59</color>
+        <width>8</width>
+      </LineStyle>
     </Style>
     <StyleMap id="multiTrack">
       <Pair>
diff --git a/gpsbabel/reference/earth-expertgps.kml b/gpsbabel/reference/earth-expertgps.kml
index 789678233..e38b0f448 100644
--- a/gpsbabel/reference/earth-expertgps.kml
+++ b/gpsbabel/reference/earth-expertgps.kml
@@ -32,15 +32,15 @@
     </StyleMap>
 <!-- Normal track style -->
     <Style id="track_n">
-      <LabelStyle>
-        <scale>0</scale>
-      </LabelStyle>
       <IconStyle>
         <scale>.5</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
+      <LabelStyle>
+        <scale>0</scale>
+      </LabelStyle>
     </Style>
 <!-- Highlighted track style -->
     <Style id="track_h">
diff --git a/gpsbabel/reference/track/gpx_garmin_extensions-kml_track.kml b/gpsbabel/reference/track/gpx_garmin_extensions-kml_track.kml
index 4d94bd15f..c7eccb06d 100644
--- a/gpsbabel/reference/track/gpx_garmin_extensions-kml_track.kml
+++ b/gpsbabel/reference/track/gpx_garmin_extensions-kml_track.kml
@@ -13,15 +13,15 @@
     </Schema>
 <!-- Normal track style -->
     <Style id="track_n">
-      <LabelStyle>
-        <scale>0</scale>
-      </LabelStyle>
       <IconStyle>
         <scale>.5</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
+      <LabelStyle>
+        <scale>0</scale>
+      </LabelStyle>
     </Style>
 <!-- Highlighted track style -->
     <Style id="track_h">
@@ -44,28 +44,28 @@
     </StyleMap>
 <!-- Normal multiTrack style -->
     <Style id="multiTrack_n">
-      <LineStyle>
-        <color>99ffac59</color>
-        <width>6</width>
-      </LineStyle>
       <IconStyle>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
-    </Style>
-<!-- Highlighted multiTrack style -->
-    <Style id="multiTrack_h">
       <LineStyle>
         <color>99ffac59</color>
-        <width>8</width>
+        <width>6</width>
       </LineStyle>
+    </Style>
+<!-- Highlighted multiTrack style -->
+    <Style id="multiTrack_h">
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
+      <LineStyle>
+        <color>99ffac59</color>
+        <width>8</width>
+      </LineStyle>
     </Style>
     <StyleMap id="multiTrack">
       <Pair>
diff --git a/gpsbabel/reference/track/gtrnctr_power-kml.kml b/gpsbabel/reference/track/gtrnctr_power-kml.kml
index 2b893313b..56961d9e9 100644
--- a/gpsbabel/reference/track/gtrnctr_power-kml.kml
+++ b/gpsbabel/reference/track/gtrnctr_power-kml.kml
@@ -16,15 +16,15 @@
     </Schema>
 <!-- Normal track style -->
     <Style id="track_n">
-      <LabelStyle>
-        <scale>0</scale>
-      </LabelStyle>
       <IconStyle>
         <scale>.5</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
+      <LabelStyle>
+        <scale>0</scale>
+      </LabelStyle>
     </Style>
 <!-- Highlighted track style -->
     <Style id="track_h">
@@ -47,28 +47,28 @@
     </StyleMap>
 <!-- Normal multiTrack style -->
     <Style id="multiTrack_n">
-      <LineStyle>
-        <color>99ffac59</color>
-        <width>6</width>
-      </LineStyle>
       <IconStyle>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
-    </Style>
-<!-- Highlighted multiTrack style -->
-    <Style id="multiTrack_h">
       <LineStyle>
         <color>99ffac59</color>
-        <width>8</width>
+        <width>6</width>
       </LineStyle>
+    </Style>
+<!-- Highlighted multiTrack style -->
+    <Style id="multiTrack_h">
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
+      <LineStyle>
+        <color>99ffac59</color>
+        <width>8</width>
+      </LineStyle>
     </Style>
     <StyleMap id="multiTrack">
       <Pair>
diff --git a/gpsbabel/reference/track/segmented_tracks-track.kml b/gpsbabel/reference/track/segmented_tracks-track.kml
index 90b0f0288..4134808d6 100644
--- a/gpsbabel/reference/track/segmented_tracks-track.kml
+++ b/gpsbabel/reference/track/segmented_tracks-track.kml
@@ -5,15 +5,15 @@
     <name>GPS device</name>
 <!-- Normal track style -->
     <Style id="track_n">
-      <LabelStyle>
-        <scale>0</scale>
-      </LabelStyle>
       <IconStyle>
         <scale>.5</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
+      <LabelStyle>
+        <scale>0</scale>
+      </LabelStyle>
     </Style>
 <!-- Highlighted track style -->
     <Style id="track_h">
@@ -36,28 +36,28 @@
     </StyleMap>
 <!-- Normal multiTrack style -->
     <Style id="multiTrack_n">
-      <LineStyle>
-        <color>99ffac59</color>
-        <width>6</width>
-      </LineStyle>
       <IconStyle>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
-    </Style>
-<!-- Highlighted multiTrack style -->
-    <Style id="multiTrack_h">
       <LineStyle>
         <color>99ffac59</color>
-        <width>8</width>
+        <width>6</width>
       </LineStyle>
+    </Style>
+<!-- Highlighted multiTrack style -->
+    <Style id="multiTrack_h">
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
+      <LineStyle>
+        <color>99ffac59</color>
+        <width>8</width>
+      </LineStyle>
     </Style>
     <StyleMap id="multiTrack">
       <Pair>
diff --git a/gpsbabel/reference/track/segmented_tracks.kml b/gpsbabel/reference/track/segmented_tracks.kml
index 9066532b8..e58bc4a51 100644
--- a/gpsbabel/reference/track/segmented_tracks.kml
+++ b/gpsbabel/reference/track/segmented_tracks.kml
@@ -5,15 +5,15 @@
     <name>GPS device</name>
 <!-- Normal track style -->
     <Style id="track_n">
-      <LabelStyle>
-        <scale>0</scale>
-      </LabelStyle>
       <IconStyle>
         <scale>.5</scale>
         <Icon>
           <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
+      <LabelStyle>
+        <scale>0</scale>
+      </LabelStyle>
     </Style>
 <!-- Highlighted track style -->
     <Style id="track_h">