Add support for IDENTIFY blocks

mappyfile.pyproj

@@ -12,7 +12,7 @@
     <Name>mappyfile</Name>
     <RootNamespace>mappyfile</RootNamespace>
     <InterpreterId>MSBuild|mappyfile|$(MSBuildProjectFullPath)</InterpreterId>
-    <StartupFile>tests\test_utils.py</StartupFile>
+    <StartupFile>tests\test_snippets.py</StartupFile>
     <LaunchProvider>Standard Python launcher</LaunchProvider>
     <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
     <Environment>PATH=C:\MapServer\bin;%PATH%
@@ -208,6 +208,7 @@ PROJ_LIB=C:\MapServer\bin\proj\SHARE
     <Content Include="MANIFEST.in" />
     <Content Include="mappyfile\mapfile.lark" />
     <Content Include="mappyfile\py.typed" />
+    <Content Include="mappyfile\schemas\identify.json" />
     <Content Include="mappyfile\schemas\plugins.json" />
     <Content Include="mappyfile\schemas\maps.json" />
     <Content Include="mappyfile\schemas\expression.json">

mappyfile/mapfile.lark

@@ -42,7 +42,7 @@ composite: composite_type composite_body _END
        | connectionoptions
 
 composite_body: _composite_item*
-_composite_item: (composite|attr|points|projection|pattern|values|config)
+_composite_item: (composite|attr|points|projection|pattern|values|config|classauto)
 
 !projection: "PROJECTION"i (string*|AUTO) _END
 !config: "CONFIG"i (string | UNQUOTED_STRING) (string | UNQUOTED_STRING)
@@ -78,6 +78,7 @@ string_pair: (string|UNQUOTED_STRING) (string|UNQUOTED_STRING)
 
 attr_bind_pair: attr_bind attr_bind
 attr_mixed_pair: attr_bind (int|float) | (int|float) attr_bind
+classauto: CLASSAUTO
 float: SIGNED_FLOAT
 float_pair: float float
 path: PATH
@@ -124,6 +125,7 @@ func_params: atom ("," atom)*
             | "COMPOSITE"i
             | "FEATURE"i
             | "GRID"i
+            | "IDENTIFY"i
             | "JOIN"i
             | "LABEL"i
             | "LAYER"i
@@ -139,6 +141,7 @@ func_params: atom ("," atom)*
             | "WEB"i
             | "SYMBOL"i
 
+CLASSAUTO: "CLASSAUTO"i
 AUTO: "AUTO"i
 PATH: /([a-z0-9_]*\.*\/|[a-z0-9_]+[.\/])[a-z0-9_\/\.-]+/i
 

mappyfile/pprint.py

@@ -151,7 +151,11 @@ def __format_line(
     ) -> str:
         if (aligned_max_indent is None) or (aligned_max_indent == 0):
             aligned_max_indent = len(key) + 1
-        indent = " " * (aligned_max_indent - len(key))
+        if value == "":
+            indent = ""  # for keywords with no values, do not add a space
+        else:
+            indent = " " * (aligned_max_indent - len(key))
+
         tmpl = "{spacer}{key}{indent}{value}"
         d = {"spacer": spacer, "key": key, "value": value, "indent": indent}
         return tmpl.format(**d)
@@ -399,6 +403,12 @@ def format_value(self, attr: str, attr_props, value: Any) -> Any:
 
             return value
 
+        if "type" in attr_props and attr_props["type"] == "null":
+            # for keywords without a value return an empty string
+            # currently only CLASSAUTO is the only keyword without a value
+            assert attr.lower() == "classauto"
+            return ""
+
         if (
             "type" in attr_props and attr_props["type"] == "string"
         ):  # and "enum" not in attr_props

mappyfile/schemas/identify.json

@@ -0,0 +1,23 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "metadata": {
+    "minVersion": 8.6
+  },
+  "patternProperties": {
+    "^__[a-z]+__$": true
+  },
+  "properties": {
+    "__type__": {
+      "const": "identify"
+    },
+    "tolerance": {
+      "type": "number"
+    },
+    "toleranceunits": {
+      "enum": [ "feet", "inches", "kilometers", "meters", "miles", "nauticalmiles", "pixels", "dd" ]
+    },
+    "classauto": { "type": "null" }
+  },
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/layer.json

@@ -159,6 +159,12 @@
     "header": {
       "type": "string"
     },
+    "identify": {
+      "$ref": "identify.json",
+      "metadata": {
+        "minVersion": 8.6
+      }
+    },
     "joins": {
       "type": "array",
       "items": {

mappyfile/tokens.py

@@ -43,6 +43,7 @@
     composite
     feature
     grid
+    identify
     join
     label
     leader
@@ -111,6 +112,7 @@
     graticule
     group
     header
+    identify
     image
     imagecolor
     imagetype
@@ -256,6 +258,7 @@
     cluster
     connectionoptions
     grid
+    identify
     leader
     legend
     metadata

mappyfile/transformer.py

@@ -642,6 +642,15 @@ def list(self, t):
         v.value = "{%s}" % list_values
         return v
 
+    def classauto(self, t):
+        key_token = t[0]
+        key_name = self.key_name(key_token)
+        pd = self.create_position_dict(key_token, None)
+        d: dict = OrderedDict()
+        d["__position__"] = pd
+        d[key_name] = None
+        return d
+
 
 class CommentsTransformer(Transformer_InPlace):
     """