changeset 2405:188e519afae8

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 10 Nov 2021 10:05:20 +0200
parents 7bc30009ed14
children 1573d5040b55
files src/mkloc.c
diffstat 1 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/mkloc.c	Wed Nov 10 09:51:10 2021 +0200
+++ b/src/mkloc.c	Wed Nov 10 10:05:20 2021 +0200
@@ -974,6 +974,8 @@
         while (*ptr != 0)
         {
             char *start;
+
+            // Detect AQ and LQ strings
             if (ptr[0] == 'A' && ptr[1] == 'Q' && th_isspace(ptr[2]) &&
                 (start = strchr(ptr + 3, '"')) != NULL)
             {
@@ -1012,19 +1014,22 @@
         // Skip disabled / invisible locations
         if (tmp->flags & (LOCF_INVIS | LOCF_INVALID)) continue;
 
-        // Print out coordinates etc.
-        fprintf(outFile, "<marker x=\"%d\" y=\"%d\" labeldir=\"%d\" name=\"",
+        // Coordinates and label direction/alignment
+        fprintf(outFile, "<marker x=\"%d\" y=\"%d\" labeldir=\"%d\"",
             tmp->ox, tmp->oy, tmp->align);
 
-        // Location name
+        // Primary location name
+        fprintf(outFile, " name=\"");
         locPrintType(outFile, tmp, FALSE, fputse, FALSE);
+        fprintf(outFile, "\"");
 
-        fprintf(outFile, "\" html=\"");
-
+        // HTML
+        fprintf(outFile, " html=\"");
         outputGMapsHTML(outFile, tmp, fprintfe, fputse);
+        fprintf(outFile, "\"");
 
         // Flags
-        fprintf(outFile, "\" flags=\"%d\"",
+        fprintf(outFile, " flags=\"%d\"",
             tmp->flags);
 
         // Continent name