From 1b74544b0879ee7663fa9a6aade5d1c7498a9d6e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 11:18:44 +0100
Subject: [PATCH] start well-known-names enum from 1 + pre-initialise keys_map
 with well-known-names

---
 include/mapnik/json/json_grammar_config.hpp    | 8 ++++----
 utils/mapnik-index/process_geojson_file_x3.cpp | 9 ++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index acd0bd7d9..ffa8be913 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -34,10 +34,10 @@ namespace mapnik { namespace json {
 
 enum well_known_names
 {
-    type = 0,
-    geometry = 1,
-    coordinates = 2,
-    properties = 3
+    type = 1,
+    geometry,
+    coordinates,
+    properties
 };
 
 constexpr char const* wkn_to_string(well_known_names val)
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 0e2d50cbd..9f87d95ae 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -428,7 +428,14 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     auto const* itr = start;
 
     extract_positions<base_iterator_type, boxes_type> callback(itr, boxes);
-    mapnik::json::grammar::keys_map keys;
+    mapnik::json::grammar::keys_map keys =
+        {
+            {"type", mapnik::json::well_known_names::type},
+            {"geometry", mapnik::json::well_known_names::geometry},
+            {"coordinates", mapnik::json::well_known_names::coordinates},
+            {"properties", mapnik::json::well_known_names::properties}
+        };
+
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
         [x3::with<mapnik::json::keys_tag>(std::ref(keys))