Merge pull request #4692 from rouault/fix_msContourGetOption

Fix msContourGetOption() to be able to parse values where no min/maxscal...
MapServer · Aug 12, 2013 · caafcaa · caafcaa
2 parents efed3d7 + c5765a5
commit caafcaa
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/mapcontour.c b/mapcontour.c
@@ -462,6 +462,9 @@ static char* msContourGetOption(layerObj *layer, const char *name)
 
   options = CSLFetchNameValueMultiple(layer->processing, name);
   c = CSLCount(options);
+
+  /* First pass to find the value among options that have min/maxscaledenom */
+  /* specified */
   for (i=0; i<c && found == MS_FALSE; ++i) {
     values = CSLTokenizeStringComplex(options[i], ":", FALSE, FALSE);
     if (CSLCount(values) == 2) {
@@ -480,6 +483,17 @@ static char* msContourGetOption(layerObj *layer, const char *name)
     }
     CSLDestroy(values);
   }
+
+  /* Second pass to find the value among options that do NOT have */
+  /* min/maxscaledenom specified */
+  for (i=0; i<c && found == MS_FALSE; ++i) {
+    values = CSLTokenizeStringComplex(options[i], ":", FALSE, FALSE);
+    if (CSLCount(values) == 1) {
+      value = msStrdup(values[0]);
+      found = MS_TRUE;
+    }
+    CSLDestroy(values);
+  }
 
   CSLDestroy(options);